2.2.2 (#1720)

2.2.2
2019-04-07 19:35:24 +02:00 · 2019-04-07 19:35:24 +02:00 · 6d1027d950
parent b4220592e1
commit 6d1027d950
32 changed files with 1669 additions and 58 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -6,7 +6,7 @@ buildscript {

    dependencies {
        classpath 'io.fabric.tools:gradle:1.+'
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2'
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.3'
    }
 }
 apply plugin: "com.android.application"
@ -15,7 +15,7 @@ apply plugin: "jacoco-android"
 apply plugin: 'com.jakewharton.butterknife'

 ext {
-    supportLibraryVersion = "27.1.0"
+    supportLibraryVersion = "27.1.1"
    ormLiteVersion = "4.46"
    powermockVersion = "1.7.3"
    dexmakerVersion = "1.2"
@ -63,7 +63,7 @@ android {
        targetSdkVersion 25
        multiDexEnabled true
        versionCode 1500
-        version "2.2"
+        version "2.2.2"
        buildConfigField "String", "VERSION", '"' + version + '"'
        buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
        buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'
@ -91,7 +91,7 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
        debug {
-            testCoverageEnabled(project.hasProperty('coverage') ? true : false)
+            testCoverageEnabled(project.hasProperty('coverage'))
        }
    }
    productFlavors {
@ -184,15 +184,14 @@ dependencies {
    implementation "com.android.support:design:${supportLibraryVersion}"
    implementation "com.android.support:percent:${supportLibraryVersion}"
    implementation "com.wdullaer:materialdatetimepicker:2.3.0"
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
    implementation "com.squareup:otto:1.3.7"
    implementation "com.j256.ormlite:ormlite-core:${ormLiteVersion}"
    implementation "com.j256.ormlite:ormlite-android:${ormLiteVersion}"
    implementation("com.github.tony19:logback-android-classic:1.1.1-6") {
        exclude group: "com.google.android", module: "android"
    }
-    implementation "org.apache.commons:commons-lang3:3.6"
-    implementation "org.slf4j:slf4j-api:1.7.12"
+    implementation "org.apache.commons:commons-lang3:3.7"
+    implementation "org.slf4j:slf4j-api:1.7.21"
    implementation "com.jjoe64:graphview:4.0.1"
    implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.1.1"
    implementation 'com.google.android.gms:play-services-wearable:10.2.1'
@ -207,8 +206,8 @@ dependencies {
        // excluding org.json which is provided by Android
        exclude group: "org.json", module: "json"
    }
-    implementation "com.google.code.gson:gson:2.7"
-    implementation "com.google.guava:guava:20.0"
+    implementation "com.google.code.gson:gson:2.8.2"
+    implementation "com.google.guava:guava:24.1-jre"

    implementation "net.danlew:android.joda:2.9.9.1"
    implementation "uk.com.robust-it:cloning:1.9.9"
@ -220,17 +219,17 @@ dependencies {

    testImplementation "junit:junit:4.12"
    testImplementation "org.json:json:20140107"
-    testImplementation "org.mockito:mockito-core:2.7.22"
+    testImplementation "org.mockito:mockito-core:2.8.47"
    testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
    testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"
    testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}"
    testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
-    testImplementation "joda-time:joda-time:2.9.4.2"
+    testImplementation "joda-time:joda-time:2.9.9"
    testImplementation "com.google.truth:truth:0.39"
    testImplementation 'org.robolectric:robolectric:3.8'
    testImplementation "org.skyscreamer:jsonassert:1.5.0"

-    androidTestImplementation "org.mockito:mockito-core:2.7.22"
+    androidTestImplementation "org.mockito:mockito-core:2.8.47"
    androidTestImplementation "com.google.dexmaker:dexmaker:${dexmakerVersion}"
    androidTestImplementation "com.google.dexmaker:dexmaker-mockito:${dexmakerVersion}"
 }
--- a/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
@ -72,8 +72,6 @@ public class GlucoseStatus {
            return null;
        }

-        sizeRecords = Math.min(sizeRecords, 9);
-
        if (data.get(0).date < DateUtil.now() - 7 * 60 * 1000L && !allowOldData) {
            return null;
        }
@ -93,10 +91,14 @@ public class GlucoseStatus {
            return status.round();
        }

+        ArrayList<Double> now_value_list = new ArrayList<Double>();
        ArrayList<Double> last_deltas = new ArrayList<Double>();
        ArrayList<Double> short_deltas = new ArrayList<Double>();
        ArrayList<Double> long_deltas = new ArrayList<Double>();

+        // Use the latest sgv value in the now calculations
+        now_value_list.add(now.value);
+
        for (int i = 1; i < sizeRecords; i++) {
            if (data.get(i).value > 38) {
                BgReading then = data.get(i);
@ -111,8 +113,9 @@ public class GlucoseStatus {

                // use the average of all data points in the last 2.5m for all further "now" calculations
                if (0 < minutesago && minutesago < 2.5) {
-                    now.value = (now.value + then.value) / 2;
-                    now_date = (now_date + then_date) / 2;
+                    // Keep and average all values within the last 2.5 minutes
+                    now_value_list.add(then.value);
+                    now.value = average(now_value_list);
                    // short_deltas are calculated from everything ~5-15 minutes ago
                } else if (2.5 < minutesago && minutesago < 17.5) {
                    //console.error(minutesago, avgdelta);
@ -124,6 +127,9 @@ public class GlucoseStatus {
                    // long_deltas are calculated from everything ~20-40 minutes ago
                } else if (17.5 < minutesago && minutesago < 42.5) {
                    long_deltas.add(avgdelta);
+                } else {
+                    // Do not process any more records after >= 42.5 minutes
+                    break;
                }
            }
        }
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@ -726,7 +726,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
            String units = JsonHelper.safeGetString(trJson, "units", Constants.MGDL);
            TempTarget tempTarget = new TempTarget()
                    .date(trJson.getLong("mills"))
-                    .duration(trJson.getInt("duration"))
+                    .duration(JsonHelper.safeGetInt(trJson, "duration"))
                    .low(Profile.toMgdl(trJson.getDouble("targetBottom"), units))
                    .high(Profile.toMgdl(trJson.getDouble("targetTop"), units))
                    .reason(JsonHelper.safeGetString(trJson, "reason", ""))
--- 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
@ -232,8 +232,13 @@ public class DetermineBasalAdapterSMBJS {
        mProfile.put("max_daily_safety_multiplier", SP.getInt(R.string.key_openapsama_max_daily_safety_multiplier, 3));
        mProfile.put("current_basal_safety_multiplier", SP.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d));

-        mProfile.put("high_temptarget_raises_sensitivity", SP.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity));
-        mProfile.put("low_temptarget_lowers_sensitivity", SP.getBoolean(R.string.key_low_temptarget_lowers_sensitivity, SMBDefaults.low_temptarget_lowers_sensitivity));
+        // TODO AS-FIX
+        // mProfile.put("high_temptarget_raises_sensitivity", SP.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity));
+        mProfile.put("high_temptarget_raises_sensitivity", false);
+        //mProfile.put("low_temptarget_lowers_sensitivity", SP.getBoolean(R.string.key_low_temptarget_lowers_sensitivity, SMBDefaults.low_temptarget_lowers_sensitivity));
+        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("adv_target_adjustments", SMBDefaults.adv_target_adjustments);
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java
@ -729,7 +729,7 @@ public class SmsCommunicatorPlugin extends PluginBase {
            String passCode = generatePasscode();
            String reply = String.format(MainApp.gs(R.string.smscommunicator_calibrationreplywithcode), cal, passCode);
            receivedSms.processed = true;
-            messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction() {
+            messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(cal) {
                @Override
                public void run() {
                    boolean result = XdripCalibrations.sendIntent(aDouble);
--- 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
@ -364,7 +364,8 @@ public class IobCobOref1Thread extends Thread {
                    //log.debug("TIME: " + new Date(bgTime).toString() + " BG: " + bg + " SENS: " + sens + " DELTA: " + delta + " AVGDELTA: " + avgDelta + " IOB: " + iob.iob + " ACTIVITY: " + iob.activity + " BGI: " + bgi + " DEVIATION: " + deviation);

                    // add an extra negative deviation if a high temptarget is running and exercise mode is set
-                    if (SP.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity)) {
+                    // TODO AS-FIX
+                    if (false && SP.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity)) {
                        TempTarget tempTarget = TreatmentsPlugin.getPlugin().getTempTargetFromHistory(bgTime);
                        if (tempTarget != null && tempTarget.target() >= 100) {
                            autosensData.extraDeviation.add(-(tempTarget.target() - 100) / 20);
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DoseStepSize.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DoseStepSize.java
@ -18,6 +18,10 @@ public enum DoseStepSize
            new DoseStepSizeEntry(5f, 10f, 0.2f), //
            new DoseStepSizeEntry(10f, Double.MAX_VALUE, 0.5f)),

+    InsightBasal(
+            new DoseStepSizeEntry(0f, 5f, 0.01f),
+            new DoseStepSizeEntry(5f, Double.MAX_VALUE, 0.1f)),
+
    MedtronicVeoBasal( //
            new DoseStepSizeEntry(0f, 1f, 0.025f), //
            new DoseStepSizeEntry(1f, 10f, 0.05f), //
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
@ -49,9 +49,15 @@ public enum PumpType {
    AccuChekInsight("Accu-Chek Insight", 0.05d, DoseStepSize.InsightBolus, //
            new DoseSettings(0.05d, 15, 24*60, 0.05d), //
            PumpTempBasalType.Percent,
-            new DoseSettings(10,  15, 12*60,0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
+            new DoseSettings(10,  15, 24*60,0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
            0.02d, 0.01d, null, PumpCapability.InsightCapabilities), //

+    AccuChekInsightBluetooth("Accu-Chek Insight", 0.01d, null, //
+            new DoseSettings(0.01d, 15, 24*60, 0.05d), //
+            PumpTempBasalType.Percent,
+            new DoseSettings(10,  15, 24*60,0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
+            0.02d, 0.01d, DoseStepSize.InsightBolus, PumpCapability.InsightCapabilities), //
+
    // Animas
    AnimasVibe("Animas Vibe", 0.05d, null, // AnimasBolus?
            new DoseSettings(0.05d, 30, 12*60, 0.05d), //
--- 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
@ -171,7 +171,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                .preferencesId(R.xml.pref_insight_local));

        pumpDescription = new PumpDescription();
-        pumpDescription.setPumpDescription(PumpType.AccuChekInsight);
+        pumpDescription.setPumpDescription(PumpType.AccuChekInsightBluetooth);
    }

    public TBROverNotificationBlock getTBROverNotificationBlock() {
@ -315,7 +315,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
        calendar.set(Calendar.HOUR_OF_DAY, pumpTime.getHour());
        calendar.set(Calendar.MINUTE, pumpTime.getMinute());
        calendar.set(Calendar.SECOND, pumpTime.getSecond());
-        if (Math.abs(calendar.getTimeInMillis() - System.currentTimeMillis()) > 10000) {
+        if (calendar.get(Calendar.HOUR_OF_DAY) != pumpTime.getHour() || Math.abs(calendar.getTimeInMillis() - System.currentTimeMillis()) > 10000) {
            calendar.setTime(new Date());
            pumpTime.setYear(calendar.get(Calendar.YEAR));
            pumpTime.setMonth(calendar.get(Calendar.MONTH) + 1);
@ -421,7 +421,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
            if (profile.getBasalValues().length > i + 1)
                nextValue = profile.getBasalValues()[i + 1];
            BasalProfileBlock profileBlock = new BasalProfileBlock();
-            profileBlock.setBasalAmount(basalValue.value);
+            profileBlock.setBasalAmount(basalValue.value > 5 ? Math.round(basalValue.value / 0.1) * 0.1 : Math.round(basalValue.value / 0.01) * 0.01);
            profileBlock.setDuration((((nextValue != null ? nextValue.timeAsSeconds : 24 * 60 * 60) - basalValue.timeAsSeconds) / 60));
            profileBlocks.add(profileBlock);
        }
@ -476,7 +476,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                nextValue = profile.getBasalValues()[i + 1];
            if (profileBlock.getDuration() * 60 != (nextValue != null ? nextValue.timeAsSeconds : 24 * 60 * 60) - basalValue.timeAsSeconds)
                return false;
-            if (Math.abs(profileBlock.getBasalAmount() - basalValue.value) > 0.01D)
+            if (Math.abs(profileBlock.getBasalAmount() - basalValue.value) > (basalValue.value > 5 ? 0.05 : 0.005))
                return false;
        }
        return true;
@ -510,14 +510,15 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
    @Override
    public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
        PumpEnactResult result = new PumpEnactResult();
-        if (detailedBolusInfo.insulin > 0) {
+        double insulin = Math.round(detailedBolusInfo.insulin / 0.01) * 0.01;
+        if (insulin > 0) {
            try {
                synchronized ($bolusLock) {
                    DeliverBolusMessage bolusMessage = new DeliverBolusMessage();
                    bolusMessage.setBolusType(BolusType.STANDARD);
                    bolusMessage.setDuration(0);
                    bolusMessage.setExtendedAmount(0);
-                    bolusMessage.setImmediateAmount(detailedBolusInfo.insulin);
+                    bolusMessage.setImmediateAmount(insulin);
                    bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId();
                    bolusCancelled = false;
                }
@ -527,7 +528,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                t.isSMB = detailedBolusInfo.isSMB;
                final EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.getInstance();
                bolusingEvent.t = t;
-                bolusingEvent.status = MainApp.gs(R.string.insight_delivered, 0d, detailedBolusInfo.insulin);
+                bolusingEvent.status = MainApp.gs(R.string.insight_delivered, 0d, insulin);
                bolusingEvent.percent = 0;
                MainApp.bus().post(bolusingEvent);
                int trials = 0;
@ -565,7 +566,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                        synchronized ($bolusLock) {
                            if (bolusCancelled || trials == -1 || trials++ >= 5) {
                                if (!bolusCancelled) {
-                                    bolusingEvent.status = MainApp.gs(R.string.insight_delivered, detailedBolusInfo.insulin, detailedBolusInfo.insulin);
+                                    bolusingEvent.status = MainApp.gs(R.string.insight_delivered, insulin, insulin);
                                    bolusingEvent.percent = 100;
                                    MainApp.bus().post(bolusingEvent);
                                }
@ -592,6 +593,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
            result.enacted = true;
        }
        result.carbsDelivered = detailedBolusInfo.carbs;
+        result.bolusDelivered = insulin;
        return result;
    }

@ -1187,6 +1189,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
    }

    private void processCannulaFilledEvent(CannulaFilledEvent event) {
+        if (!SP.getBoolean("insight_log_site_changes", false)) return;
        long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
                event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
        uploadCareportalEvent(timestamp, CareportalEvent.SITECHANGE);
@ -1214,7 +1217,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
    }

    private void processSniffingDoneEvent(SniffingDoneEvent event) {
-        if (!SP.getBoolean("insight_log_site_changes", false)) return;
+        if (!SP.getBoolean("insight_log_reservoir_changes", false)) return;
        long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
                event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
        uploadCareportalEvent(timestamp, CareportalEvent.INSULINCHANGE);
@ -1537,6 +1540,11 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
        return insulin;
    }

+    @Override
+    public Constraint<Double> applyExtendedBolusConstraints(Constraint<Double> insulin) {
+        return applyBolusConstraints(insulin);
+    }
+
    @Override
    public void onStateChanged(InsightState state) {
        if (state == InsightState.CONNECTED) {
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@ -54,6 +54,7 @@
    <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="objectives_button_back">Terug</string>
    <string name="objectives_button_start">Begin</string>
    <string name="objectives_button_verify">Verifieer</string>
    <string name="nsprofileview_units_label">Eenhede</string>
@ -265,6 +266,10 @@
    <string name="smscommunicator_bolusreplywithcode">Om %1$.2fU bolus te lewer antwoord met kode %2$s</string>
    <string name="smscommunicator_calibrationreplywithcode">Om kalibrasie %1$.2f te stuur antwoord met kode %2$s</string>
    <string name="smscommunicator_bolusfailed">Bolus het misluk</string>
+    <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>
@ -334,11 +339,24 @@
    <string name="valuelimitedto">%1$.2f beperk tot %2$.2f</string>
    <string name="valueoutofrange" formatted="false">Waarde %s is uit harde perke</string>
    <string name="smscommunicator_remotecommandnotallowed">Afstandbeheerde bevel word nie toegelaat nie</string>
+    <string name="smscommunicator_remotebolusnotallowed">Afstandbeheerde bolus nie beskikbaar nie. Probeer later weer.</string>
+    <string name="smscommunicator_basalreplywithcode">Om %1$.2fU basale vir %2$d min te aktiveer antwoord met kode %3$s</string>
+    <string name="smscommunicator_profilereplywithcode">Om profiel te verander na %1$s %2$d%% antwoord met %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Om bolus %1$.2fU vir %2$d min te verleng kies %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">Om basal e %1$d%% vir %2$d min te begin kies %3$s</string>
    <string name="smscommunicator_suspendreplywithcode">Om lus op te skort vir %1$d minute antwoord met kode %2$s</string>
    <string name="smscommunicator_tempbasalset">Temp basale %1$.2fU/h vir %2$d min suksesvol geaktiveerd</string>
+    <string name="smscommunicator_extendedset">Verlengde bolus %1$.2fU vir %2$d min is begin</string>
+    <string name="smscommunicator_tempbasalset_percent">Tydelike basale %1$d%% vir %2$d min hardloop</string>
    <string name="smscommunicator_tempbasalfailed">Tydelike basale aktivering het gefaal</string>
+    <string name="smscommunicator_extendedfailed">Verlengde bolus het misluk</string>
+    <string name="smscommunicator_basalstopreplywithcode">Stop tydelike basale antwoord met kode %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Stop tydelike basale antwoord met kode %1$s</string>
    <string name="smscommunicator_tempbasalcanceled">Tydelike basale gekanselleer</string>
+    <string name="smscommunicator_extendedcanceled">Verlengde bolus gekanselleer</string>
    <string name="smscommunicator_tempbasalcancelfailed">Kansellassie van tydelike basale het gefaal</string>
+    <string name="smscommunicator_extendedcancelfailed">Kansellasie van verlengde bolus het misluk</string>
+    <string name="smscommunicator_unknowncommand">Onbekende opdrag of verkeerde opsie</string>
    <string name="quickwizard">SlimNutsman</string>
    <string name="quickwizardsettings">SlimNutsman instellings</string>
    <string name="overview_editquickwizard_buttontext">Knoppie teks:</string>
@ -1069,6 +1087,7 @@
    <string name="mute_alert">Demp</string>
    <string name="pump_alert">Pomp alarm</string>
    <string name="log_site_changes">Log ligging veranderings</string>
+    <string name="log_reservoir_changes">Log stoor veranderinge</string>
    <string name="log_tube_changes">Log voerpyp verandering</string>
    <string name="log_battery_changes">Log battery verandering</string>
    <string name="log_operating_mode_changes">Log bedryf modus veranderinge</string>
@ -1130,8 +1149,13 @@
    <string name="tomato">Tomato (MiaoMiao)</string>
    <string name="tomato_short">Tomato</string>
    <string name="dst_in_24h_warning">Daglig spaar tyd verandering in 24 h of minder</string>
+    <string name="dst_loop_disabled_warning">Daglig spaar tyd het verander minder as 3 ure terug - Geslote lus afgeskakel</string>
    <string name="storage">interne berging beperking</string>
    <string name="diskfull">Bevry ten minste %1$d MB van intene stoorspasie! Lus gedeaktiveer!</string>
+    <string name="wrongformat">Verkeerde formaat</string>
+    <string name="sms_wrongcode">Verkeerde kode. Opdrag gekanselleer.</string>
+    <string name="notconfigured">Nie gekonfigureer nie</string>
+    <string name="profileswitchcreated">Profiel skakelaar geskep</string>
    <plurals name="objective_days">
        <item quantity="one">%1$d dae</item>
        <item quantity="other">%1$d dae</item>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -266,6 +266,10 @@
    <string name="smscommunicator_bolusreplywithcode">За да доставите болус от %1$.2fЕ отговорете с код %2$s</string>
    <string name="smscommunicator_calibrationreplywithcode">За да изпратите калибрация %1$.2f отговорете с код %2$s</string>
    <string name="smscommunicator_bolusfailed">Болус отказан</string>
+    <string name="bolusdelivered">Болус от %1$.2fЕ доставен успешно</string>
+    <string name="bolusrequested">Ще стартира %1$.2fЕ болус</string>
+    <string name="smscommunicator_bolusdelivered">Болус от %1$.2fЕ доставен успешно</string>
+    <string name="bolusdelivering">Стартирам %1$.2fЕ</string>
    <string name="smscommunicator_remotecommandsallowed">Позволи отдалечени команди чрез SMS</string>
    <string name="glucosetype_finger">Пръст</string>
    <string name="glucosetype_sensor">Сензор</string>
@ -335,11 +339,24 @@
    <string name="valuelimitedto">%1$.2f ограничен до %2$.2f</string>
    <string name="valueoutofrange" formatted="false">Стойността %s е извън границите</string>
    <string name="smscommunicator_remotecommandnotallowed">Отдалеченото управление е забранено</string>
+    <string name="smscommunicator_remotebolusnotallowed">Отдалечено стартиране на болус не е възможно. Опитайте отново по-късно.</string>
+    <string name="smscommunicator_basalreplywithcode">За да стартирате базал от %1$.2fЕ/ч за %2$d мин отговорете с код %3$s</string>
+    <string name="smscommunicator_profilereplywithcode">За да превключите профила към %1$s %2$d%% отговорете с код %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">За да започнете удължен болус %1$.2fЕ за %2$d мин отговорете с код %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_tempbasalset">Временен базал от %1$.2fЕ/ч за %2$d мин стартиран успешно</string>
+    <string name="smscommunicator_extendedset">Удължен болус %1$.2fU за %2$d мин стартиран успешно</string>
+    <string name="smscommunicator_tempbasalset_percent">Временен базал от %1$d%Е/ч за %2$d мин стартиран успешно</string>
    <string name="smscommunicator_tempbasalfailed">Неуспешно стартиране на временен базал</string>
+    <string name="smscommunicator_extendedfailed">Неуспешно стартиране на удължен болус</string>
+    <string name="smscommunicator_basalstopreplywithcode">За да спрете времен базал отговорете с код %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">За да спрете удължения болус отговорете с код %1$s</string>
    <string name="smscommunicator_tempbasalcanceled">Временният базал е отменен</string>
+    <string name="smscommunicator_extendedcanceled">Удължен болус спрян</string>
    <string name="smscommunicator_tempbasalcancelfailed">Спирането на временния базал е неуспешно</string>
+    <string name="smscommunicator_extendedcancelfailed">Неуспешно спиране на удължен болус</string>
+    <string name="smscommunicator_unknowncommand">Непозната команда или грешен отговор</string>
    <string name="quickwizard">Бърз болус</string>
    <string name="quickwizardsettings">Настройки за бърз болус</string>
    <string name="overview_editquickwizard_buttontext">Текст на бутона:</string>
@ -1070,6 +1087,7 @@
    <string name="mute_alert">Без звук</string>
    <string name="pump_alert">Аларма на помпата</string>
    <string name="log_site_changes">Записвай смяната на местата</string>
+    <string name="log_reservoir_changes">Записвай смените на резервоар</string>
    <string name="log_tube_changes">Записвай смените на резервоар</string>
    <string name="log_battery_changes">Записвай смяната на батерия</string>
    <string name="log_operating_mode_changes">Записвай промените в режима</string>
@ -1131,8 +1149,13 @@
    <string name="tomato">Tomato(MяоМяо)</string>
    <string name="tomato_short">Tomato</string>
    <string name="dst_in_24h_warning">Смяна на времето след по-малко от 24ч</string>
+    <string name="dst_loop_disabled_warning">Смяна на времето след по-малко от 3 часа - минавам в отворен режим</string>
    <string name="storage">Ограничение поради липса на памет</string>
    <string name="diskfull">Освободете поне %1$d Мб в паметта на телефона! Loop изключен!</string>
+    <string name="wrongformat">Грешен формат</string>
+    <string name="sms_wrongcode">Грешен код. Командата не е изпълнена.</string>
+    <string name="notconfigured">Не е конфигуриран</string>
+    <string name="profileswitchcreated">Създаден запис - Промяна на профил</string>
    <plurals name="objective_days">
        <item quantity="one">%1$d дeн</item>
        <item quantity="other">%1$d дни</item>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -1087,6 +1087,7 @@
    <string name="mute_alert">Ztlumit</string>
    <string name="pump_alert">Výstraha pumpy</string>
    <string name="log_site_changes">Zaznamenat výměnu kanyly</string>
+    <string name="log_reservoir_changes">Zaznamenat výměnu zásobníku</string>
    <string name="log_tube_changes">Zaznamenat výměnu hadičky</string>
    <string name="log_battery_changes">Zaznamenat výměnu baterie</string>
    <string name="log_operating_mode_changes">Zaznamenat změnu režimu provozu</string>
@ -1148,6 +1149,7 @@
    <string name="tomato">Tomato (MiaoMiao)</string>
    <string name="tomato_short">Tomato</string>
    <string name="dst_in_24h_warning">Změna letního času za méně než 24 hodin</string>
+    <string name="dst_loop_disabled_warning">Změna letního času za méně než 3 hodiny - Uzavřená smyčka zastavena</string>
    <string name="storage">omezení vnitřního úložiště</string>
    <string name="diskfull">Uvolněte alespoň %1$d MB z vnitřního úložiště! Smyčka zakázána!</string>
    <string name="wrongformat">Chybný formát</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -266,6 +266,10 @@
    <string name="smscommunicator_bolusreplywithcode">Um einen Bolus von %1$.2f IE abzugeben, antworte mit  dem Code %2$s.</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="bolusdelivered">Bolus %1$.2fU erfolgreich abgegeben</string>
+    <string name="bolusrequested">Werde %1$.2fU abgeben</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU erfolgreich abgegeben</string>
+    <string name="bolusdelivering">Gebe %1$.2fU ab</string>
    <string name="smscommunicator_remotecommandsallowed">Erlaube externe Befehle per SMS</string>
    <string name="glucosetype_finger">Finger</string>
    <string name="glucosetype_sensor">Sensor</string>
@ -336,11 +340,24 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate</string>
    <string name="valuelimitedto">%1$.2f limitiert auf %2$.2f</string>
    <string name="valueoutofrange" formatted="false">Wert %1$s ist außerhalb des festen Limits.</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$.2fU/h für %2$d Minuten zu setzen, antworte mit dem Code %3$s</string>
+    <string name="smscommunicator_profilereplywithcode">Um das Profil auf %1$s %2$d%% zu setzen, antworte mit dem Code %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Um den erweiterten Bolus %1$.2fU für %2$d Minuten abzugeben, 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_tempbasalset">TBR mit %1$.2f IE/h für %2$d min wurde erfolgreich gestartet.</string>
+    <string name="smscommunicator_extendedset">Der erweiterte Bolus %1$.2fU für %2$d Minuten wurde erfolgreich gestartet</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_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_unknowncommand">Unbekannter Befehl oder falsche Antwort</string>
    <string name="quickwizard">QuickWizard</string>
    <string name="quickwizardsettings">QuickWizard-Einstellungen</string>
    <string name="overview_editquickwizard_buttontext">Schaltflächen-Text:</string>
@ -1072,6 +1089,7 @@ Unerwartetes Verhalten.</string>
    <string name="mute_alert">Stumm</string>
    <string name="pump_alert">Pumpenalarm</string>
    <string name="log_site_changes">Katheterwechsel protokollieren</string>
+    <string name="log_reservoir_changes">Reservoirwechsel aufzeichnen</string>
    <string name="log_tube_changes">Schlauchwechsel protokollieren</string>
    <string name="log_battery_changes">Batteriewechsel protokollieren</string>
    <string name="log_operating_mode_changes">Wechsel des Betriebsmodus protokollieren</string>
@ -1133,8 +1151,13 @@ Unerwartetes Verhalten.</string>
    <string name="tomato">Tomato (MiaoMiao)</string>
    <string name="tomato_short">Tomato</string>
    <string name="dst_in_24h_warning">Zeitumstellung in weniger als 24 Stunden</string>
+    <string name="dst_loop_disabled_warning">Zeitumstellung vor weniger als 3 Stunden - Closed Loop deaktiviert</string>
    <string name="storage">interne Speicherbegrenzung</string>
    <string name="diskfull">Mindestens %1$d MB freier interer Speicher benötigt! Loop abgeschaltet!</string>
+    <string name="wrongformat">Falsches Format</string>
+    <string name="sms_wrongcode">Falscher Code. Befehl wurde abgebrochen.</string>
+    <string name="notconfigured">Nicht konfiguriert</string>
+    <string name="profileswitchcreated">Profilwechsel wurde erstellt</string>
    <plurals name="objective_days">
        <item quantity="one">%1$d Tag</item>
        <item quantity="other">%1$d Tage</item>
--- a/app/src/main/res/values-el/insight_alert_codes.xml
+++ b/app/src/main/res/values-el/insight_alert_codes.xml
@ -1,3 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="alert_r1_code">Υπενθύμιση R1</string>
+    <string name="alert_r2_code">Υπενθύμιση R2</string>
+    <string name="alert_r3_code">Υπενθύμιση R3</string>
+    <string name="alert_r4_code">Υπενθύμιση R4</string>
+    <string name="alert_r7_code">Υπενθύμιση R7</string>
+    <string name="alert_w31_code">Προειδοποίηση W31</string>
+    <string name="alert_w32_code">Προειδοποίηση W32</string>
+    <string name="alert_w33_code">Προειδοποίηση W33</string>
+    <string name="alert_w34_code">Προειδοποίηση W34</string>
+    <string name="alert_w36_code">Προειδοποίηση W36</string>
+    <string name="alert_w38_code">Προειδοποίηση W38</string>
+    <string name="alert_w39_code">Προειδοποίηση W39</string>
+    <string name="alert_m20_code">Συντήρηση M20</string>
+    <string name="alert_m21_code">Συντήρηση M21</string>
+    <string name="alert_m22_code">Συντήρηση M22</string>
+    <string name="alert_m23_code">Συντήρηση M23</string>
+    <string name="alert_m24_code">Συντήρηση M24</string>
+    <string name="alert_m25_code">Συντήρηση M25</string>
+    <string name="alert_m26_code">Συντήρηση M26</string>
+    <string name="alert_m27_code">Συντήρηση M27</string>
+    <string name="alert_m28_code">Συντήρηση M28</string>
+    <string name="alert_m29_code">Συντήρηση M29</string>
+    <string name="alert_m30_code">Συντήρηση M30</string>
+    <string name="alert_e6_code">Σφάλμα E6</string>
+    <string name="alert_e10_code">Σφάλμα E10</string>
+    <string name="alert_e13_code">Σφάλμα E13</string>
+</resources>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -44,6 +44,8 @@
    <string name="description_sensitivity_oref1">Η ευαισθησία υπολογίζεται από 8h δεδομένα στο παρελθόν και οι υδατάνθρακες (αν δεν έχουν απορροφηθεί) κόβονται μετά από χρονικό διάστημα που καθορίζεται στις επιλογές. Η προσθήκη υπολογίζει ακόμα το UAM.</string>
    <string name="description_sensitivity_weighted_average">Η ευαισθησία υπολογίζεται ως ο σταθμισμένος μέσος όρος των αποκλίσεων. Νεότερες αποκλίσεις έχουν μεγαλύτερο βάρος. Η ελάχιστη απορρόφηση υδατανθράκων υπολογίζεται από τον χρόνο της μέγιστης απορρόφησης υδατανθράκων από τις επιλογές. Αυτός ο αλγόριθμος είναι ο πιο γρήγορος για να ακολουθεί τις αλλαγές της ευαισθησίας.</string>
    <string name="description_source_dexcom_g5">Λάβετε τις τιμές BG από την εφαρμογή του Dexcom G5.</string>
+    <string name="description_source_dexcom_g6">Λάβετε τις τιμές BG από την εφαρμογή του Dexcom G6.</string>
+    <string name="description_source_eversense">Λάβετε τις τιμές BG από την εφαρμογή του Eversense.</string>
    <string name="description_source_glimp">Λάβετε τις τιμές BG από το Glimp.</string>
    <string name="description_source_mm640g">Λάβετε τις τιμές BG από το 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Λήψη δεδομένων BG από Nightscout</string>
@ -52,6 +54,7 @@
    <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="objectives_button_back">Πίσω</string>
    <string name="objectives_button_start">Έναρξη</string>
    <string name="objectives_button_verify">Επικύρωση</string>
    <string name="nsprofileview_units_label">Μονάδες</string>
@ -263,6 +266,10 @@
    <string name="smscommunicator_bolusreplywithcode">Για έγχυση bolus %1$.2fU στείλτε με κωδικό %2$s</string>
    <string name="smscommunicator_calibrationreplywithcode">Για αποστολή καλιμπραρίσματος %1$.2f στείλτε με κωδικό %2$s</string>
    <string name="smscommunicator_bolusfailed">Αποτυχία Bolus</string>
+    <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>
@ -332,11 +339,24 @@
    <string name="valuelimitedto">Το %1$.2f περιορίζεται σε %2$.2f</string>
    <string name="valueoutofrange" formatted="false">Η τιμή %s είναι έξω από τα όρια</string>
    <string name="smscommunicator_remotecommandnotallowed">Δεν επιτρέπεται απομακρυσμένη εντολή</string>
+    <string name="smscommunicator_remotebolusnotallowed">Απομακρυσμένο bolus μη διαθέσιμο. Δοκιμάστε ξανά αργότερα.</string>
+    <string name="smscommunicator_basalreplywithcode">Για έναρξη βασικού %1$.2fU/h για %2$d λεπτά στείλτε κωδικό %3$s</string>
+    <string name="smscommunicator_profilereplywithcode">Για αλλαγή προφίλ σε %1$s %2$d% στείλτε κωδικό %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Για έναρξη εκτεταμένου bolus %1$.2fU για %2$d λεπτά στείλτε κωδικό %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_tempbasalset">Προσωρινός Ρυθμός %1$.2fU/h για %2$d λεπτά ξεκίνησε επιτυχώς</string>
+    <string name="smscommunicator_extendedset">Εκτεταμένο bolus %1$.2fU για %2$d λεπτά ξεκίνησε επιτυχώς</string>
+    <string name="smscommunicator_tempbasalset_percent">Προσωρινός Ρυθμός %1$d%% για %2$d λεπτά ξεκίνησε επιτυχώς</string>
    <string name="smscommunicator_tempbasalfailed">Εκκίνηση Προσωρινού Ρυθμού απέτυχε</string>
+    <string name="smscommunicator_extendedfailed">Έναρξη εκτεταμένου bolus απέτυχε</string>
+    <string name="smscommunicator_basalstopreplywithcode">Για κλείσιμο Προσωρινού Ρυθμού στείλτε κωδικό %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Για κλείσιμο Εκτεταμένου bolus στείλτε κωδικό %1$s</string>
    <string name="smscommunicator_tempbasalcanceled">Ο Προσωρινός Ρυθμός ακυρώθηκε</string>
+    <string name="smscommunicator_extendedcanceled">Εκτεταμένο bolus ακυρώθηκε</string>
    <string name="smscommunicator_tempbasalcancelfailed">Ακύρωση Προσωρινού Ρυθμού απέτυχε</string>
+    <string name="smscommunicator_extendedcancelfailed">Η ακύρωση του Εκτεταμένου bolus απέτυχε</string>
+    <string name="smscommunicator_unknowncommand">Άγνωστη εντολή ή λάθος απάντηση</string>
    <string name="quickwizard">Γρήγορος Οδηγός</string>
    <string name="quickwizardsettings">Ρυθμίσεις Γρήγορου Οδηγού</string>
    <string name="overview_editquickwizard_buttontext">Κείμενο στο πλήκτρο:</string>
@ -399,6 +419,7 @@
    <string name="array_of_elements">Πεδίο %1$d Στοιχεία.\nΤρέχουσα τιμή:</string>
    <string name="openapsma_autosensdata_label">Δεδομένα Autosens</string>
    <string name="openapsma_scriptdebugdata_label">Εντοπισμός σφαλμάτων δέσμης ενεργειών</string>
+    <string name="openapsama_useautosens">Χρήση του Autosens</string>
    <string name="refresheventsfromnightscout">Ανανέωσε συμβάντα από NS</string>
    <string name="deletefuturetreatments">Διαγραφή συμβάντων στο μέλλον</string>
    <string name="eatingsoon">Γεύμα Σύντομα</string>
@ -539,6 +560,12 @@
    <string name="insulin_shortname">INS</string>
    <string name="enablesuperbolus">Ενεργοποίηση superbolus στον σύντομο οδηγό</string>
    <string name="enablesuperbolus_summary">Ενεργοποιήστε την λειτουργία superbolus στον σύντομο οδηγό. Μην το κάνετε μέχρι να μάθετε τι ακριβώς κάνει. ΜΠΟΡΕΙ ΝΑ ΕΓΧΥΣΕΙ ΠΑΡΑΠΑΝΩ ΔΟΣΕΙΣ ΙΝΣΟΥΛΙΝΗΣ ΑΝ ΧΡΗΣΙΜΟΠΟΙΗΘΕΙ ΛΑΝΘΑΣΜΕΝΑ!</string>
+    <string name="show_statuslights">Εμφάνιση του φωτισμού κατάστασης στην αρχική οθόνη</string>
+    <string name="show_statuslights_summary">Ενεργοποίηση του φωτισμού κατάστασης για cage, iage, sage, reservoir και επίπεδο μπεταρίας στην αρχική οθόνη.</string>
+    <string name="statuslights_res_warning">Όριο προειδοποίησης χαμηλής αμπούλας [U]</string>
+    <string name="statuslights_res_critical">Όριο προειδοποίησης πολύ χαμηλής αμπούλας [U]</string>
+    <string name="statuslights_bat_warning">Όριο προειδοποίησης χαμηλής μπαταρίας [%]</string>
+    <string name="statuslights_bat_critical">Όριο προειδοποίησης πολύ χαμηλής μπαταρίας [%]</string>
    <string name="iob">IOB</string>
    <string name="cob">COB</string>
    <string name="virtualpump_firmware_label">Έκδοση</string>
@ -546,6 +573,7 @@
    <string name="danar_bluetooth_status">Κατάσταση Bluetooth</string>
    <string name="nav_about">Σχετικά με</string>
    <string name="smscommunicator_missingsmspermission">Απουσία δικαιωμάτων SMS</string>
+    <string name="smscommunicator_missingphonestatepermission">Λείπει η άδεια κατάστασης τηλεφώνου</string>
    <string name="xdripstatus_settings">Κατάσταση xDrip (ρολόι)</string>
    <string name="xdripstatus">Γραμμή Κατάστασης xDrip (ρολόι)</string>
    <string name="xdripstatus_shortname">xds</string>
@ -692,7 +720,10 @@
    <string name="btwatchdog_title">BT Watchdog</string>
    <string name="btwatchdog_summary">Απενεργοποιεί το bluetooth του τηλεφώνου για ένα δευτερόλεπτο αν δεν είναι δυνατή η σύνδεση με την αντλία. Αυτό μπορεί να βοηθήσει σε ορισμένα τηλέφωνα όπου το bluetooth παγώνει.</string>
    <string name="DexcomG5">Εφαρμογή DexcomG5 (τροποποιημένη)</string>
+    <string name="DexcomG6">DexcomG6 App (τροποποιημένη)</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>
@ -758,6 +789,7 @@
    <string name="combo_error_bolus_verification_failed">Η έγχυση του bolus και η επαλήθευση του ιστορικού αντλίας απέτυχε, ελέγξτε την αντλία. Εάν έχει γίνει έγχυση bolus, θα προστεθεί στις θεραπείες κατά την επόμενη σύνδεση με την αντλία.</string>
    <string name="combo_reservoir_level_insufficient_for_bolus">Δεν υπάρχει αρκετή ινσουλίνη στην αμπούλα για το bolus</string>
    <string name="extendedbolusdeliveryerror">Σφάλμα έγχυσης εκτεταμένου bolus</string>
+    <string name="insightpump_shortname">Sight</string>
    <string name="insightpump">Αντλία Insight</string>
    <string name="status_no_colon">Κατάσταση</string>
    <string name="changed">Τροποποίηση</string>
@ -832,6 +864,7 @@
    <string name="data_choices">Επιλογές δεδομένων</string>
    <string name="fabric_upload">Αποστολή δεδομένων στο εργοστάσιο</string>
    <string name="allow_automated_crash_reporting">Να επιτρέπεται η αυτόματη αποστολή αναφορών σφάλματος και χαρακτηριστικά χρήσης δεδομένων στους προγραμματιστές μέσω του fabric.io. service.</string>
+    <string name="g5appnotdetected">Ενημερώστε την εφαρμογή G5 στην υποστηριζόμενη έκδοση</string>
    <string name="start_activity_tt">Εκκίνηση δραστηριότητας TT</string>
    <string name="start_eating_soon_tt">Εκκίνηση Τρώω σύντομα ΤΤ</string>
    <string name="temptargetshort">TT</string>
@ -874,6 +907,8 @@
    <string name="closedmodedisabledinpreferences">Το κλειστό κύκλωμα είναι απενεργοποιημένο στις Επιλογές</string>
    <string name="autosensdisabledinpreferences">Το Autosens είναι απενεργοποιημένο στις Επιλογές</string>
    <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>
@ -995,6 +1030,7 @@
    <string name="nth_objective">%1$d. Στόχος</string>
    <string name="poctech">Poctech</string>
    <string name="description_source_poctech">Λάβετε τις τιμές BG από την εφαρμογή Poctech</string>
+    <string name="description_source_tomato">Λάβετε τιμές BG από Tomato app (MiaoMiao)</string>
    <string name="high_temptarget_raises_sensitivity_title">Ο υψηλός προσωρινός στόχος ανεβάζει την ευαισθησία</string>
    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Αύξηση ευαισθησίας για προσωρινό στόχο > = 100]]></string>
    <string name="low_temptarget_lowers_sensitivity_title">Ο χαμηλός προσωρινός στόχος μειώνει την ευαισθησία</string>
@ -1036,6 +1072,90 @@
    <string name="insulinlimitviolation">Υπέρβαση του ορίου ινσουλίνης</string>
    <string name="loop_openmode_min_change">Ελάχιστο αίτημα για αλλαγή [%]</string>
    <string name="loop_openmode_min_change_summary">Το κύκλωμα δημιουργεί μια νέα αίτηση αλλαγής μόνο αν η αλλαγή είναι μεγαλύτερη από αυτήν την τιμή. Η προεπιλεγμένη τιμή είναι 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>
+    <string name="insight_local">Accu-Chek Insight</string>
+    <string name="insight_delivered">%1$.2fU / %2$.2fU παραδόθηκε</string>
+    <string name="insight_alert_formatter">%1$s: %2$s</string>
+    <string name="tube_changed">Σωληνάκι αλλάχθηκε</string>
+    <string name="pump_time_updated">Η ώρα στην αντλία άλλαξε</string>
+    <string name="confirm">Επιβεβαίωση</string>
+    <string name="mute_alert">Σίγαση</string>
+    <string name="pump_alert">Συναγερμός αντλίας</string>
+    <string name="log_site_changes">Αλλαγές αρχείου καταγραφής</string>
+    <string name="log_reservoir_changes">Αλλαγές αρχείου αμπούλας</string>
+    <string name="log_tube_changes">Αλλαγές αρχείου σωλήνα</string>
+    <string name="log_battery_changes">Αλλαγές αρχείου μπαταρίας</string>
+    <string name="log_operating_mode_changes">Αλλαγές αρχείου κατάστασης λειτουργίας</string>
+    <string name="log_alerts">Τοπικές Ειδοποιήσεις</string>
+    <string name="enable_tbr_emulation">Ενεργοποίηση εξομοίωσης TBR</string>
+    <string name="enable_tbr_emulation_summary">Χρησιμοποιείστε εκτεταμένα bolus αντί για TBR για παράκαμψη του ορίου 250%</string>
+    <string name="disconnect_delay">Αποσυνδέστε καθυστέρηση [s]</string>
+    <string name="serial_number">Serial number</string>
+    <string name="release_software_version">Απελευθέρωση έκδοση λογισμικού</string>
+    <string name="ui_processor_software_version">Έκδοση λογισμικού επεξεργαστή UI</string>
+    <string name="pc_processor_software_version">Έκδοση λογισμικού επεξεργαστή PC</string>
+    <string name="md_tel_processor_software_version">Έκδοση λογισμικού επεξεργαστή MD tel</string>
+    <string name="safety_processor_software_version">Έκδοση λογισμικού ασφαλείας επεξεργαστή</string>
+    <string name="bt_info_page_version">Έκδοση σελίδας πληροφοριών BT</string>
+    <string name="bluetooth_address">Διεύθυνση Bluetooth</string>
+    <string name="system_id_appendix">Σύστημα ID προσάρτημα</string>
+    <string name="manufacturing_date">Ημερομηνία κατασκευής</string>
+    <string name="delete_pairing">Διαγραφή σύζευξης</string>
+    <string name="pairing_information">Πληροφορίεςσύζευξης</string>
+    <string name="refreh_status">Ανανέωση κατάστασης</string>
+    <string name="start_pump">Έναρξη αντλίας</string>
+    <string name="stop_pump">Διακοπή αντλίας</string>
+    <string name="operating_mode">Κατάσταση λειτουργίας</string>
+    <string name="insight_status">Κατάσταση</string>
+    <string name="tdd_bolus">TDD Bolus</string>
+    <string name="tdd_basal">TDD βασικός</string>
+    <string name="tdd_total">TDD σύνολο</string>
+    <string name="recovering">Ανάκτηση</string>
+    <string name="not_paired">Μη σύζευξη</string>
+    <string name="last_connected">Τελευταία σύνδεση</string>
+    <string name="started">Ξεκίνησε</string>
+    <string name="stopped">Σταμάτησε</string>
+    <string name="tbr_formatter">%1$d%% για %2$d / %3$d λεπτά</string>
+    <string name="extended_bolus">Εκτεταμένο bolus</string>
+    <string name="multiwave_bolus">Συνδυαστικό bolus</string>
+    <string name="eb_formatter">%1$.2f / %2$.2f U για %3$d λεπτά</string>
+    <string name="enable_tbr_over_notification">Ενεργοποίηση ειδοποίησης TBR τέλος\n (ρύθμιση αντλίας)</string>
+    <string name="disable_tbr_over_notification">Απενεργοποίηση ειδοποίησης TBR τέλος\n (ρύθμιση αντλίας)</string>
+    <string name="refresh">Ανανέωση</string>
+    <string name="description_pump_insight_local">Ενσωμάτωση αντλίας για αντλίες Accu-Chek Insight</string>
+    <string name="not_inserted">Δεν έχει εισαχθεί</string>
+    <string name="short_status_last_connected">Τελευταία σύνδεση: %1$d λεπτά πριν</string>
+    <string name="short_status_tbr">TBR: %1$d%% για %2$d / %3$d λεπτά</string>
+    <string name="short_status_extended">Εκτεταμένο: %1$.2f / %2$.2f U για %3$d λεπτά</string>
+    <string name="short_status_multiwave">Συνδυαστικό: %1$.2f / %2$.2f U για %3$d λεπτά</string>
+    <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">Αμπούλα:%1$.2fU</string>
+    <string name="short_status_battery">Μπατ.:%1$d%%</string>
+    <string name="max_recovery_duration">Μέγ. διάρκεια αποκατάστασης [s]</string>
+    <string name="min_recovery_duration">Ελάχ. διάρκεια αποκατάστασης [s]</string>
+    <string name="recovery_duration">Διάρκεια αποκατάστασης</string>
+    <string name="timeout_during_handshake">Τέλος χρόνου κατά τη διάρκεια handshake - επαναφορά bluetooth</string>
+    <string name="profile_total">== ∑  %1$s U</string>
+    <string name="profile_ins_units_per_hout">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="dst_in_24h_warning">Αλλαγή σε Θερινή ώρα σε 24h ή λιγότερο</string>
+    <string name="dst_loop_disabled_warning">Η Θερινή ώρα αλλάζει σε λιγότερο από 3 ώρες - Απενεργοποιήθηκε το κλειστό κύκλωμα</string>
+    <string name="storage">περιορισμός εσωτερικής μνήμης</string>
+    <string name="diskfull">Ελευθερώστε τουλάχιστον %1$d MB από εσωτερική μνήμη! Κύκλωμα απενεργοποιήθηκε!</string>
+    <string name="wrongformat">Λάθος μορφή αρχείου</string>
+    <string name="sms_wrongcode">Λάθος κωδικός. Η εντολή ακυρώθηκε.</string>
+    <string name="notconfigured">Δεν έχει ρυθμιστεί</string>
+    <string name="profileswitchcreated">Δημιουργήθηκε αλλαγή προφίλ</string>
    <plurals name="objective_days">
        <item quantity="one">%1$d ημέρα</item>
        <item quantity="other">%1$d ημέρες</item>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-    <string name="treatmentssafety_title">Seguridad de tratamientos</string>
-    <string name="treatmentssafety_maxbolus_title">Máximo Bolo permitido [U]</string>
    <string name="treatmentssafety_maxcarbs_title">Máximos carbohidratos permitidos [g]</string>
    <string name="nav_preferences">Preferencias</string>
    <string name="nav_refreshtreatments">Actualizar los tratamientos desde NS</string>
@ -1129,6 +1127,7 @@
    <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="storage">restricción de almacenamiento interno</string>
    <plurals name="objective_days">
        <item quantity="one">%1$d día</item>
        <item quantity="other">%1$d días</item>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -1088,6 +1088,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="mute_alert">Coupure son</string>
    <string name="pump_alert">Alerte de la pompe</string>
    <string name="log_site_changes">Enreg. changement de site</string>
+    <string name="log_reservoir_changes">Enregistrer changements de réservoir</string>
    <string name="log_tube_changes">Enreg. changement de tubulure</string>
    <string name="log_battery_changes">Enreg. changement batterie</string>
    <string name="log_operating_mode_changes">Enreg. changement mode de fonctionnement</string>
@ -1149,6 +1150,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="tomato">Tomato (MiaoMiao)</string>
    <string name="tomato_short">Tomato</string>
    <string name="dst_in_24h_warning">Changement d\'heure d\'été dans moins de 24 heures</string>
+    <string name="dst_loop_disabled_warning">Changement d\'heure d\'été dans moins de 3 heures - Boucle fermée désactivée</string>
    <string name="storage">stockage interne limité</string>
    <string name="diskfull">Boucle désactivée ! Libérez au moins %1$d Mo du stockage interne !</string>
    <string name="wrongformat">Format incorrect</string>
--- a/app/src/main/res/values-lt/insight_alert_codes.xml
+++ b/app/src/main/res/values-lt/insight_alert_codes.xml
@ -1,3 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="alert_r1_code">Priminimas R1</string>
+    <string name="alert_r2_code">Priminimas R2</string>
+    <string name="alert_r3_code">Priminimas R3</string>
+    <string name="alert_r4_code">Priminimas R4</string>
+    <string name="alert_r7_code">Priminimas R7</string>
+    <string name="alert_w31_code">Įspėjimas W31</string>
+    <string name="alert_w32_code">Įspėjimas W32</string>
+    <string name="alert_w33_code">Įspėjimas W33</string>
+    <string name="alert_w34_code">Įspėjimas W34</string>
+    <string name="alert_w36_code">Įspėjimas W36</string>
+    <string name="alert_w38_code">Įspėjimas W38</string>
+    <string name="alert_w39_code">Įspėjimas W39</string>
+    <string name="alert_m20_code">Servisas M20</string>
+    <string name="alert_m21_code">Servisas M21</string>
+    <string name="alert_m22_code">Servisas M22</string>
+    <string name="alert_m23_code">Servisas M23</string>
+    <string name="alert_m24_code">Servisas M24</string>
+    <string name="alert_m25_code">Servisas M25</string>
+    <string name="alert_m26_code">Servisas M26</string>
+    <string name="alert_m27_code">Servisas M27</string>
+    <string name="alert_m28_code">Servisas M28</string>
+    <string name="alert_m29_code">Servisas M29</string>
+    <string name="alert_m30_code">Servisas M30</string>
+    <string name="alert_e6_code">Klaida E6</string>
+    <string name="alert_e10_code">Klaida E10</string>
+    <string name="alert_e13_code">Klaida E13</string>
+</resources>
--- a/app/src/main/res/values-lt/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-lt/insight_alert_descriptions.xml
@ -1,3 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="alert_r7_description"><![CDATA[Kiekis: <b>%1$d%%</b>\nTrukmė: <b>%2$s h</b>]]></string>
+    <string name="alert_w31_description"><![CDATA[Rezervuaro tūris: <b>%1$s U</b>]]></string>
+    <string name="alert_w32_description">Pakeiskite bateriją.</string>
+    <string name="alert_w33_description">Nustatykite laiką/datą.</string>
+    <string name="alert_w34_description">Kreipkitės į Accu-Chek palaikymo tarnybą.</string>
+    <string name="alert_w36_description"><![CDATA[Kiekis: <b>%1$d%%</b><br/>Trukmė: <b>%2$s h</b>]]></string>
+    <string name="alert_w38_description"><![CDATA[Suprogramuota: <b>%1$s U</b><br/>Suleista: <b>%2$s U</b>]]></string>
+    <string name="alert_m20_description">Įdėkite rezervuarą.</string>
+    <string name="alert_m21_description">Pakeiskite rezervuarą.</string>
+    <string name="alert_m22_description">Pakeiskite bateriją.</string>
+    <string name="alert_m23_description">Patikrinkite pompos būseną.</string>
+    <string name="alert_m24_description">Pakeiskite infuzijos rinkinį.</string>
+    <string name="alert_m25_description">Kreipkitės į Accu-Chek palaikymo tarnybą.</string>
+    <string name="alert_m26_description">Pakeiskite rezervuarą.</string>
+    <string name="alert_m27_description">Iš naujo paleiskite duomenų atsisiuntimą.</string>
+    <string name="alert_m28_description">Patikrinkite pompos būseną.</string>
+    <string name="alert_m29_description">Nustatykite baterijos tipą.</string>
+    <string name="alert_m30_description">Nustatykite rezervuaro tipą.</string>
+    <string name="alert_e6_description">Pakeiskite bateriją ir rezervuarą.</string>
+    <string name="alert_e10_description">Pakeiskite rezervuarą.</string>
+    <string name="alert_e13_description">Pakeiskite kalbą.</string>
+</resources>
--- a/app/src/main/res/values-lt/insight_alert_titles.xml
+++ b/app/src/main/res/values-lt/insight_alert_titles.xml
@ -1,3 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="alert_r1_title">Suleisti bolusą</string>
+    <string name="alert_r2_title">Praleistas bolusas</string>
+    <string name="alert_r3_title">Žadintuvas</string>
+    <string name="alert_r4_title">Keisti infuzijos rinkinį</string>
+    <string name="alert_r7_title">LBD baigtas</string>
+    <string name="alert_w31_title">Mažai insulino rezervuare</string>
+    <string name="alert_w32_title">Baterija senka</string>
+    <string name="alert_w33_title">Netinkamas laikas/data</string>
+    <string name="alert_w34_title">Garantija pasibaigė</string>
+    <string name="alert_w36_title">LBD atšauktas</string>
+    <string name="alert_w38_title">Bolusas atšauktas</string>
+    <string name="alert_w39_title">Eksploatacijos laikas artėja prie pabaigos</string>
+    <string name="alert_m20_title">Rezervuaras neįdėtas</string>
+    <string name="alert_m21_title">Rezervuaras tuščias</string>
+    <string name="alert_m22_title">Baterija tuščia</string>
+    <string name="alert_m23_title">Automatinis išjungimas - pompa sustabdyta</string>
+    <string name="alert_m24_title">Užsikimšimas</string>
+    <string name="alert_m25_title">Eksploatacijos laikas pasibaigė</string>
+    <string name="alert_m26_title">Rezervuaro keitimas neužbaigtas</string>
+    <string name="alert_m27_title">Atsisiųsti nepavyko</string>
+    <string name="alert_m28_title">Pristabdymo laikas baigėsi</string>
+    <string name="alert_m29_title">Baterijos tipas nenustatytas</string>
+    <string name="alert_m30_title">Rezervuaro tipas nenustatytas</string>
+    <string name="alert_e6_title">Mechaninė klaida</string>
+    <string name="alert_e10_title">Stūmoklio grąžinimo klaida</string>
+    <string name="alert_e13_title">Kalbos klaida</string>
+</resources>
--- a/app/src/main/res/values-lt/insight_exceptions.xml
+++ b/app/src/main/res/values-lt/insight_exceptions.xml
@ -1,3 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="connection_failed">Prisijungti nepavyko</string>
+    <string name="connection_lost">Nutrūko ryšys</string>
+    <string name="pairing_rejected">Susiejimas atmestas</string>
+    <string name="socket_creation_failed">Jungtis nesukurta</string>
+    <string name="timeout">Laukimo laikas viršytas</string>
+    <string name="maximum_number_of_bolus_type_already_running">Maksimalus bolusų tipų skaičius aktyvus</string>
+    <string name="no_active_tbr_to_cancel">Nėra aktyvaus LBD, kurį būtų galima atšaukti</string>
+    <string name="no_active_tbr_to_change">Nėra aktyvaus LBD, kurį būtų galima pakeisti</string>
+    <string name="no_such_bolus_to_cancel">Nėra atšaukiamo boliuso</string>
+    <string name="pump_already_in_that_state_exception">Pompa jau šiame režime</string>
+    <string name="run_mode_not_allowed">Veikimo režimas neleidžiamas</string>
+</resources>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -54,6 +54,7 @@
    <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="objectives_button_back">Cofnij</string>
    <string name="objectives_button_start">Start</string>
    <string name="objectives_button_verify">Sprawdź</string>
    <string name="nsprofileview_units_label">Jednostki</string>
@ -265,6 +266,10 @@
    <string name="smscommunicator_bolusreplywithcode">Aby dostarczyć bolus %1$.2fU wprowadź kod %2$s</string>
    <string name="smscommunicator_calibrationreplywithcode">Aby wysłać kalibrację %1$.2f wprowadź kod %2$s</string>
    <string name="smscommunicator_bolusfailed">Bolus nieudany</string>
+    <string name="bolusdelivered">Bolus %1$.2fU dostarczony prawidłowo</string>
+    <string name="bolusrequested">Zamierzam podać %1$.2fU</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU dostarczony prawidłowo</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>
--- a/app/src/main/res/values-pt/insight_alert_titles.xml
+++ b/app/src/main/res/values-pt/insight_alert_titles.xml
@ -12,14 +12,19 @@
    <string name="alert_w34_title">Fora da Garantia</string>
    <string name="alert_w36_title">Basal temporária cancelada</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>
    <string name="alert_m21_title">Cartucho vazio</string>
    <string name="alert_m22_title">Bateria vazia</string>
+    <string name="alert_m23_title">Desligar automático - bomba parada</string>
    <string name="alert_m24_title">Oclusão</string>
+    <string name="alert_m25_title">Fim de período de empréstimo - Fim de operação</string>
    <string name="alert_m26_title">Mudança de Cartucho não concluída</string>
    <string name="alert_m27_title">Falha no download de dados</string>
    <string name="alert_m28_title">Tempo limite de modo de pausa</string>
    <string name="alert_m29_title">Tipo de bateria não definido</string>
    <string name="alert_m30_title">Tipo de Cartucho não definido</string>
    <string name="alert_e6_title">Erro mecânico</string>
+    <string name="alert_e10_title">Erro Rebobinar</string>
    <string name="alert_e13_title">Erro de idioma</string>
 </resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -266,6 +266,10 @@
    <string name="smscommunicator_bolusreplywithcode">Para dar bolus %1$.2fU responder com código %2$s</string>
    <string name="smscommunicator_calibrationreplywithcode">Para enviar calibração %1$.2f responder com código %2$s</string>
    <string name="smscommunicator_bolusfailed">Bólus falhado</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="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>
@ -340,6 +344,8 @@
    <string name="smscommunicator_tempbasalfailed">Início basal temp falhou </string>
    <string name="smscommunicator_tempbasalcanceled">Basal temp cancelada</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_unknowncommand">Comando desconhecido ou resposta errada</string>
    <string name="quickwizard">Assistente Rápido</string>
    <string name="quickwizardsettings">Definições do Assistente Rápido</string>
    <string name="overview_editquickwizard_buttontext">Texto do botão:</string>
@ -1070,19 +1076,23 @@
    <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_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>
    <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_summary">Usar bolus estendidos em vez de TBRs 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>
    <string name="release_software_version">Lançar versão de software</string>
    <string name="ui_processor_software_version">Versão de software do processador de interface do utilizador</string>
    <string name="pc_processor_software_version">Versão do software do processador de PC</string>
    <string name="md_tel_processor_software_version">Versão do software do processador MD tel</string>
    <string name="safety_processor_software_version">Versão de software do processador de segurança</string>
+    <string name="bt_info_page_version">Página de informação da versão do BT</string>
    <string name="bluetooth_address">Endereço Bluetooth</string>
+    <string name="system_id_appendix">Apêndice do ID de sistema</string>
    <string name="manufacturing_date">Data de fabrico</string>
    <string name="delete_pairing">Eliminar emparelhamento</string>
    <string name="pairing_information">Informações de emparelhamento</string>
@ -1103,6 +1113,7 @@
    <string name="extended_bolus">Bólus estendido</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="refresh">Actualizar</string>
    <string name="description_pump_insight_local">Integração de bomba para bombas Accu-Chek Insight</string>
@ -1126,6 +1137,8 @@
    <string name="tomato_short">Tomato</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>
+    <string name="sms_wrongcode">Código errado. Comando cancelado.</string>
    <string name="notconfigured">Não configurado</string>
    <string name="profileswitchcreated">Troca de perfil criada</string>
    <plurals name="objective_days">
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -1089,6 +1089,7 @@ Context | Edit Context</string>
    <string name="mute_alert">Отключить звук</string>
    <string name="pump_alert">Оповещение помпы</string>
    <string name="log_site_changes">Журнал изменений места установки</string>
+    <string name="log_reservoir_changes">Отслеживать замену резервуара</string>
    <string name="log_tube_changes">Журнал замены трубки катетера</string>
    <string name="log_battery_changes">Журнал замен батареи</string>
    <string name="log_operating_mode_changes">Журнал изменений режима работы</string>
@ -1150,6 +1151,7 @@ Context | Edit Context</string>
    <string name="tomato">Томато (MiaoMiao)</string>
    <string name="tomato_short">Томато</string>
    <string name="dst_in_24h_warning">Переход на летнее/зимнее время через 24 часа или менее</string>
+    <string name="dst_loop_disabled_warning">Переход на летнее время меньше 3 часов назад - Замкнутый цикл отключен</string>
    <string name="storage">ограничение по объему карты памяти</string>
    <string name="diskfull">Освободите по крайней мере %1$d MB из внутренней памяти! Цикл остановлен!</string>
    <string name="wrongformat">Неверный формат</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -43,17 +43,18 @@
    <string name="description_sensitivity_oref0">Citlivosť je počítaná za posledných 24h a sacharidy (ak sú ešte nevstrebané), sú orezané po čase definovanom v nastaveniach.</string>
    <string name="description_sensitivity_oref1">Citlivosť je počítaná za posledných 8h a sacharidy (pokiaľ nie sú vstrebané), sú orezané po čase definovanom v nastaveniach. Modul tiež počíta s UAM (neoznámené jedlo).</string>
    <string name="description_sensitivity_weighted_average">Citlivosť je počítaná ako vážený priemer z odchýlok. Novšie majú vyššiu prioritu. Minimálna vstrebateľnosť sacharidov je počítaná dynamicky z maximálnej doby vstrebateľnosti definovanej v nastaveniach. Tento algoritmus je najrýchlejší v sledovaní zmien citlivosti.</string>
-    <string name="description_source_dexcom_g5">Príjmi hodnoty glykémií z upravenej Dexcom G5 aplikácie.</string>
-    <string name="description_source_dexcom_g6">Prijímam glykémie z upravenej Dexcom G6 aplikácie.</string>
-    <string name="description_source_eversense">Prijímam glykémie z upravenej Eversense aplikácie.</string>
-    <string name="description_source_glimp">Príjmi hodnoty glykémií z aplikácie Glimp.</string>
-    <string name="description_source_mm640g">Príjmi hodnoty glykémií z 600SeriesAndroidUploader.</string>
-    <string name="description_source_ns_client">Stiahne hodnoty glykémií z Nightscoutu</string>
-    <string name="description_source_xdrip">Príjmi hodnoty glykémií z xDripu.</string>
+    <string name="description_source_dexcom_g5">Získavať hodnoty glykémií z upravenej Dexcom G5 aplikácie.</string>
+    <string name="description_source_dexcom_g6">Získavať glykémie z upravenej Dexcom G6 aplikácie.</string>
+    <string name="description_source_eversense">Získavať glykémie z upravenej Eversense aplikácie.</string>
+    <string name="description_source_glimp">Získavať hodnoty glykémií z aplikácie Glimp.</string>
+    <string name="description_source_mm640g">Získavať hodnoty glykémií z 600SeriesAndroidUploader.</string>
+    <string name="description_source_ns_client">Získavať hodnoty glykémií z Nightscoutu</string>
+    <string name="description_source_xdrip">Získavať hodnoty glykémií z xDripu.</string>
    <string name="description_treatments">Ukladá všetky ošetrenia do databázy</string>
    <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="objectives_button_back">Naspäť</string>
    <string name="objectives_button_start">Začiatok</string>
    <string name="objectives_button_verify">Overenie</string>
    <string name="nsprofileview_units_label">Jednotky</string>
@ -265,6 +266,10 @@
    <string name="smscommunicator_bolusreplywithcode">Pre podanie bolusu %1$.2fU odpovedz SMS kódom %2$s</string>
    <string name="smscommunicator_calibrationreplywithcode">Pre odoslanie kalibrácie %1$.2f odpovedz SMS kódom %2$s</string>
    <string name="smscommunicator_bolusfailed">Chyba pri aplikovaní bolusu</string>
+    <string name="bolusdelivered">Bolus %1$.2fU podaný úspešne</string>
+    <string name="bolusrequested">Podávanie %1$.2fU inzulínu</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU podaný úspešne</string>
+    <string name="bolusdelivering">Podávanie %1$.2fU</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>
@ -334,11 +339,24 @@
    <string name="valuelimitedto">%1$.2f obmedzené na %2$.2f</string>
    <string name="valueoutofrange" formatted="false">Hodnota %s je mimo prednastavený rozsah</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$.2fU/h na %2$d min odpovedzte SMS s kódom %3$s</string>
+    <string name="smscommunicator_profilereplywithcode">Pre prepnutie profilu na %1$s %2$d%% odpovedzte SMS s kódom %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Pre spustenie predĺženého bolusu %1$.2fU na %2$d min odpovedzte SMS s 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_tempbasalset">Dočasný bazál %1$.2fU/h spustený na %2$d minút</string>
+    <string name="smscommunicator_extendedset">Predĺžený bolus %1$.2fU na %2$d min úspešne spustený</string>
+    <string name="smscommunicator_tempbasalset_percent">Dočasný bazál %1$d%% na %2$d minút úspešne spustený</string>
    <string name="smscommunicator_tempbasalfailed">Spustenie dočasného bazálu zlyhalo</string>
+    <string name="smscommunicator_extendedfailed">Spustenie predĺženého bolusu zlyhalo</string>
+    <string name="smscommunicator_basalstopreplywithcode">Na zastavenie dočasného bazálu odpovedzte SMS s kódom %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Na zastavenie predĺženého bolusu odpovedzte SMS s kódom %1$s</string>
    <string name="smscommunicator_tempbasalcanceled">Dočasný bazál zrušený</string>
+    <string name="smscommunicator_extendedcanceled">Predĺžený bolus zastavený</string>
    <string name="smscommunicator_tempbasalcancelfailed">Zrušenie dočasného bazálu zlyhalo</string>
+    <string name="smscommunicator_extendedcancelfailed">Zastavenie predĺženého bolusu zlyhalo</string>
+    <string name="smscommunicator_unknowncommand">Neznámy príkaz alebo chybná odpoveď</string>
    <string name="quickwizard">Rýchly bolus</string>
    <string name="quickwizardsettings">Nastavenie rýchleho bolusu</string>
    <string name="overview_editquickwizard_buttontext">Text na tlačidle:</string>
@ -543,7 +561,7 @@
    <string name="enablesuperbolus">Povoliť superbolus</string>
    <string name="enablesuperbolus_summary">Povolenie superbolusu v kalkulátore. Nepovoľujte, pokiaľ se nenaučíte, čo to v skutočnosti robí. MÔŽE SPÔSOBIŤ PREDÁVKOVANIE INZULÍNOM PRI NESPRÁVNOM POUŽITÍ!</string>
    <string name="show_statuslights">Zobraziť indikátory stavu na domovskej obrazovke</string>
-    <string name="show_statuslights_summary">Povoliť indikátory stavu pre CAGE, IAGE, SAGE, RESERVOIR a BATTERY LEVEL na domovskej obrazovke.</string>
+    <string name="show_statuslights_summary">Povoliť indikátory stavu pre CAGE, IAGE, SAGE, Reservoir a Battery Level na domovskej obrazovke.</string>
    <string name="statuslights_res_warning">Prah upozornenia na úroveň hladiny zásobníka [U]</string>
    <string name="statuslights_res_critical">Prah kritickej úrovne hladiny zásobníka [U]</string>
    <string name="statuslights_bat_warning">Prah upozornenia na úroveň batérie [%]</string>
@ -1069,6 +1087,7 @@
    <string name="mute_alert">Stlmiť</string>
    <string name="pump_alert">Výstraha pumpy</string>
    <string name="log_site_changes">Zaznamenať výmenu kanyly</string>
+    <string name="log_reservoir_changes">Zaznamenať výmenu zásobníka</string>
    <string name="log_tube_changes">Zaznamenať výmenu hadičky</string>
    <string name="log_battery_changes">Zaznamenať výmenu batérie</string>
    <string name="log_operating_mode_changes">Zaznamenať zmenu režimu prevádzky</string>
@ -1129,6 +1148,14 @@
    <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="dst_in_24h_warning">Zmena letného času za menej ako 24 hodín</string>
+    <string name="dst_loop_disabled_warning">Zmena letného času za menej ako 3 hodiny - Uzavretý okruh pozastavený</string>
+    <string name="storage">obmedzenie interného úložiska</string>
+    <string name="diskfull">Uvoľnite aspoň %1$d MB z interného úložiska! Uzavretý okruh zakázaný!</string>
+    <string name="wrongformat">Chybný formát</string>
+    <string name="sms_wrongcode">Nesprávný kód. Príkaz zrušený.</string>
+    <string name="notconfigured">Nie je nakonfigurované</string>
+    <string name="profileswitchcreated">Prepnutie profilu vytvorené</string>
    <plurals name="objective_days">
        <item quantity="one">%1$d deň</item>
        <item quantity="few">%1$d dní</item>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -1253,6 +1253,7 @@
    <string name="mute_alert">Mute</string>
    <string name="pump_alert">Pump alert</string>
    <string name="log_site_changes">Log site changes</string>
+    <string name="log_reservoir_changes">Log reservoir changes</string>
    <string name="log_tube_changes">Log tube changes</string>
    <string name="log_battery_changes">Log battery changes</string>
    <string name="log_operating_mode_changes">Log operating mode changes</string>
@ -1319,7 +1320,7 @@
    <string name="key_smbmaxminutes" translatable="false">smbmaxminutes</string>
    <string name="dst_plugin_name" translatable="false">Dayligh Saving time</string>
    <string name="dst_in_24h_warning">Dayligh Saving time change in 24h or less</string>
-    <string name="dst_loop_disabled_warning">Dayligh Saving time change less than 3 hours ago - Closed loop diabled</string>
+    <string name="dst_loop_disabled_warning">Daylight saving time change less than 3 hours ago - Closed loop disabled</string>
    <string name="storage">internal storage constraint</string>
    <string name="diskfull">Free at least %1$d MB from internal storage! Loop disabled!</string>
    <string name="wrongformat">Wrong format</string>
--- a/app/src/main/res/xml/pref_insight_local.xml
+++ b/app/src/main/res/xml/pref_insight_local.xml
@ -10,14 +10,19 @@

        <SwitchPreference
            android:defaultValue="false"
-            android:key="insight_log_site_changes"
-            android:title="@string/log_site_changes" />
+            android:key="insight_log_reservoir_changes"
+            android:title="@string/log_reservoir_changes" />

        <SwitchPreference
            android:defaultValue="false"
            android:key="insight_log_tube_changes"
            android:title="@string/log_tube_changes" />

+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="insight_log_site_changes"
+            android:title="@string/log_site_changes" />
+
        <SwitchPreference
            android:defaultValue="false"
            android:key="insight_log_battery_changes"
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@ -85,17 +85,24 @@
            android:summary="@string/enableuam_summary"
            android:title="@string/enableuam" />

+
+        <!-- TODO AS-FIX -->
        <SwitchPreference
            android:defaultValue="false"
            android:key="@string/key_high_temptarget_raises_sensitivity"
            android:summary="@string/high_temptarget_raises_sensitivity_summary"
-            android:title="@string/high_temptarget_raises_sensitivity_title" />
+            android:title="@string/high_temptarget_raises_sensitivity_title"
+            android:enabled="false"
+            />

+        <!-- TODO AS-FIX -->
        <SwitchPreference
            android:defaultValue="false"
            android:key="@string/key_low_temptarget_lowers_sensitivity"
            android:summary="@string/low_temptarget_lowers_sensitivity_summary"
-            android:title="@string/low_temptarget_lowers_sensitivity_title" />
+            android:title="@string/low_temptarget_lowers_sensitivity_title"
+            android:enabled="false"
+            />

        <PreferenceScreen android:title="@string/advancedsettings_title">

--- a/app/src/test/java/info/nightscout/androidaps/data/GlucoseStatusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/data/GlucoseStatusTest.java
@ -51,7 +51,6 @@ public class GlucoseStatusTest {
        when(iobCobCalculatorPlugin.getBgReadings()).thenReturn(generateValidBgData());

        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-
        Assert.assertEquals(214d, glucoseStatus.glucose, 0.001d);
        Assert.assertEquals(-2d, glucoseStatus.delta, 0.001d);
        Assert.assertEquals(-2.5d, glucoseStatus.short_avgdelta, 0.001d); // -2 -2.5 -3 deltas are relative to current value
@ -65,13 +64,12 @@ public class GlucoseStatusTest {
        when(iobCobCalculatorPlugin.getBgReadings()).thenReturn(generateMostRecentBgData());

        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-
        Assert.assertEquals(215d, glucoseStatus.glucose, 0.001d); // (214+216) / 2
-        Assert.assertEquals(-1.25d, glucoseStatus.delta, 0.001d);
-        Assert.assertEquals(-1.25d, glucoseStatus.short_avgdelta, 0.001d);
-        Assert.assertEquals(-1.25d, glucoseStatus.avgdelta, 0.001d);
+        Assert.assertEquals(-1.0d, glucoseStatus.delta, 0.001d);
+        Assert.assertEquals(-1.0d, glucoseStatus.short_avgdelta, 0.001d);
+        Assert.assertEquals(-1.0d, glucoseStatus.avgdelta, 0.001d);
        Assert.assertEquals(0d, glucoseStatus.long_avgdelta, 0.001d);
-        Assert.assertEquals(1514766850000L, glucoseStatus.date); // date is average too
+        Assert.assertEquals(1514766900000L, glucoseStatus.date); // latest date, even when averaging
    }

    @Test
@ -117,6 +115,20 @@ public class GlucoseStatusTest {
        Assert.assertEquals(0d, GlucoseStatus.average(new ArrayList<>()), 0.001d);
    }

+    @Test
+    public void calculateGlucoseStatusForLibreTestBgData() {
+        when(iobCobCalculatorPlugin.getBgReadings()).thenReturn(generateLibreTestData());
+
+        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+
+        Assert.assertEquals(100d, glucoseStatus.glucose, 0.001d); //
+        Assert.assertEquals(-10d, glucoseStatus.delta, 0.001d);
+        Assert.assertEquals(-10d, glucoseStatus.short_avgdelta, 0.001d);
+        Assert.assertEquals(-10d, glucoseStatus.avgdelta, 0.001d);
+        Assert.assertEquals(-10d, glucoseStatus.long_avgdelta, 0.001d);
+        Assert.assertEquals(1514766900000L, glucoseStatus.date); // latest date
+    }
+
    @Before
    public void initMocking() {
        AAPSMocker.mockMainApp();
@ -184,4 +196,25 @@ public class GlucoseStatusTest {
        }
        return list;
    }
+    List<BgReading> generateLibreTestData() {
+        List<BgReading> list = new ArrayList<>();
+        try {
+            long end_time = 1514766900000L;
+            double latest_reading = 100d;
+            // Now
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":" + (latest_reading) + ",\"mills\":" + (end_time) + ",\"direction\":\"Flat\"}"))));
+            // One minute ago
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":" + (latest_reading) + ",\"mills\":" + (end_time - (1000 * 60 * 1)) + ",\"direction\":\"Flat\"}"))));
+            // Two minutes ago
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":" + (latest_reading) + ",\"mills\":" + (end_time - (1000 * 60 * 2)) + ",\"direction\":\"Flat\"}"))));
+
+            // Three minutes and beyond at constant rate
+            for (int i=3; i < 50; i++) {
+                list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":" + (latest_reading + (i*2)) + ",\"mills\":" + (end_time - (1000 * 60 * i)) + ",\"direction\":\"Flat\"}"))));
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
 }
--- a/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.java
@ -77,10 +77,12 @@ public class DateUtilTest {
        assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("32"));
    }

+    /*
    @Test
    public void timeStringFromSecondsTest() {
        Assert.assertEquals("1:00 AM", DateUtil.timeStringFromSeconds((int) T.hours(1).secs()));
    }
+    */

    @Test
    public void timeFrameStringTest() {