diff --git a/app/build.gradle b/app/build.gradle
index d9a9bd6df7..b755fd8fe2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,6 +70,27 @@ def generateDate = { ->
     return stringBuilder.toString()
 }
 
+def isMaster = { ->
+    return !version.contains('-')
+}
+
+def allCommited = { ->
+    StringBuilder stringBuilder = new StringBuilder();
+    try {
+        def stdout = new ByteArrayOutputStream()
+        exec {
+            commandLine 'git', 'status', '-s'
+            standardOutput = stdout
+        }
+        String commitObject = stdout.toString().trim()
+        stringBuilder.append(commitObject)
+    } catch (ignored) {
+        return false; // NoGitSystemAvailable
+    }
+    return stringBuilder.toString().isEmpty()
+
+}
+
 tasks.matching { it instanceof Test }.all {
     testLogging.events = ["failed", "skipped", "started"]
     testLogging.exceptionFormat = "full"
@@ -83,10 +104,10 @@ android {
         targetSdkVersion 25
         multiDexEnabled true
         versionCode 1500
-        version "2.2.3-dev"
+        version "2.3.1-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
-        buildConfigField "String", "REMOTE", '"' + generateGitRemote()+ '"'
+        buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
         buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         // if you change minSdkVersion to less than 11, you need to change executeTask for wear
@@ -126,7 +147,7 @@ android {
             resValue "string", "app_name", "AndroidAPS"
             versionName version
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_launcher",
+                    appIcon     : "@mipmap/ic_launcher",
                     appIconRound: "@mipmap/ic_launcher_round"
             ]
         }
@@ -136,7 +157,7 @@ android {
             resValue "string", "app_name", "Pumpcontrol"
             versionName version + "-pumpcontrol"
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_pumpcontrol",
+                    appIcon     : "@mipmap/ic_pumpcontrol",
                     appIconRound: "@null"
             ]
         }
@@ -146,7 +167,7 @@ android {
             resValue "string", "app_name", "NSClient"
             versionName version + "-nsclient"
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_yellowowl",
+                    appIcon     : "@mipmap/ic_yellowowl",
                     appIconRound: "@null"
             ]
         }
@@ -156,7 +177,7 @@ android {
             resValue "string", "app_name", "NSClient2"
             versionName version + "-nsclient"
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_yellowowl",
+                    appIcon     : "@mipmap/ic_yellowowl",
                     appIconRound: "@null"
             ]
         }
@@ -171,7 +192,7 @@ android {
         unitTests.includeAndroidResources = true
     }
 
-    useLibrary  "org.apache.http.legacy"
+    useLibrary "org.apache.http.legacy"
 }
 
 allprojects {
@@ -285,3 +306,12 @@ task full_clean(type: Delete) {
 
 clean.dependsOn full_clean
 preBuild.dependsOn copyLibs
+
+printf('--------------\n')
+printf('isMaster: %s\n', isMaster().toString())
+printf('allCommited: %s\n', allCommited().toString())
+printf('--------------\n')
+if (isMaster() && !allCommited()) {
+    throw new GradleException('There are uncommitted changes or git system is not available. Clone sources again as described in wiki and do not allow gradle update')
+}
+
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index 31d462a007..6779b0a467 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -120,7 +120,7 @@ public class MainActivity extends AppCompatActivity {
 
         //Check here if loop plugin is disabled. Else check via constraints
         if (!LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))
-            VersionCheckerUtilsKt.checkVersion();
+            VersionCheckerUtilsKt.triggerCheckVersion();
 
         FabricPrivacy.setUserStats();
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 99d042ca13..25f55cd364 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -90,6 +90,8 @@ import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import io.fabric.sdk.android.Fabric;
 
+import static info.nightscout.androidaps.plugins.general.versionChecker.VersionCheckerUtilsKt.triggerCheckVersion;
+
 
 public class MainApp extends Application {
     private static Logger log = LoggerFactory.getLogger(L.CORE);
@@ -150,6 +152,9 @@ public class MainApp extends Application {
 
         registerLocalBroadcastReceiver();
 
+        //trigger here to see the new version on app start after an update
+        triggerCheckVersion();
+
         if (pluginsList == null) {
             pluginsList = new ArrayList<>();
             // Register all tabs in app here
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
index c6ea0eaeb6..1056cf440f 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
@@ -94,7 +94,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
             } else if (editTextPref.getText() != null) {
                 ((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage());
                 pref.setSummary(editTextPref.getText());
-            } else if (pref.getKey().contains("smscommunicator_allowednumbers") && TextUtils.isEmpty(editTextPref.getText().trim())) {
+            } else if (pref.getKey().contains("smscommunicator_allowednumbers") && (editTextPref.getText() == null || TextUtils.isEmpty(editTextPref.getText().trim()))) {
                 pref.setSummary(MainApp.gs(R.string.smscommunicator_allowednumbers_summary));
             }
         }
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 1b2c21bf18..eb51f5e2ba 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -45,9 +45,9 @@ import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRNSHistorySync;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID;
@@ -83,7 +83,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     public static final String DATABASE_INSIGHT_BOLUS_IDS = "InsightBolusIDs";
     public static final String DATABASE_INSIGHT_PUMP_IDS = "InsightPumpIDs";
 
-    private static final int DATABASE_VERSION = 10;
+    private static final int DATABASE_VERSION = 11;
 
     public static Long earliestDataChange = null;
 
@@ -147,19 +147,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             this.oldVersion = oldVersion;
             this.newVersion = newVersion;
 
-            if (oldVersion == 7 && newVersion == 8) {
-                log.debug("Upgrading database from v7 to v8");
-            } else if (oldVersion == 8 && newVersion == 9) {
-                log.debug("Upgrading database from v8 to v9");
-            } else if (oldVersion == 9 && newVersion == 10) {
-                TableUtils.createTableIfNotExists(connectionSource, InsightHistoryOffset.class);
-                TableUtils.createTableIfNotExists(connectionSource, InsightBolusID.class);
-                TableUtils.createTableIfNotExists(connectionSource, InsightPumpID.class);
-                database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " +
-                        "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_BOLUS_IDS + "\")");
-                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 + "\")");
-            } else {
+            if (oldVersion < 7) {
                 log.info(DatabaseHelper.class.getName(), "onUpgrade");
                 TableUtils.dropTable(connectionSource, TempTarget.class, true);
                 TableUtils.dropTable(connectionSource, BgReading.class, true);
@@ -170,6 +158,17 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 TableUtils.dropTable(connectionSource, CareportalEvent.class, true);
                 TableUtils.dropTable(connectionSource, ProfileSwitch.class, true);
                 onCreate(database, connectionSource);
+            } else if (oldVersion < 10) {
+                TableUtils.createTableIfNotExists(connectionSource, InsightHistoryOffset.class);
+                TableUtils.createTableIfNotExists(connectionSource, InsightBolusID.class);
+                TableUtils.createTableIfNotExists(connectionSource, InsightPumpID.class);
+                database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " +
+                        "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_BOLUS_IDS + "\")");
+                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 + "\")");
+            } else if (oldVersion < 11) {
+                database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DATABASE_INSIGHT_BOLUS_IDS + "\"");
+                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);
@@ -435,7 +434,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             return null;
 
         for (int i = 0; i < bgList.size(); i++)
-            if (bgList.get(i).value > 39)
+            if (bgList.get(i).value >= 39)
                 return bgList.get(i);
         return null;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerPlugin.kt
