Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

2022-02-28 11:14:44 +01:00 · 2022-02-28 11:14:44 +01:00 · ca7113884c
parent abd93c277d 9ed7b6dd9f
commit ca7113884c
247 changed files with 2935 additions and 792 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -109,7 +109,7 @@ android {
    defaultConfig {
        multiDexEnabled true
        versionCode 1500
-        version "3.0.0.1-dev-b"
+        version "3.0.0.1-dev-c"
        buildConfigField "String", "VERSION", '"' + version + '"'
        buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
        buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
--- a/app/src/main/assets/OpenAPSSMB/determine-basal.js
+++ b/app/src/main/assets/OpenAPSSMB/determine-basal.js
@ -287,7 +287,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
        }
        //console.log(" (autosens ratio "+sensitivityRatio+")");
    }
-    console.error("; CR:",profile.carb_ratio);
+    console.error("CR:",profile.carb_ratio);

    // compare currenttemp to iob_data.lastTemp and cancel temp if they don't match
    var lastTempAge;
@ -298,7 +298,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
    }
    //console.error("currenttemp:",currenttemp,"lastTemp:",JSON.stringify(iob_data.lastTemp),"lastTempAge:",lastTempAge,"m");
    var tempModulus = (lastTempAge + currenttemp.duration) % 30;
-    console.error("currenttemp:",currenttemp,"lastTempAge:",lastTempAge,"m","tempModulus:",tempModulus,"m");
+    console.error("currenttemp:",round(currenttemp.rate,2),"lastTempAge:",lastTempAge,"m","tempModulus:",tempModulus,"m");
    rT.temp = 'absolute';
    rT.deliverAt = deliverAt;
    if ( microBolusAllowed && currenttemp && iob_data.lastTemp && currenttemp.rate !== iob_data.lastTemp.rate && lastTempAge > 10 && currenttemp.duration ) {
--- a/app/src/main/assets/OpenAPSSMBDynamicISF/determine-basal.js
+++ b/app/src/main/assets/OpenAPSSMBDynamicISF/determine-basal.js
@ -286,7 +286,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
        }
    console.error("                                            ");
    console.error("++++++++++++++++++++++++++++++++++++++++++++++++++++++");
-    console.error("++ Dynamic ISF Beta 1.3 - Based on rolling 24 hours ++");
+    console.error("++ Dynamic ISF Beta 1.4 - Linear Extrapolation/TDD7 ++");
    console.error("++++++++++++++++++++++++++++++++++++++++++++++++++++++");
    console.error("                                            ");

@ -306,14 +306,17 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
        var tdd_24 = (( basal * 24 ) * 2.8);
        }

-        var TDD = (tdd7 * 0.3) + (tdd_24 * 0.7);
+   if (meal_data.TDDPUMP){
+        var tdd_pump = ( (meal_data.TDDPUMP / now ) * 24);
+        }
+        else {
+        var tdd_pump = (( basal * 24 ) * 2.8);
+        }
+        var TDD = (tdd7 * 0.4) + (tdd_pump * 0.6);

-       console.error("Rolling 24 hour TDD = "+tdd_24+"; ");
-       console.error("                                            ");
-       console.error("Weighted Average TDD = "+TDD+"; ");
-       console.error("                                            ");
+       console.error("Pump extrapolated TDD = "+tdd_pump+"; ");
        //if (tdd7 > 0){
-        /*if ( tdd_pump > tdd7 && now < 5 || now < 7 && TDD < ( 0.8 * tdd7 ) ){
+        if ( tdd_pump > tdd7 && now < 5 || now < 7 && TDD < ( 0.8 * tdd7 ) ){
          TDD = ( 0.8 * tdd7 );
          console.log("Excess or too low insulin from pump so TDD set to "+TDD+" based on 75% of TDD7; ");
          rT.reason += "TDD: " +TDD+ " due to low or high tdd from pump; ";
@ -325,6 +328,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
           rT.reason += "TDD set to TDD7 due to high pump usage reported. TDD = "+TDD+"; ";
           }

+
        else if (tdd_pump < (0.33 * tdd7)){
           TDD = (tdd7 * 0.25) + (tdd_pump * 0.75);
           console.error("TDD weighted to pump due to low insulin usage. TDD = "+TDD+"; ");
@ -332,9 +336,11 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
           }

        else {
-             console.log("TDD 7 ="+tdd7+", TDD Pump ="+tdd_pump+" and TDD = "+TDD+";");
+             console.log("TDD = " +TDD+ " based on standard pump 60/tdd7 40 split; ");
             rT.reason += "TDD: " +TDD+ " based on standard pump 60/tdd7 40 split; ";
-             }*/
+             }
+
+       console.error("                                            ");


    var variable_sens = (277700 / (TDD * bg));
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@ -56,8 +56,8 @@ import info.nightscout.androidaps.utils.tabs.TabPageAdapter
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.*
 import javax.inject.Inject
 import kotlin.system.exitProcess
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
@ -39,10 +39,10 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.locale.LocaleHelper
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.exceptions.UndeliverableException
-import io.reactivex.plugins.RxJavaPlugins
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.exceptions.UndeliverableException
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.plugins.RxJavaPlugins
 import net.danlew.android.joda.JodaTimeAndroid
 import java.io.IOException
 import java.net.SocketException
--- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
@ -42,8 +42,8 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.*
 import javax.inject.Inject
 import kotlin.math.min
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@ -123,10 +123,12 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang

    override fun onDestroy() {
        super.onDestroy()
+        context?.let { context ->
            PreferenceManager
                .getDefaultSharedPreferences(context)
                .unregisterOnSharedPreferenceChangeListener(this)
        }
+    }

    private fun addPreferencesFromResourceIfEnabled(p: PluginBase?, rootKey: String?, enabled: Boolean) {
        if (enabled) addPreferencesFromResourceIfEnabled(p, rootKey)
@ -139,10 +141,12 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
+        context?.let { context ->
            PreferenceManager
                .getDefaultSharedPreferences(context)
                .registerOnSharedPreferenceChangeListener(this)
        }
+    }

    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
        (savedInstanceState ?: arguments)?.let { bundle ->
@ -263,21 +267,21 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang

    @SuppressLint("RestrictedApi")
    private fun addPreferencesFromResource(@XmlRes preferencesResId: Int, key: String?) {
-        val xmlRoot = preferenceManager.inflateFromResource(context,
-            preferencesResId, null)
+        context?.let { context ->
+            val xmlRoot = preferenceManager.inflateFromResource(context, preferencesResId, null)
            val root: Preference?
            if (key != null) {
                root = xmlRoot.findPreference(key)
                if (root == null) return
                require(root is PreferenceScreen) {
-                ("Preference object with key " + key
-                    + " is not a PreferenceScreen")
+                    ("Preference object with key $key is not a PreferenceScreen")
                }
                preferenceScreen = root
            } else {
                addPreferencesFromResource(preferencesResId)
            }
        }
+    }

    private fun adjustUnitDependentPrefs(pref: Preference) { // convert preferences values to current units
        val unitDependent = arrayOf(
@ -305,15 +309,9 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
                p.initialExpandedChildrenCount = Int.MAX_VALUE
            }
        } else {
-            if (p.key != null) {
-                visible = visible || p.key.contains(filter, true)
-            }
-            if (p.title != null) {
-                visible = visible || p.title.contains(filter, true)
-            }
-            if (p.summary != null) {
-                visible = visible || p.summary.contains(filter, true)
-            }
+                visible = visible || p.key?.contains(filter, true) == true
+                visible = visible || p.title?.contains(filter, true) == true
+                visible = visible || p.summary?.contains(filter, true) == true
        }

        p.isVisible = visible
@ -393,9 +391,8 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
    // We use Preference and custom editor instead of EditTextPreference
    // to hash password while it is saved and never have to show it, even hashed

-    override fun onPreferenceTreeClick(preference: Preference?): Boolean {
+    override fun onPreferenceTreeClick(preference: Preference): Boolean {
        context?.let { context ->
-            if (preference != null) {
            if (preference.key == rh.gs(R.string.key_master_password)) {
                passwordCheck.queryPassword(context, R.string.current_master_password, R.string.key_master_password, {
                    passwordCheck.setPassword(context, R.string.master_password, R.string.key_master_password)
@ -420,7 +417,6 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
                return true
            }
        }
-        }
        return super.onPreferenceTreeClick(preference)
    }

--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt
@ -49,10 +49,10 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.Completable
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.subscribeBy
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject

@ -471,7 +471,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
        if (selectedItems.size() > 0)
            activity?.let { activity ->
                OKDialog.showConfirmation(activity, rh.gs(R.string.removerecord), getConfirmationText(), Runnable {
-                    selectedItems.forEach {key, ml ->
+                    selectedItems.forEach { _, ml ->
                        ml.bolus?.let { bolus ->
                            uel.log(
                                Action.BOLUS_REMOVED, Sources.Treatments,
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt
@ -37,10 +37,10 @@ import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.Completable
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.subscribeBy
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject

--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt
@ -37,9 +37,9 @@ import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import info.nightscout.shared.logging.LTag
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject

--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt
@ -42,10 +42,10 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.Completable
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.subscribeBy
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
 import javax.inject.Inject

 class TreatmentsProfileSwitchFragment : DaggerFragment() {
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt
@ -45,10 +45,10 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHi
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.Completable
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.subscribeBy
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject

--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
@ -43,8 +43,8 @@ import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.math.abs
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt
@ -27,8 +27,8 @@ import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject

--- a/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt
+++ b/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt
@ -7,7 +7,7 @@ import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
@ -28,8 +28,8 @@ import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DecimalFormat
 import java.util.*
 import java.util.concurrent.TimeUnit
@ -72,7 +72,7 @@ class CarbsDialog : DialogFragmentWithDate() {
    private fun validateInputs() {
        val maxCarbs = constraintChecker.getMaxCarbsAllowed().value().toDouble()
        val time = binding.time.value.toInt()
-        if (time > 12 * 60 || time < -12 * 60) {
+        if (time > 12 * 60 || time < -7 * 24 * 60) {
            binding.time.value = 0.0
            ToastUtils.showToastInUiThread(ctx, rh.gs(R.string.constraintapllied))
        }
@ -125,7 +125,7 @@ class CarbsDialog : DialogFragmentWithDate() {
        val maxCarbs = constraintChecker.getMaxCarbsAllowed().value().toDouble()
        binding.time.setParams(
            savedInstanceState?.getDouble("time")
-                ?: 0.0, -12 * 60.0, 12 * 60.0, 5.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher
+                ?: 0.0, -7 * 24 * 60.0, 12 * 60.0, 5.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher
        )

        binding.duration.setParams(
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@ -31,8 +31,8 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.extensions.fromConstant
 import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.utils.resources.ResourceHelper
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DecimalFormat
 import java.util.*
 import javax.inject.Inject
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
@ -29,8 +29,8 @@ import info.nightscout.shared.SafeParse
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.utils.resources.ResourceHelper
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.*
 import javax.inject.Inject
 import kotlin.math.abs
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
@ -30,8 +30,8 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.extensions.toSignedString
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.shared.SafeParse
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DecimalFormat
 import java.util.*
 import java.util.concurrent.TimeUnit
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
@ -40,8 +40,8 @@ import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

 class LoopDialog : DaggerDialogFragment() {
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
@ -32,8 +32,8 @@ import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DecimalFormat
 import java.util.*
 import java.util.concurrent.TimeUnit
@ -143,7 +143,7 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
                    binding.reusebutton.text = rh.gs(R.string.reuse_profile_pct_hours, profile.value.originalPercentage, T.msecs(profile.value.originalTimeshift).hours().toInt())
                    binding.reusebutton.setOnClickListener {
                        binding.percentage.value = profile.value.originalPercentage.toDouble()
-                        binding.timeshift.value = profile.value.originalTimeshift.toDouble()
+                        binding.timeshift.value = T.msecs(profile.value.originalTimeshift).hours().toDouble()
                    }
                }
        }
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@ -28,8 +28,8 @@ import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DecimalFormat
 import java.util.*
 import java.util.concurrent.TimeUnit
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
@ -31,8 +31,8 @@ import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.utils.resources.ResourceHelper
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DecimalFormat
 import java.util.*
 import javax.inject.Inject
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
@ -33,7 +33,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.androidaps.utils.wizard.BolusWizard
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.text.DecimalFormat
 import java.util.*
 import javax.inject.Inject
@ -148,7 +148,7 @@ class WizardDialog : DaggerDialogFragment() {

        if (correctionPercent) {
            calculatedPercentage = sp.getInt(R.string.key_boluswizard_percentage, 100).toDouble()
-            binding.correctionInput.setParams(calculatedPercentage, 10.0, 200.0, 1.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher)
+            binding.correctionInput.setParams(calculatedPercentage, 10.0, 200.0, 5.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher)
            binding.correctionInput.value = calculatedPercentage
            binding.correctionUnit.text = "%"
        } else {
@ -215,7 +215,7 @@ class WizardDialog : DaggerDialogFragment() {
                binding.correctionUnit.text = if (isChecked) "%" else rh.gs(R.string.insulin_unit_shortname)
                correctionPercent = binding.correctionPercent.isChecked
                if (correctionPercent) {
-                    binding.correctionInput.setParams(calculatedPercentage, 10.0, 200.0, 1.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher)
+                    binding.correctionInput.setParams(calculatedPercentage, 10.0, 200.0, 5.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher)
                    binding.correctionInput.customContentDescription = rh.gs(R.string.a11_correction_percentage)
                } else {
                    binding.correctionInput.setParams(
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
@ -19,8 +19,8 @@ import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

 class LoopFragment : DaggerFragment() {
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
@ -59,8 +59,8 @@ import info.nightscout.androidaps.plugins.aps.events.EventLoopInvoked
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.abs
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
@ -18,8 +18,8 @@ import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.JSONFormatter
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONArray
 import org.json.JSONException
 import javax.inject.Inject
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
@ -20,8 +20,8 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONArray
 import org.json.JSONException
 import javax.inject.Inject
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
@ -19,13 +19,13 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
 import info.nightscout.androidaps.utils.FabricPrivacy
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.plusAssign
 import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.util.*
 import javax.inject.Inject

--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
@ -22,8 +22,8 @@ import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
@ -12,8 +12,8 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.abs
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
@ -37,11 +37,11 @@ import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.SntpClient
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.plusAssign
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject

 class ObjectivesFragment : DaggerFragment() {
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@ -49,8 +49,8 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.androidaps.utils.ui.SingleClickButton
 import info.nightscout.androidaps.utils.ui.UIRunnable
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.*
 import javax.inject.Inject

--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
@ -25,7 +25,7 @@ import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
@ -36,10 +36,10 @@ import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.ui.UIRunnable
-import io.reactivex.Completable
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.subscribeBy
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
 import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
@ -29,9 +29,9 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.Ero
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.Completable.fromAction
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.subscribeBy
+import io.reactivex.rxjava3.core.Completable.fromAction
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.subscribeBy
 import javax.inject.Inject

 class MaintenanceFragment : DaggerFragment() {
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
@ -310,7 +310,7 @@ class NSClientAddUpdateWorker(
                        } ?: aapsLogger.error("Error parsing TherapyEvent json $json")
                    }
                eventType == TherapyEvent.Type.COMBO_BOLUS.text             ->
-                    if (config.NSCLIENT) {
+                    if (buildHelper.isEngineeringMode() && sp.getBoolean(R.string.key_ns_receive_tbr_eb, false) || config.NSCLIENT) {
                        extendedBolusFromJson(json)?.let { extendedBolus ->
                            repository.runTransactionForResult(SyncNsExtendedBolusTransaction(extendedBolus))
                                .doOnError {
@ -356,7 +356,7 @@ class NSClientAddUpdateWorker(
                        } ?: aapsLogger.error("Error parsing ExtendedBolus json $json")
                    }
                eventType == TherapyEvent.Type.TEMPORARY_BASAL.text         ->
-                    if (config.NSCLIENT) {
+                    if (buildHelper.isEngineeringMode() && sp.getBoolean(R.string.key_ns_receive_tbr_eb, false) || config.NSCLIENT) {
                        temporaryBasalFromJson(json)?.let { temporaryBasal ->
                            repository.runTransactionForResult(SyncNsTemporaryBasalTransaction(temporaryBasal))
                                .doOnError {
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.kt
@ -21,8 +21,8 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

 class NSClientFragment : DaggerFragment() {
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt
@ -38,7 +38,7 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
@ -159,6 +159,7 @@ class NSClientPlugin @Inject constructor(
 //            preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_ns_receive_carbs))?.isVisible = buildHelper.isEngineeringMode()
 //            preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_ns_receive_temp_target))?.isVisible = buildHelper.isEngineeringMode()
        }
+        preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_ns_receive_tbr_eb))?.isVisible = buildHelper.isEngineeringMode()
    }

    private val mConnection: ServiceConnection = object : ServiceConnection {
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt
@ -49,7 +49,7 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.socket.client.IO
 import io.socket.client.Socket
 import io.socket.emitter.Emitter
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@ -78,8 +78,8 @@ import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.androidaps.utils.ui.SingleClickButton
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.androidaps.utils.wizard.QuickWizard
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
@ -24,8 +24,8 @@ import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONObject
 import javax.inject.Inject
 import javax.inject.Singleton
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
@ -32,8 +32,8 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.wizard.QuickWizard
 import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

 class QuickWizardListActivity : DaggerAppCompatActivityWithResult() {
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
@ -13,7 +13,7 @@ import info.nightscout.shared.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject

 /**
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
@ -20,8 +20,8 @@ import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
@ -11,9 +11,9 @@ import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSm
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.HtmlHelper
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.plusAssign
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.util.*
 import javax.inject.Inject
 import kotlin.math.max
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@ -48,8 +48,8 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
 import info.nightscout.shared.SafeParse
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import org.apache.commons.lang3.StringUtils
 import org.joda.time.DateTime
 import java.text.Normalizer
@ -67,7 +67,7 @@ class SmsCommunicatorPlugin @Inject constructor(
    injector: HasAndroidInjector,
    aapsLogger: AAPSLogger,
    rh: ResourceHelper,
-    private val smsManager: SmsManager,
+    private val smsManager: SmsManager?,
    private val aapsSchedulers: AapsSchedulers,
    private val sp: SP,
    private val constraintChecker: ConstraintChecker,
@ -165,7 +165,7 @@ class SmsCommunicatorPlugin @Inject constructor(
    override fun updatePreferenceSummary(pref: Preference) {
        super.updatePreferenceSummary(pref)
        if (pref is EditTextPreference) {
-            if (pref.getKey().contains("smscommunicator_allowednumbers") && (pref.text == null || TextUtils.isEmpty(pref.text.trim { it <= ' ' }))) {
+            if (pref.getKey().contains("smscommunicator_allowednumbers") && (TextUtils.isEmpty(pref.text?.trim { it <= ' ' }))) {
                pref.setSummary(rh.gs(R.string.smscommunicator_allowednumbers_summary))
            }
        }
@ -1100,10 +1100,10 @@ class SmsCommunicatorPlugin @Inject constructor(
        sms.text = stripAccents(sms.text)
        try {
            aapsLogger.debug(LTag.SMS, "Sending SMS to " + sms.phoneNumber + ": " + sms.text)
-            if (sms.text.toByteArray().size <= 140) smsManager.sendTextMessage(sms.phoneNumber, null, sms.text, null, null)
+            if (sms.text.toByteArray().size <= 140) smsManager?.sendTextMessage(sms.phoneNumber, null, sms.text, null, null)
            else {
-                val parts = smsManager.divideMessage(sms.text)
-                smsManager.sendMultipartTextMessage(sms.phoneNumber, null, parts,
+                val parts = smsManager?.divideMessage(sms.text)
+                smsManager?.sendMultipartTextMessage(sms.phoneNumber, null, parts,
                    null, null)
            }
            messages.add(sms)
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt
@ -14,10 +14,10 @@ import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolD
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolResetData
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolUpdateGUI
 import info.nightscout.androidaps.utils.FabricPrivacy
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.plusAssign
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject

 class TidepoolFragment : DaggerFragment() {
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
@ -30,11 +30,11 @@ import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.plusAssign
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
@ -68,6 +68,7 @@ class TidepoolPlugin @Inject constructor(
    private val listLog = ArrayList<EventTidepoolStatus>()
    var textLog: Spanned = HtmlHelper.fromHtml("")

+    @Suppress("RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS", "NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS", "UNNECESSARY_NOT_NULL_ASSERTION")
    override fun onStart() {
        super.onStart()
        disposable += rxBus
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
@ -42,8 +42,8 @@ import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.androidaps.utils.wizard.BolusWizard
 import info.nightscout.androidaps.utils.wizard.QuickWizard
 import info.nightscout.shared.SafeParse
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt
@ -20,7 +20,7 @@ import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt
@ -15,8 +15,8 @@ import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
@ -34,8 +34,8 @@ import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONArray
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledFuture
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
@ -34,8 +34,8 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.ui.TimeListEdit
 import info.nightscout.shared.SafeParse
 import info.nightscout.shared.logging.AAPSLogger
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.math.RoundingMode
 import java.text.DecimalFormat
 import javax.inject.Inject
@ -61,7 +61,7 @@ class LocalProfileFragment : DaggerFragment() {
    private val save = Runnable {
        doEdit()
        basalView?.updateLabel(rh.gs(R.string.basal_label) + ": " + sumLabel())
-        localProfilePlugin.profile?.getSpecificProfile(binding.profileList.text.toString())?.let {
+        localProfilePlugin.getEditedProfile()?.let {
            binding.basalGraph.show(ProfileSealed.Pure(it))
            binding.icGraph.show(ProfileSealed.Pure(it))
            binding.isfGraph.show(ProfileSealed.Pure(it))
@ -81,7 +81,7 @@ class LocalProfileFragment : DaggerFragment() {
    }

    private fun sumLabel(): String {
-        val profile = localProfilePlugin.getEditProfile()
+        val profile = localProfilePlugin.getEditedProfile()
        val sum = profile?.let { ProfileSealed.Pure(profile).baseBasalSum() } ?: 0.0
        return " ∑" + DecimalFormatter.to2Decimal(sum) + rh.gs(R.string.insulin_unit_shortname)
    }
@ -237,10 +237,7 @@ class LocalProfileFragment : DaggerFragment() {
                            localProfilePlugin.currentProfileIndex = position
                            localProfilePlugin.isEdited = false
                            build()
-                        }, {
-                            val selection = localProfilePlugin.currentProfileIndex
-                            if (selection in 0 until (binding.profileList.adapter?.count ?: -1)) binding.profileList.setSelection(selection)
-                        }
+                        }, null
                    )
                }
            } else {
@ -248,7 +245,7 @@ class LocalProfileFragment : DaggerFragment() {
                build()
            }
        }
-        localProfilePlugin.profile?.getSpecificProfile(binding.profileList.text.toString())?.let {
+        localProfilePlugin.getEditedProfile()?.let {
            binding.basalGraph.show(ProfileSealed.Pure(it))
            binding.icGraph.show(ProfileSealed.Pure(it))
            binding.isfGraph.show(ProfileSealed.Pure(it))
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
@ -170,7 +170,7 @@ class LocalProfilePlugin @Inject constructor(
    }

    @Synchronized
-    fun getEditProfile(): PureProfile? {
+    fun getEditedProfile(): PureProfile? {
        val profile = JSONObject()
        with(profiles[currentProfileIndex]) {
            profile.put("dia", dia)
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
@ -21,8 +21,8 @@ import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject

 class VirtualPumpFragment : DaggerFragment() {
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
@ -28,8 +28,8 @@ import info.nightscout.androidaps.utils.TimeChangeType
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONException
 import org.json.JSONObject
 import javax.inject.Inject
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
@ -34,8 +34,8 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject

--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt
@ -26,7 +26,7 @@ import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.XDripBroadcast
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
@ -18,8 +18,8 @@ import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.XDripBroadcast
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueueImplementation.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueueImplementation.kt
@ -41,9 +41,9 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.subscribeBy
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
--- a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt
@ -52,7 +52,7 @@ class QueueThread internal constructor(
                val secondsElapsed = (System.currentTimeMillis() - connectionStartTime) / 1000
                val pump = activePlugin.activePump
                //  Manifest.permission.BLUETOOTH_CONNECT
-                if (config.PUMPDRIVERS && Build.VERSION.SDK_INT >= /*Build.VERSION_CODES.S*/31)
+                if (config.PUMPDRIVERS && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                    if (androidPermission.permissionNotGranted(context, "android.permission.BLUETOOTH_CONNECT")) {
                        aapsLogger.debug(LTag.PUMPQUEUE, "no permission")
                        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTING))
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt
@ -8,7 +8,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.events.EventStatus
 import info.nightscout.androidaps.setupwizard.elements.SWItem
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject

 class SWEventListener constructor(
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
@ -24,7 +24,7 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.locale.LocaleHelper.update
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 import kotlin.math.max
 import kotlin.math.min
--- a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt
@ -97,7 +97,7 @@ class AndroidPermission @Inject constructor(

    @Synchronized
    fun notifyForBtConnectPermission(activity: FragmentActivity) {
-        if (Build.VERSION.SDK_INT >= /*Build.VERSION_CODES.S*/31) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
            //  Manifest.permission.BLUETOOTH_CONNECT
            if (permissionNotGranted(activity, "android.permission.BLUETOOTH_CONNECT") || permissionNotGranted(activity, "android.permission.BLUETOOTH_SCAN")) {
                val notification = NotificationWithAction(injector, Notification.PERMISSION_BT, rh.gs(R.string.needconnectpermission), Notification.URGENT)
--- a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
@ -22,8 +22,8 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.min
--- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
@ -33,8 +33,8 @@ import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.*
 import javax.inject.Inject
 import kotlin.math.abs
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@ -129,7 +129,6 @@
    <string name="end_user_license_agreement">Eindverbruiker Lisensie Ooreenkoms</string>
    <string name="end_user_license_agreement_text">MOET NIE GEBRUIK WORD OM MEDIESE BESLUITE TE MAAK NIE. DAAR IS GEEN WAARBORG DAT DIE PROGRAM, ONDERWORPE AAN TOEPASSELIKE WETTE EN WETGEWING. TENSY ANDERS GEMELD IN TEKS VOORSIEN DIE KOPIEREG-HOUERS EN / OF ANDER PARTYE DIE PROGRAM \"AS IS\" SONDER ËNIGE WAARBORG VAN ENIGE ORDE, UITDRUKKELIK OF IMPLISIET, INKLUSIEF, MAAR NIE BEPERK TOT DIE IMPLISIETE WAARBORG VAN TOEPAASBAARHEID OF NUT VIR EEN SPESIFIEKE DOEL. DIE TOTALE EN ALLE RISIKOVIR DIE KWALITEIT EN PRESTASIE VAN DIE PROGRAM RUS MET JOUSELF. VIR ENIGE PROGRAM DEFEKTIEWE OF FALINGS MOET JY PERSOONLIK DIE KOSTE EN REGSAANSPREEKLIKHEID DRA VAN ALLE NODIGE AKSIES, DIENS, REPARASIES OF KORREKSIES VIR USELF OF ENIGE DERDE PARTYE EN/OF AKSIES, DIENS, REPARASIES OF KORREKSIES WAT DEUR DIE PROGRAM GEDOEN WAS.</string>
    <string name="end_user_license_agreement_i_understand">EK VERSTAAN en STEM IN</string>
-    <string name="save">Stoor</string>
    <string name="reloadprofile">Herlaai profiel</string>
    <string name="smscommunicator">SMS Communicator</string>
    <string name="smscommunicator_allowednumbers">Toegelate telefoon nommers</string>
@ -310,8 +309,6 @@
    <string name="keep_screen_on_summary">Verhoed dat Android skerm afskakel. Dit sal baie meer energie vereis wanneer nie in krag prop is nie.</string>
    <string name="sensitivity_warning">Deur Autosense aan te skakel onthou om alle koolhidrate in te voer Andersins sal koolhidrate dwalinge verkeerdelik geïdentifiseer word as sensitiwiteit veranderinge!!</string>
    <string name="sensitivityweightedaverage">Sensitiwiteit GeweegdeGemiddelde</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Kanselleer</string>
    <string name="notloadedplugins">Nie alle profiele gelaai!</string>
    <string name="valuesnotstored">Waardes nie gestoor!</string>
    <string name="ns_localbroadcasts_title">Aktiveer plaaslike Uitsaai.</string>
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@ -160,7 +160,6 @@
    <string name="end_user_license_agreement">Лицензионно споразумение с краен потребител</string>
    <string name="end_user_license_agreement_text">НЕ ТРЯБВА ДА СЕ ИЗПОЛЗВА ЗА ВЗЕМАНЕ НА МЕДИЦИНСКИ РЕШЕНИЯ. НЯМА ГАРАНЦИЯ ЗА ПРОГРАМАТА, ДО СТЕПЕНТА, ПОЗВОЛЕНА ОТ ПРИЛОЖИМОТО ПРАВО. ОСВЕН КОГАТО Е ПОСОЧЕНО ДРУГО В ПИСМЕН ВИД, ПРИТЕЖАТЕЛИТЕ НА АВТОРСКОТО ПРАВО И/ИЛИ ДРУГИ СТРАНИ ПРЕДОСТАВЯТ ПРОГРАМАТА \"КАКТО Е\", БЕЗ ГАРАНЦИИ ОТ ВСЯКАКЪВ ВИД,  ИЗРАЗЕНИ ИЛИ ПОДРАЗБИРАЩИ СЕ, ВКЛЮЧИТЕЛНО, НО НЕ САМО, ПОДРАЗБИРАЩИ СЕ ГАРАНЦИИ ЗА ПРОДАВАЕМОСТ И ПРИГОДНОСТ ЗА  КОНКРЕТНА ЦЕЛ. ЦЕЛИЯ РИСК ПО ОТНОШЕНИЕ НА КАЧЕСТВОТО И ЕФЕКТИВНОСТТА НА ПРОГРАМАТА Е САМО ВАШ. АКО ПРОГРАМАТА НЕ СРАБОТИ, ВИЕ ПОЕМАТЕ  ВСИЧКИ НЕОБХОДИМИ РАЗХОДИ ЗА ОБСЛУЖВАНЕ, РЕМОНТ ИЛИ КОРЕКЦИЯ.</string>
    <string name="end_user_license_agreement_i_understand">Разбирам и приемам</string>
-    <string name="save">Съхрани</string>
    <string name="reloadprofile">Презареди профил</string>
    <string name="smscommunicator">SMS комуникатор</string>
    <string name="smscommunicator_allowednumbers">Разрешени телефонни номера</string>
@ -424,8 +423,6 @@
    <string name="keep_screen_on_summary">Предотвратяване на андроид да изключва екрана. Това ще доведе до консумацията на много енергия, когато устройството не е включено в контакта.</string>
    <string name="sensitivity_warning">Когато включите Autosense feature трябва да въвеждате ВСИЧКИ въглехидрати. В противен случай те ще се изчисляват грешно като повишена чувствителност!!</string>
    <string name="sensitivityweightedaverage">чрез Среднопретеглената стойност</string>
-    <string name="mdtp_ok">ОК</string>
-    <string name="mdtp_cancel">Откажи</string>
    <string name="notloadedplugins">Не всички профили са заредени!</string>
    <string name="valuesnotstored">Стойностите не са запазени!</string>
    <string name="ns_localbroadcasts">Активира предаване на данни към други приложения (като xDrip+). Не активирайте, ако имате повече от един AAPS или имате инсталиран NSClient!</string>
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@ -156,7 +156,6 @@
    <string name="end_user_license_agreement">Acord de llicència per a l\'usuari final</string>
    <string name="end_user_license_agreement_text">NO S\'HA D\'UTILITZAR PER A PRENDRE DECISIONS MÈDIQUES. EL PROGRAMA NO TÉ GARANTIA, EN LA MESURA QUE HO PERMET LA LLEI APLICABLE. EXCEPTE QUAN S\'INDIQUI EL CONTRARI PER ESCRIT, ELS PROPIETARIS DEL COPYRIGHT I/O ALTRES PARTS PROPORCIONEN EL PROGRAMA \"TAL QUAL\" SENSE CAP MENA DE GARANTIA, NI IMPLÍCITA NI EXPLÍCITA, INCLOENT, PERÒ SENSE ESTAR LIMITADES A, LES GARANTIES IMPLÍCITES DE COMERCIALITZACIÓ I ADEQUACIÓ A UN OBJECTIU PARTICULAR. US FEU RESPONSABLES TOTALMENT DELS RISCOS EN QUANT A LA QUALITAT I EL RENDIMENT DEL PROGRAMA. SI EL PROGRAMA FOS DEFECTUÓS, VOSALTRES ASSUMIU EL COST DE TOT SERVEI, REPARACIÓ O CORRECCIÓ.</string>
    <string name="end_user_license_agreement_i_understand">ENTENC I ACCEPTO</string>
-    <string name="save">Desar</string>
    <string name="reloadprofile">Recarregar perfil</string>
    <string name="smscommunicator">Comunicador SMS</string>
    <string name="smscommunicator_allowednumbers">Nrs. de telèfon permesos</string>
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -162,7 +162,6 @@
    <string name="end_user_license_agreement">Licenční ujednání</string>
    <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
    <string name="end_user_license_agreement_i_understand">ROZUMÍM A POTVRZUJI</string>
-    <string name="save">Uložit</string>
    <string name="reloadprofile">Obnovit profil</string>
    <string name="smscommunicator">SMS komunikátor</string>
    <string name="smscommunicator_allowednumbers">Povolená tel. čísla</string>
@ -429,14 +428,12 @@
    <string name="keep_screen_on_summary">Zabránit Androidu ve zhasínání obrazovky. Bez připojení do nabíječky vybije velice rychle baterii!</string>
    <string name="sensitivity_warning">Při zapnuté detekci sensitivity nezapomeňte vkládat všechny sacharidy. Jinak budou odchylky mylně vyhodnocovány jako změna sensitivity !!</string>
    <string name="sensitivityweightedaverage">Sensitivita vážený průměr</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Zrušit</string>
    <string name="notloadedplugins">Všechny profily nenačteny!</string>
    <string name="valuesnotstored">Hodnoty nejsou uloženy!</string>
    <string name="ns_localbroadcasts">Povolit vysílání do jiných aplikací (například xDrip+). Nepovolujte, pokud máte instalovánu více než jednu instanci AAPS nebo NSClient!</string>
    <string name="ns_localbroadcasts_title">Povolení odesílaní</string>
    <string name="openapssmb">OpenAPS SMB</string>
-    <string name="openaps_smb_dynamic_isf">OpenAPS SMB s dynamickým ISF</string>
+    <string name="openaps_smb_dynamic_isf">Dynamická ISF</string>
    <string name="enableuam">Povolit UAM</string>
    <string name="enablesmb">Povolit SMB</string>
    <string name="enablesmb_summary">Použít super mikro bolusy místo dočasných bazálů pro zrychlení účinku</string>
@ -666,6 +663,9 @@
    <string name="sensitivity_raises_target_title">Citlivost zvyšuje cíl</string>
    <string name="sensitivity_raises_target_summary">Je-li zjištěna vyšší citlivost, zvýší nastavenou cílovou glykémii</string>
    <string name="careportal_removestartedevents">Vyčistit události \"AndroidAPS restartován\"</string>
+    <string name="show_invalidated">Zobrazit neplatné</string>
+    <string name="hide_invalidated">Skrýt zneplatněné</string>
+    <string name="remove_items">Odstranit položky</string>
    <string name="storedsettingsfound">Nalezeno uložené nastavení</string>
    <string name="allow_hardware_pump_text">POZOR: Pokud aktivuje a připojíte skutečnou pumpu, AndroidAPS nakopíruje (a bude udržovat) nastavení bazálu z aktivního profilu do pumpy. Nastavení bazálu v pumpě bude přepsáno. Pokud si nejste jistí nebo nechcete přepsat bazály v pumpě, stiskněte Zrušit a opakujte přepnutí na jinou pumpu později.</string>
    <string name="error_adding_treatment_title">Data ošetření neúplná</string>
@ -882,6 +882,8 @@
    <string name="ns_receive_profile_switch_summary">Přijmout přepnutí profilu zadané prostřednictvím NS nebo NSClienta</string>
    <string name="ns_receive_offline_event">Přijímat události APS offline</string>
    <string name="ns_receive_offline_event_summary">Přijmout APS offline události zadané prostřednictvím NS nebo NSClienta</string>
+    <string name="ns_receive_tbr_eb">Přijímat dočasný bazál a kombinovany bolus</string>
+    <string name="ns_receive_tbr_eb_summary">Přijmout dočasný bazál a kombo bolus zadaný přes jinou instanci</string>
    <string name="ns_receive_insulin">Přijímat inzulín</string>
    <string name="ns_receive_insulin_summary">Přijmout inzulín vložený přes NS nebo NSClient (není dodán, pouze započítán do IOB)</string>
    <string name="ns_receive_carbs">Přijímat sacharidy</string>
@ -974,4 +976,15 @@
    <string name="wear_unknown_action_string">Neznámý příkaz k akci:</string>
    <string name="overview_editquickwizard_percentage">Procentní podíl</string>
    <string name="app_default">Výchozí nastavení aplikace</string>
+    <string name="select_profile">Vyberte profil pro úpravu</string>
+    <string name="refresh_from_nightscout">Obnovit z Nightscoutu</string>
+    <string name="remove_selected_items">Odstranit zvolené položky</string>
+    <string name="select_for_removal">Vyberte pro odstranění</string>
+    <string name="profile_changes">Změny profilu</string>
+    <string name="tempt_targets">Dočasné cíle</string>
+    <string name="carbs_and_bolus">Sacharidy a bolusy</string>
+    <string name="confirm_remove_multiple_items">Opravdu chcete odstranit %1$d položku(y)</string>
+    <string name="hide_loop">Skrýt smyčku</string>
+    <string name="show_loop">Zobrazit smyčku</string>
+    <string name="count_selected">Vybráno: %1$d</string>
 </resources>
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@ -161,7 +161,6 @@
    <string name="end_user_license_agreement">Slutbrugerlicensaftale</string>
    <string name="end_user_license_agreement_text">MÅ IKKE BRUGES TIL AT TRÆFFE MEDICINSKE BESLUTNINGER. DER ER INGEN GARANTI FOR PROGRAMMET, I DET OMFANG GÆLDENDE LOV TILLADER DET. UNDTAGEN NÅR DET ELLERS ER ANFØRT SKRIFTLIGT, AT RETTIGHEDSHAVERE OG / ELLER ANDRE PARTER LEVERER PROGRAMMET \"SOM BESET\" UDEN NOGEN FORM FOR GARANTI, HVERKEN UDTRYKT ELLER UNDERFORSTÅET, HERUNDER, MEN IKKE BEGRÆNSET TIL, DE UNDERFORSTÅELIGHEDER, DER ER FORBUNDET MED EGNETHED OG EGNETHED TIL ET BESTEMT FORMÅL. HELE RISIKOEN MED HENSYN TIL KVALITETEN OG YDEEVNEN AF PROGRAMMET ER DIN. HVIS PROGRAMMET VISER SIG AT VÆRE DEFEKT, BÆRER DU SELV OMKOSTNINGERNE VED ALLE NØDVENDIGE SERVICER, REPARATIONER ELLER KORREKTIONER SOM ER NØDVENDIGE.</string>
    <string name="end_user_license_agreement_i_understand">JEG FORSTÅR OG ER ENIG</string>
-    <string name="save">Gem</string>
    <string name="reloadprofile">Genindlæs profil</string>
    <string name="smscommunicator">SMS Kommunikator</string>
    <string name="smscommunicator_allowednumbers">Tilladte telefonnumre</string>
@ -426,8 +425,6 @@
    <string name="keep_screen_on_summary">Forhindrer Android i at slukke for skærmen. Det vil forbruge meget energi, når den ikke er tilsluttet stikkontakt.</string>
    <string name="sensitivity_warning">Ved at slå funktionen Autosense til husk at indtaste alle spiste kulhydrater. Ellers vil kulhydrat afvigelser blive identificeret forkert som følsomheds ændring !!</string>
    <string name="sensitivityweightedaverage">Følsomhed Vægtet Gennemsnit</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Annuller</string>
    <string name="notloadedplugins">Ikke alle profiler er indlæst!</string>
    <string name="valuesnotstored">Værdier ikke gemt!</string>
    <string name="ns_localbroadcasts">Aktiver udsendelse til andre apps (såsom xDrip+). Aktiver ikke hvis du har mere end én version af AAPS eller NSClient installeret!</string>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -161,7 +161,6 @@
    <string name="end_user_license_agreement">Endbenutzervereinbarung</string>
    <string name="end_user_license_agreement_text">DAS PROGRAMM DARF NICHT FÜR MEDIZINISCHE ENTSCHEIDUNGEN BENUTZT WERDEN. ES GIBT IN DIESEM PROJEKT KEINE GEWÄHRLEISTUNG ODER GARANTIERTE UNTERSTÜTZUNG IN IRGENDEINER ART. WENN DU DICH ENTSCHEIDEST, ES ZU NUTZEN, HÄNGT DIE QUALITÄT UND LEISTUNGSFÄHIGKEIT DIESES PROJEKTES VON DIR SELBST AB. ES WIRD \"WIE BESEHEN\" ZUR VERFÜGUNG GESTELLT. SOLLTE SICH DAS PROGRAMM ALS FEHLERHAFT ERWEISEN, ÜBERNIMMST DU ALLE NOTWENDIGEN KRANKHEITSKOSTEN, SERVICELEISTUNGEN, REPARATUREN ODER KORREKTUREN.</string>
    <string name="end_user_license_agreement_i_understand">Ich verstehe und stimme zu.</string>
-    <string name="save">Speichern</string>
    <string name="reloadprofile">Profil neuladen</string>
    <string name="smscommunicator">SMS-Kommunikator</string>
    <string name="smscommunicator_allowednumbers">Erlaubte Telefonnummern</string>
@ -427,8 +426,6 @@
    <string name="keep_screen_on_summary">Hindere Android daran, den Bildschirm abzuschalten. Dies erhöht den Energieverbrauch, wenn das Gerät nicht an einem Ladegerät angeschlossen ist.</string>
    <string name="sensitivity_warning">Stelle bei aktivierter Autosens-Funktion sicher, dass du alle eingenommenen Kohlenhydrate eingibst. Ansonsten können die Kohlenhydrat-Abweichungen zu falschen Sensitivitätswerten führen!</string>
    <string name="sensitivityweightedaverage">Durchschnittliche Sensitivität</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Abbrechen</string>
    <string name="notloadedplugins">Es sind nicht alle Profile geladen!</string>
    <string name="valuesnotstored">Werte nicht gespeichert!</string>
    <string name="ns_localbroadcasts">Aktiviere die Datenübertragung zu anderen Apps (z.B. xDrip+). Nicht aktivieren, falls Du mehr als eine Instanz von AAPS oder NSClient installiert hast!</string>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@ -131,7 +131,6 @@
    <string name="end_user_license_agreement">Άδεια χρήσης τελικού χρήστη</string>
    <string name="end_user_license_agreement_text">ΔΕΝ ΠΡΕΠΕΙ ΝΑ ΧΡΗΣΙΜΟΠΟΙΗΘΕΙ ΓΙΑ ΝΑ ΚΑΝΕΤΕ ΙΑΤΡΙΚΗ ΑΠΟΦΑΣΗ. ΔΕΝ ΥΠΑΡΧΕΙ ΕΓΓΥΗΣΗ ΓΙΑ ΤΟ ΠΡΟΓΡΑΜΜΑ, ΣΤΟ ΒΑΘΜΟ ΠΟΥ ΕΠΙΤΡΕΠΕΤΑΙ ΑΠΟ ΤΟ ΕΦΑΡΜΟΣΤΕΟ ΔΙΚΑΙΟ. ΕΚΤΟΣ ΟΠΟΙΑΣΔΗΠΟΤΕ ΔΙΑΒΑΘΜΙΣΜΕΝΗ ΚΑΤΑ ΤΗΝ ΕΓΓΡΑΦΗ ΤΩΝ ΚΑΤΟΧΟΙ ΠΝΕΥΜΑΤΙΚΩΝ ΔΙΚΑΙΩΜΑΤΩΝ ΚΑΙ/Ή ΑΛΛΑ ΜΕΡΗ ΠΑΡΕΧΟΝΤΑΙ ΤΟ ΠΡΟΓΡΑΜΜΑ \"ΩΣ ΕΧΕΙ\" ΧΩΡΙΣ ΕΓΓΥΗΣΗ ΟΠΟΙΟΥΔΗΠΟΤΕ ΕΙΔΟΥΣ, ΕΞΑΙΡΟΥΜΕΝΕΣ Ή ΣΙΩΠΗΡΕΣ, ΣΥΜΠΕΡΙΛΑΜΒΑΝΟΜΕΝΩΝ, ΕΝΔΕΙΚΤΙΚΑ, ΤΩΝ ΣΙΩΠΗΡΩΝ ΕΓΓΥΗΣΕΩΝ ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ΚΑΙ ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Ο ΟΛΟΚΛΗΡΩΜΕΝΟΣ ΚΙΝΔΥΝΟΣ ΟΣΟΝ ΑΦΟΡΑ ΤΗΝ ΠΟΙΟΤΗΤΑ ΚΑΙ ΤΗΝ ΑΠΟΔΟΣΗ ΤΟΥ ΠΡΟΓΡΑΜΜΑΤΟΣ ΕΙΝΑΙ ΔΙΚΟ ΣΑΣ. ΕΑΝ ΤΟ ΠΡΟΓΡΑΜΜΑ ΔΕΝ ΕΙΝΑΙ ΕΛΑΤΤΩΜΑΤΙΚΟ, ΠΡΕΠΕΙ ΝΑ ΕΞΕΤΑΣΤΕ ΤΟ ΚΟΣΤΟΣ ΟΛΩΝ ΤΩΝ ΑΠΑΡΑΙΤΗΤΩΝ ΣΥΝΤΗΡΗΣΕΩΝ, ΕΠΙΣΚΕΥΩΝ Ή ΔΙΟΡΘΩΣΕΩΝ.</string>
    <string name="end_user_license_agreement_i_understand">ΚΑΤΑΛΑΒΑ ΚΑΙ ΣΥΜΦΩΝΩ</string>
-    <string name="save">Αποθήκευση</string>
    <string name="reloadprofile">Ξαναφορτώστε το προφίλ</string>
    <string name="smscommunicator">SMS Επικοινωνία</string>
    <string name="smscommunicator_allowednumbers">Επιτρεπτά τηλεφωνικά νούμερα</string>
@ -312,8 +311,6 @@
    <string name="keep_screen_on_summary">Αποτρέψετε το Android να απενεργοποιήσει την οθόνη. Χωρίς σύνδεση με το φορτιστή, αποφορτίζει πολύ γρήγορα την μπαταρία.</string>
    <string name="sensitivity_warning">Ενεργοποιώντας το autosense θυμηθείτε να εισάγετε όλους τους υδατάνθρακες. Διαφορετικά, οι αποκλίσεις των υδατανθράκων θα εντοπιστούν λανθασμένα ως αλλαγή ευαισθησίας!!</string>
    <string name="sensitivityweightedaverage">Ευαισθησία WeightedAverage</string>
-    <string name="mdtp_ok">ΟΚ</string>
-    <string name="mdtp_cancel">Ακύρωση</string>
    <string name="notloadedplugins">Δεν έχουν φορτωθεί όλα τα προφίλ!</string>
    <string name="valuesnotstored">Οι τιμές δεν αποθηκεύτηκαν!</string>
    <string name="ns_localbroadcasts_title">Ενεργοποιήστε τις τοπικές αποστολές.</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -162,7 +162,6 @@
    <string name="end_user_license_agreement">Acuerdo de licencia de usuario final</string>
    <string name="end_user_license_agreement_text">NO DEBE UTILIZARSE PARA TOMAR DECISIONES MÉDICAS. NO HAY NINGUNA GARANTÍA EN EL PROGRAMA, EN LA MEDIDA PERMITIDA POR LA LEY APLICABLE. EXCEPTO CUANDO SE INDIQUE LO CONTRARIO POR ESCRITO, LOS TITULARES DE LOS DERECHOS DE AUTOR Y/O OTRAS PARTES, PROPORCIONAN EL PROGRAMA \"TAL CUAL\", SIN GARANTÍA DE NINGÚN TIPO, YA SEA EXPRESA O IMPLÍCITA, INCLUIDAS, ENTRE OTRAS, LAS GARANTÍAS IMPLÍCITAS DE COMERCIABILIDAD Y ADECUACIÓN PARA UN PROPÓSITO EN PARTICULAR. TODO EL RIESGO EN CUANTO A LA CALIDAD Y EL RENDIMIENTO DEL PROGRAMA ES SUYA. SI EL PROGRAMA TUVIERA UN ERROR, USTED ASUME EL COSTE DE TODOS LOS SERVICIOS, REPARACIONES O CORRECCIONES NECESARIAS.</string>
    <string name="end_user_license_agreement_i_understand">LO ENTIENDO Y ACEPTO</string>
-    <string name="save">Guardar</string>
    <string name="reloadprofile">Recargar Perfil</string>
    <string name="smscommunicator">Comunicador SMS</string>
    <string name="smscommunicator_allowednumbers">Números de teléfono permitidos</string>
@ -429,14 +428,12 @@
    <string name="keep_screen_on_summary">Evita que Android apague la pantalla. Consume mucha batería cuando el teléfono no está conectado al cargador</string>
    <string name="sensitivity_warning">Al activar Autosens, recuerda introducir todos carbohidratos que has comido, sino, las desviaciones de carbohidratos serán identificados incorrectamente, como un cambio de sensibilidad</string>
    <string name="sensitivityweightedaverage">Sensibilidad promedio ponderada</string>
-    <string name="mdtp_ok">Ok</string>
-    <string name="mdtp_cancel">Cancelar</string>
    <string name="notloadedplugins">Faltan perfiles por cargar!</string>
    <string name="valuesnotstored">Valores no guardados!</string>
    <string name="ns_localbroadcasts">Habilita las transmisiones a otras aplicaciones (como xDrip+). ¡No lo habilites si tienes más de una instancia de AAPS o NSClient instaladas!</string>
    <string name="ns_localbroadcasts_title">Habilitar la emisión de mensajes localmente.</string>
    <string name="openapssmb">OpenAPS SMB</string>
-    <string name="openaps_smb_dynamic_isf">OpenAPS SMB ISF Dinámico</string>
+    <string name="openaps_smb_dynamic_isf">ISF Dinámico</string>
    <string name="enableuam">Activar UAM</string>
    <string name="enablesmb">Activar SMB</string>
    <string name="enablesmb_summary">Usar microbolos en lugar de basales temporales, para corregir más rápidamente</string>
@ -666,6 +663,9 @@
    <string name="sensitivity_raises_target_title">Sensibilidad aumenta el objetivo</string>
    <string name="sensitivity_raises_target_summary">Cuando se detecta sensibilidad a la insulina, aumenta el objetivo de glucosa</string>
    <string name="careportal_removestartedevents">Comenzar la limpieza de AndroidAPS</string>
+    <string name="show_invalidated">Mostrar invalidados</string>
+    <string name="hide_invalidated">Ocultar invalidados</string>
+    <string name="remove_items">Eliminar elementos</string>
    <string name="storedsettingsfound">Encontrados ajustes de configuración</string>
    <string name="allow_hardware_pump_text">Atención: si activas y conectas la bomba con AndroidAPS, AndroidAPS sobrescribirá los ajustes de basales del perfil de la bomba, con los establecidos en el perfil de AndroidAPS. Comprueba que tengas el perfil basal correcto en AndroidAPS. Si no estás seguro, o no quieres sobrescribir los ajustes basales en la bomba, presiona cancelar y repite la vinculación más adelante.</string>
    <string name="error_adding_treatment_title">Datos de tratamiento incompletos</string>
@ -882,6 +882,8 @@
    <string name="ns_receive_profile_switch_summary">Aceptar cambios de perfil registrados mediante Nightscout o NSClient</string>
    <string name="ns_receive_offline_event">Recibir eventos de desconexión de APS</string>
    <string name="ns_receive_offline_event_summary">Aceptar eventos de desconexión de APS registrados mediante Nightscout o NSClient</string>
+    <string name="ns_receive_tbr_eb">Recibir TBR y EB</string>
+    <string name="ns_receive_tbr_eb_summary">Aceptar TBR y EB ingresados mediante otra instancia</string>
    <string name="ns_receive_insulin">Recibir insulina</string>
    <string name="ns_receive_insulin_summary">Aceptar insulina registrada mediante Nightscout o NSClient (no se entrega, sólo se calcula para IOB)</string>
    <string name="ns_receive_carbs">Recibir carbohidratos</string>
@ -974,4 +976,15 @@
    <string name="wear_unknown_action_string">Comando de acción desconocido:</string>
    <string name="overview_editquickwizard_percentage">Porcentaje</string>
    <string name="app_default">Aplicación por defecto</string>
+    <string name="select_profile">Seleccione el perfil a editar</string>
+    <string name="refresh_from_nightscout">Actualizar de Nightscout</string>
+    <string name="remove_selected_items">Borrar elementos seleccionados</string>
+    <string name="select_for_removal">Selecciona para eliminar</string>
+    <string name="profile_changes">Cambios de perfil</string>
+    <string name="tempt_targets">Objetivos temporales</string>
+    <string name="carbs_and_bolus">Carbohidratos y bolos</string>
+    <string name="confirm_remove_multiple_items">¿Está seguro de que quiere eliminar %1$d elementos?</string>
+    <string name="hide_loop">Ocultar bucle</string>
+    <string name="show_loop">Mostrar bucle</string>
+    <string name="count_selected">%1$d selecionado</string>
 </resources>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -25,6 +25,7 @@
    <string name="description_ns_client">Synchronise vos données avec Nightscout</string>
    <string name="description_ama">État de l’algorithme en 2017</string>
    <string name="description_smb">Algorithme le plus récent pour les utilisateurs avancés</string>
+    <string name="description_smb_dynamic_isf">Algorithme le plus récent pour les utilisateurs avancés avec SI dynamique/automatique</string>
    <string name="description_overview">Affiche l’état actuel de votre Boucle et des boutons d’actions les plus courantes</string>
    <string name="description_persistent_notification">Affiche une notification en cours avec un bref aperçu de ce que fait votre Boucle</string>
    <string name="description_profile_local">Définissez un profil qui est disponible hors ligne.</string>
@ -162,7 +163,6 @@
    <string name="end_user_license_agreement_text">NE DOIT PAS ÊTRE UTILISÉ POUR PRENDRE DES DÉCISIONS MÉDICALES. IL N\'Y A AUCUNE GARANTIE POUR LE PROGRAMME, DANS LA LIMITE PERMISE PAR LA LOI APPLICABLE. SAUF S\'IL EST INDIQUÉ LE CONTRAIRE PAR ÉCRIT. LES TITULAIRES DU DROIT D\'AUTEUR ET / OU D\'AUTRES PARTIES FOURNISSENT LE PROGRAMME «EN L\'ÉTAT» SANS GARANTIE D\'AUCUNE SORTE, EXPLICITE OU IMPLICITE, Y COMPRIS MAIS NON SEULEMENT AUX GARANTIES IMPLICITES DE QUALITÉ MARCHANDE ET D\'ADÉQUATION À UN USAGE PARTICULIER
 L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME SONT DE VOTRE RESPONSABILITÉ. SI LE PROGRAMME EST DÉFECTUEUX, VOUS ASSUMEZ LE COÛT DE TOUS LES SERVICES, RÉPARATIONS OU CORRECTIONS NÉCESSAIRES.</string>
    <string name="end_user_license_agreement_i_understand">JE COMPRENDS ET J\'ACCEPTE LES CONDITIONS DU CONTRAT</string>
-    <string name="save">Sauvegarder</string>
    <string name="reloadprofile">Actualiser le profil</string>
    <string name="smscommunicator">Communicateur SMS</string>
    <string name="smscommunicator_allowednumbers">Numéros de tél autorisés</string>
@ -268,6 +268,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="configbuilder_shortname">CONF</string>
    <string name="loop_shortname">BOUCLE</string>
    <string name="oaps_shortname">OAPS</string>
+    <string name="dynisf_shortname">DynSI</string>
    <string name="localprofile_shortname">PL</string>
    <string name="overview_shortname">ACCUEIL</string>
    <string name="virtualpump_shortname">POMPEV</string>
@ -428,13 +429,12 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="keep_screen_on_summary">Empêcher Android d\'éteindre l\'écran. Ceci consommera beaucoup de batterie lorsque vous n’êtes pas connecté à une prise de courant.</string>
    <string name="sensitivity_warning">En activant la fonction Autosens, n’oubliez pas de rentrer tous les glucides consommés. Sinon les déviations de glucides seront incorrectement identifiées pour les changements de sensibilité !!</string>
    <string name="sensitivityweightedaverage">Sensibilité avec moyenne pondérée</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Annuler</string>
    <string name="notloadedplugins">Les profils ne sont pas tous téléchargés !</string>
    <string name="valuesnotstored">Valeurs non enregistrées !</string>
    <string name="ns_localbroadcasts">Active les diffusions vers d\'autres applications (comme xDrip+). Ne pas activer si plusieurs instances d\'AAPS ou de NSClient sont installées !</string>
    <string name="ns_localbroadcasts_title">Activer les transmissions locales</string>
    <string name="openapssmb">OpenAPS SMB</string>
+    <string name="openaps_smb_dynamic_isf">SI dynamique</string>
    <string name="enableuam">Activer RNS</string>
    <string name="enablesmb">Activer SMB</string>
    <string name="enablesmb_summary">Utiliser les Super Micro Bolus au lieu des débits de base temporaires pour une action rapide</string>
@ -664,6 +664,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="sensitivity_raises_target_title">Sensibilité augmente la cible</string>
    <string name="sensitivity_raises_target_summary">Quand une sensibilité est détectée, augmentation de la glycémie cible</string>
    <string name="careportal_removestartedevents">Réinitialiser AndroidAPS</string>
+    <string name="show_invalidated">Montrer les entrées invalides</string>
+    <string name="hide_invalidated">Masquer les entrées invalides</string>
+    <string name="remove_items">Supprimer des entrées</string>
    <string name="storedsettingsfound">Paramètres sauvegardés trouvés</string>
    <string name="allow_hardware_pump_text">ATTENTION : Si vous activez et connectez à une vraie pompe, AndroidAPS copiera les paramètres Basals du profil vers la pompe, écrasant le taux basal existant stocké sur la pompe. Assurez-vous d\'avoir correctement saisi et réglé les paramètres Basal dans AndroidAPS. Si vous ne savez pas ou si ne voulez pas écraser les paramètres Basal sur votre pompe, appuyez sur Annuler et reporter le passage à la pompe à une date ultérieure.</string>
    <string name="error_adding_treatment_title">Données de traitement incomplètes</string>
@ -971,4 +974,15 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="wear_unknown_action_string">Commande inconnue :</string>
    <string name="overview_editquickwizard_percentage">Pourcentage</string>
    <string name="app_default">Application par défaut</string>
+    <string name="select_profile">Sélectionnez le profil à modifier</string>
+    <string name="refresh_from_nightscout">Rafraîchir à partir de Nightscout</string>
+    <string name="remove_selected_items">Supprimer les entrées sélectionnées</string>
+    <string name="select_for_removal">Sélectionner pour suppression</string>
+    <string name="profile_changes">Changements de profil</string>
+    <string name="tempt_targets">Cibles Temp</string>
+    <string name="carbs_and_bolus">Glucides et bolus</string>
+    <string name="confirm_remove_multiple_items">Êtes-vous sûr de vouloir supprimer %1$d entrée(s)</string>
+    <string name="hide_loop">Masquer la boucle</string>
+    <string name="show_loop">Afficher les entrées boucle</string>
+    <string name="count_selected">%1$d sélectionnée(s)</string>
 </resources>
--- a/app/src/main/res/values-ga-rIE/strings.xml
+++ b/app/src/main/res/values-ga-rIE/strings.xml
@ -60,7 +60,6 @@
    <string name="nav_export">Socruithe Easpórtáil</string>
    <string name="nav_import">Socruithe Iompórtáil</string>
    <string name="check_preferences_import_btn">Iompórtáil</string>
-    <string name="save">Sábháil</string>
    <string name="reloadprofile">Athlódáil próifíl</string>
    <string name="smscommunicator_loophasbeendisabled">Is lúb díchumasaithe</string>
    <string name="smscommunicator_loophasbeenenabled">Is lúb cumasaithe</string>
@ -140,8 +139,6 @@
    <string name="openaps">OpenAPS</string>
    <string name="openaps_short">OAPS</string>
    <string name="basal_short">BUN</string>
-    <string name="mdtp_ok">Ceart go leor</string>
-    <string name="mdtp_cancel">Cuir ar ceal</string>
    <string name="openapssmb">OpenAPS SMB</string>
    <string name="rapid_acting_oref">Rapid-Acting Oref</string>
    <string name="lyumjev">Lyumjev</string>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -25,6 +25,7 @@
    <string name="description_ns_client">Sincronizza i tuoi dati con Nightscout</string>
    <string name="description_ama">Stato dell\'algoritmo nel 2017</string>
    <string name="description_smb">Algoritmo più recente per utenti avanzati</string>
+    <string name="description_smb_dynamic_isf">Algoritmo più recente per utenti avanzati con ISF dinamico/automatico</string>
    <string name="description_overview">Visualizza lo stato corrente del tuo loop e i tasti per le azioni più comuni</string>
    <string name="description_persistent_notification">Mostra una notifica persistente con una breve panoramica di ciò che sta facendo il tuo loop</string>
    <string name="description_profile_local">Definisci un profilo che è disponibile offline.</string>
@ -161,7 +162,6 @@
    <string name="end_user_license_agreement">Contratto di licenza per l\'utente</string>
    <string name="end_user_license_agreement_text">NON DEVE ESSERE USATO PER PRENDERE DECISIONI MEDICHE. NON ESISTE ALCUNA GARANZIA PER IL PROGRAMMA, NELLA MISURA CONSENTITA DALLA LEGGE APPLICABILE. TRANNE QUANDO DIVERSAMENTE INDICATO PER ISCRITTO, I DETENTORI DEL COPYRIGHT E/O ALTRE PARTI FORNISCONO IL PROGRAMMA \"COSÌ COM\'È\" SENZA GARANZIA DI ALCUN TIPO, ESPLICITA O IMPLICITA, INCLUSE, MA NON LIMITATAMENTE A, GARANZIE IMPLICITE DI COMMERCIABILITÀ E IDONEITÀ PER UN SCOPO PARTICOLARE. L\'INTERO RISCHIO RIGUARDO LA QUALITÀ E LE PRESTAZIONI DEL PROGRAMMA È TUO. SE IL PROGRAMMA DOVESSE RISULTARE DIFETTOSO, TI ASSUMI IL COSTO DI TUTTE LE NECESSARIE MANUTENZIONI, RIPARAZIONI O CORREZIONI.</string>
    <string name="end_user_license_agreement_i_understand">COMPRENDO E ACCETTO</string>
-    <string name="save">Salva</string>
    <string name="reloadprofile">Ricarica profilo</string>
    <string name="smscommunicator">Comunicazioni SMS</string>
    <string name="smscommunicator_allowednumbers">Numeri di telefono consentiti</string>
@ -246,6 +246,7 @@
    <string name="wear">Smartwatch</string>
    <string name="resend_all_data">Invia di nuovo tutti i dati</string>
    <string name="open_settings_on_wear">Apri impostazioni sullo smartwatch</string>
+    <string name="basal_rate">Velocità basale</string>
    <string name="basalvaluebelowminimum">Valore basale inferiore al minimo. Profilo non impostato!</string>
    <string name="sms_actualbg">BG:</string>
    <string name="sms_lastbg">Ultimo BG:</string>
@ -426,13 +427,12 @@
    <string name="keep_screen_on_summary">Evita che Android spenga lo schermo. Consumerà molta energia quando non è collegato alla presa di corrente.</string>
    <string name="sensitivity_warning">Attivando la funzione Autosense, ricorda di inserire tutti i carboidrati assunti. Altrimenti le deviazioni di glicemia dovute ai carboidrati saranno identificate erroneamente come variazione di sensibilità !!</string>
    <string name="sensitivityweightedaverage">Sensibilità WeightedAverage</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Annulla</string>
    <string name="notloadedplugins">Non tutti i profili caricati!</string>
    <string name="valuesnotstored">Valori non memorizzati!</string>
    <string name="ns_localbroadcasts">Abilita trasmissioni ad altre app (come xDrip+). Non abilitare se hai installato più di un\'istanza di AAPS o NSClient!</string>
    <string name="ns_localbroadcasts_title">Abilita trasmissioni locali</string>
    <string name="openapssmb">OpenAPS SMB</string>
+    <string name="openaps_smb_dynamic_isf">ISF Dinamico</string>
    <string name="enableuam">Abilita UAM</string>
    <string name="enablesmb">Abilita SMB</string>
    <string name="enablesmb_summary">Usa super-micro-boli al posto della basale temporanea per un\'azione più veloce</string>
@ -661,6 +661,8 @@
    <string name="sensitivity_raises_target_title">La sensibilità aumenta il target</string>
    <string name="sensitivity_raises_target_summary">Quando viene rilevata sensibilità, aumentare la glicemia target</string>
    <string name="careportal_removestartedevents">Rimuovi gli eventi \"AndroidAPS avviato\"</string>
+    <string name="show_invalidated">Mostra invalidato</string>
+    <string name="hide_invalidated">Nascondi invalidato</string>
    <string name="storedsettingsfound">Trovate impostazioni memorizzate</string>
    <string name="allow_hardware_pump_text">Attenzione: se attivi e connetti un micro, AndroidAPS copierà le impostazioni della basale dal profilo al micro, sovrascrivendo la velocità basale esistente memorizzata sul micro. Assicurati di avere la giusta impostazione della basale in AndroidAPS. Se non sei sicuro o non vuoi sovrascrivere le impostazioni della basale sul micro, premi annulla e ripeti il processo in un altro momento.</string>
    <string name="error_adding_treatment_title">Dati trattamento incompleti</string>
@ -756,6 +758,8 @@
    <string name="profilenamecontainsdot">Il nome profilo contiene dei punti.\nQuesto non è supportato da NS.\nIl profilo non viene caricato in NS.</string>
    <string name="low_mark_comment">Valore più basso per l\'intervallo di visualizzazione dell\'area \"in range\"</string>
    <string name="high_mark_comment">Valore più alto per l\'intervallo di visualizzazione dell\'area \"in range\"</string>
+    <string name="age">Età</string>
+    <string name="weight_label">Peso</string>
    <string name="id">ID:</string>
    <string name="submit">Invia</string>
    <string name="mostcommonprofile">Profilo più comune:</string>
@ -901,6 +905,34 @@
    <string name="bg_too_close">BG troppo vicino:\n%1$s\n%2$s</string>
    <string name="identification">Identificazione (email, nick Discord o FB, etc)</string>
    <string name="identification_not_set">Identificazione non impostata in modalità dev</string>
+    <string name="a11y_dialog">dialogo</string>
+    <string name="a11y_current_bg">glicemia corrente</string>
    <string name="not_available_full">Non disponibile</string>
+    <string name="a11y_high">alto</string>
+    <string name="a11y_inrange">in range</string>
+    <string name="a11y_low">basso</string>
+    <string name="a11y_arrow_flat">stabile</string>
+    <string name="a11y_arrow_unknown">sconosciuto</string>
+    <string name="a11y_graph">grafico</string>
+    <string name="a11y_bg_quality">qualità glicemia</string>
+    <string name="a11y_bg_quality_recalculated">ricalcolato</string>
+    <string name="a11y_insulin_label">insulina</string>
+    <string name="a11y_blood_glucose">glicemia</string>
    <!-- WEAR OS-->
+    <string name="wizard_explain_carbs">CHO: %1$.2fU</string>
+    <string name="wizard_explain_cob">COB: %1$.0fg %2$.2fU</string>
+    <string name="wizard_explain_bg">BG: %1$.2fU</string>
+    <string name="wizard_explain_basal_iob">IOB da basale: %1$.2fU</string>
+    <string name="wizard_explain_bolus_iob">IOB da bolo: %1$.2fU</string>
+    <string name="wizard_explain_superbolus">Superbolo: %1$.2fU</string>
+    <string name="wizard_explain_percent">Percentuale: %1$.2fU x %2$d%% ≈ %3$.2fU</string>
+    <string name="wizard_explain_tt">TempT: %1$s</string>
+    <string name="wizard_explain_tt_to">%1$s a %2$s</string>
+    <string name="wizard_pump_not_available">Nessun micro disponibile!</string>
+    <string name="overview_editquickwizard_percentage">Percentuale</string>
+    <string name="remove_selected_items">Rimuovi elementi selezionati</string>
+    <string name="select_for_removal">Seleziona per la rimozione</string>
+    <string name="profile_changes">Modifiche al profilo</string>
+    <string name="hide_loop">Nascondi loop</string>
+    <string name="show_loop">Mostra loop</string>
 </resources>
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@ -162,7 +162,6 @@
    <string name="end_user_license_agreement">הסכם רישיון למשתמש</string>
    <string name="end_user_license_agreement_text">לא מיועד לשימוש למטרת קבלת החלטות רפואיות. בעלי הזכויות מספקים את התוכנית כפי שהיא - \"AS IS\", ללא אחריות מכל סוג שהוא. כל סיכון הנובע מאיכות ו\\או ביצועי התוכנה הוא באחריותך בלבד. במידה ותימצא תקלה בתוכנית, אתם תשאו בכל עלויות שיגרמו לך בשל התקלה.</string>
    <string name="end_user_license_agreement_i_understand">אני מבין\\ה ומסכים\\ה</string>
-    <string name="save">שמור</string>
    <string name="reloadprofile">טעינה מחדש של הפרופיל</string>
    <string name="smscommunicator">תקשורת SMS</string>
    <string name="smscommunicator_allowednumbers">מספרי טלפון מורשים</string>
@ -428,14 +427,11 @@
    <string name="keep_screen_on_summary">מניעת כיבוי המסך. הדבר צורך הרבה כח סוללה.</string>
    <string name="sensitivity_warning">בהפעלת פונקציית ה-Autosens יש לזכור שחייבים להזין למערכת את כל הפחמימות שנאכלו. אחרת פחמימות לא יזוהו נכון כשינוי ברגישות!</string>
    <string name="sensitivityweightedaverage">רגישות משוקללת ממוצעת</string>
-    <string name="mdtp_ok">אישור</string>
-    <string name="mdtp_cancel">ביטול</string>
    <string name="notloadedplugins">לא כל הפרופילים נטענו!</string>
    <string name="valuesnotstored">הערכים לא נשמרו</string>
    <string name="ns_localbroadcasts">אפשר הפצה לאפליקציות אחרות (כגון xDrip). אין להפעיל אם מותקן לכם יותר ממופע אחד של AAPS או NSClient!</string>
    <string name="ns_localbroadcasts_title">אפשר שידורים מקומיים.</string>
    <string name="openapssmb">OpenAPS SMB</string>
-    <string name="openaps_smb_dynamic_isf">OpenAPS SMB רגישות דינאמית</string>
    <string name="enableuam">הפעלת UAM</string>
    <string name="enablesmb">אפשר SMB</string>
    <string name="enablesmb_summary">השתמש בסופר מיקרו בולוסים במקום בבזאלי זמני לפעילות מהירה יותר</string>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@ -157,7 +157,6 @@
    <string name="end_user_license_agreement">최종 사용자 라이선스 동의서</string>
    <string name="end_user_license_agreement_text">이 프로그램을 의학적 결정을 내리는 데 사용해서는 안되며, 여기에 대한 어떠한 보증도 없습니다. 이 프로그램의 품질과 성능에 관한 모든 위험은 사용자에게 있습니다.\nMUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
    <string name="end_user_license_agreement_i_understand">모두 이해하였고 동의합니다.</string>
-    <string name="save">저장</string>
    <string name="reloadprofile">프로파일 새로고침</string>
    <string name="smscommunicator">SMS 통신기</string>
    <string name="smscommunicator_allowednumbers">허가된 전화번호</string>
@ -420,8 +419,6 @@
    <string name="keep_screen_on_summary">안드로이드의 화면이 꺼지는 것을 방지합니다. 전원이 공급되어 있지 않으면 전력소모가 큽니다.</string>
    <string name="sensitivity_warning">Autosense 기능을 켜면 모든 섭취된 탄수화물양을 입력하십시오. 그렇지 않으면 탄수화물 편차(deviations)가 민감도 변화로 잘못 인식될것입니다!!</string>
    <string name="sensitivityweightedaverage">민감도 가중평균</string>
-    <string name="mdtp_ok">네</string>
-    <string name="mdtp_cancel">취소</string>
    <string name="notloadedplugins">모든 프로파일이 로드되지 않았습니다.</string>
    <string name="valuesnotstored">값이 저장되지 않았습니다!</string>
    <string name="ns_localbroadcasts">다른 앱 (예: xDrip)으로 데이터 전송을 활성화합니다. AAPS 또는 NSClient를 두 개 이상 설치 한 경우 활성화하지 마세요!</string>
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@ -161,7 +161,6 @@
    <string name="end_user_license_agreement">Licencinė sutartis su vartotoju</string>
    <string name="end_user_license_agreement_text">PROGRAMA NEGALI BŪTI NAUDOJAMA GYDYMO SPRENDIMAMS PRIIMTI. PAGAL GALIOJANČIUS ĮSTATYMUS PROGRAMA NESUTEIKIA JOKIŲ GARANTIJŲ VARTOTOJUI. JEI RAŠTU NENURODYTA KITAIP, PROGRAMOS AUTORINIŲ TEISIŲ TURĖTOJAS IR/AR KITOS ŠALYS PATEIKIA PROGRAMĄ \"KAIP YRA\" BE JOKIŲ GARANTIJŲ, TIEK AKIVAIZDŽIŲ, TIEK NUMANOMŲ, ĮSKAITANT, BET NEAPSIRIBOJANT GALIMYBĘ NAUDOTI PROGRAMĄ KOMERCINIAMS AR KITOKIEMS DALINIAMS TIKSLAMS. RIZIKĄ, KYLANČIĄ NAUDOJANT PROGRAMĄ PRISIIMA PATS VARTOTOJAS. JEI PROGRAMA VEIKIA NETINKAMAI, IŠLAIDOS, SUSIJUSIOS SU PROGRAMOS SERVISU, TAISYMU AR KOREGAVIMU, TENKA VARTOTOJUI.</string>
    <string name="end_user_license_agreement_i_understand">SUPRATAU IR SUTINKU</string>
-    <string name="save">Išsaugoti</string>
    <string name="reloadprofile">Atnaujinti profilį</string>
    <string name="smscommunicator">SMS komunikatorius</string>
    <string name="smscommunicator_allowednumbers">Leidžiami telefono numeriai</string>
@ -426,8 +425,6 @@
    <string name="keep_screen_on_summary">Neleidžia Android sistemai išjungti ekrano. Naudojama daug energijos, jei telefonas neprijungtas prie maitinimo šaltinio.</string>
    <string name="sensitivity_warning">Įjungę Autosens funkciją nepamirškite įvedinėti visus valgomus angliavandenius. To nedarant, angliavandenių sukeliami gliukozės svyravimai bus klaidingai identifikuojami kaip jautrumo pasikeitimai!</string>
    <string name="sensitivityweightedaverage">Jautrumas pagal svertinį vidurkį</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Atšaukti</string>
    <string name="notloadedplugins">Ne visi profiliai įkelti!</string>
    <string name="valuesnotstored">Reikšmės neišsaugotos!</string>
    <string name="ns_localbroadcasts">Įgalinti perdavimą į kitas programas (pvz., xDrip+). Neįgalinkite, jei įdiegta daugiau nei vienas AAPS arba NSClient egzempliorius!</string>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -162,7 +162,6 @@
    <string name="end_user_license_agreement">Eind gebruiker overeenkomst</string>
    <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
    <string name="end_user_license_agreement_i_understand">Begrepen en goedgekeurd</string>
-    <string name="save">Opslaan</string>
    <string name="reloadprofile">Herlaad profiel</string>
    <string name="smscommunicator">SMS Commando\'s</string>
    <string name="smscommunicator_allowednumbers">Geautoriseerde telefoon nummers</string>
@ -268,6 +267,7 @@
    <string name="configbuilder_shortname">CONF</string>
    <string name="loop_shortname">LOOP</string>
    <string name="oaps_shortname">OAPS</string>
+    <string name="dynisf_shortname">DYNISF</string>
    <string name="localprofile_shortname">LP</string>
    <string name="overview_shortname">OVZ</string>
    <string name="virtualpump_shortname">VPUMP</string>
@ -428,14 +428,12 @@
    <string name="keep_screen_on_summary">Voorkomen dat Android het scherm uitschakelt. Dit kost veel accuvoeding als je de telefoon niet aan de oplader hebt.</string>
    <string name="sensitivity_warning">Bij het gebruik van Autosense, vergeet niet alle opgenomen koolhydraten in te geven. Anders zullen BG wijzigingen door maaltijden foutief geïnterpreteerd worden !!</string>
    <string name="sensitivityweightedaverage">Gemiddelde gevoeligheid</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Afbreken</string>
    <string name="notloadedplugins">Niet alle profielen zijn geladen!</string>
    <string name="valuesnotstored">Waarden niet opgeslagen!</string>
    <string name="ns_localbroadcasts">Schakel lokaal data delen met andere apps (zoals xDrip) in. Schakel dit niet in als er meer dan één installatie van AAPS of NSClient zijn geinstalleerd!</string>
    <string name="ns_localbroadcasts_title">Activeer locaal delen.</string>
    <string name="openapssmb">OpenAPS SMB</string>
-    <string name="openaps_smb_dynamic_isf">OpenAPS SMB Dynamische ISF</string>
+    <string name="openaps_smb_dynamic_isf">Dynamische ISF</string>
    <string name="enableuam">Activeer UAM</string>
    <string name="enablesmb">Activeer SMB</string>
    <string name="enablesmb_summary">SMB in plaats van tijdelijke basalen voor snellere reactie</string>
@ -665,6 +663,9 @@
    <string name="sensitivity_raises_target_title">Gevoeligheid verhoogt het doel</string>
    <string name="sensitivity_raises_target_summary">Wanneer insulinegevoeligheid wordt gedetecteerd, wordt het BG streefdoel verhoogd</string>
    <string name="careportal_removestartedevents">Verwijder AndroidAPS start-meldingen</string>
+    <string name="show_invalidated">Toon ongeldig</string>
+    <string name="hide_invalidated">Verberg ongeldig</string>
+    <string name="remove_items">Items verwijderen</string>
    <string name="storedsettingsfound">Opgeslagen instellingen gevonden</string>
    <string name="allow_hardware_pump_text">Let op: als u activeert en verbinding maakt met een hardwarepomp, kopieert AndroidAPS de basale instellingen van het profiel naar de pomp en overschrijft de bestaande basaal snelheid die op de pomp is opgeslagen. Zorg ervoor dat u de juiste basaal instelling hebt in AndroidAPS. Als u niet zeker weet of niet wilt dat de basaal instellingen op uw pomp worden overschreven, drukt u op Annuleren en herhaalt u het overschakelen naar de pomp op een later tijdstip.</string>
    <string name="error_adding_treatment_title">Behandelingen data incompleet</string>
@ -881,6 +882,8 @@
    <string name="ns_receive_profile_switch_summary">Accepteer profielwissels zoals ingevoerd in NS of NSClient</string>
    <string name="ns_receive_offline_event">Ontvang APS offline gebeurtenissen</string>
    <string name="ns_receive_offline_event_summary">Accepteer APS offline gebeurtenissen die zijn ingevoerd via NS of NSClient</string>
+    <string name="ns_receive_tbr_eb">Ontvang TBR en EB</string>
+    <string name="ns_receive_tbr_eb_summary">Accepteer TBR en EB ingevoerd vanaf een andere bron</string>
    <string name="ns_receive_insulin">Ontvang insuline</string>
    <string name="ns_receive_insulin_summary">Accepteer insuline zoals ingevoerd in NS of NSClient (insuline wordt niet toegediend, het wordt alleen in IOB calculatie meegenomen)</string>
    <string name="ns_receive_carbs">Ontvang koolhydraten</string>
@ -973,4 +976,15 @@
    <string name="wear_unknown_action_string">Onbekend actie commando:</string>
    <string name="overview_editquickwizard_percentage">Percentage</string>
    <string name="app_default">Applicatie standaardwaarden</string>
+    <string name="select_profile">Kies profiel om te bewerken</string>
+    <string name="refresh_from_nightscout">Vernieuw vanaf Nightscout</string>
+    <string name="remove_selected_items">Geselecteerde items verwijderen</string>
+    <string name="select_for_removal">Selecteer om te verwijderen</string>
+    <string name="profile_changes">Profiel wijzigingen</string>
+    <string name="tempt_targets">Tijdelijke streefdoelen</string>
+    <string name="carbs_and_bolus">Koolhydraten en bolus</string>
+    <string name="confirm_remove_multiple_items">Weet je zeker dat je %1$d items wilt verwijderen</string>
+    <string name="hide_loop">Verberg loop</string>
+    <string name="show_loop">Toon loop</string>
+    <string name="count_selected">%1$d geselecteerd</string>
 </resources>
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@ -162,7 +162,6 @@
    <string name="end_user_license_agreement">Sluttbrukeravtale</string>
    <string name="end_user_license_agreement_text">MÅ IKKE BENYTTES TIL Å TA MEDISINSKE BESLUTNINGER. DET FINNES INGEN GARANTI FOR PROGRAMMET I DEN UTSTREKNING SOM TILLATES AV GJELDENDE LOV. SÅFREMT IKKE ANNET ER ANGITT SKRIFTLIG LEVERES PROGRAMMET HELT UTEN GARANTIER I NOEN SOM HELST FORM, VERKEN UTTRYKT ELLER INNEFORSTÅTT, INKLUSIV MEN IKKE BEGRENSET TIL SALGBARHET ELLER EGNETHET TIL VISSE FORMÅL. ALL RISIKO KNYTTET TIL KVALITET AV PROGRAMMETS FUNKSJONALITET ER HOS DEG SOM BRUKER. OM PROGRAMMET VISER SEG Å VÆRE DEFEKT, ER DET BRUKEREN SOM MÅ TA ALT ANSVAR FOR KOSTNADER KNYTTET TIL ALL SERVICE, REPERASJON ELLER RETTELSE.</string>
    <string name="end_user_license_agreement_i_understand">JEG FORSTÅR OG GODTAR</string>
-    <string name="save">Lagre</string>
    <string name="reloadprofile">Les inn profil på nytt</string>
    <string name="smscommunicator">SMS tjeneste</string>
    <string name="smscommunicator_allowednumbers">Godkjente mobilnumre</string>
@ -429,14 +428,11 @@
    <string name="keep_screen_on_summary">Forhindre Android å slå av skjermen. Mobil vil bruke mye batteri hvis den ikke plugges til strømledning.</string>
    <string name="sensitivity_warning">Hvis du slår på Autosense funksjonen må du huske å angi alle spiste karbohydrater. Ellers vil KH avvik gi feil i sensitivitetsberegningen !!</string>
    <string name="sensitivityweightedaverage">Sensitivitet vektet middelverdi</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Avbryt</string>
    <string name="notloadedplugins">Ikke alle profiler ble lastet!</string>
    <string name="valuesnotstored">Verdier ikke lagret!</string>
    <string name="ns_localbroadcasts">Aktiver kringkasting til andre apper (som xDrip+). Ikke aktiver dette hvis du har mer enn en AAPS eller NSClient installert!</string>
    <string name="ns_localbroadcasts_title">Aktiver lokale sendinger.</string>
    <string name="openapssmb">OpenAPS SMB</string>
-    <string name="openaps_smb_dynamic_isf">OpenAPS SMB dynamisk ISF</string>
    <string name="enableuam">Aktiver UAM</string>
    <string name="enablesmb">Aktiver SMB</string>
    <string name="enablesmb_summary">Bruk Super Mikro Solen i stedet for temp basal for raskere resultat</string>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -161,7 +161,6 @@
    <string name="end_user_license_agreement">Umowa licencyjna użytkownika końcowego</string>
    <string name="end_user_license_agreement_text">NIE MOŻE BY WYKORZYSTYWANY DO PODEJMOWANIA DECYZJI MEDYCZNYCH. NIE MA ŻADNEJ GWARANCJI NA PROGRAM, W ZAKRESIE DOZWOLONYM PRZEZ OBOWIĄZUJĄCE PRAWO. Z WYJĄTKIEM PRZYPADKÓW, GDY W INNY SPOSÓB PISMO OŚWIADCZENIA PRAW AUTORSKICH I / LUB INNYCH STRON, PRZEDSTAWIAĆ PROGRAM \"W STANIE TAKIM, W JAKIM SIĘ ZNAJDUJE\" BEZ JAKIEJKOLWIEK GWARANCJI, WYRAŹNEJ LUB DOMNIEMANEJ, W TYM MIĘDZY INNYMI DOMNIEMANYCH GWARANCJI PRZYDATNOŚCI HANDLOWEJ I PRZYDATNOŚCI DO OKREŚLONEGO CELU. CAŁKOWITE RYZYKO ZWIĄZANE Z JAKOŚCIĄ I WYNIKIEM PROGRAMU JEST PO PAŃSTWA STRONIE. W PRZYPADKU USZKODZENIA PROGRAMU UŻYTKOWNIK PONOSI KOSZT CAŁEGO NIEZBĘDNEGO SERWISU, NAPRAWY LUB POPRAWEK. W PRZYPADKU NIEPOROZUMIEŃ ZASTOSOWANIE PRAWNE MA UMOWA W ANGIELSKIEJ WERSJI JĘZYKOWEJ!!!</string>
    <string name="end_user_license_agreement_i_understand">ROZUMIEM I WYRAŻAM ZGODĘ</string>
-    <string name="save">ZACHOWAJ</string>
    <string name="reloadprofile">Załaduj profil ponownie</string>
    <string name="smscommunicator">Komunikator SMS</string>
    <string name="smscommunicator_allowednumbers">Dozwolone numery telefonów</string>
@ -426,8 +425,6 @@
    <string name="keep_screen_on_summary">Nie pozwól, aby system Android wyłączał ekran. Zwiększy to zużycie energii, gdy zasilanie sieciowe jest wyłączone.</string>
    <string name="sensitivity_warning">Przy włączonej funkcji Autosens pamiętaj, żeby wprowadzać wszystkie węglowodany. W innym wypadku odchylenia węglowodanów będą błędnie identyfikowane jako zmiany wrażliwości !!</string>
    <string name="sensitivityweightedaverage">Wrażliwość ŚredniaWażona</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Anuluj</string>
    <string name="notloadedplugins">Nie wszystkie profile zostały załadowane!</string>
    <string name="valuesnotstored">Wartości nie są przechowywane!</string>
    <string name="ns_localbroadcasts">Włącz rozgłaszanie do innych aplikacji (takich jak xDrip+). Nie należy włączać, jeśli zainstalowana jest więcej niż jedna instancja AAPS lub NSClient!</string>
--- a/app/src/main/res/values-pt-rBR/exam.xml
+++ b/app/src/main/res/values-pt-rBR/exam.xml
@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="dia_whatmeansdia">O que é verdade sobre o DIA?</string>
-    <string name="dia_label_exam">Duração da Atividade da Insulina (DIA)</string>
+    <string name="dia_whatmeansdia">O que é verdade sobre o DAI?</string>
+    <string name="dia_label_exam">Duração da Atividade da Insulina (DAI)</string>
+    <string name="dia_profile">Você deve definir o valor para a DAI no seu perfil.</string>
+    <string name="dia_minimumis5h">A menor duração permitida é de 5 horas.</string>
    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
    <string name="dia_meaningisequaltodiapump">Se você estiver satisfeito com um valor da DIA que funcionava bem na sua bomba antes do AndroidAPS, não há necessidade de modificar esse valor quando você começa o loop.</string>
    <string name="dia_valuemustbedetermined">Você deve determinar por si mesmo o valor apropriado para a DIA.</string>
+    <string name="hypott_label">Alvo Temporário para hipoglicemia</string>
+    <string name="hypott_whenhypott">Qual é a razão principal para definir um alvo temporário de hipoglicemia?</string>
    <string name="hypott_wrongbasal">Corrigir hipoglicemias causadas por configurações incorretas da dose basal.</string>
    <string name="hypott_preventoversmb">Evitar que o AndroidAPS corrija excessivamente um aumento de glicose causado pelos carboidratos de ação rápida que trataram a hipoglicemia.</string>
    <string name="hypott_exercise">Corrigir uma hipoglicemia causada por exercícios físicos.</string>
@ -32,8 +36,115 @@
    <string name="objectives2_internalstorage">Seu arquivo de configurações foi encontrado no armazenamento interno/AAPS/preferências do seu telefone.</string>
    <string name="objectives2_cloud">Copie seu arquivo de preferências para um local seguro fora de seu telefone (por exemplo, usando uma unidade na nuvem, conectando um cabo a um computador, e-mail, etc.)</string>
    <string name="objectives2_easyrestore">Se seu telefone ficar danificado ou se você perder-lo, existem maneiras fáceis de recuperar suas configurações remotamente sem um backup local.</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
    <string name="noisycgm_label">Leituras do CGM imprecisas</string>
    <string name="noisycgm_whattodo">O que deve ser feito se os dados do CGM são irregulares?</string>
+    <string name="noisycgm_nothing">Nada, AndroidAPS vai lidar com isso.</string>
+    <string name="noisycgm_pause">Desative o loop fechado para evitar uma possível dosagem maior ou menor que a necessária.</string>
+    <string name="noisycgm_replacesensor">Troque sensores que apresentam erros ou medições imprecisas.</string>
+    <string name="noisycgm_checksmoothing">Verifique se seu aplicativo CGM fornece dados suavizados.</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="exerciseprofile_label">Exercício e Perfis</string>
+    <string name="exerciseprofile_whattodo">Como seria a melhor forma de usar os perfis para ajudar o sistema a lidar com exercício aeróbico?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Altere o perfil para menos de 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Altere o perfil para mais de 100%.</string>
+    <string name="exerciseprofile_leaveat100">Deixe seu perfil em 100%.</string>
+    <string name="exerciseprofile_suspendloop">Suspenda o loop.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">Exercício e Alvos Temporários</string>
+    <string name="exercise_whattodo">Como seria a melhor forma de usar os alvos temporários para ajudar o sistema a lidar com exercício aeróbico?</string>
+    <string name="exercise_settt">Alguns minutos antes de iniciar o exercício, defina um alvo de glicemia.</string>
+    <string name="exercise_setfinished">Defina uma meta de glicemia após o término do exercício.</string>
+    <string name="exercise_setunchanged">Não altere o seu alvo de glicemia.</string>
+    <string name="exercise_15g">Aguarde até que a glicemia fique abaixo do seu alvo temporário de hipoglicemia e coma 15g de carbos de ação rápida.</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">Loop Desativado/Suspenso</string>
+    <string name="suspendloop_doigetinsulin">Eu recebo insulina quando o loop estiver desactivado/suspenso?</string>
+    <string name="suspendloop_yes">Sim, a insulina basal continua sendo administrada.</string>
+    <string name="suspendloop_no">Não, a administração da insulina será interrompida.</string>
+    <string name="basaltest_label">Testando a basal, FS e Relação I:C</string>
+    <string name="basaltest_when">Quando esses valores deveriam ser avaliados?</string>
+    <string name="basaltest_beforeloop">Antes de iniciar o looping.</string>
+    <string name="basaltest_havingregularhighlow">Quando ocorrerem hipoglicemias e hiperglicemias frequentes.</string>
+    <string name="basaltest_weekly">Pelo menos uma vez por semana.</string>
+    <string name="basaltest_fixed">Uma vez definido e validado, estes valores não deveriam mudar ao longo do tempo.</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">Pré-requisitos</string>
+    <string name="prerequisites_what">O que é essencial para configurar e usar o AndroidAPS?</string>
+    <string name="prerequisites_determinedcorrectprofile">Informações do perfil validadas (Basal, IC, FS, DAI).</string>
+    <string name="prerequisites_computer">Um computador com o Android Studio instalado e configurado.</string>
+    <string name="prerequisites_phone">Um telefone compatível.</string>
+    <string name="prerequisites_pump">Uma bomba de insulina compatível se você pretender usar o loop fechado.</string>
+    <string name="prerequisites_nightscout">Nightscout, para manter um registro de todos os dados e revisar configurações.</string>
+    <string name="prerequisites_tidepoolaccount">Uma conta do Tidepool.</string>
+    <string name="prerequisites_googleaccount">Uma conta Google.</string>
+    <string name="prerequisites_githubaccount">Uma conta do Github.</string>
+    <string name="prerequisites_beanandroiddeveloper">Experiência na programação ou editação de código.</string>
+    <string name="prerequisites_own670g">Uma bomba MiniMed 670G.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="prerequisites_smartwatch">Um Smartwatch.</string>
+    <string name="prerequisites_supportedcgm">Um CGM compatível.</string>
+    <string name="prerequisites2_label">Pré-requisitos</string>
+    <string name="prerequisites2_what">O que é essencial para configurar e usar o AndroidAPS?</string>
+    <string name="prerequisites2_profile">Informações validadas para configurar um perfil (razão FS, I:C, taxas de basal, DAI etc.).</string>
+    <string name="prerequisites2_device">Um dispositivo Android compatível (por exemplo, celular/celular, relógio Android completo ou tablet).</string>
+    <string name="prerequisites2_internet">O AndroidAPS requer uma conexão com a internet para ser executado em loop fechado.</string>
+    <string name="prerequisites2_supportedcgm">Um CGM compatível com um app apropriado para receber os valores de glicose no telefone/dispositivo.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">Tópico: Atualização do AndroidAPS</string>
+    <string name="whatistrue">Marque todas as respostas corretas.</string>
+    <string name="update_git">Você precisa ter o Git instalado e configurado no seu computador.</string>
+    <string name="update_asap">Quando atualizações do AndroidAPS são lançadas, as versões anteriores podem ser remotamente limitadas após um tempo especificado.</string>
+    <string name="update_keys">Você deveria salvar e anotar o local da sua chave de assinatura e usar a mesma chave de assinatura das versões anteriores para as atualizações.</string>
+    <string name="update_neverupdate">Nunca atualize se o sistema estiver funcionando bem.</string>
+    <string name="update_askfriend">Se você tiver dificuldades criando o apk, você pode instalar um apk que foi criado por um amigo.</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_label">Resolução de problemas</string>
+    <string name="troubleshooting_wheretoask">Onde você pode procurar ajuda com AndroidAPS?</string>
+    <string name="troubleshooting_fb">Você pode pedir conselhos no grupo \"AndroidAPS Users\" do Facebook.</string>
+    <string name="troubleshooting_wiki">Você deveria ler (e ler mais uma vez) a documentação do AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Você pode pedir conselhos e registrar problemas técnicos ou problemas no \"Android APS Gitter room\".</string>
+    <string name="troubleshooting_yourendo">Você deveria pedir/perguntar à sua clínica de diabetes/endocrinologista.</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">Plugins de Insulina</string>
+    <string name="insulin_ultrarapid">Qual insulina você deveria usar com o plugin \"Oref Ultra-Rapid\"?</string>
+    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
+    <string name="insulin_humalog">Humalog ®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin R®/\"regular\" insulina humana.</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">Tópico: Plugins de Sensibilidade</string>
+    <string name="sensitivity_which">Marque todas as respostas corretas.</string>
+    <string name="sensitivity_adjust">Plugins de sensibilidade permitem que o AndroidAPS se ajuste para mudanças temporárias ou de curta duração na sensibilidade à insulina (por exemplo, alterações hormonais ou problemas de absorção no local de infusão).</string>
+    <string name="sensitivity_edit">Plug-ins de sensibilidade fornecem ao usuário alterações sugeridas nas taxas de basal, relação I:C e FS que podem ser usados para editar o perfil.</string>
+    <string name="sensitivity_cannula">Registrar uma troca de cannula irá redefinir a taxa de Autosens de volta para 100%.</string>
+    <string name="sensitivity_time">Algumas opções de plugin têm intervalos de tempo que podem ser configurados pelo usuário.</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="wrongcarbs_label">Tópico: Erros de Entrada de Carboidratos</string>
+    <string name="wrongcarbs_whattodo">O que deve fazer se tiver feito uma entrada incorreta de carboidratos?</string>
+    <string name="wrongcarbs_treatmentstab">Exclua a entrada incorreta em Tratamentos e insira o novo valor de carboidratos correto.</string>
+    <string name="wrongcarbs_addinsulin">Dê um bólus com insulina usando o menu ações -> purgar/preencher.</string>
+    <string name="wrongcarbs_donothing">Não faça nada – o AndroidAPS fará os ajustes apropriados.</string>
+    <string name="wrongcarbs_bolus">Dê um Bolus com insulina usando o botão Insulina (bolus) no menu Visão Geral.</string>
+    <string name="wronginsulin_label">Tópico: Erros de entrada/administração de insulina</string>
+    <string name="wronginsulin_whattodo">O que você deveria fazer se você receber menos insulina do que o histórico da bomba sugere por exemplo, devido a uma oclusão, um canula falhada ou esquecendo de reconectar a bomba após um banho? </string>
+    <string name="wronginsulin_careportal">Exclua dados de insulina do Nightscout Careportal para removê-los do histórico da bomba.</string>
+    <string name="wronginsulin_compare">Comparar valores no histórico do AndroidAPS e a bomba (se a bomba possui esta opção).</string>
+    <string name="wronginsulin_prime">Dê uma porção do bolus calculado não administrado por meio de seringa/caneta ou usando o menu ações -> purgar/preencher.</string>
+    <string name="wronginsulin_donothing">Não faça nada e permita que o AndroidAPS corrija qualquer nível de glicose elevado resultante.</string>
+    <string name="iob_label">Insulina ativa</string>
+    <string name="iob_which">Marque todas as respostas corretas.</string>
+    <string name="iob_value">O valor de IA é afetado por basais temporárias efetuadas.</string>
+    <string name="iob_hightemp">Um basal alto temporário não será efetuado quando sua glicose estiver abaixo do alvo.</string>
+    <string name="iob_negiob">Insulina Ativa (IA) negativa por um período substancial na ausência de exercícios, sugere que seu perfil é muito agressivo e menos insulina deve ser considerada nas suas configurações.</string>
+    <string name="iob_posiob">Insulina Ativa (IA) positiva durante um período substancial sugere resistência à insulina ou refeições não anunciadas.</string>
+    <string name="breadgrams_label">Tópico: Entrada de carboidratos e bólus</string>
+    <string name="breadgrams_grams">Apenas a unidade \"gramas\" deve ser utilizada para estimar e gravar os carboidratos consumidos.</string>
+    <string name="breadgrams_exchange">Carboidratos consumidos podem ser gravados usando um sistema de conversão apropriada (por exemplo, câmbio de \"CHO\" DAFNE ou Unidades de Pão Europeas\").</string>
+    <string name="breadgrams_decay">O AndroidAPS usa um modelo dinâmico para estimar a \"degradação\" de carboidratos e calcular o Carboidratos Ativos (CA).</string>
    <string name="breadgrams_calc">Se os níveis de glicose no sangue estiverem fora dos limites aceitáveis (muito baixo ou muito alto) a calculadora de bolus pode ser usada para fornecer sugestões para correções de carboidrato ou insulina.</string>
    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
    <string name="extendedcarbs_label">Tópico: e-Carbs</string>
@ -60,6 +171,7 @@
    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
    <string name="ic_multiple">Você pode definir mais do que um valor para o rácio I:C no seu perfil.</string>
    <string name="ic_isf">Se você mudar o ISF no seu perfil, também deveria mudar o I:C.</string>
+    <string name="ic_label_exam">Tópico: Relação Insulina:Carboidrato (Relação I:C)</string>
    <string name="ic_increasingvalue">Rácios IC mais altos levam a menos insulina administrada por uma dada quantidade de carboidratos.</string>
    <string name="ic_decreasingvalue">Rácios IC mais baixos levam a menos insulina administrada por uma dada quantidade de carboidratos.</string>
    <string name="ic_noeffect">Se tiver 0 COB, alterar a proporção IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da glicemia.</string>
@ -70,12 +182,34 @@
    <string name="profileswitch_pctwillchange"> Ao especificar uma mudança de perfil de 90%, quais respostas são corretas?</string>
    <string name="profileswitch_basallower">Taxas de basal serão 10% menores.</string>
    <string name="profileswitch_isfhigher">O valor do ISF será 10% maior.</string>
+    <string name="profileswitch_iclower">O valor da relação I:C será 10% menor.</string>
    <string name="profileswitch_unchanged">O ISF e a I:C não sofrem alterações.</string>
    <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
    <string name="profileswitch2_label">Tópico: Troca de Perfil</string>
+    <string name="profileswitch2_pctwillchange"> Ao especificar uma mudança de perfil de 120%, quais respostas são corretas?</string>
+    <string name="profileswitch2_bghigher">O alvo de glicose será 20% maior.</string>
+    <string name="profileswitch2_basalhigher">Os basais serão 20% maiores.</string>
+    <string name="profileswitch2_bgunchanged">O alvo de glicose não muda.</string>
+    <string name="profileswitch2_isfhigher">O valor do FS será 20% maior.</string>
+    <string name="profileswitchtime_label">Tópico: Alternando Perfil</string>
+    <string name="profileswitchtime_iwant">Se você levantar 2h mais cedo do que o normal, como deveria avisar o AAPS da mudança do seu horário?</string>
+    <string name="profileswitchtime_2">Iniciar uma mudança de perfil com uma alteração de turno de 2</string>
+    <string name="profileswitchtime__2">Iniciar uma mudança de perfil com uma alteração de turno de -2</string>
+    <string name="profileswitchtime_tt">Defina um alvo temporário \"comer em breve\".</string>
+    <string name="profileswitchtime_100">Altere seu perfil para mais de 100%</string>
    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitch4_label">Tópico: Alterações nos perfis</string>
+    <string name="profileswitch4_rates">Taxas de basal, FS, rácios de I:C, etc., devem ser definidos em perfis.</string>
+    <string name="profileswitch4_internet">Ativar alterações no seu perfil do Nightscout requer que o telefone do AndroidAPS tenha uma conexão com a Internet.</string>
+    <string name="profileswitch4_sufficient">Apenas editar os valores nos seus perfis é suficiente para implementar as alterações feitas.</string>
+    <string name="profileswitch4_multi">Múltiplos perfis podem ser configurados e selecionados para acomodar mudanças de circunstâncias (por exemplo, alterações hormonais, mudança de trabalho, dias de semana/fim de semana).</string>
    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
+    <string name="basalhelp_label">Tópico: Ajuda com taxas basais</string>
    <string name="basalhelp_where">Onde procurar ajuda para taxas basais e etc.</string>
    <string name="basalhelp_diabetesteam">Sua equipe de diabetes</string>
    <string name="basalhelp_google">Google</string>
+    <string name="basalhelp_facebook">Facebook</string>
+    <string name="other_medication_label">Outros Medicamentos. Por favor, leia a declaração abaixo e depois marque a caixa para aceitar a declaração.</string>
+    <string name="other_medication_text">AAPS reduz ou suspende as taxas basais para aumentar a glicose. Remédios do grupo de inibidores de SGLT2 (gliflozins) podem evitar o aumento esperado da glicose e, assim, podem produzir uma deficiência de insulina perigosa (cetoacidose diabética).
+\nOs nomes comuns de marca são: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nEu Prometo por este meio que não vou tomar tais remédios enquanto estou usando o AAPS ou eu desativo o loop antes de usar esses remédios.</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/objectives.xml
+++ b/app/src/main/res/values-pt-rBR/objectives.xml
@ -1,7 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="objectives_button_start">Iniciar</string>
+    <string name="objectives_button_verify">Verificar</string>
+    <string name="nth_objective">%1$d. Objetivo</string>
+    <string name="objectivenotstarted">Objetivo %1$d não iniciado</string>
+    <string name="objectivenotfinished">Objetivo %1$d não concluido</string>
+    <string name="objectives_0_objective">Configurando a visualização e monitoramento, e analisando basais e relações</string>
+    <string name="objectives_0_gate">Verificar se a Glicemia está disponível no Nightscout, e se os dados de insulina da bomba estão sendo transferidos</string>
+    <string name="objectives_openloop_objective">Iniciando em um loop aberto</string>
+    <string name="objectives_openloop_gate">Utilize o modo Loop Aberto por alguns dias e execute manualmente várias basais temporárias. Configure e use alvos temporários e defina alvos temporários padrão (por exemplo, para exercício ou tratamento hipos com carboidratos)</string>
    <string name="objectives_maxbasal_objective">Entendendo o seu loop aberto, incluindo as suas recomendações de basais temporárias</string>
    <string name="objectives_maxbasal_gate">Com base nessa experiência, decidir qual deve ser a basal máximo e configurá-lo na bomba e nas preferências</string>
+    <string name="objectives_maxiobzero_objective">Comece a fechar loop com Suspensão por Glicose Baixa</string>
+    <string name="objectives_maxiobzero_gate">Utilizar em close loop com IOB máx = 0 por alguns dias sem muitas situações de Suspensão por Baixa Glicose</string>
+    <string name="objectives_maxiob_objective">Ajustar o loop fechado, aumentar a IOB máximo acima de 0 e reduzir gradualmente os alvos de glicemia</string>
+    <string name="objectives_maxiob_gate">Utilizar por alguns dias e pelo menos uma noite sem alarmes de glicose baixa, antes de baixar a glicemia</string>
+    <string name="objectives_autosens_objective">Ajuste as basais e os parâmetros, se necessário, e, em seguida, ative o auto-sens</string>
+    <string name="objectives_autosens_gate">1 semana de looping durante o dia com sucesso com entrada regular de carboidratos</string>
+    <string name="objectives_smb_objective">Ativando recursos adicionais para uso durante o dia, como SMB</string>
+    <string name="objectives_auto_objective">Ativando a automação</string>
+    <string name="objectives_smb_gate">Deverá ler a wiki e aumentar a I.A máx para que os SMBs funcionem corretamente! Inicialmente poderá considerar maxI.A=média dos bólus + 3 x a basal diária máxima</string>
    <string name="objectives_auto_gate">Leia os documentos de como a automação funciona. Configure suas primeiras regras simples. Em vez de efetuar uma ação deixe AAPS apresentar apenas uma notificação. Quando você tiver certeza de que a automação é acionada no momento certo substitua a notificação por uma ação real. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
    <string name="objectives_bgavailableinns">Glicose disponível no NS</string>
    <string name="objectives_pumpstatusavailableinns">Status da Bomba disponível no NS</string>
@ -32,6 +50,6 @@
    <string name="useaction_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#config-builder</string>
    <string name="usescale_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
    <string name="notconnected">Não está ligado à internet</string>
-    <string name="failedretrievetime">Falha ao recuperar tempo</string>
+    <string name="failedretrievetime">Falha no tempo de recuperação</string>
    <string name="requirementnotmet">Requisitos de objetivo não cumpridos</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -6,6 +6,7 @@
    <string name="treatmentssafety_title">Segurança do Tratamento</string>
    <string name="treatmentssafety_maxbolus_title">Máximo bolus permitido [U]</string>
    <string name="treatmentssafety_maxcarbs_title">Máximo de carbs permitidos [g]</string>
+    <string name="nav_preferences_plugin">%1$s Preferências</string>
    <string name="nav_preferences">Preferências</string>
    <string name="nav_refreshtreatments">Atualizar tratamentos de NS</string>
    <string name="nav_resetdb">Redefinir banco de dados</string>
@ -18,11 +19,13 @@
    <string name="description_food">Exibe as predefinições de comida definidas no Nightscout</string>
    <string name="description_insulin_rapid">Predefinição de Insulina para Humalog e NovoRapid / NovoLog</string>
    <string name="description_insulin_ultra_rapid">Pré-ajuste de Insulina para Fiasp</string>
+    <string name="description_insulin_lyumjev">Configuração pre-definida para a Insulina Lyumyev</string>
    <string name="description_insulin_free_peak">Permite que você defina o pico da atividade de insulina, deve ser usado apenas por usuários avançados</string>
    <string name="description_loop">Ative ou desative a implementação ativando o loop.</string>
    <string name="description_ns_client">Sincroniza seus dados com o Nightscout</string>
    <string name="description_ama">Estado do algoritmo em 2017</string>
    <string name="description_smb">Algoritmo mais recente para usuários avançados</string>
+    <string name="description_smb_dynamic_isf">Algoritmo mais recente para usuários avançados com FS dinâmico/automático</string>
    <string name="description_overview">Exibe o estado atual do seu loop e botões para ações mais comuns</string>
    <string name="description_persistent_notification">Mostra uma notificação em curso com um breve resumo do que o seu loop está a fazer</string>
    <string name="description_profile_local">Defina um perfil que está disponível offline.</string>
@ -35,6 +38,7 @@
    <string name="description_source_glimp">Receber valores BG do Glimp.</string>
    <string name="description_source_mm640g">Receber valores de Glucose do 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Downloads de dados de Glicose do Nightscout</string>
+    <string name="description_source_xdrip">Receber valores de glicose do xDrip+.</string>
    <string name="description_treatments">Salva todos os tratamentos que foram feitos</string>
    <string name="description_wear">Monitore e controle AndroidAPS usando seu relógio WearOS.</string>
    <string name="description_xdrip_status_line">Mostrar informações sobre o loop no watchface do xDrip+.</string>
@ -54,6 +58,7 @@
    <string name="treatments_wizard_tt_label">TT</string>
    <string name="treatments_wizard_carbs_label">Carbos</string>
    <string name="treatments_wizard_correction_label">Corr</string>
+    <string name="bolus_iob_label">I.A de Bolus</string>
    <string name="openapsma_run">Executar agora</string>
    <string name="vitualpump_label">BOMBA VIRTUAL</string>
    <string name="openapsma_lastrun_label">Última execução</string>
@ -89,9 +94,10 @@
    <string name="loop_constraintsprocessed_label">Depois das restrições processadas</string>
    <string name="loop_tbrsetbypump_label">Basal temporária definida pela bomba</string>
    <string name="noapsselected">SEM APS SELECIONADO OU RESULTADO FORNECIDO</string>
-    <string name="safety">Segurança</string>
+    <string name="safety">Seguro</string>
    <string name="openapsma_disabled">Plugin está desativado</string>
    <string name="constraints_violation">Violação das restrições</string>
+    <string name="treatmentdeliveryerror">O Bolus relatou um erro. Verifique a quantidade administrada manualmente</string>
    <string name="setbasalquestion">Aceitar nova basal temporária:</string>
    <string name="overview_treatment_label">Tratamento</string>
    <string name="overview_calculator_label">Calculadora</string>
@ -102,6 +108,7 @@
    <string name="changeyourinput">Altere sua entrada!</string>
    <string name="configbuilder_bgsource">Fonte de BG</string>
    <string name="configbuilder_bgsource_description">De onde o AndroidAPS deve obter os dados?</string>
+    <string name="xdrip">xDrip+</string>
    <string name="apsmode_title">Modo APS</string>
    <string name="closedloop">Loop Fechado</string>
    <string name="openloop">Loop Aberto</string>
@ -116,12 +123,16 @@
    <string name="careportal_newnstreatment_other">Outro</string>
    <string name="careportal_newnstreatment_meter">Medidor</string>
    <string name="careportal_newnstreatment_sensor">Sensor</string>
+    <string name="carb_time_label">Hora do carboidrato</string>
    <string name="careportal_newnstreatment_duration_label">Duração</string>
+    <string name="profile_label">Perfil</string>
    <string name="careportal_newnstreatment_glucosetype">Tipo de glicose</string>
    <string name="overview_tempbasal_button">Basal Temporária</string>
    <string name="overview_extendedbolus_button">Bólus estendido</string>
    <string name="configbuilder_nightscoutversion_label">Versão do Nightscout:</string>
+    <string name="missing_carbs">Precisando de %1$d g</string>
    <string name="exported">Preferências exportadas</string>
+    <string name="ue_exported">Entradas do usuário exportadas</string>
    <string name="export_to">Exportar configurações para</string>
    <string name="import_from">Importar configurações de</string>
    <string name="setting_imported">Configurações importadas</string>
@ -136,6 +147,11 @@
    <string name="password_preferences_decrypt_prompt">Será perguntado pela senha mestre, que será necessária para desencriptar preferências importadas.</string>
    <string name="preferences_export_canceled">Exportação cancelada! Preferências NÃO foram exportadas!</string>
    <string name="preferences_import_canceled">Importação cancelada! Preferências NÃO foram importadas!</string>
+    <string name="preferences_import_impossible">Não foi possível importar as preferências!</string>
+    <string name="goto_main_try_again">Por favor, volte à tela principal e tente novamente.</string>
+    <string name="old_master_password">Senha Mestra Antiga</string>
+    <string name="different_password_used">Este arquivo foi exportado e criptografado com uma senha mestra diferente. Insira a senha anterior para descriptografar o arquivo.</string>
+    <string name="master_password_will_be_replaced">Como resultado da importação bem sucedida a senha mestra atual SERÁ SUBSTITUÍDA pela senha mestra anterior!</string>
    <string name="check_preferences_before_import">Por favor, verifique as preferências antes da importação:</string>
    <string name="check_preferences_cannot_import">Preferências não podem ser importadas!</string>
    <string name="check_preferences_dangerous_import">As preferências não devem ser importadas!</string>
@ -146,7 +162,6 @@
    <string name="end_user_license_agreement">Condições de Utilização</string>
    <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCETO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É COM VOCÊ. CASO O PROGRAMA SEJA DEFEITUOSO, VOCÊ ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
    <string name="end_user_license_agreement_i_understand">EU ENTENDO E CONCORDO</string>
-    <string name="save">Salvar</string>
    <string name="reloadprofile">Recarregar perfil</string>
    <string name="smscommunicator">Comunicador SMS</string>
    <string name="smscommunicator_allowednumbers">Números de telefone permitidos</string>
@ -162,6 +177,9 @@
    <string name="smscommunicator_remotebolusmindistance_summary">Número mínimo de minutos que deve decorrer entre um bólus remoto e o próximo</string>
    <string name="smscommunicator_remotebolusmindistance">Quantos minutos deve decorrer, pelo menos, entre um bólus e o próximo</string>
    <string name="smscommunicator_remotebolusmindistance_caveat">Para sua segurança, para editar esta preferência você precisa adicionar pelo menos 2 números de telefone.</string>
+    <string name="bolusrequested">Iniciando aplicação de %1$.2f U</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %1$.2f U aplicado com sucesso</string>
+    <string name="smscommunicator_mealbolusdelivered">Bolus da refeição %1$.2f U aplicado com sucesso</string>
    <string name="smscommunicator_mealbolusdelivered_tt">Alvo %1$s para %2$d minutos</string>
    <string name="smscommunicator_tt_set">Alvo %1$s para %2$d minutos definido com sucesso</string>
    <string name="smscommunicator_tt_canceled">Alvo Temp cancelado com êxito</string>
@ -169,16 +187,25 @@
    <string name="smscommunicator_loophasbeendisabled">Loop foi desativado</string>
    <string name="smscommunicator_loophasbeenenabled">Loop foi ativado</string>
    <string name="smscommunicator_loopisenabled">Loop ativado</string>
+    <string name="smscommunicator_pumpconnectwithcode">Para conectar à bomba responda com o código %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Conexão com a bomba falhou</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Para desconectar a bomba por %1$d minutos responda com código %2$s</string>
    <string name="smscommunicator_pumpdisconnected">Bomba desconectada</string>
    <string name="smscommunicator_reconnect">Bomba reconectada</string>
    <string name="smscommunicator_remotecommandnotallowed">O comando remoto não é permitido</string>
    <string name="smscommunicator_remotebolusnotallowed">O bolus remoto não está disponível. Tente novamente mais tarde.</string>
+    <string name="smscommunicator_basalreplywithcode">Para começar o basal %1$.2fU/h durante%2$d min responda com o código %3$s</string>
    <string name="smscommunicator_profilereplywithcode">Para mudar o perfil para %1$s %2$d%% responda com o código %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Para começar o bólus estendido %1$.2fU/h para %2$d min responda com o código %3$s</string>
    <string name="smscommunicator_carbsreplywithcode">Para inserir %1$dg em %2$s responda com código %3$s</string>
    <string name="smscommunicator_basalpctreplywithcode">Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s</string>
    <string name="smscommunicator_suspendreplywithcode">Para suspender o loop por %1$d minutos resposta com código %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Para retomar o loop responda com o código %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Para ativar o loop responda com o código %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Para desativar o loop responda com o código %1$s</string>
    <string name="smscommunicator_tempbasalset">Basal temporária %1$.2fU/h para %2$d min iniciada com êxito</string>
    <string name="smscommunicator_extendedset">Bólus estendido %1$.2fU/h para %2$d min iniciado com êxito</string>
+    <string name="smscommunicator_carbsset">Carboidratos %1$d  g inseridos com sucesso</string>
    <string name="smscommunicator_carbsfailed">Introdução de %1$dg de hidratos falhou</string>
    <string name="smscommunicator_tempbasalset_percent">Basal temporária %1$d%% U/h durante%2$d min iniciada com êxito</string>
    <string name="smscommunicator_tempbasalfailed">Falha ao iniciar basal temp</string>
@ -200,6 +227,7 @@
    <string name="mealbolus">Refeição</string>
    <string name="correctionbous">Correção</string>
    <string name="actions">Ações</string>
+    <string name="ns_upload_only">(PERIGOSO PARA DESATIVAR) somente upload para NS</string>
    <string name="pumpNotInitialized">Bomba não inicializada!</string>
    <string name="primefill">Purgar/Preencher</string>
    <string name="fillwarning">Por favor certifique-se que o valor corresponde ao especificado para o seu conjunto de infusão!</string>
@ -217,6 +245,7 @@
    <string name="wear">Wear</string>
    <string name="resend_all_data">Reenviar Todos os Dados</string>
    <string name="open_settings_on_wear">Abrir Definições em Wear</string>
+    <string name="basal_rate">Valor da Basal</string>
    <string name="basalvaluebelowminimum">Valor da basal abaixo do mínimo. Perfil não definido!</string>
    <string name="sms_actualbg">BG:</string>
    <string name="sms_lastbg">Último BG:</string>
@ -225,16 +254,19 @@
    <string name="ongoingnotificaction">Notificação em curso</string>
    <string name="old_data">DADOS ANTIGOS</string>
    <string name="sms_minago">%1$dmin atrás</string>
+    <string name="localprofile">Perfil</string>
    <string name="openapsama">OpenAPS AMA</string>
    <string name="array_of_elements">Array de %1$d elementos.\nValor atual:</string>
    <string name="openapsma_autosensdata_label">Dados Autosens</string>
    <string name="openapsma_scriptdebugdata_label">Script debug</string>
    <string name="openapsama_useautosens">Usar função Autosens</string>
+    <string name="refresheventsfromnightscout">Atualizar de NS</string>
    <string name="deletefuturetreatments">Apagar tratamentos do futuro</string>
    <string name="actions_shortname">ACT</string>
    <string name="configbuilder_shortname">CONF</string>
    <string name="loop_shortname">LOOP</string>
    <string name="oaps_shortname">OAPS</string>
+    <string name="dynisf_shortname">DINFS</string>
    <string name="localprofile_shortname">PL</string>
    <string name="overview_shortname">Início</string>
    <string name="virtualpump_shortname">BOMBAV</string>
@ -244,6 +276,7 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Abreviar títulos dos separadores</string>
    <string name="always_use_shortavg">Usar sempre delta médio curto em vez de delta simples</string>
+    <string name="always_use_shortavg_summary">Útil quando há ruído nos dados das fontes sem filtro como o xDrip.</string>
    <string name="profile">Perfil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Valor padrão: 3 Por segurança é o valor limite estabelecido por OpenAPS. O que faz é limitar a basal a x3 a basal mázima. Se necessário modificar este valor, por favor ter em conta que os dados apontam para que os limites de segurança sejam - 3 x max diario ou 4x valor atual (qual seja menor) como valores máximos.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Valor padrão: 4 Esta é a outra parte dos valores limites de segurança - 3 x max diário ou 4x valor actual - do OpenAPS. Isto define que não importa o valor da basal máxima definido na bomba, o valor máximo da basal temporária não pode ser maior que 4 x o valor da basal definida na bomba. O objetivo é evitar que sejam determinadas basais temporárias muito elevadas antes que se perceba como o algoritmo funciona. 4x é um valor que a maior parte das pessoas nunca necessitará de alterar pois o mais provável é necessitar de alterar outras definições para não necessitar de \"ultrapassar\" este limite de segurança.</string>
@ -257,6 +290,9 @@
    <string name="smscommunicator_invalidphonennumber">SMS número de telefone inválido</string>
    <string name="overview_calibration">Calibração</string>
    <string name="xdripnotinstalled">xDrip+ não está instalado</string>
+    <string name="calibrationsent">Calibração enviada para o xDrip+</string>
+    <string name="smscommunicator_calibrationsent">Calibração enviada. O recebimento deve estar ativado no xDrip+.</string>
+    <string name="smscommunicator_calibrationfailed">xDrip+ não está recebendo calibrações</string>
    <string name="pumpsuspended">Bomba suspensa</string>
    <string name="executing">Executando</string>
    <string name="virtualpump_settings">Definições da bomba virtual</string>
@ -284,10 +320,13 @@
    <string name="wear_detailedIOB_summary">Dividir IOB entre IOB de bolus e de basal na face do relógio</string>
    <string name="nosuccess">não foi bem sucedido - por favor, verifique o telefone</string>
    <string name="notavailable">n/a</string>
+    <string name="patientage">Tipo de paciente</string>
    <string name="child">Criança</string>
    <string name="teenage">Adolescente</string>
    <string name="adult">Adulto</string>
    <string name="resistantadult">Adulto resistente insulina</string>
+    <string name="pregnant">Grávida</string>
+    <string name="patientage_summary">Selecione o tipo de paciente para configurar os limites de segurança</string>
    <string name="patient_name">Nome do Paciente</string>
    <string name="patient_name_summary">Por favor, forneça nome do paciente ou apelido para diferenciar entre várias configurações</string>
    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Usuário</string>
@ -299,16 +338,24 @@
    <string name="suspendloopfor2h">Suspender loop por 2h</string>
    <string name="suspendloopfor3h">Suspender loop por 3h</string>
    <string name="suspendloopfor10h">Suspender loop por 10h</string>
+    <string name="disconnectpump">Bomba Desconectada</string>
    <string name="disconnectpumpfor15m">Desligar bomba por 15 min</string>
    <string name="disconnectpumpfor30m">Desligar bomba por 30 min</string>
    <string name="disconnectpumpfor1h">Desligar bomba por 1 h</string>
    <string name="disconnectpumpfor2h">Desligar bomba por 2 h</string>
    <string name="disconnectpumpfor3h">Desligar bomba por 3 h</string>
+    <string name="duration15m">15 min</string>
+    <string name="duration30m">30 min</string>
+    <string name="duration1h">1 hora</string>
+    <string name="duration2h">2 horas</string>
+    <string name="duration3h">3 horas</string>
+    <string name="duration10h">10 horas</string>
    <string name="resume">Continuar</string>
    <string name="reconnect">Reconectar Bomba</string>
    <string name="smscommunicator_wrongduration">Duração errada</string>
    <string name="smscommunicator_loopsuspended">Loop suspenso</string>
    <string name="smscommunicator_loopresumed">Loop retomado</string>
+    <string name="bg_trend_label">Tendência 15 min</string>
    <string name="treatments_wizard_cob_label">COB</string>
    <string name="superbolus">Superbólus</string>
    <string name="ns_logappstartedevent">Registar inicio da app no NS</string>
@ -363,8 +410,6 @@
    <string name="keep_screen_on_summary">Impedir Android de desligar o ecrã. Isto irá consumir muita bateria quando não ligado ao carregador.</string>
    <string name="sensitivity_warning">Ao ativar a função Autosense lembre-se de introduzir todos os carboidratos (carbs) que comeu. Caso contra contrário os desvios de carbs serão erroneamente identificados como uma variação da sensibilidade!!</string>
    <string name="sensitivityweightedaverage">Média ponderada da Sensibilidade</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Cancelar</string>
    <string name="notloadedplugins">Nem todos perfis foram carregados!</string>
    <string name="valuesnotstored">Valores não guardados!</string>
    <string name="ns_localbroadcasts_title">Ativar partilha local.</string>
@ -629,8 +674,14 @@
    <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="application_expired">Aplicativo expirou</string>
    <string name="new_version_warning">Nova versão para pelo menos %1$d dias disponíveis! Retorno a LGS após %2$d dias, o loop será desativado após %3$d dias</string>
    <string name="twohours">2h</string>
+    <string name="dexcom_app_patched">BYODA</string>
+    <string name="dexcom_short">BYODA</string>
+    <string name="description_source_dexcom">Receber valores de glicemia do \'Build Your Own Dexcom App\'.</string>
+    <string name="cobvsiob">CA vs IA</string>
+    <string name="bolusconstraintappliedwarn">Restrição de bólus aplicada: %1$.2f U para %2$.2f U</string>
    <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Absorção lenta de hidratos detectada: %2$d%% do tempo. Verifique o seu cálculo. COB pode estar sobreestimado, assim mais insulina pode ser dada !!!</font>]]></string>
    <string name="partialboluswizard">Entregue esta parte do resultado do assistente de bólus [%]</string>
    <string name="deliverpartofboluswizard">Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é entregue. Útil com o algoritmo SMB.</string>
@ -638,6 +689,9 @@
    <string name="increasingmaxbasal">Aumentar o valor máximo de basal porque a configuração é inferior à sua basal máxima no perfil</string>
    <string name="smscommunicator_messagebody">Corpo da mensagem inválido</string>
    <string name="format_bg_isf">%1$s FSI: %2$.1f</string>
+    <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
+    <string name="format_percent">%1$d%%</string>
+    <string name="unit_minute_short">min</string>
    <string name="profile_name">Nome do Perfil:</string>
    <string name="selected_profile">Seleccionado:</string>
    <string name="unitsnosemicolon">Unidades</string>
@ -650,18 +704,25 @@
    <string name="ic_short">IC</string>
    <string name="isf_short">FSI</string>
    <string name="target_short">ALV</string>
+    <string name="clone_label">Clonar</string>
    <string name="saveorresetchangesfirst">Guardar ou repor as alterações atuais primeiro</string>
    <string name="deletecurrentprofile">Eliminar perfil atual?</string>
+    <string name="copytolocalprofile">Criar novo perfil local a partir deste perfil?</string>
    <string name="profilenamecontainsdot">Nome do perfil contém pontos.\nIsso não é suportado pelo NS.\nPerfil não foi enviado para o NS.</string>
    <string name="low_mark_comment">Valor mais baixo da área de intervalo (apenas exibição)</string>
    <string name="high_mark_comment">Valor mais alto da área de intervalo (apenas exibição)</string>
+    <string name="age">Idade</string>
+    <string name="weight_label">Peso</string>
+    <string name="id">ID:</string>
    <string name="submit">Enviar</string>
    <string name="mostcommonprofile">Perfil mais comum:</string>
    <string name="survey_comment">Nota: Apenas os dados visíveis neste ecrã serão enviados anonimamente. O ID é atribuído a esta instalação do AndroidAPS. Você pode enviar dados novamente se o perfil principal for alterado, mas deixá-lo rodar pelo menos uma semana para tornar o resultado visível no intervalo de tempo. Sua ajuda é apreciada.</string>
    <string name="invalidage">Entrada de idade inválida</string>
    <string name="invalidweight">Entrada de peso inválida</string>
+    <string name="invalidpct">Entrada % inválida</string>
    <string name="tirformat"><![CDATA[<b>%1$s:</b> Hipo: <b>%2$02d%%</b> Dentro: <b>%3$02d%%</b> Hiper: <b>%4$02d%%</b>]]></string>
    <string name="average">Média</string>
+    <string name="tir">TIR</string>
    <string name="activitymonitor">Monitor de atividade</string>
    <string name="doyouwantresetstats">Quer reiniciar as estatísticas de atividade?</string>
    <string name="statistics">Estatísticas</string>
@ -670,6 +731,7 @@
    <string name="randombg_short">GLIC</string>
    <string name="tools">Ferramentas</string>
    <string name="show_calculation">Mostrar Localização</string>
+    <string name="show_removed">Mostrar removido(a)s</string>
    <string name="clearqueueconfirm">Limpar fila? Todos os dados na fila serão perdidos!</string>
    <string name="ebstopsloop">O uso do Bólus Estendido irá parar o modo Closed Loop no tempo do bólus estendido. Quer realmente isso?</string>
    <string name="closed_loop_disabled_with_eb">Closed Loop desabilitado por causa da execução do Bólus Estendido</string>
@ -680,12 +742,20 @@
    <string name="loop_tbrrequest_time_label">Hora de solicitação Basal Temp</string>
    <string name="loop_tbrexecution_time_label">Hora de execução Basal Temp</string>
    <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">do aplicativo Autenticador para: %1$s seguido por PIN</string>
+    <string name="smscommunicator_otp_pin">PIN adicional obrigatório no fim do token</string>
    <string name="smscommunicator_otp_pin_summary">Dígitos adicionais que devem ser memorizados e colados no final de cada Uma-Password-Única que seja gerada</string>
    <string name="smscomunicator_tab_otp_label">Configuração do Autenticador</string>
+    <string name="smscommunicator_code_verify_label">Código para verificar:</string>
+    <string name="smscommunicator_code_verify_hint">CÓDIGO + PIN</string>
+    <string name="smscommunicator_code_verify_info">O código de verificação consiste em 6 dígitos exibidos pelo app Autenticador (conhecido como OTP) seguido por 3 ou mais dígitos do PIN obrigatório.</string>
    <string name="smscommunicator_otp_reset_btn">Repor Autenticadores</string>
    <string name="smscommunicator_otp_reset_title">Repor Chave Autenticador</string>
    <string name="smscommunicator_otp_reset_prompt">Tem certeza de redefinir chave Authenticador? Ele tornará todos os Authenticators configurados atualmente como inválidos, e precisará de os configurar novamente.</string>
    <string name="smscommunicator_otp_reset_successful">Nova Chave do Autenticador foi gerada! Por favor, use o QRCode atualizado para os autenticadores.</string>
+    <string name="smscommunicator_otp_export_title">Exportando senha OTP</string>
+    <string name="smscommunicator_otp_export_prompt">Tem certeza de que deseja copiar a senha OTP para a área de transferência?\n\nGeralmente, isso somente é necessário se o aplicativo autenticador apresenta problemas para escanear o QRCode, se você quer inserir a senha manualmente ou se você deseja configurar um token físico (hardware) de OTP usando um aplicativo dedicado.</string>
+    <string name="smscommunicator_otp_export_successful">Senha OTP (no formato Base32) exportada e copiada para a área de transferência. Cole-a em um aplicativo autenticador ou gravador de dispositivo OTP físico!</string>
    <string name="smscommunicator_otp_step1_install_header">1. Instalar Autenticador</string>
    <string name="smscommunicator_otp_step2_provisioning_header">2. Pesquise o código para configurar os códigos OTP do AndroidAPS</string>
    <string name="smscommunicator_otp_step3_test_header">3. Teste Uma-Password-Única</string>
@ -698,10 +768,92 @@
    <string name="overview_show_absinsulin">Insulina absoluta</string>
    <string name="master_password_summary">Password Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
    <string name="current_master_password">Senha mestra atual</string>
+    <string name="statuslights">Luzes de estado</string>
    <string name="statuslights_copy_ns">Copiar definições do NS</string>
+    <string name="copyexistingvalues">Copiar configurações do NS (se existirem)?</string>
    <string name="classic_description">Tema original</string>
+    <string name="lowres_description">Design de baixa resolução</string>
    <string name="buttonson_description">Botões são sempre exibidos na parte inferior da tela</string>
    <string name="largedisplay_description">Mostrador Grande</string>
    <string name="skin">Tema</string>
+    <string name="comapareprofile">Comparar perfis</string>
+    <string name="nav_profilehelper">Assistente de perfil</string>
+    <string name="motoldefaultprofile">Perfil padrão</string>
+    <string name="currentprofile">Perfil atual</string>
+    <string name="availableprofile">Perfis disponíveis</string>
+    <string name="profiletype">Tipo de perfil</string>
+    <string name="formatwithtdd">Idade: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwittddandpct">Idade: %1$.0f TDD: %2$.0f U %3$d%%</string>
+    <string name="formatwithweight">Idade: %1$.0f Peso: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% da basal</string>
+    <string name="dpvdefaultprofile">Perfil padrão DPV</string>
+    <string name="setupwizard_pump_riley_link_status">Estado do RileyLink:</string>
+    <string name="filter">Filtros</string>
+    <string name="copytolocalprofile_invalid">Não foi possível criar o perfil. Perfil inválido.</string>
+    <string name="cta_dont_kill_my_app_info">Não encerre meu aplicativo?</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Enviar SMS se um evento de bomba inacessível for identificado</string>
+    <string name="smscommunicator_pump_ureachable">Reportar bomba inacessível</string>
+    <string name="advisoralarm">Disparar alarme quando for a hora de comer</string>
+    <string name="alarminxmin">Disparar alarme em %1$d min</string>
+    <string name="bolusadvisor">Assistente de bolus</string>
+    <string name="bolusadvisormessage">Sua glicemia está alta. Em vez de comer agora, é recomendado esperar por uma glicemia melhor. Quer fazer um bolus de correção agora e ser lembrado de quando for hora de comer? Neste caso, nenhum carboidrato será registrado e você deverá usar o assistente novamente quando lembrarmos você.</string>
+    <string name="enablebolusadvisor">Ativar o assistente de bolus</string>
+    <string name="time_to_eat">Hora de comer!\nAbra o assistente de bolus e faça o cálculo novamente.</string>
+    <string name="timetoeat">Hora de comer</string>
+    <string name="bolusreminder">Lembrete de bolus</string>
+    <string name="enablebolusreminder">Ativar lembrete de bolus</string>
+    <string name="enablebolusreminder_summary">Usar lembrete para adiar o bolus com o assistente
+        (\"pós-bolus\")</string>
+    <string name="time_to_bolus">Hora do bolus!\nAbra o assistente de bolus e faça o cálculo novamente.</string>
+    <string name="data_status">Estado dos dados de glicemia</string>
+    <string name="statuslights_cannula_age">idade da cânula</string>
+    <string name="statuslights_patch_pump_age">Idade da bomba patch</string>
+    <string name="patch_pump">Bomba patch</string>
+    <string name="recalculated_data_used">Dados recalculados foram utilizados</string>
+    <string name="bg_too_close">Glicemia muito próxima:\n%1$s\n%2$s</string>
+    <string name="identification">Identificação (e-mail, apelido FB ou Discord, etc)</string>
+    <string name="identification_not_set">Identificação não definida no modo de desenvolvimento</string>
+    <string name="a11y_dialog">caixa de diálogo</string>
+    <string name="a11y_current_bg">glicemia atual</string>
+    <string name="a11_correction_percentage">resultado correto em %</string>
+    <string name="a11_correction_units">resultado correto em unidades</string>
+    <string name="not_available_full">Indisponível</string>
+    <string name="a11y_high">hiper</string>
+    <string name="a11y_inrange">dentro da meta</string>
+    <string name="a11y_low">hipo</string>
+    <string name="a11y_arrow_double_down">caindo rapidamente</string>
+    <string name="a11y_arrow_single_down">caindo</string>
+    <string name="a11y_arrow_forty_five_down">caindo lentamente</string>
+    <string name="a11y_arrow_flat">estável</string>
+    <string name="a11y_arrow_forty_five_up">subindo lentamente</string>
+    <string name="a11y_arrow_single_up">subindo</string>
+    <string name="a11y_arrow_double_up">subindo rapidamente</string>
+    <string name="a11y_arrow_none">nenhum</string>
+    <string name="a11y_arrow_unknown">desconhecido</string>
+    <string name="a11y_graph">gráfico</string>
+    <string name="a11y_bg_quality">qualidade da glicemia</string>
+    <string name="a11y_bg_quality_recalculated">recalculada</string>
+    <string name="a11y_bg_quality_doubles">entradas duplicadas</string>
+    <string name="a11y_insulin_label">insulina</string>
+    <string name="a11y_blood_glucose">glicemia</string>
+    <string name="a11y_bg_outdated">desatualizado</string>
+    <string name="a11y_carb_reminder">definir lembrete</string>
+    <string name="a11y_add_new_profile">adicionar novo perfil</string>
+    <string name="a11y_clone_profile">clonar perfil atual</string>
+    <string name="a11y_delete_current_profile">excluir perfil atual</string>
+    <string name="a11y_add_new_to_list">adicionar novo à lista</string>
    <!-- WEAR OS-->
+    <string name="wear_action_tempt_preset_error">Alvo temporário pré-definido desconhecido: %1$s</string>
+    <string name="wear_action_tempt_cancel_message">Cancelando Alvos temporários em execução?</string>
+    <string name="wear_action_tempt_unit_error">Unidades diferentes usadas no relógio e telefone!</string>
+    <string name="wear_action_tempt_zero_message">Desligar alvo temporário - cancelando Alvos temporários atuais?</string>
+    <string name="wear_action_tempt_min_bg_error">Glicemia mínima fora do alvo!</string>
+    <string name="wear_action_tempt_max_bg_error">Glicemia maxima fora da meta!</string>
+    <string name="wear_action_tempt_manual_range_message">Alvo temporário:\nMin: %1$s\nMax: %2$s\nDuração: %3$s</string>
+    <string name="wear_action_tempt_manual_message">Alvo temporário:\nTarget: %1$s\nDuration: %2$s</string>
+    <string name="wear_action_tempt_preset_message">Alvo temporário:\Reason: %1$s\nTarget: %2$s\nDuration: %3$s</string>
+    <string name="quick_wizard_message">Assistente rápido: %1$s\nInsulin: %2$.2fU\nCarbs: %3$dg</string>
+    <string name="wizard_result">Calculadora:\nInsulin: %1$.2fU\nCarbs: %2$dg</string>
+    <string name="overview_editquickwizard_show_on_device">Mostrar entrada no dispositivo:</string>
+    <string name="quick_wizard_not_available">O assistente rápido selecionado não está mais disponível, atualize seu atalho</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -161,7 +161,6 @@
    <string name="end_user_license_agreement">Condições de Utilização</string>
    <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCEPTO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É CONSIGO. CASO O PROGRAMA SEJA DEFEITUOSO, ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
    <string name="end_user_license_agreement_i_understand">EU ENTENDO E CONCORDO</string>
-    <string name="save">Guardar</string>
    <string name="reloadprofile">Recarregar perfil</string>
    <string name="smscommunicator">Comunicador SMS</string>
    <string name="smscommunicator_allowednumbers">Número de telefones permitidos</string>
@ -426,8 +425,6 @@
    <string name="keep_screen_on_summary">Impedir Android de desligar o ecrã. Isto irá consumir muita bateria quando não ligado ao carregador.</string>
    <string name="sensitivity_warning">Ao activar a função Autosense lembre-se de introduzir todos os hidratos de carbono (HC) que comeu. Caso contrário os desvios de hidratos serão erroneamente identificados como uma variação da sensibilidade !!</string>
    <string name="sensitivityweightedaverage">Média ponderada da Sensibilidade</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Cancelar</string>
    <string name="notloadedplugins">Nem todos perfis foram carregados!</string>
    <string name="valuesnotstored">Valores não guardados!</string>
    <string name="ns_localbroadcasts">Activar transmissões para outras aplicações (como xDrip+). Não habilite se tiver mais de uma instância de AAPS ou ClienteNS instalado!</string>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -161,7 +161,6 @@
    <string name="end_user_license_agreement">Licență utilizator final</string>
    <string name="end_user_license_agreement_text">NU FOLOSIȚI PENTRU LUAREA DE DECIZII MEDICALE. NU EXISTĂ RĂSPUNDERE LEGALĂ SAU GARANȚIE PENTRU ACEST PROGRAM, ÎN LIMITA APLICABILĂ A LEGII. CU EXCEPTIA CAZURILOR SPECIAL MENȚIONATE, AUTORUL ȘI/SAU ALTE PERSOANE IMPLICATE PUN LA DISPOZIȚIE ACEST PROGRAM FĂRĂ NICIO GARANȚIE, IMPLICITĂ SAU EXPLICITĂ, INCLUZÂND, DAR FĂRĂ A SE LIMITA LA, GARANȚIILE LEGATE DE VĂNZAREA SAU POTRIVIREA PENTRU UN ANUME SCOP. ÎNTREGUL RISC LEGAT DE CALITATEA ȘI PERFORMANȚA ACESTUI PROGRAM CAD ÎN RESPONSABILITATEA DUMNEAVOASTRĂ. DACĂ PROGRAMUL SE DOVEDEȘTE A FI DEFECT, DUMNEAVOASTRĂ VĂ ASUMAȚI ÎNTREAGA RĂSPUNDERE, PRECUM ȘI TOATE COSTURILE LEGATE DE SERVICE, REPARAȚII SAU CORECȚII.</string>
    <string name="end_user_license_agreement_i_understand">ÎNȚELEG ȘI SUNT DE ACORD</string>
-    <string name="save">Salvează</string>
    <string name="reloadprofile">Reîncarcă profilul</string>
    <string name="smscommunicator">Comunicator SMS</string>
    <string name="smscommunicator_allowednumbers">Numere de telefon permise</string>
@ -426,8 +425,6 @@
    <string name="keep_screen_on_summary">Nu permite telefonului să stingă ecranul. Când este activă, această opțiune consumă foarte multă baterie atunci când telefonul nu este la încărcat.</string>
    <string name="sensitivity_warning">Trebuie introduși toți carbo la pornirea Autosens. În caz contrar, acțiunea carbo va fi percepută ca schimbare a sensibilității!</string>
    <string name="sensitivityweightedaverage">Sensibilitate estimată prin mediere</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Renunță</string>
    <string name="notloadedplugins">Nu s-au încărcat toate profilurile!</string>
    <string name="valuesnotstored">Nu s-au salvat valorile!</string>
    <string name="ns_localbroadcasts">Activați transmisiunile către alte aplicații (cum ar fi xDrip+). Nu activați dacă aveți mai mult de o instanță de AAPS sau NSClient instalat!</string>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -25,6 +25,7 @@
    <string name="description_ns_client">Синхронизирует данные с Nightscout</string>
    <string name="description_ama">Состояние алгоритма в 2017 году</string>
    <string name="description_smb">Самый новый алгоритм для опытных пользователей</string>
+    <string name="description_smb_dynamic_isf">Последний алгоритм для опытных пользователей с динамическим/автоматическим ISF</string>
    <string name="description_overview">Отображает текущее состояние цикла и часто используемые кнопки</string>
    <string name="description_persistent_notification">Показывает текущие уведомления и краткий обзор событий цикла</string>
    <string name="description_profile_local">Определите профиль, доступный в автономном режиме.</string>
@ -161,7 +162,6 @@
    <string name="end_user_license_agreement">лицензионное соглашение с пользователем</string>
    <string name="end_user_license_agreement_text">НЕ ДОЛЖНО ИСПОЛЬЗОВАТЬСЯ ДЛЯ ПРИНЯТИЯ МЕДИЦИНСКИХ РЕШЕНИЙ. ПРОГРАММА НЕ ДАЕТ ГАРАНТИЙ В РАМКАХ СУЩЕСТВУЮЩЕГО ЗАКОНОДАТЕЛЬСТВА. ПРЕДОСТАВЛЯЕТСЯ \"КАК ЕСТЬ\" БЕЗ ЯВНЫХ ИЛИ СКРЫТЫХ ГАРАНТИЙ ВКЛЮЧАЯ НО НЕ ОГРАНИЧИВАЯСЬ ВОЗМОЖНОСТЬЮ КОММЕРЧЕСКОГО ИСПОЛЬЗОВАНИ ИЛИ СООТВЕТСТВИЯ КАКИМ-ЛИБО ЦЕЛЯМ. ВСЕ РИСКИ ЛОЖАТСЯ НА ВАС. В СЛУЧАЕ НЕРАБОТОСПОСОБНОСТИ ПРОГРАММЫ ВЫ НЕСЕТЕ ВСЕ РАСХОДЫ СВЯЗАННЫЕ С ОБСЛУЖИВАНИЕМ РЕМОНТОМ ИЛИ КОРРЕКТИРОВКОЙ.  </string>
    <string name="end_user_license_agreement_i_understand">я понимаю и принимаю</string>
-    <string name="save">сохранить</string>
    <string name="reloadprofile">обновить профиль</string>
    <string name="smscommunicator">SMS коммуникатор</string>
    <string name="smscommunicator_allowednumbers">разрешенные телефонные номера</string>
@ -266,6 +266,7 @@
    <string name="configbuilder_shortname">КОНФ</string>
    <string name="loop_shortname">ЗЦ</string>
    <string name="oaps_shortname">OAPS</string>
+    <string name="dynisf_shortname">ДинISF</string>
    <string name="localprofile_shortname">ЛП</string>
    <string name="overview_shortname">НАЧАЛО</string>
    <string name="virtualpump_shortname">ВиртПомпа</string>
@ -426,13 +427,12 @@
    <string name="keep_screen_on_summary">Не давать системе Android отключать экран. Это увеличит потребление энергии при отключенной сети питания.</string>
    <string name="sensitivity_warning">Активируя Autosense не забывайте вводить все съеденные углеводы. Иначе отклонения в углеводах будут неверно определены как изменение чувствительности !!</string>
    <string name="sensitivityweightedaverage">Средневзвешенная чувствительность</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">отмена</string>
    <string name="notloadedplugins">не все профили загружены!</string>
    <string name="valuesnotstored">Данные не сохранены!</string>
    <string name="ns_localbroadcasts">Включить трансляцию для других приложений (например, xDrip). Не включайте, если установлено несколько экземпляров приложений AAPS или NSClient!</string>
    <string name="ns_localbroadcasts_title">Активировать локальную передачу</string>
    <string name="openapssmb">Супер микро болюс OpenAPS</string>
+    <string name="openaps_smb_dynamic_isf">Динамический ISF</string>
    <string name="enableuam">Включить непредвиденный прием пищи UAM</string>
    <string name="enablesmb">Включить супер микро болюс SMB</string>
    <string name="enablesmb_summary">Для ускорения действия используйте супер микро болюсы SMB вместо временного базала</string>
@ -501,6 +501,7 @@
    <string name="negativeonly">Только отрицательные</string>
    <string name="overview_editquickwizard_usecob">Вычисление активных углеводов COB</string>
    <string name="overview_editquickwizard_usetemptarget">Вычисление временного целевого значения</string>
+    <string name="overview_editquickwizard_usepercentage">Расчет процентов</string>
    <string name="loopenabled">Цикл активирован</string>
    <string name="apsselected">Выбран APS</string>
    <string name="nsclienthaswritepermission">NSClient имеет разрешение на запись</string>
@ -661,6 +662,9 @@
    <string name="sensitivity_raises_target_title">Чувствительность поднимает цель</string>
    <string name="sensitivity_raises_target_summary">При обнаружении чувствительности целевой уровень глюкозы повышается</string>
    <string name="careportal_removestartedevents">AndroidAPS перезапущен</string>
+    <string name="show_invalidated">Показать недействительные</string>
+    <string name="hide_invalidated">Скрыть недействительные</string>
+    <string name="remove_items">Удалить элементы</string>
    <string name="storedsettingsfound">Найдены сохраненные параметры</string>
    <string name="allow_hardware_pump_text">Внимание: Если вы активируете подключение к невиртуальной помпе, AndroidAPS скопирует настройки базала в профиль помпы, перезаписывая существующие настройки, хранящиеся в ней. Убедитесь, что настройки базала в AndroidAPS корректны. Если вы не уверены или не хотите перезаписать настройки базала на помпу, нажмите отменить и повторите подключение в другое время.</string>
    <string name="error_adding_treatment_title">Данные терапии неполные</string>
@ -756,6 +760,8 @@
    <string name="profilenamecontainsdot">Имя профиля содержит точки.\nЭто не поддерживается NS.\nПрофиль не выгружен в NS.</string>
    <string name="low_mark_comment">Меньшее значение диапазона целевых значений (только для дисплея)</string>
    <string name="high_mark_comment">Большее значение диапазона целевых значений (только для дисплея)</string>
+    <string name="age">Возраст</string>
+    <string name="weight_label">Вес</string>
    <string name="id">Идентификатор:</string>
    <string name="submit">Отправить</string>
    <string name="mostcommonprofile">Наиболее часто применяемый профиль:</string>
@ -928,4 +934,23 @@
    <string name="a11y_blood_glucose">уровень глюкозы в крови (ГК)</string>
    <string name="a11y_bg_outdated">устаревшие данные</string>
    <!-- WEAR OS-->
+    <string name="wear_action_tempt_preset_error">Неизвестная конфигурация врем цели: %1$s</string>
+    <string name="wear_action_tempt_cancel_message">Отменить врем цели?</string>
+    <string name="wear_action_tempt_unit_error">На часах и телефоне различные единицы измерения!</string>
+    <string name="wear_action_tempt_zero_message">Нулевая врем цель - отмена?</string>
+    <string name="wear_action_tempt_min_bg_error">Мин ГК вне диапазона!</string>
+    <string name="wear_action_tempt_max_bg_error">Макс ГК вне диапазона!</string>
+    <string name="wear_action_tempt_manual_range_message">ВремЦель:\nМин: %1$s\nМакс.: %2$s\nДлительность: %3$s</string>
+    <string name="wear_action_tempt_manual_message">ВремЦель:\nЦель: %1$s\nДлительность: %2$s</string>
+    <string name="select_profile">Выберите профиль для изменения</string>
+    <string name="refresh_from_nightscout">Обновить из Nightscout</string>
+    <string name="remove_selected_items">Удалить выбранные элементы</string>
+    <string name="select_for_removal">Выберите для удаления</string>
+    <string name="profile_changes">Изменение профиля</string>
+    <string name="tempt_targets">Временные цели</string>
+    <string name="carbs_and_bolus">Углеводы и болюс</string>
+    <string name="confirm_remove_multiple_items">Вы уверены, что хотите удалить %1$d элементов</string>
+    <string name="hide_loop">Скрыть цикл</string>
+    <string name="show_loop">Показать цикл</string>
+    <string name="count_selected">%1$d выбрано</string>
 </resources>
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@ -162,7 +162,6 @@
    <string name="end_user_license_agreement">Licenčná zmluva s koncovým používateľom</string>
    <string name="end_user_license_agreement_text">Tento program nemôže byť použitý na medicínske rozhodnutia. Na program neexistuje žiadna záruka, alebo garantovaná podpora v akejkoľvek podobe. Keď už sa rozhodneš pre používanie, tak jeho kvalita a celkové schopnosti tohto projektu závisia len na Tebe samotnom. Ak by sa ukázalo, že je program chybný, preberáš všetky potrebné náklady na liečbu, prípadne náklady na iné servisné služby, opravy, alebo korekcie.</string>
    <string name="end_user_license_agreement_i_understand">ROZUMIEM A POTVRDZUJEM</string>
-    <string name="save">Uložiť</string>
    <string name="reloadprofile">Obnoviť profil</string>
    <string name="smscommunicator">SMS komunikátor</string>
    <string name="smscommunicator_allowednumbers">Povolené telefónne čísla</string>
@ -428,14 +427,11 @@
    <string name="keep_screen_on_summary">Zabrániť Androidu, aby zhasínal obrazovku. Bez pripojenia nabíjačky vybije veľmi rýchlo batériu!</string>
    <string name="sensitivity_warning">Pri zapnutej automatickej detekcii citlivosti, nezabudnite vkladať všetky prijaté sacharidy. V opačnom prípade, budú odchýlky mylne vyhodnocované, ako zmena citlivosti !!</string>
    <string name="sensitivityweightedaverage">Citlivosť vážený priemer</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Zrušiť</string>
    <string name="notloadedplugins">Nenačítané všetky profily!</string>
    <string name="valuesnotstored">Hodnoty nie sú uložené!</string>
    <string name="ns_localbroadcasts">Povoliť vysielanie do iných aplikácií (napr. xDrip+). Nepovoľujte, pokiaľ máte nainštalovanú viac ako jednu AAPS, alebo NSClient inštanciu!</string>
    <string name="ns_localbroadcasts_title">Povoliť lokálne vysielanie.</string>
    <string name="openapssmb">OpenAPS SMB</string>
-    <string name="openaps_smb_dynamic_isf">OpenAPS SMB s dynamickým ISF</string>
    <string name="enableuam">Povoliť UAM</string>
    <string name="enablesmb">Povoliť SMB</string>
    <string name="enablesmb_summary">Použiť Super Mikro Bolusy namiesto dočasných bazálov, pre zrýchleniu účinku</string>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -163,7 +163,6 @@ Eversense-appen.</string>
    <string name="end_user_license_agreement">Licensavtal för slutanvändare</string>
    <string name="end_user_license_agreement_text">FÅR INTE ANVÄNDAS FÖR ATT FATTA MEDICINSKA BESLUT. DET FINNS INGEN GARANTI FÖR PROGRAMMET I DEN UTSTRÄCKNING SOM TILLÅTS AV GÄLLANDE LAG. FÖRUTOM NÄR ANNAT ANGES SKRIFTLIGEN LEVERERAS APPLIKATIONEN SOM DEN ÄR HELT UTAN GARANTIER I NÅGON SOM HELST FORM, VARKEN UTTRYCKTA ELLER UNDERFÖRSTÅDDA, INKLUSIVE MEN INTE BEGRÄNSAT TILL SÄLJBARHET OCH LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL. HELA RISKEN VAD GÄLLER KVALITET OCH PRESTANDA AV PROGRAMMET ÅLIGGER ANVÄNDAREN. OM PROGRAMMET VISAR SIG VARA DEFEKT ANTAR ANVÄNDAREN DEN FULLA FÖR KOSTNADEN FÖR ALL NÖDVÄNDIG SERVICE, REPARATION ELLER KORRIGERING.</string>
    <string name="end_user_license_agreement_i_understand">JAG FÖRSTÅR OCH GODKÄNNER</string>
-    <string name="save">Spara</string>
    <string name="reloadprofile">Ladda om profil</string>
    <string name="smscommunicator">SMS-tjänst</string>
    <string name="smscommunicator_allowednumbers">Godkända telefonnummer</string>
@ -430,14 +429,11 @@ Eversense-appen.</string>
    <string name="keep_screen_on_summary">Förhindrar att skärmen stängs av. Förbrukar mer batteri.</string>
    <string name="sensitivity_warning">Genom att slå på Autosens funktionen, kom ihåg att skriva in alla KH. Annars kommer programmet göra fel i beräkningar av känslighet (ISF)!!</string>
    <string name="sensitivityweightedaverage">WeightedAverage</string>
-    <string name="mdtp_ok">OK</string>
-    <string name="mdtp_cancel">Avbryt</string>
    <string name="notloadedplugins">Alla profiler laddades inte!</string>
    <string name="valuesnotstored">Alla värden sparades inte!</string>
    <string name="ns_localbroadcasts">Aktivera sändning till andra appar (som xDrip+) på denna telefon. Aktivera inte detta om du har fler än en förekomst av AAPS eller NSClient installerad!</string>
    <string name="ns_localbroadcasts_title">Aktivera lokala broadcasts</string>
    <string name="openapssmb">OpenAPS SMB</string>
-    <string name="openaps_smb_dynamic_isf">OpenAPS SMB Dynamisk ISF</string>
    <string name="enableuam">Aktivera UAM</string>
    <string name="enablesmb">Aktivera SMB</string>
    <string name="enablesmb_summary">Använd Super Micro Bolusar istället för temp basal för snabbare resultat</string>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -162,7 +162,6 @@
    <string name="end_user_license_agreement">Son Kullanıcı Lisans Sözleşmesi</string>
    <string name="end_user_license_agreement_text">TIBBİ KARAR VERMEK İÇİN KULLANILMAMALIDIR. UYGULANABİLİR YASANIN İZİN VERDİĞİ ÖLÇÜDE, PROGRAM İÇİN GARANTİ YOKTUR. TELİF HAKKI SAHİPLERİNİN VE / VEYA DİĞER TARAFLARIN YAZILI OLMASINA YÖNELİK BAŞKA HİÇBİR ŞEKİLDE BELİRTİLEN VEYA BELİRLİ BİR AMACA UYGUNLUK İLE İLGİLİ ZIMNİ GARANTİLER DE DAHİL OLMAK ÜZERE ANCAK BUNLARLA SINIRLI OLMAMAK ÜZERE AÇIK VEYA ZIMNİ HİÇBİR GARANTİ OLMAKSIZIN “OLDUĞU GİBİ” SAĞLAMAKTADIR. PROGRAMIN KALİTESİ VE PERFORMANSI İLE İLGİLİ TÜM RİSK SİZE AİTTİR. PROGRAMIN HASARLI OLMASI DURUMUNDA, TÜM GEREKLİ SERVİS, ONARIM VEYA DÜZELTME MALİYETİNİ KABUL ETMİŞ OLURSUNUZ.</string>
    <string name="end_user_license_agreement_i_understand">ANLADIM VE KABUL EDİYORUM</string>
-    <string name="save">Kaydet</string>
    <string name="reloadprofile">Profili yeniden yükle</string>
    <string name="smscommunicator">SMS Kominikatör</string>
    <string name="smscommunicator_allowednumbers">İzinli telefon numaraları</string>
@ -430,14 +429,12 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
    <string name="keep_screen_on_summary">Android\'in ekranı kapatmasını önleyin. Prize takılı değilken çok fazla enerji tüketir.</string>
    <string name="sensitivity_warning">Otoduyarlılık özelliğini açarsanız tüm yenen karbonhidratları girmeyi unutmayın. Aksi halde, karbonhidrat sapmaları duyarlılık değiştikçe yanlış tanımlanacaktır!!</string>
    <string name="sensitivityweightedaverage">Ağırlıklı ortalama duyarlılık</string>
-    <string name="mdtp_ok">Tamam</string>
-    <string name="mdtp_cancel">Vazgeç</string>
    <string name="notloadedplugins">Tüm profiller yüklenmedi!</string>
    <string name="valuesnotstored">Değerler kaydedilmedi!</string>
    <string name="ns_localbroadcasts">Diğer uygulamalara (xDrip+ gibi) yayınları etkinleştirin. Yüklü birden fazla APPS veya NSClient örneğiniz varsa etkinleştirmeyin!</string>
    <string name="ns_localbroadcasts_title">Yerel yayınları etkinleştirin.</string>
    <string name="openapssmb">OpenAPS SMB</string>
-    <string name="openaps_smb_dynamic_isf">OpenAPS SMB Dinamik İDF</string>
+    <string name="openaps_smb_dynamic_isf">Dinamik İDF</string>
    <string name="enableuam">UAM etkinleştir</string>
    <string name="enablesmb">SMB (Super Micro Bolus) etkinleştir</string>
    <string name="enablesmb_summary">Daha hızlı bir etki için geçici bazal yerine Super Micro Bolus kullanın</string>
@ -667,6 +664,9 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
    <string name="sensitivity_raises_target_title">Duyarlılık hedefi yükseltir</string>
    <string name="sensitivity_raises_target_summary">Hassasiyet tespit edildiğinde, KŞ hedefini yükseltin</string>
    <string name="careportal_removestartedevents">Temiz AndroidAPS başladı</string>
+    <string name="show_invalidated">Geçersiz olanları göster</string>
+    <string name="hide_invalidated">Geçersiz olanları gizle</string>
+    <string name="remove_items">Öğeleri kaldır</string>
    <string name="storedsettingsfound">Saklanan ayarlar bulundu</string>
    <string name="allow_hardware_pump_text">Dikkat: Eğer bir donanım pompasını etkinleştirir ve bağlarsanız, AndroidAPS, bazal ayarları profilden pompaya aktaracaktır ve pompada kayıtlı mevcut bazal oranlarının üzerine yazacaktır. AndroidAPS\'de doğru ayarların olduğundan emin olun. Emin değilseniz veya pompanızdaki bazal ayarların üzerine yazmak istemiyorsanız, iptal tuşuna basın ve daha sonra tekrar deneyin.</string>
    <string name="error_adding_treatment_title">Tedavi verileri eksik</string>
@ -975,4 +975,15 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
    <string name="wear_unknown_action_string">Bilinmeyen eylem komutu:</string>
    <string name="overview_editquickwizard_percentage">Yüzde</string>
    <string name="app_default">Uygulama varsayılanı</string>
+    <string name="select_profile">Düzenlenecek profili seç</string>
+    <string name="refresh_from_nightscout">Nightscout\'tan Yenile</string>
+    <string name="remove_selected_items">Seçili nesneleri kaldır</string>
+    <string name="select_for_removal">Silmek için seçin</string>
+    <string name="profile_changes">Profil değişiklikleri</string>
+    <string name="tempt_targets">Geçici Hedefler</string>
+    <string name="carbs_and_bolus">Karbonhidrat ve bolus</string>
+    <string name="confirm_remove_multiple_items">%1$d öğeyi kaldırmak istediğinizden emin misiniz</string>
+    <string name="hide_loop">Döngüyü gizle</string>
+    <string name="show_loop">Döngüyü göster</string>
+    <string name="count_selected">%1$d seçildi</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/exam.xml
+++ b/app/src/main/res/values-zh-rCN/exam.xml
@ -1,4 +1,214 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="dia_whatmeansdia">关于DIA(胰岛素作用持续时间)哪些是对的?</string>
+    <string name="dia_label_exam">胰岛素作用持续时间 ( DIA)</string>
+    <string name="dia_profile">您应该在个人配置文件中设置胰岛素敏感系数DIA的值。</string>
+    <string name="dia_minimumis5h">允许的最小值为 5 小时。</string>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
+    <string name="dia_meaningisequaltodiapump">如果您确信在 AndroidAPS 之前的泵中使用的 DIA 值工作良好，那么在开始循环时不需要更改此值。</string>
+    <string name="dia_valuemustbedetermined">您应该为自己确定 DIA 的适当值。</string>
+    <string name="hypott_label">低血糖临时目标</string>
+    <string name="hypott_whenhypott">设定低血糖临时目标的主要原因是什么？</string>
+    <string name="hypott_wrongbasal">纠正由于基础率设置不准确而引起的低血糖事件。</string>
+    <string name="hypott_preventoversmb">治疗低血糖时，防止AndroidAPS过度纠正因补充碳水引起的血糖速升事件。</string>
+    <string name="hypott_exercise">纠正由于运动引起的低血糖事件。</string>
+    <string name="hypott_0basal">在已设定0%临时基础率的基础上，进一步防止血糖降低。</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
+    <string name="offlineprofile_whatprofile">哪些配置文件可以离线使用和配置？</string>
+    <string name="offlineprofile_label">主题: 离线配置文件</string>
+    <string name="offlineprofile_nsprofile">NS 文件可以使用，但不能配置 。</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">在 AndroidAPS中应用\"断开泵\"的原因</string>
    <string name="pumpdisconnect_whattodo">泵断开连接时我们应做些什么?</string>
+    <string name="pumpdisconnect_unnecessary">这是没有必要的，如果胰岛素泵物理断开，胰岛素会无法输注。</string>
+    <string name="pumpdisconnect_missinginsulin">在胰岛素泵物理断开时，它可以防止AndroidAPS将未输注的胰岛素剂量进行统计。</string>
+    <string name="pumpdisconnect_notstop">如果胰岛素泵保持连接，就不会停止胰岛素输注。</string>
+    <string name="pumpdisconnect_openloop">它将让AndroidAPS进入开环模式。</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">安卓APS设置</string>
+    <string name="objectives2_label">安卓APS设置</string>
+    <string name="objectives_howtosave">备份设置的最佳办法是什么?</string>
+    <string name="objectives_notesettings">你不需要导出你的设置，只要你对它们做了记录。</string>
+    <string name="objectives_afterobjective">在实现一个目标后导出您的设置。</string>
+    <string name="objectives_afterchange">在更改您的任何设置后导出您的设置。</string>
+    <string name="objectives_afterinitialsetup">在您完成初始化并设置了您的偏好选项后导出您的设置。</string>
+    <string name="objectives2_maintenance">使用维护菜单导出您的本地设置。</string>
+    <string name="objectives2_internalstorage">您的设置文件可以在手机上的文件夹内部存储/AAPS/preferences中找到。</string>
+    <string name="objectives2_cloud">将您的首选项文件复制到手机以外的安全位置(如使用云盘，用数据线传到计算机，电子邮箱等等)</string>
+    <string name="objectives2_easyrestore">如果您的手机损坏或丢失，在没有备份的情况下可以轻松的远程恢复您的设置。</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="noisycgm_label">CGM数据噪音</string>
+    <string name="noisycgm_whattodo">如果 CGM 数据有噪声，我们应该怎么办?</string>
+    <string name="noisycgm_nothing">什么都不需要做，AAPS会处理的。</string>
+    <string name="noisycgm_pause">禁用闭环功能以避免胰岛素过量或不足。</string>
+    <string name="noisycgm_replacesensor">更换持续产生噪音或不准确数据的传感器。</string>
+    <string name="noisycgm_checksmoothing">验证您的CGM应用程序是否提供了平滑数据。</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="exerciseprofile_label">运动和配置</string>
+    <string name="exerciseprofile_whattodo">你如何使用配置文件来最好地帮助APS系统处理有氧运动？</string>
+    <string name="exerciseprofile_switchprofilebelow100">请执行低于100%的配置文件切换。</string>
+    <string name="exerciseprofile_switchprofileabove100">请执行高于100%的配置文件切换。</string>
+    <string name="exerciseprofile_leaveat100">将配置文件设置为100%。</string>
+    <string name="exerciseprofile_suspendloop">暂停闭环。</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">运动和临时目标</string>
+    <string name="exercise_whattodo">你如何使用临时目标功能来最好地帮助APS系统处理有氧运动？</string>
+    <string name="exercise_settt">在开始运动之前，选一个合适的时间设置活动血糖目标。</string>
+    <string name="exercise_setfinished">在运动结束之后，设置活动血糖目标。</string>
+    <string name="exercise_setunchanged">让你的血糖目标保持不变。</string>
+    <string name="exercise_15g">等血糖值低于你的低血糖警戒线之后，吃15克速升的活性碳水合物。</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">禁用/暂停闭环</string>
+    <string name="suspendloop_doigetinsulin">在禁用/暂停闭环时，是否可以输注胰岛素?</string>
+    <string name="suspendloop_yes">是的，胰岛素基础率可以正常输注的。</string>
+    <string name="suspendloop_no">不，胰岛素停止输注。</string>
+    <string name="basaltest_label">Basal(基础率)，ISF(胰岛素敏感系数)和I:C(胰岛素:碳水)测试</string>
+    <string name="basaltest_when">什么时候需要修订这些值？</string>
+    <string name="basaltest_beforeloop">在开始闭环之前。</string>
+    <string name="basaltest_havingregularhighlow">当经常出现高血糖或低血糖时。</string>
+    <string name="basaltest_weekly">每周至少一次。</string>
+    <string name="basaltest_fixed">一旦设置和验证，这些值不应随着时间而变化。</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">先决条件</string>
+    <string name="prerequisites_what">什么是建立和使用 AndroidAPS的基本条件？</string>
+    <string name="prerequisites_determinedcorrectprofile">已验证配置文件的信息 (Basal， IC， ISF， DIA)。</string>
+    <string name="prerequisites_computer">一台安装和配置了Android Studio软件的计算机。</string>
+    <string name="prerequisites_phone">一部支持此应用的手机。</string>
+    <string name="prerequisites_pump">一个兼容的胰岛素泵，如果您计划运行闭合模式。</string>
+    <string name="prerequisites_nightscout">Nightscout, 以保存所有数据的日志和检查设置。</string>
+    <string name="prerequisites_tidepoolaccount">Tidelpool账户。</string>
+    <string name="prerequisites_googleaccount">Google 账户</string>
+    <string name="prerequisites_githubaccount">GitHub 账户</string>
+    <string name="prerequisites_beanandroiddeveloper">编程或编辑代码方面的经验。</string>
+    <string name="prerequisites_own670g">一台 MiniMed 670G 泵。</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="prerequisites_smartwatch">一个智能手表.</string>
+    <string name="prerequisites_supportedcgm">一个可正常使用的 CGM。</string>
+    <string name="prerequisites2_label">先决条件</string>
+    <string name="prerequisites2_what">什么是建立和使用 AndroidAPS的基本条件？</string>
+    <string name="prerequisites2_profile">验证参数信息用于个人配置文件（如ISF胰岛素敏感度系数、I:C胰岛素碳水比率、基础率、DIA胰岛素作用持续时间等等）。</string>
+    <string name="prerequisites2_device">兼容的Android 设备 (例如：手机、安卓原生系统手表，或平板电脑)。</string>
+    <string name="prerequisites2_internet">AndroidAPS需要互联网连接才能启用闭环功能。</string>
+    <string name="prerequisites2_supportedcgm">一台安装了动态血糖监测应用或兼容软件的手机/设备，用于接收血糖数据。</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">更新 AndroidAPS</string>
+    <string name="whatistrue">检查所有正确的答案.</string>
+    <string name="update_git">您需要在您的计算机上安装和配置Git。</string>
+    <string name="update_asap">当更新的 AndroidAPS 版本发布时，先前的版本可能会在指定时间之后受到远程限制。</string>
+    <string name="update_keys">您应该保存并记住密钥的存储位置，并使用相同地签名密钥进行更新，与您以前的安装一样。</string>
+    <string name="update_neverupdate">如果该系统运作良好，就不要去更新系统。</string>
+    <string name="update_askfriend">如果您在构建应用时遇到困难，您可以安装一个由朋友构建的应用程序。</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_label">疑难解答</string>
+    <string name="troubleshooting_wheretoask">您在哪里可以寻找到AndroidAPS的帮助信息？</string>
+    <string name="troubleshooting_fb">您可以在 AndroidAPS 用户 Facebook 群组中询问建议。</string>
+    <string name="troubleshooting_wiki">您应该阅读(并多次阅读) AndroidAPS 文档。</string>
+    <string name="troubleshooting_gitter">您可以在AndroidAPS的Gitter房间询问建议，记录或讨论技术问题。</string>
+    <string name="troubleshooting_yourendo">您应该问您的糖尿病诊所/内分泌专家。</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">胰岛素插件</string>
+    <string name="insulin_ultrarapid">在超速效Oref插件中你应该使用哪种胰岛素？</string>
+    <string name="insulin_fiasp">Fiasp®速效门冬胰岛素(超速效)</string>
+    <string name="insulin_novorapid">诺和锐®/门冬胰岛素®</string>
+    <string name="insulin_humalog">优泌乐®赖脯胰岛素</string>
+    <string name="insulin_actrapid">诺和灵®/优泌林 R®/\"常规\"人胰岛素</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">敏感度插件</string>
+    <string name="sensitivity_which">选择所有正确的答案。</string>
+    <string name="sensitivity_adjust">灵敏度插件允许AndroidAPS临时调整胰岛素敏感度的短暂变化(例如激素变化或与输液部位吸收相关的问题)。</string>
+    <string name="sensitivity_edit">灵敏度插件为用户提供基础率、 I:C比率和 ISF 的更改建议，可用来编辑配置文件。</string>
+    <string name="sensitivity_cannula">记录输注导管更换会将Autosens比率重置回100%。</string>
+    <string name="sensitivity_time">一些插件选项具有可配置的时间范围，可由用户设置。</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="wrongcarbs_label">碳水化合物输入错误</string>
+    <string name="wrongcarbs_whattodo">如果您输入了不正确的碳水化合物，该怎么办?</string>
+    <string name="wrongcarbs_treatmentstab">删除治疗数据中的错误条目，并重新输入正确的碳水值。</string>
+    <string name="wrongcarbs_addinsulin">使用主菜单地输注功能输注大剂量胰岛素。</string>
+    <string name="wrongcarbs_donothing">什么都不做-AndroidAPS将进行适当的调整。</string>
+    <string name="wrongcarbs_bolus">使用首页概览中的胰岛素(输注) 按钮输注大剂量胰岛素。</string>
+    <string name="wronginsulin_label">胰岛素输注/记录错误</string>
+    <string name="wronginsulin_whattodo">如果你实际吸收的胰岛素少于泵的历史记录你应该做些什么？例如：由于堵塞、插管失败或淋浴后忘记重新连接泵？</string>
+    <string name="wronginsulin_careportal">从Nightscout护理门户删除胰岛素数据，将其从泵的历史记录中删除。</string>
+    <string name="wronginsulin_compare">比较AndroidAPS和泵历史记录中的值(如果泵支持此功能)。</string>
+    <string name="wronginsulin_prime">通过注射器或胰岛素笔输注你计算出的“遗漏”胰岛素的一部分。</string>
+    <string name="wronginsulin_donothing">不做任何事情，允许AndroidAPS纠正高血糖导致的任何结果。</string>
+    <string name="iob_label">活性胰岛素(IOB)</string>
+    <string name="iob_which">选择所有正确的答案。</string>
+    <string name="iob_value">活性胰岛素IOB数值受发布的临时基础率影响。</string>
+    <string name="iob_hightemp">当您的血糖低于目标值时，不会被给予高临时基础率。</string>
+    <string name="iob_negiob">在没有运动的情况下，活性胰岛素IOB长时间负数表明你的个人配置太强，你需要在配置中减少的胰岛素用量。</string>
+    <string name="iob_posiob">长时间活性胰岛素IOB数值过高，表示可能存在胰岛素抵扣，或者没有记录的饮食。</string>
+    <string name="breadgrams_label">碳水记录和胰岛素输注</string>
+    <string name="breadgrams_grams">只能使用克来估算和记录消耗的碳水化合物。</string>
+    <string name="breadgrams_exchange">消耗的碳水化合物可以使用适当地交换份系统 (例如：正常饮食剂量调整DAFNE的“碳水化合物量CHO” 或者 欧洲“面包单位Bread Units”)进行记录。</string>
+    <string name="breadgrams_decay">AndroidAPS使用一个动态模型来估计碳水化合物的“衰减”并计算活性碳水化合物COB</string>
+    <string name="breadgrams_calc">如果血糖水平超出可接受值(过低或过高)，则可以使用大剂量向导计算器提供碳水化合物或胰岛素的校正建议。</string>
+    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
+    <string name="extendedcarbs_label">扩展碳水化合物</string>
+    <string name="extendedcarbs_handling">你能使用碳水时间偏移功能 (扩展碳水化合物) 做什么？</string>
+    <string name="extendedcarbs_future">计划今后的碳水化合物，可以在未来一段时间内分布碳水值(类似于在一段时间内分配胰岛素的扩展大剂量功能)。</string>
+    <string name="extendedcarbs_free">通过记录“自由”运动的碳水化合物，你可以躲避AndroidAPS的统计。</string>
+    <string name="extendedcarbs_fat">通过扩展碳水化合物(将来分发统计) 可以帮助AndroidAPS 处理高脂肪/蛋白质的饮食。</string>
+    <string name="extendedcarbs_rescue">用于记录治疗低血糖的碳水化合物。</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">远程监控</string>
+    <string name="nsclient_howcanyou">你如何远程监控AndroidAPS(比如你的孩子)？</string>
+    <string name="nsclient_nightscout">NS客户端应用、Nightscout应用和Nightscout网页都允许您远程关注AndroidPS。</string>
+    <string name="nsclient_dexcomfollow">其他应用(如Dexcom follow、以follow模式运行的xDrip)允许您远程关注某些参数 (如血糖/传感器值)，但由于使用不同的算法，可能会有不准确的IOB或COB值。</string>
+    <string name="nsclient_data">要远程关注AndroidAPS ，两台设备都必须能够访问互联网 (例如通过Wi-Fi或移动数据网络)。</string>
+    <string name="nsclient_fullcontrol">NS客户端作为远程关注者使用时，将监控和提供对AndroidAPS的完全控制。</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">胰岛素敏感系数(ISF)</string>
+    <string name="isf_increasingvalue">提高ISF值将导致更多的胰岛素输注，以消化特定数量的碳水化合物。</string>
+    <string name="isf_decreasingvalue">降低ISF值会导致更多的胰岛素输注，用于纠正高于目标的血糖值。</string>
+    <string name="isf_noeffect">当血糖水平低于目标值时，提高或降低ISF对胰岛素输送没有影响。</string>
+    <string name="isf_preferences">胰岛素敏感系数ISF应该在AndroidAPS 首选项配置中输入。</string>
+    <string name="isf_profile">更改配置文件中的胰岛素敏感系数值要在可以实现的范围内。</string>
+    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_multiple">在个人配置文件中可以使用一个以上的I:C比率。</string>
+    <string name="ic_isf">如果你在个人配置文件中修改了你的胰岛素敏感系数ISF，你也应该经常改变你的I:C比率。</string>
+    <string name="ic_label_exam">胰岛素与碳水化合物的比率(I:C比率)</string>
+    <string name="ic_increasingvalue">对于定量的碳水化合物，更高的I:C比率会导致胰岛素输注减少。</string>
+    <string name="ic_decreasingvalue">对于定量的碳水化合物，更低的I:C比率会导致胰岛素输注减少。</string>
+    <string name="ic_noeffect">如果你的活性碳水化合物数值为0，改变IC比率将导致使用不同的胰岛素剂量来校正给定的血糖值。</string>
+    <string name="ic_different">如果你将面包单位(交换份) 计算为10克或12克，那么碳水系数IC比率将不同。</string>
+    <string name="ic_meaning">IC 的含义是：1单位胰岛素可以覆盖多少面包单位 (交换份) 。</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+    <string name="profileswitch_label">配置文件切换</string>
+    <string name="profileswitch_pctwillchange"> 当指定一个90%的配置文件切换时，哪些答案是正确的？</string>
+    <string name="profileswitch_basallower">基础率会降低10%。</string>
+    <string name="profileswitch_isfhigher">胰岛素敏感系数ISF值将提高10%。</string>
+    <string name="profileswitch_iclower">胰岛素与碳水化合物的比率I:C比率的值将降低10%。</string>
+    <string name="profileswitch_unchanged">胰岛素敏感系数ISF和胰岛素碳水比率I:C将保持不变。</string>
+    <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profilewitch#profile-switch</string>
+    <string name="profileswitch2_label">配置文件切换</string>
+    <string name="profileswitch2_pctwillchange"> 当指定一个120%的配置文件切换时，哪些答案是正确的？</string>
+    <string name="profileswitch2_bghigher">血糖的目标值将提高20%。</string>
+    <string name="profileswitch2_basalhigher">胰岛素基础率会提高20%。</string>
+    <string name="profileswitch2_bgunchanged">血糖的目标值将保持不变。</string>
+    <string name="profileswitch2_isfhigher">胰岛素敏感系数ISF值将提高20%。</string>
+    <string name="profileswitchtime_label">配置文件切换</string>
+    <string name="profileswitchtime_iwant">如果您比平常早起 2 个小时，您应该如何通知AndroidAPS应对个人日程表中的更改?</string>
+    <string name="profileswitchtime_2">以增加2小时的方式，启动个人配置文件切换</string>
+    <string name="profileswitchtime__2">以减少2小时的方式，启动个人配置文件切换</string>
+    <string name="profileswitchtime_tt">设置一个马上吃饭的临时的目标血糖值。</string>
+    <string name="profileswitchtime_100">将配置文件切换到100%以上。</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profilewitch#timeshift</string>
+    <string name="profileswitch4_label">修改配置文件</string>
+    <string name="profileswitch4_rates">基础率、胰岛素敏感系数ISF、胰岛素和碳水比率I:C等，应在配置文件中设定。</string>
+    <string name="profileswitch4_internet">激活对Nightscout配置文件的更改，需要您的AndroidAPS 手机启用互联网连接。</string>
+    <string name="profileswitch4_sufficient">编辑配置文件并修改参数，足以进行任何更改。</string>
+    <string name="profileswitch4_multi">可以设置和选择多个配置文件，以适应不断变化的环境(例如激素变化、轮班工作、工作日/周末生活方式)。</string>
+    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
+    <string name="basalhelp_label">帮助调整基础率</string>
+    <string name="basalhelp_where">去哪里寻求胰岛素基础率等方面的帮助。</string>
+    <string name="basalhelp_diabetesteam">你的糖尿病团队</string>
+    <string name="basalhelp_google">谷歌</string>
+    <string name="basalhelp_facebook">Facebook</string>
+    <string name="other_medication_label">其他药物。请阅读下面的声明，然后勾选接受声明。</string>
+    <string name="other_medication_text">AndroidAPS通过降低基础率或暂停胰岛素泵来提高血糖值。而SGLT2抑制剂类药物(格列氟嗪) 可防止血糖升高，因此可能会导致危险的胰岛素缺乏DKA症状。\n常见的品牌包括: Invokana卡格列净®, Forxiga达格列净®, Jardiance恩格列净®, Steglatro埃格列净®, Suglat伊格列净L-脯氨酸®, Apleway®, Deberza托格列净®, Synjardy恩格列净/二甲双胍®, Vokanamet卡格列净/速释二甲双胍®, Xigduo达格列净/缓释型盐酸二甲双胍®.\n\n我在此承诺，不会在使用AndroidAPS 时服用此类药物，保证在使用此类药物前停用闭环。</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/objectives.xml
+++ b/app/src/main/res/values-zh-rCN/objectives.xml
@ -1,2 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="objectives_button_start">开始</string>
+    <string name="objectives_button_verify">验证</string>
+    <string name="nth_objective">%1$d．目标</string>
+    <string name="objectivenotstarted">目标 %1$d 未开始</string>
+    <string name="objectivenotfinished">目标 %1$d 未完成</string>
+    <string name="objectives_0_objective">设置可视化的连续血糖监测系统，并且分析胰岛素基础率和比率。</string>
+    <string name="objectives_0_gate">验证Nightscout中血糖(BG) 数据可用，并且泵的胰岛素数据正在上传。</string>
+    <string name="objectives_openloop_objective">开始开环</string>
+    <string name="objectives_openloop_gate">在开环模式下运行几天，手动设定多次临时基础率。设置临时目标默认值并使用临时目标功能（例如，在运动或低血糖补充碳水化合物时）</string>
+    <string name="objectives_maxbasal_objective">了解你的开环，包括它的临时基础率建议</string>
+    <string name="objectives_maxbasal_gate">基于使用开环的经验，决定基础率的最大值，在胰岛素泵和AAPS的参数选项上设置它</string>
+    <string name="objectives_maxiobzero_objective">从低血糖维持模式(用于测算基础率) 开始闭环功能</string>
+    <string name="objectives_maxiobzero_gate">设置最大活性胰岛素IOB=0，在闭环的低血糖维持模式下运行几天，确保没有太多的低血糖事件</string>
+    <string name="objectives_maxiob_objective">优化闭环，逐渐增加活性胰岛素IOB的最大值，并逐渐降低血糖的目标值</string>
+    <string name="objectives_maxiob_gate">运行几天，至少一个晚上没有低血糖报警，然后才可以继续调低血糖的目标值</string>
+    <string name="objectives_autosens_objective">必要时调整胰岛素基础率和比率，然后再启用auto-sens胰岛素敏感系数自动调整功能</string>
+    <string name="objectives_autosens_gate">规律的进行碳水记录，成功在一个星期的白天开启闭环</string>
+    <string name="objectives_smb_objective">在白天启用额外的功能，例如微型大剂量 SMB</string>
+    <string name="objectives_auto_objective">启用自动操作功能插件</string>
+    <string name="objectives_smb_gate">你应该阅读wiki指南，以调整 maxIOB(活性胰岛素的最大值) 设置，让SMB(微型大剂量) 更好的工作。建议是 maxIOB值=餐时剂量的平均值+基础率的最大值的3倍。</string>
+    <string name="objectives_auto_gate">阅读有关自动操作插件的说明文档，设定你的第一个简单规则。让AAPS只显示通知，而不是操作。当您确定自动操作在正确的时间触发时，用真实操作代替通知。(https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
+    <string name="objectives_bgavailableinns">血糖在NS中可用</string>
+    <string name="objectives_pumpstatusavailableinns">泵状态在 NS 中可用</string>
+    <string name="objectives_manualenacts">手动执行</string>
+    <string name="accomplished">已完成: %1$s</string>
+    <string name="objectives_usage_objective">学习如何控制 AndroidAPS</string>
+    <string name="objectives_usage_gate">在 AndroidAPS 中执行不同的操作</string>
+    <string name="objectives_useprofileswitch">将个人配置文件设置为90%持续10分钟 (长按首页概览左上角的配置文件名称)</string>
+    <string name="objectives_usedisconnectpump">模拟淋浴。 将泵断开连接1个小时(长按开环图标)</string>
+    <string name="objectives_usereconnectpump">... 然后以同样的方式重新连接</string>
+    <string name="objectives_usetemptarget">创建具有 10 分钟持续时间的定制临时目标 (当前目标上长按 )</string>
+    <string name="objectives_useactions">在配置生成器中启用Actions(常用操作) 插件，使其可视并在顶部菜单显示其内容</string>
+    <string name="objectives_useloop">显示闭环插件的内容</string>
+    <string name="objectives_usescale">长按血糖图来使用缩放功能</string>
+    <string name="objectives_button_enter">输入</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">如果您有至少3个月的其他系统闭环经验，您可能有资格获得跳过学习目标的代码。参见 https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives for details。</string>
+    <string name="codeaccepted">已接受代码</string>
+    <string name="codeinvalid">代码无效</string>
+    <string name="objectives_exam_objective">证明你的知识</string>
+    <string name="objectives_exam_gate">研究这些问题。每个问题都有四个可能的答案。答案可能不止一个。请选择所有正确的选项，然后点击验证。</string>
+    <string name="answerdisabledto">禁止答题，直到： %1$s</string>
+    <string name="wronganswer">错误答案！</string>
+    <string name="unfinshed_button">下一个未完成的</string>
+    <string name="requestcode">请求码： %1$s</string>
+    <string name="objectives_hint">(选择所有正确的答案)</string>
+    <string name="disconnectpump_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath</string>
+    <string name="usetemptarget_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
+    <string name="useaction_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#config-builder</string>
+    <string name="usescale_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
+    <string name="notconnected">未连接到网络</string>
+    <string name="failedretrievetime">时间同步失败</string>
+    <string name="requirementnotmet">未满足目标要求。</string>
+</resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -6,32 +6,39 @@
    <string name="treatmentssafety_title">治疗安全</string>
    <string name="treatmentssafety_maxbolus_title">允许的最大大剂量值[U]</string>
    <string name="treatmentssafety_maxcarbs_title">最大允许碳水化合物 [g]</string>
+    <string name="nav_preferences_plugin">%1$s 首选项</string>
    <string name="nav_preferences">参数选项</string>
    <string name="nav_refreshtreatments">从Nightscout刷新治疗数据</string>
    <string name="nav_resetdb">重置数据库</string>
    <string name="reset_db_confirm">你真的想重置数据库吗?</string>
    <string name="nav_exit">退出</string>
+    <string name="alert_dialog_permission_battery_optimization_failed">此设备似乎不支持电池优化白名单 - 您可能会遇到性能问题。</string>
    <string name="description_actions">一些快速访问常用功能的按钮</string>
    <string name="description_config_builder">用于配置活动插件</string>
    <string name="description_objectives">学习计划</string>
    <string name="description_food">显示 Nightscout 中定义的食物预设</string>
    <string name="description_insulin_rapid">胰岛素预设为 Humalog(优泌乐) 和 NovoRapid(门冬)/NovoLog(诺和锐)</string>
    <string name="description_insulin_ultra_rapid">Fiasp 胰岛素预设</string>
+    <string name="description_insulin_lyumjev">预设为Lyumjev速效赖脯胰岛素</string>
    <string name="description_insulin_free_peak">允许您定义胰岛素作用的峰值, 并且只应由高级用户使用</string>
    <string name="description_loop">激活或停用这个工具触发闭环。</string>
    <string name="description_ns_client">将数据与 Nightscout 同步</string>
    <string name="description_ama">算法的状态在2017年</string>
    <string name="description_smb">最新的适合高级用户的算法</string>
+    <string name="description_smb_dynamic_isf">面向高级用户的最新算法，可以动态/自动调整ISF胰岛素敏感系数</string>
    <string name="description_overview">显示闭环的当前状态和大多数常用操作的按钮</string>
    <string name="description_persistent_notification">显示持续的通知, 其中简要概述了您的闭环正在做什么</string>
+    <string name="description_profile_local">定义一个离线可使用的配置文件。</string>
    <string name="description_pump_mdi">与用于糖尿病治疗的多次每日注射的泵集成</string>
    <string name="description_pump_virtual">与我们还没有其驱动的泵集成（开环）</string>
    <string name="description_sensitivity_aaps">灵敏度的计算方式与 Oref0 相同, 但可以指定过去的时间范围。碳水化合物吸收最小值是根据参数选项里的碳水化合物吸收时间最大值计算得来的</string>
+    <string name="description_sensitivity_oref1">根据过去的8小时或24小时数据计算胰岛素灵敏度（使用更敏感的数据）。碳水化合物（如果没有被吸收）则在首选项中指定的时间后被核减。插件还计算UAM。</string>
    <string name="description_sensitivity_weighted_average">灵敏度计算根据偏差的加权平均值。新的偏差有更高的权重。碳水化合物吸收最小值是根据参数选项里的碳水化合物吸收时间最大值计算得来的好。此算法在敏感度变化后最快。</string>
    <string name="description_source_eversense">从 Eversense 补丁app接收血糖值。</string>
    <string name="description_source_glimp">从 Glimp 接收血糖值。</string>
    <string name="description_source_mm640g">从美敦力600Series 的AndroidUploader 接收血糖值。</string>
    <string name="description_source_ns_client">从 Nightscout 下载 血糖数据</string>
+    <string name="description_source_xdrip">从 xDrip+ 接收血糖值。</string>
    <string name="description_treatments">保存所做的所有治疗</string>
    <string name="description_wear">使用您的 WearOS 手表监视和控制 AndroidAPS。</string>
    <string name="description_xdrip_status_line">在 xDrip + 表盘上显示有关闭环的信息。</string>
@ -51,6 +58,7 @@
    <string name="treatments_wizard_tt_label">临时目标</string>
    <string name="treatments_wizard_carbs_label">碳水化合物</string>
    <string name="treatments_wizard_correction_label">矫正值</string>
+    <string name="bolus_iob_label">大剂量活性胰岛素IOB</string>
    <string name="openapsma_run">现在运行</string>
    <string name="vitualpump_label">虚拟泵</string>
    <string name="openapsma_lastrun_label">上一次运行</string>
@ -61,6 +69,7 @@
    <string name="openapsma_profile_label">配置文件</string>
    <string name="openapsma_mealdata_label">膳食数据</string>
    <string name="result">结果</string>
+    <string name="result_insulin_carbs">结果: %1$s %2$s</string>
    <string name="openapsma_noglucosedata">没有可用的血糖数据</string>
    <string name="openapsma_request_label">请求</string>
    <string name="delta">增量</string>
@ -88,6 +97,7 @@
    <string name="safety">安全性</string>
    <string name="openapsma_disabled">插件已禁用</string>
    <string name="constraints_violation">违反约束条件</string>
+    <string name="treatmentdeliveryerror">大剂量输注报告了一个错误。请手动检查真实输注量</string>
    <string name="setbasalquestion">接受新的临时基础率</string>
    <string name="overview_treatment_label">治疗</string>
    <string name="overview_calculator_label">计算器</string>
@ -98,11 +108,14 @@
    <string name="changeyourinput">更改您的输入!</string>
    <string name="configbuilder_bgsource">血糖来源</string>
    <string name="configbuilder_bgsource_description">AndroidAPS 从何处获取数据？</string>
+    <string name="xdrip">xDrip+</string>
    <string name="apsmode_title">APS模式</string>
    <string name="closedloop">闭环</string>
    <string name="openloop">开环</string>
+    <string name="lowglucosesuspend">低血糖维持模式</string>
    <string name="disabledloop">闭环禁用</string>
    <string name="openloop_newsuggestion">新的建议可用</string>
+    <string name="carbssuggestion">碳水建议</string>
    <string name="unsupportednsversion">不支持的 Nightscout 版本</string>
    <string name="treatments_wizard_basaliob_label">基础 IOB</string>
    <string name="bolusconstraintapplied">大剂量约束条件应用了</string>
@ -110,43 +123,90 @@
    <string name="careportal_newnstreatment_other">其他</string>
    <string name="careportal_newnstreatment_meter">血糖仪</string>
    <string name="careportal_newnstreatment_sensor">传感器</string>
+    <string name="carb_time_label">碳水时间</string>
    <string name="careportal_newnstreatment_duration_label">持续时间</string>
+    <string name="profile_label">配置文件</string>
    <string name="careportal_newnstreatment_glucosetype">血糖类型</string>
    <string name="overview_tempbasal_button">临时基础</string>
    <string name="overview_extendedbolus_button">扩展大剂量</string>
    <string name="configbuilder_nightscoutversion_label">Nightscout 版本:</string>
+    <string name="missing_carbs">缺少 %1$d 克</string>
    <string name="exported">参数选项导出了</string>
+    <string name="ue_exported">用户条目已导出</string>
    <string name="export_to">导出配置</string>
    <string name="import_from">导入配置</string>
    <string name="setting_imported">配置导入了</string>
    <string name="filenotfound">找不到文件</string>
    <string name="nav_export">导出配置</string>
    <string name="nav_import">导入配置</string>
+    <string name="openapsma_maxbasal_title">临时基础率可以设置的最大值(U/小时)</string>
    <string name="openapsma_maxbasal_summary">这个值在 OpenAPS被称为最大基础率</string>
    <string name="openapsma_maxiob_title">OpenAPS通过基础率可以输注的IOB活性胰岛素的最大值[U]</string>
    <string name="openapsma_maxiob_summary">这个值在OpenAPS中被成为最大IOB\n这是APS单次可以输注的胰岛素的最大值[U]</string>
+    <string name="password_preferences_encrypt_prompt">请您输入主密码，该密码将用于加密导出的首选项配置。</string>
+    <string name="password_preferences_decrypt_prompt">请您输入主密码，该密码将用于解密导入的首选项配置。</string>
+    <string name="preferences_export_canceled">导出已取消！首选项未导出！</string>
+    <string name="preferences_import_canceled">导入已取消! 未导入首选项 !</string>
+    <string name="preferences_import_impossible">无法导入首选项 !</string>
+    <string name="goto_main_try_again">请返回主屏幕，然后重试。</string>
+    <string name="old_master_password">旧的主密码</string>
+    <string name="different_password_used">此文件已导出并使用不同的主密码进行加密。 提供旧的主密码以解密文件。</string>
+    <string name="master_password_will_be_replaced">成功导入后，当前主密码将替换为旧主密码！</string>
+    <string name="check_preferences_before_import">请在导入之前检查首选项：</string>
+    <string name="check_preferences_cannot_import">无法导入首选项！</string>
+    <string name="check_preferences_dangerous_import">不应导入首选项 !</string>
+    <string name="check_preferences_details_btn">说明导入问题…</string>
+    <string name="check_preferences_details_title">导入问题详细信息</string>
+    <string name="check_preferences_import_btn">导入</string>
+    <string name="check_preferences_import_anyway_btn">继续导入（危险！）</string>
    <string name="end_user_license_agreement">最终用户许可协议</string>
    <string name="end_user_license_agreement_text">不得用于制定医疗决定。在适用法律允许的范围内，对该程序不作任何保证。除非另有书面授权的版权所有者和/或其他方均按原样提供程序，不附带明示或暗示的任何形式的担保，包括但不限于对适销性和适用于特定用途的默示担保。对您的程序的质量和性能的完整风险。如果程序存在缺陷，您应承担所有必要维修，修理或更正的代价.</string>
    <string name="end_user_license_agreement_i_understand">我理解并同意</string>
-    <string name="save">保存</string>
    <string name="reloadprofile">重新加载配置文件</string>
    <string name="smscommunicator">SMS短信通讯器</string>
    <string name="smscommunicator_allowednumbers">允许的手机号码</string>
    <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
    <string name="smscommunicator_bolusreplywithcode">要输注大剂量胰岛素%1$.2fU 回复如下代码 %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">要输注餐前大剂量 %1$.2fU ，请回复验证码 %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">要设置临时目标 %1$s，请回复验证码 %2$s</string>
+    <string name="smscommunicator_temptargetcancel">要取消临时目标，请回复验证码 %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">要禁用短信遥控服务，请回复验证码%1$s.\n\n请记住，你只能在AAPS闭环手机上重新激活此功能。</string>
+    <string name="smscommunicator_stoppedsms">短信遥控服务已禁用。要重新激活它，请使用AAPS闭环手机。</string>
    <string name="smscommunicator_calibrationreplywithcode">要发送校准值 %1$.2f 回复如下代码 %2$s</string>
    <string name="smscommunicator_bolusfailed">大剂量输注失败</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">一次远程遥控输注命令与下一次命令之间必须经过的最小分钟数</string>
+    <string name="smscommunicator_remotebolusmindistance">两次短信遥控胰岛素输注的时间间隔</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">为了您的安全，您需要添加至少两个电话号码。</string>
+    <string name="bolusrequested">将要输注 %1$.2f U</string>
+    <string name="smscommunicator_bolusdelivered">成功输注大剂量%1$.2fU</string>
+    <string name="smscommunicator_mealbolusdelivered">成功输注餐时大剂量%1$.2fU</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">目标 %1$s 执行 %2$d 分钟</string>
+    <string name="smscommunicator_tt_set">目标 %1$s 执行 %2$d 分钟设置成功</string>
+    <string name="smscommunicator_tt_canceled">临时目标已成功取消</string>
    <string name="smscommunicator_remotecommandsallowed">通过SMS短信允许远程命令</string>
    <string name="smscommunicator_loophasbeendisabled">闭环已经被禁用</string>
    <string name="smscommunicator_loophasbeenenabled">闭环已经被启用</string>
    <string name="smscommunicator_loopisenabled">闭环被启用</string>
+    <string name="smscommunicator_pumpconnectwithcode">连接泵，请回复验证码：%1$s</string>
+    <string name="smscommunicator_pumpconnectfail">连接泵失败</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">断开泵%1$d分钟，请回复验证码：%2$s</string>
+    <string name="smscommunicator_pumpdisconnected">泵已断开</string>
+    <string name="smscommunicator_reconnect">泵已重新连接</string>
    <string name="smscommunicator_remotecommandnotallowed">远程命令没有被允许</string>
    <string name="smscommunicator_remotebolusnotallowed">远程大剂量不可用。请稍后再试。</string>
+    <string name="smscommunicator_basalreplywithcode">执行基础率%1$.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_carbsreplywithcode">要在 %2$s 输入 %1$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_loopresumereplywithcode">恢复闭环，请回复验证码：%1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">启用闭环，请回复验证码：%1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">禁用闭环，请回复验证码：%1$s</string>
    <string name="smscommunicator_tempbasalset">临时基础率 %1$.2fU/h 持续 %2$d 分钟启用成功了</string>
    <string name="smscommunicator_extendedset">扩展大剂量 %1$.2fU/h 持续时间 %2$d 分钟已经启用成功了</string>
+    <string name="smscommunicator_carbsset">碳水%1$d克输入成功</string>
+    <string name="smscommunicator_carbsfailed">输入 %1$d 克碳水化合物失败</string>
    <string name="smscommunicator_tempbasalset_percent">临时基础率 %1$d%% 持续时间 %2$d 分钟 启用成功了</string>
    <string name="smscommunicator_tempbasalfailed">开始临时基础率失败了</string>
    <string name="smscommunicator_extendedfailed">开始扩展大剂量失败了</string>
@ -167,12 +227,18 @@
    <string name="mealbolus">饮食</string>
    <string name="correctionbous">矫正</string>
    <string name="actions">手动操作</string>
+    <string name="ns_upload_only">(禁用很危险) NS仅上传</string>
+    <string name="ns_upload_only_summary">NS只上传数据(禁用同步)。除非选择本地血糖数据如xDrip+否则此功能无效。使用NS网站配置文件时此功能无效。\n！！！警告！！！如果您的任何组件(AAPS，NS，xDrip+) 配置错误，禁用此选项可能导致故障和胰岛素过量。请仔细观察AAPS显示的数据是否与泵状态匹配！</string>
    <string name="pumpNotInitialized">泵未初始化!</string>
    <string name="primefill">充盈</string>
    <string name="fillwarning">请确保数量和输液器里的药量匹配</string>
+    <string name="fillbolus_title">输注/充盈标准胰岛素剂量</string>
    <string name="button1">按钮1</string>
    <string name="button2">按钮2</string>
    <string name="button3">按钮3</string>
+    <string name="units_colon">单位:</string>
+    <string name="units">单位</string>
+    <string name="dia">DIA</string>
    <string name="prefs_range_title">可视化范围</string>
    <string name="prefs_range_summary">在智能手表上的图表上的高值和低值标记</string>
    <string name="low_mark">低值标记</string>
@ -180,6 +246,7 @@
    <string name="wear">手表</string>
    <string name="resend_all_data">重新发送所有数据</string>
    <string name="open_settings_on_wear">在手表上打开设置</string>
+    <string name="basal_rate">基础率</string>
    <string name="basalvaluebelowminimum">基础率值低于泵支持的最小值。配置文件没有设定</string>
    <string name="sms_actualbg">血糖:</string>
    <string name="sms_lastbg">上次血糖：</string>
@ -188,16 +255,19 @@
    <string name="ongoingnotificaction">持续的的通知</string>
    <string name="old_data">旧数据</string>
    <string name="sms_minago">%1$d分钟前</string>
+    <string name="localprofile">配置文件</string>
    <string name="openapsama">OpenAPS AMA</string>
    <string name="array_of_elements">%1$d 元素的数组. \n 实际值:</string>
    <string name="openapsma_autosensdata_label">Autosens 数据</string>
    <string name="openapsma_scriptdebugdata_label">脚本调试</string>
    <string name="openapsama_useautosens">使用Autosens功能</string>
+    <string name="refresheventsfromnightscout">从NS刷新</string>
    <string name="deletefuturetreatments">删除未来的治疗项</string>
    <string name="actions_shortname">操作</string>
    <string name="configbuilder_shortname">配置</string>
    <string name="loop_shortname">闭环</string>
    <string name="oaps_shortname">OpenAPS</string>
+    <string name="dynisf_shortname">动态ISF</string>
    <string name="localprofile_shortname">本地配置文件</string>
    <string name="overview_shortname">主页</string>
    <string name="virtualpump_shortname">虚拟泵</string>
@ -207,11 +277,13 @@
    <string name="smscommunicator_shortname">手机SMS</string>
    <string name="short_tabtitles">标题名称缩写</string>
    <string name="always_use_shortavg">总是使用短时间的平均增量代替简单增量</string>
+    <string name="always_use_shortavg_summary">当血糖数据未经过滤时，如xDrip+数据嘈杂，此功能非常有用。</string>
    <string name="profile">配置文件</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">默认值: 3 这是一个关键的 OpenAPS 安全阀值。这是限制你的闭环可以最大扩张3倍的日最大基础率。你可能不需要改变这个值 但你应该这个值的含义。日最大基础率的3倍，当前基础率的4倍，这是建议的安全阀值</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">默认值: 4 这是另一个的关键 OpenAPS 安全阀值, 日最大基础率的3倍，当前基础率的4倍，这是建议的安全阀值。这意味着你的基础率, 无论你的泵上的最大基础率设置的多少，也 不能超过你的当前基础率的4倍。这是为了防止人们在了解该算法的工作原理之前进入危险的领域 。同样, 默认值为 4倍; 大多数人将永远不需要调整, 而是更有可能需要调整其他设置,</string>
    <string name="openapsama_autosens_max_summary">默认值: 1.2 \n 这是 autosens 的安全阀值 对 autosens ( 很快autotune) 比率的高值设置最大增加20%% 最大限制, 这反过来决定了 autosens 可以调整的基础率的上限值, 可以调整的胰岛素敏感系数的下限值, 以及它可以设置血糖目标的下限值。</string>
    <string name="openapsama_autosens_min_summary">默认值: 0.7 \n 　这是autosens 的另一个安全阈值, 。这个值决定了 autosens 可以调整的基础率的下限值, 可以调整的胰岛素敏感系数的上限值, 以及它可以设置血糖目标的上限值。</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens自动调整胰岛素敏感系数时，也调整血糖目标值</string>
    <string name="openapsama_autosens_adjusttargets_summary">缺省值：是\n　这是用来允许 autosens调整血糖目标，还有 ISF胰岛素敏感系数和基础率这些参数。</string>
    <string name="openapsama_bolussnooze_dia_divisor_summary">默认值: 2 \n大剂量snooze是在输注餐时大剂量后开始生效的, 所以在你刚吃完饭的时候, 闭环不会因为你输注了大剂量而减少或停基础。这里的例子和缺省是 2; 因此, 3 小时的DIA(胰岛素持续作用时间) 意味着大剂量snooze将逐步在１. ５小时 (3 DIA/2) 后失效。</string>
    <string name="openapsama_min_5m_carbimpact_summary">默认值: 3.0  (AMA) 或者 8.0 (SMB)。这是默认的每5分钟碳水化合物吸收量。默认值为3毫克/dl/5 分钟。 当血糖的下降超过预期时, 或者不像预期的上升的那么多时，这个值就影响了活性碳水化合物的衰减速度, 以及在计算预测未来血糖时假设的碳水化合物吸收量,</string>
@ -219,6 +291,9 @@
    <string name="smscommunicator_invalidphonennumber">无效的SMS手机号码</string>
    <string name="overview_calibration">校准</string>
    <string name="xdripnotinstalled">没有安装xDrip+</string>
+    <string name="calibrationsent">校准发送到 xDrip+</string>
+    <string name="smscommunicator_calibrationsent">校准已发送。必须在 xDrip+ 中启用接收功能。</string>
+    <string name="smscommunicator_calibrationfailed">xDrip+未接收校准</string>
    <string name="pumpsuspended">泵暂停了</string>
    <string name="executing">正在执行</string>
    <string name="virtualpump_settings">虚拟泵设置</string>
@ -245,10 +320,17 @@
    <string name="wear_detailedIOB_title">显示详细 IOB</string>
    <string name="wear_detailedIOB_summary">在手表的表盘上分别显示大剂量IOB和基础IOB</string>
    <string name="nosuccess">未成功-请检查手机</string>
+    <string name="notavailable">无可用</string>
+    <string name="patientage">患者类型</string>
    <string name="child">儿童</string>
    <string name="teenage">青少年</string>
    <string name="adult">成人</string>
    <string name="resistantadult">胰岛素抵抗成人</string>
+    <string name="pregnant">孕妇</string>
+    <string name="patientage_summary">请选择患者类型，以设置安全限制</string>
+    <string name="patient_name">患者名称</string>
+    <string name="patient_name_summary">请提供患者姓名或昵称来区分多个设置</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">用户</string>
    <string name="Glimp">Glimp</string>
    <string name="needwhitelisting">%1$s 需要加入电池优化白名单才能正常运行</string>
    <string name="loopsuspended">闭环暂停了</string>
@ -257,16 +339,24 @@
    <string name="suspendloopfor2h">暂停闭环2个小时</string>
    <string name="suspendloopfor3h">暂停闭环3个小时</string>
    <string name="suspendloopfor10h">暂停闭环10个小时</string>
+    <string name="disconnectpump">断开泵连接</string>
    <string name="disconnectpumpfor15m">与泵断开连接15分钟</string>
    <string name="disconnectpumpfor30m">与泵断开连接30分钟</string>
    <string name="disconnectpumpfor1h">与泵断开连接1个小时</string>
    <string name="disconnectpumpfor2h">与泵断开连接2个小时</string>
    <string name="disconnectpumpfor3h">与泵断开连接3个小时</string>
+    <string name="duration15m">15 分钟</string>
+    <string name="duration30m">30 分钟</string>
+    <string name="duration1h">1 小时</string>
+    <string name="duration2h">2 小时</string>
+    <string name="duration3h">3 小时</string>
+    <string name="duration10h">10 小时</string>
    <string name="resume">恢复</string>
    <string name="reconnect">重新连接泵</string>
    <string name="smscommunicator_wrongduration">错误的持续时间</string>
    <string name="smscommunicator_loopsuspended">闭环暂停了</string>
    <string name="smscommunicator_loopresumed">闭环恢复了</string>
+    <string name="bg_trend_label">15分钟 趋势</string>
    <string name="treatments_wizard_cob_label">碳水</string>
    <string name="superbolus">超级大剂量Superbolus</string>
    <string name="ns_logappstartedevent">记录app启动事件到NS服务器</string>
@ -278,16 +368,45 @@
    <string name="enablesuperbolus">在向导中启用超级大剂量</string>
    <string name="enablesuperbolus_summary">在向导中启用 superbolus超级大剂量 功能。不要启用, 直到你了解它真正的用法。如果盲目使用, 可能会导致胰岛素过量!</string>
    <string name="show_statuslights">在主屏幕上显示状态指示灯</string>
+    <string name="statuslights_cage_warning">输注导管状态灯警示阈值[小时]</string>
+    <string name="statuslights_cage_critical">输注导管状态灯临界阈值[小时]</string>
+    <string name="statuslights_iage_warning">胰岛素状态灯警示阀值[小时]</string>
+    <string name="statuslights_iage_critical">胰岛素状态灯临界阀值[小时]</string>
+    <string name="statuslights_sage_warning">传感器状态灯警示阀值[小时]</string>
+    <string name="statuslights_sage_critical">传感器状态灯临界阀值[小时]</string>
+    <string name="statuslights_sbat_warning">传感器剩余电量状态灯警示阀值[百分比]</string>
+    <string name="statuslights_sbat_critical">传感器剩余电量状态灯临界阀值[百分比]</string>
+    <string name="statuslights_bage_warning">胰岛素泵电池使用时长状态灯警示阀值[小时]</string>
+    <string name="statuslights_bage_critical">胰岛素泵电池使用时长状态灯临界阀值[小时]</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="prediction_shortname">预测</string>
+    <string name="basal_shortname">基础率</string>
+    <string name="deviation_shortname">偏差</string>
+    <string name="activity_shortname">操作</string>
+    <string name="bgi_shortname">-BGI</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DEVSLOPE</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>
    <string name="wear_showbgi_title">显示血糖线</string>
    <string name="wear_showbgi_summary">添加血糖线到状态线</string>
    <string name="overview_extendedbolus_cancel_button">取消扩展大剂量</string>
+    <string name="doprofileswitch">配置文件切换</string>
+    <string name="careportal_sensor_label">传感器</string>
+    <string name="careportal_insulin_label">胰岛素</string>
+    <string name="careportal_pb_label">泵电池</string>
+    <string name="careportal_age_label">年龄：</string>
+    <string name="careportal_level_label">剩余:</string>
    <string name="ns_alarmoptions">报警选项</string>
+    <string name="ns_alarms">创建来自NS报警的通知</string>
+    <string name="ns_announcements">创建来自NS公告的通知</string>
    <string name="nsalarm_staledatavalue_label">陈旧数据阈值 [min]</string>
    <string name="nsalarm_urgent_staledatavalue_label">紧急陈旧数据阈值 [min]</string>
    <string name="openapsama_autosens_period">Autosens间隔的 [h]</string>
@ -309,12 +428,12 @@
    <string name="keep_screen_on_summary">阻止 Android 系统关闭手机屏幕。这将非常耗电</string>
    <string name="sensitivity_warning">如果要打开 Autosense功能, 记住输入所有吃的碳水化合物。否则碳水化合物的偏差将被识别为错误的灵敏度变化!!</string>
    <string name="sensitivityweightedaverage">灵敏度 WeightedAverage</string>
-    <string name="mdtp_ok">确定</string>
-    <string name="mdtp_cancel">取消</string>
    <string name="notloadedplugins">配置文件加载不完整</string>
    <string name="valuesnotstored">值没有被存储</string>
+    <string name="ns_localbroadcasts">广播信息到其他应用(如xDrip+)。如果你安装了不止一个AAPS或NS客户端，请不要启用此功能！</string>
    <string name="ns_localbroadcasts_title">启用本地广播。</string>
    <string name="openapssmb">OpenAPS SMB</string>
+    <string name="openaps_smb_dynamic_isf">动态ISF(胰岛素敏感系数)</string>
    <string name="enableuam">启用 UAM</string>
    <string name="enablesmb">启用微型大剂量</string>
    <string name="enablesmb_summary">使用微型大剂量代替使用临时基础率，更快的干预</string>
@ -324,6 +443,7 @@
    <string name="free_peak_oref">Free-Peak Oref</string>
    <string name="rapid_acting_oref">速效 Oref</string>
    <string name="ultrarapid_oref">超速效 Oref</string>
+    <string name="lyumjev">Lyumjev(超速效赖脯胰岛素)</string>
    <string name="dia_too_short">DIA of %1$f 太短了，请使用 %2$f 代替</string>
    <string name="activate_profile">激活配置文件</string>
    <string name="invalid">无效</string>
@ -336,6 +456,7 @@
    <string name="activity_target">运动临时目标</string>
    <string name="hypo_duration">持续时间短</string>
    <string name="hypo_target">低目标</string>
+    <string name="reuse_profile_pct_hours">重新使用%1$d%% %2$d小时</string>
    <string name="wearcontrol_title">从手表上控制</string>
    <string name="wearcontrol_summary">设置临时目标并从手表中进行治疗操作。</string>
    <string name="food">食物</string>
@ -349,10 +470,12 @@
    <string name="executingrightnow">现在命令被执行了</string>
    <string name="missed_bg_readings">血糖读数丢失</string>
    <string name="raise_notifications_as_android_notifications">对警报和通知使用系统通知音</string>
+    <string name="gradually_increase_notification_volume">逐渐增加警报和通知的音量</string>
    <string name="localalertsettings_title">本地警报</string>
    <string name="enable_missed_bg_readings_alert">如果未收到血糖数据, 则发出警报</string>
    <string name="enable_pump_unreachable_alert">如果无法连接泵, 则发出警报</string>
    <string name="pump_unreachable_threshold">泵无法连接的时间阈值[min]</string>
+    <string name="enable_carbs_req_alert">当需要碳水化合物时发出提醒</string>
    <string name="urgent_alarm">紧急报警</string>
    <string name="info">信息</string>
    <string name="eversense">Everyang App (补丁)</string>
@ -360,10 +483,16 @@
    <string name="bgsource_upload">血糖上传设置</string>
    <string name="wear_detailed_delta_title">显示详细的增量</string>
    <string name="wear_detailed_delta_summary">增量再多显示一个小数位</string>
+    <string name="smbinterval_summary">以分钟为单位设置SMB(微型大剂量) 的频率</string>
    <string name="smbmaxminutes_summary">基础率的最大分钟数限制SMB微型大剂量到</string>
+    <string name="uamsmbmaxminutes">UAM(未通知膳食) SMB(微型大剂量) 最大分钟数</string>
+    <string name="uamsmbmaxminutes_summary">监测到UAM(未通知膳食) 后启用SMB(微型大剂量) 替代基础率的最大分钟数</string>
+    <string name="carbsReqThreshold">碳水化合物需求建议的最小值</string>
+    <string name="carbsReqThreshold_summary">显示碳水化合物需求警告的最小克数。低于此数值的碳水化合物需求不会触发通知。</string>
    <string name="dexcomg5_xdripupload_title">将血糖数据发送到 xDrip +</string>
    <string name="dexcomg5_xdripupload_summary">在 xDrip + 选择640ｇ/Eversense 数据源</string>
    <string name="nsclientbg">NSClient 血糖</string>
+    <string name="nsclientbgshort">NS血糖</string>
    <string name="overview_editquickwizard_usebg">血糖计算</string>
    <string name="overview_editquickwizard_usebolusiob">大剂量IOB (活性胰岛素) 计算</string>
    <string name="overview_editquickwizard_usebasaliob">基础率IOB (活性胰岛素) 计算</string>
@ -373,6 +502,7 @@
    <string name="negativeonly">仅负数</string>
    <string name="overview_editquickwizard_usecob">COB计算</string>
    <string name="overview_editquickwizard_usetemptarget">临时目标血糖计算</string>
+    <string name="overview_editquickwizard_usepercentage">百分比计算</string>
    <string name="loopenabled">闭环启用了</string>
    <string name="apsselected">APS已选择</string>
    <string name="nsclienthaswritepermission">NSClient 具有写入权限</string>
@ -389,17 +519,26 @@
    <string name="enablesmbwithtemptarget">启用带有临时目标的SMB</string>
    <string name="enablesmbwithtemptarget_summary">当临时目标处于活动状态时启用 SMB (很快吃饭, 运动)</string>
    <string name="enablesmbwithhightemptarget">启用具有高临时目标的 SMB</string>
+    <string name="enablesmbwithhightemptarget_summary">当激活较高的临时目标时，启用SMB微型大剂量(目标血糖大于100 mg/dl或5.5 mmol/l)</string>
    <string name="overview_insulin_label">胰岛素</string>
    <string name="overview_buttons_selection">按钮</string>
+    <string name="show_calibration_button_summary">将校准发送到xDrip+或打开BYODA校准对话框</string>
+    <string name="show_cgm_button_summary">打开xDrip+或BYODA应用时，返回键将返回到AAPS应用</string>
    <string name="carb_increment_button_message">按下按钮时添加的碳水化合物数量</string>
    <string name="insulin_increment_button_message">按下按钮时添加的胰岛素量</string>
    <string name="error_starting_cgm">无法启动 CGM 应用程序。 请确保已安装。</string>
    <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">忽略5分钟</string>
+    <string name="ignore15m">忽略 15分钟</string>
+    <string name="ignore30m">忽略30分钟</string>
+    <string name="required">要</string>
    <string name="nav_historybrowser">历史浏览</string>
    <string name="wear_notifysmb_title">在 SMB 上通知</string>
    <string name="wear_notifysmb_summary">在手表上像显示常规大剂量一样显示SMB微型大剂量</string>
    <string name="ns_create_announcements_from_errors_title">创建错误公告</string>
+    <string name="ns_create_announcements_from_carbs_req_title">从碳水需求警报创建NS公告</string>
    <string name="ns_create_announcements_from_errors_summary">为错误对话框和本地警报创建Nightscout公告(在治疗标签下的护理记录里也可查看)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">为碳水化合物需求警报创建Nightscout网站的公告</string>
    <string name="wear_predictions_summary">在手表的表盘上显示预测</string>
    <string name="wear_predictions_title">预测</string>
    <string name="data_choices">数据选择</string>
@ -413,8 +552,10 @@
    <string name="do_not_bolus_record_only">不打大剂量，只记录</string>
    <string name="category">类别</string>
    <string name="subcategory">子类别</string>
+    <string name="bolusrecordedonly">仅记录大剂量数值(泵不会输注)</string>
    <string name="loop_smbsetbypump_label">通过泵设置SMB微型大剂量</string>
    <string name="overview_show_activity">活动</string>
+    <string name="overview_show_bgi">血糖影响</string>
    <string name="overview_show_sensitivity">灵敏度</string>
    <string name="overview_show_deviations">偏差</string>
    <string name="overview_show_cob">活性碳水化合物</string>
@ -488,11 +629,19 @@
    <string name="exitwizard">跳过设置向导</string>
    <string name="setupwizard_loop_description">按下下面的按钮, 以使 AndroidAPS 建议或者更改基础率</string>
    <string name="setupwizard_sensitivity_description">灵敏度插件用于灵敏度检测和碳水化合物计算。有关详细信息, 请访问:</string>
+    <string name="setupwizard_sensitivity_url">https://androidaps.readthedocs.io/en/latest/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="nsclientinfotext">NS客户端可以处理与Nightscout的连接。您可以先跳过这一部分，但在设置NS参数前，你无法通过学习计划的目标。</string>
    <string name="diawarning">请记住：新的胰岛素分布需要DIA至少5小时。 对于新的配置文件，DIA 5-6小时相当于旧胰岛素配置文件中的DIA 3小时</string>
    <string name="setupwizard_aps_description">从可用算法中选择一个。 他们从最旧到最新排序。 较新的算法通常更强大，更冒险。 因此，如果你是新的闭环使用者，你可能会从AMA算法开始，而不是最新的。 不要忘记在使用之前阅读OpenAPS文档并对其进行配置。</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">在下面配置你的RileyLink 。选择RileLink后，一旦RileLink状态为“已连接”，就可以继续安装。这可能需要一分钟。\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>注意：</b>胰岛素泵设置完成后，您可以继续安装。\n</string>
    <string name="startobjective">开始你的第一个目标</string>
    <string name="permission">权限</string>
    <string name="askforpermission">请求权限</string>
+    <string name="needsystemwindowpermission">应用程序需要悬浮窗权限用于发送通知。</string>
+    <string name="needlocationpermission">应用程序需要定位权限，才能进行蓝牙扫描及WIFI识别。</string>
+    <string name="needstoragepermission">应用程序需要文件存储权限，才能存储日志文件及导出设置。</string>
+    <string name="needconnectpermission">应用程序需要蓝牙权限。</string>
    <string name="request">请求</string>
    <string name="open_navigation">打开导航栏</string>
    <string name="close_navigation">关闭导航栏</string>
@ -502,16 +651,26 @@
    <string name="time_elapsed">已用时间</string>
    <string name="poctech">Poctech</string>
    <string name="description_source_poctech">从 Poctech app 接收血糖值。</string>
+    <string name="glunovo">Glunovo</string>
+    <string name="description_source_glunovo">从Glunovo应用接收血糖数据。</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>
    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[当临时目标 ＜= 100 mg/dl (5.5 mmol/l) 时降低灵敏度]]></string>
+    <string name="resistance_lowers_target_title">抗药时降低目标</string>
+    <string name="resistance_lowers_target_summary">当检测到胰岛素抵抗时，降低血糖的目标值。</string>
+    <string name="sensitivity_raises_target_title">敏感时提高目标</string>
+    <string name="sensitivity_raises_target_summary">当检测到胰岛素敏感时，提高血糖的目标值。</string>
    <string name="careportal_removestartedevents">Clean AndroidAPS 启动了</string>
+    <string name="show_invalidated">显示无效项</string>
+    <string name="hide_invalidated">隐藏失效项</string>
+    <string name="remove_items">删除项目</string>
    <string name="storedsettingsfound">发现曾经保存过的设置</string>
    <string name="allow_hardware_pump_text">注意：如果你激活并且连接到了一个硬件泵，AndroidAPS将会从配置文件复制基础率到泵上。覆盖泵上已有的基础率。请确定你已经在AndroidAPS上设置了正确的基础率。如果你不确定或者不想覆盖泵上的基础率设置，按取消键，以后再切换激活配置文件。</string>
    <string name="error_adding_treatment_title">治疗数据不完整</string>
    <string name="maintenance_settings">维护设置</string>
+    <string name="maintenance_email">电子邮箱收件人</string>
    <string name="maintenance_amount">没有要发送的日志</string>
    <string name="maintenance">维护</string>
    <string name="maintenance_shortname">维护</string>
@ -525,11 +684,13 @@
    <string name="resettodefaults">重置为默认值</string>
    <string name="nsmalfunction">NSClient故障。 考虑Nightscout和NSClient重启。</string>
    <string name="time_offset">时区偏移</string>
+    <string name="bolus_reminder">稍后提醒输注大剂量</string>
    <string name="setupwizard_preferred_aps_mode">首选的APS模式</string>
    <string name="treatments_wizard_total_label">总计</string>
    <string name="calculation_short">计算</string>
    <string name="sendlogfiles">发送包括当前时间的今日的日志文件给开发者。描述一下意外情况</string>
    <string name="loop_openmode_min_change">最小请求更改[%]</string>
+    <string name="loop_openmode_min_change_summary" formatted="false">开环状态下，算法建议的基础率调整百分比大于此数值时，才会弹出更改建议。默认值为20%</string>
    <string name="profile_total">== ∑  %1$s U</string>
    <string name="dexcom_lognssensorchange_title">记录传感器更换至NS服务器</string>
    <string name="dexcom_lognssensorchange_summary">在传感器启动时在 NS服务器 自动创建事件 \"传感器更改\"</string>
@ -550,16 +711,280 @@
    <string name="tidepool_upload_tbr">上传临时基础率</string>
    <string name="tidepool_upload_profile">上传配置文件切换，临时目标</string>
    <string name="tidepool_upload_bg">上传血糖值</string>
+    <string name="dst_in_24h_warning">在24小时或更少时间内变更\"夏令时\"</string>
+    <string name="dst_loop_disabled_warning">夏令时变更在三小时内-已禁用闭环</string>
    <string name="storage">内部储存空间不足</string>
    <string name="diskfull">至少 剩余%1$d MB 内部存储！闭环已禁用！</string>
    <string name="wrongformat">格式错误</string>
+    <string name="wrongTbrDuration">TBR(临时基础率) 的持续时间必须是 %1$d 分钟的倍数，且大于0。</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="application_expired">应用版本已过期。</string>
+    <string name="new_version_warning">新版本已发布至少%1$d天！将在%2$d天后回退到LGS (低血糖维持模式)，闭环功能将在%3$d天后禁用。</string>
    <string name="twohours">2小时</string>
+    <string name="dexcom_app_patched">BYODA德康补丁版(构建你自己的德康应用Build Your Own Dexcom App)</string>
+    <string name="dexcom_short">BYODA</string>
+    <string name="description_source_dexcom">从德康补丁版接收血糖数据(Build Your Own Dexcom App)。</string>
+    <string name="cobvsiob">活性碳水vs活性胰岛素</string>
+    <string name="bolusconstraintappliedwarn">大剂量约束应用为： %1$.2f U 到 %2$.2f U</string>
+    <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! 检测到碳水化合物吸收缓慢：%2$d%%的时间。再次检查你的计算。COB可能被高估，因此可以给予更多胰岛素!!!!!</font>]]></string>
+    <string name="partialboluswizard">输注大剂量向导结果的一部分[%]</string>
+    <string name="deliverpartofboluswizard">大剂量向导执行计算，但只有这部分计算结果的胰岛素被输注。适用于SMB算法。</string>
+    <string name="snooze">稍后再响</string>
+    <string name="increasingmaxbasal">增加最大基础率，因为设置参数低于你配置文件中的最大基础率</string>
+    <string name="smscommunicator_messagebody">无效消息</string>
+    <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
+    <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
+    <string name="format_cob_ic">%1$.1fg IC: %2$.1f</string>
+    <string name="format_percent">%1$d%%</string>
+    <string name="unit_minute_short">分钟</string>
+    <string name="profile_name">个人配置名称：</string>
+    <string name="selected_profile">已选择:</string>
+    <string name="unitsnosemicolon">单位</string>
+    <string name="doyouwantswitchprofile">是否要切换配置文件并放弃对当前配置文件所作的更改?</string>
+    <string name="objectives_button_unfinish">清除已完成</string>
+    <string name="objectives_button_unstart">清除已启动</string>
+    <string name="doyouwantresetstart">你想要重置已启动的目标? 你会失去已有的进度。</string>
+    <string name="setupwizard_units_prompt">选择你想要的血糖显示单位。</string>
+    <string name="dia_short">DIA</string>
+    <string name="ic_short">IC</string>
+    <string name="isf_short">ISF</string>
+    <string name="target_short">TARG</string>
+    <string name="clone_label">克隆</string>
+    <string name="saveorresetchangesfirst">首先保存或重置当前更改</string>
+    <string name="deletecurrentprofile">删除当前配置文件</string>
+    <string name="copytolocalprofile">是否复制这个配置文件的参数来创新一个新的配置文件？</string>
+    <string name="profilenamecontainsdot">配置文件名称包含点。\n这不受 NS 支持。\n配置未上载到 NS。</string>
+    <string name="low_mark_comment">血糖范围区域的下限值(仅显示，不影响算法)</string>
+    <string name="high_mark_comment">血糖范围区域的上限值(仅显示，不影响算法)</string>
+    <string name="age">年龄</string>
+    <string name="weight_label">重量</string>
+    <string name="id">ID：</string>
+    <string name="submit">提交</string>
+    <string name="mostcommonprofile">最常见的配置文件:</string>
+    <string name="survey_comment">注意: 只有在此屏幕上可视的数据将被匿名上载。个人身份识别已分配给此 AndroidAPS 的安装。 如果您的主配置文件发生更改，请让它在可视的时间范围内至少运行一周，那么您可以再次提交数据。 非常感谢您的帮助！</string>
+    <string name="invalidage">输入的年龄无效</string>
+    <string name="invalidweight">输入的权重无效</string>
+    <string name="invalidpct">输入的百分比无效</string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> 低: <b>%2$02d%%</b> 中: <b>%3$02d%%</b> 高: <b>%4$02d%%</b>]]></string>
+    <string name="average">平均</string>
+    <string name="tir">TIR</string>
+    <string name="activitymonitor">活动监视器</string>
+    <string name="doyouwantresetstats">您想要重置所有的统计信息吗？</string>
+    <string name="statistics">统计</string>
+    <string name="randombg">随机血糖</string>
+    <string name="description_source_randombg">生成随机血糖数据（仅限demo演示模式）</string>
+    <string name="randombg_short">血糖</string>
+    <string name="tools">工具</string>
+    <string name="show_calculation">显示计时器</string>
+    <string name="show_removed">显示已删除</string>
+    <string name="clearqueueconfirm">清除队列? 队列中的所有数据都将丢失!</string>
+    <string name="ebstopsloop">在使用扩展大剂量(方波) 功能期间将停止闭环功能。你真的想要启用吗？</string>
+    <string name="closed_loop_disabled_with_eb">由于运行扩展大剂量而禁用了闭环</string>
+    <string name="phonechecker">手机号验证器</string>
+    <string name="chartmenu">图表菜单</string>
+    <string name="loop_smbrequest_time_label">SMB 请求时间</string>
+    <string name="loop_smbexecution_time_label">SMB持续时长</string>
+    <string name="loop_tbrrequest_time_label">临时基础率请求时间</string>
+    <string name="loop_tbrexecution_time_label">临时基础率持续时长</string>
    <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">从验证码生成器应用获取%1$s的随机码，并附加PIN码</string>
+    <string name="smscommunicator_otp_pin">验证码末尾强制附加的PIN码</string>
+    <string name="smscommunicator_otp_pin_summary">在每次生成的一次性随机密码末尾，需要记住并强制附加的数字。</string>
+    <string name="smscomunicator_tab_otp_label">验证码生成器设置</string>
+    <string name="smscommunicator_code_verify_label">验证码检查：</string>
+    <string name="smscommunicator_code_verify_hint">OTP随机 + PIN固定</string>
+    <string name="smscommunicator_code_verify_info">验证码包含6位数字，由验证器应用程序生成（称为OTP），然后再包含3位或3位以上的必填数字PIN码。</string>
+    <string name="smscommunicator_otp_reset_btn">重置身份验证器</string>
+    <string name="smscommunicator_otp_reset_title">重置身份验证器的密钥</string>
+    <string name="smscommunicator_otp_reset_prompt">你确定要重置验证器密钥吗？它将导致以前配置的OTP随机验证码无效，您需要重新设置它们(在遥控手机的OTP应用上)。</string>
+    <string name="smscommunicator_otp_reset_successful">生成了新的身份验证器密钥！请使用更新的二维码设置验证器。</string>
+    <string name="smscommunicator_otp_export_title">导出OTP密钥</string>
+    <string name="smscommunicator_otp_export_prompt">你确定要将OTP密钥复制到剪贴板？\n\n只有在验证器应用扫描二维码出现问题时，你才需要这么做。可能你想手动输入二维码，或者使用专用的应用程序配置硬件OTP令牌。</string>
+    <string name="smscommunicator_otp_export_successful">将OTP密钥 (Base32 格式) 导出并复制到剪贴板。粘贴它到身份验证器或硬件OTP中！</string>
+    <string name="smscommunicator_otp_step1_install_header">1. 安装身份验证器app</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. 扫描二维码以安装AndroidAPS随机验证码密钥</string>
+    <string name="smscommunicator_otp_step3_test_header">3. 测试一次性验证码</string>
+    <string name="smscommunicator_otp_reset_header">重置身份验证器</string>
+    <string name="smscommunicator_otp_install_info">在其他遥控手机上安装支持RFC 6238 TOTP令牌协议的应用程序。常用的免费应用有:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_reset_warning">通过重置验证码核心密钥，可以使所有已设置的OTP随机验证码生成配置无效，您需要在遥控手机上重新设置!</string>
+    <string name="overview_show_predictions">预测</string>
+    <string name="overview_show_deviationslope">斜度偏差</string>
+    <string name="authorizationfailed">授权失败</string>
+    <string name="overview_show_absinsulin">胰岛素绝对值</string>
+    <string name="master_password_summary">主密码用于备份和安全性加密，它优先于其他功能模块的密码，请牢记它或储存在安全的地方。</string>
+    <string name="current_master_password">当前主密码</string>
+    <string name="statuslights">状态指示灯</string>
+    <string name="statuslights_copy_ns">从NS复制设置</string>
+    <string name="copyexistingvalues">复制 NS 设置(如果存在的话)？</string>
+    <string name="classic_description">原始皮肤</string>
+    <string name="lowres_description">低分辨率皮肤</string>
+    <string name="buttonson_description">按钮总是显示在屏幕底部</string>
+    <string name="largedisplay_description">大显示屏</string>
+    <string name="skin">皮肤</string>
+    <string name="comapareprofile">比较个人配置文件</string>
+    <string name="nav_profilehelper">配置文件助手</string>
+    <string name="motoldefaultprofile">默认个人配置文件</string>
+    <string name="currentprofile">当前配置文件</string>
+    <string name="availableprofile">可用配置文件</string>
+    <string name="profiletype">配置文件类型</string>
+    <string name="formatwithtdd">年龄: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwittddandpct">年龄: %1$.0f TDD: %2$.0f U %3$d%%</string>
+    <string name="formatwithweight">年龄: %1$.0f 体重: %2$.0f 千克</string>
+    <string name="basalpctfromtdd_label">基础率%</string>
+    <string name="dpvdefaultprofile">DPV默认个人配置</string>
+    <string name="setupwizard_pump_riley_link_status">RileyLink 状态:</string>
+    <string name="filter">筛选</string>
+    <string name="copytolocalprofile_invalid">无法创建配置文件。配置文件无效。</string>
+    <string name="cta_dont_kill_my_app_info">不要杀死我的应用程序？</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">如果触发泵连接丢失事件，则发送短信通知。</string>
+    <string name="smscommunicator_pump_ureachable">泵连接丢失报告</string>
+    <string name="advisoralarm">在应当吃饭时提醒</string>
+    <string name="alarminxmin">在 %1$d 分钟内运行提醒</string>
+    <string name="bolusadvisor">大剂量向导</string>
+    <string name="bolusadvisormessage">你现在血糖值高，请等待血糖值改善后再吃饭。你是否需要输注胰岛素进行纠正并提醒你吃饭？在这种情况下，不会记录碳水，当我们提醒你吃饭时，您必须再次使用大剂量向导。</string>
+    <string name="enablebolusadvisor">启用大剂量向导</string>
+    <string name="enablebolusadvisor_summary">在高血糖期间(\"预测大剂量\")，使用延迟吃饭的提醒功能，来替代大剂量向导结果</string>
+    <string name="time_to_eat">吃饭时间到了！\n请运行大剂量向导，然后进行计算。</string>
+    <string name="timetoeat">吃饭时间</string>
+    <string name="bolusreminder">大剂量提醒</string>
+    <string name="enablebolusreminder">启用大剂量提醒</string>
+    <string name="enablebolusreminder_summary">使用大剂量向导稍后推注的提醒功能
+      (“稍后注射大剂量”)</string>
+    <string name="time_to_bolus">输注胰岛素时间到了！\n请运行大剂量向导，然后再次进行计算。</string>
+    <string name="fabric_upload_disabled">已禁用崩溃日志上传！</string>
+    <string name="graph_menu_divider_header">绘图</string>
+    <string name="chart_menu">图表菜单</string>
+    <string name="clear_filter">清除筛选</string>
+    <string name="trend_arrow">趋势箭头</string>
+    <string name="cannula">输注导管</string>
+    <string name="userentry">用户条目</string>
+    <string name="common_values">\n选择您三餐的最大碳水值和最大胰岛素剂量\n</string>
+    <string name="summary_email_for_crash_report">此项为选填信息，会附在反馈的崩溃报告中，以便我们在紧急情况下与您联系。</string>
+    <string name="email_address">电子邮件地址</string>
+    <string name="privacy_settings">隐私设置</string>
+    <string name="privacy_summary">如果你想得到应用程序重大缺陷的通知，你可以选择提供电子邮件地址、Facebook或Discord等信息。这不是一项自动化的服务。在可能存在危险时，开发人员才会联系您。</string>
+    <string name="full_sync">完全同步</string>
+    <string name="full_sync_comment">完全同步数据? 这可能需要很长时间，在完成以前你将无法在NS中看到新数据。</string>
+    <string name="prime">充盈</string>
+    <string name="ns_sync_options">同步</string>
+    <string name="ns_upload_summary">将用户配置，大剂量，碳水化合物，临时基础率的数据上传到NS网站</string>
+    <string name="ns_upload">上传数据到NS网站</string>
+    <string name="ns_receive_profile_store">接收存储用户配置</string>
+    <string name="ns_receive_profile_store_summary">同步NS配置文件编辑器的用户配置到本地。</string>
+    <string name="ns_receive_temp_target">接收临时目标</string>
+    <string name="ns_receive_temp_target_summary">允许通过NS或NS客户端接收血糖的临时目标值。</string>
+    <string name="ns_receive_profile_switch">接收用户配置文件切换</string>
+    <string name="ns_receive_profile_switch_summary">允许通过NS或NS客户端接收用户配置文件切换。</string>
+    <string name="ns_receive_offline_event">接收 APS 离线事件</string>
+    <string name="ns_receive_offline_event_summary">允许通过NS或NS客户端接收APS 离线事件。</string>
+    <string name="ns_receive_tbr_eb">接收TBR 和 EB</string>
+    <string name="ns_receive_tbr_eb_summary">接受通过另一个实例输入 TBR 和 EB</string>
+    <string name="ns_receive_insulin">接收胰岛素输注</string>
+    <string name="ns_receive_insulin_summary">允许通过NS或 NS客户端接收胰岛素输注 (它并不会输注胰岛素，只计算为活性胰岛素IOB)</string>
+    <string name="ns_receive_carbs">接收碳水化合物</string>
+    <string name="ns_receive_carbs_summary">允许通过NS或NS客户端接收碳水化合物输入。</string>
+    <string name="ns_receive_therapy_events">接收治疗事件</string>
+    <string name="ns_receive_therapy_events_summary">允许通过NS或NS客户端接收(导管更换、胰岛素更换、电池更换等) 护理事件</string>
+    <string name="ns_receive_cgm">接收/回填CGM数据</string>
+    <string name="ns_receive_cgm_summary">接受来自NS 的 CGM 数据</string>
+    <string name="sms_timeout_while_wating">等待上一次胰岛素泵通信完成时超时</string>
+    <string name="smscommunicator_another_bolus_in_queue">队列中在执行另一个大剂量命令，请稍后再试。</string>
+    <string name="calculation_in_progress">正在进行计算</string>
+    <string name="missing_profile_name">缺少配置文件名称</string>
+    <string name="error_in_ic_values">IC数值错误</string>
+    <string name="error_in_basal_values">基础率数值错误</string>
+    <string name="error_in_target_values">目标数值错误</string>
+    <string name="error_in_isf_values">ISF数值错误</string>
+    <string name="run_question">运行 %s？</string>
+    <string name="invalid_profile_not_accepted">不接受来自NS的无效配置文件%1$s</string>
+    <string name="view">查看</string>
+    <string name="errors">错误</string>
+    <string name="ns_sync_slow">放慢上传速度</string>
+    <string name="data_status">血糖数据状态</string>
+    <string name="statuslights_cannula_age">导管年龄</string>
+    <string name="statuslights_patch_pump_age">patch 泵年龄</string>
+    <string name="patch_pump">Patch 泵</string>
+    <string name="recalculated_data_used">重新计算的数据</string>
+    <string name="bg_too_close">血糖间隔太近:\n%1$s\n%2$s</string>
+    <string name="identification">身份识别 (email邮件地址, FaceBook账号 或 Discord账号等等)</string>
+    <string name="identification_not_set">开发模式下未设置身份识别联系方式</string>
+    <string name="a11y_dialog">会话</string>
+    <string name="a11y_current_bg">当前血糖</string>
+    <string name="a11_correction_percentage">校正结果使用%</string>
+    <string name="a11_correction_units">校正结果使用单位</string>
+    <string name="not_available_full">不可用</string>
+    <string name="a11y_high">高</string>
+    <string name="a11y_inrange">在范围内</string>
+    <string name="a11y_low">低</string>
+    <string name="a11y_arrow_double_down">迅速下降</string>
+    <string name="a11y_arrow_single_down">下降</string>
+    <string name="a11y_arrow_forty_five_down">缓慢减少</string>
+    <string name="a11y_arrow_flat">稳定</string>
+    <string name="a11y_arrow_forty_five_up">缓慢增长</string>
+    <string name="a11y_arrow_single_up">上升</string>
+    <string name="a11y_arrow_double_up">快速上升</string>
+    <string name="a11y_arrow_none">无</string>
+    <string name="a11y_arrow_unknown">未知</string>
+    <string name="a11y_graph">绘图</string>
+    <string name="a11y_bg_quality">血糖质量</string>
+    <string name="a11y_bg_quality_recalculated">重新计算</string>
+    <string name="a11y_bg_quality_doubles">双重条目</string>
+    <string name="a11y_insulin_label">胰岛素</string>
+    <string name="a11y_blood_glucose">血糖</string>
+    <string name="a11y_bg_outdated">已过期</string>
+    <string name="a11y_carb_reminder">设置提醒</string>
+    <string name="a11y_add_new_profile">添加新配置文件</string>
+    <string name="a11y_clone_profile">克隆当前配置文件</string>
+    <string name="a11y_delete_current_profile">删除当前配置文件</string>
+    <string name="a11y_add_new_to_list">新增条目到列表</string>
    <!-- WEAR OS-->
+    <string name="wear_action_tempt_preset_error">未预设的临时目标： %1$s</string>
+    <string name="wear_action_tempt_cancel_message">取消正在运行的临时目标？</string>
+    <string name="wear_action_tempt_unit_error">手表和手机上使用了不同的单位！</string>
+    <string name="wear_action_tempt_zero_message">无临时目标-取消正在运行的临时目标？</string>
+    <string name="wear_action_tempt_min_bg_error">目标血糖最小值超出范围！</string>
+    <string name="wear_action_tempt_max_bg_error">目标血糖最大值超出范围！</string>
+    <string name="wear_action_tempt_manual_range_message">临时目标:\n最小: %1$s\n最大: %2$s\n持续时间: %3$s</string>
+    <string name="wear_action_tempt_manual_message">临时目标:\n目标: %1$s\n持续时间: %2$s</string>
+    <string name="wear_action_tempt_preset_message">临时目标:\原因: %1$s\n目标: %2$s\n持续时间: %3$s</string>
+    <string name="quick_wizard_message">快速向导: %1$s\n胰岛素: %2$.2fU\n碳水: %3$d克</string>
+    <string name="wizard_result">计算. 向导:\n胰岛素: %1$.2fU\n碳水: %2$d克</string>
+    <string name="overview_editquickwizard_show_on_device">在设备上显示条目：</string>
+    <string name="quick_wizard_not_available">选定的快速向导不再可用，请刷新</string>
+    <string name="wizard_no_actual_bg">最近没有血糖数据可供计算！</string>
+    <string name="wizard_no_active_profile">没有激活的个人配置文件！</string>
+    <string name="wizard_no_cob">未知的活性碳水！血糖读取缺失或最近重新启动了应用程序？</string>
+    <string name="wizard_carbs_constraint">碳水违反约束条件!</string>
+    <string name="wizard_explain_calc">计算(IC: %2$.1f, ISF: %2$.1f) 从:\"</string>
+    <string name="wizard_explain_carbs">碳水: %1$.2fU</string>
+    <string name="wizard_explain_cob">活性碳水: %1$.0f克 %2$.2fU</string>
+    <string name="wizard_explain_bg">血糖: %1$.2fU</string>
+    <string name="wizard_explain_basal_iob">基础率活性胰岛素: %1$.2fU</string>
+    <string name="wizard_explain_bolus_iob">大剂量活性胰岛素: %1$.2fU</string>
+    <string name="wizard_explain_superbolus">超级大剂量：%1$.2fU</string>
+    <string name="wizard_explain_trend">15分钟趋势：%1$.2fU</string>
+    <string name="wizard_explain_percent">百分比：%1$.2fU x %2$d%% ≈ %3$.2fU</string>
+    <string name="wizard_constraint_bolus_size">胰岛素剂量违法约束！\n无法输注 %1$.2fU</string>
+    <string name="wizard_explain_tt">临时目标：%1$s</string>
+    <string name="wizard_explain_tt_to">%1$s 至 %2$s</string>
+    <string name="wizard_pump_not_available">没有可用的泵！</string>
+    <string name="wear_unknown_action_string">未知操作命令：</string>
+    <string name="overview_editquickwizard_percentage">百分比</string>
+    <string name="app_default">应用程序预设</string>
+    <string name="select_profile">选择要编辑的配置文件</string>
+    <string name="refresh_from_nightscout">从 Nightscout 刷新</string>
+    <string name="remove_selected_items">删除选中项？</string>
+    <string name="select_for_removal">选择要删除的</string>
+    <string name="profile_changes">配置文件更改</string>
+    <string name="tempt_targets">临时目标</string>
+    <string name="carbs_and_bolus">碳水与大剂量</string>
+    <string name="confirm_remove_multiple_items">你确定要删除 %1$d 吗？</string>
+    <string name="hide_loop">隐藏闭环</string>
+    <string name="show_loop">显示闭环</string>
+    <string name="count_selected">已选中 %1$d</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -1110,6 +1110,8 @@
    <string name="ns_receive_profile_switch_summary">Accept profile switches entered through NS or NSClient</string>
    <string name="ns_receive_offline_event">Receive APS offline events</string>
    <string name="ns_receive_offline_event_summary">Accept APS Offline events entered through NS or NSClient</string>
+    <string name="ns_receive_tbr_eb">Receive TBR and EB</string>
+    <string name="ns_receive_tbr_eb_summary">Accept TBR and EB entered through another instance</string>
    <string name="key_ns_receive_insulin" translatable="false">ns_receive_insulin</string>
    <string name="ns_receive_insulin">Receive insulin</string>
    <string name="ns_receive_insulin_summary">Accept insulin entered through NS or NSClient (it\'s not delivered, only calculated towards IOB)</string>
@ -1117,6 +1119,7 @@
    <string name="ns_receive_carbs">Receive carbs</string>
    <string name="ns_receive_carbs_summary">Accept carbs entered through NS or NSClient</string>
    <string name="key_ns_receive_therapy_events" translatable="false">ns_receive_therapy_events</string>
+    <string name="key_ns_receive_tbr_eb" translatable="false">ns_receive_tbr_eb</string>
    <string name="ns_receive_therapy_events">Receive therapy events</string>
    <string name="ns_receive_therapy_events_summary">Accept therapy events (cannula, insulin, battery change etc) entered through NS or NSClient</string>
    <string name="key_ns_receive_cgm" translatable="false">ns_receive_cgm</string>
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@ -84,6 +84,12 @@
                android:summary="@string/ns_receive_offline_event_summary"
                android:title="@string/ns_receive_offline_event" />

+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_ns_receive_tbr_eb"
+                android:summary="@string/ns_receive_tbr_eb_summary"
+                android:title="@string/ns_receive_tbr_eb" />
+
        </androidx.preference.PreferenceScreen>>

        <androidx.preference.PreferenceScreen
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@ -31,7 +31,7 @@ import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.XDripBroadcast
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Single
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
--- a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueImplementationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueImplementationTest.kt
@ -30,7 +30,7 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.sharedPreferences.SP
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Single
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
--- a/Show more
+++ b/Show more