index 7be99e2369..c0335ea64a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerPlugin.kt
@@ -23,7 +23,7 @@ object VersionCheckerPlugin : PluginBase(PluginDescription()
 
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         checkWarning()
-        checkUpdate()
+        triggerCheckVersion()
         return if (isOldVersion(GRACE_PERIOD_VERY_OLD))
             value.set(false, MainApp.gs(R.string.very_old_version), this)
         else
@@ -32,32 +32,26 @@ object VersionCheckerPlugin : PluginBase(PluginDescription()
 
     private fun checkWarning() {
         val now = System.currentTimeMillis()
+        
+        if (!SP.contains(R.string.key_last_versionchecker_plugin_warning)) {
+            SP.putLong(R.string.key_last_versionchecker_plugin_warning, now)
+            return
+        }
+
+
         if (isOldVersion(GRACE_PERIOD_WARNING) && shouldWarnAgain(now)) {
             // store last notification time
-            SP.putLong(R.string.key_last_versionchecker_warning, now)
+            SP.putLong(R.string.key_last_versionchecker_plugin_warning, now)
 
             //notify
-            val message = MainApp.gs(R.string.new_version_warning, Math.round(now / TimeUnit.DAYS.toMillis(1).toDouble()))
+            val message = MainApp.gs(R.string.new_version_warning, Math.round((now - SP.getLong(R.string.key_last_time_this_version_detected, now)) / TimeUnit.DAYS.toMillis(1).toDouble()))
             val notification = Notification(Notification.OLDVERSION, message, Notification.NORMAL)
             MainApp.bus().post(EventNewNotification(notification))
         }
     }
 
-    private fun checkUpdate() {
-        val now = System.currentTimeMillis()
-        if (shouldCheckVersionAgain(now)) {
-            // store last notification time
-            SP.putLong(R.string.key_last_versioncheck, now)
-
-            checkVersion()
-        }
-    }
-
-    private fun shouldCheckVersionAgain(now: Long) =
-            now > SP.getLong(R.string.key_last_versioncheck, 0) + CHECK_EVERY
-
     private fun shouldWarnAgain(now: Long) =
-            now > SP.getLong(R.string.key_last_versionchecker_warning, 0) + WARN_EVERY
+            now > SP.getLong(R.string.key_last_versionchecker_plugin_warning, 0) + WARN_EVERY
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> =
             if (isOldVersion(GRACE_PERIOD_OLD))
@@ -67,10 +61,9 @@ object VersionCheckerPlugin : PluginBase(PluginDescription()
 
     private fun isOldVersion(gracePeriod: Long): Boolean {
         val now = System.currentTimeMillis()
-        return      now > SP.getLong(R.string.key_new_version_available_since, 0) + gracePeriod
+        return      now > SP.getLong(R.string.key_last_time_this_version_detected, 0) + gracePeriod
     }
 
-    val CHECK_EVERY = TimeUnit.DAYS.toMillis(1)
     val WARN_EVERY = TimeUnit.DAYS.toMillis(1)
     val GRACE_PERIOD_WARNING = TimeUnit.DAYS.toMillis(30)
     val GRACE_PERIOD_OLD = TimeUnit.DAYS.toMillis(60)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtils.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtils.kt
index b8cfa7fffc..8791030abb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtils.kt
@@ -15,6 +15,7 @@ import org.apache.http.impl.client.DefaultHttpClient
 import org.slf4j.LoggerFactory
 import java.io.IOException
 import java.io.InputStream
+import java.util.concurrent.TimeUnit
 
 // check network connection
 fun isConnected(): Boolean {
@@ -35,8 +36,22 @@ inline fun InputStream.findVersion(): String? {
 
 private val log = LoggerFactory.getLogger(L.CORE)
 
+
+fun triggerCheckVersion() {
+
+    if(!SP.contains(R.string.key_last_time_this_version_detected)) {
+        // On a new installation, set it as 30 days old in order to warn that there is a new version.
+        SP.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30))
+    }
+
+    // If we are good, only check once every day.
+    if(System.currentTimeMillis() > SP.getLong(R.string.key_last_time_this_version_detected, 0) + CHECK_EVERY){
+        checkVersion()
+    }
+}
+
 @Suppress("DEPRECATION")
-fun checkVersion() = if (isConnected()) {
+private fun checkVersion() = if (isConnected()) {
     Thread {
         try {
             val request = HttpGet("https://raw.githubusercontent.com/MilosKozak/AndroidAPS/master/app/build.gradle")
@@ -56,12 +71,17 @@ fun compareWithCurrentVersion(newVersion: String?, currentVersion: String) {
         comparison == null -> onVersionNotDetectable()
         comparison == 0 -> onSameVersionDetected()
         comparison > 0 -> onNewVersionDetected(currentVersion = currentVersion, newVersion = newVersion)
-        else -> log.debug("Version newer than master. Are you developer?")
+        else -> onOlderVersionDetected()
     }
 }
 
+private fun onOlderVersionDetected() {
+    log.debug("Version newer than master. Are you developer?")
+    SP.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis())
+}
+
 fun onSameVersionDetected() {
-    SP.remove(R.string.key_new_version_available_since)
+    SP.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis())
 }
 
 fun onVersionNotDetectable() {
@@ -69,10 +89,13 @@ fun onVersionNotDetectable() {
 }
 
 fun onNewVersionDetected(currentVersion: String, newVersion: String?) {
-    log.debug("Version ${currentVersion} outdated. Found $newVersion")
-    val notification = Notification(Notification.NEWVERSIONDETECTED, String.format(MainApp.gs(R.string.versionavailable), newVersion.toString()), Notification.LOW)
-    MainApp.bus().post(EventNewNotification(notification))
-    SP.putLong(R.string.key_new_version_available_since, System.currentTimeMillis())
+    val now = System.currentTimeMillis()
+    if(now > SP.getLong(R.string.key_last_versionchecker_warning, 0) + WARN_EVERY) {
+        log.debug("Version ${currentVersion} outdated. Found $newVersion")
+        val notification = Notification(Notification.NEWVERSIONDETECTED, String.format(MainApp.gs(R.string.versionavailable), newVersion.toString()), Notification.LOW)
+        MainApp.bus().post(EventNewNotification(notification))
+        SP.putLong(R.string.key_last_versionchecker_warning, now)
+    }
 }
 
 fun String.versionStrip() = this.mapNotNull {
@@ -81,4 +104,8 @@ fun String.versionStrip() = this.mapNotNull {
         '.' -> it
         else -> null
     }
-}.joinToString(separator = "")
\ No newline at end of file
+}.joinToString(separator = "")
+
+
+val CHECK_EVERY = TimeUnit.DAYS.toMillis(1)
+val WARN_EVERY = TimeUnit.DAYS.toMillis(1)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
index 7ea52ed271..13fd698236 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
@@ -160,20 +160,25 @@ public class InsightPairingActivity extends AppCompatActivity implements Insight
     private void startBLScan() {
         if (!scanning) {
             BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-            if (!bluetoothAdapter.isEnabled()) bluetoothAdapter.enable();
-            IntentFilter intentFilter = new IntentFilter();
-            intentFilter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
-            intentFilter.addAction(BluetoothDevice.ACTION_FOUND);
-            registerReceiver(broadcastReceiver, intentFilter);
-            bluetoothAdapter.startDiscovery();
-            scanning = true;
+            if (bluetoothAdapter != null) {
+                if (!bluetoothAdapter.isEnabled()) bluetoothAdapter.enable();
+                IntentFilter intentFilter = new IntentFilter();
+                intentFilter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
+                intentFilter.addAction(BluetoothDevice.ACTION_FOUND);
+                registerReceiver(broadcastReceiver, intentFilter);
+                bluetoothAdapter.startDiscovery();
+                scanning = true;
+            }
         }
     }
 
     private void stopBLScan() {
         if (scanning) {
             unregisterReceiver(broadcastReceiver);
-            BluetoothAdapter.getDefaultAdapter().cancelDiscovery();
+            BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+            if (bluetoothAdapter != null) {
+                bluetoothAdapter.cancelDiscovery();
+            }
             scanning = false;
         }
     }
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 7bb4774911..502b7f38b7 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
@@ -190,8 +190,9 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         }
         // prepare task for execution in 1 sec
         // cancel waiting task to prevent sending multiple posts
-        if (callback.getPost() != null)
-            callback.getPost().cancel(false);
+        ScheduledFuture<?> scheduledFuture =  callback.getPost();
+        if (scheduledFuture != null)
+            scheduledFuture.cancel(false);
         Runnable task = new PostRunnable();
         final int sec = 1;
         callback.setPost(eventWorker.schedule(task, sec, TimeUnit.SECONDS));
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
index e4fbacc43c..7928435ed0 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
@@ -12,6 +12,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.LinkedList;
 
+import javax.annotation.Nullable;
+
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
@@ -143,11 +145,11 @@ public class CommandQueue {
         return queue.size();
     }
 
-    public Command performing() {
+    Command performing() {
         return performing;
     }
 
-    public void resetPerforming() {
+    void resetPerforming() {
         performing = null;
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
index 0962952221..a7e106c042 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
@@ -141,15 +141,17 @@ public class QueueThread extends Thread {
                     // Pickup 1st command and set performing variable
                     if (queue.size() > 0) {
                         queue.pickup();
-                        if (L.isEnabled(L.PUMPQUEUE))
-                            log.debug("performing " + queue.performing().status());
-                        MainApp.bus().post(new EventQueueChanged());
-                        queue.performing().execute();
-                        queue.resetPerforming();
-                        MainApp.bus().post(new EventQueueChanged());
-                        lastCommandTime = System.currentTimeMillis();
-                        SystemClock.sleep(100);
-                        continue;
+                        if (queue.performing() != null) {
+                            if (L.isEnabled(L.PUMPQUEUE))
+                                log.debug("performing " + queue.performing().status());
+                            MainApp.bus().post(new EventQueueChanged());
+                            queue.performing().execute();
+                            queue.resetPerforming();
+                            MainApp.bus().post(new EventQueueChanged());
+                            lastCommandTime = System.currentTimeMillis();
+                            SystemClock.sleep(100);
+                            continue;
+                        }
                     }
                 }
 
@@ -173,7 +175,7 @@ public class QueueThread extends Thread {
                 }
             }
         } finally {
-            if (mWakeLock != null)
+            if (mWakeLock != null && mWakeLock.isHeld())
                 mWakeLock.release();
             if (L.isEnabled(L.PUMPQUEUE))
                 log.debug("thread end");
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 1200a8e2e3..a0a0048ca1 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -147,8 +147,6 @@
     <string name="constraints_violation">Beperkings skending</string>
     <string name="treatmentdeliveryerror">Bolus aflewering fout</string>
     <string name="tempbasaldeliveryerror">Tempbasal aflewering fout</string>
-    <string name="overview_newtempbasal_basalpercent">Basale waarde [%]</string>
-    <string name="overview_newtempbasal_percent_label">% (100% =huidig)</string>
     <string name="setbasalquestion">Aanvaar nuwe tydelike basale:</string>
     <string name="overview_treatment_label">Behandeling</string>
     <string name="overview_calculator_label">Rekenaar</string>
@@ -248,7 +246,6 @@
     <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">%.1fh gelede</string>
     <string name="danar_invalidinput">Ongeldige invoer</string>
     <string name="danar_valuenotsetproperly">Waarde nie behoorlik gestel</string>
     <string name="reloadprofile">Herlaai profiel</string>
@@ -528,7 +525,6 @@
     <string name="resistantadult">Insulien weerstandige volwasse</string>
     <string name="patientage_summary">Kies asseblief pasiënt ouderdom om veiligheids limiete te stel</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s benodig battery optimisering whitelisting vir behoorlike prestasie</string>
     <string name="loopsuspended">Lus opgeskort</string>
     <string name="loopsuspendedfor">Opgeskort (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d m)</string>
@@ -564,8 +560,6 @@
     <string name="show_statuslights_summary">Wys status vlae vir cage, iage, sage, stoor en battery vlak op tuisskerm.</string>
     <string name="statuslights_res_warning">Drempel waarskuwings stoor vlak [U]</string>
     <string name="statuslights_res_critical">Drempel kritieke stoor vlak [U]</string>
-    <string name="statuslights_bat_warning">Drempel waarskuwing battery vlak [%]</string>
-    <string name="statuslights_bat_critical">Drempel kritieke battery vlak [%]</string>
     <string name="iob">IAB</string>
     <string name="cob">KOB</string>
     <string name="virtualpump_firmware_label">Firmware</string>
@@ -764,7 +758,6 @@
     <string name="combo_pump_state_running">Loop tans</string>
     <string name="combo_pump_action_cancelling_tbr">Kanselleer TBR</string>
     <string name="combo_pump_action_setting_tbr">Stel TBR (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Bolusing (%.1f U)</string>
     <string name="combo_pump_action_refreshing">Verfris</string>
     <string name="combo_pump_unsupported_operation">Versoekte bewerking nie ondersteun deur pomp</string>
     <string name="combo_low_suspend_forced_notification">Onveilige gebruik: uitgebreide of multigolf boluses is aktief. Lus modus is gestel om laag te opskort net 6 ure. Net gewone boluses is ondersteun in lus modus</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 61b87d0f13..8453a50ffe 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -147,8 +147,8 @@
     <string name="constraints_violation">Нарушено ограничение</string>
     <string name="treatmentdeliveryerror">Грешка при подаване на болус</string>
     <string name="tempbasaldeliveryerror">Грешка при подаване на временен базал</string>
-    <string name="overview_newtempbasal_basalpercent">Стойност на базал [%]</string>
-    <string name="overview_newtempbasal_percent_label">% (100% = текущ)</string>
+    <string name="overview_newtempbasal_basalpercent">Базална стойност [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = текущ)</string>
     <string name="setbasalquestion">Приложи нов временен базал:</string>
     <string name="overview_treatment_label">Болус</string>
     <string name="overview_calculator_label">Калкулатор</string>
@@ -248,7 +248,7 @@
     <string name="danar_iob_label">IOB на помпата</string>
     <string name="danar_dailyunits">Инсулин за деня</string>
     <string name="pump_lastbolus_label">Последен болус:</string>
-    <string name="hoursago">преди %.1fч</string>
+    <string name="hoursago">преди %1$.1fч</string>
     <string name="danar_invalidinput">Грешни входящи данни</string>
     <string name="danar_valuenotsetproperly">Неправилна стойност</string>
     <string name="reloadprofile">Презареди профил</string>
@@ -528,7 +528,7 @@
     <string name="resistantadult">Възрастни с голяма инсулинова резистентност</string>
     <string name="patientage_summary">Изберете възраст за определяне лимитите на безопасност</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s се нуждае от зключване на оптимизиране на батерията за пълна функционалност</string>
+    <string name="needwhitelisting">%1$s се нуждае от изключване от списъка за оптимизиране на батерията за пълна функционалност</string>
     <string name="loopsuspended">Loop изключен</string>
     <string name="loopsuspendedfor">Изключен (%1$d мин)</string>
     <string name="loopsuperbolusfor">Суперболус (%1$d мин)</string>
@@ -564,8 +564,8 @@
     <string name="show_statuslights_summary">Покажи статус светлини за канула, инсулин, сензор, резервоар и батерията на началния екран.</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="statuslights_bat_warning">Ниско ниво на батерията под [%%]</string>
+    <string name="statuslights_bat_critical">Критично ниво на батерията под [%%]</string>
     <string name="iob">IOB</string>
     <string name="cob">СОВ</string>
     <string name="virtualpump_firmware_label">Фърмуер</string>
@@ -764,7 +764,7 @@
     <string name="combo_pump_state_running">Изпълнява</string>
     <string name="combo_pump_action_cancelling_tbr">Отказва временен базал</string>
     <string name="combo_pump_action_setting_tbr">Задава временен базал (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Болус (%.1f U)</string>
+    <string name="combo_pump_action_bolusing">Болус (%1$.1f Е)</string>
     <string name="combo_pump_action_refreshing">Обновява</string>
     <string name="combo_pump_unsupported_operation">Исканата операция не се поддържа от помпата</string>
     <string name="combo_low_suspend_forced_notification">Опасно използване: удължени или многовълнови болуси са активни. Помпата  е изключена за само 6 часа. Само нормални болуси се поддържат.</string>
@@ -1156,6 +1156,10 @@
     <string name="sms_wrongcode">Грешен код. Командата не е изпълнена.</string>
     <string name="notconfigured">Не е конфигуриран</string>
     <string name="profileswitchcreated">Създаден запис - Промяна на профил</string>
+    <string name="versionChecker">Проверка на версията</string>
+    <string name="old_version">стара версия</string>
+    <string name="very_old_version">много стара версия</string>
+    <string name="new_version_warning">Има нова версия от най-малко %1$d дни! Връщане към LGS след 60 дни, цикълът ще бъде изключен след 90 дни</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d дeн</item>
         <item quantity="other">%1$d дни</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 61864568d3..96a66c5b8b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -147,8 +147,8 @@
     <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="overview_newtempbasal_percent_label">% (100% = současný)</string>
+    <string name="overview_newtempbasal_basalpercent">Hodnota bazálu [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = současný)</string>
     <string name="setbasalquestion">Spustit nový dočasný bazál:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Kalkulačka</string>
@@ -248,7 +248,7 @@
     <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 %.1fh</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>
@@ -528,7 +528,7 @@
     <string name="resistantadult">Dospělý s nízkou citlivostí</string>
     <string name="patientage_summary">Vyberte věk pacienta pro nastavení bezpečnostních limitů</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s potřebuje vypnout optimalizace baterie pro optimální výkon</string>
+    <string name="needwhitelisting">%1$s potřebuje vypnout optimalizace baterie pro optimální výkon</string>
     <string name="loopsuspended">Smyčka pozastavena</string>
     <string name="loopsuspendedfor">Pozastaveno (%1$d min)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d m)</string>
@@ -564,8 +564,8 @@
     <string name="show_statuslights_summary">Povolte stavové indikátory pro stáří kanyly, inzulínu, senzoru, zásobníku a baterie na domovské obrazovce.</string>
     <string name="statuslights_res_warning">Úroveň varování stavu zásobníku [U]</string>
     <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="statuslights_bat_warning">Úroveň varování stavu baterie [%%]</string>
+    <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>
@@ -764,7 +764,7 @@
     <string name="combo_pump_state_running">Běží</string>
     <string name="combo_pump_action_cancelling_tbr">Rušení dočasného bazálu</string>
     <string name="combo_pump_action_setting_tbr">Nastavování doč. bazálu (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Bolus (%.1f U)</string>
+    <string name="combo_pump_action_bolusing">Bolus (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Obnovování</string>
     <string name="combo_pump_unsupported_operation">Požadovaná operace není pumpou podporována</string>
     <string name="combo_low_suspend_forced_notification">Nebezpečné použití: extended nebo multiwave bolus je aktivní. Pumpa byla vypnuta jen na 6 hodin. Povolené jsou pouze normální bolusy.</string>
@@ -1156,6 +1156,10 @@
     <string name="sms_wrongcode">Nesprávný kód. Příkaz zrušen.</string>
     <string name="notconfigured">Není nakonfigurováno</string>
     <string name="profileswitchcreated">Přepnutí profilu vytvořeno</string>
+    <string name="versionChecker">Kontrola verze</string>
+    <string name="old_version">stará verze</string>
+    <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 60 dnech, vypnutí smyčky po 90 dnech</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d den</item>
         <item quantity="few">%1$d dnů</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ed46e6a8ea..2d0a15d6ac 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -147,8 +147,8 @@
     <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="overview_newtempbasal_percent_label">% (100% = aktuell)</string>
+    <string name="overview_newtempbasal_basalpercent">Basal-Wert [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = aktuell)</string>
     <string name="setbasalquestion">Akzeptiere neue TBR:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Rechner</string>
@@ -248,7 +248,7 @@
     <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 %.1f h</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>
@@ -529,7 +529,7 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate</string>
     <string name="resistantadult">Insulinresistenter Erwachsener</string>
     <string name="patientage_summary">Bitte wähle das Patientenalter, um die Sicherheits-Limits festzulegen</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s benötigt eine deaktivierte Akku-Leistungsoptimierung, um korrekt arbeiten zu können.</string>
+    <string name="needwhitelisting">%1$s benötigt eine deaktivierte Akku-Leistungsoptimierung, um korrekt arbeiten zu können.</string>
     <string name="loopsuspended">Loop pausiert</string>
     <string name="loopsuspendedfor">Pausiert (%1$d min)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d m)</string>
@@ -565,8 +565,8 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate</string>
     <string name="show_statuslights_summary">Statusanzeige für CAGE, IAGE, SAGE, Reservoir- und Batteriestand auf dem Homescreen.</string>
     <string name="statuslights_res_warning">Warnschwelle Reservoirstand [IE]</string>
     <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="statuslights_bat_warning">Warnschwelle Batteriestand [%%]</string>
+    <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>
@@ -1158,6 +1158,10 @@ Unerwartetes Verhalten.</string>
     <string name="sms_wrongcode">Falscher Code. Befehl wurde abgebrochen.</string>
     <string name="notconfigured">Nicht konfiguriert</string>
     <string name="profileswitchcreated">Profilwechsel wurde erstellt</string>
+    <string name="versionChecker">Versionsprüfer</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 60 Tagen, Loop wird nach 90 Tagen deaktiviert</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d Tag</item>
         <item quantity="other">%1$d Tage</item>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 155afd10d0..9872c77080 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -147,8 +147,8 @@
     <string name="constraints_violation">Παραβίαση Περιορισμών</string>
     <string name="treatmentdeliveryerror">Σφάλμα παράδοσης Bolus</string>
     <string name="tempbasaldeliveryerror">Σφάλμα παράδοσης Προσ Ρυθμού</string>
-    <string name="overview_newtempbasal_basalpercent">Τιμή Βασικού [%]</string>
-    <string name="overview_newtempbasal_percent_label">% (100% = τρέχων)</string>
+    <string name="overview_newtempbasal_basalpercent">Τιμή Βασικού [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = τρέχων)</string>
     <string name="setbasalquestion">Αποδοχή νέου Προσ Ρυθμού:</string>
     <string name="overview_treatment_label">Θεραπεία</string>
     <string name="overview_calculator_label">Υπολογιστής</string>
@@ -248,7 +248,7 @@
     <string name="danar_iob_label">IOB αντλίας</string>
     <string name="danar_dailyunits">Μονάδες ανά ημέρα </string>
     <string name="pump_lastbolus_label">Τελευταίο Bolus:</string>
-    <string name="hoursago">πριν από %.1fh</string>
+    <string name="hoursago">%1$.1fώρες πριν</string>
     <string name="danar_invalidinput">Μη έγκυρα δεδομένα</string>
     <string name="danar_valuenotsetproperly">Η τιμή δεν μπήκε σωστά</string>
     <string name="reloadprofile">Ξαναφορτώστε το προφίλ</string>
@@ -528,7 +528,7 @@
     <string name="resistantadult">Αντίσταση ινσουλίνης ενηλίκων</string>
     <string name="patientage_summary">Παρακαλώ επιλέξτε ηλικία χρήστη για να ορισθούν όρια ασφαλείας</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">Το %s πρέπει να απενεργοποιήσει τη βελτιστοποίηση της μπαταρίας για βέλτιστη απόδοση</string>
+    <string name="needwhitelisting">%1$s χρειάζεται λίστα βελτιστοποίησης μπαταρίας για σωστή απόδοση</string>
     <string name="loopsuspended">Κύκλωμα σε αναστολή</string>
     <string name="loopsuspendedfor">Αναστολή (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d m)</string>
@@ -564,8 +564,8 @@
     <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="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>
@@ -764,7 +764,7 @@
     <string name="combo_pump_state_running">Εκτελείτε</string>
     <string name="combo_pump_action_cancelling_tbr">Ακυρώνεται TBR</string>
     <string name="combo_pump_action_setting_tbr">Ρύθμιση TBR (%1$d%% / %2$d λεπτά)</string>
-    <string name="combo_pump_action_bolusing">Bolus (%.1f U)</string>
+    <string name="combo_pump_action_bolusing">Bolus (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Ανανέωση</string>
     <string name="combo_pump_unsupported_operation">Η λειτουργία που ζητήθηκε δεν υποστηρίζεται από την αντλία</string>
     <string name="combo_low_suspend_forced_notification">Επικίνδυνη χρήση: Εκτεταμένο ή πολλαπλά bolus είναι ενεργό. Το κύκλωμα απενεργοποιήθηκε λόγω low-suspend μόνο για 6 ώρες. Επιτρέπονται μόνο κανονικά bolus</string>
@@ -1156,6 +1156,10 @@
     <string name="sms_wrongcode">Λάθος κωδικός. Η εντολή ακυρώθηκε.</string>
     <string name="notconfigured">Δεν έχει ρυθμιστεί</string>
     <string name="profileswitchcreated">Δημιουργήθηκε αλλαγή προφίλ</string>
+    <string name="versionChecker">Έλεγχος Έκδοσης</string>
+    <string name="old_version">παλιά έκδοση</string>
+    <string name="very_old_version">πολύ παλιά έκδοση</string>
+    <string name="new_version_warning">Νέα έκδοση για τουλάχιστον %1$d ημέρες διαθέσιμη! Επιστροφή σε LGS μετά από 60 ημέρες, το κύκλωμα θα απενεργοποιηθεί μετά από 90 ημέρες</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d ημέρα</item>
         <item quantity="other">%1$d ημέρες</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9d800ccc59..93d2498e5a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -143,8 +143,6 @@
     <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="overview_newtempbasal_percent_label">% (100% = actual)</string>
     <string name="setbasalquestion">Aceptar nueva basal temporal:</string>
     <string name="overview_treatment_label">Tratamiento</string>
     <string name="overview_calculator_label">Calculadora</string>
@@ -244,7 +242,6 @@
     <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 %.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>
@@ -503,7 +500,6 @@
     <string name="resistantadult">Adulto resistente a la insulina</string>
     <string name="patientage_summary">Por favor elige la edad del paciente para ajustar los límites de seguridad</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s necesita optimización de batería lista blanca para funcionar bien</string>
     <string name="loopsuspended">Loop desactivado</string>
     <string name="loopsuspendedfor">Desactivado (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolo (%1$d m)</string>
@@ -539,8 +535,6 @@
     <string name="show_statuslights_summary">Habilitar las luces de estado para tiempo de la canula, tiempo de la insulina, tiempo del sensor y nivel de bateria en la pantalla de inicio.</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="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="virtualpump_firmware_label">Firmware</string>
@@ -734,7 +728,6 @@
     <string name="combo_pump_state_running">Funcionando</string>
     <string name="combo_pump_action_cancelling_tbr">Cancelando TBR</string>
     <string name="combo_pump_action_setting_tbr">Poniendo TBR (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Emitiendo bolo (%.1f U)</string>
     <string name="combo_pump_action_refreshing">Actualizando</string>
     <string name="combo_pump_unsupported_operation">Acción requerida no disponible por la bomba</string>
     <string name="combo_low_suspend_forced_notification">Uso inseguro: bolo extendido o multionda activo. El modo del lazo ha sido fijado a sólo suspensión en baja glucosa durante 6 horas. En modo lazo sólo se soportan los bolo estándar.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0b5ef3c187..0ae7423e5d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -147,8 +147,8 @@
     <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="overview_newtempbasal_percent_label">% (100% = actuel)</string>
+    <string name="overview_newtempbasal_basalpercent">Valeur de Basal [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = actuel)</string>
     <string name="setbasalquestion">Accepter nouveau basal temporaire :</string>
     <string name="overview_treatment_label">Traitement</string>
     <string name="overview_calculator_label">Calculatrice</string>
@@ -249,7 +249,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <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">%.1fh passées</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>
@@ -529,7 +529,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="resistantadult">Adulte résistant à l\'insuline</string>
     <string name="patientage_summary">Veuillez svp sélectionner l’âge du patient pour définir les limites de sécurité</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s a besoin de la liste blanche de l’optimisation batterie pour une bonne performance</string>
+    <string name="needwhitelisting">%1$s a besoin d\'optimisation de la batterie (whitelisting) pour une performance correcte</string>
     <string name="loopsuspended">La Boucle est suspendue</string>
     <string name="loopsuspendedfor">Suspendu (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d m)</string>
@@ -565,8 +565,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="show_statuslights_summary">Activer les lumières d\'état pour AgeC, AgeI, AgeS, niveaux du réservoir et de batterie sur l\'écran d\'accueil.</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_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="iob">IA</string>
     <string name="cob">GA</string>
     <string name="virtualpump_firmware_label">Firmware</string>
@@ -765,7 +765,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="combo_pump_state_running">En cours d\'exécution</string>
     <string name="combo_pump_action_cancelling_tbr">Annulation en cours du TBR</string>
     <string name="combo_pump_action_setting_tbr">Paramétrer TBR (%1$d%% / %2$d min) </string>
-    <string name="combo_pump_action_bolusing">Injection du bolus en cours (%.1f U)</string>
+    <string name="combo_pump_action_bolusing">Injection du Bolus en cours (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Actualisation en cours</string>
     <string name="combo_pump_unsupported_operation">L\'opération demandée n\'est pas prise en charge par la pompe</string>
     <string name="combo_low_suspend_forced_notification">Utilisation dangereuse : les bolus étendus ou carrés sont actifs. Le mode Boucle a été programmé pour des suspensions seulement pour 6 heures. Uniquement les bolus normaux sont pris en charge par le mode Boucle</string>
@@ -1157,6 +1157,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="sms_wrongcode">Code incorrect. Commande annulée.</string>
     <string name="notconfigured">Non configuré</string>
     <string name="profileswitchcreated">Changement de profil effectué</string>
+    <string name="versionChecker">Vérificateur de version</string>
+    <string name="old_version">ancienne version</string>
+    <string name="very_old_version">très ancienne version</string>
+    <string name="new_version_warning">Une nouvelle version est disponible depuis au moins %1$d jours ! Retour au traitement par pompe assistée par capteur (Arrêt par Glycémie Basse (AGB), Low Glucose Suspend (LGS) ) après 60 jours et la Boucle sera désactivée après 90 jours</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d jour</item>
         <item quantity="other">%1$d jours</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index cbb98e7289..5d942f4818 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -143,8 +143,6 @@
     <string name="constraints_violation">Vincolo Violato</string>
     <string name="treatmentdeliveryerror">Errore di erogazione del bolo</string>
     <string name="tempbasaldeliveryerror">Errore di somministrazione basale temporale</string>
-    <string name="overview_newtempbasal_basalpercent">Valore Basale [%]</string>
-    <string name="overview_newtempbasal_percent_label">% (100% = corrente)</string>
     <string name="setbasalquestion">Accettare il nuovo basale temp</string>
     <string name="overview_treatment_label">Boli</string>
     <string name="overview_calculator_label">Calcolatore</string>
@@ -244,7 +242,6 @@
     <string name="danar_iob_label">IOB Microinfusore</string>
     <string name="danar_dailyunits">Unita\' giornaliera</string>
     <string name="pump_lastbolus_label">Ultimo Bolo</string>
-    <string name="hoursago">%.1fh fa</string>
     <string name="danar_invalidinput">Data Errata</string>
     <string name="danar_valuenotsetproperly">Valore non impostato correttamente</string>
     <string name="reloadprofile">Aggiorna Profilo</string>
@@ -502,7 +499,6 @@
     <string name="resistantadult">Insulina resistente</string>
     <string name="patientage_summary">Si prega di selezionare l\'età paziente e di impostare i limiti di sicurezza</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s ha bisogno di whitelisting di ottimizzazione della batteria per un buon funzionamento</string>
     <string name="loopsuspended">Sospensione Loop</string>
     <string name="loopsuspendedfor">Sospendi (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolo (%1$d m)</string>
@@ -722,7 +718,6 @@
     <string name="combo_pump_state_running">In esecuzione</string>
     <string name="combo_pump_action_cancelling_tbr">Annullamento di TBR</string>
     <string name="combo_pump_action_setting_tbr">L\'impostazione di TBR (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Bolusing (%.1f U)</string>
     <string name="combo_pump_action_refreshing">Aggiornando</string>
     <string name="combo_pump_unsupported_operation">Richiesta operazione non supportata dal micro</string>
     <string name="combo_low_suspend_forced_notification">L\'utilizzo non sicuro: estesi o multiwave boli sono attivi. Modalità loop è stato impostato basso-sospendere solo 6 ore. Solo normali boli sono supportati in modalità loop</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 80b2994a0e..46b451b602 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -143,8 +143,6 @@
     <string name="constraints_violation">제한 위반</string>
     <string name="treatmentdeliveryerror">Bolus 주입 에러</string>
     <string name="tempbasaldeliveryerror">임시Basal 주입 에러</string>
-    <string name="overview_newtempbasal_basalpercent">Basal값[%]</string>
-    <string name="overview_newtempbasal_percent_label">% (100% = 현재)</string>
     <string name="setbasalquestion">새 임시Basal 적용:</string>
     <string name="overview_treatment_label">관리</string>
     <string name="overview_calculator_label">계산기</string>
@@ -244,7 +242,6 @@
     <string name="danar_iob_label">펌프 IOB</string>
     <string name="danar_dailyunits">일 인슐린 총량</string>
     <string name="pump_lastbolus_label">최근 Bolus:</string>
-    <string name="hoursago">%.1f시간 전</string>
     <string name="danar_invalidinput">사용할수 없는 입력 데이터</string>
     <string name="danar_valuenotsetproperly">값이 제대로 설정되지 않았습니다</string>
     <string name="reloadprofile">프로파일 새로고침</string>
@@ -502,7 +499,6 @@
     <string name="resistantadult">인슐린 저항성 높은 성인</string>
     <string name="patientage_summary">안전제한을 설정하기 위해 당뇨인의 나이를 선택하세요</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">최적의 성능을 위해 %s에서 배터리 최적화를 해제해야합니다.</string>
     <string name="loopsuspended">Loop 일시중지</string>
     <string name="loopsuspendedfor">일시중지중 (%d분)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d 분)</string>
@@ -722,7 +718,6 @@
     <string name="combo_pump_state_running">실행중</string>
     <string name="combo_pump_action_cancelling_tbr">임시기초주입 취소중</string>
     <string name="combo_pump_action_setting_tbr">임시기초주입 설정중 (%1$d%% / %2$d분)</string>
-    <string name="combo_pump_action_bolusing">Bolus 주입중(%.1f U)</string>
     <string name="combo_pump_action_refreshing">새로고침중</string>
     <string name="combo_pump_unsupported_operation">요청하신 동작은 펌프에서 지원하지 않습니다.</string>
     <string name="combo_low_suspend_forced_notification">위험한 사용: 확장Bolus 혹은 멀티웨이브Bolus가 활성화 됩니다. Loop 모드가 저혈당 방지로 오직 6시간만 설정됩니다. Loop 모드에선 일반 Bolus만 지원합니다.</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 11d4733c9b..f95cd7627f 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -12,7 +12,7 @@
     <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 stebint ir tikrinant, ar algoritmai veikia tinkamai)!</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="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>
@@ -147,8 +147,8 @@
     <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="overview_newtempbasal_percent_label">% (100 % = dabartinis)</string>
+    <string name="overview_newtempbasal_basalpercent">Valandinė bazė [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%%(100%% - pasirinkta)</string>
     <string name="setbasalquestion">Patvirtinti naują laikiną bazę:</string>
     <string name="overview_treatment_label">Terapija</string>
     <string name="overview_calculator_label">Skaičiuotuvas</string>
@@ -248,7 +248,7 @@
     <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š %.1fval</string>
+    <string name="hoursago">Prieš %1$.1f valandų</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>
@@ -528,7 +528,7 @@
     <string name="resistantadult">Insulinui rezistentiškas suaugęs</string>
     <string name="patientage_summary">Pasirinkite paciento amžių saugumo riboms nustatyti</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s įtraukite baterijos optimizavimą į baltąjį sąrašą, tinkamam veikimui užtikrinti</string>
+    <string name="needwhitelisting">%1$s įtraukite į baterijos optimizavimo baltąjį sąrašą tinkamam veikimui užtikrinti</string>
     <string name="loopsuspended">Ciklas sustabdytas</string>
     <string name="loopsuspendedfor">Sustabdyta (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolusas (%1$d m)</string>
@@ -564,8 +564,8 @@
     <string name="show_statuslights_summary">Pradžios ekrane rodyti spalvotus indikatorius adatos, insulino, sensoriaus naudojimo trukmei bei baterijos įkrovimo lygiui.</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="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="iob">AIO</string>
     <string name="cob">AAO</string>
     <string name="virtualpump_firmware_label">Programinė įranga</string>
@@ -764,7 +764,7 @@
     <string name="combo_pump_state_running">Vykdoma</string>
     <string name="combo_pump_action_cancelling_tbr">Laikina bazė atšaukiama</string>
     <string name="combo_pump_action_setting_tbr">Nustatyti laikiną bazę (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Bolusas (%.1f vv)</string>
+    <string name="combo_pump_action_bolusing">Leidžiamas bolusas (%1$.1f vv)</string>
     <string name="combo_pump_action_refreshing">Atnaujinama</string>
     <string name="combo_pump_unsupported_operation">Pompa negali įvykdyti prašomos operacijos</string>
     <string name="combo_low_suspend_forced_notification">Nesaugu: aktyvus ištęstinis arba dvibangis bolusas. Ciklas nustatytas stabdymui prie žemo tik 6 valandoms. Aktyvūs tik paprasti bolusai.</string>
@@ -1156,6 +1156,10 @@
     <string name="sms_wrongcode">Neteisingas kodas. Komanda atšaukta.</string>
     <string name="notconfigured">Nesukonfigūruota</string>
     <string name="profileswitchcreated">Profilio perjungimas sukurtas</string>
+    <string name="versionChecker">Versijos tikrintuvas</string>
+    <string name="old_version">sena versija</string>
+    <string name="very_old_version">labai sena versija</string>
+    <string name="new_version_warning">Nauja versija pasiekiama mažiausiai %1$d dienų! Po 60 d. grįšite prie stabdymo prie žemo, po 90 d. ciklas bus išjungtas.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d diena</item>
         <item quantity="few">%1$d diena</item>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 405918431f..313c3fdde5 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -145,8 +145,6 @@
     <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">Basale waarde [%]</string>
-    <string name="overview_newtempbasal_percent_label">% (100% = actueel)</string>
     <string name="setbasalquestion">Accepteer nieuw tijdelijk basaal:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Bolus wizard</string>
@@ -246,7 +244,6 @@
     <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">%.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>
@@ -506,7 +503,6 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
     <string name="resistantadult">insuline resistente volwassene</string>
     <string name="patientage_summary">Kies leeftijd van de patient voor veiligheids limieten</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s benodigd batterij optimalistaie vrijwaring voor goede werking</string>
     <string name="loopsuspended">Loop pauzeren</string>
     <string name="loopsuspendedfor">Gepauzeerd (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d m)</string>
@@ -542,8 +538,6 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
     <string name="show_statuslights_summary">Statusindicatoren inschakelen voor cage, iage, sage, reservoir en batterijniveau op het beginscherm.</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="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="virtualpump_firmware_label">Firmware</string>
@@ -737,7 +731,6 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
     <string name="combo_pump_state_running">Actief</string>
     <string name="combo_pump_action_cancelling_tbr">Annuleren van TB</string>
     <string name="combo_pump_action_setting_tbr">Instellen TBR (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Bolus (%.1f E)</string>
     <string name="combo_pump_action_refreshing">Vernieuwen</string>
     <string name="combo_pump_unsupported_operation">Gevraagde is niet mogelijk met de pomp</string>
     <string name="combo_low_suspend_forced_notification">Opgelet: verlengde en multi wave bolussen zijn actief. Loop is overgeschakeld naar low-suspend modus gedurende 6 uur. Alleen gewone bolussen worden ondersteund in loop modus</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 18f711530c..b06da87522 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -9,6 +9,7 @@
     <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>
@@ -146,8 +147,8 @@
     <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="overview_newtempbasal_percent_label">% (100% = aktualny)</string>
+    <string name="overview_newtempbasal_basalpercent">Wartość bazy [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = aktualny)</string>
     <string name="setbasalquestion">Akceptuj nową bazę tymczasową:</string>
     <string name="overview_treatment_label">Leczenie</string>
     <string name="overview_calculator_label">Kalkulator</string>
@@ -247,7 +248,7 @@
     <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">%.1fh temu</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>
@@ -313,6 +314,7 @@
     <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="objectives_0_objective">Konfiguracja wizualizacji i monitorowania, analiza dawek i wartości bazowych</string>
     <string name="objectives_0_gate">Sprawdź czy BG (pomiary cukru) są dostępne w Nightscout, i dane pompy insulinowej są ładowane</string>
     <string name="objectives_1_objective">Uruchamiam otwartą pętle (OpenLoop)</string>
@@ -335,12 +337,26 @@
     <string name="smscommunicator_loopisdisabled">Pętla (Loop) jest wyłączona</string>
     <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_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>
+    <string name="smscommunicator_profilereplywithcode">Aby przełączyć profil na %1$s %2$d%% odpowiedz kodem %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Aby rozpocząć bolus przedłużony %1$.2fU przez %2$d min. odpowiedz kodem %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_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_tempbasalset_percent">Tymczasowa baza %1$d%% przez %2$d min. pomyślnie rozpoczęta</string>
     <string name="smscommunicator_tempbasalfailed">Rozpoczęcie tymczasowej bazy nie powiodło się</string>
+    <string name="smscommunicator_extendedfailed">Nie powiodło się podanie bolusa przedłużonego</string>
+    <string name="smscommunicator_basalstopreplywithcode">Aby zatrzymać bazę tymczasową wprowadź kod %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Aby zatrzymać bolus przedłużony wprowadź kod %1$s</string>
     <string name="smscommunicator_tempbasalcanceled">Baza tymczasowa anulowana</string>
+    <string name="smscommunicator_extendedcanceled">Przedłużony bolus anulowano</string>
     <string name="smscommunicator_tempbasalcancelfailed">Anulowanie tymczasowej bazy nie powiodło się</string>
+    <string name="smscommunicator_extendedcancelfailed">Anulowanie bolusa przedłużonego nie powiodło się</string>
+    <string name="smscommunicator_unknowncommand">Nieznane polecenie lub błędna odpowiedź</string>
     <string name="quickwizard">Bolus zdefiniowany</string>
     <string name="quickwizardsettings">Ustaw szybkie bolusy</string>
     <string name="overview_editquickwizard_buttontext">Tekst przycisku:</string>
@@ -448,6 +464,7 @@
     <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>
+    <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>
@@ -460,6 +477,7 @@
     <string name="error_phone_not_valid">Nieprawidłowy numer telefonu</string>
     <string name="smscommunicator_invalidphonennumber">Nieprawidłowy numer telefonu SMS</string>
     <string name="overview_calibration">Kalibracja</string>
+    <string name="send_calibration">Wysłać kalibrację %1$.1f do xDrip?</string>
     <string name="xdripnotinstalled">xDrip+ nie zainstalowany</string>
     <string name="calibrationsent">Kalibracja przesłana do xDrip</string>
     <string name="smscommunicator_calibrationsent">Kalibracja wysłana. Odbiór musi być dozwolony w xDrip.</string>
@@ -510,7 +528,7 @@
     <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="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s Potrzebuję wpisu na białą listę optymalizacji baterii, w celu zapewnienia poprawnego działania</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>
     <string name="loopsuspendedfor">Wstrzymana (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d m)</string>
@@ -546,8 +564,8 @@
     <string name="show_statuslights_summary">Włącz diody stanu dla cage, iage, sage, rezerwuar i poziom baterii na ekranie głównym.</string>
     <string name="statuslights_res_warning">Próg ostrzeżenia o poziomie zbiornika [U]</string>
     <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="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="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="virtualpump_firmware_label">Firmware</string>
@@ -601,6 +619,7 @@
     <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>
@@ -713,6 +732,8 @@
     <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>
@@ -730,6 +751,8 @@
     <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>
@@ -742,7 +765,7 @@
     <string name="combo_pump_state_running">W działaniu</string>
     <string name="combo_pump_action_cancelling_tbr">Anulowanie TBR</string>
     <string name="combo_pump_action_setting_tbr">Ustawianie TBR (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Podawanie bolusa (%.1f U)</string>
+    <string name="combo_pump_action_bolusing">Podawanie bolusa (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Odświeżanie</string>
     <string name="combo_pump_unsupported_operation">Żądana operacja nie jest obsługiwana przez pompę</string>
     <string name="combo_low_suspend_forced_notification">Niebezpieczne użycie: aktywne są bolusy przedłużone lub wielofalowe. Tryb pętli został ustawiony tylko na 6 godzinne zawieszenie z uwagi na niski poziom (BG). W trybie pętli obsługiwane są tylko normalne bolusy</string>
@@ -1065,11 +1088,13 @@
     <string name="mute_alert">Wycisz</string>
     <string name="pump_alert">Alarm pompy</string>
     <string name="log_site_changes">Melduj zmianę miejsca wkłucia</string>
+    <string name="log_reservoir_changes">Zapisz zmianę zbiornika</string>
     <string name="log_tube_changes">Melduj zmianę drenu</string>
     <string name="log_battery_changes">Melduj zmiany baterii</string>
     <string name="log_operating_mode_changes">Melduj zmiany trybu pracy</string>
     <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="disconnect_delay">Opóźnienie rozłączenie [s]</string>
     <string name="serial_number">Numer seryjny</string>
     <string name="release_software_version">Wersja oprogramowania</string>
@@ -1124,6 +1149,18 @@
     <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="dst_in_24h_warning">Zmiana na czas letni w ciągu 24 godzin lub krócej</string>
+    <string name="dst_loop_disabled_warning">Zmiana czasu nastąpiła mniej niż 3 godziny temu - Zamknięta pętla wyłączona</string>
+    <string name="storage">limit wielkości pamięci wewnętrznej</string>
+    <string name="diskfull">Zwolnij co najmniej %1$d MB z pamięci wewnętrznej! Pętla zatrzymana!</string>
+    <string name="wrongformat">Błędny format</string>
+    <string name="sms_wrongcode">Zły kod. Polecenie anulowano.</string>
+    <string name="notconfigured">Nie skonfigurowano</string>
+    <string name="profileswitchcreated">Zmiana profilu wykonana</string>
+    <string name="versionChecker">Kontroler wersji</string>
+    <string name="old_version">stara wersja</string>
+    <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 60 dniach, pętla zostanie wyłączona po 90 dniach</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d dzień</item>
         <item quantity="few">%1$d dni</item>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 33d67541f7..36ffb7c5e9 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -147,8 +147,8 @@
     <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="overview_newtempbasal_percent_label">% (100% = atual)</string>
+    <string name="overview_newtempbasal_basalpercent">Valor da Basal [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = actual)</string>
     <string name="setbasalquestion">Aceitar nova basal temporária:</string>
     <string name="overview_treatment_label">Tratamento</string>
     <string name="overview_calculator_label">Calculadora</string>
@@ -248,7 +248,7 @@
     <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">%.1fh atrás</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>
@@ -528,7 +528,7 @@
     <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="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s necessita de autorizar a não optimização da bateria para assegurar a performance necessária</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>
     <string name="loopsuspendedfor">Suspendido (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbólus (%1$d m)</string>
@@ -564,8 +564,8 @@
     <string name="show_statuslights_summary">Ativar as luzes de status para idade da cânula, idade da insulina, idade do sensor, reservatório e bateria no ecrã inicial.</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 crítico de nível de bateria [%]</string>
+    <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%%]</string>
+    <string name="statuslights_bat_critical">Limite 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>
@@ -764,7 +764,7 @@
     <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_bolusing">Injectando (%.1f U)</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>
@@ -1129,7 +1129,7 @@
     <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 conexão:%1$d minutos atrás</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_multiwave">Multionda: %1$.2f / %2$.2f U por %3$d min</string>
@@ -1139,7 +1139,7 @@
     <string name="max_recovery_duration">Duração máxima da recuperação [s]</string>
     <string name="min_recovery_duration">Duração mínima da recuperação [s]</string>
     <string name="recovery_duration">Duração da recuperação</string>
-    <string name="timeout_during_handshake">Tempo de operação excedido - reset bluetooth</string>
+    <string name="timeout_during_handshake">Tempo de operação excedido - reinicar 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>
@@ -1156,6 +1156,10 @@
     <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>
+    <string name="versionChecker">Verificador de Versão</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! Voltar para o LGS após 60 dias, o loop será desativado após 90 dias</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d dia</item>
         <item quantity="other">%1$d dias</item>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 67868f930a..894641e880 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -9,6 +9,7 @@
     <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>
@@ -53,6 +54,7 @@
     <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="objectives_button_back">Înapoi</string>
     <string name="objectives_button_start">Start</string>
     <string name="objectives_button_verify">Verifică</string>
     <string name="nsprofileview_units_label">Unități</string>
@@ -145,8 +147,8 @@
     <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="overview_newtempbasal_basalpercent">Valoare bazală [%]</string>
-    <string name="overview_newtempbasal_percent_label">% (100% = curent)</string>
+    <string name="overview_newtempbasal_basalpercent">Valoare bazală [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = curent)</string>
     <string name="setbasalquestion">Acceptă noua bazală temporară:</string>
     <string name="overview_treatment_label">Tratament</string>
     <string name="overview_calculator_label">Calculator</string>
@@ -246,7 +248,7 @@
     <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">%.1f o în urmă</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>
@@ -264,6 +266,10 @@
     <string name="smscommunicator_bolusreplywithcode">Pentru a livra un bolus de %1$.2fU răspundeți cu codul %2$s</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="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>
@@ -308,6 +314,7 @@
     <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="objectives_0_objective">Se stabilesc vizualizările și monitorizarea și se analizează bazalele și valorile ratelor</string>
     <string name="objectives_0_gate">Verificați că vedeți glicemia în Nightscout și că datele despre insulină date de pompă sunt înregistrate în site</string>
     <string name="objectives_1_objective">Pornire în mod buclă deschisă</string>
@@ -330,12 +337,26 @@
     <string name="smscommunicator_loopisdisabled">Bucla este dezactivată</string>
     <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_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>
+    <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_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_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_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>
+    <string name="smscommunicator_basalstopreplywithcode">Pentru oprirea bazalei temporare, răspundeți cu codul %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Pentru oprirea bolusului extins, răspundeți cu codul %1$s</string>
     <string name="smscommunicator_tempbasalcanceled">Bazala temporară a fost anulată</string>
+    <string name="smscommunicator_extendedcanceled">Bolus extins anulat</string>
     <string name="smscommunicator_tempbasalcancelfailed">Renunțarea la bazala temporară a eșuat</string>
+    <string name="smscommunicator_extendedcancelfailed">Anularea bolusului extins a eșuat</string>
+    <string name="smscommunicator_unknowncommand">Comandă necunoscută sau răspuns greșit</string>
     <string name="quickwizard">AsistentRapid</string>
     <string name="quickwizardsettings">Setări AsistentRapid</string>
     <string name="overview_editquickwizard_buttontext">Text buton:</string>
@@ -443,6 +464,7 @@
     <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>
+    <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>
@@ -455,6 +477,7 @@
     <string name="error_phone_not_valid">Numărul de telefon este invalid</string>
     <string name="smscommunicator_invalidphonennumber">Număr de telefon SMS invalid</string>
     <string name="overview_calibration">Calibrare</string>
+    <string name="send_calibration">Trimite calibrarea %1$.1f către xDrip?</string>
     <string name="xdripnotinstalled">xDrip+ nu este instalat.</string>
     <string name="calibrationsent">Calibrare trimisă către xDrip</string>
     <string name="smscommunicator_calibrationsent">Calibrare trimisă. Recepționarea trebuie să fie activată și în xDrip.</string>
@@ -505,7 +528,7 @@
     <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="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s necesită excluderea din lista de optimizare a bateriei pentru funcționare corespunzătoare</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>
     <string name="loopsuspendedfor">Suspendat (%1$d min)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d min)</string>
@@ -541,8 +564,8 @@
     <string name="show_statuslights_summary">Activați indicatori pentru CAGE, IAGE, SAGE, nivel baterie și rezervor pe ecranul principal.</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="statuslights_bat_warning">Pragul de avertizare nivel baterie [%%]</string>
+    <string name="statuslights_bat_critical">Pragul critic al nivelului baterie [%%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="virtualpump_firmware_label">Firmware</string>
@@ -595,6 +618,7 @@
     <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>
@@ -707,6 +731,8 @@
     <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>
@@ -724,6 +750,8 @@
     <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>
@@ -736,7 +764,7 @@
     <string name="combo_pump_state_running">Rulează</string>
     <string name="combo_pump_action_cancelling_tbr">Se oprește TBR</string>
     <string name="combo_pump_action_setting_tbr">Se setează TBR (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Bolusare (%.1f U)</string>
+    <string name="combo_pump_action_bolusing">Bolusare (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Reîncărcare</string>
     <string name="combo_pump_unsupported_operation">Operațiunea nu este suportată de pompă</string>
     <string name="combo_low_suspend_forced_notification">Folosire nesigură: un bolus extins sau multiwave este activ. Modul buclă este setat să funcționeze în low-suspend pentru 6 ore. Doar bolusurile normale sunt posibile.</string>
@@ -1059,11 +1087,13 @@
     <string name="mute_alert">Liniște</string>
     <string name="pump_alert">Alertă a pompei</string>
     <string name="log_site_changes">Înregistrează schimbările locului de inserție</string>
+    <string name="log_reservoir_changes">Jurnal al schimbărilor rezervorului</string>
     <string name="log_tube_changes">Înregistrează schimbările canulei</string>
     <string name="log_battery_changes">Înregistrează schimbările bateriei</string>
     <string name="log_operating_mode_changes">Înregistrează schimbările modului de operare</string>
     <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="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>
@@ -1078,6 +1108,58 @@
     <string name="delete_pairing">Șterge asocierea</string>
     <string name="pairing_information">Informații despre asociere</string>
     <string name="refreh_status">Reîmprospătare stare</string>
+    <string name="start_pump">Porniți pompa</string>
+    <string name="stop_pump">Opriți pompa</string>
+    <string name="operating_mode">Modul de funcționare</string>
+    <string name="insight_status">Stare</string>
+    <string name="tdd_bolus">Bolus TDD</string>
+    <string name="tdd_basal">Bazală TDD</string>
+    <string name="tdd_total">Total TDD</string>
+    <string name="recovering">Se recuperează...</string>
+    <string name="not_paired">Nu există asociere</string>
+    <string name="last_connected">Ultima conexiune</string>
+    <string name="started">Pornit</string>
+    <string name="stopped">Oprit</string>
+    <string name="tbr_formatter">%1$d%% pentru %2$d / %3$d min</string>
+    <string name="extended_bolus">Bolus extins</string>
+    <string name="multiwave_bolus">Bolus multiwave</string>
+    <string name="eb_formatter">%1$.2f / %2$.2f U pentru %3$d min</string>
+    <string name="enable_tbr_over_notification">Permiteți notificarea de terminare RBT\n(setare a pompei)</string>
+    <string name="disable_tbr_over_notification">Nu permiteți notificarea terminării RBT\n(setare a pompei)</string>
+    <string name="refresh">Actualizează</string>
+    <string name="description_pump_insight_local">Integrare pentru pompele Accu-Chek Insight</string>
+    <string name="not_inserted">Nu este introdus</string>
+    <string name="short_status_last_connected">Ultima conexiune: acum %1$d min</string>
+    <string name="short_status_tbr">TBR: %1$d%% pentru %2$d / %3$d min</string>
+    <string name="short_status_extended">Extins: %1$.2f / %2$.2f U pentru %3$d min</string>
+    <string name="short_status_multiwave">Multiwave: %1$.2f / %2$.2f U pentru %3$d min</string>
+    <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">Rzvr.: %1$.2fU</string>
+    <string name="short_status_battery">Bat.: %1$d%%</string>
+    <string name="max_recovery_duration">Timpul maxim de restabilire [s]</string>
+    <string name="min_recovery_duration">Timpul minim de restabilire [s]</string>
+    <string name="recovery_duration">Durata restabilirii</string>
+    <string name="timeout_during_handshake">Durată timp expirat pe timpul negocierii - resetare 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">Î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="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ă 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>
+    <string name="sms_wrongcode">Cod greșit. Comandă anulată.</string>
+    <string name="notconfigured">Nu este configurat</string>
+    <string name="profileswitchcreated">Schimbare de profil creată</string>
+    <string name="versionChecker">Verificator versiune</string>
+    <string name="old_version">versiune veche</string>
+    <string name="very_old_version">versiune foarte veche</string>
+    <string name="new_version_warning">Noua versiune este disponibilă de cel puțin %1$d zile! Revenire la LGS după 60 zile, bucla va fi dezactivată după 90 zile</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d zi</item>
         <item quantity="few">%1$d zi</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 26d330f64b..aaa07dfec0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -147,8 +147,8 @@
     <string name="constraints_violation">ограничение нарушено</string>
     <string name="treatmentdeliveryerror">Ошибка подачи болюса</string>
     <string name="tempbasaldeliveryerror">Ошибка подачи врем базала</string>
-    <string name="overview_newtempbasal_basalpercent">величина базала (%)</string>
-    <string name="overview_newtempbasal_percent_label">% (100% = текущий)</string>
+    <string name="overview_newtempbasal_basalpercent">Величина базала [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = текущее)</string>
     <string name="setbasalquestion">принять новый врем базал:</string>
     <string name="overview_treatment_label">болюс</string>
     <string name="overview_calculator_label">калькулятор</string>
@@ -248,7 +248,7 @@
     <string name="danar_iob_label">активный инсулин на помпе</string>
     <string name="danar_dailyunits">суточные единицы</string>
     <string name="pump_lastbolus_label">предыдущий болюс</string>
-    <string name="hoursago">%.1fч назад</string>
+    <string name="hoursago">%1$.1fч назад</string>
     <string name="danar_invalidinput">введенные данные неверны</string>
     <string name="danar_valuenotsetproperly">величина не задана должным образом</string>
     <string name="reloadprofile">обновить профиль</string>
@@ -528,7 +528,7 @@
     <string name="resistantadult">Инсулинорезистентный взрослый</string>
     <string name="patientage_summary">выберите возраст пациента для определения ограничителей безопасности</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s необходимо включить в белый список для корректной работы</string>
+    <string name="needwhitelisting">%1$s необходимо включить в белый список оптимизации батареи для корректной работы</string>
     <string name="loopsuspended">ЗЦ остановлен</string>
     <string name="loopsuspendedfor">Остановлен на(%1$d m)</string>
     <string name="loopsuperbolusfor">Суперболюс(%1$d m)</string>
@@ -564,8 +564,8 @@
     <string name="show_statuslights_summary">Включить на главном экране индикаторы отработанного времени для канюли помпы, инсулина, сенсора, резервуара, а также показать уровень аккумулятора.</string>
     <string name="statuslights_res_warning">Порог уровня наполненности резервуара для оповещения [ед.]</string>
     <string name="statuslights_res_critical">Порог критического уровня наполненности резервуара [U]</string>
-    <string name="statuslights_bat_warning">Порог предупреждения о разрядке батареи [%]</string>
-    <string name="statuslights_bat_critical">Порог предупреждения о критическом уровне разрядки батареи [%]</string>
+    <string name="statuslights_bat_warning">Порог предупреждения о разрядке батареи [%%]</string>
+    <string name="statuslights_bat_critical">Порог предупреждения о критическом уровне разрядки батареи [%%]</string>
     <string name="iob">IOB акт инс</string>
     <string name="cob">акт углев</string>
     <string name="virtualpump_firmware_label">прошивка</string>
@@ -764,7 +764,7 @@
     <string name="combo_pump_state_running">Выполняется</string>
     <string name="combo_pump_action_cancelling_tbr">Отмена врем базала TBR</string>
     <string name="combo_pump_action_setting_tbr">Установка врем базала TBR на (%1$d%% / %2$d мин)</string>
-    <string name="combo_pump_action_bolusing">Введение болюса (%.1f ед)</string>
+    <string name="combo_pump_action_bolusing">Введение болюса (%1$.1f ед)</string>
     <string name="combo_pump_action_refreshing">Обновление</string>
     <string name="combo_pump_unsupported_operation">Запрашиваемая операция не поддерживается помпой</string>
     <string name="combo_low_suspend_forced_notification">Небезопасное использование: Удлиненный или многоволновой болюс активны. Режим цикла Loop установлен на приостановку при низкой гликемии только на 6 часов. В режиме loop поддерживаются только обычные болюсы</string>
@@ -1158,4 +1158,8 @@ Context | Edit Context</string>
     <string name="sms_wrongcode">Неверный код. Команда отменена.</string>
     <string name="notconfigured">Не сконфигурировано</string>
     <string name="profileswitchcreated">Переключатель профиля создан</string>
+    <string name="versionChecker">Проверка версии</string>
+    <string name="old_version">старая версия</string>
+    <string name="very_old_version">очень старая версия</string>
+    <string name="new_version_warning">Новая версия доступна не менее %1$d дней! После 60 дней переход на остановку при низкой гликемии LGS, замкнутый цикл будет отключен через 90 дней</string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index d2cdb050cd..f9dacaef8b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -147,8 +147,8 @@
     <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="overview_newtempbasal_percent_label">% (100% = aktuálny)</string>
+    <string name="overview_newtempbasal_basalpercent">Hodnota bazálu [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = aktuálny)</string>
     <string name="setbasalquestion">Povoliť nový dočasný bazál:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Kalkulačka</string>
@@ -248,7 +248,7 @@
     <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 %.1fh</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>
@@ -528,7 +528,7 @@
     <string name="resistantadult">Dospelý z nízkou citlivosťou</string>
     <string name="patientage_summary">Vyberte vek pacienta pre nastavenie bezpečnostných limitov</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s potrebuje vypnúť optimalizáciu baterie pre optimálny výkon</string>
+    <string name="needwhitelisting">%1$s potrebuje vypnúť optimalizáciu batérie pre optimálny výkon</string>
     <string name="loopsuspended">Uzavretý okruh pozastavený</string>
     <string name="loopsuspendedfor">Pozastavený (%1$d min)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d m)</string>
@@ -564,8 +564,8 @@
     <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>
-    <string name="statuslights_bat_critical">Prah kritickej úrovne batérie [%]</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="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="virtualpump_firmware_label">Firmware</string>
@@ -764,7 +764,7 @@
     <string name="combo_pump_state_running">V prevádzke</string>
     <string name="combo_pump_action_cancelling_tbr">Rušenie dočasného bazálu</string>
     <string name="combo_pump_action_setting_tbr">Nastavovanie doč. bazálu (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Podávanie bolusu (%.1f U)</string>
+    <string name="combo_pump_action_bolusing">Podávanie bolusu (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Aktualizuje sa stav</string>
     <string name="combo_pump_unsupported_operation">Požadovaná operácia nie je pumpou podporovaná</string>
     <string name="combo_low_suspend_forced_notification">Nebezpečné použitie: predĺžený alebo multiwave bolus je aktívny. Pumpa bola vypnutá len na 6 hodín. Povolené sú iba normálne bolusy.</string>
@@ -1156,6 +1156,10 @@
     <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>
+    <string name="versionChecker">Kontrola verzie</string>
+    <string name="old_version">stará verzia</string>
+    <string name="very_old_version">veľmi stará verzia</string>
+    <string name="new_version_warning">Nová verzia dostupná najmenej %1$d dní! Návrat k liečbe inzulínovou pumpou s podporou senzora po 60 dňoch, okruh bude deaktivovaný po 90 dňoch.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d deň</item>
         <item quantity="few">%1$d dní</item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 74378fb8d9..409b7f21a6 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -148,8 +148,6 @@ Eversense-appen.</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">Basal [%]</string>
-    <string name="overview_newtempbasal_percent_label">% (100% = profilens värde)</string>
     <string name="setbasalquestion">Acceptera ny temp basal:</string>
     <string name="overview_treatment_label">Behandling</string>
     <string name="overview_calculator_label">Kalkylator</string>
@@ -249,7 +247,6 @@ Eversense-appen.</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">%.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>
@@ -529,7 +526,6 @@ Eversense-appen.</string>
     <string name="resistantadult">Insulinresistent vuxen</string>
     <string name="patientage_summary">Vg ange personens ålder för inställningar av gränser</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s behöver kunna kringgå batterisparfunktionerna för att fungera korrekt</string>
     <string name="loopsuspended">Loop pausad</string>
     <string name="loopsuspendedfor">Pausad (%1$d min)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d min)</string>
@@ -565,8 +561,6 @@ Eversense-appen.</string>
     <string name="show_statuslights_summary">Aktivera statusindikationerna för cage, iage, sage, reservoar och batterinivå på hemskärmen.</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>
@@ -765,7 +759,6 @@ Eversense-appen.</string>
     <string name="combo_pump_state_running">Körs</string>
     <string name="combo_pump_action_cancelling_tbr">Avbryter temp basal</string>
     <string name="combo_pump_action_setting_tbr">Sätter temp basal (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Levererar bolus (%.1f enheter)</string>
     <string name="combo_pump_action_refreshing">Uppdaterar</string>
     <string name="combo_pump_unsupported_operation">Önskad åtgärd stöds inte av pumpen</string>
     <string name="combo_low_suspend_forced_notification">Osäker användning: Förlängd- eller kombibolus är aktiv. Loop mode är satt till att bromsa vid lågt BG i 6 timmar. Endast normala bolusar tillåtna i loopläge.</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index dcc3af86e3..d858630fff 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -143,8 +143,6 @@
     <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="overview_newtempbasal_basalpercent">Bazal değeri [%]</string>
-    <string name="overview_newtempbasal_percent_label">% ( 100% = aktuel)</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>
@@ -244,7 +242,6 @@
     <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="hoursago">%.1fs önce</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>
@@ -503,7 +500,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="resistantadult">Yetişkin İnsülin direnci</string>
     <string name="patientage_summary">Güvenlik sınırlarını ayarlamak için lütfen hasta yaşını seçiniz</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s, düzgün bir şekilde çalışması için devre dışı bırakılmış pil performans ayarlaması gerektirir</string>
     <string name="loopsuspended">Döngü durduldu</string>
     <string name="loopsuspendedfor">Askıya alındı (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d m)</string>
@@ -725,7 +721,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="combo_pump_state_running">Çalışıyor</string>
     <string name="combo_pump_action_cancelling_tbr">TBR (Geçici Bazal Oranı) İptal ediliyor</string>
     <string name="combo_pump_action_setting_tbr">TBR(Geçici Bazal Oranı) ayarı (%1$d%% / %2$d dak)</string>
-    <string name="combo_pump_action_bolusing">Bolus (%.1f U) teslim ediliyor</string>
     <string name="combo_pump_action_refreshing">Yenileniyor...</string>
     <string name="combo_pump_unsupported_operation">İstenen işlem pompası tarafından desteklenmiyor</string>
     <string name="combo_low_suspend_forced_notification">Güvensiz kullanım: yayım veya çoklu dalgalı (kare dalgalı) boluslar aktiftir. Döngü modu 6 saat içinde ekstra insülin vermeyecektir. Döngü modunda sadece normal boluslar desteklenir</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 2e1874e5ef..7e4b22eacd 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -53,6 +53,7 @@
     <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="objectives_button_back">返回</string>
     <string name="objectives_button_start">开始</string>
     <string name="objectives_button_verify">校验</string>
     <string name="nsprofileview_units_label">单位</string>
@@ -145,8 +146,6 @@
     <string name="constraints_violation">违反约束条件</string>
     <string name="treatmentdeliveryerror">大剂量输注错误</string>
     <string name="tempbasaldeliveryerror">临时基础输注错误</string>
-    <string name="overview_newtempbasal_basalpercent">基础率数值 [%]</string>
-    <string name="overview_newtempbasal_percent_label">% (100% = 当前)</string>
     <string name="setbasalquestion">接受新的临时基础率</string>
     <string name="overview_treatment_label">治疗</string>
     <string name="overview_calculator_label">计算器</string>
@@ -246,7 +245,6 @@
     <string name="danar_iob_label">泵 IOB</string>
     <string name="danar_dailyunits">每日单位数</string>
     <string name="pump_lastbolus_label">上次大剂量</string>
-    <string name="hoursago">%.1fh 前</string>
     <string name="danar_invalidinput">无效的输入数据</string>
     <string name="danar_valuenotsetproperly">数值设定的不正确</string>
     <string name="reloadprofile">重新加载配置文件</string>
@@ -264,6 +262,10 @@
     <string name="smscommunicator_bolusreplywithcode">要输注大剂量胰岛素%1$.2fU 回复如下代码 %2$s</string>
     <string name="smscommunicator_calibrationreplywithcode">要发送校准值 %1$.2f 回复如下代码 %2$s</string>
     <string name="smscommunicator_bolusfailed">大剂量输注失败</string>
+    <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>
@@ -331,11 +333,24 @@
     <string name="smscommunicator_loopisenabled">闭环被启用</string>
     <string name="valuelimitedto">%1$.2f 超过 %2$.2f的限制</string>
     <string name="smscommunicator_remotecommandnotallowed">远程命令没有被允许</string>
+    <string name="smscommunicator_remotebolusnotallowed">远程大剂量不可用。请稍后再试。</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">要开始扩展大剂量 %1$.2fU/h 持续时间%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">扩展大剂量 %1$.2fU/h 持续时间 %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>
@@ -505,7 +520,6 @@
     <string name="resistantadult">胰岛素抵抗成人</string>
     <string name="patientage_summary">请选择患者年龄以设置安全限制</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%s 需要加入电池优化白名单才能正常运行</string>
     <string name="loopsuspended">闭环暂停了</string>
     <string name="loopsuspendedfor">暂停了 (%1$d m)</string>
     <string name="loopsuperbolusfor">超级大剂量 (%1$d m)</string>
@@ -541,8 +555,6 @@
     <string name="show_statuslights_summary">在主屏幕上启用cage(碳水时间)、iage(胰岛素时间)、sage(探头使用时间)、储药器和电池电量的状态指示灯。</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>
@@ -550,6 +562,7 @@
     <string name="danar_bluetooth_status">蓝牙状态</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">xdrip</string>
@@ -735,7 +748,6 @@
     <string name="combo_pump_state_running">正在运行</string>
     <string name="combo_pump_action_cancelling_tbr">正在取消临时基础率</string>
     <string name="combo_pump_action_setting_tbr">正在设置临时基础率 (%1$d%% / %2$d 分钟)</string>
-    <string name="combo_pump_action_bolusing">正在输注大剂量 (%.1f U)</string>
     <string name="combo_pump_action_refreshing">正在刷新</string>
     <string name="combo_pump_unsupported_operation">泵不支持请求的操作</string>
     <string name="combo_low_suspend_forced_notification">不安全的用法: 扩展大剂量(方波) 或者双波被启用了，闭环只支持常规大剂量， 闭环已经被设置为6个小时的低血糖暂停模式(low-suspend only 6 hours).</string>
@@ -1001,6 +1013,7 @@
     <string name="nth_objective">%1$d．目标</string>
     <string name="poctech">Poctech</string>
     <string name="description_source_poctech">从 Poctech app 接收血糖值。</string>
+    <string name="description_source_tomato">从番茄app(喵喵设备) 接收血糖值</string>
     <string name="high_temptarget_raises_sensitivity_title">高临时目标增加灵敏度</string>
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[当临时目标 >=100 mg/dl (5.5 mmol/l) 时提高灵敏度]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">低临时目标降低灵敏度</string>
@@ -1057,6 +1070,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>
@@ -1100,6 +1114,7 @@
     <string name="short_status_last_connected">最后一次连接: %1$d 分钟前</string>
     <string name="short_status_tbr">临时基础率: %1$d%% for %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">Reser.: %1$.2fU</string>
     <string name="short_status_battery">电池: %1$d%%</string>
@@ -1113,6 +1128,16 @@
     <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="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>
+    <string name="sms_wrongcode">错误的代码。命令取消</string>
+    <string name="notconfigured">未配置</string>
+    <string name="profileswitchcreated">配置文件切换已创建</string>
     <plurals name="objective_days">
         <item quantity="other">%1$d　天</item>
     </plurals>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 24d9f1f2d9..93b4a50063 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1382,9 +1382,9 @@
     <string name="copy_short">COPY</string>
     <string name="addnew">Add new</string>
     <string name="versionChecker">Version Checker</string>
-    <string name="key_new_version_available_since" translatable="false">new_version_available_since</string>
+    <string name="key_last_time_this_version_detected" translatable="false">last_time_this_version_detected</string>
     <string name="key_last_versionchecker_warning" translatable="false">last_versionchecker_waring</string>
-    <string name="key_last_versioncheck" translatable="false">key_last_versioncheck</string>
+    <string name="key_last_versionchecker_plugin_warning" translatable="false">last_versionchecker_plugin_waring</string>
 
     <string name="old_version">old version</string>
     <string name="very_old_version">very old version</string>
diff --git a/app/src/test/java/info/AAPSMocker.java b/app/src/test/java/info/AAPSMocker.java
index 10d00fb751..1cf320b270 100644
--- a/app/src/test/java/info/AAPSMocker.java
+++ b/app/src/test/java/info/AAPSMocker.java
@@ -39,7 +39,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -155,6 +154,7 @@ public class AAPSMocker {
         when(MainApp.gs(R.string.enableloop)).thenReturn("Enable loop");
         when(MainApp.gs(R.string.resumeloop)).thenReturn("Resume loop");
         when(MainApp.gs(R.string.suspendloop)).thenReturn("Suspend loop");
+        when(MainApp.gs(R.string.pumpNotInitialized)).thenReturn("Pump not initialized!");
     }
 
     public static MainApp mockMainApp() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtilsKtTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtilsKtTest.kt
index 29725e4d9e..2d07e40c1d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtilsKtTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtilsKtTest.kt
@@ -70,7 +70,9 @@ class VersionCheckerUtilsKtTest {
         verify(bus, times(1)).post(any())
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_new_version_available_since), ArgumentMatchers.anyLong())
+        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
+        PowerMockito.verifyStatic(SP::class.java, times(1))
+        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
         PowerMockito.verifyNoMoreInteractions(SP::class.java)
 
     }
@@ -85,7 +87,9 @@ class VersionCheckerUtilsKtTest {
         verify(bus, times(1)).post(any())
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_new_version_available_since), ArgumentMatchers.anyLong())
+        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
+        PowerMockito.verifyStatic(SP::class.java, times(1))
+        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
         PowerMockito.verifyNoMoreInteractions(SP::class.java)
     }
 
@@ -99,7 +103,9 @@ class VersionCheckerUtilsKtTest {
         verify(bus, times(1)).post(any())
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_new_version_available_since), ArgumentMatchers.anyLong())
+        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
+        PowerMockito.verifyStatic(SP::class.java, times(1))
+        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
         PowerMockito.verifyNoMoreInteractions(SP::class.java)
     }
 
@@ -113,7 +119,9 @@ class VersionCheckerUtilsKtTest {
         verify(bus, times(1)).post(any())
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_new_version_available_since), ArgumentMatchers.anyLong())
+        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
+        PowerMockito.verifyStatic(SP::class.java, times(1))
+        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
         PowerMockito.verifyNoMoreInteractions(SP::class.java)
     }
 
@@ -126,7 +134,9 @@ class VersionCheckerUtilsKtTest {
         verify(bus, times(1)).post(any())
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_new_version_available_since), ArgumentMatchers.anyLong())
+        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
+        PowerMockito.verifyStatic(SP::class.java, times(1))
+        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
         PowerMockito.verifyNoMoreInteractions(SP::class.java)
     }
 
@@ -139,7 +149,9 @@ class VersionCheckerUtilsKtTest {
         verify(bus, times(1)).post(any())
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_new_version_available_since), ArgumentMatchers.anyLong())
+        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
+        PowerMockito.verifyStatic(SP::class.java, times(1))
+        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
         PowerMockito.verifyNoMoreInteractions(SP::class.java)
     }
 
@@ -159,7 +171,7 @@ class VersionCheckerUtilsKtTest {
         verify(bus, times(0)).post(any())
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.remove(eq(R.string.key_new_version_available_since))
+        SP.putLong(eq(R.string.key_last_time_this_version_detected), ArgumentMatchers.anyLong())
         PowerMockito.verifyNoMoreInteractions(SP::class.java)
     }
 
@@ -179,7 +191,9 @@ class VersionCheckerUtilsKtTest {
         verify(bus, times(1)).post(any())
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_new_version_available_since), ArgumentMatchers.anyLong())
+        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
+        PowerMockito.verifyStatic(SP::class.java, times(1))
+        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
         PowerMockito.verifyNoMoreInteractions(SP::class.java)
     }