Merge branch 'dev' into crashalytics_280_jan21

.idea/codeStyles/Project.xml

@@ -4,18 +4,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />

CONTRIBUTING.md

@@ -36,7 +36,7 @@ Translations
 ------------
 
 * If possible, always use Android translation mechanism (with strings.xml and @strings/id) instead of hardcoded texts
-* Provide only English strings - all other languages will be crowd translated via Crowdn https://translations.androidaps.org/
+* Provide only English strings - all other languages will be crowd translated via Crowdin (https://crowdin.com/project/androidaps and https://crowdin.com/project/androidapsdocs)
 
 Hints
 -----

app/build.gradle

@@ -116,11 +116,11 @@ android {
     ndkVersion "21.1.6352462"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.7.2-dev"
+        version "2.8.0.1-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'

app/src/main/assets/OpenAPSSMB/determine-basal.js

@@ -151,7 +151,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         }
     }
     //cherry pick from oref upstream dev cb8e94990301277fb1016c778b4e9efa55a6edbc
-    if (bg <= 10 || bg === 38 || noise >= 3 || minAgo > 12 || minAgo < -5 || ( bg > 60 && glucose_status.delta == 0 && glucose_status.short_avgdelta > -1 && glucose_status.short_avgdelta < 1 && glucose_status.long_avgdelta > -1 && glucose_status.long_avgdelta < 1 ) ) {
+    if (bg <= 10 || bg === 38 || noise >= 3 || minAgo > 12 || minAgo < -5 || ( bg > 60 && glucose_status.delta == 0 && glucose_status.short_avgdelta > -1 && glucose_status.short_avgdelta < 1 && glucose_status.long_avgdelta > -1 && glucose_status.long_avgdelta < 1 ) && !isSaveCgmSource ) {
         if (currenttemp.rate > basal) { // high temp is running
             rT.reason += ". Replacing high temp basal of "+currenttemp.rate+" with neutral temp of "+basal;
             rT.deliverAt = deliverAt;

app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt

@@ -10,7 +10,7 @@ import info.nightscout.androidaps.plugins.general.maintenance.activities.PrefImp
 import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansLoginActivity
 import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
 import info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity
-import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEScanActivity
+import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEConfigActivity
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity
@@ -33,7 +33,7 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributesQuickWizardListActivity(): QuickWizardListActivity
     @ContributesAndroidInjector abstract fun contributesRequestDexcomPermissionActivity(): RequestDexcomPermissionActivity
     @ContributesAndroidInjector abstract fun contributesRileyLinkStatusActivity(): RileyLinkStatusActivity
-    @ContributesAndroidInjector abstract fun contributesRileyLinkBLEScanActivity(): RileyLinkBLEScanActivity
+    @ContributesAndroidInjector abstract fun contributesRileyLinkBLEConfigActivity(): RileyLinkBLEConfigActivity
     @ContributesAndroidInjector abstract fun contributesSetupWizardActivity(): SetupWizardActivity
     @ContributesAndroidInjector abstract fun contributesSingleFragmentActivity(): SingleFragmentActivity
     @ContributesAndroidInjector abstract fun contributesSmsCommunicatorOtpActivity(): SmsCommunicatorOtpActivity

app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt

@@ -109,6 +109,7 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesChooseActionDialog(): ChooseActionDialog
     @ContributesAndroidInjector abstract fun contributesChooseTriggerDialog(): ChooseTriggerDialog
     @ContributesAndroidInjector abstract fun contributesInsulinDialog(): InsulinDialog
+    @ContributesAndroidInjector abstract fun contributesLoopDialog(): LoopDialog
     @ContributesAndroidInjector abstract fun contributesObjectivesExamDialog(): ObjectivesExamDialog
     @ContributesAndroidInjector abstract fun contributesProfileSwitchDialog(): ProfileSwitchDialog
     @ContributesAndroidInjector abstract fun contributesTempBasalDialog(): TempBasalDialog

app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt

@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.dialogs
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
@@ -15,8 +15,8 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.HtmlHelper
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.extensions.formatColor
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_extendedbolus.*
@@ -27,7 +27,8 @@ import javax.inject.Inject
 import kotlin.math.abs
 
 class ExtendedBolusDialog : DialogFragmentWithDate() {
-    @Inject lateinit var mainApp: MainApp
+
+    @Inject lateinit var ctx: Context
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var commandQueue: CommandQueueProvider
@@ -77,12 +78,12 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
                 commandQueue.extendedBolus(insulinAfterConstraint, durationInMinutes, object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            val i = Intent(mainApp, ErrorHelperActivity::class.java)
+                            val i = Intent(ctx, ErrorHelperActivity::class.java)
                             i.putExtra("soundid", R.raw.boluserror)
                             i.putExtra("status", result.comment)
                             i.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror))
                             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            mainApp.startActivity(i)
+                            ctx.startActivity(i)
                         }
                     }
                 })

app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt

@@ -0,0 +1,385 @@
+package info.nightscout.androidaps.dialogs
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.os.Handler
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import androidx.fragment.app.FragmentManager
+import dagger.android.support.DaggerDialogFragment
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.databinding.DialogLoopBinding
+import info.nightscout.androidaps.events.*
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.androidaps.utils.extensions.toVisibility
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+
+class LoopDialog : DaggerDialogFragment() {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var ctx: Context
+    @Inject lateinit var sp: SP
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var objectivesPlugin: ObjectivesPlugin
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
+
+    private var showOkCancel: Boolean = true
+    private var _binding: DialogLoopBinding? = null
+    private var loopHandler = Handler()
+    private var refreshDialog: Runnable? = null
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+    }
+
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        super.onSaveInstanceState(savedInstanceState)
+        savedInstanceState.putInt("showOkCancel", if (showOkCancel) 1 else 0)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View {
+        // load data from bundle
+        (savedInstanceState ?: arguments)?.let { bundle ->
+            showOkCancel = bundle.getInt("showOkCancel", 1) == 1
+        }
+        dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE)
+        dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
+        isCancelable = true
+        dialog?.setCanceledOnTouchOutside(false)
+
+        _binding = DialogLoopBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        updateGUI("LoopDialogOnViewCreated")
+
+        binding.overviewCloseloop.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewLgsloop.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewOpenloop.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewDisable.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewEnable.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewResume.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewReconnect.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewSuspend1h.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewSuspend2h.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewSuspend3h.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewSuspend10h.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewDisconnect15m.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewDisconnect30m.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewDisconnect1h.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewDisconnect2h.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+        binding.overviewDisconnect3h.setOnClickListener { if (showOkCancel) onClickOkCancelEnabled(it) else onClick(it); dismiss() }
+
+        // cancel button
+        binding.cancel.setOnClickListener { dismiss() }
+
+        refreshDialog = Runnable {
+            scheduleUpdateGUI("refreshDialog")
+            loopHandler.postDelayed(refreshDialog, 15 * 1000L)
+        }
+        loopHandler.postDelayed(refreshDialog, 15 * 1000L)
+    }
+
+    @Synchronized
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+        loopHandler.removeCallbacksAndMessages(null)
+    }
+
+    var task: Runnable? = null
+
+    private fun scheduleUpdateGUI(from: String) {
+        class UpdateRunnable : Runnable {
+
+            override fun run() {
+                updateGUI(from)
+                task = null
+            }
+        }
+        view?.removeCallbacks(task)
+        task = UpdateRunnable()
+        view?.postDelayed(task, 500)
+    }
+
+    @Synchronized
+    fun updateGUI(from: String) {
+        if (_binding == null) return
+        aapsLogger.debug("UpdateGUI from $from")
+        val pumpDescription: PumpDescription = activePlugin.activePump.pumpDescription
+        val closedLoopAllowed = objectivesPlugin.isClosedLoopAllowed(Constraint(true))
+        val lgsEnabled = objectivesPlugin.isLgsAllowed(Constraint(true))
+        val apsMode = sp.getString(R.string.key_aps_mode, "open")
+        if (profileFunction.isProfileValid("LoopDialogUpdateGUI")) {
+            if (loopPlugin.isEnabled(PluginType.LOOP)) {
+                when {
+                    closedLoopAllowed.value() -> {
+                        binding.overviewCloseloop.visibility = (apsMode != "closed").toVisibility()
+                        binding.overviewLgsloop.visibility = (apsMode != "lgs").toVisibility()
+                        binding.overviewOpenloop.visibility = (apsMode != "open").toVisibility()
+                    }
+
+                    lgsEnabled.value()        -> {
+                        binding.overviewCloseloop.visibility = View.GONE
+                        binding.overviewLgsloop.visibility = (apsMode != "lgs").toVisibility()
+                        binding.overviewOpenloop.visibility = (apsMode != "open").toVisibility()
+                    }
+
+                    else                      -> {
+                        binding.overviewCloseloop.visibility = View.GONE
+                        binding.overviewLgsloop.visibility = View.GONE
+                        binding.overviewOpenloop.visibility = View.GONE
+                    }
+                }
+                binding.overviewEnable.visibility = View.GONE
+                binding.overviewDisable.visibility = View.VISIBLE
+                if (!loopPlugin.isSuspended) {
+                    binding.overviewSuspendHeader.text = resourceHelper.gs(R.string.suspendloop)
+                    binding.overviewResume.visibility = View.GONE
+                    binding.overviewSuspendButtons.visibility = View.VISIBLE
+                    binding.overviewSuspend.visibility = View.VISIBLE
+                } else {
+                    if (!loopPlugin.isDisconnected) {
+                        binding.overviewSuspendHeader.text = resourceHelper.gs(R.string.resumeloop)
+                        binding.overviewResume.visibility = View.VISIBLE
+                        binding.overviewSuspendButtons.visibility = View.GONE
+                        binding.overviewSuspend.visibility = View.VISIBLE
+                    } else
+                        binding.overviewSuspend.visibility = View.GONE
+                }
+            } else {
+                binding.overviewEnable.visibility = View.VISIBLE
+                binding.overviewDisable.visibility = View.GONE
+                binding.overviewSuspend.visibility = View.GONE
+            }
+            if (!loopPlugin.isDisconnected) {
+                binding.overviewPumpHeader.text = resourceHelper.gs(R.string.disconnectpump)
+                binding.overviewDisconnect15m.visibility = pumpDescription.tempDurationStep15mAllowed.toVisibility()
+                binding.overviewDisconnect30m.visibility = pumpDescription.tempDurationStep30mAllowed.toVisibility()
+                binding.overviewDisconnectButtons.visibility = View.VISIBLE
+                binding.overviewReconnect.visibility = View.GONE
+            } else {
+                binding.overviewPumpHeader.text = resourceHelper.gs(R.string.reconnect)
+                binding.overviewDisconnectButtons.visibility = View.GONE
+                binding.overviewReconnect.visibility = View.VISIBLE
+            }
+        }
+        val profile = profileFunction.getProfile()
+        val profileStore = activePlugin.activeProfileInterface.profile
+
+        if (profile == null || profileStore == null) {
+            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.noprofile))
+            dismiss()
+            return
+        }
+
+    }
+
+    private fun onClickOkCancelEnabled(v: View): Boolean {
+        var description = ""
+        when (v.id) {
+            R.id.overview_closeloop -> description = resourceHelper.gs(R.string.closedloop)
+            R.id.overview_lgsloop -> description = resourceHelper.gs(R.string.lowglucosesuspend)
+            R.id.overview_openloop -> description = resourceHelper.gs(R.string.openloop)
+            R.id.overview_disable -> description = resourceHelper.gs(R.string.disableloop)
+            R.id.overview_enable -> description = resourceHelper.gs(R.string.enableloop)
+            R.id.overview_resume -> description = resourceHelper.gs(R.string.resume)
+            R.id.overview_reconnect -> description = resourceHelper.gs(R.string.reconnect)
+            R.id.overview_suspend_1h -> description = resourceHelper.gs(R.string.suspendloopfor1h)
+            R.id.overview_suspend_2h -> description = resourceHelper.gs(R.string.suspendloopfor2h)
+            R.id.overview_suspend_3h -> description = resourceHelper.gs(R.string.suspendloopfor3h)
+            R.id.overview_suspend_10h -> description = resourceHelper.gs(R.string.suspendloopfor10h)
+            R.id.overview_disconnect_15m -> description = resourceHelper.gs(R.string.disconnectpumpfor15m)
+            R.id.overview_disconnect_30m -> description = resourceHelper.gs(R.string.disconnectpumpfor30m)
+            R.id.overview_disconnect_1h -> description = resourceHelper.gs(R.string.disconnectpumpfor1h)
+            R.id.overview_disconnect_2h -> description = resourceHelper.gs(R.string.disconnectpumpfor2h)
+            R.id.overview_disconnect_3h -> description = resourceHelper.gs(R.string.disconnectpumpfor3h)
+        }
+        activity?.let { activity ->
+            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.confirm), description, Runnable {
+                onClick(v)
+            })
+        }
+        return true
+    }
+
+    fun onClick(v: View): Boolean {
+        val profile = profileFunction.getProfile() ?: return true
+        when (v.id) {
+            R.id.overview_closeloop -> {
+                aapsLogger.debug("USER ENTRY: CLOSED LOOP MODE")
+                sp.putString(R.string.key_aps_mode, "closed")
+                rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.closedloop)))
+                return true
+            }
+
+            R.id.overview_lgsloop -> {
+                aapsLogger.debug("USER ENTRY: LGS LOOP MODE")
+                sp.putString(R.string.key_aps_mode, "lgs")
+                rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.lowglucosesuspend)))
+                return true
+            }
+
+            R.id.overview_openloop -> {
+                aapsLogger.debug("USER ENTRY: OPEN LOOP MODE")
+                sp.putString(R.string.key_aps_mode, "open")
+                rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.lowglucosesuspend)))
+                return true
+            }
+
+            R.id.overview_disable -> {
+                aapsLogger.debug("USER ENTRY: LOOP DISABLED")
+                loopPlugin.setPluginEnabled(PluginType.LOOP, false)
+                loopPlugin.setFragmentVisible(PluginType.LOOP, false)
+                configBuilderPlugin.storeSettings("DisablingLoop")
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                commandQueue.cancelTempBasal(true, object : Callback() {
+                    override fun run() {
+                        if (!result.success) {
+                            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.tempbasaldeliveryerror))
+                        }
+                    }
+                })
+                loopPlugin.createOfflineEvent(24 * 60) // upload 24h, we don't know real duration
+                return true
+            }
+
+            R.id.overview_enable -> {
+                aapsLogger.debug("USER ENTRY: LOOP ENABLED")
+                loopPlugin.setPluginEnabled(PluginType.LOOP, true)
+                loopPlugin.setFragmentVisible(PluginType.LOOP, true)
+                configBuilderPlugin.storeSettings("EnablingLoop")
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                loopPlugin.createOfflineEvent(0)
+                return true
+            }
+
+            R.id.overview_resume, R.id.overview_reconnect -> {
+                aapsLogger.debug("USER ENTRY: RESUME")
+                loopPlugin.suspendTo(0L)
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                commandQueue.cancelTempBasal(true, object : Callback() {
+                    override fun run() {
+                        if (!result.success) {
+                            val i = Intent(ctx, ErrorHelperActivity::class.java)
+                            i.putExtra("soundid", R.raw.boluserror)
+                            i.putExtra("status", result.comment)
+                            i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror))
+                            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            ctx.startActivity(i)
+                        }
+                    }
+                })
+                sp.putBoolean(R.string.key_objectiveusereconnect, true)
+                loopPlugin.createOfflineEvent(0)
+                return true
+            }
+
+            R.id.overview_suspend_1h -> {
+                aapsLogger.debug("USER ENTRY: SUSPEND 1h")
+                loopPlugin.suspendLoop(60)
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                return true
+            }
+
+            R.id.overview_suspend_2h -> {
+                aapsLogger.debug("USER ENTRY: SUSPEND 2h")
+                loopPlugin.suspendLoop(120)
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                return true
+            }
+
+            R.id.overview_suspend_3h -> {
+                aapsLogger.debug("USER ENTRY: SUSPEND 3h")
+                loopPlugin.suspendLoop(180)
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                return true
+            }
+
+            R.id.overview_suspend_10h -> {
+                aapsLogger.debug("USER ENTRY: SUSPEND 10h")
+                loopPlugin.suspendLoop(600)
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                return true
+            }
+
+            R.id.overview_disconnect_15m -> {
+                aapsLogger.debug("USER ENTRY: DISCONNECT 15m")
+                loopPlugin.disconnectPump(15, profile)
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                return true
+            }
+
+            R.id.overview_disconnect_30m -> {
+                aapsLogger.debug("USER ENTRY: DISCONNECT 30m")
+                loopPlugin.disconnectPump(30, profile)
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                return true
+            }
+
+            R.id.overview_disconnect_1h -> {
+                aapsLogger.debug("USER ENTRY: DISCONNECT 1h")
+                loopPlugin.disconnectPump(60, profile)
+                sp.putBoolean(R.string.key_objectiveusedisconnect, true)
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                return true
+            }
+
+            R.id.overview_disconnect_2h -> {
+                aapsLogger.debug("USER ENTRY: DISCONNECT 2h")
+                loopPlugin.disconnectPump(120, profile)
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                return true
+            }
+
+            R.id.overview_disconnect_3h -> {
+                aapsLogger.debug("USER ENTRY: DISCONNECT 3h")
+                loopPlugin.disconnectPump(180, profile)
+                rxBus.send(EventRefreshOverview("suspendmenu"))
+                return true
+            }
+        }
+        return false
+    }
+
+    override fun show(manager: FragmentManager, tag: String?) {
+        try {
+            manager.beginTransaction().let {
+                it.add(this, tag)
+                it.commitAllowingStateLoss()
+            }
+        } catch (e: IllegalStateException) {
+            aapsLogger.debug(e.localizedMessage)
+        }
+    }
+}

app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt

@@ -85,23 +85,11 @@ class TempTargetDialog : DialogFragmentWithDate() {
             val adapterReason = ArrayAdapter(context, R.layout.spinner_centered, reasonList)
             overview_temptarget_reason.adapter = adapterReason
 
-            overview_temptarget_custom?.setOnClickListener {
-                overview_temptarget_temptarget.value = savedInstanceState?.getDouble("overview_temptarget_temptarget") ?: if (profileFunction.getUnits() == Constants.MMOL) Constants.MIN_TT_MMOL else Constants.MIN_TT_MGDL
-                overview_temptarget_duration.value = savedInstanceState?.getDouble("overview_temptarget_duration")  ?: 0.0
-                overview_temptarget_reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.manual)));
-            }
-
             overview_temptarget_cancel?.setOnClickListener { shortClick(it) }
             overview_temptarget_eating_soon?.setOnClickListener { shortClick(it) }
             overview_temptarget_activity?.setOnClickListener { shortClick(it) }
             overview_temptarget_hypo?.setOnClickListener { shortClick(it) }
-            /*
-            overview_temptarget_cancel?.setOnLongClickListener {
-                longClick(it)
-                return@setOnLongClickListener true
-            }
 
-             */
             overview_temptarget_eating_soon?.setOnLongClickListener {
                 longClick(it)
                 return@setOnLongClickListener true
@@ -124,11 +112,6 @@ class TempTargetDialog : DialogFragmentWithDate() {
 
     private fun longClick(v:View) {
         when (v.id) {
-            R.id.overview_temptarget_cancel         -> {
-                overview_temptarget_temptarget.value = 0.0
-                overview_temptarget_duration.value = 0.0
-                overview_temptarget_reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.cancel)))
-            }
             R.id.overview_temptarget_eating_soon    -> {
                 overview_temptarget_temptarget.value = defaultValueHelper.determineEatingSoonTT()
                 overview_temptarget_duration.value = defaultValueHelper.determineEatingSoonTTDuration().toDouble()

app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt

@@ -18,6 +18,7 @@ import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.databinding.DialogWizardBinding
 import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
@@ -39,7 +40,6 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import info.nightscout.androidaps.utils.wizard.BolusWizard
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
-import kotlinx.android.synthetic.main.dialog_wizard.*
 import java.text.DecimalFormat
 import java.util.*
 import javax.inject.Inject
@@ -72,8 +72,23 @@ class WizardDialog : DaggerDialogFragment() {
         }
     }
 
+    private val timeTextWatcher = object : TextWatcher {
+        override fun afterTextChanged(s: Editable) {}
+        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+            calculateInsulin()
+            binding.alarm.isChecked = binding.carbTimeInput.value > 0
+        }
+    }
+
     private var disposable: CompositeDisposable = CompositeDisposable()
 
+    private var _binding: DialogWizardBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
     override fun onStart() {
         super.onStart()
         dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
@@ -81,49 +96,50 @@ class WizardDialog : DaggerDialogFragment() {
 
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
-        savedInstanceState.putDouble("treatments_wizard_bg_input", treatments_wizard_bg_input.value)
-        savedInstanceState.putDouble("treatments_wizard_carbs_input", treatments_wizard_carbs_input.value)
-        savedInstanceState.putDouble("treatments_wizard_correction_input", treatments_wizard_correction_input.value)
-        savedInstanceState.putDouble("treatments_wizard_carb_time_input", treatments_wizard_carb_time_input.value)
+        savedInstanceState.putDouble("bg_input", binding.bgInput.value)
+        savedInstanceState.putDouble("carbs_input", binding.carbsInput.value)
+        savedInstanceState.putDouble("correction_input", binding.correctionInput.value)
+        savedInstanceState.putDouble("carb_time_input", binding.carbTimeInput.value)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
+                              savedInstanceState: Bundle?): View {
         dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE)
         dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
         isCancelable = true
         dialog?.setCanceledOnTouchOutside(false)
 
-        return inflater.inflate(R.layout.dialog_wizard, container, false)
+        _binding = DialogWizardBinding.inflate(inflater, container, false)
+        return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         loadCheckedStates()
         processCobCheckBox()
-        treatments_wizard_sbcheckbox.visibility = sp.getBoolean(R.string.key_usesuperbolus, false).toVisibility()
-        treatments_wizard_notes_layout.visibility = sp.getBoolean(R.string.key_show_notes_entry_dialogs, false).toVisibility()
+        binding.sbcheckbox.visibility = sp.getBoolean(R.string.key_usesuperbolus, false).toVisibility()
+        binding.notesLayout.visibility = sp.getBoolean(R.string.key_show_notes_entry_dialogs, false).toVisibility()
 
         val maxCarbs = constraintChecker.getMaxCarbsAllowed().value()
         val maxCorrection = constraintChecker.getMaxBolusAllowed().value()
 
         if (profileFunction.getUnits() == Constants.MGDL)
-            treatments_wizard_bg_input.setParams(savedInstanceState?.getDouble("treatments_wizard_bg_input")
-                ?: 0.0, 0.0, 500.0, 1.0, DecimalFormat("0"), false, ok, textWatcher)
+            binding.bgInput.setParams(savedInstanceState?.getDouble("bg_input")
+                ?: 0.0, 0.0, 500.0, 1.0, DecimalFormat("0"), false, binding.ok, timeTextWatcher)
         else
-            treatments_wizard_bg_input.setParams(savedInstanceState?.getDouble("treatments_wizard_bg_input")
-                ?: 0.0, 0.0, 30.0, 0.1, DecimalFormat("0.0"), false, ok, textWatcher)
-        treatments_wizard_carbs_input.setParams(savedInstanceState?.getDouble("treatments_wizard_carbs_input")
-            ?: 0.0, 0.0, maxCarbs.toDouble(), 1.0, DecimalFormat("0"), false, ok, textWatcher)
+            binding.bgInput.setParams(savedInstanceState?.getDouble("bg_input")
+                ?: 0.0, 0.0, 30.0, 0.1, DecimalFormat("0.0"), false, binding.ok, textWatcher)
+        binding.carbsInput.setParams(savedInstanceState?.getDouble("carbs_input")
+            ?: 0.0, 0.0, maxCarbs.toDouble(), 1.0, DecimalFormat("0"), false, binding.ok, textWatcher)
         val bolusStep = activePlugin.activePump.pumpDescription.bolusStep
-        treatments_wizard_correction_input.setParams(savedInstanceState?.getDouble("treatments_wizard_correction_input")
-            ?: 0.0, -maxCorrection, maxCorrection, bolusStep, DecimalFormatter.pumpSupportedBolusFormat(activePlugin.activePump), false, ok, textWatcher)
-        treatments_wizard_carb_time_input.setParams(savedInstanceState?.getDouble("treatments_wizard_carb_time_input")
-            ?: 0.0, -60.0, 60.0, 5.0, DecimalFormat("0"), false, ok, textWatcher)
+        binding.correctionInput.setParams(savedInstanceState?.getDouble("correction_input")
+            ?: 0.0, -maxCorrection, maxCorrection, bolusStep, DecimalFormatter.pumpSupportedBolusFormat(activePlugin.activePump), false, binding.ok, textWatcher)
+        binding.carbTimeInput.setParams(savedInstanceState?.getDouble("carb_time_input")
+            ?: 0.0, -60.0, 60.0, 5.0, DecimalFormat("0"), false, binding.ok, timeTextWatcher)
         initDialog()
 
-        treatments_wizard_percent_used.text = resourceHelper.gs(R.string.format_percent, sp.getInt(R.string.key_boluswizard_percentage, 100))
+        binding.percentUsed.text = resourceHelper.gs(R.string.format_percent, sp.getInt(R.string.key_boluswizard_percentage, 100))
         // ok button
-        ok.setOnClickListener {
+        binding.ok.setOnClickListener {
             if (okClicked) {
                 aapsLogger.debug(LTag.UI, "guarding: ok already clicked")
             } else {
@@ -136,37 +152,37 @@ class WizardDialog : DaggerDialogFragment() {
             dismiss()
         }
         // cancel button
-        cancel.setOnClickListener { dismiss() }
+        binding.cancel.setOnClickListener { dismiss() }
         // checkboxes
-        treatments_wizard_bgcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
-        treatments_wizard_ttcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
-        treatments_wizard_cobcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
-        treatments_wizard_basaliobcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
-        treatments_wizard_bolusiobcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
-        treatments_wizard_bgtrendcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
-        treatments_wizard_sbcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
+        binding.bgcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
+        binding.ttcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
+        binding.cobcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
+        binding.basaliobcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
+        binding.bolusiobcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
+        binding.bgtrendcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
+        binding.sbcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
 
-        val showCalc = sp.getBoolean(resourceHelper.gs(R.string.key_wizard_calculation_visible), false)
-        treatments_wizard_delimiter.visibility = showCalc.toVisibility()
-        treatments_wizard_resulttable.visibility = showCalc.toVisibility()
-        treatments_wizard_calculationcheckbox.isChecked = showCalc
-        treatments_wizard_calculationcheckbox.setOnCheckedChangeListener { _, isChecked ->
+        val showCalc = sp.getBoolean(R.string.key_wizard_calculation_visible, false)
+        binding.delimiter.visibility = showCalc.toVisibility()
+        binding.resulttable.visibility = showCalc.toVisibility()
+        binding.calculationcheckbox.isChecked = showCalc
+        binding.calculationcheckbox.setOnCheckedChangeListener { _, isChecked ->
             run {
                 sp.putBoolean(resourceHelper.gs(R.string.key_wizard_calculation_visible), isChecked)
-                treatments_wizard_delimiter.visibility = isChecked.toVisibility()
-                treatments_wizard_resulttable.visibility = isChecked.toVisibility()
+                binding.delimiter.visibility = isChecked.toVisibility()
+                binding.resulttable.visibility = isChecked.toVisibility()
             }
         }
         // profile spinner
-        treatments_wizard_profile.onItemSelectedListener = object : OnItemSelectedListener {
+        binding.profile.onItemSelectedListener = object : OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
                 ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.noprofileselected))
-                ok.visibility = View.GONE
+                binding.ok.visibility = View.GONE
             }
 
             override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 calculateInsulin()
-                ok.visibility = View.VISIBLE
+                binding.ok.visibility = View.VISIBLE
             }
         }
         // bus
@@ -183,36 +199,37 @@ class WizardDialog : DaggerDialogFragment() {
     override fun onDestroyView() {
         super.onDestroyView()
         disposable.clear()
+        _binding = null
     }
 
     private fun onCheckedChanged(buttonView: CompoundButton, @Suppress("UNUSED_PARAMETER") state: Boolean) {
         saveCheckedStates()
-        treatments_wizard_ttcheckbox.isEnabled = treatments_wizard_bgcheckbox.isChecked && treatmentsPlugin.tempTargetFromHistory != null
-        if (buttonView.id == treatments_wizard_cobcheckbox.id)
+        binding.ttcheckbox.isEnabled = binding.bgcheckbox.isChecked && treatmentsPlugin.tempTargetFromHistory != null
+        if (buttonView.id == binding.cobcheckbox.id)
             processCobCheckBox()
         calculateInsulin()
     }
 
     private fun processCobCheckBox() {
-        if (treatments_wizard_cobcheckbox.isChecked) {
-            treatments_wizard_bolusiobcheckbox.isEnabled = false
-            treatments_wizard_basaliobcheckbox.isEnabled = false
-            treatments_wizard_bolusiobcheckbox.isChecked = true
-            treatments_wizard_basaliobcheckbox.isChecked = true
+        if (binding.cobcheckbox.isChecked) {
+            binding.bolusiobcheckbox.isEnabled = false
+            binding.basaliobcheckbox.isEnabled = false
+            binding.bolusiobcheckbox.isChecked = true
+            binding.basaliobcheckbox.isChecked = true
         } else {
-            treatments_wizard_bolusiobcheckbox.isEnabled = true
-            treatments_wizard_basaliobcheckbox.isEnabled = true
+            binding.bolusiobcheckbox.isEnabled = true
+            binding.basaliobcheckbox.isEnabled = true
         }
     }
 
     private fun saveCheckedStates() {
-        sp.putBoolean(resourceHelper.gs(R.string.key_wizard_include_cob), treatments_wizard_cobcheckbox.isChecked)
-        sp.putBoolean(resourceHelper.gs(R.string.key_wizard_include_trend_bg), treatments_wizard_bgtrendcheckbox.isChecked)
+        sp.putBoolean(R.string.key_wizard_include_cob, binding.cobcheckbox.isChecked)
+        sp.putBoolean(R.string.key_wizard_include_trend_bg, binding.bgtrendcheckbox.isChecked)
     }
 
     private fun loadCheckedStates() {
-        treatments_wizard_bgtrendcheckbox.isChecked = sp.getBoolean(resourceHelper.gs(R.string.key_wizard_include_trend_bg), false)
-        treatments_wizard_cobcheckbox.isChecked = sp.getBoolean(resourceHelper.gs(R.string.key_wizard_include_cob), false)
+        binding.bgtrendcheckbox.isChecked = sp.getBoolean(R.string.key_wizard_include_trend_bg, false)
+        binding.cobcheckbox.isChecked = sp.getBoolean(R.string.key_wizard_include_cob, false)
     }
 
     private fun initDialog() {
@@ -230,25 +247,25 @@ class WizardDialog : DaggerDialogFragment() {
         profileList.add(0, resourceHelper.gs(R.string.active))
         context?.let { context ->
             val adapter = ArrayAdapter(context, R.layout.spinner_centered, profileList)
-            treatments_wizard_profile.adapter = adapter
+            binding.profile.adapter = adapter
         } ?: return
 
         val units = profileFunction.getUnits()
-        treatments_wizard_bgunits.text = units
+        binding.bgunits.text = units
         if (units == Constants.MGDL)
-            treatments_wizard_bg_input.setStep(1.0)
+            binding.bgInput.setStep(1.0)
         else
-            treatments_wizard_bg_input.setStep(0.1)
+            binding.bgInput.setStep(0.1)
 
         // Set BG if not old
         val lastBg = iobCobCalculatorPlugin.actualBg()
 
         if (lastBg != null) {
-            treatments_wizard_bg_input.value = lastBg.valueToUnits(units)
+            binding.bgInput.value = lastBg.valueToUnits(units)
         } else {
-            treatments_wizard_bg_input.value = 0.0
+            binding.bgInput.value = 0.0
         }
-        treatments_wizard_ttcheckbox.isEnabled = treatmentsPlugin.tempTargetFromHistory != null
+        binding.ttcheckbox.isEnabled = treatmentsPlugin.tempTargetFromHistory != null
 
         // IOB calculation
         treatmentsPlugin.updateTotalIOBTreatments()
@@ -256,19 +273,19 @@ class WizardDialog : DaggerDialogFragment() {
         treatmentsPlugin.updateTotalIOBTempBasals()
         val basalIob = treatmentsPlugin.lastCalculationTempBasals.round()
 
-        treatments_wizard_bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, -bolusIob.iob)
-        treatments_wizard_basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, -basalIob.basaliob)
+        binding.bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, -bolusIob.iob)
+        binding.basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, -basalIob.basaliob)
 
         calculateInsulin()
 
-        treatments_wizard_percent_used.visibility = (sp.getInt(R.string.key_boluswizard_percentage, 100) != 100).toVisibility()
+        binding.percentUsed.visibility = (sp.getInt(R.string.key_boluswizard_percentage, 100) != 100).toVisibility()
     }
 
     private fun calculateInsulin() {
         val profileStore = activePlugin.activeProfileInterface.profile
-        if (treatments_wizard_profile?.selectedItem == null || profileStore == null)
+        if (binding.profile.selectedItem == null || profileStore == null)
             return  // not initialized yet
-        var profileName = treatments_wizard_profile.selectedItem.toString()
+        var profileName = binding.profile.selectedItem.toString()
         val specificProfile: Profile?
         if (profileName == resourceHelper.gs(R.string.active)) {
             specificProfile = profileFunction.getProfile()
@@ -279,82 +296,83 @@ class WizardDialog : DaggerDialogFragment() {
         if (specificProfile == null) return
 
         // Entered values
-        var bg = SafeParse.stringToDouble(treatments_wizard_bg_input.text)
-        val carbs = SafeParse.stringToInt(treatments_wizard_carbs_input.text)
-        val correction = SafeParse.stringToDouble(treatments_wizard_correction_input.text)
+        var bg = SafeParse.stringToDouble(binding.bgInput.text)
+        val carbs = SafeParse.stringToInt(binding.carbsInput.text)
+        val correction = SafeParse.stringToDouble(binding.correctionInput.text)
         val carbsAfterConstraint = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
         if (abs(carbs - carbsAfterConstraint) > 0.01) {
-            treatments_wizard_carbs_input.value = 0.0
+            binding.carbsInput.value = 0.0
             ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.carbsconstraintapplied))
             return
         }
 
-        bg = if (treatments_wizard_bgcheckbox.isChecked) bg else 0.0
-        val tempTarget = if (treatments_wizard_ttcheckbox.isChecked) treatmentsPlugin.tempTargetFromHistory else null
+        bg = if (binding.bgcheckbox.isChecked) bg else 0.0
+        val tempTarget = if (binding.ttcheckbox.isChecked) treatmentsPlugin.tempTargetFromHistory else null
 
         // COB
         var cob = 0.0
-        if (treatments_wizard_cobcheckbox.isChecked) {
+        if (binding.cobcheckbox.isChecked) {
             val cobInfo = iobCobCalculatorPlugin.getCobInfo(false, "Wizard COB")
             cobInfo.displayCob?.let { cob = it }
         }
 
-        val carbTime = SafeParse.stringToInt(treatments_wizard_carb_time_input.text)
+        val carbTime = SafeParse.stringToInt(binding.carbTimeInput.text)
 
         wizard = BolusWizard(mainApp).doCalc(specificProfile, profileName, tempTarget, carbsAfterConstraint, cob, bg, correction,
             sp.getInt(R.string.key_boluswizard_percentage, 100).toDouble(),
-            treatments_wizard_bgcheckbox.isChecked,
-            treatments_wizard_cobcheckbox.isChecked,
-            treatments_wizard_bolusiobcheckbox.isChecked,
-            treatments_wizard_basaliobcheckbox.isChecked,
-            treatments_wizard_sbcheckbox.isChecked,
-            treatments_wizard_ttcheckbox.isChecked,
-            treatments_wizard_bgtrendcheckbox.isChecked,
-            treatment_wizard_notes.text.toString(), carbTime)
+            binding.bgcheckbox.isChecked,
+            binding.cobcheckbox.isChecked,
+            binding.bolusiobcheckbox.isChecked,
+            binding.basaliobcheckbox.isChecked,
+            binding.sbcheckbox.isChecked,
+            binding.ttcheckbox.isChecked,
+            binding.bgtrendcheckbox.isChecked,
+            binding.alarm.isChecked,
+            binding.notes.text.toString(), carbTime)
 
         wizard?.let { wizard ->
-            treatments_wizard_bg.text = String.format(resourceHelper.gs(R.string.format_bg_isf), BgReading().value(Profile.toMgdl(bg, profileFunction.getUnits())).valueToUnitsToString(profileFunction.getUnits()), wizard.sens)
-            treatments_wizard_bginsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBG)
+            binding.bg.text = String.format(resourceHelper.gs(R.string.format_bg_isf), BgReading().value(Profile.toMgdl(bg, profileFunction.getUnits())).valueToUnitsToString(profileFunction.getUnits()), wizard.sens)
+            binding.bginsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBG)
 
-            treatments_wizard_carbs.text = String.format(resourceHelper.gs(R.string.format_carbs_ic), carbs.toDouble(), wizard.ic)
-            treatments_wizard_carbsinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCarbs)
+            binding.carbs.text = String.format(resourceHelper.gs(R.string.format_carbs_ic), carbs.toDouble(), wizard.ic)
+            binding.carbsinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCarbs)
 
-            treatments_wizard_bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBolusIOB)
-            treatments_wizard_basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBasalsIOB)
+            binding.bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBolusIOB)
+            binding.basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBasalIOB)
 
-            treatments_wizard_correctioninsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCorrection)
+            binding.correctioninsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCorrection)
 
             // Superbolus
-            treatments_wizard_sb.text = if (treatments_wizard_sbcheckbox.isChecked) resourceHelper.gs(R.string.twohours) else ""
-            treatments_wizard_sbinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromSuperBolus)
+            binding.sb.text = if (binding.sbcheckbox.isChecked) resourceHelper.gs(R.string.twohours) else ""
+            binding.sbinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromSuperBolus)
 
             // Trend
-            if (treatments_wizard_bgtrendcheckbox.isChecked && wizard.glucoseStatus != null) {
-                treatments_wizard_bgtrend.text = ((if (wizard.trend > 0) "+" else "")
+            if (binding.bgtrendcheckbox.isChecked && wizard.glucoseStatus != null) {
+                binding.bgtrend.text = ((if (wizard.trend > 0) "+" else "")
                     + Profile.toUnitsString(wizard.trend * 3, wizard.trend * 3 / Constants.MMOLL_TO_MGDL, profileFunction.getUnits())
                     + " " + profileFunction.getUnits())
             } else {
-                treatments_wizard_bgtrend.text = ""
+                binding.bgtrend.text = ""
             }
-            treatments_wizard_bgtrendinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromTrend)
+            binding.bgtrendinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromTrend)
 
             // COB
-            if (treatments_wizard_cobcheckbox.isChecked) {
-                treatments_wizard_cob.text = String.format(resourceHelper.gs(R.string.format_cob_ic), cob, wizard.ic)
-                treatments_wizard_cobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCOB)
+            if (binding.cobcheckbox.isChecked) {
+                binding.cob.text = String.format(resourceHelper.gs(R.string.format_cob_ic), cob, wizard.ic)
+                binding.cobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCOB)
             } else {
-                treatments_wizard_cob.text = ""
-                treatments_wizard_cobinsulin.text = ""
+                binding.cob.text = ""
+                binding.cobinsulin.text = ""
             }
 
             if (wizard.calculatedTotalInsulin > 0.0 || carbsAfterConstraint > 0.0) {
                 val insulinText = if (wizard.calculatedTotalInsulin > 0.0) resourceHelper.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin) else ""
                 val carbsText = if (carbsAfterConstraint > 0.0) resourceHelper.gs(R.string.format_carbs, carbsAfterConstraint) else ""
-                treatments_wizard_total.text = resourceHelper.gs(R.string.result_insulin_carbs, insulinText, carbsText)
-                ok.visibility = View.VISIBLE
+                binding.total.text = resourceHelper.gs(R.string.result_insulin_carbs, insulinText, carbsText)
+                binding.ok.visibility = View.VISIBLE
             } else {
-                treatments_wizard_total.text = resourceHelper.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt())
-                ok.visibility = View.INVISIBLE
+                binding.total.text = resourceHelper.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt())
+                binding.ok.visibility = View.INVISIBLE
             }
         }
 

app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt

@@ -44,6 +44,7 @@ import java.util.*
 import javax.inject.Inject
 
 class HistoryBrowseActivity : NoSplashAppCompatActivity() {
+
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var rxBus: RxBusWrapper
@@ -144,7 +145,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         historybrowse_bggraph?.gridLabelRenderer?.labelVerticalWidth = axisWidth
 
         overviewMenus.setupChartMenu(overview_chartMenuButton)
-        prepareGraphs()
+        prepareGraphsIfNeeded(overviewMenus.setting.size)
         savedInstanceState?.let { bundle ->
             rangeToDisplay = bundle.getInt("rangeToDisplay", 0)
             start = bundle.getLong("start", 0)
@@ -168,7 +169,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                 if (it.cause is EventCustomCalculationFinished) {
                     updateGUI("EventAutosensCalculationFinished", bgOnly = false)
                 }
-            }, fabricPrivacy::logException )
+            }, fabricPrivacy::logException)
         )
         disposable.add(rxBus
             .toObservable(EventAutosensBgLoaded::class.java)
@@ -178,22 +179,21 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                 if (it.cause is EventCustomCalculationFinished) {
                     updateGUI("EventAutosensCalculationFinished", bgOnly = true)
                 }
-            }, fabricPrivacy::logException )
+            }, fabricPrivacy::logException)
         )
         disposable.add(rxBus
             .toObservable(EventIobCalculationProgress::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ overview_iobcalculationprogess?.text = it.progress }, fabricPrivacy::logException )
+            .subscribe({ overview_iobcalculationprogess?.text = it.progress }, fabricPrivacy::logException)
         )
         disposable.add(rxBus
             .toObservable(EventRefreshOverview::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
                 if (it.now) {
-                    prepareGraphs()
                     updateGUI("EventRefreshOverview", bgOnly = false)
                 }
-            }, fabricPrivacy::logException )
+            }, fabricPrivacy::logException)
         )
         if (start == 0L) {
             // set start of current day
@@ -217,8 +217,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
     }
 
-    private fun prepareGraphs() {
-        val numOfGraphs = overviewMenus.setting.size
+    private fun prepareGraphsIfNeeded(numOfGraphs: Int) {
 
         if (numOfGraphs != secondaryGraphs.size - 1) {
             //aapsLogger.debug("New secondary graph count ${numOfGraphs-1}")
@@ -266,6 +265,8 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     }
 
     fun updateGUI(from: String, bgOnly: Boolean) {
+        val menuChartSettings = overviewMenus.setting
+        prepareGraphsIfNeeded(menuChartSettings.size)
         aapsLogger.debug(LTag.UI, "updateGUI from: $from")
         val pump = activePlugin.activePump
         val profile = profileFunction.getProfile()
@@ -308,11 +309,11 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                 if (!bgOnly) {
                     // Treatments
                     graphData.addTreatments(fromTime, toTime)
-                    if (overviewMenus.setting[0][OverviewMenus.CharType.ACT.ordinal])
+                    if (menuChartSettings[0][OverviewMenus.CharType.ACT.ordinal])
                         graphData.addActivity(fromTime, toTime, false, 0.8)
 
                     // add basal data
-                    if (pump.pumpDescription.isTempBasalCapable && overviewMenus.setting[0][OverviewMenus.CharType.BAS.ordinal]) {
+                    if (pump.pumpDescription.isTempBasalCapable && menuChartSettings[0][OverviewMenus.CharType.BAS.ordinal]) {
                         graphData.addBasals(fromTime, toTime, lowLine / graphData.maxY / 1.2)
                     }
                     // ------------------ 2nd graph
@@ -326,22 +327,22 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                         var useIAForScale = false
                         var useABSForScale = false
                         when {
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]      -> useIobForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]      -> useCobForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]      -> useDevForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]      -> useRatioForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]      -> useIAForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]      -> useABSForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]      -> useIobForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]      -> useCobForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]      -> useDevForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]      -> useRatioForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.ACT.ordinal]      -> useIAForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]      -> useABSForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true
                         }
 
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, toTime, useIobForScale, 1.0, overviewMenus.setting[g + 1][OverviewMenus.CharType.PRE.ordinal])
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, toTime, useCobForScale, if (useCobForScale) 1.0 else 0.5)
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, toTime, useDevForScale, 1.0)
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, toTime, useRatioForScale, 1.0)
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]) secondGraphData.addActivity(fromTime, toTime, useIAForScale, 0.8)
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, toTime, useABSForScale, 1.0)
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, toTime, useDSForScale, 1.0)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, toTime, useIobForScale, 1.0, menuChartSettings[g + 1][OverviewMenus.CharType.PRE.ordinal])
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, toTime, useCobForScale, if (useCobForScale) 1.0 else 0.5)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, toTime, useDevForScale, 1.0)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, toTime, useRatioForScale, 1.0)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.ACT.ordinal]) secondGraphData.addActivity(fromTime, toTime, useIAForScale, 0.8)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, toTime, useABSForScale, 1.0)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, toTime, useDSForScale, 1.0)
 
                         // set manual x bounds to have nice steps
                         secondGraphData.formatAxis(fromTime, toTime)
@@ -356,13 +357,13 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                 for (g in 0 until secondaryGraphs.size) {
                     secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
                     secondaryGraphs[g].visibility = (!bgOnly && (
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
+                        menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.ACT.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
                         )).toVisibility()
                     secondaryGraphsData[g].performUpdate()
                 }

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java

@@ -19,7 +19,6 @@ import java.nio.charset.StandardCharsets;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.R;
@@ -28,13 +27,14 @@ import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback;
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
+import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
@@ -73,10 +73,6 @@ public class DetermineBasalAdapterSMBJS {
     private String storedGlucoseStatus = null;
     private String storedProfile = null;
     private String storedMeal_data = null;
-    private String storedAutosens_data = null;
-    private String storedMicroBolusAllowed = null;
-    private String storedSMBAlwaysAllowed = null;
-    private String storedCurrentTime = null;
 
     private String scriptDebug = "";
 
@@ -102,13 +98,13 @@ public class DetermineBasalAdapterSMBJS {
         aapsLogger.debug(LTag.APS, "Profile:        " + (storedProfile = mProfile.toString()));
         aapsLogger.debug(LTag.APS, "Meal data:      " + (storedMeal_data = mMealData.toString()));
         if (mAutosensData != null)
-            aapsLogger.debug(LTag.APS, "Autosens data:  " + (storedAutosens_data = mAutosensData.toString()));
+            aapsLogger.debug(LTag.APS, "Autosens data:  " + mAutosensData.toString());
         else
-            aapsLogger.debug(LTag.APS, "Autosens data:  " + (storedAutosens_data = "undefined"));
+            aapsLogger.debug(LTag.APS, "Autosens data:  " + "undefined");
         aapsLogger.debug(LTag.APS, "Reservoir data: " + "undefined");
-        aapsLogger.debug(LTag.APS, "MicroBolusAllowed:  " + (storedMicroBolusAllowed = "" + mMicrobolusAllowed));
-        aapsLogger.debug(LTag.APS, "SMBAlwaysAllowed:  " + (storedSMBAlwaysAllowed = "" + mSMBAlwaysAllowed));
-        aapsLogger.debug(LTag.APS, "CurrentTime: " + (storedCurrentTime = "" + mCurrentTime));
+        aapsLogger.debug(LTag.APS, "MicroBolusAllowed:  " + mMicrobolusAllowed);
+        aapsLogger.debug(LTag.APS, "SMBAlwaysAllowed:  " + mSMBAlwaysAllowed);
+        aapsLogger.debug(LTag.APS, "CurrentTime: " + mCurrentTime);
         aapsLogger.debug(LTag.APS, "isSaveCgmSource: " + mIsSaveCgmSource);
 
 
@@ -151,9 +147,10 @@ public class DetermineBasalAdapterSMBJS {
                         makeParam(mAutosensData, rhino, scope),
                         makeParam(mMealData, rhino, scope),
                         setTempBasalFunctionsObj,
-                        new Boolean(mMicrobolusAllowed),
+                        Boolean.valueOf(mMicrobolusAllowed),
                         makeParam(null, rhino, scope), // reservoir data as undefined
-                        new Long(mCurrentTime)
+                        Long.valueOf(mCurrentTime),
+                        Boolean.valueOf(mIsSaveCgmSource)
                 };
 
 
@@ -213,14 +210,6 @@ public class DetermineBasalAdapterSMBJS {
         return storedMeal_data;
     }
 
-    String getAutosensDataParam() {
-        return storedAutosens_data;
-    }
-
-    String getMicroBolusAllowedParam() {
-        return storedMicroBolusAllowed;
-    }
-
     String getScriptDebug() {
         return scriptDebug;
     }
@@ -243,7 +232,6 @@ public class DetermineBasalAdapterSMBJS {
                         boolean isSaveCgmSource
     ) throws JSONException {
 
-        String units = profile.getUnits();
         PumpInterface pump = activePluginProvider.getActivePump();
         Double pumpbolusstep = pump.getPumpDescription().bolusStep;
         mProfile = new JSONObject();
@@ -267,8 +255,8 @@ public class DetermineBasalAdapterSMBJS {
         mProfile.put("low_temptarget_lowers_sensitivity", false);
 
 
-        mProfile.put("sensitivity_raises_target", sp.getBoolean(resourceHelper.gs(R.string.key_sensitivity_raises_target),SMBDefaults.sensitivity_raises_target));
-        mProfile.put("resistance_lowers_target", sp.getBoolean(resourceHelper.gs(R.string.key_resistance_lowers_target),SMBDefaults.resistance_lowers_target));
+        mProfile.put("sensitivity_raises_target", sp.getBoolean(R.string.key_sensitivity_raises_target, SMBDefaults.sensitivity_raises_target));
+        mProfile.put("resistance_lowers_target", sp.getBoolean(R.string.key_resistance_lowers_target, SMBDefaults.resistance_lowers_target));
         mProfile.put("adv_target_adjustments", SMBDefaults.adv_target_adjustments);
         mProfile.put("exercise_mode", SMBDefaults.exercise_mode);
         mProfile.put("half_basal_exercise_target", SMBDefaults.half_basal_exercise_target);
@@ -284,7 +272,7 @@ public class DetermineBasalAdapterSMBJS {
         mProfile.put("enableUAM", uamAllowed);
         mProfile.put("A52_risk_enable", SMBDefaults.A52_risk_enable);
 
-        boolean smbEnabled = sp.getBoolean(resourceHelper.gs(R.string.key_use_smb), false);
+        boolean smbEnabled = sp.getBoolean(R.string.key_use_smb, false);
         mProfile.put("SMBInterval", sp.getInt(R.string.key_smbinterval, SMBDefaults.SMBInterval));
         mProfile.put("enableSMB_with_COB", smbEnabled && sp.getBoolean(R.string.key_enableSMB_with_COB, false));
         mProfile.put("enableSMB_with_temptarget", smbEnabled && sp.getBoolean(R.string.key_enableSMB_with_temptarget, false));
@@ -364,14 +352,12 @@ public class DetermineBasalAdapterSMBJS {
 
         if (jsonObject == null) return Undefined.instance;
 
-        Object param = NativeJSON.parse(rhino, scope, jsonObject.toString(), (context, scriptable, scriptable1, objects) -> objects[1]);
-        return param;
+        return NativeJSON.parse(rhino, scope, jsonObject.toString(), (context, scriptable, scriptable1, objects) -> objects[1]);
     }
 
     private Object makeParamArray(JSONArray jsonArray, Context rhino, Scriptable scope) {
         //Object param = NativeJSON.parse(rhino, scope, "{myarray: " + jsonArray.toString() + " }", new Callable() {
-        Object param = NativeJSON.parse(rhino, scope, jsonArray.toString(), (context, scriptable, scriptable1, objects) -> objects[1]);
-        return param;
+        return NativeJSON.parse(rhino, scope, jsonArray.toString(), (context, scriptable, scriptable1, objects) -> objects[1]);
     }
 
     private String readFile(String filename) throws IOException {

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt

@@ -163,6 +163,12 @@ class ObjectivesPlugin @Inject constructor(
         return value
     }
 
+    fun isLgsAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
+        if (!objectives[MAXBASAL_OBJECTIVE].isStarted)
+            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), MAXBASAL_OBJECTIVE + 1), this)
+        return value
+    }
+
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[MAXIOB_ZERO_CL_OBJECTIVE].isStarted)
             value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), MAXIOB_ZERO_CL_OBJECTIVE + 1), this)

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java

@@ -19,186 +19,197 @@ public class Objective2 extends Objective {
 
     @Override
     protected void setupTasks(List<Task> tasks) {
+        tasks.add(new ExamTask(R.string.prerequisites_label, R.string.prerequisites_what, "prerequisites")
+                .option(new Option(R.string.prerequisites_nightscout, true))
+                .option(new Option(R.string.prerequisites_computer, true))
+                .option(new Option(R.string.prerequisites_pump, true))
+                .option(new Option(R.string.prerequisites_beanandroiddeveloper, false))
+                .hint(new Hint(R.string.prerequisites_hint1))
+        );
+        tasks.add(new ExamTask(R.string.prerequisites2_label, R.string.prerequisites2_what, "prerequisites2")
+                .option(new Option(R.string.prerequisites2_profile, true))
+                .option(new Option(R.string.prerequisites2_device, true))
+                .option(new Option(R.string.prerequisites2_internet, false))
+                .option(new Option(R.string.prerequisites2_supportedcgm, true))
+                .hint(new Hint(R.string.prerequisites2_hint1))
+        );
+        tasks.add(new ExamTask(R.string.basaltest_label, R.string.basaltest_when,"basaltest")
+                .option(new Option(R.string.basaltest_fixed, false))
+                .option(new Option(R.string.basaltest_havingregularhighlow, true))
+                .option(new Option(R.string.basaltest_weekly, false))
+                .option(new Option(R.string.basaltest_beforeloop, true))
+                .hint(new Hint(R.string.basaltest_hint1))
+        );
         tasks.add(new ExamTask(R.string.dia_label_exam, R.string.dia_whatmeansdia,"dia")
-                .option(new Option(R.string.dia_minimumis3h, false))
+                .option(new Option(R.string.dia_profile, true))
                 .option(new Option(R.string.dia_minimumis5h, true))
                 .option(new Option(R.string.dia_meaningisequaltodiapump, false))
                 .option(new Option(R.string.dia_valuemustbedetermined, true))
                 .hint(new Hint(R.string.dia_hint1))
         );
+        tasks.add(new ExamTask(R.string.isf_label_exam, R.string.blank,"isf")
+                .option(new Option(R.string.isf_decreasingvalue, true))
+                .option(new Option(R.string.isf_preferences, false))
+                .option(new Option(R.string.isf_increasingvalue, false))
+                .option(new Option(R.string.isf_noeffect, false))
+                .hint(new Hint(R.string.isf_hint1))
+                .hint(new Hint(R.string.isf_hint2))
+        );
+        tasks.add(new ExamTask(R.string.ic_label_exam, R.string.blank,"ic")
+                .option(new Option(R.string.ic_increasingvalue, true))
+                .option(new Option(R.string.ic_decreasingvalue, false))
+                .option(new Option(R.string.ic_multiple, true))
+                .option(new Option(R.string.ic_isf, false))
+                .hint(new Hint(R.string.ic_hint1))
+        );
         tasks.add(new ExamTask(R.string.hypott_label, R.string.hypott_whenhypott,"hypott")
-                .option(new Option(R.string.hypott_goinglow, false))
                 .option(new Option(R.string.hypott_preventoversmb, true))
+                .option(new Option(R.string.hypott_exercise, false))
+                .option(new Option(R.string.hypott_wrongbasal, false))
+                .option(new Option(R.string.hypott_0basal, false))
                 .hint(new Hint(R.string.hypott_hint1))
         );
-        tasks.add(new ExamTask(R.string.offlineprofile_label, R.string.offlineprofile_whatprofile,"offlineprofile")
-                .option(new Option(R.string.localprofile, true))
-                .option(new Option(R.string.nsprofile, false))
-                .option(new Option(R.string.offlineprofile_nsprofile, true))
-                .hint(new Hint(R.string.offlineprofile_hint1))
+        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch")
+                .option(new Option(R.string.profileswitch_basallower, true))
+                .option(new Option(R.string.profileswitch_isfhigher, true))
+                .option(new Option(R.string.profileswitch_iclower, false))
+                .option(new Option(R.string.profileswitch_unchanged, false))
+                .hint(new Hint(R.string.profileswitch_hint1))
         );
-        tasks.add(new ExamTask(R.string.pumpdisconnect_label, R.string.pumpdisconnect_label,"pumpdisconnect")
-                .option(new Option(R.string.pumpdisconnect_letknow, true))
-                .option(new Option(R.string.pumpdisconnect_suspend, false))
-                .option(new Option(R.string.pumpdisconnect_dontchnage, false))
-                .hint(new Hint(R.string.pumpdisconnect_hint1))
+        tasks.add(new ExamTask(R.string.profileswitch2_label, R.string.profileswitch2_pctwillchange,"profileswitch2")
+                .option(new Option(R.string.profileswitch2_bghigher, false))
+                .option(new Option(R.string.profileswitch2_basalhigher, true))
+                .option(new Option(R.string.profileswitch2_bgunchanged, true))
+                .option(new Option(R.string.profileswitch2_isfhigher, false))
+                .hint(new Hint(R.string.profileswitch_hint1))
         );
-        tasks.add(new ExamTask(R.string.objectives_label, R.string.objectives_howtosave,"objectives")
-                .option(new Option(R.string.objectives_exportsettings, true))
-                .option(new Option(R.string.objectives_storeelsewhere, true))
-                .option(new Option(R.string.objectives_doexportonstart, false))
-                .option(new Option(R.string.objectives_doexportafterchange, true))
-                .option(new Option(R.string.objectives_doexportafterobjective, true))
-                .option(new Option(R.string.objectives_doexportafterfirtssettings, true))
-                .hint(new Hint(R.string.objectives_hint1))
-                .hint(new Hint(R.string.objectives_hint2))
+        tasks.add(new ExamTask(R.string.profileswitchtime_label, R.string.profileswitchtime_iwant,"profileswitchtime")
+                .option(new Option(R.string.profileswitchtime_2, false))
+                .option(new Option(R.string.profileswitchtime__2, true))
+                .option(new Option(R.string.profileswitchtime_tt, false))
+                .option(new Option(R.string.profileswitchtime_100, false))
+                .hint(new Hint(R.string.profileswitchtime_hint1))
+        );
+        tasks.add(new ExamTask(R.string.profileswitch4_label, R.string.blank,"profileswitch4")
+                .option(new Option(R.string.profileswitch4_rates, true))
+                .option(new Option(R.string.profileswitch4_internet, true))
+                .option(new Option(R.string.profileswitch4_sufficient, false))
+                .option(new Option(R.string.profileswitch4_multi, true))
+                .hint(new Hint(R.string.profileswitch_hint1))
+        );
+        tasks.add(new ExamTask(R.string.exerciseprofile_label, R.string.exerciseprofile_whattodo,"exercise")
+                .option(new Option(R.string.exerciseprofile_switchprofileabove100, false))
+                .option(new Option(R.string.exerciseprofile_switchprofilebelow100, true))
+                .option(new Option(R.string.exerciseprofile_suspendloop, false))
+                .option(new Option(R.string.exerciseprofile_leaveat100, false))
+                .hint(new Hint(R.string.exerciseprofile_hint1))
+        );
+        tasks.add(new ExamTask(R.string.exercise_label, R.string.exercise_whattodo,"exercise2")
+                .option(new Option(R.string.exercise_settt, true))
+                .option(new Option(R.string.exercise_setfinished, false))
+                .option(new Option(R.string.exercise_setunchanged, false))
+                .option(new Option(R.string.exercise_15g, false))
+                .hint(new Hint(R.string.exercise_hint1))
         );
         tasks.add(new ExamTask(R.string.noisycgm_label, R.string.noisycgm_whattodo,"noisycgm")
-                .option(new Option(R.string.nothing, false))
-                .option(new Option(R.string.disconnectpumpfor1h, false))
+                .option(new Option(R.string.noisycgm_nothing, false))
                 .option(new Option(R.string.noisycgm_pause, true))
                 .option(new Option(R.string.noisycgm_replacesensor, true))
-                .option(new Option(R.string.noisycgm_turnoffphone, false))
                 .option(new Option(R.string.noisycgm_checksmoothing, true))
                 .hint(new Hint(R.string.noisycgm_hint1))
         );
-        tasks.add(new ExamTask(R.string.exercise_label, R.string.exercise_whattodo,"exercise")
-                .option(new Option(R.string.nothing, false))
-                .option(new Option(R.string.exercise_setactivitytt, true))
-                .option(new Option(R.string.exercise_switchprofilebelow100, true))
-                .option(new Option(R.string.exercise_switchprofileabove100, false))
-                .option(new Option(R.string.exercise_stoploop, false))
-                .option(new Option(R.string.exercise_doitbeforestart, true))
-                .option(new Option(R.string.exercise_afterstart, true))
-                .hint(new Hint(R.string.exercise_hint1))
+        tasks.add(new ExamTask(R.string.pumpdisconnect_label, R.string.blank,"pumpdisconnect")
+                .option(new Option(R.string.pumpdisconnect_unnecessary, false))
+                .option(new Option(R.string.pumpdisconnect_missinginsulin, true))
+                .option(new Option(R.string.pumpdisconnect_notstop, false))
+                .option(new Option(R.string.pumpdisconnect_openloop, false))
+                .hint(new Hint(R.string.pumpdisconnect_hint1))
         );
-       tasks.add(new ExamTask(R.string.suspendloop_label, R.string.suspendloop_doigetinsulin,"suspendloop")
-                .option(new Option(R.string.suspendloop_yes, true))
-                .option(new Option(R.string.suspendloop_no, false))
+        tasks.add(new ExamTask(R.string.insulin_label, R.string.insulin_ultrarapid,"insulin")
+                .option(new Option(R.string.insulin_novorapid, false))
+                .option(new Option(R.string.insulin_humalog, false))
+                .option(new Option(R.string.insulin_actrapid, false))
+                .option(new Option(R.string.insulin_fiasp, true))
+                .hint(new Hint(R.string.insulin_hint1))
         );
-       tasks.add(new ExamTask(R.string.basaltest_label, R.string.basaltest_when,"basaltest")
-                .option(new Option(R.string.basaltest_beforeloop, true))
-                .option(new Option(R.string.basaltest_havingregularhypo, true))
-                .option(new Option(R.string.basaltest_havingregularhyper, true))
-                 .hint(new Hint(R.string.basaltest_hint1))
+        tasks.add(new ExamTask(R.string.sensitivity_label, R.string.blank,"sensitivity")
+                .option(new Option(R.string.sensitivity_adjust, true))
+                .option(new Option(R.string.sensitivity_edit, false))
+                .option(new Option(R.string.sensitivity_cannula, true))
+                .option(new Option(R.string.sensitivity_time, true))
+                .hint(new Hint(R.string.sensitivity_hint1))
         );
-       tasks.add(new ExamTask(R.string.basalhelp_label, R.string.basalhelp_where,"basalhelp")
-                .option(new Option(R.string.basalhelp_diabetesteam, true))
-                .option(new Option(R.string.basalhelp_google, false))
-                .option(new Option(R.string.basalhelp_facebook, false))
-                 .hint(new Hint(R.string.basalhelp_hint1))
+        tasks.add(new ExamTask(R.string.objectives_label, R.string.objectives_howtosave,"objectives")
+                .option(new Option(R.string.objectives_notesettings, false))
+                .option(new Option(R.string.objectives_afterobjective, true))
+                .option(new Option(R.string.objectives_afterchange, true))
+                .option(new Option(R.string.objectives_afterinitialsetup, true))
+                .hint(new Hint(R.string.objectives_hint1))
+                .hint(new Hint(R.string.objectives_hint2))
         );
-       tasks.add(new ExamTask(R.string.prerequisites_label, R.string.prerequisites_what, "prerequisites")
-                .option(new Option(R.string.prerequisites_determinedcorrectprofile, true))
-                .option(new Option(R.string.prerequisites_computer, true))
-                .option(new Option(R.string.prerequisites_phone, true))
-                .option(new Option(R.string.prerequisites_car, false))
-                .option(new Option(R.string.prerequisites_nightscout, true))
-                .option(new Option(R.string.prerequisites_tidepoolaccount, false))
-                .option(new Option(R.string.prerequisites_googleaccount, false))
-                .option(new Option(R.string.prerequisites_githubaccount, false))
-                .option(new Option(R.string.prerequisites_beanandroiddeveloper, false))
-                .option(new Option(R.string.prerequisites_own670g, false))
-                .option(new Option(R.string.prerequisites_smartwatch, false))
-                .option(new Option(R.string.prerequisites_supportedcgm, true))
-                .hint(new Hint(R.string.prerequisites_hint1))
+        tasks.add(new ExamTask(R.string.objectives2_label, R.string.objectives_howtosave,"objectives2")
+                .option(new Option(R.string.objectives2_maintenance, true))
+                .option(new Option(R.string.objectives2_internalstorage, true))
+                .option(new Option(R.string.objectives2_cloud, true))
+                .option(new Option(R.string.objectives2_easyrestore, false))
+                .hint(new Hint(R.string.objectives_hint1))
+                .hint(new Hint(R.string.objectives_hint2))
         );
-        tasks.add(new ExamTask(R.string.update_label, R.string.whatistrue,"update")
+        tasks.add(new ExamTask(R.string.update_label, R.string.blank,"update")
                 .option(new Option(R.string.update_git, true))
-                .option(new Option(R.string.update_asap, true))
-                .option(new Option(R.string.update_keys, true))
-                .option(new Option(R.string.update_neverupdate, false))
                 .option(new Option(R.string.update_askfriend, false))
+                .option(new Option(R.string.update_keys, true))
+                .option(new Option(R.string.update_asap, true))
                 .hint(new Hint(R.string.update_hint1))
         );
         tasks.add(new ExamTask(R.string.troubleshooting_label, R.string.troubleshooting_wheretoask,"troubleshooting")
                 .option(new Option(R.string.troubleshooting_fb, true))
                 .option(new Option(R.string.troubleshooting_wiki, true))
                 .option(new Option(R.string.troubleshooting_gitter, true))
-                .option(new Option(R.string.troubleshooting_googlesupport, false))
                 .option(new Option(R.string.troubleshooting_yourendo, false))
                 .hint(new Hint(R.string.troubleshooting_hint1))
                 .hint(new Hint(R.string.troubleshooting_hint2))
                 .hint(new Hint(R.string.troubleshooting_hint3))
         );
-        tasks.add(new ExamTask(R.string.insulin_label, R.string.insulin_ultrarapid,"insulin")
-                .option(new Option(R.string.insulin_fiasp, true))
-                .option(new Option(R.string.insulin_novorapid, false))
-                .option(new Option(R.string.insulin_humalog, false))
-                .option(new Option(R.string.insulin_actrapid, false))
-                .hint(new Hint(R.string.insulin_hint1))
-        );
-        tasks.add(new ExamTask(R.string.sensitivity_label, R.string.sensitivity_which,"sensitivity")
-                .option(new Option(R.string.sensitivityweightedaverage, true))
-                .option(new Option(R.string.sensitivityoref1, false))
-                .option(new Option(R.string.sensitivityaaps, true))
-                .hint(new Hint(R.string.sensitivity_hint1))
-        );
-        tasks.add(new ExamTask(R.string.sensitivity_label, R.string.sensitivityuam_which,"sensitivityuam")
-                .option(new Option(R.string.sensitivityweightedaverage, false))
-                .option(new Option(R.string.sensitivityoref1, true))
-                .option(new Option(R.string.sensitivityaaps, false))
-                .hint(new Hint(R.string.sensitivity_hint1))
-        );
         tasks.add(new ExamTask(R.string.wrongcarbs_label, R.string.wrongcarbs_whattodo,"wrongcarbs")
-                .option(new Option(R.string.wrongcarbs_addfakeinsulin, false))
+                .option(new Option(R.string.wrongcarbs_addinsulin, false))
                 .option(new Option(R.string.wrongcarbs_treatmentstab, true))
+                .option(new Option(R.string.wrongcarbs_donothing, false))
+                .option(new Option(R.string.wrongcarbs_bolus, false))
+        );
+        tasks.add(new ExamTask(R.string.wronginsulin_label, R.string.wronginsulin_whattodo,"wronginsulin")
+                .option(new Option(R.string.wronginsulin_careportal, false))
+                .option(new Option(R.string.wronginsulin_compare, true))
+                .option(new Option(R.string.wronginsulin_prime, true))
+                .option(new Option(R.string.wrongcarbs_donothing, false))
+        );
+        tasks.add(new ExamTask(R.string.iob_label, R.string.blank,"iob")
+                .option(new Option(R.string.iob_value, true))
+                .option(new Option(R.string.iob_hightemp, false))
+                .option(new Option(R.string.iob_negiob, true))
+                .option(new Option(R.string.iob_posiob, true))
+        );
+        tasks.add(new ExamTask(R.string.breadgrams_label, R.string.blank,"breadgrams")
+                .option(new Option(R.string.breadgrams_grams, true))
+                .option(new Option(R.string.breadgrams_exchange, false))
+                .option(new Option(R.string.breadgrams_decay, true))
+                .option(new Option(R.string.breadgrams_calc, true))
+                .hint(new Hint(R.string.breadgrams_hint1))
         );
         tasks.add(new ExamTask(R.string.extendedcarbs_label, R.string.extendedcarbs_handling,"extendedcarbs")
-                .option(new Option(R.string.extendedcarbs_useextendedcarbs, true))
-                .option(new Option(R.string.extendedcarbs_add, false))
-                .option(new Option(R.string.extendedcarbs_useextendedbolus, false))
+                .option(new Option(R.string.extendedcarbs_future, true))
+                .option(new Option(R.string.extendedcarbs_free, false))
+                .option(new Option(R.string.extendedcarbs_fat, true))
+                .option(new Option(R.string.extendedcarbs_rescue, false))
                 .hint(new Hint(R.string.extendedcarbs_hint1))
         );
         tasks.add(new ExamTask(R.string.nsclient_label, R.string.nsclient_howcanyou,"nsclient")
                 .option(new Option(R.string.nsclient_nightscout, true))
-                .option(new Option(R.string.nsclientinternal, true))
                 .option(new Option(R.string.nsclient_dexcomfollow, true))
-                .option(new Option(R.string.nsclient_dexcomfollowxdrip, false))
-                .option(new Option(R.string.nsclient_xdripfollower, true))
-                .option(new Option(R.string.nsclient_looponiphone, false))
-                .option(new Option(R.string.nsclient_spikeiphone, true))
+                .option(new Option(R.string.nsclient_data, true))
+                .option(new Option(R.string.nsclient_fullcontrol, false))
                 .hint(new Hint(R.string.nsclient_hint1))
         );
-        tasks.add(new ExamTask(R.string.isf_label_exam, R.string.whatistrue,"isf")
-                .option(new Option(R.string.isf_increasingvalue, true))
-                .option(new Option(R.string.isf_decreasingvalue, false))
-                .option(new Option(R.string.isf_noeffect, false))
-                .option(new Option(R.string.isf_preferences, false))
-                .option(new Option(R.string.isf_profile, false))
-                .hint(new Hint(R.string.isf_hint1))
-                .hint(new Hint(R.string.isf_hint2))
-        );
-        tasks.add(new ExamTask(R.string.ic_label_exam, R.string.whatistrue,"ic")
-                .option(new Option(R.string.ic_increasingvalue, true))
-                .option(new Option(R.string.ic_decreasingvalue, false))
-                .option(new Option(R.string.ic_noeffect, false))
-                .option(new Option(R.string.ic_different, false))
-                .option(new Option(R.string.ic_meaning, false))
-                .hint(new Hint(R.string.ic_hint1))
-        );
-        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch")
-                .option(new Option(R.string.profileswitch_basalhigher, false))
-                .option(new Option(R.string.profileswitch_basallower, true))
-                .option(new Option(R.string.profileswitch_ichigher, true))
-                .option(new Option(R.string.profileswitch_iclower, false))
-                .option(new Option(R.string.profileswitch_isfhigher, true))
-                .option(new Option(R.string.profileswitch_isflower, false))
-                .option(new Option(R.string.profileswitch_overall, true))
-                .option(new Option(R.string.profileswitch_targethigher, false))
-                .option(new Option(R.string.profileswitch_targetlower, false))
-                .option(new Option(R.string.profileswitch_targetbottom, false))
-                .hint(new Hint(R.string.profileswitch_hint1))
-        );
-
-        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitchtime_iwant,"profileswitchtime")
-                .option(new Option(R.string.profileswitchtime_1, false))
-                .option(new Option(R.string.profileswitchtime__1, true))
-                .option(new Option(R.string.profileswitchtime_60, false))
-                .option(new Option(R.string.profileswitchtime__60, false))
-                .hint(new Hint(R.string.profileswitchtime_hint1))
-        );
-
         tasks.add(new ExamTask(R.string.other_medication_label, R.string.other_medication_text,"otherMedicationWarning")
                 .option(new Option(R.string.yes, true))
                 .option(new Option(R.string.no, false))

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt

@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.actions
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.util.DisplayMetrics
@@ -11,7 +12,6 @@ import androidx.core.content.ContextCompat
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.activities.TDDStatsActivity
@@ -45,11 +45,12 @@ import java.util.*
 import javax.inject.Inject
 
 class ActionsFragment : DaggerFragment() {
+
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var ctx: Context
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var statusLightHandler: StatusLightHandler
     @Inject lateinit var fabricPrivacy: FabricPrivacy
@@ -94,12 +95,12 @@ class ActionsFragment : DaggerFragment() {
         }
         actions_extendedbolus.setOnClickListener {
             activity?.let { activity ->
-                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable {
+                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable {
                     OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.extended_bolus), resourceHelper.gs(R.string.ebstopsloop),
                         Runnable {
                             ExtendedBolusDialog().show(childFragmentManager, "Actions")
                         }, null)
-                }))
+                })
             }
         }
         actions_extendedbolus_cancel.setOnClickListener {
@@ -108,12 +109,12 @@ class ActionsFragment : DaggerFragment() {
                 commandQueue.cancelExtended(object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            val i = Intent(mainApp, ErrorHelperActivity::class.java)
+                            val i = Intent(ctx, ErrorHelperActivity::class.java)
                             i.putExtra("soundid", R.raw.boluserror)
                             i.putExtra("status", result.comment)
                             i.putExtra("title", resourceHelper.gs(R.string.extendedbolusdeliveryerror))
                             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            mainApp.startActivity(i)
+                            ctx.startActivity(i)
                         }
                     }
                 })
@@ -128,12 +129,12 @@ class ActionsFragment : DaggerFragment() {
                 commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            val i = Intent(mainApp, ErrorHelperActivity::class.java)
+                            val i = Intent(ctx, ErrorHelperActivity::class.java)
                             i.putExtra("soundid", R.raw.boluserror)
                             i.putExtra("status", result.comment)
                             i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror))
                             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            mainApp.startActivity(i)
+                            ctx.startActivity(i)
                         }
                     }
                 })
@@ -141,7 +142,7 @@ class ActionsFragment : DaggerFragment() {
         }
         actions_fill.setOnClickListener {
             activity?.let { activity ->
-                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { FillDialog().show(childFragmentManager, "FillDialog") }))
+                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { FillDialog().show(childFragmentManager, "FillDialog") })
             }
         }
         actions_historybrowser.setOnClickListener { startActivity(Intent(context, HistoryBrowseActivity::class.java)) }

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt

@@ -15,8 +15,8 @@ import androidx.annotation.DrawableRes
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.AutomationEventItemBinding
 import info.nightscout.androidaps.databinding.AutomationFragmentBinding
@@ -46,7 +46,7 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var automationPlugin: AutomationPlugin
-    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var injector: HasAndroidInjector
 
     private var disposable: CompositeDisposable = CompositeDisposable()
     private lateinit var eventListAdapter: EventListAdapter
@@ -76,7 +76,7 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
         binding.fabAddEvent.setOnClickListener {
             val dialog = EditEventDialog()
             val args = Bundle()
-            args.putString("event", AutomationEvent(mainApp).toJSON())
+            args.putString("event", AutomationEvent(injector).toJSON())
             args.putInt("position", -1) // New event
             dialog.arguments = args
             dialog.show(childFragmentManager, "EditEventDialog")
@@ -112,6 +112,7 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
         disposable.clear()
     }
 
+    @Synchronized
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
@@ -119,6 +120,7 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
 
     @Synchronized
     private fun updateGui() {
+        if (_binding == null) return
         eventListAdapter.notifyDataSetChanged()
         val sb = StringBuilder()
         for (l in automationPlugin.executionLog.reversed())
@@ -159,7 +161,7 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
 
         @SuppressLint("ClickableViewAccessibility")
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-            val event = automationPlugin.automationEvents[position]
+            val event = automationPlugin.at(position)
             holder.binding.eventTitle.text = event.title
             holder.binding.enabled.isChecked = event.isEnabled
             holder.binding.enabled.isEnabled = !event.readOnly
@@ -190,15 +192,14 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
                 rxBus.send(EventAutomationDataChanged())
             }
             // edit event
-            if (!event.readOnly)
-                holder.binding.rootLayout.setOnClickListener {
-                    val dialog = EditEventDialog()
-                    val args = Bundle()
-                    args.putString("event", event.toJSON())
-                    args.putInt("position", position)
-                    dialog.arguments = args
-                    dialog.show(childFragmentManager, "EditEventDialog")
-                }
+            holder.binding.rootLayout.setOnClickListener {
+                val dialog = EditEventDialog()
+                val args = Bundle()
+                args.putString("event", event.toJSON())
+                args.putInt("position", position)
+                dialog.arguments = args
+                dialog.show(childFragmentManager, "EditEventDialog")
+            }
             // Start a drag whenever the handle view it touched
             holder.binding.iconSort.setOnTouchListener { v: View, motionEvent: MotionEvent ->
                 if (motionEvent.action == MotionEvent.ACTION_DOWN) {
@@ -209,36 +210,33 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
             }
             // remove event
             holder.binding.iconTrash.setOnClickListener {
-                showConfirmation(requireContext(), resourceHelper.gs(R.string.removerecord) + " " + automationPlugin.automationEvents[position].title,
+                showConfirmation(requireContext(), resourceHelper.gs(R.string.removerecord) + " " + automationPlugin.at(position).title,
                     Runnable {
-                        automationPlugin.automationEvents.removeAt(position)
+                        automationPlugin.removeAt(position)
                         notifyItemRemoved(position)
-                        rxBus.send(EventAutomationDataChanged())
-                        rxBus.send(EventAutomationUpdateGui())
                     }, Runnable {
                     rxBus.send(EventAutomationUpdateGui())
                 })
             }
             holder.binding.iconTrash.visibility = (!event.readOnly).toVisibility()
+            holder.binding.aapsLogo.visibility = (event.systemAction).toVisibility()
         }
 
-        override fun getItemCount(): Int = automationPlugin.automationEvents.size
+        override fun getItemCount(): Int = automationPlugin.size()
 
         override fun onItemMove(fromPosition: Int, toPosition: Int): Boolean {
-            Collections.swap(automationPlugin.automationEvents, fromPosition, toPosition)
+            automationPlugin.swap(fromPosition, toPosition)
             notifyItemMoved(fromPosition, toPosition)
-            rxBus.send(EventAutomationDataChanged())
             return true
         }
 
         override fun onItemDismiss(position: Int) {
             activity?.let { activity ->
-                showConfirmation(activity, resourceHelper.gs(R.string.removerecord) + " " + automationPlugin.automationEvents[position].title,
+                showConfirmation(activity, resourceHelper.gs(R.string.removerecord) + " " + automationPlugin.at(position).title,
                     Runnable {
-                        automationPlugin.automationEvents.removeAt(position)
+                        automationPlugin.removeAt(position)
                         notifyItemRemoved(position)
                         rxBus.send(EventAutomationDataChanged())
-                        rxBus.send(EventAutomationUpdateGui())
                     }, Runnable { rxBus.send(EventAutomationUpdateGui()) })
             }
         }

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt

@@ -39,8 +39,10 @@ import io.reactivex.schedulers.Schedulers
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
+import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.collections.ArrayList
 
 @Singleton
 class AutomationPlugin @Inject constructor(
@@ -69,7 +71,7 @@ class AutomationPlugin @Inject constructor(
 
     private val keyAutomationEvents = "AUTOMATION_EVENTS"
 
-    val automationEvents = ArrayList<AutomationEvent>()
+    private val automationEvents = ArrayList<AutomationEvent>()
     var executionLog: MutableList<String> = ArrayList()
     var btConnects: MutableList<EventBTChange> = ArrayList()
 
@@ -77,6 +79,7 @@ class AutomationPlugin @Inject constructor(
     private lateinit var refreshLoop: Runnable
 
     companion object {
+
         const val event = "{\"title\":\"Low\",\"enabled\":true,\"trigger\":\"{\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\\\",\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[\\\"{\\\\\\\"type\\\\\\\":\\\\\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBg\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"bg\\\\\\\":4,\\\\\\\"comparator\\\\\\\":\\\\\\\"IS_LESSER\\\\\\\",\\\\\\\"units\\\\\\\":\\\\\\\"mmol\\\\\\\"}}\\\",\\\"{\\\\\\\"type\\\\\\\":\\\\\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDelta\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"value\\\\\\\":-0.1,\\\\\\\"units\\\\\\\":\\\\\\\"mmol\\\\\\\",\\\\\\\"deltaType\\\\\\\":\\\\\\\"DELTA\\\\\\\",\\\\\\\"comparator\\\\\\\":\\\\\\\"IS_LESSER\\\\\\\"}}\\\"]}}\",\"actions\":[\"{\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.actions.ActionStartTempTarget\\\",\\\"data\\\":{\\\"value\\\":8,\\\"units\\\":\\\"mmol\\\",\\\"durationInMinutes\\\":60}}\"]}"
     }
 
@@ -184,42 +187,46 @@ class AutomationPlugin @Inject constructor(
 
     @Synchronized
     private fun processActions() {
+        var userEventsEnabled = true
         if (loopPlugin.isSuspended || !loopPlugin.isEnabled()) {
             aapsLogger.debug(LTag.AUTOMATION, "Loop deactivated")
             executionLog.add(resourceHelper.gs(R.string.smscommunicator_loopisdisabled))
-            return
+            userEventsEnabled = false
         }
         val enabled = constraintChecker.isAutomationEnabled()
         if (!enabled.value()) {
             executionLog.add(enabled.getMostLimitedReasons(aapsLogger))
-            return
+            userEventsEnabled = false
         }
 
         aapsLogger.debug(LTag.AUTOMATION, "processActions")
         for (event in automationEvents) {
             if (event.isEnabled && event.shouldRun() && event.trigger.shouldRun() && event.getPreconditions().shouldRun()) {
-                val actions = event.actions
-                for (action in actions) {
-                    action.doAction(object : Callback() {
-                        override fun run() {
-                            val sb = StringBuilder()
-                            sb.append(dateUtil.timeString(DateUtil.now()))
-                            sb.append(" ")
-                            sb.append(if (result.success) "☺" else "▼")
-                            sb.append(" <b>")
-                            sb.append(event.title)
-                            sb.append(":</b> ")
-                            sb.append(action.shortDescription())
-                            sb.append(": ")
-                            sb.append(result.comment)
-                            executionLog.add(sb.toString())
-                            aapsLogger.debug(LTag.AUTOMATION, "Executed: $sb")
-                            rxBus.send(EventAutomationUpdateGui())
-                        }
-                    })
+                if (event.systemAction || userEventsEnabled) {
+                    val actions = event.actions
+                    for (action in actions) {
+                        action.doAction(object : Callback() {
+                            override fun run() {
+                                val sb = StringBuilder()
+                                sb.append(dateUtil.timeString(DateUtil.now()))
+                                sb.append(" ")
+                                sb.append(if (result.success) "☺" else "▼")
+                                sb.append(" <b>")
+                                sb.append(event.title)
+                                sb.append(":</b> ")
+                                sb.append(action.shortDescription())
+                                sb.append(": ")
+                                sb.append(result.comment)
+                                executionLog.add(sb.toString())
+                                aapsLogger.debug(LTag.AUTOMATION, "Executed: $sb")
+                                rxBus.send(EventAutomationUpdateGui())
+                            }
+                        })
+                    }
+                    SystemClock.sleep(1100)
+                    event.lastRun = DateUtil.now()
+                    if (event.autoRemove) automationEvents.remove(event)
                 }
-                SystemClock.sleep(1100)
-                event.lastRun = DateUtil.now()
             }
         }
         // we cannot detect connected BT devices
@@ -231,6 +238,38 @@ class AutomationPlugin @Inject constructor(
         storeToSP() // save last run time
     }
 
+    fun add(event: AutomationEvent) {
+        automationEvents.add(event)
+        rxBus.send(EventAutomationDataChanged())
+    }
+
+    fun addIfNotExists(event: AutomationEvent) {
+        for (e in automationEvents) {
+            if (event.title == e.title) return
+        }
+        automationEvents.add(event)
+        rxBus.send(EventAutomationDataChanged())
+    }
+
+    fun set(event: AutomationEvent, index: Int) {
+        automationEvents[index] = event
+        rxBus.send(EventAutomationDataChanged())
+    }
+
+    fun removeAt(index: Int) {
+        automationEvents.removeAt(index)
+        rxBus.send(EventAutomationDataChanged())
+    }
+
+    fun at(index: Int) = automationEvents[index]
+
+    fun size() = automationEvents.size
+
+    fun swap(fromPosition: Int, toPosition: Int) {
+        Collections.swap(automationEvents, fromPosition, toPosition)
+        rxBus.send(EventAutomationDataChanged())
+    }
+
     fun getActionDummyObjects(): List<Action> {
         return listOf(
             //ActionLoopDisable(injector),

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarm.kt

@@ -33,6 +33,9 @@ class ActionAlarm(injector: HasAndroidInjector) : Action(injector) {
 
     var text = InputString(injector)
 
+    constructor(injector: HasAndroidInjector, text: String) : this(injector) {
+        this.text = InputString(injector, text)
+    }
     override fun friendlyName(): Int = R.string.alarm
     override fun shortDescription(): String = resourceHelper.gs(R.string.alarm_message, text.value)
     @DrawableRes override fun icon(): Int = R.drawable.ic_access_alarm_24dp

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt

@@ -26,6 +26,7 @@ import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerCon
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.extensions.toVisibility
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import javax.inject.Inject
@@ -66,9 +67,13 @@ class EditEventDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        binding.okcancel.ok.visibility = (!event.readOnly).toVisibility()
+
         binding.inputEventTitle.setText(event.title)
+        binding.inputEventTitle.isFocusable = !event.readOnly
         binding.triggerDescription.text = event.trigger.friendlyDescription()
 
+        binding.editTrigger.visibility = (!event.readOnly).toVisibility()
         binding.editTrigger.setOnClickListener {
             val args = Bundle()
             args.putString("trigger", event.trigger.toJSON())
@@ -82,6 +87,7 @@ class EditEventDialog : DialogFragmentWithDate() {
         binding.actionListView.layoutManager = LinearLayoutManager(context)
         binding.actionListView.adapter = actionListAdapter
 
+        binding.addAction.visibility = (!event.readOnly).toVisibility()
         binding.addAction.setOnClickListener { ChooseActionDialog().show(childFragmentManager, "ChooseActionDialog") }
 
         showPreconditions()
@@ -92,31 +98,28 @@ class EditEventDialog : DialogFragmentWithDate() {
             .subscribe({
                 actionListAdapter?.notifyDataSetChanged()
                 showPreconditions()
-            }, { fabricPrivacy.logException(it) }
-            )
+            }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventAutomationAddAction::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
                 event.addAction(it.action)
                 actionListAdapter?.notifyDataSetChanged()
-            }, { fabricPrivacy.logException(it) }
-            )
+            }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventAutomationUpdateTrigger::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
                 event.trigger = it.trigger
                 binding.triggerDescription.text = event.trigger.friendlyDescription()
-            }, { fabricPrivacy.logException(it) }
-            )
+            }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventAutomationUpdateAction::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
                 event.actions[it.position] = it.action
                 actionListAdapter?.notifyDataSetChanged()
-            }, { fabricPrivacy.logException(it) })
+            }, fabricPrivacy::logException)
     }
 
     override fun submit(): Boolean {
@@ -140,9 +143,9 @@ class EditEventDialog : DialogFragmentWithDate() {
         }
         // store
         if (position == -1)
-            automationPlugin.automationEvents.add(event)
+            automationPlugin.add(event)
         else
-            automationPlugin.automationEvents[position] = event
+            automationPlugin.set(event, position)
 
         rxBus.send(EventAutomationDataChanged())
         return true
@@ -189,20 +192,24 @@ class EditEventDialog : DialogFragmentWithDate() {
         inner class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
 
             fun bind(action: Action, recyclerView: RecyclerView.Adapter<ViewHolder>, position: Int) {
-                view.findViewById<LinearLayout>(R.id.automation_layoutText).setOnClickListener {
-                    if (action.hasDialog()) {
-                        val args = Bundle()
-                        args.putInt("actionPosition", position)
-                        args.putString("action", action.toJSON())
-                        val dialog = EditActionDialog()
-                        dialog.arguments = args
-                        dialog.show(childFragmentManager, "EditActionDialog")
+                if (!event.readOnly)
+                    view.findViewById<LinearLayout>(R.id.automation_layoutText).setOnClickListener {
+                        if (action.hasDialog()) {
+                            val args = Bundle()
+                            args.putInt("actionPosition", position)
+                            args.putString("action", action.toJSON())
+                            val dialog = EditActionDialog()
+                            dialog.arguments = args
+                            dialog.show(childFragmentManager, "EditActionDialog")
+                        }
+                    }
+                view.findViewById<ImageView>(R.id.automation_iconTrash).run {
+                    visibility = (!event.readOnly).toVisibility()
+                    setOnClickListener {
+                        event.actions.remove(action)
+                        recyclerView.notifyDataSetChanged()
+                        rxBus.send(EventAutomationUpdateGui())
                     }
-                }
-                view.findViewById<ImageView>(R.id.automation_iconTrash).setOnClickListener {
-                    event.actions.remove(action)
-                    recyclerView.notifyDataSetChanged()
-                    rxBus.send(EventAutomationUpdateGui())
                 }
                 view.findViewById<ImageView>(R.id.automation_action_image).setImageResource(action.icon())
                 view.findViewById<TextView>(R.id.automation_viewActionTitle).text = action.shortDescription()

app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt

@@ -35,6 +35,12 @@ class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
         else InputDelta(injector, 0.0, (-MGDL_MAX), MGDL_MAX, 1.0, DecimalFormat("1"), DeltaType.DELTA)
     }
 
+    constructor(injector: HasAndroidInjector, inputDelta: InputDelta, units: String, comparator: Comparator.Compare) : this(injector) {
+        this.units = units
+        this.delta = inputDelta
+        this.comparator.value = comparator
+    }
+
     private constructor(injector: HasAndroidInjector, triggerDelta: TriggerDelta) : this(injector) {
         units = triggerDelta.units
         delta = InputDelta(injector, triggerDelta.delta)

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt

@@ -123,7 +123,7 @@ class ImportExportPrefs @Inject constructor(
     }
 
     private fun prefsEncryptionIsDisabled() =
-        buildHelper.isEngineeringMode() && !sp.getBoolean(resourceHelper.gs(R.string.key_maintenance_encrypt_exported_prefs), true)
+        buildHelper.isEngineeringMode() && !sp.getBoolean(R.string.key_maintenance_encrypt_exported_prefs, true)
 
     private fun askForMasterPass(activity: FragmentActivity, @StringRes canceledMsg: Int, then: ((password: String) -> Unit)) {
         passwordCheck.queryPassword(activity, R.string.master_password, R.string.key_master_password, { password ->

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt

@@ -11,10 +11,7 @@ import android.graphics.drawable.AnimationDrawable
 import android.os.Bundle
 import android.os.Handler
 import android.util.DisplayMetrics
-import android.view.ContextMenu
-import android.view.ContextMenu.ContextMenuInfo
 import android.view.LayoutInflater
-import android.view.MenuItem
 import android.view.View
 import android.view.View.OnLongClickListener
 import android.view.ViewGroup
@@ -31,11 +28,7 @@ import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.dialogs.CalibrationDialog
-import info.nightscout.androidaps.dialogs.CarbsDialog
-import info.nightscout.androidaps.dialogs.InsulinDialog
-import info.nightscout.androidaps.dialogs.TreatmentDialog
-import info.nightscout.androidaps.dialogs.WizardDialog
+import info.nightscout.androidaps.dialogs.*
 import info.nightscout.androidaps.events.*
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -184,9 +177,13 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             sp.putBoolean(R.string.key_objectiveusescale, true)
             false
         }
+        prepareGraphsIfNeeded(overviewMenus.setting.size)
         overviewMenus.setupChartMenu(overview_chartMenuButton)
-        prepareGraphs()
 
+        overview_activeprofile?.setOnClickListener(this)
+        overview_activeprofile?.setOnLongClickListener(this)
+        overview_temptarget?.setOnClickListener(this)
+        overview_temptarget?.setOnLongClickListener(this)
         overview_accepttempbutton?.setOnClickListener(this)
         overview_treatmentbutton?.setOnClickListener(this)
         overview_wizardbutton?.setOnClickListener(this)
@@ -196,15 +193,15 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         overview_carbsbutton?.setOnClickListener(this)
         overview_quickwizardbutton?.setOnClickListener(this)
         overview_quickwizardbutton?.setOnLongClickListener(this)
+        overview_apsmode?.setOnClickListener(this)
+        overview_apsmode?.setOnLongClickListener(this)
+        overview_activeprofile?.setOnLongClickListener(this)
     }
 
     override fun onPause() {
         super.onPause()
         disposable.clear()
         loopHandler.removeCallbacksAndMessages(null)
-        overview_apsmode_llayout?.let { unregisterForContextMenu(it) }
-        overview_activeprofile?.let { unregisterForContextMenu(it) }
-        overview_temptarget?.let { unregisterForContextMenu(it) }
     }
 
     override fun onResume() {
@@ -213,7 +210,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             .toObservable(EventRefreshOverview::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
-                prepareGraphs()
                 if (it.now) updateGUI(it.from)
                 else scheduleUpdateGUI(it.from)
             }) { fabricPrivacy.logException(it) })
@@ -276,21 +272,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
         loopHandler.postDelayed(refreshLoop, 60 * 1000L)
 
-        overview_apsmode_llayout?.let { registerForContextMenu(overview_apsmode) }
-        overview_activeprofile?.let { registerForContextMenu(it) }
-        overview_temptarget?.let { registerForContextMenu(it) }
         updateGUI("onResume")
     }
 
-    override fun onCreateContextMenu(menu: ContextMenu, v: View, menuInfo: ContextMenuInfo?) {
-        super.onCreateContextMenu(menu, v, menuInfo)
-        overviewMenus.createContextMenu(menu, v)
-    }
-
-    override fun onContextItemSelected(item: MenuItem): Boolean {
-        return if (overviewMenus.onContextItemSelected(item, childFragmentManager)) true else super.onContextItemSelected(item)
-    }
-
     override fun onClick(v: View) {
         // try to fix  https://fabric.io/nightscout3/android/apps/info.nightscout.androidaps/issues/5aca7a1536c7b23527eb4be7?time=last-seven-days
         // https://stackoverflow.com/questions/14860239/checking-if-state-is-saved-before-committing-a-fragmenttransaction
@@ -302,6 +286,16 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 R.id.overview_insulinbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { InsulinDialog().show(childFragmentManager, "Overview") })
                 R.id.overview_quickwizardbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { onClickQuickWizard() })
                 R.id.overview_carbsbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { CarbsDialog().show(childFragmentManager, "Overview") })
+                R.id.overview_temptarget -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { TempTargetDialog().show(childFragmentManager, "Overview") })
+
+                R.id.overview_activeprofile -> {
+                    ProfileViewerDialog().also { pvd ->
+                        pvd.arguments = Bundle().also {
+                            it.putLong("time", DateUtil.now())
+                            it.putInt("mode", ProfileViewerDialog.Mode.RUNNING_PROFILE.ordinal)
+                        }
+                    }.show(childFragmentManager, "ProfileViewDialog")
+                }
 
                 R.id.overview_cgmbutton -> {
                     if (xdripPlugin.isEnabled(PluginType.BGSOURCE))
@@ -335,17 +329,27 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                         val lastRun = loopPlugin.lastRun
                         loopPlugin.invoke("Accept temp button", false)
                         if (lastRun?.lastAPSRun != null && lastRun.constraintsProcessed?.isChangeRequested == true) {
-                            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.tempbasal_label), lastRun.constraintsProcessed?.toSpanned()
-                                ?: "".toSpanned(), {
-                                aapsLogger.debug("USER ENTRY: ACCEPT TEMP BASAL")
-                                overview_accepttempbutton?.visibility = View.GONE
-                                (context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(Constants.notificationID)
-                                actionStringHandler.handleInitiate("cancelChangeRequest")
-                                loopPlugin.acceptChangeRequest()
+                            protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable {
+                                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.tempbasal_label), lastRun.constraintsProcessed?.toSpanned()
+                                    ?: "".toSpanned(), {
+                                    aapsLogger.debug("USER ENTRY: ACCEPT TEMP BASAL")
+                                    overview_accepttempbutton?.visibility = View.GONE
+                                    (context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(Constants.notificationID)
+                                    actionStringHandler.handleInitiate("cancelChangeRequest")
+                                    loopPlugin.acceptChangeRequest()
+                                })
                             })
                         }
                     }
                 }
+
+                R.id.overview_apsmode -> {
+                    protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable {
+                        LoopDialog().also { dialog ->
+                            dialog.arguments = Bundle().also { it.putInt("showOkCancel", 1) }
+                        }.show(childFragmentManager, "Overview")
+                    })
+                }
             }
         }
     }
@@ -370,6 +374,20 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 startActivity(Intent(v.context, QuickWizardListActivity::class.java))
                 return true
             }
+
+            R.id.overview_apsmode -> {
+                activity?.let { activity ->
+                    protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable {
+                        LoopDialog().also { dialog ->
+                            dialog.arguments = Bundle().also { it.putInt("showOkCancel", 0) }
+                        }.show(childFragmentManager, "Overview")
+                    })
+                }
+            }
+
+            R.id.overview_temptarget -> v.performClick()
+            R.id.overview_activeprofile -> activity?.let { activity -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { ProfileSwitchDialog().show(childFragmentManager, "Overview") }) }
+
         }
         return false
     }
@@ -456,10 +474,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
     }
 
-    private fun prepareGraphs() {
+    private fun prepareGraphsIfNeeded(numOfGraphs: Int) {
         synchronized(graphLock) {
-            val numOfGraphs = overviewMenus.setting.size
-
             if (numOfGraphs != secondaryGraphs.size - 1) {
                 //aapsLogger.debug("New secondary graph count ${numOfGraphs-1}")
                 // rebuild needed
@@ -785,6 +801,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     private fun updateGraph(lastRun: LoopInterface.LastRun?, predictionsAvailable: Boolean, lowLine: Double, highLine: Double, pump: PumpInterface, profile: Profile) {
         viewLifecycleOwner.lifecycleScope.launch(Dispatchers.Main) {
             overview_bggraph ?: return@launch
+            val menuChartSettings = overviewMenus.setting
+            prepareGraphsIfNeeded(menuChartSettings.size)
             val graphData = GraphData(injector, overview_bggraph, iobCobCalculatorPlugin, treatmentsPlugin)
             val secondaryGraphsData: ArrayList<GraphData> = ArrayList()
 
@@ -802,7 +820,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 val fromTime: Long
                 val endTime: Long
                 val apsResult = if (config.APS) lastRun?.constraintsProcessed else NSDeviceStatus.getAPSResult(injector)
-                if (predictionsAvailable && apsResult != null && overviewMenus.setting[0][OverviewMenus.CharType.PRE.ordinal]) {
+                if (predictionsAvailable && apsResult != null && menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal]) {
                     var predictionHours = (ceil(apsResult.latestPredictionsTime - System.currentTimeMillis().toDouble()) / (60 * 60 * 1000)).toInt()
                     predictionHours = min(2, predictionHours)
                     predictionHours = max(0, predictionHours)
@@ -824,7 +842,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 graphData.addInRangeArea(fromTime, endTime, lowLine, highLine)
 
                 // **** BG ****
-                if (predictionsAvailable && overviewMenus.setting[0][OverviewMenus.CharType.PRE.ordinal])
+                if (predictionsAvailable && menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal])
                     graphData.addBgReadings(fromTime, toTime, lowLine, highLine, apsResult?.predictions)
                 else graphData.addBgReadings(fromTime, toTime, lowLine, highLine, null)
 
@@ -833,11 +851,11 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
                 // Treatments
                 graphData.addTreatments(fromTime, endTime)
-                if (overviewMenus.setting[0][OverviewMenus.CharType.ACT.ordinal])
+                if (menuChartSettings[0][OverviewMenus.CharType.ACT.ordinal])
                     graphData.addActivity(fromTime, endTime, false, 0.8)
 
                 // add basal data
-                if (pump.pumpDescription.isTempBasalCapable && overviewMenus.setting[0][OverviewMenus.CharType.BAS.ordinal])
+                if (pump.pumpDescription.isTempBasalCapable && menuChartSettings[0][OverviewMenus.CharType.BAS.ordinal])
                     graphData.addBasals(fromTime, now, lowLine / graphData.maxY / 1.2)
 
                 // add target line
@@ -848,7 +866,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
                 // ------------------ 2nd graph
                 synchronized(graphLock) {
-                    for (g in 0 until min(secondaryGraphs.size, overviewMenus.setting.size + 1)) {
+                    for (g in 0 until min(secondaryGraphs.size, menuChartSettings.size + 1)) {
                         val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobCalculatorPlugin, treatmentsPlugin)
                         var useABSForScale = false
                         var useIobForScale = false
@@ -858,22 +876,22 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                         var useDSForScale = false
                         var useIAForScale = false
                         when {
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]      -> useABSForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]      -> useIobForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]      -> useCobForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]      -> useDevForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]      -> useRatioForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]      -> useIAForScale = true
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]      -> useABSForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]      -> useIobForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]      -> useCobForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]      -> useDevForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]      -> useRatioForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.ACT.ordinal]      -> useIAForScale = true
+                            menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true
                         }
 
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, now, useABSForScale, 1.0)
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, now, useIobForScale, 1.0, overviewMenus.setting[g + 1][OverviewMenus.CharType.PRE.ordinal])
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, now, useCobForScale, if (useCobForScale) 1.0 else 0.5)
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, now, useDevForScale, 1.0)
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, now, useRatioForScale, 1.0)
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]) secondGraphData.addActivity(fromTime, endTime, useIAForScale, 0.8)
-                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, now, useDSForScale, 1.0)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, now, useABSForScale, 1.0)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, now, useIobForScale, 1.0, menuChartSettings[g + 1][OverviewMenus.CharType.PRE.ordinal])
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, now, useCobForScale, if (useCobForScale) 1.0 else 0.5)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, now, useDevForScale, 1.0)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, now, useRatioForScale, 1.0)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.ACT.ordinal]) secondGraphData.addActivity(fromTime, endTime, useIAForScale, 0.8)
+                        if (menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, now, useDSForScale, 1.0)
 
                         // set manual x bounds to have nice steps
                         secondGraphData.formatAxis(fromTime, endTime)
@@ -885,16 +903,16 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             // finally enforce drawing of graphs in UI thread
             graphData.performUpdate()
             synchronized(graphLock) {
-                for (g in 0 until min(secondaryGraphs.size, overviewMenus.setting.size + 1)) {
+                for (g in 0 until min(secondaryGraphs.size, menuChartSettings.size + 1)) {
                     secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
                     secondaryGraphs[g].visibility = (
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal] ||
-                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
+                        menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.ACT.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
                         ).toVisibility()
                     secondaryGraphsData[g].performUpdate()
                 }

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt

@@ -1,43 +1,20 @@
 package info.nightscout.androidaps.plugins.general.overview
 
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
 import android.text.SpannableString
 import android.text.style.ForegroundColorSpan
-import android.view.ContextMenu
 import android.view.Menu
-import android.view.MenuItem
 import android.view.View
 import android.widget.ImageButton
 import androidx.annotation.ColorRes
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.PopupMenu
-import androidx.fragment.app.FragmentManager
 import com.google.gson.Gson
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.activities.ErrorHelperActivity
-import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.db.Source
-import info.nightscout.androidaps.db.TempTarget
-import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
-import info.nightscout.androidaps.dialogs.ProfileViewerDialog
-import info.nightscout.androidaps.dialogs.TempTargetDialog
 import info.nightscout.androidaps.events.EventRefreshOverview
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.queue.Callback
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -50,13 +27,7 @@ class OverviewMenus @Inject constructor(
     private val resourceHelper: ResourceHelper,
     private val sp: SP,
     private val rxBus: RxBusWrapper,
-    private val context: Context,
     private val buildHelper: BuildHelper,
-    private val defaultValueHelper: DefaultValueHelper,
-    private val activePlugin: ActivePluginProvider,
-    private val profileFunction: ProfileFunction,
-    private val commandQueue: CommandQueueProvider,
-    private val configBuilderPlugin: ConfigBuilderPlugin,
     private val loopPlugin: LoopPlugin,
     private val config: Config
 ) {
@@ -79,17 +50,22 @@ class OverviewMenus @Inject constructor(
 
     fun enabledTypes(graph: Int): String {
         val r = StringBuilder()
-        for (type in CharType.values()) if (setting[graph][type.ordinal]) {
+        for (type in CharType.values()) if (_setting[graph][type.ordinal]) {
             r.append(resourceHelper.gs(type.shortnameId))
             r.append(" ")
         }
         return r.toString()
     }
 
-    var setting: MutableList<Array<Boolean>> = ArrayList()
+
+
+    private var _setting: MutableList<Array<Boolean>> = ArrayList()
+
+    val setting: List<Array<Boolean>>
+     get() = _setting.toMutableList() // implicitly does a list copy
 
     private fun storeGraphConfig() {
-        val sts = Gson().toJson(setting)
+        val sts = Gson().toJson(_setting)
         sp.putString(R.string.key_graphconfig, sts)
         aapsLogger.debug(sts)
     }
@@ -97,22 +73,22 @@ class OverviewMenus @Inject constructor(
     private fun loadGraphConfig() {
         val sts = sp.getString(R.string.key_graphconfig, "")
         if (sts.isNotEmpty()) {
-            setting = Gson().fromJson(sts, Array<Array<Boolean>>::class.java).toMutableList()
+            _setting = Gson().fromJson(sts, Array<Array<Boolean>>::class.java).toMutableList()
             // reset when new CharType added
-            for (s in setting)
+            for (s in _setting)
                 if (s.size != CharType.values().size) {
-                    setting = ArrayList()
-                    setting.add(Array(CharType.values().size) { true })
+                    _setting = ArrayList()
+                    _setting.add(Array(CharType.values().size) { true })
                 }
         } else {
-            setting = ArrayList()
-            setting.add(Array(CharType.values().size) { true })
+            _setting = ArrayList()
+            _setting.add(Array(CharType.values().size) { true })
         }
     }
 
     fun setupChartMenu(chartButton: ImageButton) {
         loadGraphConfig()
-        val numOfGraphs = setting.size // 1 main + x secondary
+        val numOfGraphs = _setting.size // 1 main + x secondary
 
         chartButton.setOnClickListener { v: View ->
             val predictionsAvailable: Boolean = when {
@@ -141,7 +117,7 @@ class OverviewMenus @Inject constructor(
                         s.setSpan(ForegroundColorSpan(resourceHelper.gc(m.colorId)), 0, s.length, 0)
                         item.title = s
                         item.isCheckable = true
-                        item.isChecked = setting[g][m.ordinal]
+                        item.isChecked = _setting[g][m.ordinal]
                     }
                 }
             }
@@ -155,14 +131,14 @@ class OverviewMenus @Inject constructor(
                 // id < 100 graph header - divider 1, 2, 3 .....
                 if (it.itemId == numOfGraphs) {
                     // add new empty
-                    setting.add(Array(CharType.values().size) { false })
+                    _setting.add(Array(CharType.values().size) { false })
                 } else if (it.itemId < 100) {
                     // remove graph
-                    setting.removeAt(it.itemId)
+                    _setting.removeAt(it.itemId)
                 } else {
                     val graphNumber = it.itemId / 100 - 1
                     val item = it.itemId % 100
-                    setting[graphNumber][item] = !it.isChecked
+                    _setting[graphNumber][item] = !it.isChecked
                 }
                 storeGraphConfig()
                 setupChartMenu(chartButton)
@@ -175,247 +151,4 @@ class OverviewMenus @Inject constructor(
         }
     }
 
-    fun createContextMenu(menu: ContextMenu, v: View) {
-        when (v.id) {
-            R.id.overview_apsmode       -> {
-                val pumpDescription: PumpDescription = activePlugin.activePump.pumpDescription
-                if (!profileFunction.isProfileValid("ContextMenuCreation")) return
-                menu.setHeaderTitle(resourceHelper.gs(R.string.loop))
-                if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                    menu.add(resourceHelper.gs(R.string.disableloop))
-                    if (!loopPlugin.isSuspended) {
-                        menu.add(resourceHelper.gs(R.string.suspendloopfor1h))
-                        menu.add(resourceHelper.gs(R.string.suspendloopfor2h))
-                        menu.add(resourceHelper.gs(R.string.suspendloopfor3h))
-                        menu.add(resourceHelper.gs(R.string.suspendloopfor10h))
-                    } else {
-                        if (!loopPlugin.isDisconnected) {
-                            menu.add(resourceHelper.gs(R.string.resume))
-                        }
-                    }
-                }
-                if (!loopPlugin.isEnabled(PluginType.LOOP)) {
-                    menu.add(resourceHelper.gs(R.string.enableloop))
-                }
-                if (!loopPlugin.isDisconnected) {
-                    showSuspendPump(menu, pumpDescription)
-                } else {
-                    menu.add(resourceHelper.gs(R.string.reconnect))
-                }
-            }
-
-            R.id.overview_activeprofile -> {
-                menu.setHeaderTitle(resourceHelper.gs(R.string.profile))
-                menu.add(resourceHelper.gs(R.string.viewprofile))
-                if (activePlugin.activeProfileInterface.profile != null) {
-                    menu.add(resourceHelper.gs(R.string.careportal_profileswitch))
-                }
-            }
-
-            R.id.overview_temptarget    -> {
-                menu.setHeaderTitle(resourceHelper.gs(R.string.careportal_temporarytarget))
-                menu.add(resourceHelper.gs(R.string.custom))
-                menu.add(resourceHelper.gs(R.string.eatingsoon))
-                menu.add(resourceHelper.gs(R.string.activity))
-                menu.add(resourceHelper.gs(R.string.hypo))
-                if (activePlugin.activeTreatments.tempTargetFromHistory != null) {
-                    menu.add(resourceHelper.gs(R.string.cancel))
-                }
-            }
-        }
-    }
-
-    private fun showSuspendPump(menu: ContextMenu, pumpDescription: PumpDescription) {
-        if (pumpDescription.tempDurationStep15mAllowed) menu.add(resourceHelper.gs(R.string.disconnectpumpfor15m))
-        if (pumpDescription.tempDurationStep30mAllowed) menu.add(resourceHelper.gs(R.string.disconnectpumpfor30m))
-        menu.add(resourceHelper.gs(R.string.disconnectpumpfor1h))
-        menu.add(resourceHelper.gs(R.string.disconnectpumpfor2h))
-        menu.add(resourceHelper.gs(R.string.disconnectpumpfor3h))
-    }
-
-    fun onContextItemSelected(item: MenuItem, manager: FragmentManager): Boolean {
-        val profile = profileFunction.getProfile() ?: return true
-        when (item.title) {
-            resourceHelper.gs(R.string.disableloop)                                   -> {
-                aapsLogger.debug("USER ENTRY: LOOP DISABLED")
-                loopPlugin.setPluginEnabled(PluginType.LOOP, false)
-                loopPlugin.setFragmentVisible(PluginType.LOOP, false)
-                configBuilderPlugin.storeSettings("DisablingLoop")
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                commandQueue.cancelTempBasal(true, object : Callback() {
-                    override fun run() {
-                        if (!result.success) {
-                            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.tempbasaldeliveryerror))
-                        }
-                    }
-                })
-                loopPlugin.createOfflineEvent(24 * 60) // upload 24h, we don't know real duration
-                return true
-            }
-
-            resourceHelper.gs(R.string.enableloop)                                    -> {
-                aapsLogger.debug("USER ENTRY: LOOP ENABLED")
-                loopPlugin.setPluginEnabled(PluginType.LOOP, true)
-                loopPlugin.setFragmentVisible(PluginType.LOOP, true)
-                configBuilderPlugin.storeSettings("EnablingLoop")
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                loopPlugin.createOfflineEvent(0)
-                return true
-            }
-
-            resourceHelper.gs(R.string.resume), resourceHelper.gs(R.string.reconnect) -> {
-                aapsLogger.debug("USER ENTRY: RESUME")
-                loopPlugin.suspendTo(0L)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                commandQueue.cancelTempBasal(true, object : Callback() {
-                    override fun run() {
-                        if (!result.success) {
-                            val i = Intent(context, ErrorHelperActivity::class.java)
-                            i.putExtra("soundid", R.raw.boluserror)
-                            i.putExtra("status", result.comment)
-                            i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror))
-                            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            context.startActivity(i)
-                        }
-                    }
-                })
-                sp.putBoolean(R.string.key_objectiveusereconnect, true)
-                loopPlugin.createOfflineEvent(0)
-                return true
-            }
-
-            resourceHelper.gs(R.string.suspendloopfor1h)                              -> {
-                aapsLogger.debug("USER ENTRY: SUSPEND 1h")
-                loopPlugin.suspendLoop(60)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                return true
-            }
-
-            resourceHelper.gs(R.string.suspendloopfor2h)                              -> {
-                aapsLogger.debug("USER ENTRY: SUSPEND 2h")
-                loopPlugin.suspendLoop(120)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                return true
-            }
-
-            resourceHelper.gs(R.string.suspendloopfor3h)                              -> {
-                aapsLogger.debug("USER ENTRY: SUSPEND 3h")
-                loopPlugin.suspendLoop(180)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                return true
-            }
-
-            resourceHelper.gs(R.string.suspendloopfor10h)                             -> {
-                aapsLogger.debug("USER ENTRY: SUSPEND 10h")
-                loopPlugin.suspendLoop(600)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                return true
-            }
-
-            resourceHelper.gs(R.string.disconnectpumpfor15m)                          -> {
-                aapsLogger.debug("USER ENTRY: DISCONNECT 15m")
-                loopPlugin.disconnectPump(15, profile)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                return true
-            }
-
-            resourceHelper.gs(R.string.disconnectpumpfor30m)                          -> {
-                aapsLogger.debug("USER ENTRY: DISCONNECT 30m")
-                loopPlugin.disconnectPump(30, profile)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                return true
-            }
-
-            resourceHelper.gs(R.string.disconnectpumpfor1h)                           -> {
-                aapsLogger.debug("USER ENTRY: DISCONNECT 1h")
-                loopPlugin.disconnectPump(60, profile)
-                sp.putBoolean(R.string.key_objectiveusedisconnect, true)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                return true
-            }
-
-            resourceHelper.gs(R.string.disconnectpumpfor2h)                           -> {
-                aapsLogger.debug("USER ENTRY: DISCONNECT 2h")
-                loopPlugin.disconnectPump(120, profile)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                return true
-            }
-
-            resourceHelper.gs(R.string.disconnectpumpfor3h)      -> {
-                aapsLogger.debug("USER ENTRY: DISCONNECT 3h")
-                loopPlugin.disconnectPump(180, profile)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                return true
-            }
-
-            resourceHelper.gs(R.string.careportal_profileswitch) -> {
-                ProfileSwitchDialog().show(manager, "Overview")
-            }
-
-            resourceHelper.gs(R.string.viewprofile)              -> {
-                val args = Bundle()
-                args.putLong("time", DateUtil.now())
-                args.putInt("mode", ProfileViewerDialog.Mode.RUNNING_PROFILE.ordinal)
-                val pvd = ProfileViewerDialog()
-                pvd.arguments = args
-                pvd.show(manager, "ProfileViewDialog")
-            }
-
-            resourceHelper.gs(R.string.eatingsoon)               -> {
-                aapsLogger.debug("USER ENTRY: TEMP TARGET EATING SOON")
-                val target = Profile.toMgdl(defaultValueHelper.determineEatingSoonTT(), profileFunction.getUnits())
-                val tempTarget = TempTarget()
-                    .date(System.currentTimeMillis())
-                    .duration(defaultValueHelper.determineEatingSoonTTDuration())
-                    .reason(resourceHelper.gs(R.string.eatingsoon))
-                    .source(Source.USER)
-                    .low(target)
-                    .high(target)
-                activePlugin.activeTreatments.addToHistoryTempTarget(tempTarget)
-            }
-
-            resourceHelper.gs(R.string.activity)                                      -> {
-                aapsLogger.debug("USER ENTRY: TEMP TARGET ACTIVITY")
-                val target = Profile.toMgdl(defaultValueHelper.determineActivityTT(), profileFunction.getUnits())
-                val tempTarget = TempTarget()
-                    .date(DateUtil.now())
-                    .duration(defaultValueHelper.determineActivityTTDuration())
-                    .reason(resourceHelper.gs(R.string.activity))
-                    .source(Source.USER)
-                    .low(target)
-                    .high(target)
-                activePlugin.activeTreatments.addToHistoryTempTarget(tempTarget)
-            }
-
-            resourceHelper.gs(R.string.hypo)                                          -> {
-                aapsLogger.debug("USER ENTRY: TEMP TARGET HYPO")
-                val target = Profile.toMgdl(defaultValueHelper.determineHypoTT(), profileFunction.getUnits())
-                val tempTarget = TempTarget()
-                    .date(DateUtil.now())
-                    .duration(defaultValueHelper.determineHypoTTDuration())
-                    .reason(resourceHelper.gs(R.string.hypo))
-                    .source(Source.USER)
-                    .low(target)
-                    .high(target)
-                activePlugin.activeTreatments.addToHistoryTempTarget(tempTarget)
-            }
-
-            resourceHelper.gs(R.string.custom)                                        -> {
-                TempTargetDialog().show(manager, "Overview")
-            }
-
-            resourceHelper.gs(R.string.cancel)                                        -> {
-                aapsLogger.debug("USER ENTRY: TEMP TARGET CANCEL")
-                val tempTarget = TempTarget()
-                    .source(Source.USER)
-                    .date(DateUtil.now())
-                    .duration(0)
-                    .low(0.0)
-                    .high(0.0)
-                activePlugin.activeTreatments.addToHistoryTempTarget(tempTarget)
-            }
-        }
-        return false
-    }
-
 }

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt

@@ -195,7 +195,7 @@ class ActionStringHandler @Inject constructor(
             val formatInt = DecimalFormat("0")
             val bolusWizard = BolusWizard(injector).doCalc(profile, profileName, activePlugin.activeTreatments.tempTargetFromHistory,
                 carbsAfterConstraints, cobInfo.displayCob!!, bgReading!!.valueToUnits(profileFunction.getUnits()),
-                0.0, percentage.toDouble(), useBG, useCOB, useBolusIOB, useBasalIOB, false, useTT, useTrend)
+                0.0, percentage.toDouble(), useBG, useCOB, useBolusIOB, useBasalIOB, false, useTT, useTrend, false)
             if (Math.abs(bolusWizard.insulinAfterConstraints - bolusWizard.calculatedTotalInsulin) >= 0.01) {
                 sendError("Insulin constraint violation!" +
                     "\nCannot deliver " + format.format(bolusWizard.calculatedTotalInsulin) + "!")
@@ -215,7 +215,7 @@ class ActionStringHandler @Inject constructor(
             if (useCOB) rMessage += "\nFrom" + formatInt.format(cobInfo.displayCob) + "g COB : " + format.format(bolusWizard.insulinFromCOB) + "U"
             if (useBG) rMessage += "\nFrom BG: " + format.format(bolusWizard.insulinFromBG) + "U"
             if (useBolusIOB) rMessage += "\nBolus IOB: " + format.format(bolusWizard.insulinFromBolusIOB) + "U"
-            if (useBasalIOB) rMessage += "\nBasal IOB: " + format.format(bolusWizard.insulinFromBasalsIOB) + "U"
+            if (useBasalIOB) rMessage += "\nBasal IOB: " + format.format(bolusWizard.insulinFromBasalIOB) + "U"
             if (useTrend) rMessage += "\nFrom 15' trend: " + format.format(bolusWizard.insulinFromTrend) + "U"
             if (percentage != 100) {
                 rMessage += "\nPercentage: " + format.format(bolusWizard.totalBeforePercentageAdjustment) + "U * " + percentage + "% -> ~" + format.format(bolusWizard.calculatedTotalInsulin) + "U"

app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt

@@ -77,7 +77,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
             aapsLogger.debug(LTag.CORE, "KeepAlive scheduled")
             SystemClock.sleep(5000) // wait for app initialization
             localAlertUtils.shortenSnoozeInterval()
-            localAlertUtils.presnoozeAlarms()
+            localAlertUtils.preSnoozeAlarms()
             val am = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
             val i = Intent(context, KeepAliveReceiver::class.java)
             val pi = PendingIntent.getBroadcast(context, 0, i, 0)

app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt

@@ -5,19 +5,21 @@ import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.math.min
 
 /**
  * Created by adrian on 17/12/17.
@@ -31,48 +33,49 @@ class LocalAlertUtils @Inject constructor(
     private val activePlugin: ActivePluginProvider,
     private val profileFunction: ProfileFunction,
     private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private val smsCommunicatorPlugin: SmsCommunicatorPlugin,
     private val config: Config,
     private val nsUpload: NSUpload,
     private val dateUtil: DateUtil
 ) {
 
-    fun missedReadingsThreshold(): Long {
-        return T.mins(sp.getInt(resourceHelper.gs(R.string.key_missed_bg_readings_threshold_minutes), Constants.DEFAULT_MISSED_BG_READINGS_THRESHOLD_MINUTES).toLong()).msecs()
+    private fun missedReadingsThreshold(): Long {
+        return T.mins(sp.getInt(R.string.key_missed_bg_readings_threshold_minutes, Constants.DEFAULT_MISSED_BG_READINGS_THRESHOLD_MINUTES).toLong()).msecs()
     }
 
-    fun pumpUnreachableThreshold(): Long {
-        return T.mins(sp.getInt(resourceHelper.gs(R.string.key_pump_unreachable_threshold_minutes), Constants.DEFAULT_PUMP_UNREACHABLE_THRESHOLD_MINUTES).toLong()).msecs()
+    private fun pumpUnreachableThreshold(): Long {
+        return T.mins(sp.getInt(R.string.key_pump_unreachable_threshold_minutes, Constants.DEFAULT_PUMP_UNREACHABLE_THRESHOLD_MINUTES).toLong()).msecs()
     }
 
     fun checkPumpUnreachableAlarm(lastConnection: Long, isStatusOutdated: Boolean, isDisconnected: Boolean) {
         val alarmTimeoutExpired = isAlarmTimeoutExpired(lastConnection, pumpUnreachableThreshold())
         val nextAlarmOccurrenceReached = sp.getLong("nextPumpDisconnectedAlarm", 0L) < System.currentTimeMillis()
-        if (config.APS && sp.getBoolean(resourceHelper.gs(R.string.key_enable_pump_unreachable_alert), true)
-            && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached && !isDisconnected) {
-            aapsLogger.debug(LTag.CORE, "Generating pump unreachable alarm. lastConnection: " + dateUtil.dateAndTimeString(lastConnection) + " isStatusOutdated: " + isStatusOutdated)
-            val n = Notification(Notification.PUMP_UNREACHABLE, resourceHelper.gs(R.string.pump_unreachable), Notification.URGENT)
-            n.soundId = R.raw.alarm
-            sp.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold())
-            rxBus.send(EventNewNotification(n))
-            if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
-                nsUpload.uploadError(n.text)
+        if (config.APS && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached && !isDisconnected) {
+            if (sp.getBoolean(R.string.key_enable_pump_unreachable_alert, true)) {
+                aapsLogger.debug(LTag.CORE, "Generating pump unreachable alarm. lastConnection: " + dateUtil.dateAndTimeString(lastConnection) + " isStatusOutdated: " + isStatusOutdated)
+                sp.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold())
+                rxBus.send(EventNewNotification(Notification(Notification.PUMP_UNREACHABLE, resourceHelper.gs(R.string.pump_unreachable), Notification.URGENT).also { it.soundId = R.raw.alarm }))
+                if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true))
+                    nsUpload.uploadError(resourceHelper.gs(R.string.pump_unreachable))
             }
+            if (sp.getBoolean(R.string.key_smscommunicator_report_pump_ureachable, true))
+                smsCommunicatorPlugin.sendNotificationToAllNumbers(resourceHelper.gs(R.string.pump_unreachable))
         }
         if (!isStatusOutdated && !alarmTimeoutExpired) rxBus.send(EventDismissNotification(Notification.PUMP_UNREACHABLE))
     }
 
     private fun isAlarmTimeoutExpired(lastConnection: Long, unreachableThreshold: Long): Boolean {
-        if (activePlugin.activePump.pumpDescription.hasCustomUnreachableAlertCheck) {
-            return activePlugin.activePump.isUnreachableAlertTimeoutExceeded(unreachableThreshold)
+        return if (activePlugin.activePump.pumpDescription.hasCustomUnreachableAlertCheck) {
+            activePlugin.activePump.isUnreachableAlertTimeoutExceeded(unreachableThreshold)
         } else {
-            return lastConnection + pumpUnreachableThreshold() < System.currentTimeMillis()
+            lastConnection + pumpUnreachableThreshold() < System.currentTimeMillis()
         }
     }
 
-    /*Presnoozes the alarms with 5 minutes if no snooze exists.
+    /*Pre-snoozes the alarms with 5 minutes if no snooze exists.
      * Call only at startup!
      */
-    fun presnoozeAlarms() {
+    fun preSnoozeAlarms() {
         if (sp.getLong("nextMissedReadingsAlarm", 0L) < System.currentTimeMillis()) {
             sp.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + 5 * 60 * 1000)
         }
@@ -83,10 +86,10 @@ class LocalAlertUtils @Inject constructor(
 
     fun shortenSnoozeInterval() { //shortens alarm times in case of setting changes or future data
         var nextMissedReadingsAlarm = sp.getLong("nextMissedReadingsAlarm", 0L)
-        nextMissedReadingsAlarm = Math.min(System.currentTimeMillis() + missedReadingsThreshold(), nextMissedReadingsAlarm)
+        nextMissedReadingsAlarm = min(System.currentTimeMillis() + missedReadingsThreshold(), nextMissedReadingsAlarm)
         sp.putLong("nextMissedReadingsAlarm", nextMissedReadingsAlarm)
         var nextPumpDisconnectedAlarm = sp.getLong("nextPumpDisconnectedAlarm", 0L)
-        nextPumpDisconnectedAlarm = Math.min(System.currentTimeMillis() + pumpUnreachableThreshold(), nextPumpDisconnectedAlarm)
+        nextPumpDisconnectedAlarm = min(System.currentTimeMillis() + pumpUnreachableThreshold(), nextPumpDisconnectedAlarm)
         sp.putLong("nextPumpDisconnectedAlarm", nextPumpDisconnectedAlarm)
     }
 
@@ -104,7 +107,7 @@ class LocalAlertUtils @Inject constructor(
 
     fun checkStaleBGAlert() {
         val bgReading: BgReading? = iobCobCalculatorPlugin.lastBg()
-        if (sp.getBoolean(resourceHelper.gs(R.string.key_enable_missed_bg_readings_alert), false)
+        if (sp.getBoolean(R.string.key_enable_missed_bg_readings_alert, false)
             && bgReading != null && bgReading.date + missedReadingsThreshold() < System.currentTimeMillis() && sp.getLong("nextMissedReadingsAlarm", 0L) < System.currentTimeMillis()) {
             val n = Notification(Notification.BG_READINGS_MISSED, resourceHelper.gs(R.string.missed_bg_readings), Notification.URGENT)
             n.soundId = R.raw.alarm

app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt

@@ -6,6 +6,7 @@ import android.text.Spanned
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.DetailedBolusInfo
@@ -20,6 +21,15 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.automation.AutomationEvent
+import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
+import info.nightscout.androidaps.plugins.general.automation.actions.ActionAlarm
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBg
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDelta
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTime
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.queue.Callback
@@ -30,8 +40,10 @@ import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.extensions.formatColor
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONException
 import org.json.JSONObject
+import java.text.DecimalFormat
 import java.util.*
 import javax.inject.Inject
 import kotlin.math.abs
@@ -43,13 +55,15 @@ class BolusWizard @Inject constructor(
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var constraintChecker: ConstraintChecker
-    @Inject lateinit var context: Context
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var loopPlugin: LoopPlugin
     @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    @Inject lateinit var automationPlugin: AutomationPlugin
+    @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var config: Config
 
     init {
@@ -72,7 +86,7 @@ class BolusWizard @Inject constructor(
         private set
     var insulinFromBolusIOB = 0.0
         private set
-    var insulinFromBasalsIOB = 0.0
+    var insulinFromBasalIOB = 0.0
         private set
     var insulinFromCorrection = 0.0
         private set
@@ -104,7 +118,7 @@ class BolusWizard @Inject constructor(
     var carbs: Int = 0
     var cob: Double = 0.0
     var bg: Double = 0.0
-    var correction: Double = 0.0
+    private var correction: Double = 0.0
     private var percentageCorrection: Double = 0.0
     private var useBg: Boolean = false
     private var useCob: Boolean = false
@@ -113,8 +127,9 @@ class BolusWizard @Inject constructor(
     private var useSuperBolus: Boolean = false
     private var useTT: Boolean = false
     private var useTrend: Boolean = false
+    private var useAlarm = false
     var notes: String = ""
-    var carbTime: Int = 0
+    private var carbTime: Int = 0
 
     @JvmOverloads
     fun doCalc(profile: Profile,
@@ -132,6 +147,7 @@ class BolusWizard @Inject constructor(
                useSuperBolus: Boolean,
                useTT: Boolean,
                useTrend: Boolean,
+               useAlarm: Boolean,
                notes: String = "",
                carbTime: Int = 0
     ): BolusWizard {
@@ -151,6 +167,7 @@ class BolusWizard @Inject constructor(
         this.useSuperBolus = useSuperBolus
         this.useTT = useTT
         this.useTrend = useTrend
+        this.useAlarm = useAlarm
         this.notes = notes
         this.carbTime = carbTime
 
@@ -193,7 +210,7 @@ class BolusWizard @Inject constructor(
         val basalIob = activePlugin.activeTreatments.lastCalculationTempBasals.round()
 
         insulinFromBolusIOB = if (includeBolusIOB) -bolusIob.iob else 0.0
-        insulinFromBasalsIOB = if (includeBasalIOB) -basalIob.basaliob else 0.0
+        insulinFromBasalIOB = if (includeBasalIOB) -basalIob.basaliob else 0.0
 
         // Insulin from correction
         insulinFromCorrection = correction
@@ -207,7 +224,7 @@ class BolusWizard @Inject constructor(
         }
 
         // Total
-        calculatedTotalInsulin = insulinFromBG + insulinFromTrend + insulinFromCarbs + insulinFromBolusIOB + insulinFromBasalsIOB + insulinFromCorrection + insulinFromSuperBolus + insulinFromCOB
+        calculatedTotalInsulin = insulinFromBG + insulinFromTrend + insulinFromCarbs + insulinFromBolusIOB + insulinFromBasalIOB + insulinFromCorrection + insulinFromSuperBolus + insulinFromCOB
 
         // Percentage adjustment
         totalBeforePercentageAdjustment = calculatedTotalInsulin
@@ -229,6 +246,7 @@ class BolusWizard @Inject constructor(
         return this
     }
 
+    @Suppress("SpellCheckingInspection")
     private fun nsJSON(): JSONObject {
         val bolusCalcJSON = JSONObject()
         try {
@@ -239,9 +257,9 @@ class BolusWizard @Inject constructor(
             bolusCalcJSON.put("targetBGHigh", targetBGHigh)
             bolusCalcJSON.put("isf", sens)
             bolusCalcJSON.put("ic", ic)
-            bolusCalcJSON.put("iob", -(insulinFromBolusIOB + insulinFromBasalsIOB))
+            bolusCalcJSON.put("iob", -(insulinFromBolusIOB + insulinFromBasalIOB))
             bolusCalcJSON.put("bolusiob", insulinFromBolusIOB)
-            bolusCalcJSON.put("basaliob", insulinFromBasalsIOB)
+            bolusCalcJSON.put("basaliob", insulinFromBasalIOB)
             bolusCalcJSON.put("bolusiobused", includeBolusIOB)
             bolusCalcJSON.put("basaliobused", includeBasalIOB)
             bolusCalcJSON.put("bg", bg)
@@ -270,40 +288,41 @@ class BolusWizard @Inject constructor(
         return bolusCalcJSON
     }
 
-    private fun confirmMessageAfterConstraints(pump: PumpInterface): Spanned {
+    private fun confirmMessageAfterConstraints(advisor: Boolean): Spanned {
 
         val actions: LinkedList<String> = LinkedList()
         if (insulinAfterConstraints > 0) {
             val pct = if (percentageCorrection != 100.0) " (" + percentageCorrection.toInt() + "%)" else ""
             actions.add(resourceHelper.gs(R.string.bolus) + ": " + resourceHelper.gs(R.string.formatinsulinunits, insulinAfterConstraints).formatColor(resourceHelper, R.color.bolus) + pct)
         }
-        if (carbs > 0) {
+        if (carbs > 0 && !advisor) {
             var timeShift = ""
             if (carbTime > 0) {
                 timeShift += " (+" + resourceHelper.gs(R.string.mins, carbTime) + ")"
             } else if (carbTime < 0) {
-                timeShift += " (-" + resourceHelper.gs(R.string.mins, carbTime) + ")"
+                timeShift += " (" + resourceHelper.gs(R.string.mins, carbTime) + ")"
             }
             actions.add(resourceHelper.gs(R.string.carbs) + ": " + resourceHelper.gs(R.string.format_carbs, carbs).formatColor(resourceHelper, R.color.carbs) + timeShift)
         }
         if (insulinFromCOB > 0) {
-            actions.add(resourceHelper.gs(R.string.cobvsiob) + ": " + resourceHelper.gs(R.string.formatsignedinsulinunits, insulinFromBolusIOB + insulinFromBasalsIOB + insulinFromCOB + insulinFromBG).formatColor(resourceHelper, R.color.cobAlert))
+            actions.add(resourceHelper.gs(R.string.cobvsiob) + ": " + resourceHelper.gs(R.string.formatsignedinsulinunits, insulinFromBolusIOB + insulinFromBasalIOB + insulinFromCOB + insulinFromBG).formatColor(resourceHelper, R.color.cobAlert))
             val absorptionRate = iobCobCalculatorPlugin.slowAbsorptionPercentage(60)
             if (absorptionRate > .25)
                 actions.add(resourceHelper.gs(R.string.slowabsorptiondetected, resourceHelper.gc(R.color.cobAlert), (absorptionRate * 100).toInt()))
         }
-        if (abs(insulinAfterConstraints - calculatedTotalInsulin) > pump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
-             actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarn, calculatedTotalInsulin, insulinAfterConstraints).formatColor(resourceHelper, R.color.warning))
-        if (config.NSCLIENT)
+        if (abs(insulinAfterConstraints - calculatedTotalInsulin) > activePlugin.activePump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
+            actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarn, calculatedTotalInsulin, insulinAfterConstraints).formatColor(resourceHelper, R.color.warning))
+        if (config.NSCLIENT && insulinAfterConstraints > 0)
             actions.add(resourceHelper.gs(R.string.bolusrecordedonly).formatColor(resourceHelper, R.color.warning))
+        if (useAlarm && !advisor && carbs > 0 && carbTime > 0)
+            actions.add(resourceHelper.gs(R.string.alarminxmin, carbTime).formatColor(resourceHelper, R.color.info))
+        if (advisor)
+            actions.add(resourceHelper.gs(R.string.advisoralarm).formatColor(resourceHelper, R.color.info))
 
         return HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions))
     }
 
-    fun confirmAndExecute(context: Context) {
-        val profile = profileFunction.getProfile() ?: return
-        val pump = activePlugin.activePump
-
+    fun confirmAndExecute(ctx: Context) {
         if (calculatedTotalInsulin > 0.0 || carbs > 0.0) {
             if (accepted) {
                 aapsLogger.debug(LTag.UI, "guarding: already accepted")
@@ -311,76 +330,174 @@ class BolusWizard @Inject constructor(
             }
             accepted = true
 
-            val confirmMessage = confirmMessageAfterConstraints(pump)
+            if (sp.getBoolean(R.string.key_usebolusadvisor, false) && Profile.toMgdl(bg, profile.units) > 180 && carbs > 0 && carbTime >= 0)
+                OKDialog.showYesNoCancel(ctx, resourceHelper.gs(R.string.bolusadvisor), resourceHelper.gs(R.string.bolusadvisormessage),
+                    { bolusAdvisorProcessing(ctx) },
+                    { commonProcessing(ctx) }
+                )
+            else
+                commonProcessing(ctx)
+        }
+    }
 
-            OKDialog.showConfirmation(context, resourceHelper.gs(R.string.boluswizard), confirmMessage, Runnable {
-                if (insulinAfterConstraints > 0 || carbs > 0) {
-                    if (useSuperBolus) {
-                        aapsLogger.debug("USER ENTRY: SUPERBOLUS TBR")
-                        if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                            loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000)
-                            rxBus.send(EventRefreshOverview("WizardDialog"))
+    private fun bolusAdvisorProcessing(ctx: Context) {
+        val confirmMessage = confirmMessageAfterConstraints(advisor = true)
+        OKDialog.showConfirmation(ctx, resourceHelper.gs(R.string.boluswizard), confirmMessage, {
+            DetailedBolusInfo().apply {
+                eventType = CareportalEvent.CORRECTIONBOLUS
+                insulin = insulinAfterConstraints
+                carbs = 0.0
+                context = ctx
+                glucose = bg
+                glucoseType = "Manual"
+                carbTime = 0
+                boluscalc = nsJSON()
+                source = Source.USER
+                notes = this@BolusWizard.notes
+                aapsLogger.debug("USER ENTRY: BOLUS ADVISOR insulin $insulinAfterConstraints")
+                if (insulin > 0) {
+                    commandQueue.bolus(this, object : Callback() {
+                        override fun run() {
+                            if (!result.success) {
+                                val i = Intent(ctx, ErrorHelperActivity::class.java)
+                                i.putExtra("soundid", R.raw.boluserror)
+                                i.putExtra("status", result.comment)
+                                i.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror))
+                                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                ctx.startActivity(i)
+                            } else
+                                scheduleEatReminder()
                         }
+                    })
+                }
+            }
+        })
+    }
 
-                        if (pump.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) {
-                            commandQueue.tempBasalAbsolute(0.0, 120, true, profile, object : Callback() {
-                                override fun run() {
-                                    if (!result.success) {
-                                        val i = Intent(context, ErrorHelperActivity::class.java)
-                                        i.putExtra("soundid", R.raw.boluserror)
-                                        i.putExtra("status", result.comment)
-                                        i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror))
-                                        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                        context.startActivity(i)
-                                    }
-                                }
-                            })
-                        } else {
+    private fun commonProcessing(ctx: Context) {
+        val profile = profileFunction.getProfile() ?: return
+        val pump = activePlugin.activePump
 
-                            commandQueue.tempBasalPercent(0, 120, true, profile, object : Callback() {
-                                override fun run() {
-                                    if (!result.success) {
-                                        val i = Intent(context, ErrorHelperActivity::class.java)
-                                        i.putExtra("soundid", R.raw.boluserror)
-                                        i.putExtra("status", result.comment)
-                                        i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror))
-                                        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                        context.startActivity(i)
-                                    }
-                                }
-                            })
-                        }
+        val confirmMessage = confirmMessageAfterConstraints(advisor = false)
+        OKDialog.showConfirmation(ctx, resourceHelper.gs(R.string.boluswizard), confirmMessage, {
+            if (insulinAfterConstraints > 0 || carbs > 0) {
+                if (useSuperBolus) {
+                    aapsLogger.debug("USER ENTRY: SUPERBOLUS TBR")
+                    if (loopPlugin.isEnabled(PluginType.LOOP)) {
+                        loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000)
+                        rxBus.send(EventRefreshOverview("WizardDialog"))
                     }
-                    val detailedBolusInfo = DetailedBolusInfo()
-                    detailedBolusInfo.eventType = CareportalEvent.BOLUSWIZARD
-                    detailedBolusInfo.insulin = insulinAfterConstraints
-                    detailedBolusInfo.carbs = carbs.toDouble()
-                    detailedBolusInfo.context = context
-                    detailedBolusInfo.glucose = bg
-                    detailedBolusInfo.glucoseType = "Manual"
-                    detailedBolusInfo.carbTime = carbTime
-                    detailedBolusInfo.boluscalc = nsJSON()
-                    detailedBolusInfo.source = Source.USER
-                    detailedBolusInfo.notes = notes
-                    aapsLogger.debug("USER ENTRY: BOLUS insulin $insulinAfterConstraints carbs: $carbs")
-                    if (detailedBolusInfo.insulin > 0 || pump.pumpDescription.storesCarbInfo) {
-                        commandQueue.bolus(detailedBolusInfo, object : Callback() {
+
+                    if (pump.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) {
+                        commandQueue.tempBasalAbsolute(0.0, 120, true, profile, object : Callback() {
                             override fun run() {
                                 if (!result.success) {
-                                    val i = Intent(context, ErrorHelperActivity::class.java)
+                                    val i = Intent(ctx, ErrorHelperActivity::class.java)
                                     i.putExtra("soundid", R.raw.boluserror)
                                     i.putExtra("status", result.comment)
-                                    i.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror))
+                                    i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror))
                                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                    context.startActivity(i)
+                                    ctx.startActivity(i)
                                 }
                             }
                         })
                     } else {
-                        activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
+
+                        commandQueue.tempBasalPercent(0, 120, true, profile, object : Callback() {
+                            override fun run() {
+                                if (!result.success) {
+                                    val i = Intent(ctx, ErrorHelperActivity::class.java)
+                                    i.putExtra("soundid", R.raw.boluserror)
+                                    i.putExtra("status", result.comment)
+                                    i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror))
+                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    ctx.startActivity(i)
+                                }
+                            }
+                        })
                     }
                 }
-            })
+                DetailedBolusInfo().apply {
+                    eventType = CareportalEvent.BOLUSWIZARD
+                    insulin = insulinAfterConstraints
+                    carbs = this@BolusWizard.carbs.toDouble()
+                    context = ctx
+                    glucose = bg
+                    glucoseType = "Manual"
+                    carbTime = this@BolusWizard.carbTime
+                    boluscalc = nsJSON()
+                    source = Source.USER
+                    notes = this@BolusWizard.notes
+                    aapsLogger.debug("USER ENTRY: BOLUS WIZARD insulin $insulinAfterConstraints carbs: $carbs")
+                    if (insulin > 0 || pump.pumpDescription.storesCarbInfo) {
+                        commandQueue.bolus(this, object : Callback() {
+                            override fun run() {
+                                if (!result.success) {
+                                    val i = Intent(ctx, ErrorHelperActivity::class.java)
+                                    i.putExtra("soundid", R.raw.boluserror)
+                                    i.putExtra("status", result.comment)
+                                    i.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror))
+                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    ctx.startActivity(i)
+                                }
+                            }
+                        })
+                    } else {
+                        activePlugin.activeTreatments.addToHistoryTreatment(this, false)
+                    }
+                }
+                if (useAlarm && carbs > 0 && carbTime > 0) {
+                    scheduleReminder(dateUtil._now() + T.mins(carbTime.toLong()).msecs())
+                }
+            }
+        })
+    }
+
+    private fun scheduleEatReminder() {
+        val event = AutomationEvent(injector).apply {
+            title = resourceHelper.gs(R.string.bolusadvisor)
+            readOnly = true
+            systemAction = true
+            autoRemove = true
+            trigger = TriggerConnector(injector, TriggerConnector.Type.OR).apply {
+
+                // Bg under 180 mgdl and dropping by 15 mgdl
+                list.add(TriggerConnector(injector, TriggerConnector.Type.AND).apply {
+                    list.add(TriggerBg(injector, 180.0, Constants.MGDL, Comparator.Compare.IS_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(injector, -15.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.DELTA), Constants.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(injector, -8.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.SHORT_AVERAGE), Constants.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                })
+                // Bg under 160 mgdl and dropping by 9 mgdl
+                list.add(TriggerConnector(injector, TriggerConnector.Type.AND).apply {
+                    list.add(TriggerBg(injector, 160.0, Constants.MGDL, Comparator.Compare.IS_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(injector, -9.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.DELTA), Constants.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(injector, -5.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.SHORT_AVERAGE), Constants.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                })
+                // Bg under 145 mgdl and dropping
+                list.add(TriggerConnector(injector, TriggerConnector.Type.AND).apply {
+                    list.add(TriggerBg(injector, 145.0, Constants.MGDL, Comparator.Compare.IS_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(injector, 0.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.DELTA), Constants.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(injector, 0.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.SHORT_AVERAGE), Constants.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                })
+            }
+            actions.add(ActionAlarm(injector, resourceHelper.gs(R.string.time_to_eat)))
         }
+
+        automationPlugin.addIfNotExists(event)
+    }
+
+    private fun scheduleReminder(time: Long) {
+        val event = AutomationEvent(injector).apply {
+            title = resourceHelper.gs(R.string.timetoeat)
+            readOnly = true
+            systemAction = true
+            autoRemove = true
+            trigger = TriggerConnector(injector, TriggerConnector.Type.AND).apply {
+                list.add(TriggerTime(injector, time))
+            }
+            actions.add(ActionAlarm(injector, resourceHelper.gs(R.string.timetoeat)))
+        }
+
+        automationPlugin.addIfNotExists(event)
     }
 }

app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt

@@ -117,7 +117,7 @@ class QuickWizardEntry @Inject constructor(private val injector: HasAndroidInjec
             trend = true
         }
         val percentage = sp.getDouble(R.string.key_boluswizard_percentage, 100.0)
-        return BolusWizard(injector).doCalc(profile, profileName, tempTarget, carbs(), cob, bg, 0.0, percentage, true, useCOB() == YES, bolusIOB, basalIOB, superBolus, useTempTarget() == YES, trend, "QuickWizard")
+        return BolusWizard(injector).doCalc(profile, profileName, tempTarget, carbs(), cob, bg, 0.0, percentage, true, useCOB() == YES, bolusIOB, basalIOB, superBolus, useTempTarget() == YES, trend, false, "QuickWizard")
     }
 
     fun buttonText(): String = safeGetString(storage, "buttonText", "")

app/src/main/res/drawable/ic_loop_reconnect.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-3.952,0 -7.156,-3.204 -7.156,-7.156c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.937,4.449 -9.937,9.938c0,5.488 4.449,9.937 9.937,9.937C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
+      android:fillColor="#939393"/>
+  <path
+      android:pathData="M14.868,22.154c0.794,0 1.49,-0.418 1.973,-1.054l-0.001,-3.926c-0.482,-0.634 -1.177,-1.052 -1.969,-1.052l-5.612,-0.001c-0.793,0 -1.487,0.416 -1.97,1.05l-0.004,3.926c0.482,0.636 1.178,1.055 1.972,1.055"
+      android:fillColor="#939393"/>
+</vector>

app/src/main/res/drawable/ic_loop_resume.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-3.952,0 -7.156,-3.204 -7.156,-7.156c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.937,4.449 -9.937,9.938c0,5.488 4.449,9.937 9.937,9.937C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
+      android:fillColor="#00C03E"/>
+  <path
+      android:pathData="M9.401,8.391l6.599,3.609l-6.599,3.609z"
+      android:fillColor="#00C03E"/>
+</vector>

app/src/main/res/layout/activity_profilehelper.xml

@@ -12,9 +12,9 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <Button
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/profilehelper_compareprofile"
-            style="@style/ButtonMediumFontStyle"
+            style="?android:attr/buttonStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:drawableStart="@drawable/ic_compare_profiles"
@@ -50,8 +50,8 @@
         </LinearLayout>
 
         <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:id="@+id/profilehelper_profiletype_title"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/profiletype"
@@ -173,11 +173,11 @@
                 android:layout_marginStart="10dp"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
-            <Button
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/profilehelper_copytolocalprofile"
-                style="@style/ButtonMediumFontStyle"
+                style="?android:attr/buttonStyle"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:drawableStart="@drawable/ic_clone_48"
                 android:text="@string/clone_label" />
 

app/src/main/res/layout/automation_dialog_event.xml

@@ -51,8 +51,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="10dp">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/inputEventTitle"
@@ -163,7 +163,9 @@
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp" />
 
-            <include layout="@layout/okcancel" />
+            <include
+                android:id="@+id/okcancel"
+                layout="@layout/okcancel" />
 
         </LinearLayout>
 

app/src/main/res/layout/automation_event_item.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rootLayout"
     android:layout_width="match_parent"
@@ -8,59 +8,80 @@
     android:layout_marginTop="8dp"
     android:layout_marginEnd="8dp"
     android:layout_marginBottom="8dp"
-    android:clickable="true"
-    android:focusable="true"
     android:background="@color/ribbonDefault"
-    android:padding="8dp">
+    android:clickable="true"
+    android:focusable="true">
 
     <CheckBox
         android:id="@+id/enabled"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true" />
+        app:layout_constraintBottom_toTopOf="@+id/iconLayout"
+        app:layout_constraintEnd_toStartOf="@+id/aapsLogo"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/aapsLogo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="5dp"
+        android:contentDescription="@string/remove_label"
+        android:scaleX="0.9"
+        android:scaleY="0.9"
+        android:src="@drawable/ic_notif_aaps"
+        app:layout_constraintBottom_toTopOf="@+id/iconLayout"
+        app:layout_constraintEnd_toStartOf="@+id/eventTitle"
+        app:layout_constraintStart_toEndOf="@+id/enabled"
+        app:layout_constraintTop_toTopOf="@+id/enabled" />
 
     <TextView
         android:id="@+id/eventTitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/enabled"
-        android:layout_alignBottom="@+id/enabled"
-        android:layout_centerVertical="true"
-        android:layout_marginTop="6dp"
-        android:layout_toStartOf="@+id/iconTrash"
-        android:layout_toEndOf="@id/enabled"
-        android:text="Title"
         android:textAlignment="viewStart"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/iconLayout"
+        app:layout_constraintEnd_toStartOf="@+id/iconTrash"
+        app:layout_constraintStart_toEndOf="@+id/aapsLogo"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/iconTrash"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
         android:layout_marginEnd="20dp"
-        android:layout_toStartOf="@+id/iconSort"
         android:contentDescription="@string/remove_label"
         android:orientation="horizontal"
-        android:src="@drawable/ic_trash_outline" />
+        android:src="@drawable/ic_trash_outline"
+        app:layout_constraintBottom_toTopOf="@+id/iconLayout"
+        app:layout_constraintEnd_toStartOf="@+id/iconSort"
+        app:layout_constraintStart_toEndOf="@+id/eventTitle"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/iconSort"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"
         android:contentDescription="@string/reorder_label"
         android:orientation="horizontal"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/iconLayout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/iconTrash"
+        app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_reorder_gray_24dp" />
 
     <LinearLayout
         android:id="@+id/iconLayout"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/enabled"
-        android:orientation="horizontal" />
+        android:layout_marginStart="16dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/iconSort" />
 
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/datetime.xml

@@ -7,9 +7,10 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
+        android:layout_gravity="center"
         android:width="120dp"
-        android:padding="10dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="4dp"
         android:text="@string/event_time_label"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold" />
@@ -19,7 +20,7 @@
         android:id="@+id/overview_eventdate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
+        android:layout_gravity="center"
         android:padding="10dp"
         android:text="2017/05/05" />
 
@@ -27,7 +28,7 @@
         android:id="@+id/overview_eventtime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
+        android:layout_gravity="center"
         android:padding="10dp"
         android:text="08:20pm" />
 

app/src/main/res/layout/dialog_loop.xml

@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusableInTouchMode="true"
+    android:minWidth="300dp"
+    android:orientation="vertical"
+    tools:context=".dialogs.LoopDialog">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/dialog_title_background"
+            android:orientation="horizontal"
+            android:padding="5dp">
+
+            <ImageView
+                android:id="@+id/loop_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/boluswizard"
+                app:srcCompat="@drawable/ic_loop_closed" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/loop"
+                android:textAlignment="center"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/spacer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="5dp" />
+
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/overview_loop_header"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/loop"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <LinearLayout
+                android:id="@+id/overview_loop_buttons"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:orientation="horizontal">
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_closeloop"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="center"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:drawableTop="@drawable/ic_loop_closed"
+                    android:text="@string/closedloop"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp"
+                    android:visibility="gone" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_lgsloop"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="center"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:drawableTop="@drawable/ic_loop_lgs"
+                    android:text="@string/lowglucosesuspend"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp"
+                    android:visibility="gone" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_openloop"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="center"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:drawableTop="@drawable/ic_loop_open"
+                    android:text="@string/openloop"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp"
+                    android:visibility="gone" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_enable"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="center"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:drawableTop="@drawable/ic_loop_resume"
+                    android:text="@string/enableloop"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp"
+                    android:visibility="gone" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_disable"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="center"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:drawableTop="@drawable/ic_loop_disabled"
+                    android:text="@string/disableloop"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
+                android:background="@color/listdelimiter" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/overview_suspend"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/overview_suspend_header"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/suspendloop"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
+                android:id="@+id/overview_resume"
+                style="?android:attr/buttonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_gravity="center"
+                android:layout_marginEnd="-4dp"
+                android:layout_weight="0.5"
+                android:drawableTop="@drawable/ic_loop_resume"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/resumeloop"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textSize="11sp"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:id="@+id/overview_suspend_buttons"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:orientation="horizontal">
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_suspend_1h"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:drawableTop="@drawable/ic_loop_paused"
+                    android:text="@string/duration1h"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_suspend_2h"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:drawableTop="@drawable/ic_loop_paused"
+                    android:text="@string/duration2h"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp" />
+
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_suspend_3h"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:drawableTop="@drawable/ic_loop_paused"
+                    android:text="@string/duration3h"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp" />
+
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_suspend_10h"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:drawableTop="@drawable/ic_loop_paused"
+                    android:text="@string/duration10h"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
+                android:background="@color/listdelimiter" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/overview_pump_header"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/disconnectpump"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
+                android:id="@+id/overview_reconnect"
+                style="?android:attr/buttonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginEnd="-4dp"
+                android:layout_weight="0.5"
+                android:drawableTop="@drawable/ic_loop_reconnect"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/reconnect"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textSize="11sp"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:id="@+id/overview_disconnect_buttons"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:orientation="horizontal">
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_disconnect_15m"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:drawableTop="@drawable/ic_loop_disconnected"
+                    android:text="@string/duration15m"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_disconnect_30m"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:drawableTop="@drawable/ic_loop_disconnected"
+                    android:text="@string/duration30m"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_disconnect_1h"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:drawableTop="@drawable/ic_loop_disconnected"
+                    android:text="@string/duration1h"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_disconnect_2h"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:drawableTop="@drawable/ic_loop_disconnected"
+                    android:text="@string/duration2h"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/overview_disconnect_3h"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:drawableTop="@drawable/ic_loop_disconnected"
+                    android:text="@string/duration3h"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textSize="11sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/listdelimiter" />
+
+        <Button
+            android:id="@+id/cancel"
+            style="@style/mdtp_ActionButton.Text"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_weight="1"
+            android:text="@string/mdtp_cancel"
+            android:padding="10dp"
+            android:textAlignment="textEnd" />
+
+    </LinearLayout>
+</ScrollView>

app/src/main/res/layout/dialog_temptarget.xml

@@ -142,27 +142,12 @@
         </LinearLayout>
 
         <include layout="@layout/datetime" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/overview_temptarget_custom"
-                style="?android:attr/buttonStyle"
-                android:layout_width="0px"
-                android:layout_height="fill_parent"
-                android:layout_marginEnd="-4dp"
-                android:layout_weight="0.5"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:drawableTop="@drawable/ic_target_manual"
-                android:text="@string/manual"
-                android:textColor="@color/tempTargetConfirmation"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                android:visibility="gone"
-                android:textSize="11sp" />
-
             <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/overview_temptarget_cancel"
                 style="?android:attr/buttonStyle"

app/src/main/res/layout/dialog_wizard.xml

@@ -49,9 +49,9 @@
             android:padding="5dp" />
 
         <TableLayout
-            android:paddingEnd="5dp"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:paddingEnd="5dp">
 
             <TableRow
                 android:layout_width="match_parent"
@@ -67,12 +67,12 @@
                     android:textStyle="bold" />
 
                 <info.nightscout.androidaps.utils.ui.NumberPicker
-                    android:id="@+id/treatments_wizard_bg_input"
+                    android:id="@+id/bg_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_bgunits"
+                    android:id="@+id/bgunits"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
@@ -97,7 +97,7 @@
                     android:textStyle="bold" />
 
                 <info.nightscout.androidaps.utils.ui.NumberPicker
-                    android:id="@+id/treatments_wizard_carbs_input"
+                    android:id="@+id/carbs_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
                     android:layout_gravity="center_horizontal" />
@@ -128,7 +128,7 @@
                     android:textStyle="bold" />
 
                 <info.nightscout.androidaps.utils.ui.NumberPicker
-                    android:id="@+id/treatments_wizard_correction_input"
+                    android:id="@+id/correction_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
                     android:layout_gravity="center_horizontal" />
@@ -146,22 +146,49 @@
 
             <TableRow
                 android:layout_width="match_parent"
+                android:gravity="center_vertical"
                 android:layout_height="match_parent">
 
-                <TextView
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
                     android:layout_weight="1"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_carbtime_label"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textStyle="bold" />
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="10dp"
+                        android:paddingRight="2dp"
+                        android:text="@string/careportal_newnstreatment_carbtime_label"
+                        android:gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textStyle="bold" />
+
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:src="@drawable/ic_access_alarm_24dp" />
+
+                    <CheckBox
+                        android:id="@+id/alarm"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:checked="false"
+                        android:padding="2dp" />
+
+                </LinearLayout>
 
                 <info.nightscout.androidaps.utils.ui.NumberPicker
-                    android:id="@+id/treatments_wizard_carb_time_input"
+                    android:id="@+id/carb_time_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
-                    android:layout_gravity="center_horizontal" />
+                    android:layout_gravity="center" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -191,7 +218,7 @@
                 android:textStyle="bold" />
 
             <Spinner
-                android:id="@+id/treatments_wizard_profile"
+                android:id="@+id/profile"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical|center_horizontal"
@@ -199,13 +226,13 @@
 
 
             <CheckBox
-                android:id="@+id/treatments_wizard_sbcheckbox"
+                android:id="@+id/sbcheckbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="10dp"
-                android:padding="5dp"
                 android:checked="false"
+                android:padding="5dp"
                 android:text="@string/superbolus" />
 
         </LinearLayout>
@@ -217,7 +244,7 @@
             android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/treatments_wizard_total"
+                android:id="@+id/total"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/background_darkgray"
@@ -227,7 +254,7 @@
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
             <TextView
-                android:id="@+id/treatments_wizard_percent_used"
+                android:id="@+id/percent_used"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
@@ -241,7 +268,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/treatments_wizard_notes_layout"
+            android:id="@+id/notes_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
@@ -250,14 +277,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:labelFor="@+id/treatment_wizard_notes"
+                android:labelFor="@+id/notes"
                 android:padding="10dp"
                 android:text="@string/careportal_newnstreatment_notes_label"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
             <EditText
-                android:id="@+id/treatment_wizard_notes"
+                android:id="@+id/notes"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -279,7 +306,7 @@
             android:padding="5dp">
 
             <CheckBox
-                android:id="@+id/treatments_wizard_calculationcheckbox"
+                android:id="@+id/calculationcheckbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -288,8 +315,8 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/show_calculation"
                 android:layout_gravity="center_vertical"
+                android:contentDescription="@string/show_calculation"
                 app:srcCompat="@drawable/ic_visibility" />
 
             <Button
@@ -312,7 +339,7 @@
         </LinearLayout>
 
         <View
-            android:id="@+id/treatments_wizard_delimiter"
+            android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
             android:layout_marginStart="20dp"
@@ -321,7 +348,7 @@
             android:background="@color/listdelimiter" />
 
         <TableLayout
-            android:id="@+id/treatments_wizard_resulttable"
+            android:id="@+id/resulttable"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="5dp">
@@ -331,7 +358,7 @@
                 android:layout_height="match_parent">
 
                 <CheckBox
-                    android:id="@+id/treatments_wizard_bgcheckbox"
+                    android:id="@+id/bgcheckbox"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="32dp"
@@ -350,7 +377,7 @@
                         android:textAppearance="?android:attr/textAppearanceSmall" />
 
                     <CheckBox
-                        android:id="@+id/treatments_wizard_ttcheckbox"
+                        android:id="@+id/ttcheckbox"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:width="32dp"
@@ -366,7 +393,7 @@
                 </LinearLayout>
 
                 <TextView
-                    android:id="@+id/treatments_wizard_bg"
+                    android:id="@+id/bg"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -374,7 +401,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_bginsulin"
+                    android:id="@+id/bginsulin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="50dp"
@@ -388,7 +415,7 @@
                 android:layout_height="match_parent">
 
                 <CheckBox
-                    android:id="@+id/treatments_wizard_bgtrendcheckbox"
+                    android:id="@+id/bgtrendcheckbox"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="32dp"
@@ -402,7 +429,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_bgtrend"
+                    android:id="@+id/bgtrend"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -410,7 +437,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_bgtrendinsulin"
+                    android:id="@+id/bgtrendinsulin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="50dp"
@@ -424,7 +451,7 @@
                 android:layout_height="match_parent">
 
                 <CheckBox
-                    android:id="@+id/treatments_wizard_cobcheckbox"
+                    android:id="@+id/cobcheckbox"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="32dp"
@@ -438,7 +465,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_cob"
+                    android:id="@+id/cob"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -446,7 +473,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_cobinsulin"
+                    android:id="@+id/cobinsulin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="50dp"
@@ -460,7 +487,7 @@
                 android:layout_height="match_parent">
 
                 <CheckBox
-                    android:id="@+id/treatments_wizard_bolusiobcheckbox"
+                    android:id="@+id/bolusiobcheckbox"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="32dp"
@@ -481,7 +508,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_bolusiobinsulin"
+                    android:id="@+id/bolusiobinsulin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="50dp"
@@ -495,7 +522,7 @@
                 android:layout_height="match_parent">
 
                 <CheckBox
-                    android:id="@+id/treatments_wizard_basaliobcheckbox"
+                    android:id="@+id/basaliobcheckbox"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="32dp"
@@ -516,7 +543,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_basaliobinsulin"
+                    android:id="@+id/basaliobinsulin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="50dp"
@@ -542,7 +569,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_carbs"
+                    android:id="@+id/carbs"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -550,7 +577,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_carbsinsulin"
+                    android:id="@+id/carbsinsulin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="50dp"
@@ -576,7 +603,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_sb"
+                    android:id="@+id/sb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -584,7 +611,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_sbinsulin"
+                    android:id="@+id/sbinsulin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="50dp"
@@ -617,7 +644,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <TextView
-                    android:id="@+id/treatments_wizard_correctioninsulin"
+                    android:id="@+id/correctioninsulin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:width="50dp"

app/src/main/res/layout/overview_info_layout.xml

@@ -162,18 +162,20 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="-4dp"
+            android:visibility="gone"
             app:srcCompat="@drawable/ic_loop_closed" />
 
         <TextView
             android:id="@+id/overview_apsmode_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:gravity="center_horizontal"
             android:paddingTop="3dp"
             android:paddingBottom="3dp"
             android:text="Open Loop"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:visibility="gone" />
     </LinearLayout>
 
     <LinearLayout
@@ -183,6 +185,7 @@
         android:layout_marginTop="5dp"
         android:gravity="center_horizontal"
         android:orientation="vertical"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/overview_bg"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/overview_apsmode_llayout"

app/src/main/res/layout/overview_loop_pumpstatus_layout.xml

@@ -19,8 +19,8 @@
             android:layout_marginEnd="5dp"
             android:layout_weight="1"
             android:gravity="center_vertical|center_horizontal"
-            android:paddingTop="3dp"
-            android:paddingBottom="3dp"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
             android:text="Profile"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -31,8 +31,8 @@
             android:layout_gravity="end"
             android:layout_weight="1"
             android:gravity="center_vertical|center_horizontal"
-            android:paddingTop="3dp"
-            android:paddingBottom="3dp"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
             android:text="TempTarget"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/mdtp_white" />
@@ -53,8 +53,8 @@
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
             android:gravity="center_vertical|center_horizontal"
-            android:paddingTop="3dp"
-            android:paddingBottom="3dp"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
             android:text="@string/initializing"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 

app/src/main/res/values-af-rZA/exam.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="pumpdisconnect_whattodo">Wat moet gedoen word wanneer pomp ontkoppel word?</string>
+</resources>

app/src/main/res/values-af-rZA/strings.xml

@@ -428,8 +428,6 @@
     <string name="overview_editquickwizard_usebasaliob">Basale IAB berekening</string>
     <string name="overview_editquickwizard_usetrend">Tendens berekening</string>
     <string name="overview_editquickwizard_usesuperbolus">Superbolus berekening</string>
-    <string name="yes">Ja</string>
-    <string name="no">Nee</string>
     <string name="positiveonly">Slegs positiewe</string>
     <string name="negativeonly">Slegs negatiewe</string>
     <string name="overview_editquickwizard_usecob">COB berekening</string>
@@ -633,7 +631,6 @@
     <string name="low_temptarget_lowers_sensitivity_title">Lae tydelike doelwitte verlaag sensitiwiteit</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Laer sensitiwiteit vir tydelike doelwitte < 100]]></string>
     <string name="combo_invalid_setup">Ongeldige pomp opstelling kontroleer die hulpdokumente en verifieer dat die vinnige inligting kieslys wel QUICK INFO benaam is met behulp van die 360 konfigurasie sagteware.</string>
-    <string name="custom">Gepasmaak</string>
     <string name="careportal_removestartedevents">Skoon AndroidAPS begin</string>
     <string name="storedsettingsfound">Gestoorde instellings gevind</string>
     <string name="allow_hardware_pump_text">Aandag: As jy aktiveer en koppel aan \'n hardeware pomp, AndroidAPS sal die basale instellings uit die profiel aan die pomp kopieer, die bestaande basale koers gestoor op die pomp sal oorskryf word. Maak seker jy het die korrekte basale instelling in AndroidAPS. As jy nie seker is of nie die basale instellings wil oorskryf op jou pomp, druk Kanselleer en herhaal oorskakel na die pomp op \'n later tyd.</string>

app/src/main/res/values-bg-rBG/exam.xml

@@ -21,6 +21,10 @@
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Съотношение на инсулин към въглехидрати (I:C)</string>
+    <string name="ic_increasingvalue">По-високите стойности на I:C водят до по-малко инсулин доставени за дадено количество въглехидрати.</string>
+    <string name="ic_decreasingvalue">По-ниските стойности на I:C водят до повече инсулин доставен за дадено количество въглехидрати.</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_unchanged">ISF и I:C ще останат непроменени.</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
 </resources>

app/src/main/res/values-bg-rBG/objectives.xml

@@ -21,7 +21,7 @@
     <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_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>
@@ -36,11 +36,11 @@
     <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 за получаване на подробна информация.</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 за получаване на подробна информация.</string>
     <string name="codeaccepted">Код приет!</string>
     <string name="codeinvalid">Неправилен код</string>
     <string name="objectives_exam_objective">Докажете знанията си</string>
-    <string name="objectives_exam_gate">Отговорете правилно на въпросите</string>
+    <string name="objectives_exam_gate">Четете внимателно въпросите.  Имате четири възможни отговора за всеки въпрос. Може да има повече от един правилен отговор. Моля, изберете всички, които са правилни, и натиснете VERIFY.</string>
     <string name="answerdisabledto">Изключено до: %1$s</string>
     <string name="wronganswer">Грешен отговор!</string>
     <string name="unfinshed_button">Следващия неотговорен</string>

app/src/main/res/values-bg-rBG/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Настройки на сигурността</string>
     <string name="treatmentssafety_maxbolus_title">Максимален инсулин при болус [единици]</string>
     <string name="treatmentssafety_maxcarbs_title">Максимални въглехидрати [гр]</string>
+    <string name="nav_preferences_plugin">Настройки на %1$s</string>
     <string name="nav_preferences">Опции</string>
     <string name="nav_refreshtreatments">Обнови леченията от NS</string>
     <string name="nav_resetdb">Нулирай базата данни</string>
@@ -405,11 +406,18 @@
     <string name="suspendloopfor3h">Изключи APS за 3ч</string>
     <string name="suspendloopfor10h">Изключи APS за 10 ч</string>
     <string name="suspendloopforXmin">Изключи APS за %1$d мин</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>
@@ -564,8 +572,6 @@
     <string name="overview_editquickwizard_usebasaliob">Калкулиране на базален IOB</string>
     <string name="overview_editquickwizard_usetrend">Калкулиране на тенденция КЗ</string>
     <string name="overview_editquickwizard_usesuperbolus">Калкулиране суперболус</string>
-    <string name="yes">Да</string>
-    <string name="no">Не</string>
     <string name="positiveonly">Само положителни</string>
     <string name="negativeonly">Само отрицателни</string>
     <string name="overview_editquickwizard_usecob">Калкулиране на COB</string>
@@ -612,8 +618,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">Няма достатъчно инсулин в резервоара</string>
     <string name="extendedbolusdeliveryerror">Грешка при доставяне на удължен болус</string>
     <string name="insightpump_shortname">Sight</string>
-    <string name="set_neutral_temps_title">Прилагане на неутрални временни базали</string>
-    <string name="set_neutral_temps_summary">Ако е вкл, то ще анулира временен базал на всеки час. Това може да помогне за спиране на  звук/вибрация от някой помпи на всеки час.</string>
     <string name="enablesmbalways">Разреши SMB постоянно</string>
     <string name="enablesmbalways_summary">Разрешава SMB постоянно и независимо от болусите. Възможно само с източник на КЗ с добра филтрация като G5  </string>
     <string name="enablesmbaftercarbs">Разреши SMB след въглехидрати</string>
@@ -762,7 +766,7 @@
     <string name="diawarning">Моля, не забравяйте: нови инсулин профили изискват време на действие на инсулиина - DIA от поне 5ч. DIA 5-6ч на нов профил е равно на DIA 3ч при стари инсулин профили.</string>
     <string name="setupwizard_profile_description">Моля изберете вид профил. Ако пациентът е дете, трябва да използвате NS профил. Ако никой освен Вас не ви проследява в Nightscout вероятно ще предпочетете Локален профил. Моля, не забравяйте, че тук само избирате източника на профил. За да го използвате трябва да го активирате с натискане на \"Смяна на профила\"</string>
     <string name="setupwizard_aps_description">Изберете един от наличните алгоритми. Те са подредени от най-стария до най-новия. По-новите алгоритми са обикновено по-мощни и по-агресивни. Така ако сте новак в APS системите може да започнете с AMA. Не забравяйте да прочетете документацията на OpenAPS и да го конфигурирате преди употреба.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Изчакване на RileyLink връзка…\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Конфигурация на RileyLink. След избиране на RileyLink, ще е възможно неговото конфигуриране, след като статуса му е \"Свързан\". Може да отнеме време \n</string>
     <string name="setupwizard_pump_pump_not_initialized"><b>Заб:</b> Можете да продължите след като помпата се инициализира.\n</string>
     <string name="startobjective">Започнете първа цел</string>
     <string name="permission">Разрешение</string>
@@ -790,7 +794,6 @@
     <string name="sensitivity_raises_target_title">Чувствителността увеличава целта</string>
     <string name="sensitivity_raises_target_summary">Когато се установи чувствителност, повишаване на целевата глюкоза</string>
     <string name="combo_invalid_setup">Невалидни настройки на помпата, проверете wiki и се уверете че меню Quick Info се казва QUICK INFO, с помощта на 360 софтуера.</string>
-    <string name="custom">По избор</string>
     <string name="careportal_removestartedevents"> AndroidAPS стартира</string>
     <string name="storedsettingsfound">Открити са предишни настройки</string>
     <string name="allow_hardware_pump_text">Внимание: Ако активирате и свържете с хардуерна помпа, AndroidAPS ще копира основните настройки от профила в помпата, като презапише съществуващата базова скорост, съхранявана на помпата. Уверете се, че имате правилните основни настройки в AndroidAPS. Ако не сте сигурни или не искате да презапишете основните настройки на помпата, натиснете Cancel и повторете превключването към помпата по-късно.</string>
@@ -978,7 +981,9 @@
     <string name="description_source_dexcom">Да получава данни за КЗ от модифицираното приложение на Dexcom.</string>
     <string name="notification">Известие</string>
     <string name="notification_message">Известие: %1$s</string>
+    <string name="alarm_message">Аларма: %1$s</string>
     <string name="message_short">Съоб:</string>
+    <string name="alarm_short">Алармa:</string>
     <string name="profilepercentage">Профил процент</string>
     <string name="percent_u">Процент [%]:</string>
     <string name="startprofile">Стартирай профил %1$d%% за %2$d мин</string>
@@ -1180,4 +1185,15 @@
     <string name="filter">Филтър</string>
     <string name="copytolocalprofile_invalid">Не може да се създаде локален профил. Профилът е невалиден.</string>
     <string name="cta_dont_kill_my_app_info">Не убивай приложението?</string>
+    <string name="alarm">Аларма</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Изпращане на SMS, ако помпата е недостъпна</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>
 </resources>

app/src/main/res/values-cs-rCZ/exam.xml

@@ -1,167 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Co je pravda o DIA?</string>
-    <string name="dia_label_exam">Téma: Doba trvání účinku inzulínu</string>
-    <string name="dia_minimumis3h">Minimální hodnota je 3 hodiny.</string>
+    <string name="dia_label_exam">Doba působnosti inzulínu (DIA)</string>
+    <string name="dia_profile">Měli byste nastavit hodnotu DIA ve vašem profilu.</string>
     <string name="dia_minimumis5h">Minimální hodnota je 5 hodin.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#inzulin</string>
-    <string name="dia_meaningisequaltodiapump">Význam se shoduje s parametrem DIA používaným ve vaší pumpě.</string>
-    <string name="dia_valuemustbedetermined">Musíte určit svou individuální hodnotu (ale ne méně než 5 hodin).</string>
-    <string name="hypott_label">Téma: Dočasný cíl Hypoglykémie</string>
+    <string name="dia_meaningisequaltodiapump">Pokud jste spokojeni s tím, že hodnota DIA použitá v pumpě před AndroidAPS dobře fungovala, není třeba ji měnit, když začínáte se smyčkou.</string>
+    <string name="dia_valuemustbedetermined">Měli byste si pro sebe určit příslušnou hodnotu DIA.</string>
+    <string name="hypott_label">Dočasný cíl při hypoglykémii</string>
     <string name="hypott_whenhypott">Co je primárním důvodem k nastavení dočasného cíle Hypoglykémie?</string>
-    <string name="hypott_goinglow">Zabránit nízké glykémii, pokud je již spuštěn nulový dočasný bazál.</string>
-    <string name="hypott_preventoversmb">Aby se zabránilo AAPS podání příliš velkého množtví inzulínu po růstu glykémie způsobenému rychlými sacharidy použtými k léčbě hypoglykémie.</string>
+    <string name="hypott_wrongbasal">Opravovat hypoglykémie způsobené nesprávným nastavením bazálu.</string>
+    <string name="hypott_preventoversmb">Aby se zabránilo přehnané korekci, způsobené rychlými sacharidy použitými k léčbě hypoglykémie.</string>
+    <string name="hypott_exercise">Napravit hypo jako důsledek fyzické aktivity.</string>
+    <string name="hypott_0basal">Aby se zabránilo snížení hladiny glukózy v krvi, pokud již běží 0% dočasný bazál.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Který profil lze použít a konfigurovat offline?</string>
     <string name="offlineprofile_label">Téma: Offline profil</string>
     <string name="offlineprofile_nsprofile">NS profil může být použit, ale ne nastaven.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Téma: Odpojení od pumpy</string>
-    <string name="pumpdisconnect_letknow">Klepněte na \"Odpojit pumpu\" tak, aby AAPS vědělo, že není dodáván žádný inzulín.</string>
-    <string name="pumpdisconnect_suspend">Klepněte na tlačítko \"Pozastavit smyčku\", aby AAPS zastavil smyčku na dobu, co je pumpa odpojená.</string>
-    <string name="pumpdisconnect_dontchnage">Neměňte nic v AAPS, jen odpojte pumpu.</string>
+    <string name="pumpdisconnect_label">Důvody pro použití \"Odpojit pumpu\" v AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">Co se má provést při odpojení pumpy?</string>
+    <string name="pumpdisconnect_unnecessary">To je zbytečné, protože inzulín nebude dodáván v případě, že je pumpa fyzicky odpojena.</string>
+    <string name="pumpdisconnect_missinginsulin">Zabraňuje AndroidAPS započítat inzulín, který nebyl dodán, když je pumpa fyzicky odpojena</string>
+    <string name="pumpdisconnect_notstop">Nezastaví vydávání inzulínu, pokud pumpa zůstane připojena.</string>
+    <string name="pumpdisconnect_openloop">Pošle AndroidAPS do režimu otevřené smyčky.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#dalsi-nastaveni</string>
-    <string name="objectives_label">Téma: Nastavení AndroidAPS</string>
+    <string name="objectives_label">AndroidAPS nastavení</string>
+    <string name="objectives2_label">AndroidAPS nastavení</string>
     <string name="objectives_howtosave">Jaké jsou nejlepší postupy pro zálohování vašich nastavení?</string>
-    <string name="objectives_exportsettings">Exportovat je lokálně z nabídky Údržba.</string>
-    <string name="objectives_storeelsewhere">Uložte exportovaný soubor do jiného umístění, např. e-mail, Dropbox, Disk Google…</string>
-    <string name="objectives_doexportonstart">Exportovat je ihned po instalaci AAPS.</string>
-    <string name="objectives_doexportafterchange">Vyexportujte je po provedení změn v nastavení.</string>
-    <string name="objectives_doexportafterobjective">Exportujte je po dokončení cíle.</string>
-    <string name="objectives_doexportafterfirtssettings">Exportovat je, jakmile dokončíte počáteční nastavení.</string>
+    <string name="objectives_notesettings">Nastavení není třeba exportovat za předpokladu, že jste si je poznamenali.</string>
+    <string name="objectives_afterobjective">Exportujte svá nastavení po dokončení cíle.</string>
+    <string name="objectives_afterchange">Exportujte svá nastavení po změně kteréhokoli z vašich nastavení.</string>
+    <string name="objectives_afterinitialsetup">Exportujte své nastavení po dokončení počátečního nastavení a nastavení předvoleb.</string>
+    <string name="objectives2_maintenance">Exportujte vaše nastavení lokálně pomocí nabídky menu údržby.</string>
+    <string name="objectives2_internalstorage">Soubor nastavení se nachází ve složce Interní úložiště/AAPS/preferences vašeho telefonu.</string>
+    <string name="objectives2_cloud">Zkopírujte soubor předvoleb do bezpečného umístění mimo telefon (např. pomocí cloudového disku, připojením kabelu k počítači, e-mailem apod.)</string>
+    <string name="objectives2_easyrestore">Je-li váš telefon poškozen nebo ztracen, existují jednoduché způsoby, jak vzdáleně obnovit vaše nastavení bez zálohování.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#jake-vybaveni-pro-pripad-nouze-se-doporucuje-brat-s-sebou</string>
-    <string name="noisycgm_label">Téma: Šum dat ze senzoru</string>
+    <string name="noisycgm_label">Šum dat ze senzoru</string>
     <string name="noisycgm_whattodo">Co by mělo být provedeno v případě, že CGM data poskakují?</string>
-    <string name="nothing">Nic, smyčka se s tím vypořádá.</string>
-    <string name="noisycgm_pause">Zakažte smyčku, abyste se vyhnuli předávkování inzulínem.</string>
-    <string name="noisycgm_replacesensor">Vyměňte senzor.</string>
-    <string name="noisycgm_turnoffphone">Vypnout telefon.</string>
-    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#vyhlazovani-zarusenych-dat-glykemii</string>
+    <string name="noisycgm_nothing">Nic, smyčka se s tím vypořádá.</string>
+    <string name="noisycgm_pause">Zakažte uzavřenou smyčku, aby nedošlo k předávkování nebo poddávkování.</string>
+    <string name="noisycgm_replacesensor">Nahraďte trvale zašůměné nebo nepřesné senzory.</string>
     <string name="noisycgm_checksmoothing">Ověřte, že vaše aplikace CGM vyhlazuje gklykémie.</string>
-    <string name="exercise_label">Téma: Cvičení</string>
-    <string name="exercise_whattodo">Jak můžete pomoci systému vypořádat se s cvičením?</string>
-    <string name="exercise_setactivitytt">Použití funkce dočasný cíl.</string>
-    <string name="exercise_switchprofilebelow100">Přepnout na profil pod 100 %.</string>
-    <string name="exercise_switchprofileabove100">Přepnout na profil nad 100 %.</string>
-    <string name="exercise_stoploop">Zastavit smyčku.</string>
-    <string name="exercise_doitbeforestart">Nastavit dočasný cíl aktivity před zahájením cvičení.</string>
-    <string name="exercise_afterstart">Nastavení dočasného cíle aktivity až po zahájení cvičení vede k horšímu výsledku, než kdyby byl spuštěn před.</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#vyhlazovani-zarusenych-dat-glykemii</string>
+    <string name="exerciseprofile_label">Cvičení a profily</string>
+    <string name="exerciseprofile_whattodo">Jak můžete použít profily, abyste mohli nejlépe pomoci systému řešit aerobní cvičení?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Přepnout na profil pod 100 %.</string>
+    <string name="exerciseprofile_switchprofileabove100">Přepnout profil na více než 100 %.</string>
+    <string name="exerciseprofile_leaveat100">Ponechte profil nastavený na hodnotu 100%.</string>
+    <string name="exerciseprofile_suspendloop">Pozastavte smyčku.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/temptarget.html#docasny-cil-pri-pohybove-aktivite</string>
+    <string name="exercise_label">Cvičení a dočasné cíle</string>
+    <string name="exercise_whattodo">Jak můžete použít dočasné cíle pro nejlepší pomoc při práci se systémem při aerobním cvičení?</string>
+    <string name="exercise_settt">Nastavte cílovou hodnotu glykémie vhodnou dobu před zahájením cvičení.</string>
+    <string name="exercise_setfinished">Po ukončení cvičení nastavte cílovou hodnotu glykémie.</string>
+    <string name="exercise_setunchanged">Nechte svůj cíl glykémie beze změny.</string>
+    <string name="exercise_15g">Počkejte, dokud glykémie neklesne pod Váš dočasný cíl hypoglykémie a pak snězte15 g rychlých sacharidů.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/temptarget.html#docasny-cil-pri-pohybove-aktivite</string>
-    <string name="suspendloop_label">Téma: Zakázaná/Pozastavená smyčka</string>
+    <string name="suspendloop_label">Zakázaná/pozastavená smyčka</string>
     <string name="suspendloop_doigetinsulin">Dostávám inzulín, když je smyčka zakázána/pozastavena?</string>
     <string name="suspendloop_yes">Ano, bazální inzulín se dále dodává.</string>
     <string name="suspendloop_no">Ne, podávání inzulínu je zastaveno.</string>
-    <string name="basaltest_label">Téma: Testování bazálu, ISF a IC</string>
-    <string name="basaltest_when">Kdy mám ověřit hodnoty bazálů, ISF a IC?</string>
+    <string name="basaltest_label">Testování bazálu, ISF a IC</string>
+    <string name="basaltest_when">Kdy mají být tyto hodnoty ověřeny?</string>
     <string name="basaltest_beforeloop">Než začnu provozovat smyčku.</string>
-    <string name="basaltest_havingregularhypo">Pokud máte často nízké glykémie.</string>
-    <string name="basaltest_havingregularhyper">Pokud máte často vysoké glykémie.</string>
+    <string name="basaltest_havingregularhighlow">Při častém výskytu vysoké nebo nízké hladiny glykémie v krvi.</string>
+    <string name="basaltest_weekly">Minimálně jednou týdně.</string>
+    <string name="basaltest_fixed">Jakmile jsou tyto hodnoty nastaveny a ověřeny, neměly by se časem měnit.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#nastaveni-androidaps</string>
-    <string name="prerequisites_label">Téma: Nezbytné předpoklady</string>
-    <string name="prerequisites_what">Co potřebuji?</string>
+    <string name="prerequisites_label">Požadavky</string>
+    <string name="prerequisites_what">Co je nezbytné pro nastavení a používání AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Ověřené informace o profilu (Bazál, IC, ISF, DIA).</string>
-    <string name="prerequisites_computer">Počítač pro vytvoření APK.</string>
+    <string name="prerequisites_computer">Počítač s nainstalovanou a konfigurovanou aplikací Android Studio.</string>
     <string name="prerequisites_phone">Podporovaný telefon.</string>
-    <string name="prerequisites_car">Auto.</string>
-    <string name="prerequisites_nightscout">Nightscout, pro splnění cílů.</string>
+    <string name="prerequisites_pump">Kompatibilní inzulínová pumpa, pokud plánujete spuštění uzavřené smyčky.</string>
+    <string name="prerequisites_nightscout">Nightscout pro záznam všech dat a kontrolu nastavení.</string>
     <string name="prerequisites_tidepoolaccount">Účet Tidepool.</string>
     <string name="prerequisites_googleaccount">Účet Google.</string>
     <string name="prerequisites_githubaccount">Účet Github.</string>
-    <string name="prerequisites_beanandroiddeveloper">Zkušenosti s vývojem pro Android.</string>
+    <string name="prerequisites_beanandroiddeveloper">Zkušenosti s programováním nebo úpravou kódu.</string>
     <string name="prerequisites_own670g">Pumpu MiniMed 670G.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Module/module.html</string>
     <string name="prerequisites_smartwatch">Chytré hodinky.</string>
     <string name="prerequisites_supportedcgm">Podporované CGM.</string>
-    <string name="update_label">Téma: Aktualizace AndroidAPS</string>
-    <string name="whatistrue">Co je pravda?</string>
-    <string name="update_git">Musíte mít nainstalován Git.</string>
-    <string name="update_asap">Aktualizujte ihned, jakmile se uvolní nová verze a bude mít dostatek času na to, aby to bylo možné provést.</string>
-    <string name="update_keys">Měli byste používat stejné podpisové klíče.</string>
+    <string name="prerequisites2_label">Požadavky</string>
+    <string name="prerequisites2_what">Co je nezbytné pro nastavení a používání AndroidAPS?</string>
+    <string name="prerequisites2_profile">Ověřené informace pro nastavení profilu (ISF, poměr I:C, bazální dávky, DIA atd.).</string>
+    <string name="prerequisites2_device">Kompatibilní Android zařízení (např. mobilní telefon, Android hodinky nebo tablet).</string>
+    <string name="prerequisites2_internet">AndroidAPS vyžaduje připojení k internetu pro spuštění uzavřené smyčky.</string>
+    <string name="prerequisites2_supportedcgm">Podporované CGM a vhodná aplikace pro příjem glykémií v telefonu/zařízení.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Module/module.html</string>
+    <string name="update_label">Aktualizace AndroidAPS</string>
+    <string name="whatistrue">Zatrhněte všechny správné odpovědi.</string>
+    <string name="update_git">Musíte mít nainstalovaný a nakonfigurovaný Git na vašem počítači.</string>
+    <string name="update_asap">Pokud jsou uvolněny aktualizované verze AndroidAPS, starší verze mohou být po určité době vzdálené omezeny.</string>
+    <string name="update_keys">Měli byste uložit a zaznamenat umístění úložiště klíčů a použít stejný podpisový klíč pro aktualizace jako pro vaši předchozí instalaci.</string>
     <string name="update_neverupdate">Nikdy neaktualizujte, pokud systém funguje dobře.</string>
-    <string name="update_askfriend">Požádejte kamaráda o novou verzi APK.</string>
+    <string name="update_askfriend">Máte-li potíže se sestavením apk, můžete nainstalovat apk, který byl vybudován přítelem.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Installing-AndroidAPS/Update-to-new-version.html</string>
-    <string name="troubleshooting_label">Téma: Odstraňování problémů</string>
-    <string name="troubleshooting_wheretoask">Kde hledat pomoc?</string>
-    <string name="troubleshooting_fb">Připojte se do facebookové skupiny AndroidAPS.</string>
-    <string name="troubleshooting_wiki">Přečtěte si dokumentaci AndroidAPS.</string>
-    <string name="troubleshooting_gitter">Navštivte místnost AndroidAPS na Gitteru.</string>
-    <string name="troubleshooting_googlesupport">Navštivte Google podporu AndroidAPS</string>
-    <string name="troubleshooting_yourendo">Promluvte si se svým diabetologem.</string>
+    <string name="troubleshooting_label">Řešení problémů</string>
+    <string name="troubleshooting_wheretoask">Kde můžete hledat pomoc s AndroidAPS?</string>
+    <string name="troubleshooting_fb">Můžete požádat o radu v Facebookové skupině uživatelů AndroidAPS.</string>
+    <string name="troubleshooting_wiki">Měli byste si přečíst (a znovu přečíst) dokumentaci AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Můžete požádat o radu a nahlásit technické problémy nebo potíže na Gitteru.</string>
+    <string name="troubleshooting_yourendo">Měli byste se zeptat svého lékaře/endokrinologa.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/index.html#poradce-pri-potizich</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Téma: Inzulínové pluginy</string>
-    <string name="insulin_ultrarapid">Jaký druh inzulínu může být použit s pluginem \'Ultra-Rychlý-Oref\'?</string>
+    <string name="insulin_label">Pluginy Inzulín</string>
+    <string name="insulin_ultrarapid">Který inzulin byste měli používat s pluginem Ultra-Rapid Oref?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_novorapid">NovoRapid ® /Novolog ®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid ®/Humilin R ®/\"běžný\" lidský inzulín.</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#inzulin</string>
-    <string name="sensitivity_label">Téma: Pluginy citlivosti</string>
-    <string name="sensitivity_which">Který algoritmus citlivosti má konfigurovatelnou dobu detekce?</string>
+    <string name="sensitivity_label">Pluginy Citlivost</string>
+    <string name="sensitivity_which">Zatrhněte všechny správné odpovědi.</string>
+    <string name="sensitivity_adjust">Pluginy citlivosti umožňují AndroidAPS přizpůsobit se dočasným nebo krátkodobým změnám v citlivosti inzulinu (například hormonální změny nebo problémy s absorpcí na infúzním místě).</string>
+    <string name="sensitivity_edit">Pluginy citlivosti poskytují uživateli návrh změn bazálních hodnot, I:C poměrů a ISF, které mohou být použity k úpravě profilu.</string>
+    <string name="sensitivity_cannula">Výměna kanyly nebo změna profilu automaticky nastaví Autosense zpět na 100%.</string>
+    <string name="sensitivity_time">Některé pluginy mají konfigurovatelné časové rozmezí, které může nastavit uživatel.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#detekce-citlivosti</string>
-    <string name="sensitivityuam_which">Který modul citlivosti musí být použit pro funkci UAM (rozpoznání neoznámeného jídla)?</string>
-    <string name="wrongcarbs_label">Téma: Chyby při zadávání sacharidů</string>
+    <string name="wrongcarbs_label">Chyby při zadávání sacharidů</string>
     <string name="wrongcarbs_whattodo">Co byste měli udělat, pokud jste zadali chybně sacharidy?</string>
-    <string name="wrongcarbs_treatmentstab">V Ošetřeních odstraňte chybnou položku. Zadejte nové sacharidy.</string>
-    <string name="wrongcarbs_addfakeinsulin">Přidat falešný inzulin pomocí funkce Doplňování</string>
-    <string name="extendedcarbs_label">Téma: Jídlo s tukem a bílkovinami</string>
-    <string name="extendedcarbs_handling">Co dělat, když jídlo obsahuje vysoké množství tuků a/nebo bílkovin?</string>
-    <string name="extendedcarbs_useextendedcarbs">Přepočítejte tuky a bílkoviny na sacharidy a použijte funkci „Rozložené sacharidy“.</string>
-    <string name="extendedcarbs_add">Přepočítejte tuky a bílkoviny na sacharidy a přidejte je do výpočtu bolusu.</string>
-    <string name="extendedcarbs_useextendedbolus">Použijte prodloužený bolus, abyste pokryli tuky a bílkoviny.</string>
+    <string name="wrongcarbs_treatmentstab">Odstraňte nesprávný záznam v Ošetření a zadejte správnou novou hodnotu sacharidů.</string>
+    <string name="wrongcarbs_addinsulin">Pošlete inzulín pomocí plnění/doplňování.</string>
+    <string name="wrongcarbs_donothing">Nic nedělejte – AndroidAPS provede příslušné úpravy.</string>
+    <string name="wrongcarbs_bolus">Pošlete inzulín pomocí ikony Inzulín v přehledu.</string>
+    <string name="wronginsulin_label">Chyby v podání inzulínu</string>
+    <string name="wronginsulin_whattodo">Co byste měli udělat, pokud jste dostali méně inzulínu, než ukazuje historie pumpy, např. v důsledku okluze, vadné kanyly nebo zapomenutí na opětovné připojení pumpy po sprše? </string>
+    <string name="wronginsulin_careportal">Odstraňte data z Nightscoutu pro odstranění z historie pumpy.</string>
+    <string name="wronginsulin_compare">Porovnejte hodnoty v AndroidAPS a historii pumpy.</string>
+    <string name="wronginsulin_prime">Pošlete bolus na vypočtený „chybějící“ inzulín buď injekční stříkačkou nebo perem nebo pomocí plnění na pumpě.</string>
+    <string name="wronginsulin_donothing">Neudělejte nic a dovolte AndroidAPS opravit jakoukoliv výslednou vysokou hladinu glukózy v krvi.</string>
+    <string name="iob_label">Aktivní inzulín (IOB)</string>
+    <string name="iob_which">Zatrhněte všechny správné odpovědi.</string>
+    <string name="iob_value">Hodnota IOB je ovlivněna vydanými dočasnými bazály.</string>
+    <string name="iob_hightemp">Vysoký dočasný bazál nebude spuštěn, pokud je Váše glykémie nižší než cíl.</string>
+    <string name="iob_negiob">Negativní IOB po značnou dobu bez cvičení naznačuje, že váš profil je příliš \"silný\" a ve vašem profilu je potřeba méně inzulínu.</string>
+    <string name="iob_posiob">Pozitivní IOB na značnou dobu naznačuje rezistenci vůči inzulinu nebo neohlášené jídlo.</string>
+    <string name="breadgrams_label">Zadávání sacharidů a bolusy</string>
+    <string name="breadgrams_grams">Pouze gramy by měly být použity pro odhad a záznam spotřebovaných sacharidů.</string>
+    <string name="breadgrams_exchange">Spotřebované sacharidy lze nahrávat pomocí vhodného systému (např. \"výměnné jednotky\").</string>
+    <string name="breadgrams_decay">AndroidAPS používá dynamický model k odhadu vstřebávání sacharidů a k výpočtu COB.</string>
+    <string name="breadgrams_calc">Pokud jsou hladiny glykémie v krvi mimo přijatelné hodnoty (příliš nízké nebo příliš vysoké), může být použit bolusová kalkulačka k podávání návrhů na sacharidy nebo na korekční bolus.</string>
+    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#inzulinovosacharidovy-pomer-ic-g-u</string>
+    <string name="extendedcarbs_label">e-sacharidy</string>
+    <string name="extendedcarbs_handling">Na co byste mohli použít e-sacharidy (prodloužené sacharidy)?</string>
+    <string name="extendedcarbs_future">Pro plánování budoucích sacharidů, případně distribuovaných v intervalu (podobné prodlouženému bolusu).</string>
+    <string name="extendedcarbs_free">Pro zaznamenání \'falešných\' sacharidů při cvičení, které chcete skrýt v AndroidAPS.</string>
+    <string name="extendedcarbs_fat">e-sacharidy (distribuované v budoucnu) mohou AndroidAPS pomoci při nakládání s jídly s vysokým obsahem tuku/bílkovin.</string>
+    <string name="extendedcarbs_rescue">Pro zaznamenání rychlých sacharidů použitých k léčbě nízké hladiny glykémie v krvi</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Téma: Vzdálené sledování</string>
-    <string name="nsclient_howcanyou">Jak můžete na dálku monitorovat AAPS svého dítěte?</string>
-    <string name="nsclient_nightscout">Pomocí stránky Nightscout.</string>
-    <string name="nsclient_dexcomfollow">Dexcom follow, pokud používáte originální aplikaci Dexcom (pouze hodnoty glykémie).</string>
-    <string name="nsclient_dexcomfollowxdrip">Aplikace Dexcom Follow, pokud používáte aplikaci xDrip.</string>
-    <string name="nsclient_xdripfollower">Aplikace xDrip v režimu sledování.</string>
-    <string name="nsclient_looponiphone">Aplikace Loop na iPhone.</string>
-    <string name="nsclient_spikeiphone">Aplikace Spike na iPhone.</string>
+    <string name="nsclient_label">Vzdálené sledování</string>
+    <string name="nsclient_howcanyou">Jak můžete vzdáleně monitorovat AndroidAPS (například své dítě)?</string>
+    <string name="nsclient_nightscout">NS Client, aplikace Nightscout a webová stránka Nightscout umožnují sledovat AndroidAPS vzdáleně.</string>
+    <string name="nsclient_dexcomfollow">Další aplikace (např. Dexcom follow, xDrip běžící v režimu sledování) vám umožňují sledovat některé parametry (např. hodnoty glykémie) na dálku, ale použití různých algoritmů může mít vliv na nepřesné hodnoty IOB nebo COB.</string>
+    <string name="nsclient_data">Chcete-li sledovat AndroidAPS dálkově, musí mít obě zařízení přístup k internetu (např. přes Wi-Fi nebo mobilní síť/mobilní síť).</string>
+    <string name="nsclient_fullcontrol">NSClient umožní oboje: monitorovat a poskytovat plnou kontrolu nad AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Children/Children.html</string>
-    <string name="isf_label_exam">Téma: Citlivost na inzulín</string>
-    <string name="isf_increasingvalue">Vyšší hodnoty ISF vedou k menší dávce inzulínu při korigování vysoké glykémie.</string>
-    <string name="isf_decreasingvalue">Nižší hodnoty ISF vedou k menší dávce inzulínu při korigování vysoké glykémie.</string>
-    <string name="isf_noeffect">Změna hodnoty ISF nemá vliv na dávku inzulínu při korigování vysoké glykémie.</string>
-    <string name="isf_preferences">Musíte zadat citlivost v Nastavení.</string>
+    <string name="isf_label_exam">Citlivost inzulínu (ISF)</string>
+    <string name="isf_increasingvalue">Zvýšení hodnot citlivosti povede k větší dodávce inzulínu k pokrytí určitého množství sacharidů.</string>
+    <string name="isf_decreasingvalue">Snížení hodnot citlivosti vede k většímu množství inzulinu pro korekci vyšší glykémie.</string>
+    <string name="isf_noeffect">Zvýšení nebo snížení citlivosti nemá žádný vliv na výdej inzulinu, pokud jsou hladiny glykémie v krvi pod cílovou hodnotou.</string>
+    <string name="isf_preferences">ISF by měl být zadán do předvoleb AndroidAPS.</string>
     <string name="isf_profile">Změna hodnoty citlivosti ve vašem profilu postačuje k tomu, aby se tato změna použila.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#korekcni-faktor-citlivost-na-inzulin-isf-mmol-l-u-nebo-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Téma: Inzulino-sacharidový poměr</string>
-    <string name="ic_increasingvalue">Vyšší hodnoty IC vedou k menší dávce inzulínu pro stejné množství sacharidů.</string>
-    <string name="ic_decreasingvalue">Nižší hodnoty IC vedou k menší dávce inzulínu pro stejné množství sacharidů.</string>
+    <string name="ic_multiple">Ve svém profilu můžete použít více než jednu hodnotu poměru I:C.</string>
+    <string name="ic_isf">Změníte-li ISF ve svém profilu, měli byste vždy změnit také poměr I:C.</string>
+    <string name="ic_label_exam">Inzulínosacharidový poměr (I:C)</string>
+    <string name="ic_increasingvalue">Vyšší hodnoty I:C vedou k menší dávce inzulínu pro stejné množství sacharidů.</string>
+    <string name="ic_decreasingvalue">Nižší hodnoty I:C vedou k menší dávce inzulínu pro stejné množství sacharidů.</string>
     <string name="ic_noeffect">Pokud máte 0 COB změna inzulino-sacharidového poměru povede k jinému množství inzulínu vydanému pro korekci glykémie.</string>
     <string name="ic_different">Inzulino-sacharidový poměr se bude lišit podle toho, zda počítáte výměnnou jednotku jako 10 g nebo jako 12 g sacharidů.</string>
     <string name="ic_meaning">Inzulino-sacharidový poměr vyjadřuje: kolik výměnných jednotek pokryje 1 jednotka inzulinu.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#inzulino-sacharidovy-pomer-cr-g-u</string>
-    <string name="profileswitch_label">Téma: Přepínání profilu</string>
-    <string name="profileswitch_pctwillchange">Když v přepnutí profilu zadáte 90 %…</string>
-    <string name="profileswitch_basalhigher">Bazály budou o 10 % vyšší.</string>
+    <string name="profileswitch_label">Přepnutí profilu</string>
+    <string name="profileswitch_pctwillchange">Když zadáte 90% profil, které odpovědi jsou pravdivé?</string>
     <string name="profileswitch_basallower">Bazály budou o 10 % nižší.</string>
-    <string name="profileswitch_ichigher">Hodnota inzulino-sacharidového poměru bude o 10 % vyšší.</string>
-    <string name="profileswitch_iclower">Hodnota inzulino-sacharidového poměru bude o 10 % nižší.</string>
     <string name="profileswitch_isfhigher">Hodnota citlivosti bude o 10 % vyšší.</string>
-    <string name="profileswitch_isflower">Hodnota citlivosti bude o 10 % nižší.</string>
-    <string name="profileswitch_overall">Celkově dostanete o cca 10 % inzulinu méně.</string>
-    <string name="profileswitch_targethigher">Cíl bude o 10 % vyšší.</string>
-    <string name="profileswitch_targetlower">Cíl bude o 10 % nižší.</string>
-    <string name="profileswitch_targetbottom">Pouze dolní cíl bude o 10 % nižší.</string>
+    <string name="profileswitch_iclower">Hodnota poměru I:C bude o 10% nižší.</string>
+    <string name="profileswitch_unchanged">Hodnoty ISF a I:C nebudou změněny.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html?highlight=p%C5%99epnut%C3%AD%20profilu</string>
-    <string name="profileswitchtime_iwant">Pokud se probudíte o 1h dříve než obvykle, jak byste měli oznámit AAPS tuto změnu?</string>
-    <string name="profileswitchtime_1">Proveďte přepnutí profilu s posunem času 1</string>
-    <string name="profileswitchtime__1">Proveďte přepnutí profilu s posunem času -1</string>
+    <string name="profileswitch2_label">Přepnutí profilu</string>
+    <string name="profileswitch2_pctwillchange">Když zadáte 120% profil, které odpovědi jsou pravdivé?</string>
+    <string name="profileswitch2_bghigher">Cílová glykémie bude o 20 % vyšší.</string>
+    <string name="profileswitch2_basalhigher">Bazály budou o 20 % vyšší.</string>
+    <string name="profileswitch2_bgunchanged">Cílová glykémie se nezmění.</string>
+    <string name="profileswitch2_isfhigher">Hodnota citlivosti bude o 20 % vyšší.</string>
+    <string name="profileswitchtime_label">Přepnutí profilu</string>
+    <string name="profileswitchtime_iwant">Pokud se probudíte o 2h dříve než obvykle, jak byste měli oznámit AndroidAPS tuto změnu?</string>
+    <string name="profileswitchtime_2">Proveďte přepnutí profilu s posunem času 2</string>
+    <string name="profileswitchtime__2">Proveďte přepnutí profilu s posunem času -2</string>
+    <string name="profileswitchtime_tt">Nastavte dočasný cíl pro blížící se jídlo.</string>
+    <string name="profileswitchtime_100">Přepněte profil na více než 100%. </string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html#posun-casu</string>
-    <string name="profileswitchtime_60">Proveďte přepnutí profilu s posunem času 60</string>
-    <string name="profileswitchtime__60">Proveďte přepnutí profilu s posunem času -60</string>
+    <string name="profileswitch4_label">Změna profilu</string>
+    <string name="profileswitch4_rates">V profilech by měly být nastaveny bazální dávky, ISF, I:C poměry, atd.</string>
+    <string name="profileswitch4_internet">Aktivace změn vašeho profilu Nightscout vyžaduje, aby váš telefon AndroidAPS měl k dispozici připojení k Internetu.</string>
+    <string name="profileswitch4_sufficient">Úprava profilů za účelem změny hodnot je dostatečná k provedení všech provedených změn.</string>
+    <string name="profileswitch4_multi">Je možné nastavit a vybrat z více profilů za účelem přizpůsobení se měnícím se okolnostem (např. hormonální změny, pracovní dny směny, pracovní dny/víkend životního stylu).</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Module/module.html#spravny-individualni-algoritmus-davkovani-pro-lecbu-vaseho-diabetu</string>
-    <string name="basalhelp_label">Téma: Pomoc s bazály</string>
+    <string name="basalhelp_label">Pomoc s bazály</string>
     <string name="basalhelp_where">Kam jít pro pomoc s bazály apod.</string>
     <string name="basalhelp_diabetesteam">K Vašemu lékaři</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Jiné léky</string>
+    <string name="other_medication_label">Ostatní léky. Přečtěte si prosím níže uvedené prohlášení a poté zaškrtněte políčko pro přijetí prohlášení.</string>
     <string name="other_medication_text">AAPS snižuje bazály na zvýšení hladiny cukru v krvi. Léky ze skupiny inhibitorů SGLT2 (glifloziny) mohou zabránit očekávanému zvýšení hodnoty glykémie, a tak mohou produkovat nebezpečný nedostatek inzulínu (ketoacidózu).
-\nSpolečné značky jsou: Invokana ®, Forxiga ®, Jardiance ®, Steglatro ®, Suglat ®, Apleway ®, Deberza ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\n. Tímto slibuji, že tyto léky neberu při používání AAPS nebo deaktivuji smyčku před užíváním těchto léků.</string>
+\nBěžné značky jsou: Invokana ®, Forxiga ®, Jardiance ®, Steglatro ®, Suglat ®, Apleway ®, Deberza ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\nTímto slibuji, že tyto léky neberu při používání AndroidAPS nebo deaktivuji smyčku před užíváním těchto léků.</string>
 </resources>

app/src/main/res/values-cs-rCZ/objectives.xml

@@ -40,7 +40,7 @@
     <string name="codeaccepted">Kód přijat</string>
     <string name="codeinvalid">Neplatný kód</string>
     <string name="objectives_exam_objective">Prokažte své znalosti</string>
-    <string name="objectives_exam_gate">Studujte a správně zodpovězte otázky</string>
+    <string name="objectives_exam_gate">Prostudujte otázky. Na každou otázku jste dostali čtyři možné odpovědi. Může existovat více než jedna správná odpověď. Zatrhněte prosím všechny odpovědi, které jsou správné, a potvrďte volbou ZKONTROLOVAT.</string>
     <string name="answerdisabledto">Odpovídání zakázáno do: %1$s</string>
     <string name="wronganswer">Špatná odpověď!</string>
     <string name="unfinshed_button">Další nedokončená</string>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Bezpečnost zadání ošetřeni</string>
     <string name="treatmentssafety_maxbolus_title">Maximální povolený bolus [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Maximální počet sacharidů [g]</string>
+    <string name="nav_preferences_plugin">Nastavení pluginu %1$s</string>
     <string name="nav_preferences">Nastavení</string>
     <string name="nav_refreshtreatments">Obnovit ošetření z NS</string>
     <string name="nav_resetdb">Inicializovat databáze</string>
@@ -405,11 +406,18 @@
     <string name="suspendloopfor3h">Pozastavit smyčku na 3 h</string>
     <string name="suspendloopfor10h">Pozastavit smyčku na 10 h</string>
     <string name="suspendloopforXmin">Pozastavit smyčku na %1$d min</string>
+    <string name="disconnectpump">Odpojit pumpu</string>
     <string name="disconnectpumpfor15m">Odpojit pumpu na 15 min</string>
     <string name="disconnectpumpfor30m">Odpojit pumpu na 30 min</string>
     <string name="disconnectpumpfor1h">Odpojit pumpu na 1 h</string>
     <string name="disconnectpumpfor2h">Odpojit pumpu na 2 h</string>
     <string name="disconnectpumpfor3h">Odpojit pumpu na 3 h</string>
+    <string name="duration15m">15 minut</string>
+    <string name="duration30m">30 minut</string>
+    <string name="duration1h">1 hodina</string>
+    <string name="duration2h">2 hodiny</string>
+    <string name="duration3h">3 hodiny</string>
+    <string name="duration10h">10 hodin</string>
     <string name="resume">Uvolnit</string>
     <string name="reconnect">Znovu připojit pumpu</string>
     <string name="smscommunicator_wrongduration">Chybná doba trvání</string>
@@ -564,8 +572,6 @@
     <string name="overview_editquickwizard_usebasaliob">Kalkulace bazálního IOB</string>
     <string name="overview_editquickwizard_usetrend">Kalkulace trendu</string>
     <string name="overview_editquickwizard_usesuperbolus">Kalkulace superbolusu</string>
-    <string name="yes">Ano</string>
-    <string name="no">Ne</string>
     <string name="positiveonly">Pouze kladné</string>
     <string name="negativeonly">Pouze záporné</string>
     <string name="overview_editquickwizard_usecob">Kalkulace COB</string>
@@ -612,8 +618,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">Nedostatek inzulínu pro takovýto bolus</string>
     <string name="extendedbolusdeliveryerror">Chyba spuštění extended bolusu</string>
     <string name="insightpump_shortname">Insight</string>
-    <string name="set_neutral_temps_title">Nastavit neutrální dočasný bazál</string>
-    <string name="set_neutral_temps_summary">Je-li povoleno, zastaví dočasný bazál před koncem každé hodiny. To může u některých pump pomoci zastavit pípání/vibrace v celou hodinu.</string>
     <string name="enablesmbalways">Vždy povolit SMB</string>
     <string name="enablesmbalways_summary">Povolit SMB nezávisle na bolusech. Možno pouze se zdroji glykémií s dobrým filtrováním dat, jako např. G5</string>
     <string name="enablesmbaftercarbs">Povolit SMB po jídle</string>
@@ -762,8 +766,8 @@
     <string name="diawarning">Pozor: Nové inzulínové profily vyžadují DIA minimálně 5h. DIA 5–6 hodin odpovídá zhruba nastavení 3h na starších typech profilů nebo v pumpě.</string>
     <string name="setupwizard_profile_description">Vyberte zdroj profilů. Pokud jde o dítě, využijte nejspíše NS profil. Pokud Vás nikdo přes NS nesleduje, budete patrně preferovat Místní profil. Uvědomte si, že nastavujete pouze zdroj profilů. Na to aby se opravdu profil začal používat, je třeba provést aktivaci profilu použitím \"Přepnutí profilu\"</string>
     <string name="setupwizard_aps_description">Vyberte jeden z algoritmů. Jsou setříděné od nejstaršího po nejnovější. Novější je obvykle lepší a agresivnější, ale vyžaduje přesnější nastavení. Proto pokud se smyčkou začínáte, měli byste nejdříve vybrat jen AMA a ne ten poslední. Nezapomeňte si přečíst dokumentaci k OpenAPS a provést nastavení, než ho začnete používat.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Čekám na připojení RileyLink.... \n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b>Poznámka:</b> Po inicializaci pumpy můžete pokračovat v nastavení.\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Prosím nakonfigurujte svůj RileyLink níže. Po výběru RileyLinku bude možné pokračovat v nastavení, jakmile stav RileyLinku je \"Připojeno\". Tato akce může chvilku trvat.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Poznámka:</b> Po nastavení pumpy můžete pokračovat v nastavení.\n</string>
     <string name="startobjective">Spusťte první cíl</string>
     <string name="permission">Povolení</string>
     <string name="askforpermission">Získat povolení</string>
@@ -790,7 +794,6 @@
     <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="combo_invalid_setup">Chybné nastavení pumpy. Projděte si dokumentaci a přesvědčete se, že menu Quick Info se jmenuje QUICK INFO, za použití 360 configuration software.</string>
-    <string name="custom">Volitelný</string>
     <string name="careportal_removestartedevents">Vyčistit události \"AndroidAPS restartován\"</string>
     <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>
@@ -978,7 +981,9 @@
     <string name="description_source_dexcom">Příjem hodnot glykémií z upravené aplikace Dexcom.</string>
     <string name="notification">Oznámení</string>
     <string name="notification_message">Oznámení: %1$s</string>
+    <string name="alarm_message">Poplach: %1$s</string>
     <string name="message_short">Zpráva:</string>
+    <string name="alarm_short">Alarm:</string>
     <string name="profilepercentage">Procento profilu</string>
     <string name="percent_u">Procent [%]:</string>
     <string name="startprofile">Spustit profil %1$d%% na %2$d min</string>
@@ -1180,4 +1185,15 @@
     <string name="filter">Filtr</string>
     <string name="copytolocalprofile_invalid">Nelze vytvořit lokální profil. Profil je neplatný.</string>
     <string name="cta_dont_kill_my_app_info">Nezabíjet mou aplikaci?</string>
+    <string name="alarm">Alarm</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Odeslat SMS, pokud je detekována nedostupná pumpa</string>
+    <string name="smscommunicator_pump_ureachable">Nahlásit nedostupnou pumpu</string>
+    <string name="advisoralarm">Spustit alarm, když je čas na jídlo</string>
+    <string name="alarminxmin">Spustit alarm za %1$d min</string>
+    <string name="bolusadvisor">Poradce pro bolus</string>
+    <string name="bolusadvisormessage">Máte vysokou glykémii. Namísto jídla doporučujeme vyčkat na lepší glykémii a připomenout, až bude čas na jídlo. Přejete si poslat korekční bolus a připomenout, až bude čas k jídlu? V tomto případě nebudou zapsané žádné sacharidy, a později opět musíte spustit kalkulátor, jakmile vám to připomeneme.</string>
+    <string name="enablebolusadvisor">Povolit poradce s bolusem</string>
+    <string name="enablebolusadvisor_summary">Během vysoké glykémie spusťte připomenutí namísto průvodce</string>
+    <string name="time_to_eat">Čas k jídlu!\nSpusťte Bolusovou kalkulačku a proveďte výpočet znovu.</string>
+    <string name="timetoeat">Čas k jídlu</string>
 </resources>

app/src/main/res/values-de-rDE/exam.xml

@@ -1,167 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Welche Aussagen zum DIA stimmen?</string>
-    <string name="dia_label_exam">Thema: Insulinwirkdauer</string>
-    <string name="dia_minimumis3h">Der Mindestwert ist 3 Stunden.</string>
-    <string name="dia_minimumis5h">Der Mindestwert ist 5 Stunden.</string>
+    <string name="dia_label_exam">Insulinwirkdauer (DIA)</string>
+    <string name="dia_profile">Definiere den DIA-Wert in Deinem Profil.</string>
+    <string name="dia_minimumis5h">Der minimal zulässige Wert ist 5 Stunden.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Configuration/Config-Builder.html#insulin</string>
-    <string name="dia_meaningisequaltodiapump">Entspricht der Insulinwirkdauer (DIA), die Du in Deiner Pumpe eingestellt hast.</string>
-    <string name="dia_valuemustbedetermined">Du musst den individuell für Dich passenden Wert (nicht weniger als 5 Stunden) ermitteln.</string>
-    <string name="hypott_label">Thema: Temporäres Ziel \"Hypo\"</string>
-    <string name="hypott_whenhypott">Was ist der Hauptgrund, ein Hypo TT zu setzen?</string>
-    <string name="hypott_goinglow">Um zu verhinden, dass der Glukosewert sinkt, wenn die temp. Basalrate bereits 0 ist (sog. zero temp).</string>
-    <string name="hypott_preventoversmb">Um zu verhindern, dass AAPS zu viel Insulin abgibt, wenn der Glukosewert durch Hypo-KH steigt.</string>
+    <string name="dia_meaningisequaltodiapump">Wenn du mit dem DIA zufrieden warst, bevor du AndroidAPS verwendet hast, dann musst du ihn nicht ändern, wenn du anfängst zu loopen.</string>
+    <string name="dia_valuemustbedetermined">Du solltest den für dich geeigneten DIA selbst festlegen.</string>
+    <string name="hypott_label">Temporäres Ziel für Hypos</string>
+    <string name="hypott_whenhypott">Was ist der Hauptgrund, ein Temporäres Ziel für Hypos zu setzen?</string>
+    <string name="hypott_wrongbasal">Zur Korrektur von Hypos, die durch falsche Basalrateneinstellungen verursacht wurden.</string>
+    <string name="hypott_preventoversmb">Um zu verhindern, dass AndroidAPS einen Blutzuckeranstieg überkorrigiert, der durch die schnell wirkenden Kohlenhydrate verursacht wird, die zur Behandlung einer Hypo verwendet werden.</string>
+    <string name="hypott_exercise">Um eine Hypo zu korrigieren, die durch Bewegung / Sport entstanden ist.</string>
+    <string name="hypott_0basal">Um ein Absinken des Blutzuckers zu verhindern, wenn bereits eine temporäre Basalrate von 0 % läuft.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Welches Profil kann offline verwendet und konfiguriert werden?</string>
     <string name="offlineprofile_label">Thema: Offline-Profil</string>
     <string name="offlineprofile_nsprofile">NS-Profil kann verwendet, aber nicht konfiguriert werden.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Configuration/Config-Builder.html#profil</string>
-    <string name="pumpdisconnect_label">Thema: Pumpe abkoppeln</string>
-    <string name="pumpdisconnect_letknow">Klicke auf \'Pumpe trennen\', so dass AAPS weiß, dass kein Insulin abgegeben wird.</string>
-    <string name="pumpdisconnect_suspend">Klicke auf auf \'Loop pausieren\', damit AAPS den Loop unterbricht während die Pumpe nicht verbunden ist.</string>
-    <string name="pumpdisconnect_dontchnage">Ändere nichts in AAPS, trenne einfach die Verbindung zur Pumpe.</string>
+    <string name="pumpdisconnect_label">Gründe, für den Einsatz des Kommandos \"Trenne Pumpe\" </string>
+    <string name="pumpdisconnect_whattodo">Was sollte getan werden, wenn die Pumpe getrennt wird?</string>
+    <string name="pumpdisconnect_unnecessary">Nichts, da kein Insulin abgegeben wird, wenn die Pumpe physisch getrennt ist.</string>
+    <string name="pumpdisconnect_missinginsulin">Verhindert, dass AndroidAPS Insulin berücksichtigt, das nicht abgegeben wurde, während die Pumpe physisch getrennt war.</string>
+    <string name="pumpdisconnect_notstop">Unterbricht die Insulinzufuhr nicht, wenn die Pumpe physikalisch verbunden bleibt.</string>
+    <string name="pumpdisconnect_openloop">Versetzt AndroidAPS in den Open Loop Modus.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Getting-Started/FAQ.html#andere-einstellungen</string>
-    <string name="objectives_label">Thema: AndroidAPS Einstellungen</string>
+    <string name="objectives_label">AndroidAPS Einstellungen</string>
+    <string name="objectives2_label">AndroidAPS Einstellungen</string>
     <string name="objectives_howtosave">Welches ist die empfohlene Vorgehensweise, um ein Backup Deiner Einstellungen zu erstellen?</string>
-    <string name="objectives_exportsettings">Exportiere sie lokal auf Deinem Smartphone über den Menüpunkt \"Wartung\".</string>
-    <string name="objectives_storeelsewhere">Speichere die exportierte Datei an einen anderen Ort (E-Mail, Dropbox, Google Drive...).</string>
-    <string name="objectives_doexportonstart">Exportiere sie direkt nach der Installation von AAPS.</string>
-    <string name="objectives_doexportafterchange">Exportiere sie, nachdem du Änderungen vorgenommen hast.</string>
-    <string name="objectives_doexportafterobjective">Exportiere sie, nachdem du ein Ziel (objective) abgeschlossen hast.</string>
-    <string name="objectives_doexportafterfirtssettings">Exportiere sie, nachdem Du die Ersteinrichtung abgeschlossen hast.</string>
+    <string name="objectives_notesettings">Du brauchst Deine Einstellungen nicht zu exportieren, sofern Du Dir diese notierst.</string>
+    <string name="objectives_afterobjective">Exportiere die Einstellungen nach Abschluss eines Objectives (Ziels).</string>
+    <string name="objectives_afterchange">Exportiere die Einstellungen nach jeder Änderung Deiner Einstellungen.</string>
+    <string name="objectives_afterinitialsetup">Exportiere Deine Einstellungen, nachdem Du Deine Ersteinrichtung abgeschlossen und Deine Präferenzen festgelegt hast.</string>
+    <string name="objectives2_maintenance">Exportiere Deine Einstellungen lokal über das Wartungs-Menü.</string>
+    <string name="objectives2_internalstorage">Deine Einstellungsdatei befindet sich im Ordner Internal Storage/AAPS/preferences auf Deinem Smartphone.</string>
+    <string name="objectives2_cloud">Kopieren Deine Einstellungen an einen sicheren Ort außerhalb Deines Telefons (z. durch Verwendung eines Cloud-Laufwerks, Verbindung eines Kabels mit einem Computer, E-Mail, etc.)</string>
+    <string name="objectives2_easyrestore">Wenn Dein Telefon beschädigt ist oder verloren geht, gibt es einfache Möglichkeiten, Deine Einstellungen ohne Sicherungskopie wiederherzustellen.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Getting-Started/FAQ.html#was-sollte-ich-fur-den-notfall-immer-dabei-haben</string>
-    <string name="noisycgm_label">Thema: Verrauschte CGM-Werte</string>
+    <string name="noisycgm_label">Verrauschte CGM Werte</string>
     <string name="noisycgm_whattodo">Was sollte getan werden, wenn CGM-Daten unzuverlässig werden?</string>
-    <string name="nothing">Nichts, AAPS kümmert sich darum.</string>
-    <string name="noisycgm_pause">Deaktiviere den Loop, um zu hohe Insulinabgabe zu vermeiden.</string>
-    <string name="noisycgm_replacesensor">Ersetze den CGM-Sensor.</string>
-    <string name="noisycgm_turnoffphone">Schalte das Smartphone aus.</string>
+    <string name="noisycgm_nothing">Tue nichts - AndroidAPS kümmert sich darum.</string>
+    <string name="noisycgm_pause">Deaktiviere den Loop, um mögliche Über- oder Unterdosierungen zu verhindern.</string>
+    <string name="noisycgm_replacesensor">Ersetze dauerhaft verrauschte oder ungenaue Sensoren.</string>
+    <string name="noisycgm_checksmoothing">Vergewissere Dich, dass Deine CGM App geglättete Daten liefert.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html</string>
-    <string name="noisycgm_checksmoothing">Stelle sicher, dass deine CGM-app die Glukose-Werte glättet.</string>
-    <string name="exercise_label">Thema: Aktivität</string>
-    <string name="exercise_whattodo">Wie kannst Du das System dabei unterstützen, mit Sport und Bewegung umzugehen?</string>
-    <string name="exercise_setactivitytt">Verwenden der Funktion temporäres Ziel.</string>
-    <string name="exercise_switchprofilebelow100">Mache einen Profilwechsel auf UNTER 100%.</string>
-    <string name="exercise_switchprofileabove100">Mache einen Profilwechsel auf ÜBER 100%.</string>
-    <string name="exercise_stoploop">Stoppe den Loop.</string>
-    <string name="exercise_doitbeforestart">Setze ein temporäres Ziel für Aktivität, bevor du mit Sport beginnst.</string>
-    <string name="exercise_afterstart">Ein temporäres Ziel nach dem Sport einzustellen führt zu schlechteren Resultaten als wenn das Ziel vor dem Sport eingestellt würde.</string>
+    <string name="exerciseprofile_label">Sport und Profile</string>
+    <string name="exerciseprofile_whattodo">Wie kannst Du Profile verwenden, um das System am besten beim Umgang mit sportlichen Aktivitäten zu unterstützen?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Mache einen Profilwechsel auf unter 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Mache einen Profilwechsel auf über 100%</string>
+    <string name="exerciseprofile_leaveat100">Belasse das Profil auf 100%.</string>
+    <string name="exerciseprofile_suspendloop">Stoppe den Loop.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/temptarget.html#aktivitaten-temp-target</string>
+    <string name="exercise_label">Sport und temporäre Ziele</string>
+    <string name="exercise_whattodo">Wie kannst Du temporäre Ziele verwenden, um das System am besten beim Umgang mit sportlichen Aktivitäten zu unterstützen?</string>
+    <string name="exercise_settt">Setze ein Aktivitätsblutzuckerziel, welches angemessene Zeit vor dem Sport beginnt.</string>
+    <string name="exercise_setfinished">Richte nach dem Training ein Aktivitätsblutzuckerziel ein.</string>
+    <string name="exercise_setunchanged">Lasse Dein Blutzuckerziel unverändert.</string>
+    <string name="exercise_15g">Warte, bis die Blutglukose unter das temporäre Hypoziel abfällt und esse dann 15 g schnell wirkende Kohlenhydrate.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/temptarget.html#aktivitaten-temp-target</string>
-    <string name="suspendloop_label">Thema: Deaktiviere/Pausiere den Loop</string>
+    <string name="suspendloop_label">Deaktiviere/Pausiere den Loop</string>
     <string name="suspendloop_doigetinsulin">Bekomme ich Insulin, wenn der Loop deaktiviert/pausiert ist?</string>
     <string name="suspendloop_yes">Ja, Basalinsulin wird weiter abgegeben.</string>
     <string name="suspendloop_no">Nein, die Insulinabgabe ist gestoppt.</string>
-    <string name="basaltest_label">Thema: Basalrate, Korrektur- und Kohlenhydratfaktoren überprüfen</string>
-    <string name="basaltest_when">Wann sollte ich Basalrate, Korrektur- und KH-Faktoren prüfen?</string>
+    <string name="basaltest_label">Basal-, ISF-und I:C-Tests</string>
+    <string name="basaltest_when">Wann sollten diese Werte überprüft werden?</string>
     <string name="basaltest_beforeloop">Bevor ich beginne zu loopen.</string>
-    <string name="basaltest_havingregularhypo">Bei häufig niedrigen Glukose-Werten.</string>
-    <string name="basaltest_havingregularhyper">Bei häufig hohen Glukose-Werten.</string>
+    <string name="basaltest_havingregularhighlow">Bei häufig hohen oder niedrigen Blutzuckerwerten.</string>
+    <string name="basaltest_weekly">Mindestens einmal pro Woche.</string>
+    <string name="basaltest_fixed">Einmal gesetzt und überprüft, sollten sich diese Werte im Laufe der Zeit nicht ändern.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Getting-Started/FAQ.html#androidaps-einstellungen</string>
-    <string name="prerequisites_label">Thema: Grundvoraussetzungen</string>
-    <string name="prerequisites_what">Was brauche ich?</string>
+    <string name="prerequisites_label">Voraussetzungen</string>
+    <string name="prerequisites_what">Was ist wichtig für die Einrichtung und Nutzung von AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Überprüfe die Profil-Einstellungen (Basal, IC, ISF, DIA).</string>
-    <string name="prerequisites_computer">Einen Computer zum Erstellen der APK.</string>
+    <string name="prerequisites_computer">Ein Computer mit installiertem und konfiguriertem Android Studio.</string>
     <string name="prerequisites_phone">Ein unterstütztes Smartphone.</string>
-    <string name="prerequisites_car">Ein Auto.</string>
-    <string name="prerequisites_nightscout">Nightscout zum Erreichen der Objectives (Ziele)</string>
+    <string name="prerequisites_pump">Eine kompatible Insulinpumpe, wenn Du einen Closed Loop planst.</string>
+    <string name="prerequisites_nightscout">Nightscout, um ein Protokoll aller Daten zu erhalten und Einstellungen zu überprüfen.</string>
     <string name="prerequisites_tidepoolaccount">Ein Tidepool-Konto.</string>
     <string name="prerequisites_googleaccount">Ein Google-Konto.</string>
     <string name="prerequisites_githubaccount">Ein Github-Konto.</string>
-    <string name="prerequisites_beanandroiddeveloper">Erfahrung in der Entwicklung von Android-Apps.</string>
+    <string name="prerequisites_beanandroiddeveloper">Erfahrung im Programmieren oder Bearbeiten von Codes.</string>
     <string name="prerequisites_own670g">Eine Medtronic 670G Insulinpumpe.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Module/module.html</string>
     <string name="prerequisites_smartwatch">Eine Smartwatch.</string>
     <string name="prerequisites_supportedcgm">Ein unterstütztes CGM.</string>
-    <string name="update_label">Thema: AndroidAPS updaten</string>
-    <string name="whatistrue">Was stimmt?</string>
-    <string name="update_git">Du musst Git installieren.</string>
-    <string name="update_asap">Führe das Update durch, sobald die neue Version freigegeben ist und Du genug Zeit dafür hast.</string>
-    <string name="update_keys">Du solltest die gleichen Signaturschlüssel (keys) verwenden.</string>
+    <string name="prerequisites2_label">Voraussetzungen</string>
+    <string name="prerequisites2_what">Was ist wichtig für die Einrichtung und Nutzung von AndroidAPS?</string>
+    <string name="prerequisites2_profile">Geprüfte Informationen zum Einrichten eines Profils (ISF, I:C Verhältnis, Basalraten, DIA etc.).</string>
+    <string name="prerequisites2_device">Ein kompatibles Android-Gerät (z.B. Handy, Android-Uhr oder Tablet).</string>
+    <string name="prerequisites2_internet">AndroidAPS benötigt eine Internetverbindung, um im Closed Loop laufen zu können.</string>
+    <string name="prerequisites2_supportedcgm">Ein unterstütztes CGM und eine passende App, um Blutzuckerwerte auf dem Gerät zu erhalten.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Module/module.html</string>
+    <string name="update_label">AndroidAPS aktualisieren</string>
+    <string name="whatistrue">Kreuze alle richtigen Antworten an.</string>
+    <string name="update_git">Du musst Git auf Deinem Computer installiert und konfiguriert haben.</string>
+    <string name="update_asap">Wenn aktualisierte Versionen von AndroidAPS veröffentlicht werden, können die früheren Versionen nach einer bestimmten Zeit aus der Ferne begrenzt werden.</string>
+    <string name="update_keys">Du solltest den Speicherort des Keystores speichern und immer den gleichen Signaturschlüssel für Updates verwenden wie für die vorherige Installation.</string>
     <string name="update_neverupdate">Nie updaten, wenn das System stabil läuft.</string>
-    <string name="update_askfriend">Frag deine Freunde nach einer neuen APK-Datei.</string>
+    <string name="update_askfriend">Wenn Du Schwierigkeiten beim Erstellen der apk hast, kannst Du eine apk installieren, die von einem Freund erstellt wurde.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Installing-AndroidAPS/Update-to-new-version.html</string>
-    <string name="troubleshooting_label">Thema: Fehlerbehebung</string>
-    <string name="troubleshooting_wheretoask">Wo bekommst Du Hilfe?</string>
-    <string name="troubleshooting_fb">Tritt den Facebook-Gruppen LoopedDE (deutsch) und androidapsusers (englisch) bei.</string>
-    <string name="troubleshooting_wiki">Lies die AndroidAPS-Dokumentation.</string>
-    <string name="troubleshooting_gitter">Nutze den AndroidAPS Gitter Channel.</string>
-    <string name="troubleshooting_googlesupport">Nutze AndroidAPS Google Support.</string>
-    <string name="troubleshooting_yourendo">Sprich mit Deinem Diabetologen / Diabetesberater.</string>
+    <string name="troubleshooting_label">Problembehandlung</string>
+    <string name="troubleshooting_wheretoask">Wo kannst Du nach Hilfe für AndroidAPS suchen?</string>
+    <string name="troubleshooting_fb">Du kannst in der AndroidAPS-Facebook-Gruppe um Rat bitten.</string>
+    <string name="troubleshooting_wiki">Du solltest die AndroidAPS-Dokumentation lesen (und wiederholt lesen).</string>
+    <string name="troubleshooting_gitter">Du kannst im AndroidAPS Gitter-Raum nach Rat fragen und technische Probleme dort erfassen und posten.</string>
+    <string name="troubleshooting_yourendo">Du solltest Deine Diabetesklinik / Deinen Diabetologen fragen.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Installing-AndroidAPS/Update-to-new-version.html#problembehandlung</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/loopedDE/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Thema: Insulin Plugins</string>
-    <string name="insulin_ultrarapid">Welches Insulin kann mit dem Plugin „Ultra-Rapid-Oref“ verwendet werden?</string>
+    <string name="insulin_label">Insulin-Plugins</string>
+    <string name="insulin_ultrarapid">Welches Insulin kann mit dem Ultra-Rapid-Oref-Plugin verwendet werden?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">Novorapid®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin R®/\"normales\" Humaninsulin</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Thema: Empfindlichkeit (Sensitivity) Plugins</string>
-    <string name="sensitivity_which">Welcher Empfindlichkeitsalgorithmus hat einen einstellbaren Zeitbereich?</string>
+    <string name="sensitivity_label">Empfindlichkeits-Plugins</string>
+    <string name="sensitivity_which">Kreuze alle richtigen Antworten an.</string>
+    <string name="sensitivity_adjust">Empfindlichkeits-Plugins erlauben AndroidAPS vorübergehende oder kurzzeitige Veränderungen der Insulinempfindlichkeit (z. B. hormonelle Veränderungen oder Probleme mit der Absorption an der Infusionsstelle).</string>
+    <string name="sensitivity_edit">Sensitivitäts-Plugins liefern dem Benutzer Vorschläge für Änderungen an Basalraten, I:C-Verhältnissen und ISF, die zur Bearbeitung des Profils verwendet werden können.</string>
+    <string name="sensitivity_cannula">Das Protokollieren eines Kanülenwechsels setzt das Autosens Verhältnis wieder auf 100% zurück.</string>
+    <string name="sensitivity_time">Einige der Plugin-Optionen haben konfigurierbare Zeiträume, die vom Benutzer eingestellt werden können.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Welches Plugin zur Empfindlichkeitserkennung muss für die UAM-Funktion (\"nicht angegebene Mahlzeiten\") genutzt werden?</string>
-    <string name="wrongcarbs_label">Thema: Fehler bei der KH-Eingabe</string>
+    <string name="wrongcarbs_label">Fehler bei der KH-Eingabe</string>
     <string name="wrongcarbs_whattodo">Was sollst Du tun, wenn Du einen falschen KH-Eintrag gemacht hast?</string>
-    <string name="wrongcarbs_treatmentstab">Lösche den falschen KH-Eintrag unter \"Behandlungen\" und gib die korrekten KH neu ein.</string>
-    <string name="wrongcarbs_addfakeinsulin">Gib \"Fake Insulin\" über die Funktion Vorfüllen/Füllen ab.</string>
-    <string name="extendedcarbs_label">Thema: Mahlzeiten mit Fett und Protein (FPE)</string>
-    <string name="extendedcarbs_handling">Wie gehst Du vor, wenn Deine Mahlzeit viel Fett und\/oder Proteine enthält?</string>
-    <string name="extendedcarbs_useextendedcarbs">Rechne Fett und Proteine in Kohlenhydrate um und nutze die Funktion für verzögerte Kohlenhydrate (\"eCarbs\").</string>
-    <string name="extendedcarbs_add">Rechne Fett und Proteine in Kohlenhydrate um und füge sie zu Deiner Bolusberechnung hinzu.</string>
-    <string name="extendedcarbs_useextendedbolus">Verwende einen verzögerten Bolus, um Fett und Proteine abzudecken.</string>
+    <string name="wrongcarbs_treatmentstab">Lösche die falsche Eingabe in der Behandlung und gib den richtigen neuen Kohlehydratwert ein.</string>
+    <string name="wrongcarbs_addinsulin">Nutze den Befehl zum Befüllen des Infusionssets für einen Bolus.</string>
+    <string name="wrongcarbs_donothing">Nichts tun – AndroidAPS wird die entsprechenden Anpassungen vornehmen.</string>
+    <string name="wrongcarbs_bolus">Bolus mit Insulin mit dem Insulin-Button in der Übersicht.</string>
+    <string name="wronginsulin_label">Fehler bei Insulinabgabe/Eintrag</string>
+    <string name="wronginsulin_whattodo">Wie solltest Du vorgehen, wenn Du weniger Insulin im Körper hast als in der Pumpenhistorie vermerkt - z.B. durch eine Verstopfung, Kanülenfehler oder eine nach dem Duschen nicht wieder angekoppelte Pumpe?</string>
+    <string name="wronginsulin_careportal">Lösche Insulindaten im Nightscout careportal, um sie aus der Pumpenhistorie zu entfernen.</string>
+    <string name="wronginsulin_compare">Vergleiche die Werte in AndroidAPS und der Pumpenhistorie.</string>
+    <string name="wronginsulin_prime">Gib einen Teil-Bolus des \'nicht erhaltenen\' Insulins mit Spritze / Pen oder durch Befüllen der Kanüle.</string>
+    <string name="wronginsulin_donothing">Unternimm nichts und lass AndroidAPS die entstehenden hohen Glukosewerte korrigieren.</string>
+    <string name="iob_label">Aktives Insulin (IOB)</string>
+    <string name="iob_which">Kreuze alle richtigen Antworten an.</string>
+    <string name="iob_value">IOB wird von den abgegebenen temporären Basalraten beeinflusst.</string>
+    <string name="iob_hightemp">Eine hohe temporäre Basalrate wird nicht abgegeben, wenn der BZ unterhalb des Zielwerts liegt.</string>
+    <string name="iob_negiob">Ein negativer IOB über einen längeren Zeitraum bei fehlender Bewegung deutet darauf hin, dass Dein Profil zu stark ist und weniger Insulin in Deinen Einstellungen benötigt wird.</string>
+    <string name="iob_posiob">Ein positiver IOB über einen längeren Zeitraum deutet auf eine Insulinresistenz oder unangekündigte Mahlzeiten hin.</string>
+    <string name="breadgrams_label">Kohlenhydrat-Eingaben und Boli</string>
+    <string name="breadgrams_grams">Zur Abschätzung und Eingabe von Kohlenhydraten sollten nur Gramm als Einheit verwendet werden.</string>
+    <string name="breadgrams_exchange">Aufgenommene Kohlenhydrate können in einem geeigneten Austauschformat (z.B. Broteinheiten oder DAFNE \"CHO\" exchanges) eingegeben werden.</string>
+    <string name="breadgrams_decay">AndroidAPS verwendet ein dynamisches Modell zur Abschätzung des Kohlenhydratabbaus und zur Berechnung der COB.</string>
+    <string name="breadgrams_calc">Wenn die Blutzuckerwerte außerhalb der akzeptablen Werte liegen (zu niedrig oder zu hoch), kann der Bolusrechner verwendet werden, um Vorschläge für Kohlenhydrat- oder Insulinkorrekturen zu machen.</string>
+    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Getting-Started/FAQ.html#insulin-kohlenhydrat-verhaltnis-insulin-to-carb-ratio-ic-g-u</string>
+    <string name="extendedcarbs_label">E-carbs</string>
+    <string name="extendedcarbs_handling">Wofür können E-Carbs (\"verlängerte Kohlenhydrate\") verwendet werden?</string>
+    <string name="extendedcarbs_future">Zum Einplanen von Kohlenhydraten in der Zukunft, meist über ein Intervall verteilt (ähnlich wie bei einem verlängerten Bolus, der Insulin über ein Intervall verteilt).</string>
+    <string name="extendedcarbs_free">Zum Protokollieren von \'freien\' Sport-BE, die Du vor AndroidAPS verstecken willst.</string>
+    <string name="extendedcarbs_fat">E-carbs (über einen Zeitraum in der Zukunft verteilt) können AndroidAPS beim Umgang mit Mahlzeiten mit hohem Fett-/Proteinanteil unterstützen.</string>
+    <string name="extendedcarbs_rescue">Für die Protokollierung von Hypo-BEs bei der Behandlung niedriger Werte.</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Thema: Kontrolle aus der Ferne</string>
-    <string name="nsclient_howcanyou">Wie kannst Du den Loop eines Kindes mit AAPS aus der Ferne mitverfolgen?</string>
-    <string name="nsclient_nightscout">Mit einer Nightscout-Website.</string>
-    <string name="nsclient_dexcomfollow">Dexcom Follow App zusammen mit der originalen Dexcom App (nur BZ).</string>
-    <string name="nsclient_dexcomfollowxdrip">Über Dexcom Follow, falls Du die xDrip App verwendest.</string>
-    <string name="nsclient_xdripfollower">xDrip im Follower Modus.</string>
-    <string name="nsclient_looponiphone">Loop App auf einem iPhone.</string>
-    <string name="nsclient_spikeiphone">Spike App auf einem iPhone.</string>
+    <string name="nsclient_label">Kontrolle aus der Ferne</string>
+    <string name="nsclient_howcanyou">Wie kann man AndroidAPS (zum Beispiel für ein Kind) aus der Ferne kontrollieren?</string>
+    <string name="nsclient_nightscout">NS Client App, Nightscout App und die Nightscout Webseite ermöglichen es, AndroidAPS aus der Ferne zu verfolgen.</string>
+    <string name="nsclient_dexcomfollow">Andere Apps (z. B. Dexcom Follow, xDrip+ im Follow-Modus) ermöglichen es, einige Parameter (z. B. Blutzucker-/Sensorwerte) aus der Ferne zu verfolgen, verwenden jedoch andere Algorithmen und können daher ungenaue IOB- oder COB-Werte aufweisen.</string>
+    <string name="nsclient_data">Um AndroidAPS aus der Ferne zu folgen, müssen beide Geräte über einen Internetzugang verfügen (z. B. über WLAN oder Mobilfunkdaten).</string>
+    <string name="nsclient_fullcontrol">Der NS-Client, der als Remote Follower verwendet wird, kann AndroidAPS sowohl überwachen als auch die volle Kontrolle darüber übernehmen.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Children/Children.html</string>
-    <string name="isf_label_exam">Thema: Korrekturfaktoren (ISF)</string>
-    <string name="isf_increasingvalue">Höhere ISF-Werte (Insulinempfindlichkeit) führen zu niedrigerer Insulin-Abgabe, wenn AAPS hohe Glukosewerte korrigiert.</string>
-    <string name="isf_decreasingvalue">Niedrigere ISF-Werte (Insulinempfindlichkeit) führen zu niedrigerer Insulin-Abgabe, wenn AAPS hohe Glukosewerte korrigiert.</string>
-    <string name="isf_noeffect">Das Ändern von ISF-Werten hat keinen Einfluss auf die abgegebene Menge an Insulin, wenn AAPS hohe Glukosewerte korrigiert.</string>
-    <string name="isf_preferences">Du musst den ISF in den Einstellungen eingeben.</string>
+    <string name="isf_label_exam">Insulinsensibilitätsfaktor (ISF)</string>
+    <string name="isf_increasingvalue">Eine Erhöhung der ISF-Werte führt zu einer höheren Insulinabgabe, um eine bestimmte Menge an Kohlenhydraten abzudecken.</string>
+    <string name="isf_decreasingvalue">Reduzierte ISF-Werte führen zu einer höheren Insulinabgabe zur Korrektur eines über dem Zielwert liegenden Blutzuckers.</string>
+    <string name="isf_noeffect">Das Erhöhen oder Senken des ISF hat keinen Einfluss auf die Insulinabgabe, wenn der Blutzuckerspiegel unter dem Zielwert liegt.</string>
+    <string name="isf_preferences">ISF werden in den AndroidAPS-Einstellungen eingegeben.</string>
     <string name="isf_profile">Wenn Du einen ISF-Wert im Profil änderst, wird dies sofort vom Loop berücksichtigt.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Getting-Started/FAQ.html#korrekturfaktor-isf-mg-dl-ie-oder-mmol-l-ie</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Thema: Das IC-Verhältnis (Insulin-Kohlenhydrate)</string>
-    <string name="ic_increasingvalue">Ein höheres IC-Verhältnis bedeutet, dass weniger Insulin für die selbe Menge an KH abgegeben wird.</string>
-    <string name="ic_decreasingvalue">Ein niedrigeres IC-Verhältnis bedeutet, dass weniger Insulin für die selbe Menge an KH abgegeben wird.</string>
+    <string name="ic_multiple">Du kannst mehr als einen Wert für das I:C-Verhältnis in Deinem Profil verwenden.</string>
+    <string name="ic_isf">Wenn Du den ISF in Deinem Profil änderst, solltest Du immer auch Dein I:C-Verhältnis anpassen.</string>
+    <string name="ic_label_exam">Insulin zu Kohlenhydratverhältnis (I:C-Verhältnis)</string>
+    <string name="ic_increasingvalue">Ein höheres I:C-Verhältnis bedeutet, dass weniger Insulin für die vorgegebene Menge an KH abgegeben wird.</string>
+    <string name="ic_decreasingvalue">Ein niedrigeres I:C-Verhältnis bedeutet, dass weniger Insulin für die vorgegebene Menge an KH abgegeben wird.</string>
     <string name="ic_noeffect">Das Ändern des IC-Verhältnisses bedeutet, dass bei 0 COB eine andere Menge an Insulin zur Korrektur eines vorgegebenen BZ-Wertes abgegeben wird.</string>
     <string name="ic_different">Der IC-Wert wird sich unterscheiden, je nachdem, ob Du eine Broteinheit (BE) mit 10g oder mit 12g berechnest.</string>
     <string name="ic_meaning">IC bedeutet: Anzahl BE, die durch eine Einheit Insulin abgedeckt werden</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Getting-Started/FAQ.html#kh-faktor-carbohydrate-to-insulin-ratio-cr-g-ie</string>
-    <string name="profileswitch_label">Thema: Profilwechsel</string>
-    <string name="profileswitch_pctwillchange"> Durch einen Profilwechsel auf 90%…</string>
-    <string name="profileswitch_basalhigher">wird 10% MEHR Basalinsulin abgegeben.</string>
-    <string name="profileswitch_basallower">wird 10% WENIGER Basalinsulin abgegeben.</string>
-    <string name="profileswitch_ichigher">liegt der IC-Wert (KH-Faktor) 10% HÖHER.</string>
-    <string name="profileswitch_iclower">liegt der IC-Wert (KH-Faktor) 10% NIEDRIGER.</string>
-    <string name="profileswitch_isfhigher">liegt der ISF-Wert (Korrekturfaktor) 10% HÖHER.</string>
-    <string name="profileswitch_isflower">wird der ISF-Wert (Korrekturfaktor) 10% NIEDRIGER sein.</string>
-    <string name="profileswitch_overall">Du wirst rund 10% weniger Insulin erhalten.</string>
-    <string name="profileswitch_targethigher">wird der Zielwert 10% HÖHER liegen.</string>
-    <string name="profileswitch_targetlower">wird der Zielwert 10% NIEDRIGER liegen.</string>
-    <string name="profileswitch_targetbottom">wird nur der untere Zielwert 10% NIEDRIGER liegen.</string>
+    <string name="profileswitch_label">Profilwechsel</string>
+    <string name="profileswitch_pctwillchange">Welche Antworten sind bei der Einstellung eines Profilwechsels von 90% wahr?</string>
+    <string name="profileswitch_basallower">Die Basalrate ist um 10 % niedriger.</string>
+    <string name="profileswitch_isfhigher">ISF wird um 10% höher sein.</string>
+    <string name="profileswitch_iclower">Der Wert für das Verhältnis I:C wird um 10% niedriger sein.</string>
+    <string name="profileswitch_unchanged">ISF-und I:C-Werte werden unverändert bleiben.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/Profiles.html#prozentsatz</string>
-    <string name="profileswitchtime_iwant">Wenn du 1h früher als üblich aufwachst, wie solltest du AAPS über die Änderung in deinem Zeitplan informieren?</string>
-    <string name="profileswitchtime_1">Profilwechsel mit einer Zeitverschiebung von 1</string>
-    <string name="profileswitchtime__1">Profilwechsel mit einer Zeitverschiebung von -1</string>
+    <string name="profileswitch2_label">Profilwechsel</string>
+    <string name="profileswitch2_pctwillchange">Welche Antworten sind bei der Einstellung eines Profilwechsels von 120% wahr?</string>
+    <string name="profileswitch2_bghigher">Das Blutzuckerziel wird um 20 % höher sein.</string>
+    <string name="profileswitch2_basalhigher">Die Basalrate wird um 20 % höher sein.</string>
+    <string name="profileswitch2_bgunchanged">Das Blutzuckerziel wird unverändert sein.</string>
+    <string name="profileswitch2_isfhigher">ISF wird um 20% höher sein.</string>
+    <string name="profileswitchtime_label">Profilwechsel</string>
+    <string name="profileswitchtime_iwant">Wenn du 2h früher als üblich aufstehst, wie solltest Du AAPS über die Änderung in Deinem Zeitplan informieren?</string>
+    <string name="profileswitchtime_2">Profilwechsel mit einer Zeitverschiebung von +2</string>
+    <string name="profileswitchtime__2">Profilwechsel mit einer Zeitverschiebung von -2</string>
+    <string name="profileswitchtime_tt">Setze ein temporäres Ziel \"bald essen\".</string>
+    <string name="profileswitchtime_100">Mache einen Profilwechsel auf über 100%</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/Profiles.html#zeitverschiebung</string>
-    <string name="profileswitchtime_60">Profilwechsel mit einer Zeitverschiebung von 60</string>
-    <string name="profileswitchtime__60">Profilwechsel mit einer Zeitverschiebung von -60</string>
+    <string name="profileswitch4_label">Änderungen an Profilen</string>
+    <string name="profileswitch4_rates">Basalraten, ISF, I:C-Verhältnisse, etc., sollten in Profilen gesetzt werden.</string>
+    <string name="profileswitch4_internet">Um Änderungen an Deinem Nightscout Profil zu aktivieren, muss Dein AndroidAPS-Smartphone eine Internetverbindung haben.</string>
+    <string name="profileswitch4_sufficient">Das Bearbeiten von Profilen zur Änderung von Werten reicht aus, um alle vorgenommenen Änderungen durchzuführen.</string>
+    <string name="profileswitch4_multi">Es können mehrere Profile erstellt und ausgewählt werden, um sich verändernden Umständen anzupassen (z.B. hormonelle Veränderungen, Schichtarbeit, Wochentage/Wochenend-Lebensstil).</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Module/module.html#gute-individuelle-profileinstellungen-fur-deine-diabetes-therapie</string>
-    <string name="basalhelp_label">Thema: Hilfe zur Einstellung der Basalraten</string>
+    <string name="basalhelp_label">Hilfe bei Basalraten</string>
     <string name="basalhelp_where">An wen solltest Du Dich wenden, wenn Du Unterstützung zur Einstellung Deiner Basalrate etc. brauchst?</string>
     <string name="basalhelp_diabetesteam">Dein Diabetes-Team</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Andere Medikamente</string>
-    <string name="other_medication_text">AAPS reduziert die Basalrate zur Erhöhung des Blutzuckers. Medikamente aus der Gruppe der SGLT2-Hemmer (Gliflozine) können zu erwartende Blutzuckersteigungen verhindern und damit einen gefährlichen Insulinmangel (DKA) produzieren.
-\nÜbliche Handelsnamen sind: Invokana ®, Forxiga ®, Jardiance ®, Steglatro ®, Suglat ®, Apleway ®, Deberza ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\nIch verspreche, dass ich solche Medikamente bei der Anwendung von AAPS nicht einnehmen werde oder den Loop vor der Verwendung dieser Medikamente deaktivieren werde.</string>
+    <string name="other_medication_label">Andere Medikation. Bitte lies die Erklärung unten und markiere dann das Kästchen, um die Erklärung zu akzeptieren.</string>
+    <string name="other_medication_text">AAPS reduziert die Basalrate oder stoppt die Insulinzufuhr zur Erhöhung des Blutzuckers. Medikamente aus der Gruppe der SGLT2-Hemmer (Gliflozine) können zu erwartende Blutzuckersteigungen verhindern und damit einen gefährlichen Insulinmangel (DKA) produzieren.
+\nÜbliche Handelsnamen sind: Invokana ®, Forxiga ®, Jardiance ®, Steglatro ®, Suglat ®, Apleway ®, Deberza ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\nIch versichere, dass ich solche Medikamente bei der Anwendung von AAPS nicht einnehmen oder den Loop vor der Verwendung dieser Medikamente deaktivieren werde.</string>
 </resources>

app/src/main/res/values-de-rDE/objectives.xml

@@ -22,7 +22,7 @@
     <string name="objectives_auto_objective">Automatisierung aktivieren</string>
     <string name="objectives_smb_gate">Lies das Wiki und erhöhe maxIOB, damit der SMB gut funktioniert. Ein guter Anfang ist
 die Formel maxIOB = durchschnittlicher Essensbolus + 3 x höchste Basalrate</string>
-    <string name="objectives_auto_gate">Lies in den Docs wie Automatisierung funktioniert und erstelle dann eine erste einfache Regel. Verwende eine Benachrichtigung statt der tatsächlichen Aktion. Wenn die Automatisierung zum richtigen Zeitpunkt auslöst, ersetze die Benachrichtigung durch die gewünschte Aktion. (https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/Automation.html)</string>
+    <string name="objectives_auto_gate">Lies in der Dokumentation nach, wie Automation funktioniert. Richte dir erst einfache Regeln ein. Zunächst sollte AAPS keine Änderungen vornehmen, sondern dir nur eine Benachrichtigung anzeigen. Wenn du dir sicher bist, dass die Automation im richtigen Moment angetriggert wird, dann kannst du die Benachrichtigung durch eine Aktion ersetzen (https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">BZ in Nightscout verfügbar</string>
     <string name="objectives_pumpstatusavailableinns">Pumpen-Status in Nightscout verfügbar</string>
     <string name="objectives_manualenacts">Manuelle Aktionen</string>
@@ -41,7 +41,7 @@ die Formel maxIOB = durchschnittlicher Essensbolus + 3 x höchste Basalrate</str
     <string name="codeaccepted">Code akzeptiert</string>
     <string name="codeinvalid">Code ungültig</string>
     <string name="objectives_exam_objective">Prüfe Dein Wissen</string>
-    <string name="objectives_exam_gate">Lies und beantworte die Fragen richtig</string>
+    <string name="objectives_exam_gate">Beschäftige dich mit den Fragen. Dir werden für jede Frage vier Antwortmöglichkeiten vorgegeben. Es kann mehr als eine richtige Antwort geben. Bitte hake alle richtigen an und wähle BESTÄTIGEN.</string>
     <string name="answerdisabledto">Frage gesperrt bis: %1$s</string>
     <string name="wronganswer">Falsch!</string>
     <string name="unfinshed_button">Nächste offene</string>

app/src/main/res/values-de-rDE/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Sicherheitseinstellungen der Behandlungen</string>
     <string name="treatmentssafety_maxbolus_title">Max. erlaubter Bolus [IE]</string>
     <string name="treatmentssafety_maxcarbs_title">Max. erlaubte Kohlenhydrate [g]</string>
+    <string name="nav_preferences_plugin">%1$s-Einstellungen</string>
     <string name="nav_preferences">Einstellungen</string>
     <string name="nav_refreshtreatments">Behandlungen von NS aktualisieren</string>
     <string name="nav_resetdb">Datenbanken zurücksetzen</string>
@@ -405,11 +406,18 @@
     <string name="suspendloopfor3h">Pausiere Loop für 3 h</string>
     <string name="suspendloopfor10h">Pausiere Loop für 10 h</string>
     <string name="suspendloopforXmin">Loop für %1$d min pausieren</string>
+    <string name="disconnectpump">Pumpe trennen</string>
     <string name="disconnectpumpfor15m">Trenne Pumpe für 15 min</string>
     <string name="disconnectpumpfor30m">Trenne Pumpe für 30 min</string>
     <string name="disconnectpumpfor1h">Trenne Pumpe für 1 h</string>
     <string name="disconnectpumpfor2h">Trenne Pumpe für 2 h</string>
     <string name="disconnectpumpfor3h">Trenne Pumpe für 3 h</string>
+    <string name="duration15m">15 Min.</string>
+    <string name="duration30m">30 Min.</string>
+    <string name="duration1h">1 Std.</string>
+    <string name="duration2h">2 Std.</string>
+    <string name="duration3h">3 Std.</string>
+    <string name="duration10h">10 Std.</string>
     <string name="resume">Fortsetzen</string>
     <string name="reconnect">Pumpe erneut verbinden</string>
     <string name="smscommunicator_wrongduration">Falsche Dauer</string>
@@ -564,8 +572,6 @@
     <string name="overview_editquickwizard_usebasaliob">Basal-IOB Berechnung</string>
     <string name="overview_editquickwizard_usetrend">Trend Berechnung</string>
     <string name="overview_editquickwizard_usesuperbolus">Superbolus Berechnung</string>
-    <string name="yes">Ja</string>
-    <string name="no">Nein</string>
     <string name="positiveonly">Nur positive</string>
     <string name="negativeonly">Nur negative</string>
     <string name="overview_editquickwizard_usecob">COB Berechnung</string>
@@ -612,8 +618,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">Nicht mehr genug Insulin im Reservoir für den Bolus</string>
     <string name="extendedbolusdeliveryerror">Fehler bei der Abgabe eines verzögerten Bolus</string>
     <string name="insightpump_shortname">Sight</string>
-    <string name="set_neutral_temps_title">Neutrale TBR setzen</string>
-    <string name="set_neutral_temps_summary">Wenn diese Option aktiviert ist, wird die TBR vor Ende jeder Stunde abgebrochen. Dies kann dazu beitragen, einige Pumpen davon abzuhalten, zur vollen Stunde zu vibrieren / zu piepsen.</string>
     <string name="enablesmbalways">SMB immer aktivieren</string>
     <string name="enablesmbalways_summary">Aktiviere SMB immer, unabhängig von Boli. Dies ist nur möglich, wenn eine BZ-Quelle genutzt wird, die die Daten besonders gut filtert wie z. B. G5.</string>
     <string name="enablesmbaftercarbs">Aktiviere SMB nach Mahlzeiten.</string>
@@ -762,7 +766,7 @@
     <string name="diawarning">Bitte beachte: Neue Insulin-Profile benötigen einen DIA von mind. 5 Stunden. Eine DIA von 5-6 Stunden im neuen Insulin-Profil entspricht einem DIA von 3 Stunden bei alten Insulin-Profilen.</string>
     <string name="setupwizard_profile_description">Wähle eine Profilquelle aus. Verwende für ein Kind das NS-Profil. Wenn Dir niemand auf Nightscout folgt, wirst Du wahrscheinlich das lokale Profil bevorzugen. Beachte, dass hier nur die Profilquelle festgelegt wird. Damit das Profil verwendet werden kann, muss es mit einem \"Profil-Wechsel\" aktiviert werden.</string>
     <string name="setupwizard_aps_description">Wähle einen der verfügbaren Algorithmen aus. Sie sind vom Ältesten zum Neuesten sortiert. Neuere Algorithmen sind meist stärker und aggressiver. Wenn du ein Anfänger bist, solltest du nicht mit dem Neuesten sondern mit AMA starten. Vergiss nicht, die OpenAPS-Dokumentation zu lesen und die entsprechenden Einstellungen vor der Benutzung vorzunehmen.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Warte auf Verbindung mit RileyLink…\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Bitte konfiguriere Deinen RileyLink unten. Nachdem Du einen RileyLink ausgewählt hast, kannst Du die Installation fortsetzen, sobald der RileyLink-Status \"Verbunden\" ist. Das kann eine Minute dauern.\n</string>
     <string name="setupwizard_pump_pump_not_initialized"><b>Hinweis:</b> Du kannst das Setup fortsetzen, sobald die Pumpe initialisiert wurde.\n</string>
     <string name="startobjective">Starte deine erste Zielsetzung</string>
     <string name="permission">Berechtigung</string>
@@ -790,7 +794,6 @@
     <string name="sensitivity_raises_target_title">Empfindlichkeit erhöht den Zielwert</string>
     <string name="sensitivity_raises_target_summary">Wenn eine höhere Empfindlichkeit festgestellt wird, wird der Glukose-Zielwert erhöht.</string>
     <string name="combo_invalid_setup">Ungültige Pumpen-Einstellungen. Lies das Wiki und stelle mit der 360° Konfigurations-Software sicher, dass das Quick-Info-Menü \"QUICK INFO\" heißt.</string>
-    <string name="custom">Benutzerdefiniert</string>
     <string name="careportal_removestartedevents">\"AndroidAPS gestartet\" Ereignisse löschen</string>
     <string name="storedsettingsfound">Gespeicherte Einstellungen gefunden</string>
     <string name="allow_hardware_pump_text">WARNUNG: Wenn Du eine echte Pumpe aktivierst und anschließt, kopiert AndroidAPS die Basaleinstellungen vom aktiven Profil zur Pumpe (und behält sie bei). Die Einstellungen in der Pumpe werden hierbei überschrieben. Wenn Du Dir nicht sicher bist oder die Basaleinstellungen in der Pumpe nicht überschreiben möchten, drücke \"Abbrechen\" und vollziehe den Wechsel zur Pumpe später.</string>
@@ -979,7 +982,9 @@ Unerwartetes Verhalten.</string>
     <string name="description_source_dexcom">Empfange Blutzucker-Werte von der gepatchten Dexcom App.</string>
     <string name="notification">Benachrichtigung</string>
     <string name="notification_message">Benachrichtigung: %1$s</string>
+    <string name="alarm_message">Alarm: %1$s</string>
     <string name="message_short">Nachricht:</string>
+    <string name="alarm_short">Alarm:</string>
     <string name="profilepercentage">Prozentsatz des Profils</string>
     <string name="percent_u">Prozent [%]:</string>
     <string name="startprofile">Profil %1$d%% für %2$d Min. starten</string>
@@ -1181,4 +1186,15 @@ Unerwartetes Verhalten.</string>
     <string name="filter">Filter</string>
     <string name="copytolocalprofile_invalid">Lokales Profil kann nicht erstellt werden. Profil ist ungültig.</string>
     <string name="cta_dont_kill_my_app_info">Don\'t kill my app?</string>
+    <string name="alarm">Alarm</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">SMS senden, wenn Pumpe nicht erreichbar</string>
+    <string name="smscommunicator_pump_ureachable">Bericht Pumpe nicht erreichbar</string>
+    <string name="advisoralarm">Alarmiere mich, wenn es Zeit zum Essen ist. </string>
+    <string name="alarminxmin">Alarm in %1$d Min.</string>
+    <string name="bolusadvisor">Bolus-Berater</string>
+    <string name="bolusadvisormessage">Deine BZ-Werte sind hoch. Statt jetzt zu essen solltest Du abwarten, bis die Werte gesunken sind. Willst du jetzt einen Korrekturbolus abgeben und erinnert werden, wenn es Zeit zum Essen ist? In diesem Fall werden die Kohlenhydrate nicht übernommen und Du musst nach der Erinnerung den Bolus-Rechner erneut verwenden.</string>
+    <string name="enablebolusadvisor">Bolus-Berater aktivieren</string>
+    <string name="enablebolusadvisor_summary">Bei hohen BZ-Werten Essenserinnerung statt Bolus-Wizard verwenden</string>
+    <string name="time_to_eat">Zeit zum Essen!\nStarte den Bolus-Rechner und gib die KH ein. </string>
+    <string name="timetoeat">Zeit zum Essen</string>
 </resources>

app/src/main/res/values-el-rGR/exam.xml

@@ -1,157 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Ποια είναι η αλήθεια για το DIA;</string>
-    <string name="dia_minimumis3h">Η ελάχιστη τιμή είναι 3 ώρες.</string>
-    <string name="dia_minimumis5h">Η ελάχιστη τιμή είναι 5 ώρες.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">Το νόημα είναι ίσο με την DIA που χρησιμοποιείται στην αντλία.</string>
-    <string name="dia_valuemustbedetermined">Θα πρέπει να καθορίσει την ατομική τιμή (αλλά όχι λιγότερο από 5 ώρες).</string>
-    <string name="hypott_label">Θέμα: Προσωρινοί στόχοι Υπό</string>
-    <string name="hypott_whenhypott">Ποιος είναι ο πρωταρχικός λόγος για να ορίσετε ένα υπο TT;</string>
-    <string name="hypott_goinglow">Για να αποτρέψετε BG να πάει χαμηλά εάν υπάρχει ενεργός ήδη μηδενικό; προσωρινός.</string>
-    <string name="hypott_preventoversmb">Για να αποτρέψετε AAPS από τη χορήγηση υπερβολικής ινσουλίνης μετά από μια αύξηση που προκαλείται από ταχείας δράσης υδατάνθρακες που χρησιμοποιούνται για τη θεραπεία υπογλυκαιμίας.</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">Θέμα: Αποσύνδεση από την Αντλία</string>
-    <string name="pumpdisconnect_letknow">Πατήστε το κουμπί \"Αποσύνδεση αντλίας\", έτσι ώστε το AAPS να ξέρει ότι δεν χορηγείται ινσουλίνη.</string>
-    <string name="pumpdisconnect_suspend">Πατήστε το κουμπί \"Αναστολή κυκλώματος\", έτσι ώστε το AAPS να σταματά το κύκλωμα, ενώ η αντλία είναι αποσυνδεδεμένη.</string>
-    <string name="pumpdisconnect_dontchnage">Μην αλλάζετετίποτα στο AAPS, απλά αποσυνδέστε την αντλία.</string>
+    <string name="pumpdisconnect_whattodo">Τι πρέπει να γίνει όταν αποσυνδέεται η αντλία;</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Θέμα: AndroidAPS Ρυθμίσεις</string>
-    <string name="objectives_howtosave">Ποιες είναι οι καλύτερες πρακτικές για να αποθηκεύσετε τις ρυθμίσεις σας;</string>
-    <string name="objectives_exportsettings">Εξάγετέ τις τοπικά από το Μενού Συντήρηση.</string>
-    <string name="objectives_storeelsewhere">Αποθηκεύστε το αρχείο σε ένα άλλο μέρος όπως email, Dropbox, Google drive…</string>
-    <string name="objectives_doexportonstart">Εξάγετε τις ρυθμίσεις αμέσως μετά την εγκατάσταση του AAPS.</string>
-    <string name="objectives_doexportafterchange">Εξάγετέ τις μετά από κάθε αλλαγή στις ρυθμίσεις.</string>
-    <string name="objectives_doexportafterobjective">Εξάγετέ τις έπιτα από κάθε επίτευξη στόχου.</string>
-    <string name="objectives_doexportafterfirtssettings">Εξάγετέ τις όταν ολοκληρώσετε τις αρχικές ρυθμίσεις.</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="nothing">Τίποτα, το AAPS θα το αντιμετωπίσει.</string>
-    <string name="noisycgm_pause">Απενεργοποίηση κυκλώματος για αποφυγή υπερβολικής δόσης.</string>
-    <string name="noisycgm_replacesensor">Αντικαταστήστε τον αισθητήρα CGM.</string>
-    <string name="noisycgm_turnoffphone">Απενεργοποιήστε το τηλέφωνο.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">Βεβαιωθείτε ότι το CGM app λειαίνει τις μετρήσεις BG.</string>
-    <string name="exercise_label">Θέμα: Άσκηση</string>
-    <string name="exercise_whattodo">Πώς μπορείτε να βοηθήσετε το σύστημα να αντιμετωπίσει την άσκηση;</string>
-    <string name="exercise_setactivitytt">Χρησιμοποιώντας το χαρακτηριστικό προσωρινό-στόχο.</string>
-    <string name="exercise_switchprofilebelow100">Κάντε ένα προφίλ κάτω από το 100%.</string>
-    <string name="exercise_switchprofileabove100">Κάντε ένα προφίλ πάνω από το 100%.</string>
-    <string name="exercise_stoploop">Σταματήστε το κύκλωμα.</string>
-    <string name="exercise_doitbeforestart">Ορίστε έναν προσωρινό-στόχο πριν την έναρξη της άσκησης.</string>
-    <string name="exercise_afterstart">Ο ορισμός προσωρινού-στόχου μετά την έναρξη της άσκησης οδηγεί σε χειρότερα αποτελέσματα από το να οριστεί πριν.</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">Θέμα: Βασική, ISF, και IC Έλεγχος</string>
-    <string name="basaltest_when">Πότε θα πρέπει να επικυρώσετε τις τιμές του Βασικού, του ISF, και του IC;</string>
-    <string name="basaltest_beforeloop">Πριν αρχίσει το κύκλωμα.</string>
-    <string name="basaltest_havingregularhypo">Όταν αντιμετωπίζετε συχνά χαμηλές τιμές BG.</string>
-    <string name="basaltest_havingregularhyper">Όταν αντιμετωπίζετε συχνά υψηλές τιμές BG.</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">Τι χρειάζομαι;</string>
     <string name="prerequisites_determinedcorrectprofile">Έγκυρες πληροφορίες προφίλ (Βασικός, IC, ISF, DIA).</string>
-    <string name="prerequisites_computer">Έναν υπολογιστή για δημιουργία ενός APK.</string>
     <string name="prerequisites_phone">Ένα τηλέφωνο που υποστηρίζεται.</string>
-    <string name="prerequisites_car">Ένα Αυτοκίνητο.</string>
-    <string name="prerequisites_nightscout">Nightscout να περάσει τους στόχους.</string>
     <string name="prerequisites_tidepoolaccount">Ένα Tidepool λογαριασμό.</string>
     <string name="prerequisites_googleaccount">Ένα λογαριασμό Google.</string>
     <string name="prerequisites_githubaccount">Ένα λογαριασμό Github.</string>
-    <string name="prerequisites_beanandroiddeveloper">Εμπειρία προγραμματιστή Android.</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">Ένα Smartwatch.</string>
     <string name="prerequisites_supportedcgm">Ένα Υποστηριζόμενο CGM.</string>
-    <string name="update_label">Θέμα: Αναβάθμιση AndroidAPS</string>
-    <string name="whatistrue">Τι είναι αλήθεια;</string>
-    <string name="update_git">Θα πρέπει να έχετε εγκατεστημένο το Git.</string>
-    <string name="update_asap">Αναβαθμίστε μόλις μία έκδοση είναι διαθέσιμη και έχοντας αρκετό χρόνο για να το κάνετε.</string>
-    <string name="update_keys">Θα πρέπει να χρησιμοποιήσετε την ίδια υπογραφή κλειδιών.</string>
     <string name="update_neverupdate">Ποτέ μην αναβαθμίζετε εάν το σύστημα λειτουργεί καλά.</string>
-    <string name="update_askfriend">Ρωτήστε ένα φίλο γα το νέο APK.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Θέμα: Αντιμετώπιση Προβλημάτων</string>
-    <string name="troubleshooting_wheretoask">Πού ψάχνω για βοήθεια;</string>
-    <string name="troubleshooting_fb">Γίνετε μέλος της ομάδας AndroidAPS στο Facebook.</string>
-    <string name="troubleshooting_wiki">Διαβάστε τον οδηγό AndroidAPS.</string>
-    <string name="troubleshooting_gitter">Επισκεφθείτε το AndroidAPS Gitter Room.</string>
-    <string name="troubleshooting_googlesupport">Επισκεφθείτε την υποστήριξη AndroidAPS Google</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">NovoRapid®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Θέμα: Προσθήκες Ευαισθησία</string>
-    <string name="sensitivity_which">Ποιος αλγόριθμος ευαισθησίας έχει ένα ρυθμιζόμενο χρονικό εύρος;</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Ποια προσθήκη ευαισθησίας πρέπει να χρησιμοποιείται για το UAM χαρακτηριστικό;</string>
-    <string name="wrongcarbs_label">Θέμα: Σφάλματα Εισαγωγής Υδατανθράκων</string>
     <string name="wrongcarbs_whattodo">Τι πρέπει να κάνετε αν γίνει μια λανθασμένη εισαγωγή υδατανθράκων;</string>
-    <string name="wrongcarbs_treatmentstab">Στις Θεραπείες, διαγράψτε την λανθασμένη εισαγωγή υδατανθράκων. Εισάγετε νέους υδατάνθρακες.</string>
-    <string name="wrongcarbs_addfakeinsulin">Προσθέσθε ψεύτικη ινσουλίνη, χρησιμοποιώντας την λειτουργία Ξαναγέμισμα</string>
-    <string name="extendedcarbs_label">Θέμα: Τρόφιμα με Λίπος και Πρωτεΐνη</string>
-    <string name="extendedcarbs_handling">Τι να κάνετε αν το φαγητό περιέχει ένα μεγάλο ποσό λίπους και/ή πρωτεΐνών;</string>
-    <string name="extendedcarbs_useextendedcarbs">Επανυπολογισμός του λίπους και των πρωτεϊνών σε υδατάνθρακες και χρησιμοποιήστε το χαρακτηριστικό \"Εκτεταμμένους υδατάνθρακες\".</string>
-    <string name="extendedcarbs_add">Επανυπολογισμός του λίπους και των πρωτεϊνών σε υδατάνθρακες και προσθέστε το στον υπολογισμό bolus.</string>
-    <string name="extendedcarbs_useextendedbolus">Χρήση εκτεταμμένου bolus για κάλυψη λίπους και πρωτεϊνών.</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">Πώς μπορείτε να παρακολουθήσετε το AAPS του παιδιού σας από απόσταση;</string>
-    <string name="nsclient_nightscout">Χρησιμοποιώντας την σελίδα του Nightscout.</string>
-    <string name="nsclient_dexcomfollow">Dexcom Follow app αν χρησιμοποιείτε το αυθεντικό Dexcom app (BG μόνο).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow εάν χρησιμοποιείτε το xDrip app.</string>
-    <string name="nsclient_xdripfollower">το xDrip τρέχει σε λειτουργία ακολούθου.</string>
-    <string name="nsclient_looponiphone">App κύκλωμα για το iPhone.</string>
-    <string name="nsclient_spikeiphone">Spike app για iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_increasingvalue">Υψηλότερη τιμή ISF οδηγεί σε λιγότερη χορήγηση ινσουλίνης, όταν το AAPS διορθώνει την υψηλή BG.</string>
-    <string name="isf_decreasingvalue">Χαμηλότερη τιμή ISF οδηγεί σε λιγότερη χορήγηση ινσουλίνης, όταν το AAPS διορθώνει την υψηλή BG.</string>
-    <string name="isf_noeffect">Αλλάζοντας την τιμή του ISF δεν έχει καμία επίδραση στην ποσότητα ινσουλίνης που χορηγείται όταν το AAPS διορθώνει την υψηλή BG.</string>
-    <string name="isf_preferences">Θα πρέπει να εισάγετε την ISF στις Επιλογές.</string>
     <string name="isf_profile">Η αλλαγή της τιμής της ISF στο προφίλ σας είναι αρκετό για να εφαρμόσετε την αλλαγή αυτή.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_increasingvalue">Υψηλή αναλογία IC οδηγεί σε λιγότερη χορήγηση ινσουλίνης για μια δεδομένη ποσότητα υδατανθράκων.</string>
-    <string name="ic_decreasingvalue">Μικρή αναλογία IC οδηγεί σε λιγότερη χορήγηση ινσουλίνης για μια δεδομένη ποσότητα υδατανθράκων.</string>
     <string name="ic_noeffect">Αν έχετε 0 COB Ενεργούς Υδατ., αλλάζοντας την αναλογία IC θα οδηγήσει σε μια διαφορετική ποσότητα ινσουλίνης για να διορθωθεί μια συγκεκριμένη τιμή BG.</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_basalhigher">Ο Βασικός θα είναι 10% υψηλότερος.</string>
-    <string name="profileswitch_basallower">Ο Βασικός θα είναι 10% χαμηλότερος.</string>
-    <string name="profileswitch_ichigher">Η τιμή IC θα είναι 10% υψηλότερη.</string>
-    <string name="profileswitch_iclower">Η τιμή IC θα είναι 10% χαμηλότερη.</string>
-    <string name="profileswitch_isfhigher">Η τιμή ISF θα είναι 10% υψηλότερη.</string>
-    <string name="profileswitch_isflower">Η τιμή ISF θα είναι 10% χαμηλότερη.</string>
-    <string name="profileswitch_overall">Θα πάρετε περίπου 10% λιγότερη ινσουλίνη στο σύνολο.</string>
-    <string name="profileswitch_targethigher">Ο στόχος θα είναι 10% υψηλότερος.</string>
-    <string name="profileswitch_targetlower">Ο στόχος θα είναι 10% χαμηλότερος.</string>
-    <string name="profileswitch_targetbottom">Μόνο ο χαμηλός στόχος θα είναι 10% χαμηλότερος.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Αν ξυπνήσετε 1 ώρα νωρίτερα από το συνηθισμένο, πώς θα πρέπει να ενημερώσετε το AAPS για την αλλαγή στο πρόγραμμά σας;</string>
-    <string name="profileswitchtime_1">Ξεκινήστε μία αλλαγή προφίλ με χρονική μετατόπιση 1</string>
-    <string name="profileswitchtime__1">Ξεκινήστε μία αλλαγή προφίλ με χρονική μετατόπιση -1</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Ξεκινήστε μία αλλαγή προφίλ με χρονική μετατόπιση 60</string>
-    <string name="profileswitchtime__60">Ξεκινήστε μία αλλαγή προφίλ με χρονική μετατόπιση -60</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
-    <string name="basalhelp_label">Θέμα: Βοήθεια με βασικό ρυθμό</string>
     <string name="basalhelp_where">Πού θα πάτε για βοήθεια με Βασικό ρυθμό κτλ.</string>
     <string name="basalhelp_diabetesteam">Στην ομάδα του γιατρού σας</string>
     <string name="basalhelp_google">Google</string>

app/src/main/res/values-el-rGR/objectives.xml

@@ -37,7 +37,6 @@
     <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>

app/src/main/res/values-el-rGR/strings.xml

@@ -433,8 +433,6 @@
     <string name="overview_editquickwizard_usebasaliob">Υπολογισμός βασικού IOB</string>
     <string name="overview_editquickwizard_usetrend">Υπολογισμός τάσης</string>
     <string name="overview_editquickwizard_usesuperbolus">Υπολογισμός superbolus</string>
-    <string name="yes">Ναι</string>
-    <string name="no">Όχι</string>
     <string name="positiveonly">Μόνο θετική</string>
     <string name="negativeonly">Μόνο αρνητική</string>
     <string name="overview_editquickwizard_usecob">Υπολογισμός COB</string>
@@ -639,7 +637,6 @@
     <string name="low_temptarget_lowers_sensitivity_title">Ο χαμηλός προσωρινός στόχος μειώνει την ευαισθησία</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Χαμηλότερη ευαισθησία για προσωρινό στόχο < 100]]></string>
     <string name="combo_invalid_setup">Εσφαλμένη ρύθμιση αντλίας. Ελέγξτε τα κείμενα και βεβαιωθείτε ότι η Quick Info ονομάζεται QUICK INFO χρησιμοποιώντας το λογισμικό διαμόρφωσης 360.</string>
-    <string name="custom">Προσαρμογή</string>
     <string name="careportal_removestartedevents">Ξεκίνησε το AndroidAPS καθαρό</string>
     <string name="storedsettingsfound">Βρέθηκαν αποθηκευμένες ρυθμίσεις</string>
     <string name="allow_hardware_pump_text">Προσοχή: Εάν ενεργοποιήσετε και συνδεθείτε με μια αντλία, το AndroidAPS θα αντιγράψει τις ρυθμίσεις βασικού από το προφίλ στην αντλία, αντικαθιστώντας τον υπάρχων βασικό ρυθμό της αντλίας. Βεβαιωθείτε ότι έχετε τον σωστό βασικό ρυθμό στο AndroidAPS. Εάν δεν είστε βέβαιοι ή δεν θέλετε να αντικαταστήσετε τον βασικό ρυθμό στην αντλία σας, πατήστε Άκυρο και επαναλάβετε εναλλαγή προς την αντλία σε μεταγενέστερο χρόνο.</string>

app/src/main/res/values-es-rES/exam.xml

@@ -1,167 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">¿Qué es cierto acerca de DIA?</string>
-    <string name="dia_label_exam">Tema: Duración de la acción de la insulina</string>
-    <string name="dia_minimumis3h">El valor mínimo es de 3 horas.</string>
-    <string name="dia_minimumis5h">El valor mínimo es de 5 horas.</string>
+    <string name="dia_label_exam">Duración de actividad de insulina (DIA)</string>
+    <string name="dia_profile">Debe establecer el valor para DIA en su perfil.</string>
+    <string name="dia_minimumis5h">El valor mínimo permitido es 5 horas.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">El significado es igual al parámetro DIA utilizado en su bomba.</string>
-    <string name="dia_valuemustbedetermined">Debes determinar tu valor individual (pero no menos de 5 horas).</string>
-    <string name="hypott_label">Tema: Objetivo Temporal por Hipoglucemia</string>
+    <string name="dia_meaningisequaltodiapump">Si está satisfecho con el valor para DIA que utilizó en su bomba antes de usar AndroidAPS y le funcionó bien, no hay necesidad de cambiar esto cuando empieces a cerrar el bucle.</string>
+    <string name="dia_valuemustbedetermined">Deberías determinar por ti mismo el valor apropiado para DIA.</string>
+    <string name="hypott_label">Objetivo temporal ante Hipoglucemia</string>
     <string name="hypott_whenhypott">¿Cuál es la razón principal para establecer un objetivo temporal por hipoglucemia?</string>
-    <string name="hypott_goinglow">Para evitar que la glucemia caiga si ya hay una basal temporal a cero activada.</string>
-    <string name="hypott_preventoversmb">Para evitar que AAPS inyecte demasiada insulina después de una subida causada por los carbohidratos de acción rápida utilizados para tratar una bajada en las lecturas de glucosa.</string>
+    <string name="hypott_wrongbasal">Para corregir hipos causados por ajustes incorrectos de la tasa basal.</string>
+    <string name="hypott_preventoversmb">Para evitar que AndroidAPS corriga excesivamente un aumento de la glucosa en la sangre causado por los glúcidos de acción rápida que se utilizaron para tratar una hípo.</string>
+    <string name="hypott_exercise">Para corregir una hipo resultando de ejercicio.</string>
+    <string name="hypott_0basal">Para evitar que la glucosa sanguínea se quede baja si ya hay una tasa basal temporal 0% en funcionamiento.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">¿Qué perfil puede ser usado y configurado estando desconectado?</string>
     <string name="offlineprofile_label">Tema: Perfil fuera de línea</string>
     <string name="offlineprofile_nsprofile">El perfil NS puede ser usado pero no configurado.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Tema: Desconectando de la bomba</string>
-    <string name="pumpdisconnect_letknow">Haga clic en \"Desconectar bomba\" para que AAPS sepa que no se está inyectando insulina.</string>
-    <string name="pumpdisconnect_suspend">Haga clic en \'Suspender lazo \' para que la AAPS deje de estar en lazo cerrado mientras la bomba está desconectada.</string>
-    <string name="pumpdisconnect_dontchnage">No cambies nada en AAPS, sólo desconecta la bomba.</string>
+    <string name="pumpdisconnect_label">Razones para aplicar \"Desconectar bomba\" en AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">¿Qué se debe hacer al desconectar la bomba?</string>
+    <string name="pumpdisconnect_unnecessary">Esto es innecesario, ya que no se entregará insulina si la bomba está físicamente desconectada.</string>
+    <string name="pumpdisconnect_missinginsulin">Evita que AndroidAPS tenga en cuenta la insulina que no se entregó mientras la bomba se desconecta físicamente. </string>
+    <string name="pumpdisconnect_notstop">Si la bomba permanece conectada, no se detendrá la entrega de insulina.</string>
+    <string name="pumpdisconnect_openloop">Enviará AndroidAPS a modo bucle abierto.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Tema: Ajustes AndroidAPS</string>
-    <string name="objectives_howtosave">¿Cuál es la mejor práctica para hacer copias de seguridad de tus ajustes?</string>
-    <string name="objectives_exportsettings">Exportarlos localmente desde el menú de Mantenimiento.</string>
-    <string name="objectives_storeelsewhere">Guardar archivo exportado a otro lugar como correo electrónico, Dropbox, Google drive…</string>
-    <string name="objectives_doexportonstart">Exportarlos justo después de la instalación de AAPS.</string>
-    <string name="objectives_doexportafterchange">Exportarlos después de realizar cambios en la configuración.</string>
-    <string name="objectives_doexportafterobjective">Exportarlos tras completar un objetivo.</string>
-    <string name="objectives_doexportafterfirtssettings">Exportarlos al terminar la configuración inicial.</string>
+    <string name="objectives_label">Ajustes AndroidAPS</string>
+    <string name="objectives2_label">Ajustes AndroidAPS</string>
+    <string name="objectives_howtosave">¿Cuáles son las mejores prácticas para hacer copias de seguridad de su configuración?</string>
+    <string name="objectives_notesettings">No necesita exportar sus ajustes siempre que haga una nota de ellos.</string>
+    <string name="objectives_afterobjective">Exporta tu configuración después de completar un objetivo.</string>
+    <string name="objectives_afterchange">Exportar la configuración después de cambiar cualquiera de sus ajustes.</string>
+    <string name="objectives_afterinitialsetup">Exportar la configuración una vez finalizada la configuración inicial y haber establecido sus preferencias.</string>
+    <string name="objectives2_maintenance">Exportar la configuración localmente usando el menú de mantenimiento.</string>
+    <string name="objectives2_internalstorage">El archivo de configuración se encuentra en la carpeta Almacenamiento/AAPS/preferencias en el teléfono.</string>
+    <string name="objectives2_cloud">Copie el archivo de preferencias a una ubicación segura fuera de su teléfono (p.e. mediante el uso de una nube, conectando un cable a una computadora, correo electrónico, etc.)</string>
+    <string name="objectives2_easyrestore">Si su teléfono está dañado o perdido, hay formas fáciles de recuperar remotamente su configuración sin hacer una copia de seguridad.</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">Tema: Lecturas de CGM ruidosas</string>
+    <string name="noisycgm_label">Lecturas CGM ruidosas</string>
     <string name="noisycgm_whattodo">¿Qué se debe hacer si los datos de CGM tienen ruido?</string>
-    <string name="nothing">Nada, AAPS se ocupará de ello.</string>
-    <string name="noisycgm_pause">Desactivar el lazo cerrado para evitar una sobredosis.</string>
-    <string name="noisycgm_replacesensor">Sustituya el sensor de CGM.</string>
-    <string name="noisycgm_turnoffphone">Apagar el movil.</string>
+    <string name="noisycgm_nothing">No hacer nada - AndroidAPS se encargará de ello.</string>
+    <string name="noisycgm_pause">Deshabilita el bucle cerrado para evitar posibles sobredosis o subdosis.</string>
+    <string name="noisycgm_replacesensor">Sustituya los sensores constantemente ruidosos o inexactos.</string>
+    <string name="noisycgm_checksmoothing">Comprueba que tu aplicación CGM proporciona datos 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="noisycgm_checksmoothing">Verifique que la aplicación CGM suaviza los datos de glucosa.</string>
-    <string name="exercise_label">Tema: Ejercicio</string>
-    <string name="exercise_whattodo">¿Cómo puedes ayudar al sistema a lidiar con el ejercicio?</string>
-    <string name="exercise_setactivitytt">Utilización de la característica de objetivo temporal.</string>
-    <string name="exercise_switchprofilebelow100">Realice un cambio de perfil por debajo del 100%.</string>
-    <string name="exercise_switchprofileabove100">Realice un cambio de perfil por encima del 100%.</string>
-    <string name="exercise_stoploop">Detener el lazo.</string>
-    <string name="exercise_doitbeforestart">Establezca un objetivo temporal de actividad antes de iniciar el ejercicio.</string>
-    <string name="exercise_afterstart">Establecer un objetivo temporal de actividad después de comenzar el ejercicio conduce a peores resultados que si se inicia antes de hacerlo.</string>
+    <string name="exerciseprofile_label">Ejercicio y perfiles</string>
+    <string name="exerciseprofile_whattodo">¿Cómo puede usar perfiles para ayudar mejor al sistema a hacer frente al ejercicio aeróbico?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Haga un cambio de perfil a menos de 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Haga un cambio de perfil a más de 100%. </string>
+    <string name="exerciseprofile_leaveat100">Deja el perfil fijado a 100%.</string>
+    <string name="exerciseprofile_suspendloop">Suspender el bucle.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">Ejercicios y objetivos temporales</string>
+    <string name="exercise_whattodo">¿Cómo se puede usar objetivos temporales para ayudar mejor al sistema a hacer frente al ejercicio aeróbico?</string>
+    <string name="exercise_settt">Establece un objetivo de glucosa en la sangre actividad que comienza un tiempo adecuado antes de comenzar el ejercicio.</string>
+    <string name="exercise_setfinished">Establece un objetivo de glucosa en la sangre actividad después de finalizar el ejercicio.</string>
+    <string name="exercise_setunchanged">Deja tu objetivo de glucosa sanguíneo sin cambios.</string>
+    <string name="exercise_15g">Espere hasta que la glucosa en sangre caiga por debajo de su objetivo de hipo temp y luego coma 15 g de hidratos de carbono de actividad 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">Tema: Lazo inhabilitado/suspendido</string>
+    <string name="suspendloop_label">Desactiva /suspende el bucle</string>
     <string name="suspendloop_doigetinsulin">¿Recibo insulina cuando el lazo está desactivado/suspendido?</string>
     <string name="suspendloop_yes">Sí, la insulina basal sigue siendo entregada.</string>
     <string name="suspendloop_no">No, la administración de la insulina está detenida.</string>
-    <string name="basaltest_label">Tema: Basal, ISF, y IC Pruebas</string>
-    <string name="basaltest_when">¿Cuándo debo validar los valores basales, ISF y IC?</string>
-    <string name="basaltest_beforeloop">Antes de empezar en uso de lazo.</string>
-    <string name="basaltest_havingregularhypo">Si se experimentan valores bajos de BG frecuentemente.</string>
-    <string name="basaltest_havingregularhyper">Si se experimentan valores altos de BG frecuentemente.</string>
+    <string name="basaltest_label">Pruebas basales, ISF, e I:C</string>
+    <string name="basaltest_when">¿Cuándo se deben validar estos valores?</string>
+    <string name="basaltest_beforeloop">Antes de empezar el bucle.</string>
+    <string name="basaltest_havingregularhighlow">Cuando se tienen valores de glucosa altos o bajos frecuentemente.</string>
+    <string name="basaltest_weekly">Al menos una vez a la semana.</string>
+    <string name="basaltest_fixed">Una vez fijados y validados, estos valores no debrían cambiar a lo largo del tiempo.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Tema: Requisitos previos</string>
-    <string name="prerequisites_what">¿Qué necesito?</string>
+    <string name="prerequisites_label">Requisitos previos</string>
+    <string name="prerequisites_what">¿Qué es imprescindible instalar para usar AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Información de perfil validada (Basal, IC, ISF, DIA).</string>
-    <string name="prerequisites_computer">Un ordenador para crear un APK.</string>
+    <string name="prerequisites_computer">Un ordenador con Android Studio instalado y configurado.</string>
     <string name="prerequisites_phone">Un teléfono compatible.</string>
-    <string name="prerequisites_car">Un Coche.</string>
-    <string name="prerequisites_nightscout">Nightscout para pasar los objetivos.</string>
+    <string name="prerequisites_pump">Una bomba de insulina compatible si pretendes usar el sistema en modo \"lazo cerrado\".</string>
+    <string name="prerequisites_nightscout">Nightscout, para tener un registro de los datos y revisar los parámetros de cnfiguración.</string>
     <string name="prerequisites_tidepoolaccount">Una cuenta de Tidepool.</string>
     <string name="prerequisites_googleaccount">Una cuenta de Google.</string>
     <string name="prerequisites_githubaccount">Una cuenta de Github.</string>
-    <string name="prerequisites_beanandroiddeveloper">Experiencia en desarrollo de Android.</string>
+    <string name="prerequisites_beanandroiddeveloper">Experiencia programando o editando código.</string>
     <string name="prerequisites_own670g">Una bomba MiniMed 670G.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">Un Smartwatch.</string>
     <string name="prerequisites_supportedcgm">Un CGM soportado.</string>
-    <string name="update_label">Tema: Actualización de AndroidAPS</string>
-    <string name="whatistrue">¿Qué es verdad?</string>
-    <string name="update_git">Tienes que tener instalado Git.</string>
-    <string name="update_asap">Actualice tan pronto como se libere la nueva versión y prevea tener tiempo suficiente para hacerlo.</string>
-    <string name="update_keys">Debes usar las mismas claves de firma.</string>
+    <string name="prerequisites2_label">Requisitos previos</string>
+    <string name="prerequisites2_what">¿Qué es necesario para poder instalar y usar AndroidAPS?</string>
+    <string name="prerequisites2_profile">Parámetros validados para poder configurar un perfil (ISF, I:C ratio, perfil basal, DIA etc.).</string>
+    <string name="prerequisites2_device">Un dispositivo Android compatible (e.j. un móvil, un smartwatch Android compatible o una tablet).</string>
+    <string name="prerequisites2_internet">AndroidAPS necesita una conexión a internet para funcionar en modo \"lazo cerrado\".</string>
+    <string name="prerequisites2_supportedcgm">Un medidor continuo de glucosa (MCG) y una aplicación capaz de recibir los valores proporcionados por el medidor en el móvil o tablet.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">Actualizando AndroidAPS</string>
+    <string name="whatistrue">Compruebe todas las respuestas correctas.</string>
+    <string name="update_git">Es necesario tener Git instalado y configurado en el ordenador.</string>
+    <string name="update_asap">Cuando esté disponible una versión más actualizada de AndroidAPS, las funciones de las versiones anteriores podrán ser limitadas de manera remota después de una fecha determinada.</string>
+    <string name="update_keys">Se debe guardar en un lugar seguro la \"keystore\" que se ha empleado y usar la misma\"key\" para futuras actulizaciones.</string>
     <string name="update_neverupdate">Nunca actualice si el sistema está funcionando bien.</string>
-    <string name="update_askfriend">Pregúntale a tu amigo por el nuevo APK.</string>
+    <string name="update_askfriend">Si tienes problemas construyendo la aplicación (. apk), puedes instalar el mismo archivo. apk compilado por un 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">Tema: Resolución de problemas</string>
-    <string name="troubleshooting_wheretoask">Donde buscar ayuda?</string>
-    <string name="troubleshooting_fb">Únete al grupo AndroidAPS de Facebook.</string>
-    <string name="troubleshooting_wiki">Lea la documentación de AndroidAPS.</string>
-    <string name="troubleshooting_gitter">Visite AndroidAPS Gitter Room.</string>
-    <string name="troubleshooting_googlesupport">Visite el soporte de Google AndroidAPS</string>
-    <string name="troubleshooting_yourendo">Hable con su endocrinólogo.</string>
+    <string name="troubleshooting_label">Solución de problemas</string>
+    <string name="troubleshooting_wheretoask">¿Dónde se puede pedir ayuda relacionada con AndroidAPS?</string>
+    <string name="troubleshooting_fb">Puedes pedir ayuda en el grupo de Facebook AndroidAPS Users.</string>
+    <string name="troubleshooting_wiki">Debes leer (y después releer) la documentación oficial de AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Puedes pedir ayuda y registrar problemas técnicos en la llamada AndroidAPS Gitter room.</string>
+    <string name="troubleshooting_yourendo">Debes preguntar a tu endocrino o educador diabetológico.</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">Tema: Plugins sobre Insulina</string>
-    <string name="insulin_ultrarapid">¿Qué marca de insulina se puede utilizar con el plugin Ultra-Rapid-Oref?</string>
+    <string name="insulin_label">Plugins de insulina</string>
+    <string name="insulin_ultrarapid">¿Qué insulina debes usar con el plugin Ultra-Rapid Oref?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid ®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin R®/\"insulina humana estándar\".</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Tema: Plugins de sensibilidad</string>
-    <string name="sensitivity_which">¿Qué algoritmo de sensibilidad tiene un rango de tiempo configurable?</string>
+    <string name="sensitivity_label">Plugins de sensibilidad</string>
+    <string name="sensitivity_which">Compruebe todas las respuestas correctas.</string>
+    <string name="sensitivity_adjust">Los plugins de sensibilidad permiten a AndroidAPS ajustarse para cambios temporales o de corta duración en la sensibilidad a la insulina (por ejemplo, cambios hormonales o problemas con la absorción en el sitio de infusión).</string>
+    <string name="sensitivity_edit">Los plugins de sensibilidad sugieren al usuario cambios en la cantidad de insulina basal a suministrar, en el factor de sensibiliad a la insulina (ISF) y en el ratio I:C y pueden ser incorporados al perfil definido.</string>
+    <string name="sensitivity_cannula">Registrar el cámbio de cánula reseteará Autosens, dejándolo de nuevo al 100%.</string>
+    <string name="sensitivity_time">Algunas de las opciones del plugin tienen rangos de tiempo configurables que pueden ser definidos por el usuario.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">¿Qué plugin de sensibilidad se debe utilizar para la funcionalidad UAM?</string>
-    <string name="wrongcarbs_label">Tema: Errores en la entrada de carbohidratos</string>
+    <string name="wrongcarbs_label">Error de entrada de Carbohidratos</string>
     <string name="wrongcarbs_whattodo">¿Qué deberías hacer si has hecho una entrada incorrecta de carbohidratos?</string>
-    <string name="wrongcarbs_treatmentstab">En los Tratamientos, eliminar la entrada incorrecta de carbohidratos. Introducir los nuevos valores de carbohidratos.</string>
-    <string name="wrongcarbs_addfakeinsulin">Cómo agregar una insulina falsa utilizando la función llenado de cánula</string>
-    <string name="extendedcarbs_label">Tema: Comida con Grasa y Proteína</string>
-    <string name="extendedcarbs_handling">¿Qué hacer si su comida contiene una gran cantidad de grasas y /o proteínas?</string>
-    <string name="extendedcarbs_useextendedcarbs">Recalcular grasas y proteínas a los carbohidratos y utilizar la función \"carbohidratos extendidos\".</string>
-    <string name="extendedcarbs_add">Recalcular grasa y proteínas a los carbohidratos y añadirlo al cálculo del bolo.</string>
-    <string name="extendedcarbs_useextendedbolus">Utilice el bolus extendido para cubrir grasas y proteínas.</string>
+    <string name="wrongcarbs_treatmentstab">Elimina la entrada incorrecta en los tratamientos e introduce el valor correcto de carbohidratos.</string>
+    <string name="wrongcarbs_addinsulin">Bolo con insulina usando el menú de llenado de la infusión.</string>
+    <string name="wrongcarbs_donothing">No haga nada – AndroidAPS hará los ajustes apropiados.</string>
+    <string name="wrongcarbs_bolus">Bolo con insulina usando el botón de Insulina (bolus) en página general.</string>
+    <string name="wronginsulin_label">Errores de entrega/entrada de insulina</string>
+    <string name="wronginsulin_whattodo">¿Qué debes hacer si recibiste menos insulina de la que sugiere la historia de la bomba p.ej. debido a una oclusión, una cánula fallida o olvidarse de reponer la bomba después de una ducha?</string>
+    <string name="wronginsulin_careportal">Elimina los datos de insulina del portal de Nightscout Careportal para eliminarlos del historial de la bomba.</string>
+    <string name="wronginsulin_compare">Comparar valores en AndroidAPS e historial de la bomba.</string>
+    <string name="wronginsulin_prime">Bolo una proporción de la insulina calculada “perdida” por jeringa/pluma o usando menú de llenado.</string>
+    <string name="wronginsulin_donothing">No haga nada y permite que AndroidAPS corrija cualquier nivel alto de glucosa en la sangre resultante.</string>
+    <string name="iob_label">Insulina a bordo (IOB)</string>
+    <string name="iob_which">Marca todas las respuestas correctas.</string>
+    <string name="iob_value">El valor del IOB se ve afectado por las bases temporales ejecutadas.</string>
+    <string name="iob_hightemp">No se dará alta tasa basal temporal cuando su nivel de azúcar en sangre esté por debajo del objetivo.</string>
+    <string name="iob_negiob">El IOB negativo durante un período sustancial en ausencia de ejercicio sugiere que tu perfil es demasiado fuerte y que se necesita menos insulina en tus ajustes.</string>
+    <string name="iob_posiob">El IOB positivo durante un período sustancial sugiere resistencia a la insulina o comidas no anunciadas.</string>
+    <string name="breadgrams_label">Entrada y bolos de carbohidratos</string>
+    <string name="breadgrams_grams">Sólo se deben utilizar gramos para estimar y registrar los carbohidratos consumidos.</string>
+    <string name="breadgrams_exchange">Los carbohidratos consumidos se pueden registrar utilizando un sistema de intercambio apropiado (por ejemplo, los intercambios DAFNE \"CHO\" o \"Unidades de Pan\" europeas).</string>
+    <string name="breadgrams_decay">AndroidAPS utiliza un modelo dinámico para estimar la \"reducción\" y calcular el COB.</string>
+    <string name="breadgrams_calc">Si los niveles de glucosa en sangre están fuera de los valores aceptables (demasiado bajos o demasiado altos), la calculadora del bolo se puede utilizar para proporcionar sugerencias para las correcciones de carbohidratos o de 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">e-carbs</string>
+    <string name="extendedcarbs_handling">¿Para qué podría utilizar los e-carbs (carbohidratos extendidos)?</string>
+    <string name="extendedcarbs_future">Para programar los carbohidratos en el futuro, posiblemente distribuidos a través de un período (similar a un bolo extendido que distribuye insulina sobre un período).</string>
+    <string name="extendedcarbs_free">Para el registro de los carbohidratos \'libres\' para ejercicios que desea ocultar de AndroidAPS.</string>
+    <string name="extendedcarbs_fat">los e-carbohidratos (distribuidos en el futuro) pueden ayudar a AndroidAPS en el tratamiento de comidas de alta grasa/proteína.</string>
+    <string name="extendedcarbs_rescue">Para registrar carbohidratos de rescate que se utilizan para tratar glucosa baja.</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Tema: Supervisión remota</string>
-    <string name="nsclient_howcanyou">¿Cómo puede supervisar la AAPS de su hijo de forma remota?</string>
-    <string name="nsclient_nightscout">Cómo utilizar un sitio de \"Nightscout\".</string>
-    <string name="nsclient_dexcomfollow">App Dexcom seguidora si está usando la aplicación original Dexcom (sólo valores BG).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Seguidora si está utilizando la aplicación xDrip.</string>
-    <string name="nsclient_xdripfollower">xDrip ejecutado en modo seguidor.</string>
-    <string name="nsclient_looponiphone">Aplicación de Loop en el iPhone.</string>
-    <string name="nsclient_spikeiphone">App de Spike en el iPhone.</string>
+    <string name="nsclient_label">Monitoreo remoto</string>
+    <string name="nsclient_howcanyou">¿Cómo puede monitorear a AndroidAPS (por ejemplo para su hijo) de forma remota?</string>
+    <string name="nsclient_nightscout">La aplicación NS Client, la aplicación Nightscout y la página web Nightscout le permiten seguir a AndroidAPS de forma remota.</string>
+    <string name="nsclient_dexcomfollow">Otras aplicaciones (por ejemplo, Dexcom follow, xDrip running en el modo de seguimiento) le permiten seguir algunos parámetros (por ejemplo, los valores de glucosa/sensor) de forma remota, pero utilizan diferentes algoritmos por lo que puede tener valores de IOB o COB inexactos.</string>
+    <string name="nsclient_data">Para seguir a AndroidAPS de forma remota, ambos dispositivos deben tener acceso a Internet (por ejemplo, a través de Wi-Fi o datos de red móvil/celular).</string>
+    <string name="nsclient_fullcontrol">El Cliente NS utilizado como seguidor remoto supervisará y proporcionará el control total de AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Tema: Factor de sensibilidad de insulina</string>
-    <string name="isf_increasingvalue">Los valores más altos de ISF llevan a una menor cantidad de insulina cuando AAPS corrige los valores altos de glucemia.</string>
-    <string name="isf_decreasingvalue">Los valores más bajos de ISF llevan a una menor cantidad de insulina cuando AAPS corrige los valores altos de glucemia.</string>
-    <string name="isf_noeffect">El cambio de los valores de ISF no afecta a la cantidad de insulina que se entrega cuando AAPS corrige para compensar los valores altos de glucemia.</string>
-    <string name="isf_preferences">Tiene que especificar ISF en Preferencias.</string>
+    <string name="isf_label_exam">Factor Sensibilidad a la Insulina (ISF)</string>
+    <string name="isf_increasingvalue">El aumento de los valores de ISF conducirá a un mayor suministro de insulina para cubrir una cantidad específica de carbonos.</string>
+    <string name="isf_decreasingvalue">Reducir los valores de ISF conduce a una mayor cantidad de insulina para corregir una glucosa sanguínea a un objetivo superior.</string>
+    <string name="isf_noeffect">Aumentar o reducir el ISF no tiene ningún efecto en la administración de insulina cuando los niveles de glucosa en la sangre están por debajo del objetivo.</string>
+    <string name="isf_preferences">ISF debe introducirse en sus preferencias de AndroidAPS.</string>
     <string name="isf_profile">El cambio del valor de ISF en el perfil es suficiente para aplicar el cambio.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Tema: El ratio insulina carbohidratos- IC</string>
-    <string name="ic_increasingvalue">Los ratios IC más altos conducen a menos insulina entregada por una cantidad determinada de carbohidratos.</string>
-    <string name="ic_decreasingvalue">Los ratios IC más bajos conducen a menos insulina entregada por una cantidad determinada de carbohidratos.</string>
+    <string name="ic_multiple">Puede utilizar más de un valor para la relación I:C en su perfil.</string>
+    <string name="ic_isf">Si cambias tu ISF en tu perfil, siempre deberías cambiar tu relación I:C también.</string>
+    <string name="ic_label_exam">Proporción de insulina a carbohidrato (relación I:C)</string>
+    <string name="ic_increasingvalue">Las relaciones I:C más altas conducen a menos insulina entregada por una cantidad dada de carbohidratos.</string>
+    <string name="ic_decreasingvalue">Las relaciones I:C más bajas conducen a menos insulina entregada por una cantidad dada de carbohidratos.</string>
     <string name="ic_noeffect">Si tiene 0 COB, cambiar la ratio IC conducirá a una cantidad distinta de insulina para corregir un valor de glucemia determinado.</string>
     <string name="ic_different">El IC será diferente si cuenta una unidad de carbohidratos como 10g o 12g.</string>
     <string name="ic_meaning">IC significa: Cuántas unidades de carbohidratos están cubiertas por 1U de insulina.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Tema: Cambio de perfil</string>
-    <string name="profileswitch_pctwillchange"> Especificando el 90% en el cambio de perfil…</string>
-    <string name="profileswitch_basalhigher">Las basales serán 10% más altas.</string>
+    <string name="profileswitch_label">Cambio de perfil</string>
+    <string name="profileswitch_pctwillchange"> Al especificar un cambio de perfil del 90%, ¿qué respuestas son correctas?</string>
     <string name="profileswitch_basallower">Las basales serán 10% más bajas.</string>
-    <string name="profileswitch_ichigher">El valor IC será 10% superior.</string>
-    <string name="profileswitch_iclower">El valor IC será 10% inferior.</string>
-    <string name="profileswitch_isfhigher">El valor sensibilidad será 10% superior.</string>
-    <string name="profileswitch_isflower">El valor sensibilidad será 10% inferior.</string>
-    <string name="profileswitch_overall">En total obtendrás alrededor del 10% menos insulina.</string>
-    <string name="profileswitch_targethigher">El objetivo será 10% más alto.</string>
-    <string name="profileswitch_targetlower">El objetivo será 10% más bajo.</string>
-    <string name="profileswitch_targetbottom">Sólo el objetivo inferior será 10% inferior.</string>
+    <string name="profileswitch_isfhigher">El ISF será un 10% más alto.</string>
+    <string name="profileswitch_iclower">El valor del ratio I:C será un 10% más bajo.</string>
+    <string name="profileswitch_unchanged">Las relaciones ISF e I:C no se modificarán.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profilewitch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Si se despierta 1h antes de lo habitual, ¿cómo debe notificar a AAPS el cambio en su horario?</string>
-    <string name="profileswitchtime_1">Iniciar un cambio de perfil con un intervalo de tiempo de 1</string>
-    <string name="profileswitchtime__1">Iniciar un cambio de perfil con un intervalo de tiempo de -1</string>
+    <string name="profileswitch2_label">Cambio de perfil</string>
+    <string name="profileswitch2_pctwillchange"> Al especificar un cambio de perfil del 120%, ¿qué respuestas son correctas?</string>
+    <string name="profileswitch2_bghigher">El objetivo de la glucosa en sangre será 20% más alto.</string>
+    <string name="profileswitch2_basalhigher">Las tasas basales serán un 20% más altas.</string>
+    <string name="profileswitch2_bgunchanged">El objetivo de la glucosa sanguínea no cambiará.</string>
+    <string name="profileswitch2_isfhigher">El ISF será un 20% más alto.</string>
+    <string name="profileswitchtime_label">Cambio de perfil</string>
+    <string name="profileswitchtime_iwant">Si te levantas 2 horas antes de lo habitual, ¿cómo debes notificar a AndroidAPS del cambio en tu horario?</string>
+    <string name="profileswitchtime_2">Iniciar un cambio de perfil con un intervalo de tiempo de 2</string>
+    <string name="profileswitchtime__2">Iniciar un cambio de perfil con un intervalo de tiempo de -2</string>
+    <string name="profileswitchtime_tt">Establece un objetivo temporal comida pronta.</string>
+    <string name="profileswitchtime_100">Haga un cambio de perfil a más de 100%. </string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Iniciar un cambio de perfil con un intervalo de tiempo de 60</string>
-    <string name="profileswitchtime__60">Iniciar un cambio de perfil con un intervalo de tiempo de -60</string>
+    <string name="profileswitch4_label">Cambios en perfiles</string>
+    <string name="profileswitch4_rates">Las tasas basales, ISF, I:C, etc., deben establecerse en los perfiles.</string>
+    <string name="profileswitch4_internet">Activar cambios en su perfil de Nightscout requiere que su móvil con AndroidAPS tenga conexión a Internet.</string>
+    <string name="profileswitch4_sufficient">Editar perfiles para cambiar valores es suficiente para implementar cualquier cambio realizado.</string>
+    <string name="profileswitch4_multi">Se pueden configurar múltiples perfiles y seleccionarlos para adaptarse a las circunstancias cambiantes (por ejemplo, cambios hormonales, turnos de trabajo, días de semana/fin 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">Tema: Ayuda con tasas basales</string>
+    <string name="basalhelp_label">Ayuda con tasas basales</string>
     <string name="basalhelp_where">A donde ir para obtener ayuda con tasa basal y demás.</string>
     <string name="basalhelp_diabetesteam">Tu equipo de diabetes</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Otra medicación</string>
-    <string name="other_medication_text">La AAPS reduce el BR para aumentar la glucosa en la sangre. Los inhibidores del grupo de las SGLT2 (gliflozinas) pueden prevenir el aumento esperado de BG y, por lo tanto, pueden producir una deficiencia de insulina peligrosa (DKA).
-\nLos nombres comunes de marca son: Invokana ®, Forxiga ®, Steglatro ®, Suglat ®, Apleway ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\nI prometo que no tomaré este tipo de medicamentos cuando use AAPS o desactivará el lazo cerrado antes de usar estas drogas.</string>
+    <string name="other_medication_label">Otros Medicamentos. Por favor, lea la siguiente declaración y luego marque la casilla para aceptar la declaración.</string>
+    <string name="other_medication_text">AAPS reduce tasas basales o para la administración de insulina para aumentar la glucosa en la sangre. Los inhibidores del grupo de las SGLT2 (gliflozinas) pueden prevenir el aumento esperado de glucosa en sangre y, por lo tanto, pueden producir una deficiencia de insulina peligrosa (DKA).
+\nLos nombres comunes de marca son: Invokana ®, Forxiga ®, Steglatro ®, Suglat ®, Apleway ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\nI prometo que no tomaré este tipo de medicamentos usando AAPS o desactivaré el bucle cerrado antes de usar esas drogas.</string>
 </resources>

app/src/main/res/values-es-rES/objectives.xml

@@ -36,11 +36,11 @@
     <string name="objectives_useloop">Mostrar contenido del plugin Loop</string>
     <string name="objectives_usescale">Usar función de escala mediante un gráfico BG pulsado largo</string>
     <string name="objectives_button_enter">Intro</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si tienes al menos 3 meses de experiencia con el lazo cerrado de otros sistemas puedes cualificarte para obtener un código para saltarte los objetivos. Para información detallada (en inglés): https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives.</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si tienes al menos 3 meses de experiencia con el bucle cerrado de otros sistemas puedes cualificarte para obtener un código para saltarte los objetivos. Para información detallada (en inglés): https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives.</string>
     <string name="codeaccepted">Código aceptado</string>
     <string name="codeinvalid">Código no válido</string>
     <string name="objectives_exam_objective">Compruebe su conocimiento</string>
-    <string name="objectives_exam_gate">Responder correctamente</string>
+    <string name="objectives_exam_gate">Estudia las preguntas. Se te dan cuatro respuestas posibles para cada pregunta. Puede haber más de una respuesta correcta. Por favor, marca todas las que son correctas y seleccione VERIFICAR.</string>
     <string name="answerdisabledto">Respuesta deshabilitada a: %1$s</string>
     <string name="wronganswer">Respuesta incorrecta!</string>
     <string name="unfinshed_button">Siguien&amp;te sin terminar</string>

app/src/main/res/values-es-rES/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Seguridad tratamientos</string>
     <string name="treatmentssafety_maxbolus_title">Máximo Bolo permitido [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Máximos carbohidratos permitidos [g]</string>
+    <string name="nav_preferences_plugin">%1$s preferencias</string>
     <string name="nav_preferences">Preferencias</string>
     <string name="nav_refreshtreatments">Actualizar los tratamientos desde NS</string>
     <string name="nav_resetdb">Restablecer las bases de datos</string>
@@ -405,11 +406,18 @@
     <string name="suspendloopfor3h">Desactivar lazo por 3h</string>
     <string name="suspendloopfor10h">Desactivar lazo por 10 h</string>
     <string name="suspendloopforXmin">Suspender lazo durante %1$d min</string>
+    <string name="disconnectpump">Desconectar bomba</string>
     <string name="disconnectpumpfor15m">Desconectar bomba por 15 min</string>
     <string name="disconnectpumpfor30m">Desconectar bomba por 30 min</string>
     <string name="disconnectpumpfor1h">Desconectar bomba por 1 h</string>
     <string name="disconnectpumpfor2h">Desconectar bomba por 2 h</string>
     <string name="disconnectpumpfor3h">Desconectar 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">Reanudar</string>
     <string name="reconnect">Vuelva a conectar la bomba</string>
     <string name="smscommunicator_wrongduration">Duración incorrecta</string>
@@ -564,8 +572,6 @@
     <string name="overview_editquickwizard_usebasaliob">Cálculo basal IOB</string>
     <string name="overview_editquickwizard_usetrend">Cálculo tendencia</string>
     <string name="overview_editquickwizard_usesuperbolus">Cálculo superbolo</string>
-    <string name="yes">Si</string>
-    <string name="no">No</string>
     <string name="positiveonly">Solo positivo</string>
     <string name="negativeonly">Solo negativo</string>
     <string name="overview_editquickwizard_usecob">Cálculo COB</string>
@@ -612,8 +618,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">No hay suficiente insulina en el depósito para emitir bolo</string>
     <string name="extendedbolusdeliveryerror">Error al emitir bolo extendido</string>
     <string name="insightpump_shortname">Sight</string>
-    <string name="set_neutral_temps_title">Establecer basales temporales neutras</string>
-    <string name="set_neutral_temps_summary">Si está activado, cancelará un basal temporal antes del final de cada hora. Este método puede ayudar a evitar que algunas bombas pitan/vibran al final de la hora.</string>
     <string name="enablesmbalways">Habilitar SMB siempre</string>
     <string name="enablesmbalways_summary">Habilitar SMB siempre de forma independiente a los Bolos. Solo posible con fuente BG con buen filtrado de datos como G5</string>
     <string name="enablesmbaftercarbs">Habilitar SMB después de Carbohidratos</string>
@@ -762,8 +766,8 @@
     <string name="diawarning">Por favor, recuerde: nuevos perfiles de insulina requieren DIA de al menos 5h. DIA de 5-6h en nuevos perfiles es lo mismo que DIA de 3h en perfiles antiguos.</string>
     <string name="setupwizard_profile_description">Selecciona origen de perfil. Si el usuario es un niño debe seleccionar perfil NS. Si no hay nadie siguiendo tu Nightscout probablemente preferirás perfil Local. Recuerde que sólo está seleccionando el origen del perfil. Para usarlo debe activarlo ejecutando \"Cambio Perfil\"</string>
     <string name="setupwizard_aps_description">Selecciona uno de los algoritmos disponibles. Están ordenados de más antiguos a más recientes. Los nuevos son más potentes y agresivos. Por ello, si eres usuario nuevo, se recomienda empezar con AMA y no con el último. No olvides leer la documentación de OpenAPS y configurarlo antes de usarlo.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Esperando la conexión de RileyLink…\n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b>Nota:</b> Puede continuar la configuración una vez que la bomba se haya inicializado.\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Por favor, a continuación configure su RileyLink. Después de seleccionar un RileyLink, será posible continuar la configuración una vez que el estado de RileyLink esté en \"Conectado\". Esto podría tardar un minuto.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Nota:</b> Puede continuar con la configuración una vez que la bomba se haya configurado.\n</string>
     <string name="startobjective">Comienza tu primer objetivo</string>
     <string name="permission">Permiso</string>
     <string name="askforpermission">Pedir permiso</string>
@@ -790,7 +794,6 @@
     <string name="sensitivity_raises_target_title">Sensibilidad aumenta objetivo</string>
     <string name="sensitivity_raises_target_summary">Cuando se detecta sensibilidad a insulina, aumenta el objetivo de glucosa</string>
     <string name="combo_invalid_setup">Configuración de la bomba incorrecta, leer la documentación y comprobar que el menú de Quick Info se llama QUICK INFO usando el software de configuración 360.</string>
-    <string name="custom">Personalizado</string>
     <string name="careportal_removestartedevents">Limpiar eventos AndroidAPS iniciado</string>
     <string name="storedsettingsfound">Ajustes guardados encontrados</string>
     <string name="allow_hardware_pump_text">Atención: si activas y conectas al hardware de la bomba, AndroidAPS copiará los ajustes basales del perfil de la bomba, sobrescribiendo el actual perfil basal de la bomba. Comprueba que tengas el perfil basal correcto en AndroidAPS. Si no estás seguro o no quieres sobrescribir los ajustes basales en la bomba, presiona cancelar y repite cambio de la bomba más tarde.</string>
@@ -978,7 +981,9 @@
     <string name="description_source_dexcom">Recibir valores de glucosa de la app parcheada de Dexcom.</string>
     <string name="notification">Notificación</string>
     <string name="notification_message">Notificación: %1$s</string>
+    <string name="alarm_message">Alarma: %1$s</string>
     <string name="message_short">Msj:</string>
+    <string name="alarm_short">Alarma:</string>
     <string name="profilepercentage">Porcentaje de perfil</string>
     <string name="percent_u">Porcentaje [%]:</string>
     <string name="startprofile">Iniciar perfil %1$d%% durante %2$d min</string>
@@ -1180,4 +1185,15 @@
     <string name="filter">Filtro</string>
     <string name="copytolocalprofile_invalid">No se puede crear el perfil local. El perfil no es válido.</string>
     <string name="cta_dont_kill_my_app_info">¿No matar mi aplicación?</string>
+    <string name="alarm">Alarma</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Enviar SMS si se activa un evento de bomba inaccesible</string>
+    <string name="smscommunicator_pump_ureachable">Reportar bomba no alcanzable</string>
+    <string name="advisoralarm">Ejecutar alarma cuando es hora de comer</string>
+    <string name="alarminxmin">Ejecutar alarma en %1$d min</string>
+    <string name="bolusadvisor">Asistente de bolo</string>
+    <string name="bolusadvisormessage">Usted tiene alta glicemia. En lugar de comer ahora se recomienda esperar a una mejor glicemia. ¿Quieres hacer un bolo de corrección ahora y recibir una nota cuándo es el momento de comer? En este caso no se grabarán carbohidratos y se debe volver a utilizar el asistente cuando lo recordamos.</string>
+    <string name="enablebolusadvisor">Habilitar asistente de bolo</string>
+    <string name="enablebolusadvisor_summary">Usar un recordatorio para empezar a comer en lugar del asistente durante la glucemia alta</string>
+    <string name="time_to_eat">¡Hora de comer!\nEjecutar el asistente de bolo y cálcular de nuevo.</string>
+    <string name="timetoeat">Hora de comer</string>
 </resources>

app/src/main/res/values-fr-rFR/exam.xml

@@ -1,167 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Qu\'est-ce qu\'il y a de vrai pour le DAI (Durée Action Insuline)?</string>
-    <string name="dia_label_exam">Rubrique : Durée de l\'Action de l\'Insuline</string>
-    <string name="dia_minimumis3h">La valeur minimale est de 3 heures.</string>
-    <string name="dia_minimumis5h">La valeur minimale est de 5 heures.</string>
+    <string name="dia_label_exam">Durée d\'Action de l\'Insuline (DAI)</string>
+    <string name="dia_profile">Vous devez définir la valeur de DAI dans votre profil.</string>
+    <string name="dia_minimumis5h">La valeur minimale autorisée est de 5 heures.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">La signification est la même que le paramètre DAI utilisé dans votre pompe.</string>
-    <string name="dia_valuemustbedetermined">Vous devez déterminer votre valeur personnelle (mais pas moins de 5 heures).</string>
-    <string name="hypott_label">Rubrique: Cible Temporaire Hypo</string>
-    <string name="hypott_whenhypott">Quelle est la principale raison de fixer une CT hypo ?</string>
-    <string name="hypott_goinglow">Pour empêcher la glycémie de baisser si aucune basale temporaire en cours d\'exécution.</string>
-    <string name="hypott_preventoversmb">Afin d\'éviter qu\' AAPS n\'administre trop d\'insuline suite à une forte montée de la glycémie causée par des glucides à action rapide utilisés pour traiter une hypoglycémie.</string>
+    <string name="dia_meaningisequaltodiapump">Si vous êtes convaincu que la valeur de DAI que vous avez utilisée dans votre pompe avant AndroidAPS marche bien, il n\'y a pas besoin de la changer lorsque vous commencez à boucler.</string>
+    <string name="dia_valuemustbedetermined">Vous devez déterminer par vous-même la valeur appropriée pour la DAI.</string>
+    <string name="hypott_label">Cible temporaire Hypo</string>
+    <string name="hypott_whenhypott">Quelle est la principale raison de fixer une cible temp. hypo ?</string>
+    <string name="hypott_wrongbasal">Pour corriger les hypos causés par des paramètres de débit basal incorrects.</string>
+    <string name="hypott_preventoversmb">Pour empêcher AndroidAPS de surcorriger une hausse de glycémie causée par les glucides à action rapide utilisés pour traiter une hypo.</string>
+    <string name="hypott_exercise">Pour corriger une hypo due à un exercice.</string>
+    <string name="hypott_0basal">Pour éviter que la glycémie ne baisse s\'il y a déjà un débit de basal temporaire de 0%.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Quel profil peut être utilisé et configuré hors ligne?</string>
     <string name="offlineprofile_label">Rubrique : Profil Hors Ligne</string>
     <string name="offlineprofile_nsprofile">Le profil NS peut être utilisé, mais il n\'est pas configuré.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Rubrique : Déconnexion de la pompe</string>
-    <string name="pumpdisconnect_letknow">Cliquez sur \"Déconnecter la pompe\" pour que APS sache qu\'aucune insuline ne soit délivrée.</string>
-    <string name="pumpdisconnect_suspend">Cliquez sur \"Suspendre la boucle\" pour que AAPS s\'arrête tant que la pompe est déconnectée.</string>
-    <string name="pumpdisconnect_dontchnage">Ne changez rien dans AAPS, débranchez juste la pompe.</string>
+    <string name="pumpdisconnect_label">Motifs d\'application de la \"Déconnexion de pompe\" dans AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">Que faire lors de la déconnexion de la pompe?</string>
+    <string name="pumpdisconnect_unnecessary">C\'est inutile car l\'insuline ne sera pas délivrée si la pompe est physiquement déconnectée.</string>
+    <string name="pumpdisconnect_missinginsulin">Cela empêche AndroidAPS de comptabiliser l\'insuline qui n\'a pas été délivrée quand la pompe est physiquement déconnectée.</string>
+    <string name="pumpdisconnect_notstop">Cela n\'arrêtera pas la distribution d\'insuline si la pompe reste connectée.</string>
+    <string name="pumpdisconnect_openloop">Cela passera AndroidAPS en mode boucle ouverte.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Rubrique : Paramètres AndroidAPS</string>
+    <string name="objectives_label">Paramètres AndroidAPS</string>
+    <string name="objectives2_label">Paramètres AndroidAPS</string>
     <string name="objectives_howtosave">Quelles sont les meilleures pratiques pour sauvegarder vos paramètres ?</string>
-    <string name="objectives_exportsettings">Les exporter localement à partir du menu Maintenance.</string>
-    <string name="objectives_storeelsewhere">Stocker le fichier exporté à un autre endroit comme un email, Dropbox, Google drive…</string>
-    <string name="objectives_doexportonstart">Les exporter juste après l\'installation d\'AAPS.</string>
-    <string name="objectives_doexportafterchange">Exportez-les après avoir modifié les paramètres.</string>
-    <string name="objectives_doexportafterobjective">Exportez-les après avoir atteint un objectif.</string>
-    <string name="objectives_doexportafterfirtssettings">Les exporter lorsque vous terminez le paramétrage initial.</string>
+    <string name="objectives_notesettings">Vous n\'avez pas besoin d\'exporter vos paramètres si vous les avez notés.</string>
+    <string name="objectives_afterobjective">Exportez vos paramètres une fois que vous avez terminé un objectif.</string>
+    <string name="objectives_afterchange">Exportez vos paramètres après avoir modifié n\'importe lequel de vos paramètres.</string>
+    <string name="objectives_afterinitialsetup">Exportez vos paramètres une fois que vous avez terminé votre configuration initiale et défini vos préférences.</string>
+    <string name="objectives2_maintenance">Exportez vos paramètres localement en utilisant le menu maintenance.</string>
+    <string name="objectives2_internalstorage">Votre fichier de paramètres se trouve dans le dossier Stockage Interne/AAPS/Préférences sur votre téléphone.</string>
+    <string name="objectives2_cloud">Copiez votre fichier de préférences vers un emplacement sûr en dehors de votre téléphone (par ex. en utilisant un disque cloud, en connectant un câble à un ordinateur, un courriel, etc.)</string>
+    <string name="objectives2_easyrestore">Si votre téléphone est endommagé ou perdu, il existe des moyens faciles de récupérer vos paramètres à distance sans aucune sauvegarde.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
-    <string name="noisycgm_label">Rubrique : Lectures MGC incohérentes</string>
+    <string name="noisycgm_label">Valeurs MGC bruitées</string>
     <string name="noisycgm_whattodo">Que faut-il faire si les données de MGC sont bruitées ?</string>
-    <string name="nothing">Rien, AAPS s\'en occupera.</string>
-    <string name="noisycgm_pause">Désactivez la boucle pour éviter un surdosage.</string>
-    <string name="noisycgm_replacesensor">Remplacer le capteur MGC.</string>
-    <string name="noisycgm_turnoffphone">Éteindre le téléphone.</string>
+    <string name="noisycgm_nothing">Ne faites rien - AndroidAPS s\'en occupera.</string>
+    <string name="noisycgm_pause">Désactivez la boucle fermée pour éviter tout sur-dosage ou sous-dosage possible.</string>
+    <string name="noisycgm_replacesensor">Remplacez systématiquement les capteurs bruyants ou imprécis.</string>
+    <string name="noisycgm_checksmoothing">Vérifiez que votre application MGC fournit des données lissées.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">Vérifiez que votre application de MGC filtre les glycémies.</string>
-    <string name="exercise_label">Rubrique : Activités physiques</string>
-    <string name="exercise_whattodo">Comment pouvez-vous aider le système à gérer l\'exercice physique ?</string>
-    <string name="exercise_setactivitytt">Utilisation de la fonction cible temporaire.</string>
-    <string name="exercise_switchprofilebelow100">Faire un changement de profil inférieur à 100%.</string>
-    <string name="exercise_switchprofileabove100">Faire un changement de profil supérieur à 100%.</string>
-    <string name="exercise_stoploop">Arrêter la boucle.</string>
-    <string name="exercise_doitbeforestart">Définissez une cible temporaire d\'activité avant de commencer votre effort.</string>
-    <string name="exercise_afterstart">Définir une cible temporaire d\'activité après le début d\'un effort entraîne des résultats moins efficace que si elle est définie avant.</string>
+    <string name="exerciseprofile_label">Exercices et profils</string>
+    <string name="exerciseprofile_whattodo">Comment utiliser les profils pour aider au mieux le système à gérer un exercice aérobique ?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Faites un changement de profil à moins de 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Faites un changement de profil à plus de 100 %.</string>
+    <string name="exerciseprofile_leaveat100">Laissez le profil fixé à 100%.</string>
+    <string name="exerciseprofile_suspendloop">Suspendez la boucle.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/temptarget.html#cible-temporaire-activite</string>
+    <string name="exercise_label">Exercices et cibles temporaires</string>
+    <string name="exercise_whattodo">Comment utiliser les cibles temporaires pour aider au mieux le système à gérer un exercice aérobique ?</string>
+    <string name="exercise_settt">Définissez une cible temporaire d\'activité en la démarrant à une heure appropriée avant de commencer l\'exercice physique.</string>
+    <string name="exercise_setfinished">Définissez une cible temporaire d\'activité après la fin de l\'exercice.</string>
+    <string name="exercise_setunchanged">Laissez votre cible de glycémie inchangée.</string>
+    <string name="exercise_15g">Attendez que la glycémie tombe en dessous de votre cible temporaire d\'hypo, puis mangez 15 g de glucides à action rapide.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">Rubrique : Désactivation/activation de boucle</string>
+    <string name="suspendloop_label">Boucle désactivée/suspendue</string>
     <string name="suspendloop_doigetinsulin">Est-ce que je reçois de l\'insuline lorsque la boucle est désactivée / suspendue ?</string>
     <string name="suspendloop_yes">Oui, l\'insuline basale continue à être délivrée.</string>
     <string name="suspendloop_no">Non, l\'injection d\'insuline est arrêtée.</string>
-    <string name="basaltest_label">Rubrique : Tests des débits de basal, SI et G/I</string>
-    <string name="basaltest_when">Quand dois-je valider les débits de basal, SI et G/I ?</string>
+    <string name="basaltest_label">Tests des débits de basal, SI et G/I</string>
+    <string name="basaltest_when">Quand faut-il valider ces valeurs ?</string>
     <string name="basaltest_beforeloop">Avant de commencer la boucle.</string>
-    <string name="basaltest_havingregularhypo">Lors d\'hypoglycémies fréquentes.</string>
-    <string name="basaltest_havingregularhyper">Lors d\'hyperglycémies fréquentes.</string>
+    <string name="basaltest_havingregularhighlow">Lorsque la glycémie est souvent élevée ou faible.</string>
+    <string name="basaltest_weekly">Au moins 1 fois par semaine.</string>
+    <string name="basaltest_fixed">Une fois définies et validées, ces valeurs ne doivent pas changer avec le temps.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Rubrique : Les Prérequis</string>
-    <string name="prerequisites_what">De quoi ai-je besoin ?</string>
+    <string name="prerequisites_label">Conditions préalables</string>
+    <string name="prerequisites_what">Quelles conditions sont essentiels pour configurer et utiliser AndroidAPS ?</string>
     <string name="prerequisites_determinedcorrectprofile">Informations de profil validées (Basal, G/I, SI, DAI).</string>
-    <string name="prerequisites_computer">Un ordinateur pour créer un APK.</string>
+    <string name="prerequisites_computer">Un ordinateur avec Android Studio installé et configuré.</string>
     <string name="prerequisites_phone">Un téléphone compatible.</string>
-    <string name="prerequisites_car">Une voiture.</string>
-    <string name="prerequisites_nightscout">Nightscout pour réussir les objectifs.</string>
+    <string name="prerequisites_pump">Une pompe à insuline compatible si vous avez l\'intention d\'exécuter une boucle fermée.</string>
+    <string name="prerequisites_nightscout">Nightscout, pour conserver un historique de toutes les données et revoir les paramètres.</string>
     <string name="prerequisites_tidepoolaccount">Un compte Tidepool.</string>
     <string name="prerequisites_googleaccount">Un compte Google.</string>
     <string name="prerequisites_githubaccount">Un compte Github.</string>
-    <string name="prerequisites_beanandroiddeveloper">Expérience de développement Android.</string>
+    <string name="prerequisites_beanandroiddeveloper">Avoir de l\'expérience en programmation ou en édition de code.</string>
     <string name="prerequisites_own670g">Une pompe MiniMed 670G.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Module/module.html</string>
     <string name="prerequisites_smartwatch">Une montre connectée.</string>
     <string name="prerequisites_supportedcgm">Un MGC pris en charge et compatible.</string>
-    <string name="update_label">Rubrique : Mettre à jour AndroidAPS</string>
-    <string name="whatistrue">Qu\'est-ce qui est vrai ?</string>
-    <string name="update_git">Vous devez avoir Git installé.</string>
-    <string name="update_asap">Mettre à jour dès qu\'une nouvelle version est publiée et avoir suffisamment de temps pour le faire.</string>
-    <string name="update_keys">Vous devez utiliser les mêmes clés de signature.</string>
+    <string name="prerequisites2_label">Conditions préalables</string>
+    <string name="prerequisites2_what">Quelles conditions sont essentiels pour configurer et utiliser AndroidAPS ?</string>
+    <string name="prerequisites2_profile">Informations validées pour configurer un profil (SI, ratio G/I, débits de basal, DAI, etc.).</string>
+    <string name="prerequisites2_device">Un appareil Android compatible (par ex. téléphone mobile, montre Android version complète ou tablette).</string>
+    <string name="prerequisites2_internet">AndroidAPS nécessite une connexion internet pour fonctionner en boucle fermée.</string>
+    <string name="prerequisites2_supportedcgm">Une MGC prise en charge et une application appropriée pour recevoir des valeurs de glycémie sur le téléphone/appareil.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Module/module.html</string>
+    <string name="update_label">Mise à jour de AndroidAPS</string>
+    <string name="whatistrue">Sélectionnez toutes les bonnes réponses.</string>
+    <string name="update_git">Git doit être installé et configuré sur votre ordinateur.</string>
+    <string name="update_asap">Lorsque des versions mises à jour d\'AndroidAPS sont publiées, les versions précédentes peuvent être limitées à distance après une période déterminée.</string>
+    <string name="update_keys">Vous devez enregistrer et noter l\'emplacement de votre magasin de clés et utiliser la même clé de signature que votre installation précédente pour les mises à jour.</string>
     <string name="update_neverupdate">Ne jamais mettre à jour si le système fonctionne correctement.</string>
-    <string name="update_askfriend">Demandez à un ami le nouveau APK.</string>
+    <string name="update_askfriend">Si vous avez des difficultés à construire l\'apk, vous pouvez installer un apk qui a été construit par un ami.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Rubrique : Dépannage</string>
-    <string name="troubleshooting_wheretoask">Où chercher de l\'aide ?</string>
-    <string name="troubleshooting_fb">Rejoindre le groupe Facebook d\'AndroidAPS.</string>
-    <string name="troubleshooting_wiki">Lisez la documentation AndroidAPS.</string>
-    <string name="troubleshooting_gitter">Consulter la Gitter room pour AndroidAPS.</string>
-    <string name="troubleshooting_googlesupport">Consulter le support Google d\'AndroidAPS</string>
-    <string name="troubleshooting_yourendo">Parler en à votre diabétologue.</string>
+    <string name="troubleshooting_label">Résolution de problèmes</string>
+    <string name="troubleshooting_wheretoask">Où pouvez-vous chercher de l\'aide avec AndroidAPS ?</string>
+    <string name="troubleshooting_fb">Vous pouvez demander des conseils dans le groupe Facebook des utilisateurs AndroidAPS.</string>
+    <string name="troubleshooting_wiki">Vous devez lire (et relire) la documentation AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Vous pouvez demander des conseils et signaler des problèmes techniques ou des défauts dans forum Gitter AndroidAPS.</string>
+    <string name="troubleshooting_yourendo">Vous devez demander à votre diabétologue/professionnels de santés.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/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">Rubrique : Plugins d\'Insuline</string>
-    <string name="insulin_ultrarapid">Quelle marque d\'insuline peut être utilisée avec le plugin \"Ultra-Rapid-Oref\" ?</string>
+    <string name="insulin_label">Plugins Insuline</string>
+    <string name="insulin_ultrarapid">Quelle insuline devez-vous utiliser avec le plugin Ultra-Rapid-Oref?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">Novorapid®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin R®/Insuline humaine \"Normale\".</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Rubrique : Plugins de Sensibilité</string>
-    <string name="sensitivity_which">Quel algorithme de sensibilité a un intervalle de temps paramétrable ?</string>
+    <string name="sensitivity_label">Plugins de Sensibilité</string>
+    <string name="sensitivity_which">Sélectionnez toutes les bonnes réponses.</string>
+    <string name="sensitivity_adjust">Les plugins de sensibilité permettent à AndroidAPS de s\'adapter aux changements temporaires ou de courte durée de la sensibilité à l\'insuline (par ex. changements hormonaux ou problèmes d\'absorption sur le site d\'infusion).</string>
+    <string name="sensitivity_edit">Les plugins de sensibilité fournissent à l\'utilisateur des modifications suggérées pour les débits de basal, les ratios G/I et SI qui peuvent être utilisés pour éditer le profil.</string>
+    <string name="sensitivity_cannula">Le changement de canule réinitialisera le ratio Autosens à 100%.</string>
+    <string name="sensitivity_time">Certaines des options du plugin ont des plages de temps configurables qui peuvent être définies par l\'utilisateur.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Quel plugin de sensibilité doit être utilisé pour la fonction RNP (UAM) ?</string>
-    <string name="wrongcarbs_label">Rubrique : Entrées de glucides erronées</string>
+    <string name="wrongcarbs_label">Entrées de glucides erronées</string>
     <string name="wrongcarbs_whattodo">Que devez-vous faire si vous avez renseigné une valeur erronée de glucides ?</string>
-    <string name="wrongcarbs_treatmentstab">Dans Traitements, supprimez la mauvaise valeur de glucides. Entrez la nouvelle.</string>
-    <string name="wrongcarbs_addfakeinsulin">Ajouter une insuline fictive à l\'aide de la fonction Remplissage</string>
-    <string name="extendedcarbs_label">Rubrique : Aliments avec Graisses et Protéines</string>
-    <string name="extendedcarbs_handling">Que faire si votre nourriture contient une grande quantité de matières grasses ou de protéines ?</string>
-    <string name="extendedcarbs_useextendedcarbs">Convertir les graisses et les protéines en glucides et utiliser la fonction \"glucides étendus\".</string>
-    <string name="extendedcarbs_add">Convertir les graisses et protéines en glucides et ajoutez les au calcul du Bolus.</string>
-    <string name="extendedcarbs_useextendedbolus">Utiliser les Bolus étendus pour gérer les graisses et les protéines.</string>
+    <string name="wrongcarbs_treatmentstab">Supprimez l\'entrée incorrecte dans les Traitements et entrez la nouvelle valeur correcte de glucides.</string>
+    <string name="wrongcarbs_addinsulin">Bolus avec insuline en utilisant le menu d\'amoçage de la perfusion.</string>
+    <string name="wrongcarbs_donothing">Ne faites rien – AndroidAPS effectuera les ajustements appropriés.</string>
+    <string name="wrongcarbs_bolus">Bolus avec insuline en utilisant le bouton Insuline (bolus) dans Aperçu (Accueil).</string>
+    <string name="wronginsulin_label">Erreurs de saisie/injection d\'insuline</string>
+    <string name="wronginsulin_whattodo">Que devriez-vous faire si vous avez reçu moins d\'insuline que l\'historique de la pompe suggère par ex. à cause d\'une occlusion, d\'une mauvaise canule ou d\'un oubli de rebranchement de la pompe après une douche ?</string>
+    <string name="wronginsulin_careportal">Supprimez les données d\'insuline de Nightscout Careportal pour le retirer de l\'historique de la pompe.</string>
+    <string name="wronginsulin_compare">Comparez les valeurs dans l\'historique de la pompe et AndroidAPS.</string>
+    <string name="wronginsulin_prime">Faites un bolus du montant de votre insuline calculée « manquante » soit par seringue / stylo ou en utilisant un amorçage.</string>
+    <string name="wronginsulin_donothing">Ne faites rien et laissez AndroidAPS corriger tout taux élevé de glycémie qui en résulte.</string>
+    <string name="iob_label">Insuline Active (IA)</string>
+    <string name="iob_which">Sélectionnez toutes les bonnes réponses.</string>
+    <string name="iob_value">La valeur de l\'IA est impactée par les débits de basal temporaires émis.</string>
+    <string name="iob_hightemp">Une basal temp. haute ne sera pas donnée quand votre glycémie est en dessous de la cible.</string>
+    <string name="iob_negiob">Une IA négative pendant une période significative en l\'absence d\'exercice indique que votre profil est trop fort et qu\'il faut moins d\'insuline dans vos paramètres.</string>
+    <string name="iob_posiob">Une IA positive pendant une période significative indique une résistance à l\'insuline ou des repas non signalés.</string>
+    <string name="breadgrams_label">Entrée de glucides et bolus</string>
+    <string name="breadgrams_grams">Seuls les grammes doivent être utilisés pour estimer et enregistrer les glucides consommés.</string>
+    <string name="breadgrams_exchange">Les glucides consommés peuvent être enregistrés à l\'aide d\'un système d\'échange approprié (par exemple, les échanges DAFNE \"CHO\" ou les \"Unités de Pain\" européennes).</string>
+    <string name="breadgrams_decay">AndroidAPS utilise un modèle dynamique pour estimer la « décomposition » des glucides et calculer les GA.</string>
+    <string name="breadgrams_calc">Si les glycémies sont en dehors des valeurs acceptables (trop faibles ou trop élevées), la calculatrice de bolus peut être utilisée pour fournir des suggestions de corrections de glucides ou d\'insuline.</string>
+    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Getting-Started/FAQ.html#rapport-glucides-insuline-g-i-g-u</string>
+    <string name="extendedcarbs_label">e-Glucides</string>
+    <string name="extendedcarbs_handling">Pour quoi pourriez-vous utiliser des e-Glucides (glucides étendus) ?</string>
+    <string name="extendedcarbs_future">Pour planifier les glucides dans le futur, éventuellement répartis sur un intervalle de temps (similaire à un bolus étendu distribuant l\'insuline sur une durée).</string>
+    <string name="extendedcarbs_free">Pour enregistrer des glucides d\'exercice « gratuits » que vous voulez cacher à AndroidAPS.</string>
+    <string name="extendedcarbs_fat">Les e-glucides (distribués à l’avenir) peuvent aider AndroidAPS à traiter les repas à haute teneur en graisses/protéines.</string>
+    <string name="extendedcarbs_rescue">Pour enregistrer les glucides de secours que vous utilisez pour traiter la glycémie faible.</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Rubrique : Surveillance à distance</string>
-    <string name="nsclient_howcanyou">Comment pouvez-vous surveiller AAPS de votre enfant à distance ?</string>
-    <string name="nsclient_nightscout">En utilisant un site Nightscout.</string>
-    <string name="nsclient_dexcomfollow">Dexcom Follow si vous utilisez l\'application officielle Dexcom (Glycémie uniquement).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow si vous utilisez l\'application xDrip.</string>
-    <string name="nsclient_xdripfollower">xDrip exécuté en mode suiveur.</string>
-    <string name="nsclient_looponiphone">Application Loop sur iPhone.</string>
-    <string name="nsclient_spikeiphone">Application Spike sur iPhone.</string>
+    <string name="nsclient_label">Surveillance à distance</string>
+    <string name="nsclient_howcanyou">Comment pouvez-vous surveiller AndroidAPS (par exemple pour votre enfant) à distance ?</string>
+    <string name="nsclient_nightscout">L\'application NSClient, l\'application Nightscout et la page Web Nightscout vous permettent de suivre AndroidAPS à distance.</string>
+    <string name="nsclient_dexcomfollow">D\'autres applications (par ex. Dexcom Follow, xDrip en mode suivi) vous permettent de suivre certains paramètres (par ex. valeurs de glycémie/capteur) à distance, mais elles utilisent des algorithmes différents qui peuvent donner des valeurs IA ou GA inexactes.</string>
+    <string name="nsclient_data">Pour suivre AndroidAPS à distance, les deux appareils doivent avoir un accès à internet (par exemple via Wi-Fi ou données de réseau mobile/cellulaire).</string>
+    <string name="nsclient_fullcontrol">NS Client utilisé comme suivi à distance surveillera et fournira le contrôle complet d\'AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Children/Children.html</string>
-    <string name="isf_label_exam">Rubrique : Sensibilité à l\'Insuline (SI)</string>
-    <string name="isf_increasingvalue">Les valeurs de SI plus élevées conduisent à moins d\'insuline injectée quand AAPS corrige une hyperglycémie.</string>
-    <string name="isf_decreasingvalue">Des valeurs plus faibles de SI entraînent une diminution de l\'administration d\'insuline lorsque l\'AAPS corrige une hyperglycémie.</string>
-    <string name="isf_noeffect">Changer les valeurs de SI n\'a aucun effet sur la quantité d\'insuline injectée quand AAPS corrige une hyperglycémie.</string>
-    <string name="isf_preferences">Vous devez renseigner la SI dans les Préférences.</string>
+    <string name="isf_label_exam">Sensibilité à l\'Insuline (SI)</string>
+    <string name="isf_increasingvalue">Augmenter la SI entraînera une augmentation de la quantité d\'insuline pour couvrir une quantité spécifique de glucides.</string>
+    <string name="isf_decreasingvalue">Réduire la SI entraînera une augmentation de la quantité d\'insuline pour corriger une glycémie supérieure à la cible.</string>
+    <string name="isf_noeffect">Augmenter ou diminuer la SI n\'a aucun effet sur la quantité d\'insuline injectée lorsque la glycémie est inférieur à la cible.</string>
+    <string name="isf_preferences">La SI doit être saisie dans vos préférences AndroidAPS.</string>
     <string name="isf_profile">La modification de la SI dans le profil est suffisant pour appliquer le changement.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Rubrique : Ratio Glucides/Insuline</string>
+    <string name="ic_multiple">Vous pouvez utiliser plus d\'une valeur pour le ratio G/I dans votre profil.</string>
+    <string name="ic_isf">Si vous changez votre SI dans votre profil, vous devez toujours modifier votre ratio G/I également.</string>
+    <string name="ic_label_exam">Ratio Glucides sur Insuline (ratio G/I)</string>
     <string name="ic_increasingvalue">Les ratios G/I plus élevés conduisent à moins d\'insuline injectée pour une quantité donnée de glucides.</string>
     <string name="ic_decreasingvalue">Les ratios G/I plus faibles conduisent à moins d\'insuline injectée pour une quantité donnée de glucides.</string>
     <string name="ic_noeffect">Si vous avez 0 GA, changer le ratio G/I conduira à différentes quantités d\'insuline pour corriger une valeur de glycémie donnée.</string>
     <string name="ic_different">Le G/I sera différent si vous comptez l\'unité (d\'échange) de pain à 10g ou à 12g.</string>
     <string name="ic_meaning">Le G/I (Ratio Glucides/Insuline) est : combien d\'unités (d\'échange) de pain sont couverte par 1U d\'insuline.</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">Rubrique : Changement de profil</string>
-    <string name="profileswitch_pctwillchange"> Quand on renseigne 90% dans le changement de profil…</string>
-    <string name="profileswitch_basalhigher">Le débit de base sera 10% plus élevé.</string>
-    <string name="profileswitch_basallower">Le débit de base sera 10% plus faible.</string>
-    <string name="profileswitch_ichigher">Le G/I sera augmenté de 10%.</string>
-    <string name="profileswitch_iclower">Le G/I sera diminué de 10%.</string>
+    <string name="profileswitch_label">Changement de profil</string>
+    <string name="profileswitch_pctwillchange">Quand vous spécifiez un changement de profil à 90%, quelles réponses sont vraies ?</string>
+    <string name="profileswitch_basallower">Le débit de base sera diminuée de 10%.</string>
     <string name="profileswitch_isfhigher">La valeur de SI sera augmentée de 10%.</string>
-    <string name="profileswitch_isflower">La valeur SI sera diminuée de 10%.</string>
-    <string name="profileswitch_overall">Vous aurez au total environ 10% d\'insuline en moins.</string>
-    <string name="profileswitch_targethigher">La Cible sera 10% plus élevée.</string>
-    <string name="profileswitch_targetlower">La Cible sera 10% plus faible.</string>
-    <string name="profileswitch_targetbottom">Seule la cible inférieure sera diminuée de 10%.</string>
+    <string name="profileswitch_iclower">La valeur du ratio G/I sera un nombre 10% inférieur.</string>
+    <string name="profileswitch_unchanged">Les ratios SI et G/I seront inchangés.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Si vous vous réveillez 1h plus tôt que d\'habitude, comment informez-vous AAPS du changement de votre planning ?</string>
-    <string name="profileswitchtime_1">Faites un changement de profil avec un décalage horaire de 1</string>
-    <string name="profileswitchtime__1">Faites un changement de profil avec un décalage horaire de -1</string>
+    <string name="profileswitch2_label">Changement de profil</string>
+    <string name="profileswitch2_pctwillchange">Quand vous spécifiez un changement de profil à 120%, quelles réponses sont vraies ?</string>
+    <string name="profileswitch2_bghigher">La glycémie cible sera 20% plus élevée.</string>
+    <string name="profileswitch2_basalhigher">Le débit de base sera 20% plus élevé.</string>
+    <string name="profileswitch2_bgunchanged">La glycémie cible sera inchangée.</string>
+    <string name="profileswitch2_isfhigher">La valeur de SI sera 20 % plus élevée.</string>
+    <string name="profileswitchtime_label">Changement de profil</string>
+    <string name="profileswitchtime_iwant">Si vous vous réveillez 2 heures plus tôt que d\'habitude, comment informez-vous AndroidAPS du changement de votre planning ?</string>
+    <string name="profileswitchtime_2">Faites un changement de profil avec un décalage horaire de 2</string>
+    <string name="profileswitchtime__2">Faites un changement de profil avec un décalage horaire de -2</string>
+    <string name="profileswitchtime_tt">Fixez une cible temporaire repas imminent.</string>
+    <string name="profileswitchtime_100">Faites un changement de profil à plus de 100 %.</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profilewitch#timeshift</string>
-    <string name="profileswitchtime_60">Faites un changement de profil avec un décalage horaire de 60</string>
-    <string name="profileswitchtime__60">Faites un changement de profil avec un décalage horaire de -60</string>
+    <string name="profileswitch4_label">Changements de profils</string>
+    <string name="profileswitch4_rates">Les débits de basal, SI, ratios G/I, etc. doivent être définis dans les profils.</string>
+    <string name="profileswitch4_internet">L\'activation des modifications de votre profil Nightscout nécessite que votre téléphone AndroidAPS soit connecté à Internet.</string>
+    <string name="profileswitch4_sufficient">Modifier les profils pour changer des valeurs est suffisant pour mettre en œuvre toutes les modifications effectuées.</string>
+    <string name="profileswitch4_multi">Plusieurs profils peuvent être définis et sélectionnés pour s\'adapter à des circonstances changeantes (par ex. changements hormonaux, changement de poste de travail, jours de semaine/week-end).</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
-    <string name="basalhelp_label">Rubrique : Aide avec le débit Basal</string>
+    <string name="basalhelp_label">Aide sur les débits de basal</string>
     <string name="basalhelp_where">Où aller pour avoir de l\'aide avec le débit Basal etc.</string>
     <string name="basalhelp_diabetesteam">Votre équipe médicale</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Autres médicaments</string>
-    <string name="other_medication_text">AAPS réduit le débit de basal pour augmenter le taux de sucre dans le sang. Les médicaments du groupe d\'inhibiteurs SGLT2 (gliflozins) peuvent empêcher l\'augmentation prévue de la glycémie et ainsi produire une carence dangereuse en insuline (DKA).
-\nLes noms de marque communes sont : Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nJe m\'engage à ne pas prendre ces médicaments lors de l\'utilisation d\'AAPS ou à désactiver la boucle avant de les utiliser.</string>
+    <string name="other_medication_label">Autres médicaments. Veuillez lire l\'énoncé ci-dessous et cocher la case pour accepter la déclaration.</string>
+    <string name="other_medication_text">AndroidAPS réduit le débit de basal ou suspent l\'injection d\'insuline pour augmenter le taux de sucre dans le sang. Les médicaments du groupe d\'inhibiteurs SGLT2 (gliflozins) peuvent empêcher l\'augmentation de la glycémie et ainsi produire une carence dangereuse en insuline conduisant à une acidocétose DKA.
+\nLes noms de marque communes sont : Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nJe m\'engage à ne pas prendre ces médicaments lors de l\'utilisation d\'AndroidAPS ou à désactiver la boucle avant de les utiliser.</string>
 </resources>

app/src/main/res/values-fr-rFR/objectives.xml

@@ -40,7 +40,7 @@
     <string name="codeaccepted">Code accepté</string>
     <string name="codeinvalid">Code invalide</string>
     <string name="objectives_exam_objective">Prouver ses connaissances</string>
-    <string name="objectives_exam_gate">Étudiez et répondez correctement aux questions</string>
+    <string name="objectives_exam_gate">Étudiez les questions. Vous avez quatre réponses possibles pour chaque question. Il peut y avoir plusieurs réponses correctes. Veuillez vérifier celles qui sont correctes et sélectionnez VÉRIFIER.</string>
     <string name="answerdisabledto">Réponse désactivée jusqu\'à : %1$s</string>
     <string name="wronganswer">Mauvaise réponse !</string>
     <string name="unfinshed_button">Prochain non terminé</string>

app/src/main/res/values-fr-rFR/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Traitements de sécurité</string>
     <string name="treatmentssafety_maxbolus_title">Maximum Bolus autorisé [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Maximum de Glucides autorisé [g]</string>
+    <string name="nav_preferences_plugin">Préférences de %1$s</string>
     <string name="nav_preferences">Préférences</string>
     <string name="nav_refreshtreatments">Actualiser les données depuis NS</string>
     <string name="nav_resetdb">Réinitialiser les Bases de Données </string>
@@ -406,11 +407,18 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="suspendloopfor3h">Suspendre la Boucle pour 3h</string>
     <string name="suspendloopfor10h">Suspendre la Boucle pour 10h</string>
     <string name="suspendloopforXmin">Suspendre la Boucle pour %1$d min</string>
+    <string name="disconnectpump">Déconnecter la pompe</string>
     <string name="disconnectpumpfor15m">Déconnecter la pompe 15 min</string>
     <string name="disconnectpumpfor30m">Déconnecter la pompe 30 min</string>
     <string name="disconnectpumpfor1h">Déconnecter la pompe 1h</string>
     <string name="disconnectpumpfor2h">Déconnecter la pompe 2h</string>
     <string name="disconnectpumpfor3h">Déconnecter la pompe 3h</string>
+    <string name="duration15m">15 min</string>
+    <string name="duration30m">30 min</string>
+    <string name="duration1h">1 heure</string>
+    <string name="duration2h">2 heures</string>
+    <string name="duration3h">3 heures</string>
+    <string name="duration10h">10 heures</string>
     <string name="resume">Reprendre</string>
     <string name="reconnect">Rebrancher la pompe</string>
     <string name="smscommunicator_wrongduration">Durée incorrecte</string>
@@ -466,8 +474,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="careportal_canula_label">Canule</string>
     <string name="careportal_insulin_label">Insuline</string>
     <string name="careportal_pb_label">Pile pompe</string>
-    <string name="careportal_age_label">Âge:</string>
-    <string name="careportal_level_label">Niveau:</string>
+    <string name="careportal_age_label">âge:</string>
+    <string name="careportal_level_label">niveau:</string>
     <string name="ns_alarmoptions">Options d\'alarme</string>
     <string name="ns_alarms">Créer des notifications à partir des alarmes NS</string>
     <string name="ns_announcements">Créer des notifications à partir des notifications NS</string>
@@ -533,7 +541,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="shortenergy">En</string>
     <string name="shortprotein">Protéines</string>
     <string name="shortfat">Gras (Lipides)</string>
-    <string name="active"><![CDATA[<Actives>]]></string>
+    <string name="active"><![CDATA[<Actif>]]></string>
     <string name="executingrightnow">Commande exécutée à l\'instant</string>
     <string name="pump_unreachable">Pompe hors de portée</string>
     <string name="missed_bg_readings">Valeurs de glycémie manquantes</string>
@@ -565,8 +573,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="overview_editquickwizard_usebasaliob">Calcul IA du Basal</string>
     <string name="overview_editquickwizard_usetrend">Calcul de tendance</string>
     <string name="overview_editquickwizard_usesuperbolus">Calcul SuperBolus</string>
-    <string name="yes">Oui</string>
-    <string name="no">Non</string>
     <string name="positiveonly">Seulement positif</string>
     <string name="negativeonly">Seulement négatif</string>
     <string name="overview_editquickwizard_usecob">Calcul GA</string>
@@ -613,8 +619,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="combo_reservoir_level_insufficient_for_bolus">Pas assez d\'insuline dans le réservoir pour le bolus</string>
     <string name="extendedbolusdeliveryerror">Erreur administration bolus étendu</string>
     <string name="insightpump_shortname">AC-I</string>
-    <string name="set_neutral_temps_title">Définir des basals temp neutres</string>
-    <string name="set_neutral_temps_summary">Si activé, cela annulera une basal temp avant la fin de chaque heure. Cela peut aider à supprimer les bips/vibrations à chaque heure.</string>
     <string name="enablesmbalways">Activer en permanence les SMB</string>
     <string name="enablesmbalways_summary">Activer toujours SMB de manière autonome pour les bolus. Ceci est possible uniquement avec une source de glycémie ayant un très bon filtrage de données comme le G5</string>
     <string name="enablesmbaftercarbs">Activer SMB après ingestion de glucides</string>
@@ -680,6 +684,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="combo_error_failure_reading_changed_basal_rate">Le pourcentage de basal a changé dans la pompe mais sa lecture a échoué</string>
     <string name="combo_activity_checking_for_history_changes">Vérification des modifications de l\'historique</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">De multiples bolus similaires viennent d\'être importés dans la même minute. Un seul enregistrement a pu être ajouté aux traitements. Merci de vérifier la pompe et d\'ajouter manuellement un enregistrement de bolus en utilisant l\'onglet Careportal. Assurez vous de créer ce bolus avec un temps différent de tous les autres Bolus.</string>
+    <string name="about_link_urls">\n\ndocumentation :\nhttps://androidaps.readthedocs.io/en/latest/CROWDIN/fr\n\nfacebook :\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <string name="combo_check_date">Le dernier bolus enregistré date d\'il y a plus de 24h ou est dans le futur. Vérifiez que la date dans la pompe est correctement définie.</string>
     <string name="combo_suspious_bolus_time">L\'heure/date sur la pompe du dernier bolus administré semble erroné. L\'IA est probablement incorrecte. Vérifiez l\'heure/date de la pompe.</string>
     <string name="profileswitch_ismissing">ProfileSwitch manquant. S’il vous plaît faire un changement de profil ou appuyez sur « Activer le profil » dans le LocalProfile.</string>
@@ -762,8 +767,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="diawarning">Rappel : les nouveaux profils d\'insuline requièrent une DIA d\'au moins 5h. Une DIA 5-6h dans les nouveaux profils d\'insuline équivaut à une DIA 3h dans les anciens profils d\'insuline.</string>
     <string name="setupwizard_profile_description">Sélectionnez la source du profil. Si le patient est un enfant vous devriez utiliser un profil NS. Si personne ne vous suit sur Nightscout, vous préférerez probablement un profil local. N\'oubliez pas que vous êtes simplement en train de sélectionner la source du profil. Afin de pouvoir l\'utiliser vous devrez l\'activer via \"Changement de Profil\"</string>
     <string name="setupwizard_aps_description">Sélectionnez un des algorithmes disponibles. Ils sont organisés du plus ancien au plus récent. Les algorithmes les plus récents sont habituellement plus puissants et plus agressifs. De ce fait, si vous êtes un nouvel utilisateur, vous devriez probablement démarrer avec AMA au lieu de choisir un algorithme plus récent. N\'oubliez pas de lire la documentation OpenAPS et en faire la configuration avant utilisation.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">En attente de connexion RileyLink...\n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b>Remarque :</b> Vous pouvez continuer l\'installation une fois que la pompe a été initialisée.\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Veuillez configurer votre RileyLink ci-dessous. Après avoir sélectionné un RileyLink, il sera possible de continuer l\'installation une fois que le statut de RileyLink sera « Connecté ». Cela peut prendre une minute.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Remarque :</b> Vous pouvez continuer l\'installation une fois la pompe configurée.\n</string>
     <string name="startobjective">Démarrez votre premier objectif</string>
     <string name="permission">Autorisation</string>
     <string name="askforpermission">Demande d\'autorisation</string>
@@ -790,7 +795,6 @@ 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="combo_invalid_setup">Paramétrage de la pompe invalide. Vérifiez la documentation et le menu QUICK INFO en utilisant le logiciel de configuration 360.</string>
-    <string name="custom">Personnalisé</string>
     <string name="careportal_removestartedevents">Réinitialiser AndroidAPS</string>
     <string name="storedsettingsfound">Paramètres sauvegardés trouvés</string>
     <string name="allow_hardware_pump_text">ATTENTION : Si vous activez et connectez à une vraie pompe, AndroidAPS copiera les paramètres Basals du profil vers la pompe, écrasant le taux basal existant stocké sur la pompe. Assurez-vous d\'avoir correctement saisi et réglé les paramètres Basal dans AndroidAPS. Si vous ne savez pas ou si ne voulez pas écraser les paramètres Basal sur votre pompe, appuyez sur Annuler et reporter le passage à la pompe à une date ultérieure.</string>
@@ -978,7 +982,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="description_source_dexcom">Recevoir les valeurs de glycémie de l’application Dexcom patchée.</string>
     <string name="notification">Notification</string>
     <string name="notification_message">Notification : %1$s</string>
+    <string name="alarm_message">Alarme: %1$s</string>
     <string name="message_short">Mess :</string>
+    <string name="alarm_short">Alarme:</string>
     <string name="profilepercentage">Pourcentage du profil</string>
     <string name="percent_u">Pourcentage [%]:</string>
     <string name="startprofile">Début du profil %1$d%% pour %2$d min</string>
@@ -1178,4 +1184,17 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Les données suivantes seront téléchargées sur votre compte Open Humans : glycémie, bolus, glucides, événements Careportal (sauf les notes), bolus étendus, changements de profil, doses quotidiennes totales, basales temporaires, cibles temporaires, préférences, version de l\'application, modèle de l\'appareil et dimensions de l\'écran. Les informations secrètes ou privées telles que votre URL Nightscout ou votre API secret ne seront pas téléchargés.</string>
     <string name="setupwizard_pump_riley_link_status">État du RileyLink :</string>
     <string name="filter">Filtrer</string>
+    <string name="copytolocalprofile_invalid">Impossible de créer le profil local. Le profil est invalide.</string>
+    <string name="cta_dont_kill_my_app_info">Garder l\'appli en arrière plan ?</string>
+    <string name="alarm">Alarme</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Envoyer un SMS si l\'événement Pompe hors de portée est déclenché</string>
+    <string name="smscommunicator_pump_ureachable">Signaler Pompe hors de portée</string>
+    <string name="advisoralarm">Alerter quand il est temps de manger</string>
+    <string name="alarminxmin">Alerter dans %1$d min</string>
+    <string name="bolusadvisor">Assistant bolus</string>
+    <string name="bolusadvisormessage">Vous avez une glycémie élevée. Au lieu de manger maintenant, il est recommandé d\'attendre une meilleure glycémie. Voulez-vous faire un bolus de correction maintenant et avoir une alerte quand il sera temps de manger ? Dans ce cas, aucun glucide ne sera enregistré et vous devrez utiliser l\'assistant à nouveau lorsque nous vous le rappelons.</string>
+    <string name="enablebolusadvisor">Activer l\'assistant bolus</string>
+    <string name="enablebolusadvisor_summary">Utiliser le rappel pour commencer à manger au lieu de l\'assistant quand la glycémie est élevée</string>
+    <string name="time_to_eat">Il est temps de manger !\nExécutez l\'assistant Bolus et refaites le calcul.</string>
+    <string name="timetoeat">Il est temps de manger</string>
 </resources>

app/src/main/res/values-it-rIT/exam.xml

@@ -1,167 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Cosa è vero riguardo DIA?</string>
-    <string name="dia_label_exam">Argomento: durata dell\'azione dell\'insulina</string>
-    <string name="dia_minimumis3h">Il valore minimo è 3 ore.</string>
-    <string name="dia_minimumis5h">Il valore minimo è 5 ore.</string>
+    <string name="dia_label_exam">Durata attività insulina (DIA)</string>
+    <string name="dia_profile">Dovresti impostare il valore DIA nel tuo profilo.</string>
+    <string name="dia_minimumis5h">Il valore minimo consentito è 5 ore.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">Il significato è uguale al parametro DIA utilizzato nel tuo micro.</string>
-    <string name="dia_valuemustbedetermined">Devi determinare il tuo valore individuale (ma non meno di 5 ore).</string>
-    <string name="hypott_label">Argomento: Temp-Target \"Ipoglicemia\"</string>
-    <string name="hypott_whenhypott">Qual è la ragione principale per impostare un TT Ipoglicemia?</string>
-    <string name="hypott_goinglow">Per impedire che la glicemia vada in basso se c\'è già in esecuzione una basale temporanea impostata a zero.</string>
-    <string name="hypott_preventoversmb">Per evitare che AAPS somministri troppa insulina dopo un aumento di glicemia causato da carboidrati a veloce assorbimento usati per trattare una glicemia bassa.</string>
+    <string name="dia_meaningisequaltodiapump">Se sei soddisfatto del valore DIA che hai usato nel tuo micro prima di AndroidAPS, non c\'è bisogno di cambiarlo quando inizi l\'attività di loop.</string>
+    <string name="dia_valuemustbedetermined">Dovresti determinare da te il valore appropriato per DIA.</string>
+    <string name="hypott_label">Temp-Target Ipoglicemia</string>
+    <string name="hypott_whenhypott">Qual è la ragione principale per impostare un target temporaneo \"ipoglicemia\"?</string>
+    <string name="hypott_wrongbasal">Per correggere ipoglicemie causate da impostazioni non corrette della velocità basale.</string>
+    <string name="hypott_preventoversmb">Per evitare che AndroidAPS corregga eccessivamente un aumento della glicemia causato dai carboidrati a veloce assorbimento usati per trattare una ipoglicemia.</string>
+    <string name="hypott_exercise">Per correggere una ipoglicemia indotta da esercizio fisico.</string>
+    <string name="hypott_0basal">Per evitare che la glicemia si abbassi se è già in esecuzione una velocità basale temporanea dello 0%.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Quale profilo può essere usato e configurato offline?</string>
     <string name="offlineprofile_label">Argomento: profilo offline</string>
-    <string name="offlineprofile_nsprofile">Il profilo NS può essere utilizzato, ma non configurato.</string>
+    <string name="offlineprofile_nsprofile">Il profilo NS può essere usato, ma non configurato.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Argomento: disconnessione dal micro</string>
-    <string name="pumpdisconnect_letknow">Click su \'Disconnetti micro\' cosicché AAPS sappia che non viene erogata alcuna insulina.</string>
-    <string name="pumpdisconnect_suspend">Click su \'Sospendi loop\' cosicché AAPS stoppi l\'attività di loop mentre il micro è disconnesso.</string>
-    <string name="pumpdisconnect_dontchnage">Non cambiare alcunché in AAPS, solo disconnettere il micro.</string>
+    <string name="pumpdisconnect_label">Motivi per azionare la funzione \"Disconnetti micro\" in AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">Cosa dovrebbe essere fatto quando si disconnette il micro?</string>
+    <string name="pumpdisconnect_unnecessary">Questo non è necessario poiché l\'insulina non verrà erogata se il micro è fisicamente disconnesso.</string>
+    <string name="pumpdisconnect_missinginsulin">Evita che AndroidAPS tenga conto di insulina che non è stata erogata mentre il micro è fisicamente disconnesso.</string>
+    <string name="pumpdisconnect_notstop">Non interromperà l\'erogazione di insulina se il micro rimane connesso.</string>
+    <string name="pumpdisconnect_openloop">Manderà AndroidAPS in modalità loop aperto.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Argomento: impostazioni di AndroidAPS</string>
-    <string name="objectives_howtosave">Quali sono le migliori pratiche per il backup delle impostazioni?</string>
-    <string name="objectives_exportsettings">Esportarle localmente dal menu Manutenzione.</string>
-    <string name="objectives_storeelsewhere">Memorizzare il file esportato in un altro posto come l\'email, Dropbox, Google drive…</string>
-    <string name="objectives_doexportonstart">Esportarle subito dopo l\'installazione di AAPS.</string>
-    <string name="objectives_doexportafterchange">Esportarle dopo aver fatto modifiche d\'impostazione.</string>
-    <string name="objectives_doexportafterobjective">Esportarle dopo il completamento di un obiettivo.</string>
-    <string name="objectives_doexportafterfirtssettings">Esportarle quando termini le configurazioni iniziali.</string>
+    <string name="objectives_label">Impostazioni AndroidAPS</string>
+    <string name="objectives2_label">Impostazioni AndroidAPS</string>
+    <string name="objectives_howtosave">Quali sono le migliori pratiche per il backup delle tue impostazioni?</string>
+    <string name="objectives_notesettings">Non hai bisogno di esportare le tue impostazioni a condizione di prenderne nota.</string>
+    <string name="objectives_afterobjective">Esportare le tue impostazioni dopo aver completato un obiettivo.</string>
+    <string name="objectives_afterchange">Esportare le tue impostazioni dopo aver fatto delle modifiche.</string>
+    <string name="objectives_afterinitialsetup">Esportare le tue impostazioni dopo aver terminato la tua configurazione iniziale e aver impostato le tue preferenze.</string>
+    <string name="objectives2_maintenance">Esportare le tue impostazioni localmente utilizzando il menu manutenzione.</string>
+    <string name="objectives2_internalstorage">Il file delle tue impostazioni si trova nella cartella Internal Storage (memoria interna)/AAPS/preferences del tuo telefono.</string>
+    <string name="objectives2_cloud">Copiare il file delle tue preferenze in un luogo sicuro al di fuori del tuo telefono (ad esempio usando un\'unità cloud, un computer, l\'email, ecc.)</string>
+    <string name="objectives2_easyrestore">Se il tuo telefono è danneggiato o smarrito, ci sono modi semplici per recuperare da remoto le tue impostazioni senza avere un backup.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
-    <string name="noisycgm_label">Argomento: letture CGM \"rumorose\" (noisy)</string>
+    <string name="noisycgm_label">Letture CGM \"rumorose\" (noisy)</string>
     <string name="noisycgm_whattodo">Cosa dovrebbe essere fatto se i dati CGM sono \"rumorosi\"?</string>
-    <string name="nothing">Nulla, AAPS se ne occuperà.</string>
-    <string name="noisycgm_pause">Disabilitare il loop per evitare il sovradosaggio.</string>
-    <string name="noisycgm_replacesensor">Sostituire il sensore CGM.</string>
-    <string name="noisycgm_turnoffphone">Spegnere il telefono.</string>
-    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="noisycgm_nothing">Nulla - AndroidAPS se ne occuperà.</string>
+    <string name="noisycgm_pause">Disabilitare il loop chiuso per evitare un possibile sovra-dosaggio o sotto-dosaggio.</string>
+    <string name="noisycgm_replacesensor">Sostituire i sensori costantemente \"rumorosi\" o inaccurati.</string>
     <string name="noisycgm_checksmoothing">Verificare che la tua app CGM faccia lo smoothing dei dati della glicemia.</string>
-    <string name="exercise_label">Argomento: esercizio fisico</string>
-    <string name="exercise_whattodo">Come puoi aiutare il sistema a gestire l\'esercizio fisico?</string>
-    <string name="exercise_setactivitytt">Utilizzo della funzione temp-target.</string>
-    <string name="exercise_switchprofilebelow100">Fare un cambio profilo sotto il 100%.</string>
-    <string name="exercise_switchprofileabove100">Fare un cambio profilo sopra il 100%.</string>
-    <string name="exercise_stoploop">Stoppare il loop.</string>
-    <string name="exercise_doitbeforestart">Impostare un temp-target \"attività fisica\" prima dell\'inizio dell\'esercizio fisico.</string>
-    <string name="exercise_afterstart">L\'impostazione di un temp-target \"attività fisica\" dopo l\'inizio dell\'esercizio fisico porta a risultati peggiori rispetto all\'avviarlo prima dell\'inizio dell\'esercizio.</string>
+    <string name="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">Esercizio e profili</string>
+    <string name="exerciseprofile_whattodo">Come puoi usare i profili per aiutare al meglio il sistema a gestire l\'esercizio aerobico?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Fare un cambio profilo sotto il 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Fare un cambio profilo sopra il 100%.</string>
+    <string name="exerciseprofile_leaveat100">Lasciare il profilo al 100%.</string>
+    <string name="exerciseprofile_suspendloop">Sospendere il loop.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">Esercizio e target temporanei</string>
+    <string name="exercise_whattodo">Come puoi usare i target temporanei per aiutare al meglio il sistema a gestire l\'esercizio aerobico?</string>
+    <string name="exercise_settt">Impostare un target glicemico per l\'attività fisica in un momento adeguato, sufficientemente prima dell\'inizio dell\'esercizio.</string>
+    <string name="exercise_setfinished">Impostare un target glicemico per l\'attività fisica dopo la fine dell\'esercizio.</string>
+    <string name="exercise_setunchanged">Lasciare il tuo target glicemico invariato.</string>
+    <string name="exercise_15g">Attendere che la glicemia scenda al di sotto del tuo target temporaneo \"ipoglicemia\" e poi mangiare 15 g di carboidrati a rapido assorbimento.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">Argomento: loop disabilitato/sospeso</string>
+    <string name="suspendloop_label">Loop disabilitato/sospeso</string>
     <string name="suspendloop_doigetinsulin">Ricevo insulina quando il loop è disabilitato/sospeso?</string>
     <string name="suspendloop_yes">Sì, l\'insulina basale continua a essere erogata.</string>
     <string name="suspendloop_no">No, l\'erogazione di insulina è interrotta.</string>
-    <string name="basaltest_label">Argomento: basale, ISF e test IC</string>
-    <string name="basaltest_when">Quando dovrei verificare i valori di basali, ISF e IC?</string>
-    <string name="basaltest_beforeloop">Prima che io inizi l\'attività di loop.</string>
-    <string name="basaltest_havingregularhypo">Quando si verificano frequentemente glicemie basse.</string>
-    <string name="basaltest_havingregularhyper">Quando si verificano frequentemente glicemie alte.</string>
+    <string name="basaltest_label">Test Basale, ISF e I:C</string>
+    <string name="basaltest_when">Quando questi valori dovrebbero essere validati?</string>
+    <string name="basaltest_beforeloop">Prima di iniziare l\'attività di loop.</string>
+    <string name="basaltest_havingregularhighlow">Quando si verificano frequenti glicemie alte o basse.</string>
+    <string name="basaltest_weekly">Almeno una volta a settimana.</string>
+    <string name="basaltest_fixed">Una volta impostati e validati, questi valori non dovrebbero cambiare nel tempo.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Argomento: prerequisiti</string>
-    <string name="prerequisites_what">Di cosa ho bisogno?</string>
-    <string name="prerequisites_determinedcorrectprofile">Informazioni profilo convalidate (basale, IC, ISF, DIA).</string>
-    <string name="prerequisites_computer">Un computer per creare un APK.</string>
+    <string name="prerequisites_label">Prerequisiti</string>
+    <string name="prerequisites_what">Cosa è essenziale per configurare e usare AndroidAPS?</string>
+    <string name="prerequisites_determinedcorrectprofile">Informazioni profilo validate (basale, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">Un computer con Android Studio installato e configurato.</string>
     <string name="prerequisites_phone">Un telefono supportato.</string>
-    <string name="prerequisites_car">Un\'auto.</string>
-    <string name="prerequisites_nightscout">Nightscout, per superare gli obiettivi.</string>
+    <string name="prerequisites_pump">Un microinfusore compatibile se stai pianificando di eseguire un loop chiuso.</string>
+    <string name="prerequisites_nightscout">Nightscout, per tenere un registro di tutti i dati e rivedere le impostazioni.</string>
     <string name="prerequisites_tidepoolaccount">Un account Tidepool.</string>
     <string name="prerequisites_googleaccount">Un account Google.</string>
     <string name="prerequisites_githubaccount">Un account Github.</string>
-    <string name="prerequisites_beanandroiddeveloper">Esperienza di sviluppo Android.</string>
+    <string name="prerequisites_beanandroiddeveloper">Esperienza in programmazione o modifica di codice.</string>
     <string name="prerequisites_own670g">Un micro MiniMed 670G.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">Uno smartwatch.</string>
     <string name="prerequisites_supportedcgm">Un CGM Supportato.</string>
-    <string name="update_label">Argomento: aggiornamento di AndroidAPS</string>
-    <string name="whatistrue">Cosa è vero?</string>
-    <string name="update_git">Devi avere Git installato.</string>
-    <string name="update_asap">Aggiornare appena la nuova versione viene rilasciata e avere abbastanza tempo per farlo.</string>
-    <string name="update_keys">Dovresti usare le stesse chiavi di firma.</string>
+    <string name="prerequisites2_label">Prerequisiti</string>
+    <string name="prerequisites2_what">Cosa è essenziale per configurare e usare AndroidAPS?</string>
+    <string name="prerequisites2_profile">Informazioni validate per configurare un profilo (ISF, rapporto I:C, velocità basali, DIA, ecc).</string>
+    <string name="prerequisites2_device">Un dispositivo Android compatibile (smartphone, smartwatch con versione integrale di Android o tablet).</string>
+    <string name="prerequisites2_internet">AndroidAPS richiede una connessione internet per poter funzionare in loop chiuso.</string>
+    <string name="prerequisites2_supportedcgm">Un CGM supportato e un\'app appropriata per ricevere valori della glicemia sul telefono/dispositivo.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">Aggiornamento di AndroidAPS</string>
+    <string name="whatistrue">Seleziona tutte le risposte corrette.</string>
+    <string name="update_git">Devi avere Git installato e configurato sul tuo computer.</string>
+    <string name="update_asap">Quando vengono rilasciate versioni aggiornate di AndroidAPS, le precedenti potrebbero essere limitate da remoto dopo un determinato periodo di tempo.</string>
+    <string name="update_keys">Dovresti salvare e annotare la posizione del tuo archivio chiavi e usare per gli aggiornamenti la stessa chiave di firma della tua installazione precedente.</string>
     <string name="update_neverupdate">Non aggiornare mai se il sistema funziona bene.</string>
-    <string name="update_askfriend">Chiedere al tuo amico il nuovo APK.</string>
+    <string name="update_askfriend">Se hai difficoltà a costruire l\'apk, puoi installare un apk che è stato costruito da un amico.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Argomento: risoluzione dei problemi</string>
-    <string name="troubleshooting_wheretoask">Dove cercare aiuto?</string>
-    <string name="troubleshooting_fb">Entrare nel gruppo facebook di AndroidAPS.</string>
-    <string name="troubleshooting_wiki">Leggere la documentazione di AndroidAPS.</string>
-    <string name="troubleshooting_gitter">Visitare la Gitter Room di AndroidAPS.</string>
-    <string name="troubleshooting_googlesupport">Visitare il supporto Google di AndroidAPS</string>
-    <string name="troubleshooting_yourendo">Parlare con il tuo endocrinologo.</string>
+    <string name="troubleshooting_label">Risoluzione problemi</string>
+    <string name="troubleshooting_wheretoask">Dove puoi cercare aiuto con AndroidAPS?</string>
+    <string name="troubleshooting_fb">Puoi chiedere consiglio nel gruppo Facebook degli utenti AndroidAPS.</string>
+    <string name="troubleshooting_wiki">Dovresti leggere (e rileggere) la documentazione di AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Puoi chiedere consigli e segnalare problemi tecnici nella stanza Gitter di AndroidAPS.</string>
+    <string name="troubleshooting_yourendo">Dovresti chiedere al tuo endocrinologo/centro diabetologico.</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/aapsitalia/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Argomento: plugin insulina</string>
-    <string name="insulin_ultrarapid">Quale marca di insulina può essere usata con il plugin \'Ultra-Rapid-Oref\'?</string>
+    <string name="insulin_label">Plugin insulina</string>
+    <string name="insulin_ultrarapid">Quale insulina dovresti usare con il plugin Ultra-Rapid Oref?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin R®/insulina umana \"regolare\".</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Argomento: plugin di sensibilità</string>
-    <string name="sensitivity_which">Quale algoritmo di sensibilità ha un intervallo di tempo configurabile?</string>
+    <string name="sensitivity_label">Plugin sensibilità</string>
+    <string name="sensitivity_which">Seleziona tutte le risposte corrette.</string>
+    <string name="sensitivity_adjust">I plugin di sensibilità consentono ad AndroidAPS di adattarsi a cambiamenti temporanei o di breve durata nella sensibilità all\'insulina (ad esempio cambiamenti ormonali o problemi di assorbimento legati al sito di infusione).</string>
+    <string name="sensitivity_edit">I plugin di sensibilità forniscono all\'utente suggerimenti su cambi a velocità basali, rapporti I:C e ISF che possono essere utilizzati per modificare il profilo.</string>
+    <string name="sensitivity_cannula">La registrazione di un cambio cannula ripristinerà il rapporto Autosens al 100%.</string>
+    <string name="sensitivity_time">Alcune opzioni del plugin hanno intervalli di tempo configurabili che possono essere impostati dall\'utente.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Quale plugin di sensibilità deve essere utilizzato per la funzione UAM?</string>
-    <string name="wrongcarbs_label">Argomento: errori di immissione carboidrati</string>
+    <string name="wrongcarbs_label">Errori inserimento CHO</string>
     <string name="wrongcarbs_whattodo">Cosa dovresti fare se hai fatto un inserimento non corretto di carboidrati?</string>
-    <string name="wrongcarbs_treatmentstab">Nella sezione Trattamenti, eliminare la voce carboidrati non corretta. Inserire nuovi carboidrati.</string>
-    <string name="wrongcarbs_addfakeinsulin">Aggiungere insulina fittizia usando la funzione di riempimento</string>
-    <string name="extendedcarbs_label">Argomento: cibo con grassi e proteine</string>
-    <string name="extendedcarbs_handling">Cosa fare se il tuo cibo contiene una grande quantità di grassi e/o proteine?</string>
-    <string name="extendedcarbs_useextendedcarbs">Convertire grassi e proteine in carboidrati e utilizzare la funzione \"carboidrati estesi\" (eCarbs).</string>
-    <string name="extendedcarbs_add">Convertire grassi e proteine in carboidrati e aggiungerli al calcolo del bolo.</string>
-    <string name="extendedcarbs_useextendedbolus">Utilizzare il bolo esteso per coprire grassi e proteine.</string>
+    <string name="wrongcarbs_treatmentstab">Eliminare nei Trattamenti l\'inserimento non corretto e immettere il nuovo valore CHO.</string>
+    <string name="wrongcarbs_addinsulin">Erogare un bolo di insulina usando il menu caricamento set di infusione.</string>
+    <string name="wrongcarbs_donothing">Non fare nulla - AndroidAPS effettuerà gli opportuni aggiustamenti.</string>
+    <string name="wrongcarbs_bolus">Erogare un bolo di insulina usando il tasto Insulina nella sezione Panoramica.</string>
+    <string name="wronginsulin_label">Errori erogazione/inserimento insulina</string>
+    <string name="wronginsulin_whattodo">Cosa dovresti fare se hai ricevuto meno insulina di quanto lo storico del micro suggerisce? Ad esempio a causa di un\'occlusione, una cannula difettosa o l\'aver dimenticato di riattaccare il micro dopo una doccia? </string>
+    <string name="wronginsulin_careportal">Eliminare dal portale Nightscout i dati relativi all\'insulina per rimuoverli dallo storico del micro.</string>
+    <string name="wronginsulin_compare">Confrontare i valori in AndroidAPS con lo storico del micro.</string>
+    <string name="wronginsulin_prime">Erogare un bolo con parte della tua insulina calcolata \"mancante\" usando una siringa/penna o la funzione caricamento.</string>
+    <string name="wronginsulin_donothing">Non fare nulla e permettere ad AndroidAPS di correggere eventuali glicemie alte.</string>
+    <string name="iob_label">Insulina attiva (IOB)</string>
+    <string name="iob_which">Seleziona tutte le risposte corrette.</string>
+    <string name="iob_value">Il valore IOB è influenzato dalle basali temporanee emesse.</string>
+    <string name="iob_hightemp">Non verrà emessa una basale temporanea alta quando la tua glicemia è al di sotto del target.</string>
+    <string name="iob_negiob">IOB negativo per un periodo considerevole in assenza di esercizio fisico suggerisce che il tuo profilo è troppo incisivo e che è necessaria meno insulina nelle tue impostazioni.</string>
+    <string name="iob_posiob">IOB positivo per un periodo considerevole suggerisce resistenza all\'insulina o pasti non annunciati.</string>
+    <string name="breadgrams_label">Inserimento CHO e boli</string>
+    <string name="breadgrams_grams">Solo i grammi dovrebbero essere utilizzati per stimare e registrare i carboidrati consumati.</string>
+    <string name="breadgrams_exchange">I carboidrati consumati possono essere registrati utilizzando un sistema di scambio appropriato (ad esempio: gli scambi CHO \"DAFNE\" o le unità di pane europee \"Bread Units\").</string>
+    <string name="breadgrams_decay">AndroidAPS usa un modello dinamico per stimare il \"decadimento\" dei carboidrati e calcolare COB.</string>
+    <string name="breadgrams_calc">Se la glicemia è di fuori dei valori accettabili (troppo bassa o troppo alta) il calcolatore di boli può essere utilizzato per fornire suggerimenti per le correzioni con carboidrati o 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">e-carbs</string>
+    <string name="extendedcarbs_handling">Per cosa potresti usare gli e-carbs (carboidrati estesi)?</string>
+    <string name="extendedcarbs_future">Per indicare i carboidrati nel futuro e/o distribuiti su un intervallo di tempo (similmente a un bolo esteso che distribuisce insulina sullo stesso intervallo).</string>
+    <string name="extendedcarbs_free">Per registrare i carboidrati \"liberi\" relativi all\'esercizio fisico e che vuoi nascondere da AndroidAPS.</string>
+    <string name="extendedcarbs_fat">Gli e-carbs (distribuiti nel futuro) possono aiutare AndroidAPS a gestire pasti ricchi di grassi/proteine.</string>
+    <string name="extendedcarbs_rescue">Per registrare i carboidrati che usi per trattare la glicemia bassa.</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Argomento: monitoraggio remoto</string>
-    <string name="nsclient_howcanyou">Come puoi monitorare AAPS del tuo bambino in remoto?</string>
-    <string name="nsclient_nightscout">Usando un sito Nightscout.</string>
-    <string name="nsclient_dexcomfollow">L\'app Dexcom Follow se stai usando l\'app originale Dexcom (solo glicemia).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow se stai usando l\'app xDrip.</string>
-    <string name="nsclient_xdripfollower">xDrip in modalità follower.</string>
-    <string name="nsclient_looponiphone">App Loop su iPhone.</string>
-    <string name="nsclient_spikeiphone">App Spike su iPhone.</string>
+    <string name="nsclient_label">Monitoraggio remoto</string>
+    <string name="nsclient_howcanyou">Come puoi monitorare AndroidAPS (ad esempio per il tuo bambino) da remoto?</string>
+    <string name="nsclient_nightscout">L\'app NS Client, l\'app Nightscout e la versione web di Nightscout ti consentono di seguire AndroidAPS da remoto.</string>
+    <string name="nsclient_dexcomfollow">Altre app (ad esempio: Dexcom follow o xDrip in modalità follower) consentono di seguire da remoto alcuni parametri come i valori di glicemia/sensore, ma usano algoritmi diversi e potrebbero mostrare valori inaccurati di IOB o COB.</string>
+    <string name="nsclient_data">Per seguire AndroidAPS da remoto, entrambi i dispositivi devono avere accesso a internet (ad esempio via Wi-Fi o dati da rete mobile/cellulare).</string>
+    <string name="nsclient_fullcontrol">NS Client utilizzato come follower remoto monitorerà AndroidAPS e ne fornirà il pieno controllo.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Argomento: fattore di sensibilità all\'insulina</string>
-    <string name="isf_increasingvalue">Valori ISF più alti portano a una minore erogazione di insulina quando AAPS corregge glicemie alte.</string>
-    <string name="isf_decreasingvalue">Valori ISF più bassi portano a una minore erogazione di insulina quando AAPS corregge glicemie alte.</string>
-    <string name="isf_noeffect">Cambiare i valori di ISF non ha alcun effetto sulla quantità di insulina erogata quando AAPS corregge glicemie alte.</string>
-    <string name="isf_preferences">Devi inserire ISF in Preferenze.</string>
+    <string name="isf_label_exam">Fattore di sensibilità insulinica (ISF)</string>
+    <string name="isf_increasingvalue">Aumentare i valori di ISF porterà a una maggiore erogazione di insulina per coprire una specifica quantità di carboidrati.</string>
+    <string name="isf_decreasingvalue">Ridurre i valori ISF porta a una maggiore erogazione di insulina per correggere una glicemia al di sopra del target.</string>
+    <string name="isf_noeffect">Aumentare o ridurre ISF non ha alcun effetto sull\'erogazione di insulina quando le glicemie sono al di sotto del target.</string>
+    <string name="isf_preferences">ISF dovrebbe essere inserito nelle tue preferenze di AndroidAPS.</string>
     <string name="isf_profile">Cambiare il valore ISF nel tuo profilo è sufficiente per applicare la modifica.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Argomento: il rapporto IC</string>
-    <string name="ic_increasingvalue">Rapporti IC più alti portano a una minore insulina erogata per una data quantità di carboidrati.</string>
-    <string name="ic_decreasingvalue">Rapporti IC più bassi portano a una minore insulina erogata per una data quantità di carboidrati.</string>
+    <string name="ic_multiple">Puoi usare più di un valore per il rapporto I:C nel tuo profilo.</string>
+    <string name="ic_isf">Se cambi il tuo ISF nel tuo profilo dovresti sempre cambiare anche il tuo rapporto I:C.</string>
+    <string name="ic_label_exam">Rapporto insulina-carboidrati (rapporto I:C)</string>
+    <string name="ic_increasingvalue">Rapporti I:C più alti portano a una minore insulina erogata per una data quantità di carboidrati.</string>
+    <string name="ic_decreasingvalue">Rapporti I:C più bassi portano a una minore insulina erogata per una data quantità di carboidrati.</string>
     <string name="ic_noeffect">Se hai 0 COB, cambiare il rapporto IC porterà a una differente quantità di insulina necessaria a correggere una determinata glicemia.</string>
     <string name="ic_different">IC sarà diverso se consideri l\'unità di pane (BE) come 10g o 12g.</string>
     <string name="ic_meaning">Il significato di IC è: quante unità di pane (BE) sono coperte da 1U di insulina.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Argomento: cambio profilo</string>
-    <string name="profileswitch_pctwillchange"> Quando si specifica il 90% nel cambio profilo…</string>
-    <string name="profileswitch_basalhigher">Le basali saranno il 10% più alte.</string>
-    <string name="profileswitch_basallower">Le basali saranno il 10% più basse.</string>
-    <string name="profileswitch_ichigher">Il valore IC sarà il 10% più alto.</string>
-    <string name="profileswitch_iclower">Il valore IC sarà il 10% più basso.</string>
-    <string name="profileswitch_isfhigher">Il valore ISF sarà il 10% più alto.</string>
-    <string name="profileswitch_isflower">Il valore ISF sarà il 10% più basso.</string>
-    <string name="profileswitch_overall">Riceverai circa il 10% in meno di insulina, in totale.</string>
-    <string name="profileswitch_targethigher">Il target sarà il 10% più alto.</string>
-    <string name="profileswitch_targetlower">Il target sarà il 10% più basso.</string>
-    <string name="profileswitch_targetbottom">Solo il target inferiore sarà il 10% più basso.</string>
+    <string name="profileswitch_label">Cambio profilo</string>
+    <string name="profileswitch_pctwillchange"> Quando si specifica un cambio profilo del 90%, quali risposte sono vere?</string>
+    <string name="profileswitch_basallower">Le velocità basali saranno il 10% più basse.</string>
+    <string name="profileswitch_isfhigher">ISF sarà il 10% più alto.</string>
+    <string name="profileswitch_iclower">Il valore del rapporto I:C sarà un numero il 10% più basso.</string>
+    <string name="profileswitch_unchanged">ISF e rapporti I:C rimarranno invariati.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Se ti svegli 1h prima del solito, come dovresti informare AAPS del cambiamento nei tuoi programmi?</string>
-    <string name="profileswitchtime_1">Avviare un cambio profilo con un timeshift di 1</string>
-    <string name="profileswitchtime__1">Avviare un cambio profilo con un timeshift di -1</string>
+    <string name="profileswitch2_label">Cambio profilo</string>
+    <string name="profileswitch2_pctwillchange"> Quando si specifica un cambio profilo del 120%, quali risposte sono vere?</string>
+    <string name="profileswitch2_bghigher">La glicemia target sarà il 20% più alta.</string>
+    <string name="profileswitch2_basalhigher">Le velocità basali saranno il 20% più alte.</string>
+    <string name="profileswitch2_bgunchanged">La glicemia target rimarrà invariata.</string>
+    <string name="profileswitch2_isfhigher">ISF sarà il 20% più alto.</string>
+    <string name="profileswitchtime_label">Cambio profilo</string>
+    <string name="profileswitchtime_iwant">Se ti svegli 2 ore prima del solito, come dovresti informare AndroidAPS del cambiamento nei tuoi programmi?</string>
+    <string name="profileswitchtime_2">Avviare un cambio profilo con un timeshift di 2</string>
+    <string name="profileswitchtime__2">Avviare un cambio profilo con un timeshift di -2</string>
+    <string name="profileswitchtime_tt">Impostare un target temporaneo \"pasto a breve\".</string>
+    <string name="profileswitchtime_100">Fare un cambio profilo sopra il 100%.</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Avviare un cambio profilo con un timeshift di 60</string>
-    <string name="profileswitchtime__60">Avviare un cambio profilo con un timeshift di -60</string>
+    <string name="profileswitch4_label">Modifiche ai profili</string>
+    <string name="profileswitch4_rates">Velocità basali, ISF, rapporti I:C, ecc., dovrebbero essere impostati nei profili.</string>
+    <string name="profileswitch4_internet">L\'attivazione delle modifiche al tuo profilo Nightscout richiede che il tuo telefono con AndroidAPS abbia una connessione internet.</string>
+    <string name="profileswitch4_sufficient">Modificare i profili per cambiare i valori è sufficiente per attivare ogni cambiamento fatto.</string>
+    <string name="profileswitch4_multi">Più profili possono essere impostati e selezionati per adattarsi a diverse circostanze (ad esempio: cambiamenti ormonali, turni di lavoro, stile di vita nei giorni lavorativi/weekend).</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
-    <string name="basalhelp_label">Argomento: aiuto le con velocità basali</string>
+    <string name="basalhelp_label">Aiuto con le velocità basali</string>
     <string name="basalhelp_where">Dove andare per avere aiuto con le velocità basali e il resto.</string>
     <string name="basalhelp_diabetesteam">Il tuo team diabetologico</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Altri medicinali</string>
-    <string name="other_medication_text">AAPS riduce la velocità basale per aumentare la glicemia. Farmaci appartenenti al gruppo degli inibitori dell\'SGLT2 (gliflozine) possono ostacolare l\'aumento previsto della glicemia e, quindi, provocare una pericolosa carenza di insulina (DKA).
-\nI marchi più comuni sono: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nCon ciò prometto che non prenderò tali farmaci durante l\'utilizzo di AAPS o disattiverò il loop prima di usare questi farmaci.</string>
+    <string name="other_medication_label">Altri Farmaci. Leggere la seguente dichiarazione e, per proseguire, accettarla selezionando la casella.</string>
+    <string name="other_medication_text">AndroidAPS riduce la velocità basale o sospende l\'erogazione di insulina per aumentare la glicemia. Farmaci appartenenti al gruppo degli inibitori SGLT2 (gliflozine) possono ostacolare l\'aumento previsto della glicemia e, quindi, provocare una pericolosa carenza di insulina (DKA).
+\nI marchi più comuni sono: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nCon ciò prometto che non prenderò tali farmaci durante l\'uso di AndroidAPS o disattiverò il loop prima di usare questi farmaci.</string>
 </resources>

app/src/main/res/values-it-rIT/objectives.xml

@@ -8,7 +8,7 @@
     <string name="objectives_0_objective">Impostazione della visualizzazione e del monitoraggio. Analisi di basali e rapporti</string>
     <string name="objectives_0_gate">Verifica che la glicemia sia disponibile su Nightscout e che i dati sull\'insulina del micro siano in fase di caricamento</string>
     <string name="objectives_openloop_objective">Avvio in un loop aperto</string>
-    <string name="objectives_openloop_gate">Esegui l\'applicazione in modalità loop aperto per alcuni giorni. Attiva manualmente il maggior numero possibile di basali temporanee suggerite. Imposta e utilizza i target temporanei, anche quelli predefiniti (ad esempio per l\'attività fisica o il trattamento dell\'ipoglicemia con carboidrati)</string>
+    <string name="objectives_openloop_gate">Esegui l\'applicazione in modalità loop aperto per alcuni giorni. Attiva manualmente il maggior numero possibile di basali temporanee suggerite. Imposta e usa i target temporanei, anche quelli predefiniti (ad esempio per l\'attività fisica o il trattamento dell\'ipoglicemia con carboidrati)</string>
     <string name="objectives_maxbasal_objective">Comprensione del tuo loop aperto, incluse le relative raccomandazioni sulle basali temporanee</string>
     <string name="objectives_maxbasal_gate">Sulla base di tale esperienza, decidi quale dovrebbe essere il valore di \'max basale\' e impostalo sul microinfusore e nelle preferenze</string>
     <string name="objectives_maxiobzero_objective">Avvio della chiusura del loop con Low Glucose Suspend</string>
@@ -41,7 +41,7 @@
     <string name="codeaccepted">Codice accettato</string>
     <string name="codeinvalid">Codice non valido</string>
     <string name="objectives_exam_objective">Dai prova della tua conoscenza</string>
-    <string name="objectives_exam_gate">Studia e rispondi correttamente alle domande</string>
+    <string name="objectives_exam_gate">Studia, leggi le domande e rifletti. Ti vengono fornite quattro possibili risposte per ogni domanda. Ci può essere più di una risposta corretta. Seleziona tutte quelle che sono corrette e poi vai su VERIFICA.</string>
     <string name="answerdisabledto">Risposta disabilitata fino a: %1$s</string>
     <string name="wronganswer">Risposta errata!</string>
     <string name="unfinshed_button">Prossimo N.C.</string>

app/src/main/res/values-it-rIT/strings.xml

@@ -7,22 +7,23 @@
     <string name="treatmentssafety_title">Sicurezza trattamenti</string>
     <string name="treatmentssafety_maxbolus_title">Max bolo consentito [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Max CHO consentiti [g]</string>
+    <string name="nav_preferences_plugin">%1$s Preferenze</string>
     <string name="nav_preferences">Preferenze</string>
     <string name="nav_refreshtreatments">Aggiorna trattamenti da NS</string>
     <string name="nav_resetdb">Resetta database</string>
     <string name="reset_db_confirm">Vuoi davvero resettare i database?</string>
     <string name="nav_exit">Esci</string>
-    <string name="ns_sync_use_absolute_title">Utilizza sempre valori basali assoluti</string>
+    <string name="ns_sync_use_absolute_title">Usa sempre valori basali assoluti</string>
     <string name="alert_dialog_storage_permission_text">Per favore riavvia il tuo telefono oppure fai ripartire AndroidAPS dalle impostazioni di sistema \naltrimenti Android APS non farà il log (è importante monitorare e verificare che gli algoritmi stiano funzionando correttamente)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Questo dispositivo non sembra supportare la whitelist dell\'ottimizzazione batteria: potrebbero verificarsi problemi di prestazioni.</string>
     <string name="description_actions">Alcuni tasti per accedere rapidamente alle funzioni comuni</string>
-    <string name="description_config_builder">Utilizzato per configurare i plugin attivi</string>
+    <string name="description_config_builder">Usato per configurare i plugin attivi</string>
     <string name="description_objectives">Programma di apprendimento</string>
     <string name="description_food">Visualizza i preset dei cibi definiti in Nightscout</string>
     <string name="description_insulin_rapid">Preset per insulina Humalog e NovoRapid / NovoLog</string>
     <string name="description_insulin_ultra_rapid">Preset per insulina Fiasp</string>
     <string name="description_insulin_lyumjev">Preset per insulina Lyumjev</string>
-    <string name="description_insulin_free_peak">Ti consente di definire il picco di attività dell\'insulina e deve essere utilizzato solo dagli utenti avanzati</string>
+    <string name="description_insulin_free_peak">Ti consente di definire il picco di attività dell\'insulina e dovrebbe essere usato solo dagli utenti avanzati</string>
     <string name="description_loop">Attiva o disattiva l\'implementazione per la gestione del loop.</string>
     <string name="description_ns_client">Sincronizza i tuoi dati con Nightscout</string>
     <string name="description_ama">Stato dell\'algoritmo nel 2017</string>
@@ -35,7 +36,7 @@
     <string name="description_pump_mdi">Per le persone in terapia multi-iniettiva</string>
     <string name="description_pump_virtual">Per microinfusori che non hanno ancora alcun driver (Loop aperto)</string>
     <string name="description_sensitivity_aaps">La sensibilità è calcolata allo stesso modo di Oref0, ma puoi specificare l\'intervallo di tempo al passato. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento pasto\' nelle preferenze.</string>
-    <string name="description_sensitivity_oref1">La sensibilità è calcolata dai dati delle ultime 8h o 24h (utilizzando tra i due periodi il più sensibile) e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze. Il plugin calcola anche UAM.</string>
+    <string name="description_sensitivity_oref1">La sensibilità è calcolata dai dati delle ultime 8h o 24h (usando tra i due periodi il più sensibile) e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze. Il plugin calcola anche UAM.</string>
     <string name="description_sensitivity_weighted_average">La sensibilità è calcolata come media ponderata dalle deviazioni. Le deviazioni più recenti hanno peso maggiore. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento pasto\' nelle preferenze. Questo algoritmo è il più veloce nel seguire i cambiamenti di sensibilità.</string>
     <string name="description_source_eversense">Ricevi valori glicemia dall\'app Eversense modificata.</string>
     <string name="description_source_glimp">Ricevi valori glicemia da Glimp.</string>
@@ -45,7 +46,7 @@
     <string name="description_treatments">Salva tutti i trattamenti che sono stati fatti</string>
     <string name="description_wear">Monitora e controlla AndroidAPS usando il tuo smartwatch WearOS.</string>
     <string name="description_xdrip_status_line">Mostra le informazioni del loop sulla watchface di xDrip+.</string>
-    <string name="description_sms_communicator">Controlla AndroidAPS in remoto utilizzando i comandi SMS.</string>
+    <string name="description_sms_communicator">Controlla AndroidAPS in remoto usando i comandi SMS.</string>
     <string name="treatments_insulin_label_string">Insulina:</string>
     <string name="treatments_carbs_label_string">CHO:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -86,9 +87,9 @@
     <string name="virtualpump">Micro virtuale</string>
     <string name="careportal">Portale</string>
     <string name="configbuilder_pump">Micro</string>
-    <string name="configbuilder_pump_description">Quale microinfusore desideri utilizzare con AndroidAPS?</string>
+    <string name="configbuilder_pump_description">Quale microinfusore desideri usare con AndroidAPS?</string>
     <string name="configbuilder_treatments">Trattamenti</string>
-    <string name="configbuilder_treatments_description">Quale plugin dovrebbe essere utilizzato per la gestione del trattamento?</string>
+    <string name="configbuilder_treatments_description">Quale plugin dovrebbe essere usato per la gestione del trattamento?</string>
     <string name="configbuilder_profile">Profilo</string>
     <string name="configbuilder_profile_description">Quale profilo AndroidAPS dovrebbe usare?</string>
     <string name="configbuilder_aps">APS</string>
@@ -158,7 +159,7 @@
     <string name="openapsma_maxbasal_summary">Questo valore è chiamato max basale nel contesto OpenAPS</string>
     <string name="openapsma_maxiob_title">Max IOB da basale a cui limitare OpenAPS [U]</string>
     <string name="openapsma_maxiob_summary">Questo valore è chiamato Max IOB nel contesto OpenAPS\nIndica l\'insulina massima in [U] che APS può erogare in contemporanea.</string>
-    <string name="password_preferences_encrypt_prompt">Ti verrà richiesta la password master, che verrà utilizzata per crittografare le preferenze esportate.</string>
+    <string name="password_preferences_encrypt_prompt">Ti verrà richiesta la password master, che verrà usata per crittografare le preferenze esportate.</string>
     <string name="password_preferences_decrypt_prompt">Ti verrà chiesta la password master, che è necessaria per decrittare le preferenze importate.</string>
     <string name="preferences_export_canceled">Esportazione annullata! Le preferenze NON sono state esportate!</string>
     <string name="preferences_import_canceled">Importazione annullata! Le preferenze NON sono state importate!</string>
@@ -177,7 +178,7 @@
     <string name="check_preferences_import_anyway_btn">Importa comunque (PERICOLOSO!)</string>
     <string name="metadata_warning_different_flavour">Le preferenze sono state create con una differente versione di AAPS (%1$s) mentre invece tu hai: %2$s.\n\nAlcune impostazioni potrebbero mancare o non essere valide - dopo l\'importazione controlla e aggiornare le tue preferenze.</string>
     <string name="metadata_warning_different_device">Le preferenze sono state create su un dispositivo diverso. Va bene importarle da un vecchio/diverso telefono, ma assicurati che le preferenze importate siano corrette!</string>
-    <string name="metadata_warning_outdated_format">Stai utilizzando il formato precedente (obsoleto) delle vecchie versioni di APPS, che non è sicuro! Utilizzalo solo come ultima risorsa, se non hai un\'esportazione nel corrente formato JSON.</string>
+    <string name="metadata_warning_outdated_format">Stai usando il formato precedente (obsoleto) delle vecchie versioni di APPS, che non è sicuro! Usalo solo come ultima risorsa, se non hai un\'esportazione nel corrente formato JSON.</string>
     <string name="metadata_warning_old_export">Le preferenze importate hanno già %1$s giorni! Forse hai preferenze più aggiornate. Hai scelto il file sbagliato? Ricorda di esportare le preferenze regolarmente!</string>
     <string name="metadata_warning_date_format">Formato data-ora non valido!</string>
     <string name="metadata_warning_different_version">Le preferenze arrivano da una differente versione secondaria dell\'applicazione (minor). Va bene se le stai importando dopo l\'aggiornamento, ma controlla che, dopo l\'importazione, le preferenze siano ancora corrette!</string>
@@ -195,7 +196,7 @@
     <string name="metadata_format_other">Formato esportazione sconosciuto</string>
     <string name="prefdecrypt_settings_tampered">File delle impostazioni manomesso</string>
     <string name="prefdecrypt_settings_secure">Il file delle impostazioni è sicuro</string>
-    <string name="prefdecrypt_settings_unencrypted">Utilizzo non sicuro, formato impostazioni non crittografato</string>
+    <string name="prefdecrypt_settings_unencrypted">Uso non sicuro, formato impostazioni non crittografato</string>
     <string name="prefdecrypt_wrong_json">Errore formato JSON, campo obbligatorio mancante (formato, contenuto, metadati o sicurezza)</string>
     <string name="prefdecrypt_wrong_password">Errore decrittazione, la password data non può decrittare il file</string>
     <string name="prefdecrypt_issue_missing_file_hash">File checksum (hash) mancante, impossibile verificare l\'autenticità delle impostazioni!</string>
@@ -209,7 +210,7 @@
     <string name="exported_less_than_hour_ago">esportato meno di un\'ora fa</string>
     <string name="in_directory" comment="placeholder is for exported file path">nella directory: %1$s</string>
     <string name="end_user_license_agreement">Contratto di licenza per l\'utente</string>
-    <string name="end_user_license_agreement_text">NON DEVE ESSERE UTILIZZATO PER PRENDERE DECISIONI MEDICHE. NON ESISTE ALCUNA GARANZIA PER IL PROGRAMMA, NELLA MISURA CONSENTITA DALLA LEGGE APPLICABILE. TRANNE QUANDO DIVERSAMENTE INDICATO PER ISCRITTO, I DETENTORI DEL COPYRIGHT E/O ALTRE PARTI FORNISCONO IL PROGRAMMA \"COSÌ COM\'È\" SENZA GARANZIA DI ALCUN TIPO, ESPLICITA O IMPLICITA, INCLUSE, MA NON LIMITATAMENTE A, GARANZIE IMPLICITE DI COMMERCIABILITÀ E IDONEITÀ PER UN SCOPO PARTICOLARE. L\'INTERO RISCHIO RIGUARDO LA QUALITÀ E LE PRESTAZIONI DEL PROGRAMMA È TUO. SE IL PROGRAMMA DOVESSE RISULTARE DIFETTOSO, TI ASSUMI IL COSTO DI TUTTE LE NECESSARIE MANUTENZIONI, RIPARAZIONI O CORREZIONI.</string>
+    <string name="end_user_license_agreement_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>
@@ -285,7 +286,7 @@
     <string name="correctionbous">Corr</string>
     <string name="actions">Azioni</string>
     <string name="ns_upload_only">NS: solo upload (sincron. disabilitata)</string>
-    <string name="ns_upload_only_summary">NS: solo upload. Non ha effetto su SGV a meno che non sia selezionata una fonte locale come xDrip. Non ha effetto sui profili durante l\'utilizzo dei profili NS.</string>
+    <string name="ns_upload_only_summary">NS: solo upload. Non ha effetto su SGV a meno che non sia selezionata una fonte locale come xDrip. Non ha effetto sui profili durante l\'uso dei profili NS.</string>
     <string name="pumpNotInitialized">Micro non inizializzato!</string>
     <string name="primefill">Carica/Riempi</string>
     <string name="fillwarning">Assicurati che la quantità corrisponda alla specifica del tuo set di infusione!</string>
@@ -339,7 +340,7 @@
     <string name="wear_shortname">SMWA</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Accorcia titoli schede</string>
-    <string name="always_use_shortavg">Utilizza sempre il delta medio ridotto</string>
+    <string name="always_use_shortavg">Usa sempre il delta medio ridotto</string>
     <string name="always_use_shortavg_summary">Utile quando i dati provenienti da sorgenti non filtrate come xDrip diventano \"rumorosi\" (instabili).</string>
     <string name="profile">Profilo</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">[Valore predefinito: 3] Questo è un parametro di sicurezza chiave in OpenAPS. Ciò che fa è limitare le tue basali a essere 3 volte, al più, la tua velocità basale massima. Probabilmente non avrai bisogno di cambiare questo valore, ma dovresti essere consapevole di cosa significa il gruppo di parametri \"3x max giornaliera; 4x corrente\" e per quali motivi di sicurezza siano stati impostati tali valori.</string>
@@ -347,7 +348,7 @@
     <string name="openapsama_autosens_max_summary">[Valore predefinito: 1.2]\nQuesto è un moltiplicatore di sicurezza per autosens (e presto autotune) per impostare un limite massimo del 20%% (col valore predefinito) su quanto alto può essere il rapporto di autosens, che a sua volta determina quanto in alto autosens può regolare le basali, quanto in basso può regolare ISF e quanto in basso può impostare il target glicemico.</string>
     <string name="openapsama_autosens_min_summary">[Valore predefinito: 0.7]\nUn altro limite di sicurezza di autosens, imposta un blocco a quanto in basso autosens può regolare le basali e a quanto in alto può regolare ISF e target glicemici.</string>
     <string name="openapsama_autosens_adjusttargets">Autosens regola anche i target</string>
-    <string name="openapsama_autosens_adjusttargets_summary">[Valore predefinito: vero]\nViene utilizzato per consentire ad autosens di regolare i target glicemici, in aggiunta a ISF e basali.</string>
+    <string name="openapsama_autosens_adjusttargets_summary">[Valore predefinito: vero]\nViene usato per consentire ad autosens di regolare i target glicemici, in aggiunta a ISF e basali.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">[Valore predefinito: 2]\nBolus snooze è attivato dopo un bolo pasto per fare in modo che il loop non imposti basali temporanee basse quando hai appena mangiato. AndroidAPS non imposterà velocità basali troppo basse nel periodo corrispondente a DIA diviso il parametro bolus snooze - divisore DIA. Con DIA di 3 ore \"bolus snooze\" durerà 1.5 ore (3/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">[Valore predefinito: 3.0 (AMA) o 8.0 (SMB)]. Questa è un\'impostazione per l\'impatto di assorbimento predefinito dei carboidrati in 5 minuti. L\'impostazione predefinita è una previsione di 3mg/dl/5min. Ha effetto sulla velocità di decadimento dei COB (carboidrati attivi) e su quanto il loro assorbimento incide nella previsione dell’andamento glicemico, quando la glicemia sta scendendo più del previsto o non sta salendo quanto previsto.</string>
     <string name="openapsama_link_to_preferncejson_doc_txt">Attenzione!\nNormalmente non dovresti modificare questi valori. FAI CLICK QUI e leggi il testo e assicurati di AVERLO CAPITO prima di cambiare uno di questi valori.</string>
@@ -405,11 +406,18 @@
     <string name="suspendloopfor3h">Sospendi loop per 3h</string>
     <string name="suspendloopfor10h">Sospendi loop per 10h</string>
     <string name="suspendloopforXmin">Sospendi loop per %1$d min</string>
+    <string name="disconnectpump">Disconnetti micro</string>
     <string name="disconnectpumpfor15m">Disconnetti micro per 15 min</string>
     <string name="disconnectpumpfor30m">Disconnetti micro per 30 min</string>
     <string name="disconnectpumpfor1h">Disconnetti micro per 1 h</string>
     <string name="disconnectpumpfor2h">Disconnetti micro per 2 h</string>
     <string name="disconnectpumpfor3h">Disconnetti micro per 3 h</string>
+    <string name="duration15m">15 min</string>
+    <string name="duration30m">30 min</string>
+    <string name="duration1h">1 ora</string>
+    <string name="duration2h">2 ore</string>
+    <string name="duration3h">3 ore</string>
+    <string name="duration10h">10 ore</string>
     <string name="resume">Riprendi</string>
     <string name="reconnect">Riconnetti micro</string>
     <string name="smscommunicator_wrongduration">Durata errata</string>
@@ -425,7 +433,7 @@
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="insulin_shortname">INS</string>
     <string name="enablesuperbolus">Abilita superbolo nel calcolatore</string>
-    <string name="enablesuperbolus_summary">Abilita la funzionalità superbolo nel calcolatore. Non abilitare fino a quando non impari ciò che realmente fa. PUÒ CAUSARE SOVRADOSAGGIO DI INSULINA SE USATO IMPROPRIAMENTE!</string>
+    <string name="enablesuperbolus_summary">Abilita la funzionalità superbolo nel calcolatore. Non abilitare fino a quando non impari ciò che realmente fa. PUÒ CAUSARE SOVRA-DOSAGGIO DI INSULINA SE USATO IMPROPRIAMENTE!</string>
     <string name="show_statuslights">Mostra indicatori di stato sulla home</string>
     <string name="statuslights_cage_warning">Soglia di avviso età cannula [h]</string>
     <string name="statuslights_cage_critical">Soglia età cannula critica [h]</string>
@@ -478,7 +486,7 @@
     <string name="openaps">OpenAPS</string>
     <string name="uploader">Uploader</string>
     <string name="configbuilder_sensitivity">Rilevamento sensibilità</string>
-    <string name="configbuilder_sensitivity_description">Quale algoritmo di sensibilità dovrebbe essere utilizzato?</string>
+    <string name="configbuilder_sensitivity_description">Quale algoritmo di sensibilità dovrebbe essere usato?</string>
     <string name="sensitivity_shortname">SENS</string>
     <string name="sensitivityoref1">Sensibilità Oref1</string>
     <string name="sensitivityaaps">Sensibilità AAPS</string>
@@ -502,7 +510,7 @@
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="enableuam">Abilita UAM</string>
     <string name="enablesmb">Abilita SMB</string>
-    <string name="enablesmb_summary">Utilizza super-micro-boli al posto della basale temporanea per un\'azione più veloce</string>
+    <string name="enablesmb_summary">Usa super-micro-boli al posto della basale temporanea per un\'azione più veloce</string>
     <string name="enableuam_summary">Rilevamento dei pasti non annunciati</string>
     <string name="insulin_oref_peak">Tempo picco Curva IOB</string>
     <string name="insulin_peak_time">Tempo del picco [min]</string>
@@ -510,7 +518,7 @@
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="lyumjev">Lyumjev</string>
-    <string name="dia_too_short">DIA di %1$f troppo breve - utilizzo %2$f.</string>
+    <string name="dia_too_short">DIA di %1$f troppo breve - uso %2$f.</string>
     <string name="activate_profile">Attiva profilo</string>
     <string name="invalid">NON VALIDO</string>
     <string name="careportal_newnstreatment_percentage_label">Percentuale</string>
@@ -522,7 +530,7 @@
     <string name="activity_target">target \"attività fisica\"</string>
     <string name="hypo_duration">target \"ipoglicemia\" - durata</string>
     <string name="hypo_target">target \"ipoglicemia\"</string>
-    <string name="reuse">riutilizzo</string>
+    <string name="reuse">riuso</string>
     <string name="wearcontrol_title">Controlli da smartwatch</string>
     <string name="wearcontrol_summary">Imposta Temp-Target e inserisci trattamenti dallo smartwatch.</string>
     <string name="food">Cibo</string>
@@ -564,8 +572,6 @@
     <string name="overview_editquickwizard_usebasaliob">Calcolo IOB da basale</string>
     <string name="overview_editquickwizard_usetrend">Calcolo trend</string>
     <string name="overview_editquickwizard_usesuperbolus">Calcolo superbolo</string>
-    <string name="yes">Sì</string>
-    <string name="no">No</string>
     <string name="positiveonly">Solo positivo</string>
     <string name="negativeonly">Solo negativo</string>
     <string name="overview_editquickwizard_usecob">Calcolo COB</string>
@@ -591,8 +597,8 @@
     <string name="combo_pump_action_bolusing">Erogazione bolo (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Aggiornamento</string>
     <string name="combo_pump_unsupported_operation">Operazione richiesta non supportata dal micro</string>
-    <string name="combo_low_suspend_forced_notification">Utilizzo non sicuro: sono attivi boli estesi o multiwave. Il loop è stato messo in modalità di sola sospensione dell\'erogazione di insulina a glicemia bassa (LGS), per 6 ore. In modalità loop sono supportati solo boli normali</string>
-    <string name="combo_force_disabled_notification">Utilizzo non sicuro: il micro utilizza un profilo della velocità basale diverso dal primo in elenco tra le sue impostazioni. Il loop è stato disabilitato. Selezionare sul micro il profilo basale numero 1.</string>
+    <string name="combo_low_suspend_forced_notification">Uso non sicuro: sono attivi boli estesi o multiwave. Il loop è stato messo in modalità di sola sospensione dell\'erogazione di insulina a glicemia bassa (LGS), per 6 ore. In modalità loop sono supportati solo boli normali</string>
+    <string name="combo_force_disabled_notification">Uso non sicuro: il micro usa un profilo della velocità basale diverso dal primo in elenco tra le sue impostazioni. Il loop è stato disabilitato. Selezionare sul micro il profilo basale numero 1.</string>
     <string name="bolus_frequency_exceeded">Un bolo con la stessa quantità è stato richiesto negli ultimi due minuti. Questo non è consentito al fine di evitare boli doppi accidentali e a protezione di eventuali \"bug\".</string>
     <string name="combo_pump_connected_now">Adesso</string>
     <string name="combo_activity_reading_pump_history">Lettura storico micro</string>
@@ -612,8 +618,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">Insulina nel serbatoio insufficiente per erogare il bolo</string>
     <string name="extendedbolusdeliveryerror">Errore erogazione bolo esteso</string>
     <string name="insightpump_shortname">Sight</string>
-    <string name="set_neutral_temps_title">Imposta basali temporanee neutre</string>
-    <string name="set_neutral_temps_summary">Se abilitato, cancellerà una basale temporanea prima della fine di ogni ora. Questo metodo può aiutare a fermare alcuni micro dall\'emettere un suono/vibrare allo scoccare dell\'ora.</string>
     <string name="enablesmbalways">Abilita SMB sempre</string>
     <string name="enablesmbalways_summary">Abilita SMB sempre, indipendentemente dai boli. Possibile solo con sorgente glicemia con un buon filtraggio dei dati, come G5</string>
     <string name="enablesmbaftercarbs">Abilita SMB dopo i CHO</string>
@@ -648,7 +652,7 @@
     <string name="wear_predictions_title">Predizioni</string>
     <string name="data_choices">Scelta dei dati</string>
     <string name="fabric_upload">Invio a fabric.io</string>
-    <string name="allow_automated_crash_reporting">Consenti la segnalazione automatica degli errori e l\'invio dei dati di utilizzo delle funzioni dell\'app agli sviluppatori tramite il servizio fabric.io.</string>
+    <string name="allow_automated_crash_reporting">Consenti la segnalazione automatica degli errori e l\'invio dei dati d\'uso delle funzioni dell\'app agli sviluppatori tramite il servizio fabric.io.</string>
     <string name="g5appnotdetected">Aggiorna la tua app Dexcom a una versione supportata</string>
     <string name="dexcom_app_not_installed">App Dexcom non installata.</string>
     <string name="start_activity_tt">Avvia TT Attività fisica</string>
@@ -672,13 +676,13 @@
     <string name="engineering_mode_enabled">Engineering mode abilitata</string>
     <string name="combo_actvity_reading_basal_profile">Lettura profilo basale</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Lo storico del micro è cambiato dopo il calcolo del bolo. Il bolo non è stato erogato. Ricalcolare se un bolo è ancora necessario.</string>
-    <string name="combo_error_updating_treatment_record">Bolo erogato con successo, ma non è possibile aggiungere la voce ai trattamenti. Questo può accadere se due piccoli boli della stessa quantità sono stati somministrati negli ultimi due minuti. Controlla lo storico del micro e le voci della sezione Trattamenti e utilizza la sezione Portale per aggiungere eventuali voci mancanti. Assicurati di non aggiungere voci che si riferiscano al medesimo minuto e alla stessa quantità.</string>
+    <string name="combo_error_updating_treatment_record">Bolo erogato con successo, ma non è possibile aggiungere la voce ai trattamenti. Questo può accadere se due piccoli boli della stessa quantità sono stati somministrati negli ultimi due minuti. Controlla lo storico del micro e le voci della sezione Trattamenti e usa la sezione Portale per aggiungere eventuali voci mancanti. Assicurati di non aggiungere voci che si riferiscano al medesimo minuto e alla stessa quantità.</string>
     <string name="combo_high_temp_rejected_due_to_pump_history_changes">Rifiuto basale temporanea \"alta\" in quanto il calcolo non ha considerato i cambiamenti recenti allo storico del micro</string>
     <string name="combo_activity_checking_pump_state">Aggiornamento stato micro</string>
     <string name="combo_warning_pump_basal_rate_changed">La velocità basale sul micro è cambiata e verrà aggiornata a breve</string>
     <string name="combo_error_failure_reading_changed_basal_rate">Velocità basale cambiata sul micro, ma la sua lettura è fallita</string>
     <string name="combo_activity_checking_for_history_changes">Controllo modifiche allo storico</string>
-    <string name="combo_error_multiple_boluses_with_identical_timestamp">Sono appena stati importati più boli con la stessa quantità nello stesso minuto. Solo un record può essere aggiunto ai trattamenti. Controlla il micro e aggiungi manualmente un record di bolo utilizzando la sezione Portale. Assicurati di creare un bolo con un\'ora non utilizzata da nessun altro bolo.</string>
+    <string name="combo_error_multiple_boluses_with_identical_timestamp">Sono appena stati importati più boli con la stessa quantità nello stesso minuto. Solo un record può essere aggiunto ai trattamenti. Controlla il micro e aggiungi manualmente un record di bolo usando la sezione Portale. Assicurati di creare un bolo con un\'ora non usata da nessun altro bolo.</string>
     <string name="about_link_urls">\n\ndocumentazione:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers\nhttps://www.facebook.com/groups/aapsitalia</string>
     <string name="combo_check_date">L\'ultimo bolo è più vecchio di 24 ore o ha una data nel futuro. Controlla che la data sul micro sia impostata correttamente.</string>
     <string name="combo_suspious_bolus_time">L\'ora/la data del bolo erogato sul micro sembra errata, IOB probabilmente non è corretto. Controlla l\'ora e/o la data del micro.</string>
@@ -702,7 +706,7 @@
     <string name="limitingiob">Limitazione IOB a %1$.1f U a causa di: %2$s</string>
     <string name="maxvalueinpreferences">valore max nelle preferenze</string>
     <string name="hardlimit">limite fisso</string>
-    <string name="unsafeusage">utilizzo non sicuro</string>
+    <string name="unsafeusage">uso non sicuro</string>
     <string name="readstatusfailed">Lettura stato fallita</string>
     <string name="record_pump_site_change">Registra cambio posizione cannula</string>
     <string name="record_insulin_cartridge_change">Registra cambio cartuccia insulina</string>
@@ -756,14 +760,14 @@
     <string name="adjustprofileinns">Le modifiche devono essere fatte in NS</string>
     <string name="exitwizard">Salta configurazione guidata</string>
     <string name="setupwizard_loop_description">Premi il tasto in basso per permettere ad AndroidAPS di proporre/fare modifiche alla basale</string>
-    <string name="setupwizard_sensitivity_description">Il plugin di sensibilità è utilizzato per il rilevamento della sensibilità all\'insulina e il calcolo di COB. Per ulteriori informazioni visita:</string>
+    <string name="setupwizard_sensitivity_description">Il plugin di sensibilità è usato per il rilevamento della sensibilità all\'insulina e il calcolo di COB. Per ulteriori informazioni visita:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
     <string name="nsclientinfotext">NSClient gestisce la connessione a Nightscout. Puoi saltare questa parte ora, ma non sarai in grado di superare gli obiettivi fino a quando non ne porterai a termine la configurazione.</string>
     <string name="diawarning">Ricorda: i nuovi profili di insulina richiedono una DIA di almeno 5h. DIA di 5-6h sui nuovi profili sono uguali a DIA di 3h sui vecchi profili di insulina.</string>
-    <string name="setupwizard_profile_description">Seleziona il tipo di profilo. Se il paziente è un bambino dovresti utilizzare il profilo di NS. Se non c\'è nessuno a seguirti su Nightscout probabilmente preferirai il profilo locale. Ricorda che stai solo selezionando la sorgente del profilo. Per utilizzarlo devi attivarlo tramite l\'esecuzione del comando \"Cambio profilo\"</string>
+    <string name="setupwizard_profile_description">Seleziona il tipo di profilo. Se il paziente è un bambino dovresti usare il profilo NS. Se non c\'è nessuno a seguirti su Nightscout probabilmente preferirai il profilo locale. Ricorda che stai solo selezionando la sorgente del profilo. Per usarlo devi attivarlo tramite l\'esecuzione del comando \"Cambio profilo\"</string>
     <string name="setupwizard_aps_description">Seleziona uno degli algoritmi disponibili. Sono ordinati dal più vecchio al più recente. L\'algoritmo più recente è solitamente più potente e più aggressivo. Pertanto, se sei un nuovo utente, probabilmente dovresti iniziare con AMA e non con l\'ultimo. Non dimenticare di leggere la documentazione di OpenAPS e di configurarlo prima dell\'uso.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Attesa connessione RileyLink…\n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b>Nota:</b> Puoi continuare la configurazione una volta che il micro è stato inizializzato.\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Configura il RileyLink di seguito. Dopo aver selezionato un RileyLink, sarà possibile continuare la configurazione una volta che lo stato del RileyLink sarà \"Connesso\". Questo potrebbe richiedere un minuto.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Nota:</b> Puoi continuare la configurazione una volta che il micro è stato configurato.\n</string>
     <string name="startobjective">Avvia il tuo primo obiettivo</string>
     <string name="permission">Autorizzazione</string>
     <string name="askforpermission">Chiedi l\'autorizzazione</string>
@@ -789,8 +793,7 @@
     <string name="resistance_lowers_target_summary">Quando viene rilevata resistenza, ridurre la glicemia target</string>
     <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="combo_invalid_setup">Configurazione micro non valida, controlla la documentazione e verifica che il menu Quick Info sia denominato QUICK INFO utilizzando \"360 configuration software\".</string>
-    <string name="custom">Personalizzato</string>
+    <string name="combo_invalid_setup">Configurazione micro non valida, controlla la documentazione e verifica che il menu Quick Info sia denominato QUICK INFO usando \"360 configuration software\".</string>
     <string name="careportal_removestartedevents">Rimuovi gli eventi \"AndroidAPS avviato\"</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>
@@ -978,7 +981,9 @@
     <string name="description_source_dexcom">Ricevi valori glicemia dall\'app Dexcom modificata.</string>
     <string name="notification">Notifica</string>
     <string name="notification_message">Notifica: %1$s</string>
+    <string name="alarm_message">Allarme: %1$s</string>
     <string name="message_short">Msg:</string>
+    <string name="alarm_short">Allarme:</string>
     <string name="profilepercentage">Percentuale profilo</string>
     <string name="percent_u">Percentuale [%]:</string>
     <string name="startprofile">Avvia profilo %1$d%% per %2$d min</string>
@@ -1099,7 +1104,7 @@
     <!-- SMS Communicator & OTP Authenticator -->
     <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">da app autenticatore: %1$s seguito da PIN</string>
     <string name="smscommunicator_otp_enabled">Abilita autenticatore</string>
-    <string name="smscommunicator_otp_enabled_summary">Autentica i comandi utilizzando OTP (One Time Password) generate da Google Authenticator o app 2FA simili.</string>
+    <string name="smscommunicator_otp_enabled_summary">Autentica i comandi usando OTP (One Time Password) generate da Google Authenticator o app 2FA simili.</string>
     <string name="smscommunicator_otp_pin">PIN obbligatorio aggiuntivo a fine token</string>
     <string name="smscommunicator_otp_pin_summary">Cifre aggiuntive che devono essere memorizzate e incollate alla fine di ogni OTP generata</string>
     <string name="smscomunicator_tab_otp_label">Configurazione autenticatore</string>
@@ -1109,7 +1114,7 @@
     <string name="smscommunicator_otp_reset_btn">Resetta autenticatori</string>
     <string name="smscommunicator_otp_reset_title">Resetta chiave autenticatore</string>
     <string name="smscommunicator_otp_reset_prompt">Sei sicuro di resettare la chiave autenticatore? Renderà non validi tutti gli autenticatori attualmente configurati e sarà necessario configurarli nuovamente.</string>
-    <string name="smscommunicator_otp_reset_successful">La nuova chiave autenticatore è stata generata! Utilizza il QRCode aggiornato per fornire gli autenticatori.</string>
+    <string name="smscommunicator_otp_reset_successful">La nuova chiave autenticatore è stata generata! Usa il QRCode aggiornato per fornire gli autenticatori.</string>
     <string name="smscommunicator_otp_export_title">Esportazione OTP secret</string>
     <string name="smscommunicator_otp_export_prompt">Sei sicuro di voler copiare l\'OTP secret negli appunti?\n\nPotresti averne bisogno solo se la tua app autenticatore ha problemi con la scansione del QRCode, vuoi inserirlo manualmente o vuoi configurare un token OTP hardware usando un\'app dedicata.</string>
     <string name="smscommunicator_otp_export_successful">OTP secret (in formato Base32) esportato e copiato negli appunti. Incollalo nell\'autenticatore o nel configuratore hardware di OTP!</string>
@@ -1125,7 +1130,7 @@
     <string name="overview_show_deviationslope">Pendenza deviazione</string>
     <string name="authorizationfailed">Autorizzazione fallita</string>
     <string name="overview_show_absinsulin">Insulina assoluta</string>
-    <string name="master_password_summary">La password master viene utilizzata per la crittografia del backup e per gestire la sicurezza nell\'applicazione. Ricordala o conservala in un luogo sicuro.</string>
+    <string name="master_password_summary">La password master viene usata per la crittografia del backup e per gestire la sicurezza nell\'applicazione. Ricordala o conservala in un luogo sicuro.</string>
     <string name="current_master_password">Password Master corrente</string>
     <string name="statuslights">Indicatori di stato</string>
     <string name="statuslights_copy_ns">Copia impostazioni da NS</string>
@@ -1161,9 +1166,9 @@
     <string name="oh_logout_confirmation">Vuoi davvero fare il logout e smettere di donare dati alla scienza?</string>
     <string name="project_member_id">Project Member ID: %s</string>
     <string name="queue_size">Dimensione coda: %d</string>
-    <string name="terms_of_use">Termini di utilizzo</string>
+    <string name="terms_of_use">Termini d\'uso</string>
     <string name="not_logged_in">Accesso non effettuato</string>
-    <string name="you_need_to_accept_the_of_use_first">Devi prima accettare i termini di utilizzo.</string>
+    <string name="you_need_to_accept_the_of_use_first">Devi prima accettare i termini d\'uso.</string>
     <string name="successfully_logged_in">Accesso riuscito</string>
     <string name="setup_will_continue_in_background">La configurazione verrà ora completata in background. Grazie per il caricamento dei tuoi dati.\n\nPer completare la configurazione, mantieni questo plugin attivo e il telefono acceso per un po\' di tempo.</string>
     <string name="completing_login">Completamento accesso…</string>
@@ -1180,4 +1185,15 @@
     <string name="filter">Filtro</string>
     <string name="copytolocalprofile_invalid">Impossibile creare il profilo locale. Il profilo non è valido.</string>
     <string name="cta_dont_kill_my_app_info">Non terminare l\'app?</string>
+    <string name="alarm">Allarme</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Invia SMS se si verifica l\'evento \"micro irraggiungibile\"</string>
+    <string name="smscommunicator_pump_ureachable">Segnala micro irraggiungibile</string>
+    <string name="advisoralarm">Esegui allarme quando è tempo di mangiare</string>
+    <string name="alarminxmin">Esegui allarme in %1$d min</string>
+    <string name="bolusadvisor">Consiglio bolo</string>
+    <string name="bolusadvisormessage">Hai una glicemia alta. Invece di mangiare ora, si consiglia di attendere una glicemia migliore. Vuoi fare adesso un bolo di correzione ed essere ricordato quando è il momento di mangiare? In questo caso non verranno registrati carboidrati e dovrai usare di nuovo il calcolatore quando ti verrà mostrato il promemoria.</string>
+    <string name="enablebolusadvisor">Abilita consiglio bolo</string>
+    <string name="enablebolusadvisor_summary">Usa un promemoria per iniziare a mangiare invece del calcolatore durante la glicemia alta</string>
+    <string name="time_to_eat">Tempo di mangiare!\nEsegui il calcolatore e fai di nuovi i calcoli.</string>
+    <string name="timetoeat">Tempo di mangiare</string>
 </resources>

app/src/main/res/values-iw-rIL/exam.xml

@@ -1,167 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">מה נכון לגבי משך פעילות אינסולין (DIA)?</string>
-    <string name="dia_label_exam">נושא: משך פעילות אינסולין</string>
-    <string name="dia_minimumis3h">הערך המינימלי הוא 3 שעות.</string>
-    <string name="dia_minimumis5h">הערך המינימלי הוא 5 שעות.</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">המשמעות שווה לערך ה-DIA שמשמש את המשאבה.</string>
-    <string name="dia_valuemustbedetermined">עליכם לקבוע את הערך האישי לכם (עליו להיות לכל הפחות 5 שעות).</string>
-    <string name="hypott_label">נושא: ערך מטרה זמני בהיפוגליקמיה</string>
-    <string name="hypott_whenhypott">מהי הסיבה העיקרית להגדרת ערך \"ערך מטרה זמני בהיפו\" ?</string>
-    <string name="hypott_goinglow">כדי למנוע מרמת הסוכר מלרדת נמוך אם יש כבר מינון בזאלי זמני אפס.</string>
-    <string name="hypott_preventoversmb">כדי למנוע מ-AAPS להזריק יותר מדי אינסולין לאחר עלייה ברמת הגלוקוז כתוצאה מפחמימות פשוטות שנאכלו כטיפול בהיפו.</string>
+    <string name="dia_meaningisequaltodiapump">אם ערך ה- DIA אותו קבעתם במשאבה לפני המעבר ל- AndroidAPS עבד היטב, אפשר להמשיך להשתמש באותו ערך עם הלולאה.</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">ניתן להשתמש ב-Nightscout אך לא ניתן להגדירו.</string>
+    <string name="offlineprofile_label">פרופיל לא מקוון</string>
+    <string name="offlineprofile_nsprofile">ניתן להשתמש בנייטסקאוט אך לא ניתן להגדירו.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">נושא: התנתקות מהמשאבה</string>
-    <string name="pumpdisconnect_letknow">לחצו \"ניתוק משאבה\" כדי ש-AAPS יידע שלא יינתן איסולין.</string>
-    <string name="pumpdisconnect_suspend">לחצו \"השהיית לולאה\" כדי ש-AAPS יעצור את הלולאה בזמן שהמשאבה מנותקת.</string>
-    <string name="pumpdisconnect_dontchnage">לא לשנות דבר ב-AAPS, רק לנתק את המשאבה.</string>
+    <string name="pumpdisconnect_label">סיבות להפעלת מצב \"ניתוק משאבה\" ב- AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">מה צריך לעשות כשמנתקים את המשאבה?</string>
+    <string name="pumpdisconnect_unnecessary">זה לא הכרחי הואיל ולא יוזרם אינסולין אם המשאבה מנותקת פיזית.</string>
+    <string name="pumpdisconnect_missinginsulin">כדי למנוע מ- AndoirdAPS לקחת בחשבון אינסולין שלא הוזרם בעת שהמשאבה היתה מנותקת</string>
+    <string name="pumpdisconnect_notstop">זה לא יגרום להפסקת הזרמת האינסולין כל עוד המשאבה מחוברת.</string>
+    <string name="pumpdisconnect_openloop">זה יעביר את AndoirdAPS למצב לולאה פתוחה.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">נושא: הגדרות AndroidAPS</string>
-    <string name="objectives_howtosave">מהן שיטות העבודה המומלצות לגיבוי ההגדרות שלכם?</string>
-    <string name="objectives_exportsettings">ייצוא ההגדרות בתפריט התחזוקה אל מכשירכם.</string>
-    <string name="objectives_storeelsewhere">גיבוי הקובץ המיוצא למקום נוסף כמו דוא\"ל, דרופבוקס, גוגל דרייב…</string>
-    <string name="objectives_doexportonstart">ייצוא ההגדרות מיד לאחר התקנת AAPS.</string>
-    <string name="objectives_doexportafterchange">ייצוא לאחר שינוי בהגדרות.</string>
-    <string name="objectives_doexportafterobjective">ייצוא ההגדרות לאחר סיום משימה.</string>
-    <string name="objectives_doexportafterfirtssettings">ייצוא לאחר סיום ההגדרה הראשונית.</string>
+    <string name="objectives_label">הגדרות AndoirdAPS</string>
+    <string name="objectives2_label">הגדרות AndroidAPS</string>
+    <string name="objectives_howtosave">מהן הפעולות המומלצות לצורך גיבוי ההגדרות שלכם?</string>
+    <string name="objectives_notesettings">אין צורך לייצא את ההגדרות שלכם בהנחה שרשמתם אותן בצורה כלשהי.</string>
+    <string name="objectives_afterobjective">יצאו את ההגדרות שלכם אחרי השלמת משימה (Objective).</string>
+    <string name="objectives_afterchange">יצאו את ההגדרות שלכם אחרי כל שינוי שבצעתם בהן.</string>
+    <string name="objectives_afterinitialsetup">יצאו את ההגדרות שלכם לאחר סיום ההתקנה הראשונית וקביעת ההגדרות.</string>
+    <string name="objectives2_maintenance">יצאו את ההגדרות ליעד מקומי באמצעות תפריט התחזוקה.</string>
+    <string name="objectives2_internalstorage">קובץ ההגדרות שלכם נמצא בתיקיה Internal Storage/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">נושא: קריאות סנסור לא יציבות</string>
+    <string name="noisycgm_label">נתוני הסנסור אינם יציבים.</string>
     <string name="noisycgm_whattodo">מה לעשות אם נתוני הסנסור לא יציבים?</string>
-    <string name="nothing">שום דבר. AAPS יטפל בזה בעצמו.</string>
-    <string name="noisycgm_pause">להשבית את הלולאה כדי למנוע מינון יתר.</string>
-    <string name="noisycgm_replacesensor">להחליף את הסנסור.</string>
-    <string name="noisycgm_turnoffphone">כבה את הטלפון.</string>
+    <string name="noisycgm_nothing">אין צורך לעשות כלום - AndroidAPS יטפל בכך.</string>
+    <string name="noisycgm_pause">הפסיקו את הלולאה כדי למנוע מינון איסולין גבוה מדי \ נמוך מדי.</string>
+    <string name="noisycgm_replacesensor">יש להחליף סנסור שבאופן קבוע מספק נתוני רועשים ו/או לא מדויקים.</string>
+    <string name="noisycgm_checksmoothing">יש לוודא שיישום הסנסור מספק נתונים איכותיים ו- \"חלקים\".</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">לוודא שאפליקציית הסנסור מתקנת את נתוני הקריאה.</string>
-    <string name="exercise_label">נושא: התעמלות</string>
-    <string name="exercise_whattodo">איך עוזרים למערכת להתמודד עם התעמלות?</string>
-    <string name="exercise_setactivitytt">שימוש בפונקציית ערך מטרה זמני.</string>
-    <string name="exercise_switchprofilebelow100">בחירת פרופיל עם אחוז נמוך מ-100%.</string>
-    <string name="exercise_switchprofileabove100">בחירת פרופיל עם אחוז גבוה מ-100%.</string>
-    <string name="exercise_stoploop">הפסק את הלולאה.</string>
-    <string name="exercise_doitbeforestart">הגדרת ערך מטרה של התעמלות לפני תחילת האימון.</string>
-    <string name="exercise_afterstart">הגדרת ערך מטרה של התעמלות אחרי תחילת האימון מובילה לתוצאות טובות פחות מאשר הגדרה לפני תחילת אימון.</string>
+    <string name="exerciseprofile_label">פעילות גופנית ופרופילים</string>
+    <string name="exerciseprofile_whattodo">איך השימוש בפרופילים יכול לסייע למערכת להתמודד בצורה הטובה ביותר עם פעילות גופנית?</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">איך ניתן להשתמש בערכי מטרה זמניים כדי לסייע למערכת להתמודד בצורה הטובה ביותר עם פעילות גופנית?</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_label">השבתת / השהיית לולאה</string>
     <string name="suspendloop_doigetinsulin">האם אני מקבל\ת אינסולין כאשר הלולאה מושבתת/מושהית?</string>
     <string name="suspendloop_yes">כן, אינסולין בזאלי ממשיך להינתן.</string>
     <string name="suspendloop_no">לא, אספקת האינסולין נפסקת.</string>
-    <string name="basaltest_label">נושא: מדידת בזאלי, יחס תיקון ויחס פחמימות</string>
-    <string name="basaltest_when">מתי עלי לאמת את ערכי הבזאלי ואת יחסי התיקון והפחמימות?</string>
+    <string name="basaltest_label">מינון באזלי, יחס תיקון, ויחס פחמימות.</string>
+    <string name="basaltest_when">מתי יש לאמת את הערכים האלה?</string>
     <string name="basaltest_beforeloop">לפני שאני מתחיל\ה לולאה.</string>
-    <string name="basaltest_havingregularhypo">כאשר יש היפוגליקמיה לעיתים קרובות.</string>
-    <string name="basaltest_havingregularhyper">כאשר יש היפרגליקמיה לעיתים קרובות.</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">מה אני צריך\ה?</string>
-    <string name="prerequisites_determinedcorrectprofile">הגדרת פרופיל אישי (מינון בזאלי-Basal, יחס אינסולין\פחמימה- IC, פקטור תיקון-ISF, משך פעילות אינסולין-DIA).</string>
-    <string name="prerequisites_computer">מחשב ליצירת קובץ ה-APK.</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_car">מכונית.</string>
-    <string name="prerequisites_nightscout">Nightscout לצורך הגדרת ערכים.</string>
+    <string name="prerequisites_pump">משאבת אינסולין מתאימה אם אתם מתכננים להפעיל לולאה סגורה.</string>
+    <string name="prerequisites_nightscout">נייטסקאוט, כדי לשמור יומן של כל הנתונים וסקירה של ההגדרות.</string>
     <string name="prerequisites_tidepoolaccount">חשבון Tidepool.</string>
     <string name="prerequisites_googleaccount">חשבון Google.</string>
     <string name="prerequisites_githubaccount">חשבון Github.</string>
-    <string name="prerequisites_beanandroiddeveloper">ניסיון בפיתוח אנדרואיד.</string>
+    <string name="prerequisites_beanandroiddeveloper">ניסיון בתכנות או בעריכת קוד.</string>
     <string name="prerequisites_own670g">משאבת מנימד 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">סנסור נתמך.</string>
-    <string name="update_label">נושא: עדכון AndroidAPS</string>
-    <string name="whatistrue">מה נכון?</string>
-    <string name="update_git">על Git להיות מותקן.</string>
-    <string name="update_asap">עדכנו כשיש גרסה חדשה ועשו זאת כשיש לכם זמן.</string>
-    <string name="update_keys">השתמשו באותם מפתחות חתימה.</string>
+    <string name="prerequisites2_label">דרישות מקדימות</string>
+    <string name="prerequisites2_what">מה חיוני להגדרה ולשימוש ב-AndroidAPS?</string>
+    <string name="prerequisites2_profile">מידע מאומת כדי להגדיר פרופיל (יחסי תיקון, יחסי פחמימות, מינונים בזאליים, משך פעילות האינסולין וכו\').</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">עליכם לשמור ולציין את מיקום ה-Keystore שלכם ולהשתמש באותו מפתח חתימה בעדכונים בו השתמשתם להתקנה הקודמת שלכם.</string>
     <string name="update_neverupdate">לעולם לא לעדכן את האפליקציה אם היא פועלת כראוי.</string>
-    <string name="update_askfriend">בקשו עזרה מחבר להשגת קובץ ה-APK החדש.</string>
+    <string name="update_askfriend">אם נתקלתם בקושי בבנייה של ה-APK, אתם יכולים להתקין APK שנבנה על ידי חבר.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">נושא: פתרון בעיות</string>
-    <string name="troubleshooting_wheretoask">איפה לחפש עזרה?</string>
-    <string name="troubleshooting_fb">הצטרפו לקבוצת AndroidAPS בפייסבוק.</string>
-    <string name="troubleshooting_wiki">קראו את הוראות AndroidAPS.</string>
-    <string name="troubleshooting_gitter">בקרו בחדר ה-Gitter של AndroidAPS.</string>
-    <string name="troubleshooting_googlesupport">בקשו תמיכה ל-AndroidAPS ב-Google</string>
-    <string name="troubleshooting_yourendo">דברו עם האנדוקרינולוג שלכם.</string>
+    <string name="troubleshooting_label">פתרון תקלות</string>
+    <string name="troubleshooting_wheretoask">איפה אפשר לחפש עזרה עם AndroidAPS?</string>
+    <string name="troubleshooting_fb">אפשר לבקש עצות בקבוצת הפייסבוק \"AndroidAPS Users\" (אנגלית).</string>
+    <string name="troubleshooting_wiki">צריך לקרוא (ולקרוא מחדש) את מסמכי AndroidAPS.</string>
+    <string name="troubleshooting_gitter">תוכלו לבקש עצות ולרשום בעיות טכניות או בעיות בחדר ה-Gitter של AndroidAPS.</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">באיזה סוג של אינסולין מתאים לתוסף \"Ultra-Rapid-Oref\"?</string>
+    <string name="insulin_label">תוספי אינסולין</string>
+    <string name="insulin_ultrarapid">באיזה אינסולין להשתמש עם תוסף האולטרה מהיר?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin 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_label">תוספי רגישות</string>
+    <string name="sensitivity_which">בחרו את כל ההיגדים הנכונים.</string>
+    <string name="sensitivity_adjust">תוספי רגישות מאפשרים ל-AndroidAPS לפצות על שינויים זמניים או קצרים ברגישות לאינסולין (לדוגמה משינויים הורמונליים או בעיות עם קליטה באתר העירוי).</string>
+    <string name="sensitivity_edit">תוספי רגישות מספקים למשתמש הצעות לשינויים למינוני הבזאלי, יחסי התיקון והפחמימות, שאיתם ניתן לערוך את הפרופיל.</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="sensitivityuam_which">באיזה תוסף רגישות חייבים להתשמש כדי לאפשר את פונקציית \"ארוחות לא מוכרזות\" (UAM)?</string>
-    <string name="wrongcarbs_label">נושא: שגיאות רישום פחמימות</string>
+    <string name="wrongcarbs_label">שגיאות רישום פחמימות</string>
     <string name="wrongcarbs_whattodo">מה לעשות אם טעית ברישום הפחמימות?</string>
-    <string name="wrongcarbs_treatmentstab">ב\"טיפולים\", מחקו את רשומת הפחימות השגויה. רשמו פחמימות מחדש.</string>
-    <string name="wrongcarbs_addfakeinsulin">הזרקת אינסולין מדומה באמצעות הפונקציה \"מילוי חדש\"</string>
-    <string name="extendedcarbs_label">נושא: מזון עם שומן וחלבון</string>
-    <string name="extendedcarbs_handling">מה לעשות אם האוכל שלך מכיל כמות גדולה של שומן ו\או חלבונים?</string>
-    <string name="extendedcarbs_useextendedcarbs">לחשב מחדש שומן וחלבונים כפחמימות והשתמש בפונקציית \"פחמימות ממושכות\".</string>
-    <string name="extendedcarbs_add">חשב מחדש את השומן והחלבונים כפחמימות והוסף לבולוס.</string>
-    <string name="extendedcarbs_useextendedbolus">השתמש בבולוס ממושך לכיסוי שומן וחלבונים.</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">מחקו את נתוני האינסולין מפורטל הטיפולים של נייטסקאוט כדי לסלק אותו מהיסטוריית המשאבה.</string>
+    <string name="wronginsulin_compare">השווה ערכים ב-AndroidAPS ובהיסטוריית משאבה.</string>
+    <string name="wronginsulin_prime">מזריקים בולוס על חלק מהאינסולין המחושב \"שחסר\" עם מזרק\עט או באמצעות תיחול (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">אינסולין פעיל שלילי בתקופה משמעותית בה לא נעשית פעילות מצביעה על כך שהפרופיל הוא חזק מדי, נדרש פחות אינסולין ויש להגדיר זאת בהגדרות.</string>
+    <string name="iob_posiob">אינסולין פעיל חיובי עבור תקופה משמעותית מצביעה על תנגודת לאינסולין או על ארוחות שלא הוכרזו.</string>
+    <string name="breadgrams_label">רישום פחמימות ובולוסים</string>
+    <string name="breadgrams_grams">יש להשתמש אך ורק בגרמים להערכה ורישום צריכת הפחמימות.</string>
+    <string name="breadgrams_exchange">ניתן לתעד צריכת פחמימות באמצעות מערכת המרה מתאימה (לדוגמה, המרות DAFNE \"CHO\", מערכת המרת \"יחידות לחם\" אירופאית).</string>
+    <string name="breadgrams_decay">AndroidAPS משתמש במודל דינאמי כדי להעריך את דעיכת הפחמימות ולחשב פחמימות פעילות.</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">איך אפשר לפקח על AAPS של הילד שלך מרחוק?</string>
-    <string name="nsclient_nightscout">באמצעות אתר Nightscout.</string>
-    <string name="nsclient_dexcomfollow">Dexcom Follow במקרה ומשתמשים באפליקציית Dexcom המקורית (לערכי סוכר בלבד).</string>
-    <string name="nsclient_dexcomfollowxdrip">שימוש ב-Dexcom Follow אם משתמשים באפליקציית xDrip.</string>
-    <string name="nsclient_xdripfollower">xDrip פועל במצב עוקב.</string>
-    <string name="nsclient_looponiphone">אפליקציית Loop על iPhone.</string>
-    <string name="nsclient_spikeiphone">אפליקציית Spike על iPhone.</string>
+    <string name="nsclient_label">ניטור מרוחק</string>
+    <string name="nsclient_howcanyou">איך לפקח על AndroidAPS (למשל של הילד שלכם) מרחוק?</string>
+    <string name="nsclient_nightscout">אפלקציית NS Client, אפליקציית נייטסקאוט ואתר נייטסקאוט מאפשרים כולם לעקוב אחר AndroidAPS מרחוק.</string>
+    <string name="nsclient_dexcomfollow">אפליקציות אחרות(לדוגמה, דקסקום Follow ו-xDrip במצב מעקב) מאפשרים לכם לעקוב אחר פרמטרים מסוימים (לדוגמה, ערכי סוכר) מרחוק, אך משתמשים באלגוריתמים שונים, כך עשויים להציג ערכי אינסולין ופחמימות פעילים לא מדויקים.</string>
+    <string name="nsclient_data">כדי לעקוב אחר AndroidAPS מרחוק, שני ההתקנים חייבים להיות בעלי גישה לאינטרנט (למשל באמצעות רשת אינטרנט אלחוטית או אינטרנט סלולרי).</string>
+    <string name="nsclient_fullcontrol">NS Client משמש כעוקב מרוחק יאפשר ניטור ויספק שליטה מלאה ב-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">פקטור תיקון גבוה גורם להזרקה של פחות אינסולין בעת תיקון ערכי סוכר גבוהים</string>
-    <string name="isf_decreasingvalue">פקטור תיקון נמוך גורם להזרקה של פחות אינסולין בעת תיקון ערכי סוכר גבוהים.</string>
-    <string name="isf_noeffect">שינוי פקטור תיקון אינו משפיע על כמות האינסולין שמוזרקת כאשר AAPS מתקן את ערכי הסוכר הגבוהים.</string>
-    <string name="isf_preferences">עליכם לציין את פקטור התיקון (ISF) בהעדפות.</string>
+    <string name="isf_label_exam">יחס התיקון (ISF) </string>
+    <string name="isf_increasingvalue">עלייה בערך יחס התיקון תביא למתן יותר אינסולין לכיסוי כמות נתונה של פחמימות.</string>
+    <string name="isf_decreasingvalue">הפחתת ערך יחס התיקון (ISF) מובילים למתן יותר אינסולין כדי לתקן רמת סוכר שמעל ערך המטרה.</string>
+    <string name="isf_noeffect">העלאת או הורדת יחס התיקון (ISF) אינו משפיע על מינון האינסולין כאשר רמות הגלוקוז בדם הן מתחת לערך המטרה.</string>
+    <string name="isf_preferences">יש להזין את יחס התיקון בהעדפות ב-AndroidAPS.</string>
     <string name="isf_profile">שינוי ערך ISF בפרופיל שלכם מספיק כדי להחיל את השינוי.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">נושא: יחס אינסולין פחמימה (IC)</string>
-    <string name="ic_increasingvalue">יחס אינסולין פחמימה גבוה גורם להזרקת פחות אינסולין עבור כל פחמימה.</string>
-    <string name="ic_decreasingvalue">יחס אינסולין פחמימה נמוך גורם להזרקת פחות אינסולין עבור כל פחמימה.</string>
+    <string name="ic_multiple">ניתן להשתמש ביותר מערך אחד ליחס הפחמימות בפרופיל שלכם.</string>
+    <string name="ic_isf">אם משנים את יחס התיקון בפרופיל, חייבים לשנות גם את יחס הפחמימות.</string>
+    <string name="ic_label_exam">יחס אינסולין לפחמימות (יחס הפחמימות, I:C)</string>
+    <string name="ic_increasingvalue">יחס פחמימות גבוה גורם להזרקת פחות אינסולין עבור כל פחמימה.</string>
+    <string name="ic_decreasingvalue">יחס פחמימות נמוך גורם להזרקת פחות אינסולין עבור כל פחמימה.</string>
     <string name="ic_noeffect">כאשר יש 0 פחמ\', שינוי יחס הפחמימות (IC) יוביל למינון שונה של אינסולין כדי לתקן ערך סוכר נתון.</string>
     <string name="ic_different">יחס הפחמימות (IC) יהיה שונה אם ערך יחידת לחם ייספר כ-10 או 12 גר\'.</string>
     <string name="ic_meaning">יחס הפחמימות (IC) הוא: כמה יחידות לחם מכוסות ע\"י יחידת אינסולין אחת.</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_basalhigher">הבזאלי יהיה גבוה ב-10%.</string>
-    <string name="profileswitch_basallower">הבזאלי יהיה נמוך ב-10%.</string>
-    <string name="profileswitch_ichigher">ערך יחס אינסולין פחמימה (IC) יהיה גבוה ב-10%.</string>
-    <string name="profileswitch_iclower">ערך יחס אינסולין פחמימה (IC) יהיה נמוך ב-10%.</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_isflower">ערך פקטור התיקון (ISF) יהיה נמוך ב-10%.</string>
-    <string name="profileswitch_overall">תקבלו בערך 10% פחות אינסולין.</string>
-    <string name="profileswitch_targethigher">ערך המטרה יהיה גבוה ב-10%.</string>
-    <string name="profileswitch_targetlower">ערך המטרה יהיה נמוך ב-10%.</string>
-    <string name="profileswitch_targetbottom">רק ערך המטרה התחתון יהיה נמוך ב-10%.</string>
+    <string name="profileswitch_iclower">ערך יחס הפחמימות יהיה נמוך ב-10%.</string>
+    <string name="profileswitch_unchanged">ערכי יחס התיקון ויחס הפחמימות לא ישתנו.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">איך תעדכן את AAPS אם קמת שעה מוקדם?</string>
-    <string name="profileswitchtime_1">אפעיל מצב פרופיל זמני עם היסט זמן של 1+</string>
-    <string name="profileswitchtime__1">אפעיל מצב פרופיל זמני עם היסט זמן של 1-</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">אם קמים שעתיים מוקדם מהרגיל, איך צריך להודיע ל-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=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">אפעיל מצב פרופיל זמני עם היסט זמן של 60+</string>
-    <string name="profileswitchtime__60">אפעיל מצב פרופיל זמני עם היסט זמן של 60-</string>
+    <string name="profileswitch4_label">שינויים בפרופילים</string>
+    <string name="profileswitch4_rates">על המינונים בזאליים, יחס התיקון, יחס הפחמימות וכו\' להיות מוגדרים בפרופילים.</string>
+    <string name="profileswitch4_internet">הפעלת שינויים בפרופיל הנייטסקאוט שלכם דורשת שהמכשיר עליו 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_label">נושא: עזרה עם מינונים בזאליים</string>
     <string name="basalhelp_where">היכן ניתן לקבל עזרה בנושא מינון בזאלי וכו\'.</string>
     <string name="basalhelp_diabetesteam">צוות הסוכרת שלכם</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">תרופה אחרת</string>
-    <string name="other_medication_text">AAPS מוריד את הבזאלי כדי להעלות את רמת הגלוקוז בדם. תרופות מקבוצת מעכבי SGLT2 (גליפלוזינים) יכולים למנוע עלייה צפויה בסוכר וייתכן שייצרו חסר אינסולין מסוכן (DKA).
+    <string name="other_medication_label">תרופות אחרות. אנא קראו את ההצהרה להלן ולאחר מכן סמנו את התיבה כדי לקבל את ההצהרה.</string>
+    <string name="other_medication_text">AAPS מוריד את המינון הבזאלי כדי להעלות את רמת הגלוקוז בדם. תרופות מקבוצת מעכבי SGLT2 (גליפלוזינים) יכולים למנוע עלייה צפויה בסוכר וייתכן שייצרו חסר אינסולין מסוכן (DKA).
 \nשמותיהם המסחריים מוכרים הם: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nאני מתחייב\ת שלא לקחת את התרופות הללו תוך שימוש ב-AAPS או שלא אאפשר את הלולאה לפני לקיחת התרופות הנ\"ל.</string>
 </resources>

app/src/main/res/values-iw-rIL/insight_exceptions.xml

@@ -2,7 +2,7 @@
 <resources>
     <string name="connection_failed">החיבור נכשל</string>
     <string name="connection_lost">החיבור נותק</string>
-    <string name="pairing_rejected">התחברות נדחתה</string>
+    <string name="pairing_rejected">הצימוד נדחה</string>
     <string name="socket_creation_failed">יצירת סוקט נכשלה</string>
     <string name="timeout">פג הזמן</string>
     <string name="maximum_number_of_bolus_type_already_running">מספר מרבי של סוגי בולוס מופעל</string>

app/src/main/res/values-iw-rIL/objectives.xml

@@ -40,7 +40,7 @@
     <string name="codeaccepted">קוד אושר</string>
     <string name="codeinvalid">קוד בלתי חוקי</string>
     <string name="objectives_exam_objective">הוכח את הידע שלך</string>
-    <string name="objectives_exam_gate">למדו וענו נכונה על שאלות</string>
+    <string name="objectives_exam_gate">למדו את השאלות.  ניתנות לכם ארבע תשובות אפשריות לכל שאלה. ייתכן שיש יותר מתשובה נכונה אחת. בחרו את כל התשובות הנכונות ובחרו אישור.</string>
     <string name="answerdisabledto">השבת תשובה מושבתת עד: %1$s</string>
     <string name="wronganswer">תשובה שגויה!</string>
     <string name="unfinshed_button">הבא שלא נעשה</string>

app/src/main/res/values-iw-rIL/strings.xml

@@ -7,6 +7,7 @@
     <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>
@@ -28,14 +29,14 @@
     <string name="description_ama">מצב האלגוריתם ב-2017</string>
     <string name="description_smb">האלגוריתם העדכני ביותר, עבור משתמשים מתקדמים בלבד</string>
     <string name="description_overview">מציג את המצב הנוכחי של הלולאה, ולחצני פעולות שימושיות</string>
-    <string name="description_persistent_notification">מציג הודעה קבועה עם סקירה קצרה של מה שהלולאה שלך עושה</string>
+    <string name="description_persistent_notification">מציג הודעה קבועה עם סקירה קצרה של מה שהלולאה שלכם עושה</string>
     <string name="description_profile_local">הגדירו פרופיל שזמין באופן לא מקוון.</string>
     <string name="description_profile_nightscout">יבא פרופיל מ- Nightscout</string>
-    <string name="description_pump_combo">חיבור משאבת Accu-Chek Combo מחייב התקנת ruffy</string>
+    <string name="description_pump_combo">חיבור משאבת Accu-Chek Combo, מחייב התקנת ruffy</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_oref1">הרגישות מחושבת מנתונים מ-8 או 24 השעות האחרונות (הרגישות הנמוכה מביניהם). הפחמימות (אם לא נספגו) מפסיקות להיחשב לאחר משך זמן שהוגדר בהגדרות. תוסף זה מחשב גם ארוחות לא ידועות מראש (UAM).</string>
     <string name="description_sensitivity_weighted_average">הרגישות מחושבת כממוצע משוקלל מערכי הסטיות. ערכי סטיות חדשים יותר יזכו לשקלול גבוה יותר. ספיגת הפחמימות המינימלית מחושבת על בסיס נתון משך ספיגת פחמימות מקסימלי מההגדרות. אלגוריתם זה הוא המהיר ביותר במעקב אחר שינויי רגישות.</string>
     <string name="description_source_eversense">קבלת ערכי רמת סוכר מאפליקצית Eversense עם פאץ\'.</string>
     <string name="description_source_glimp">קבלת ערכי סוכר בדם מ-Glimp.</string>
@@ -287,9 +288,9 @@
     <string name="ns_upload_only">העלאה ל-nightscout בלבד (סנכרון מבוטל)</string>
     <string name="ns_upload_only_summary">העלאה ל- NS בלבד. ללא השפעה על SGV אלא אם נבחר מקור מקומי כגון Xdrip. ללא השפעה על הפרופילים כל עוד פרופיל NS בשימוש.</string>
     <string name="pumpNotInitialized">משאבה לא הופעלה!</string>
-    <string name="primefill">הפעלה/מילוי</string>
+    <string name="primefill">תיחול\מילוי</string>
     <string name="fillwarning">נא ודאו שהכמות מתאימה למפרט ערכת העירוי שלכם!</string>
-    <string name="fillbolus_title">מילוי\מילוי מראש כמויות סטנדרטיות של אינסולין</string>
+    <string name="fillbolus_title">מילוי\תיחול כמויות סטנדרטיות של אינסולין</string>
     <string name="button1">כפתור 1</string>
     <string name="button2">כפתור 2</string>
     <string name="button3">כפתור 3</string>
@@ -405,11 +406,18 @@
     <string name="suspendloopfor3h">השהה לולאה ל-3 שע\'</string>
     <string name="suspendloopfor10h">השהה לולאה ל-10 שע\'</string>
     <string name="suspendloopforXmin">השהה לולאה ל-%1$d דקות</string>
+    <string name="disconnectpump">ניתוק משאבה</string>
     <string name="disconnectpumpfor15m">נתק את המשאבה למשך 15 דקות</string>
     <string name="disconnectpumpfor30m">נתק את המשאבה למשך 30 דקות</string>
     <string name="disconnectpumpfor1h">נתק את המשאבה למשך שעה</string>
     <string name="disconnectpumpfor2h">נתק את המשאבה למשך שעתיים</string>
     <string name="disconnectpumpfor3h">נתק את המשאבה למשך שלוש שעות</string>
+    <string name="duration15m">15 דקות</string>
+    <string name="duration30m">30 דקות</string>
+    <string name="duration1h">שעה אחת</string>
+    <string name="duration2h">שעתיים</string>
+    <string name="duration3h">3 שעות</string>
+    <string name="duration10h">10 שעות</string>
     <string name="resume">חידוש</string>
     <string name="reconnect">חיבור משאבה מחדש</string>
     <string name="smscommunicator_wrongduration">משך שגוי</string>
@@ -543,7 +551,7 @@
     <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="urgent_alarm">התראה דחופה</string>
     <string name="info">מידע</string>
     <string name="eversense">אפליקלציית Eversense (עם פאץ\')</string>
     <string name="dexcomg5_nsupload_title">טעינת נתוני סוכר ל-Nightscout</string>
@@ -564,8 +572,6 @@
     <string name="overview_editquickwizard_usebasaliob">חישוב IOB של בזאלי</string>
     <string name="overview_editquickwizard_usetrend">חישוב מגמה</string>
     <string name="overview_editquickwizard_usesuperbolus">חישוב סופר בולוס</string>
-    <string name="yes">כן</string>
-    <string name="no">לא</string>
     <string name="positiveonly">חיובי בלבד</string>
     <string name="negativeonly">שלילי בלבד</string>
     <string name="overview_editquickwizard_usecob">חישוב פחמ\' פעילות</string>
@@ -612,8 +618,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">לא נותר מספיק אינסולין במיכל בשביל להשלים את הבולוס</string>
     <string name="extendedbolusdeliveryerror">שגיאה במתן הבולוס הממושך</string>
     <string name="insightpump_shortname">Insight</string>
-    <string name="set_neutral_temps_title">הגדרת קצב בזאלי ניטרלי</string>
-    <string name="set_neutral_temps_summary">אם תופעל, היא תבטל בזאלי זמני לפני תום כל שעה. שיטה זו יכולה לעזור לבטל ציפצופים ורטט רבים בחלק מהמשאבות.</string>
     <string name="enablesmbalways">הפעלת SMB תמיד</string>
     <string name="enablesmbalways_summary">אפשר SMB תמיד באופן עצמאי מבולוסים. אפשרי רק עם מקור ערכי סוכר עם דיוק של נתונים כמו G5</string>
     <string name="enablesmbaftercarbs">הפעלת SMB אחרי פחמימות</string>
@@ -762,8 +766,8 @@
     <string name="diawarning">חשוב לזכור: פרופילי אינסולין חדשים דורשים משך פעילות אינסולין (DIA) של 5 ש\' לפחות. ערך של 5-6 ש\' בפרופיל חדש שווה לערך של 3 ש\' בפרופילים ישנים.</string>
     <string name="setupwizard_profile_description">נא לבחור מקור פרופיל. אם המטופל הוא ילד כדאי להשתמש בפרופיל NS. אם אף אחד לא עוקב אחרייך ב-Nightscout כנראה שתעדיף פרופיל מקומי. יש זכור כי אתם בוחרים רק את מקור הפרופיל. כדי להשתמש בו יש להפעילו הפעלת \"החלפת פרופיל\"</string>
     <string name="setupwizard_aps_description">בחרו באחד מהאלגוריתמים הזמינים. הם ממוינים מהישן לחדש. אלגוריתם חדש יותר הוא בדרך כלל חזק ואגרסיבי יותר. לפיכך, אם אתם משתמשים חדשים רצוי שתתחילו עם AMA ולא עם האלגוריתם האחרון. נא לא לשכוח לקרוא את תיעוד OpenAPS ולהגדיר אותו כראוי לפני השימוש.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">ממתין לחיבור לריילילינק…\n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b>הערה:</b> ניתן להמשיך בהתקנה לאחר אתחול המשאבה.\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">הגדירו את תצורת הריילילינק מטה. לאחר שתבחרו באפשרות ריילילינק, ניתן יהיה להמשיך בהתקנה אחרי שסטטוס הריילילינק יהיה \"מחובר\". פעולה זו עשויה להימשך דקה.\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>
@@ -790,7 +794,6 @@
     <string name="sensitivity_raises_target_title">רגישות מעלה את ערך המטרה</string>
     <string name="sensitivity_raises_target_summary">כשמזוהה רגישות, הגדל את ערך המטרה של הגלוקוז</string>
     <string name="combo_invalid_setup">הגדרת משאבה לא חוקית, בדקו את הוראות ההפעלה וודאו שתפריט \'מידע מהיר\' נקרא בשם QUICK INFO באמצעות תוכנת התצורה 360.</string>
-    <string name="custom">מותאם אישית</string>
     <string name="careportal_removestartedevents">מחק אירועי \"AndroidAPS Started\"</string>
     <string name="storedsettingsfound">נמצאו הגדרות שמורות</string>
     <string name="allow_hardware_pump_text">שימו לב: אם אתם מפעילים ומתחברים למשאבה פיזית, AndroidAPS יעתיק את הפרופיל הבזאלי אל המשאבה תוך דריסת הפרופיל שכבר שמור על המשאבה. יש שההגדרות הבזאליות שב-AndroidAPS נכונות. אם אינכם בטוחים או אינכם רוצים לשנות את הגדרות הבזאליות שעל המשאבה, לחצו על \'ביטול\' וחזרו על תהליך המעבר אל המשאבה במועד מאוחר יותר.</string>
@@ -819,9 +822,9 @@
     <string name="loop_openmode_min_change">מינימום לבקשה לשינוי [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">\'לולאה פתוחה\' תציג בקשת שינוי חדשה רק אם השינוי גדול מערך זה ב-%. ערך ברירת המחדל הוא 20%</string>
     <string name="searching_for_devices">מחפש התקנים…</string>
-    <string name="pairing_completed">הזיווג הושלם</string>
+    <string name="pairing_completed">הצימוד הושלם</string>
     <string name="code_compare">האם הקודים המוצגים בהתקן זה ובמשאבה זהים?</string>
-    <string name="insight_pairing">זיווג Insight</string>
+    <string name="insight_pairing">צימוד Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
     <string name="insight_delivered">%1$.2f יח\' מתוך %2$.2f יח\' הוזרקו</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
@@ -853,8 +856,8 @@
     <string name="bluetooth_address">כתובת בלוטות\'</string>
     <string name="system_id_appendix">נספח זהות מערכת</string>
     <string name="manufacturing_date">תאריך ייצור</string>
-    <string name="delete_pairing">מחיקת זיווג</string>
-    <string name="pairing_information">פרטי זיווג</string>
+    <string name="delete_pairing">מחיקת צימוד</string>
+    <string name="pairing_information">פרטי צימוד</string>
     <string name="start_pump">הפעל משאבה</string>
     <string name="stop_pump">עצור משאבה</string>
     <string name="operating_mode">מצב פעולה</string>
@@ -863,7 +866,7 @@
     <string name="tdd_basal">מינון בזאלי יומי מצטבר</string>
     <string name="tdd_total">מינון יומי מצטבר כולל</string>
     <string name="recovering">משחזר</string>
-    <string name="not_paired">לא מזווג</string>
+    <string name="not_paired">לא מצומד</string>
     <string name="last_connected">התחברות אחרונה</string>
     <string name="started">החל</string>
     <string name="stopped">נעצר</string>
@@ -978,7 +981,9 @@
     <string name="description_source_dexcom">קבלת ערכי רמת סוכר מאפליקציית Dexcom עם פאץ\'.</string>
     <string name="notification">התראה</string>
     <string name="notification_message">התראה: %1$s</string>
+    <string name="alarm_message">התראה: %1$s</string>
     <string name="message_short">הודעה:</string>
+    <string name="alarm_short">התראה:</string>
     <string name="profilepercentage">אחוז הפרופיל</string>
     <string name="percent_u">אחוז [%]:</string>
     <string name="startprofile">הפעלת פרופיל %1$d%% במשך %2$d דק\'</string>
@@ -1180,4 +1185,15 @@
     <string name="filter">סינון</string>
     <string name="copytolocalprofile_invalid">לא ניתן ליצור פרופיל מקומי. הפרופיל אינו חוקי.</string>
     <string name="cta_dont_kill_my_app_info">לא להשבית את האפליקציה שלי?</string>
+    <string name="alarm">התראה</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">שולח SMS אם מופעל אירוע \"המשאבה אינה נגישה\"</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>
 </resources>

app/src/main/res/values-ko-rKR/exam.xml

@@ -1,162 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">DIA에 대하여 올바른 것은?</string>
-    <string name="dia_minimumis3h">최소값은 3시간입니다.</string>
-    <string name="dia_minimumis5h">최소값은 5시간입니다.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">당신이 사용중인 펌프의 DIA값과 동일합니다.</string>
-    <string name="dia_valuemustbedetermined">당신이 값을 결정해야합니다(최소 5시간 이상)</string>
-    <string name="hypott_label">주제: 저혈당 임시 목표</string>
-    <string name="hypott_whenhypott">저혈당 임시 목표를 설정하는 주된 이유가 무엇입니까?</string>
-    <string name="hypott_goinglow">임시 Basal이 0일 경우 저혈당을 방지하기 위해서.</string>
-    <string name="hypott_preventoversmb">저혈당때문에 섭취한 탄수화물로 인해 급격하게 혈당이 올라간 후 AAPS가 인슐린을 너무 많이 주입하는 것을 방지하기 위해서.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/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/CROWDIN/ko/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">주제: 펌프 일시중지하기</string>
-    <string name="pumpdisconnect_letknow">인슐린이 주입되지 않을것이라는 것을 AAPS가 인지하도록 \'펌프 일시중지\'를 누릅니다.</string>
-    <string name="pumpdisconnect_suspend">펌프가 일시중지되는 동안 \'Loop 일시중지\'를 눌러서 Loop를 중지합니다.</string>
-    <string name="pumpdisconnect_dontchnage">AAPS에선 아무 작업도 하지 않고, 그냥 펌프와 연결을 해제합니다.</string>
+    <string name="pumpdisconnect_whattodo">펌프 일시중지할땐 무엇을 해야합니까?</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">주제: AndroidAPS 설정</string>
-    <string name="objectives_howtosave">다음중 당신의 AAPS 설정을 백업하기 위한 좋은 사례는 무엇입니까?</string>
-    <string name="objectives_exportsettings">정비 메뉴에서 설정 저장하기 합니다.</string>
-    <string name="objectives_storeelsewhere">저장된 설정파일을 이메일, 드롭박스, 구글드라이브 등에 저장한다…</string>
-    <string name="objectives_doexportonstart">AAPS 설치 후 바로 설정을 저장합니다.</string>
-    <string name="objectives_doexportafterchange">설정을 변경한 이후 바로 설정을 저장합니다.</string>
-    <string name="objectives_doexportafterobjective">목표수행을 완료한 후 설정을 저장합니다.</string>
-    <string name="objectives_doexportafterfirtssettings">초기 설정이 완료되면 설정을 저장합니다.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/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="nothing">아무것도 하지 않고, AAPS가 알아서 하게 내버려둔다.</string>
-    <string name="noisycgm_pause">과도한 주입을 방지하기 위해 Loop를 중지한다.</string>
-    <string name="noisycgm_replacesensor">CGM 센서를 교체한다.</string>
-    <string name="noisycgm_turnoffphone">폰을 끈다.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">CGM앱의 혈당 평활화 기능 작동 여부를 확인한다.</string>
-    <string name="exercise_label">주제: 운동</string>
-    <string name="exercise_whattodo">운동시 어떻게 하는 것이 도움이 됩니까?</string>
-    <string name="exercise_setactivitytt">임시 목표 기능 사용.</string>
-    <string name="exercise_switchprofilebelow100">100%이하로 프로파일을 변경합니다.</string>
-    <string name="exercise_switchprofileabove100">100%이상으로 프로파일을 변경합니다.</string>
-    <string name="exercise_stoploop">Loop를 중지합니다.</string>
-    <string name="exercise_doitbeforestart">운동 시작전 운동 임시목표를 설정합니다.</string>
-    <string name="exercise_afterstart">운동 시작 후 운동 임시목표를 설정하는 것은 운동 시작 전에 설정하는 것보다 나쁜 결과를 초래합니다.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">주제: Loop 중지/일시중지</string>
     <string name="suspendloop_doigetinsulin">Loop가 중지/일시중지 되었을때 인슐린이 주입됩니까?</string>
     <string name="suspendloop_yes">네, Basal 인슐린은 계속 주입됩니다.</string>
     <string name="suspendloop_no">아니오, 인슐린 주입이 모두 중지됩니다.</string>
-    <string name="basaltest_label">주제: Basal, ISF, and IC 테스트</string>
-    <string name="basaltest_when">Basal, ISF 그리고 IC 값은 언제 확인해야 합니까?</string>
-    <string name="basaltest_beforeloop">Loop를 시작하기 전.</string>
-    <string name="basaltest_havingregularhypo">저혈당 빈도가 많을 때</string>
-    <string name="basaltest_havingregularhyper">고혈당 빈도가 많을 때</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">주제: 사전 요구사항</string>
-    <string name="prerequisites_what">필요한 것이 무엇입니까?</string>
     <string name="prerequisites_determinedcorrectprofile">유효한 프로파일 정보 (Basal, IC, ISF, DIA).</string>
-    <string name="prerequisites_computer">APK파일을 빌드하기 위한 컴퓨터.</string>
     <string name="prerequisites_phone">지원되는 폰.</string>
-    <string name="prerequisites_car">자동차.</string>
-    <string name="prerequisites_nightscout">목표수행하기 위해 필요한 Nightscout.</string>
     <string name="prerequisites_tidepoolaccount">Tidepool 계정.</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/CROWDIN/ko/Module/module.html</string>
     <string name="prerequisites_smartwatch">스마트워치.</string>
     <string name="prerequisites_supportedcgm">지원되는 연속혈당측정기(CGM).</string>
-    <string name="update_label">주제: AndroidAPS 업데이트</string>
-    <string name="whatistrue">올바른 것을 선택하세요.</string>
-    <string name="update_git">Git이 설치되어 있어야 합니다.</string>
-    <string name="update_asap">신버전이 나온 후 시간이 되면 바로 업데이트 하세요.</string>
-    <string name="update_keys">동일한 signing keys를 사용하여야 합니다.</string>
     <string name="update_neverupdate">시스템이 잘 작동한다면 절대 업데이트하지마세요.</string>
-    <string name="update_askfriend">지인에게 신버전의 APK를 달라고 요청합니다.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">주제: 문제해결</string>
-    <string name="troubleshooting_wheretoask">어디에 도움을 요청해야 합니까?</string>
-    <string name="troubleshooting_fb">AndroidAPS 페이스북 그룹에 가입합니다.</string>
-    <string name="troubleshooting_wiki">AndroidAPS documentation을 읽어봅니다.</string>
-    <string name="troubleshooting_gitter">AndroidAPS Gitter Room을 방문합니다.</string>
-    <string name="troubleshooting_googlesupport">AndroidAPS Google support에 방문합니다.</string>
-    <string name="troubleshooting_yourendo">내분비과 의사와 상담해봅니다.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/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">노보래피드(NovoRapid®)</string>
     <string name="insulin_humalog">휴마로그(Humalog®)</string>
-    <string name="insulin_actrapid">액트라피드(Actrapid®)</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">주제: 민감도 플러그인</string>
-    <string name="sensitivity_which">어떤 민감도 알고리즘에 구성 가능한 시간 범위가 있습니까?</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">UAM기능(알려지지않은 탄수화물 인식 기능)을 사용하기 위해서 어떤 민감도 알고리즘을 사용해야합니까?</string>
-    <string name="wrongcarbs_label">주제: 탄수화물 입력 에러</string>
     <string name="wrongcarbs_whattodo">부적절한 탄수화물을 입력하였다면 어떻게 하여야 합니까?</string>
-    <string name="wrongcarbs_treatmentstab">관리에서, 부적절한 탄수화물 입력을 삭제하고, 새 탄수화물을 입력합니다.</string>
-    <string name="wrongcarbs_addfakeinsulin">채움 기능을 이용하여 거짓으로 인슐린을 추가합니다.</string>
-    <string name="extendedcarbs_label">주제: 지방과 단백질 음식</string>
-    <string name="extendedcarbs_handling">많은 양의 지방 그리고\/또는 단백질이 있는 음식을 섭취할땐 어떻게 합니까?</string>
-    <string name="extendedcarbs_useextendedcarbs">지방과 단백질을 탄수화물로 계산하고 \"확장 탄수화물\"기능을 사용합니다.</string>
-    <string name="extendedcarbs_add">지방과 단백질을 탄수화물로 계산하고 Bolus 계산에 추가합니다.</string>
-    <string name="extendedcarbs_useextendedbolus">지방과 단백질을 보완하기 위해서 확장 Bouls를 사용합니다.</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">주제: 원격 모니터링</string>
-    <string name="nsclient_howcanyou">당신의 아이의 AAPS를 어떻게 원격으로 모니터합니까?</string>
-    <string name="nsclient_nightscout">Nightscout 사이트를 이용합니다.</string>
-    <string name="nsclient_dexcomfollow">덱스콤 정식앱을 사용한다면 덱스콤 팔로우앱을 사용합니다(혈당만).</string>
-    <string name="nsclient_dexcomfollowxdrip">xDrip앱을 사용한다면 덱스콤 팔로우앱을 사용합니다.</string>
-    <string name="nsclient_xdripfollower">xDrip에서 팔로어 모드를 이용합니다.</string>
-    <string name="nsclient_looponiphone">아이폰에서 Loop앱을 이용합니다.</string>
-    <string name="nsclient_spikeiphone">아이폰에서 Spike앱을 이용합니다.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Children/Children.html</string>
-    <string name="isf_increasingvalue">높은 ISF 값은 AAPS가 고혈당을 잡으려고 할때 보다 적은 인슐린 주입을 하게끔 합니다.</string>
-    <string name="isf_decreasingvalue">낮은 ISF 값은 AAPS가 고혈당을 잡으려고 할때 보다 적은 인슐린 주입을 하게끔 합니다.</string>
-    <string name="isf_noeffect">ISF 값 변경은 AAPS가 고혈당을 잡으려고 할때의 인슐린양에 아무런 영향을 주지 않습니다.</string>
-    <string name="isf_preferences">설정에서 ISF 값을 입력해야합니다.</string>
     <string name="isf_profile">변경사항을 적용하는데 프로파일에서 ISF 값 변경하는 것으로 충분합니다.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html</string>
-    <string name="ic_increasingvalue">높은 IC 비율은 탄수화물 섭취시 인슐린이 보다 덜 주입되게 합니다.</string>
-    <string name="ic_decreasingvalue">낮은 IC 비율은 탄수화물 섭취시 인슐린이 보다 덜 주입되게 합니다.</string>
     <string name="ic_noeffect">COB가 0 인 경우 IC 비율을 변경하면 혈당을 교정하기 위해 다른 양의 인슐린이 주입됩니다.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/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_basalhigher">Basal이 10% 높아집니다.</string>
-    <string name="profileswitch_basallower">Basal이 10% 낮아집니다.</string>
-    <string name="profileswitch_ichigher">IC 값이 10% 높아집니다.</string>
-    <string name="profileswitch_iclower">IC 값이 10% 낮아집니다.</string>
-    <string name="profileswitch_isfhigher">ISF 값이 10% 높아집니다.</string>
-    <string name="profileswitch_isflower">ISF 값이 10% 낮아집니다.</string>
-    <string name="profileswitch_overall">전체적으로 약 10 % 더 적은 인슐린이 주입되게 됩니다.</string>
-    <string name="profileswitch_targethigher">목표가 10% 높아집니다.</string>
-    <string name="profileswitch_targetlower">목표가 10% 낮아집니다.</string>
-    <string name="profileswitch_targetbottom">하한 목표만 10% 낮아집니다.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">평소보다 1 시간 일찍 일어난 경우, AAPS에게 당신의 변경된 일정을 알리려면 어떻게 해야합니까?</string>
-    <string name="profileswitchtime_1">시간이동 1로 프로파일을 변경합니다.</string>
-    <string name="profileswitchtime__1">시간이동 -1로 프로파일을 변경합니다.</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">시간이동 60으로 프로파일을 변경합니다.</string>
-    <string name="profileswitchtime__60">시간이동 -60으로 프로파일을 변경합니다.</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
-    <string name="basalhelp_label">Topic: Basal 값에 대한 도움</string>
     <string name="basalhelp_where">Basal값 등과 관련된 도움을 어디서 받아야 하나요?</string>
     <string name="basalhelp_diabetesteam">의료진</string>
     <string name="basalhelp_google">구글(Google)</string>
     <string name="basalhelp_facebook">페이스북(Facebook)</string>
-    <string name="other_medication_label">기타 의약품</string>
-    <string name="other_medication_text">AAPS는 혈당을 올리기 위하여 Basal값을 내립니다. SGLT2 억제제(gliflozins) 계열의 의약품들은 예상되는 혈당 상승을 억제하여 인슐린 결핍 (케톤산증)을 유발할 수 있습니다.
-\n일반적인 브랜드명은 다음과 같습니다: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\n본인은 AAPS를 사용할 때 이러한 의약품을 복용하지 않거나 혹은 이러한 의약품을 복용하기 전에 Loop를 비활성화 할것임을 약속합니다.</string>
 </resources>

app/src/main/res/values-ko-rKR/objectives.xml

@@ -37,7 +37,6 @@
     <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>

app/src/main/res/values-ko-rKR/strings.xml

@@ -452,8 +452,6 @@
     <string name="overview_editquickwizard_usebasaliob">Basal IOB 계산</string>
     <string name="overview_editquickwizard_usetrend">추세계산</string>
     <string name="overview_editquickwizard_usesuperbolus">Superbolus 계산</string>
-    <string name="yes">네</string>
-    <string name="no">아니오</string>
     <string name="positiveonly">양수만</string>
     <string name="negativeonly">음수만</string>
     <string name="overview_editquickwizard_usecob">COB 계산</string>
@@ -659,7 +657,6 @@
     <string name="low_temptarget_lowers_sensitivity_title">낮은 임시목표는 민감도를 내립니다.</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[임시목표 100미만을 위해 민감도를 낮춥니다.]]></string>
     <string name="combo_invalid_setup">유효하지 않은 펌프 설정, 문서를 확인하고 360 구성 소프트웨어를 사용하여 Quick Info menu의 이름이 QUICK INFO인지 확인하십시오.</string>
-    <string name="custom">사용자 정의</string>
     <string name="careportal_removestartedevents">\"AndroidAPS 시작\" 기록 삭제하기</string>
     <string name="storedsettingsfound">저장된 설정이 있습니다.</string>
     <string name="allow_hardware_pump_text">주의: 활성화하고 펌프에 연결하게되면, AndroidAPS는 프로파일의 Basal설정을 복사해서 기존에 펌프에 저장되어 있던 Basal설정을 덮어쓰게 될것입니다. AndroidAPS의 Basal설정이 올바른지 반드시 확인하세요. 만약 확실치 않거나 Basal설정을 덮어씌우길 원치않는다면, 취소버튼을 누르고 나중에 다시 연결하세요.</string>

app/src/main/res/values-lt-rLT/exam.xml

@@ -1,165 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Koks atsakymas apie IVT yra teisingas?</string>
-    <string name="dia_label_exam">Tema: Insulino veikimo trukmė</string>
-    <string name="dia_minimumis3h">Mažiausia reikšmė - 3 valandos.</string>
+    <string name="dia_label_exam">Insulino veikimo trukmė (IVT)</string>
+    <string name="dia_profile">Jūs turite nustatyti IVT reikšmę profilyje.</string>
     <string name="dia_minimumis5h">Mažiausia reikšmė - 5 valandos.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">Jis yra lygus IVT parametrui, kuris naudojamas pompoje.</string>
-    <string name="dia_valuemustbedetermined">Jūs turite nustatyti savo individualią reikšmę (bet ne mažiau kaip 5 val.).</string>
-    <string name="hypott_label">Tema: Hipo Laikinas tikslas</string>
+    <string name="dia_meaningisequaltodiapump">Jei IVT reikšmė, kurią naudojote pompoje prieš pradedant naudotis AndroidAPS, tiko - jos nereikia keisti.</string>
+    <string name="dia_valuemustbedetermined">Jūs turite nustatyti sau tinkamą IVT reikšmę.</string>
+    <string name="hypott_label">Hipo laikinas tikslas</string>
     <string name="hypott_whenhypott">Kokia yra pagrindinė priežastis nustatyti hipo laikiną tikslą?</string>
-    <string name="hypott_goinglow">Užkirsti kelią kristi gliukozės kiekiui kraujyje, kai jau veikia nulinė laikina bazė.</string>
-    <string name="hypott_preventoversmb">Apriboti AAPS, kad nebūtų suleista per daug insulino po glikemijos kilimo, kurį sukelia greiti angliavandeniai, suvartoti hipoglikemijai suvaldyti.</string>
+    <string name="hypott_wrongbasal">Hipoglikemijų dėl neteisingai nustatytos bazės korekcija.</string>
+    <string name="hypott_preventoversmb">Kad būtų išvengta per didelių AndroidAPS korekcijų, kai glikemija pradeda staigiai kilti suvalgius greitai veikiančių angliavandenių hipoglikemijos metu.</string>
+    <string name="hypott_exercise">Hipoglikemijos dėl fizinio aktyvumo korekcija.</string>
+    <string name="hypott_0basal">Kad būtų išvengta glikemijos kritimo kai jau nustatyta 0% laikina bazė.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Kuris profilis gali būti naudojamas ir sukonfigūruotas neprisijungus?</string>
     <string name="offlineprofile_label">Tema: Vietinis Profilis</string>
     <string name="offlineprofile_nsprofile">NS Profilis gali būti naudojamas, bet nekonfigūruojamas.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Tema: Atsijungimas nuo Pompos</string>
-    <string name="pumpdisconnect_letknow">Spustelėkite Atjungti pompą, kad AAPS žinotų, kad insulinas nėra leidžiamas.</string>
-    <string name="pumpdisconnect_suspend">Paspauskite Sustabdyti ciklą, kad AAPS sustabdytų ciklą, kai pompa yra atjungta.</string>
-    <string name="pumpdisconnect_dontchnage">Nieko nekeiskite AAPS, tiesiog atjunkite pompą.</string>
+    <string name="pumpdisconnect_label">Priežastys, kada taikoma AndroidAPS funkcija „Atjungti pompą“</string>
+    <string name="pumpdisconnect_whattodo">Kas vyksta programiškai atjungus pompą?</string>
+    <string name="pumpdisconnect_unnecessary">To daryti nereikia, nes insulinas nebus tiekiamas, jei pompa fiziškai atjungta.</string>
+    <string name="pumpdisconnect_missinginsulin">Tai neleidžia AndroidAPS įskaičiuoti insuliną, kuris nebus tiekiamas fiziškai atjungus pompą</string>
+    <string name="pumpdisconnect_notstop">Tai nesustabdys insulino tiekimo, jei pompa nebus fiziškai atjungta.</string>
+    <string name="pumpdisconnect_openloop">Tai perves AndroidAPS į atviro ciklo režimą.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Tema: AndroidAPS nustatymai</string>
-    <string name="objectives_howtosave">Kokie geriausi veiksmai išsaugant nustatymų atsarginę kopiją?</string>
-    <string name="objectives_exportsettings">Eksportavimas į vidinę atmintį per Serviso meniu.</string>
-    <string name="objectives_storeelsewhere">Išsaugokite eksportuotą failą tokiose vietose kaip el. paštas, Dropbox, Google drive…</string>
-    <string name="objectives_doexportonstart">Eksportuokite juos iš karto po AAPS instaliavimo.</string>
-    <string name="objectives_doexportafterchange">Atlikę nustatymų pakeitimus, juos eksportuokite.</string>
-    <string name="objectives_doexportafterobjective">Eksportuokite juos įvykdę tikslą.</string>
-    <string name="objectives_doexportafterfirtssettings">Eksportuokite juos, kai atliksite pradinius nustatymus.</string>
+    <string name="objectives_label">AndroidAPS nustatymai</string>
+    <string name="objectives2_label">AndroidAPS nustatymai</string>
+    <string name="objectives_howtosave">Kaip geriausiai padaryti nustatymų atsarginę kopiją?</string>
+    <string name="objectives_notesettings">Jums nereikia eksportuoti nustatymų, jei juos užsirašėte.</string>
+    <string name="objectives_afterobjective">Reikia eksportuoti nustatymus kaskart užbaigus tikslą.</string>
+    <string name="objectives_afterchange">Reikia eksportuoti nustatymus juos pakeitus.</string>
+    <string name="objectives_afterinitialsetup">Reikia eksportuoti nustatymus užbaigus pirminę sąranką ir įvedus asmeninius parametrus.</string>
+    <string name="objectives2_maintenance">Reikia eksportuoti nustatymus lokaliai per Serviso meniu.</string>
+    <string name="objectives2_internalstorage">Jūsų nustatymų failas randamas telefono aplanke Internal Storage/AAPS/preferences.</string>
+    <string name="objectives2_cloud">Išsaugokite nustatymų failą saugioje vietoje ne telefone (pvz. saugykloje debesyje, perkeliant į kompiuterį kabeliu, el. pašte ir pan.)</string>
+    <string name="objectives2_easyrestore">Jei sugadinsite telefoną ar jį pamesite, yra paprastų būdų, kaip nuotoliniu būdu atkurti nustatymus be atsarginės kopijos.</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">Tema: Triukšmingi NGJ Rodmenys</string>
+    <string name="noisycgm_label">Triukšmingi NGJ Rodmenys</string>
     <string name="noisycgm_whattodo">Ką reikėtų daryti, jei sensoriaus duomenys yra triukšmingi - besiblaškantys?</string>
-    <string name="nothing">Nieko, Ciklas pats susitvarkys.</string>
-    <string name="noisycgm_pause">Išjungti ciklą, kad išvengtumėte insulino perdozavimo.</string>
-    <string name="noisycgm_replacesensor">Pakeisti NGJ sensorių.</string>
-    <string name="noisycgm_turnoffphone">Išjungti telefoną.</string>
+    <string name="noisycgm_nothing">Nieko - AndroidAPS savaime susitvarkys.</string>
+    <string name="noisycgm_pause">Išjungti uždarą ciklą, kad išvengtumėte per didelio ar per mažo dozavimo.</string>
+    <string name="noisycgm_replacesensor">Pakeisti sensorių, jei jo duomenys pastoviai triukšmingi ar netikslūs.</string>
+    <string name="noisycgm_checksmoothing">Patikrinti, ar jūsų NGJ programa išlygina duomenis.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">Įsitikinkite, kad sensoriaus programėlė išlygina KG duomenis.</string>
-    <string name="exercise_label">Tema: Mankšta</string>
-    <string name="exercise_whattodo">Kaip padėti sistemai susidoroti su fizine veikla?</string>
-    <string name="exercise_setactivitytt">Laikino tikslo funkcijos naudojimas.</string>
-    <string name="exercise_switchprofilebelow100">Perjungti profilį į žemesnį nei 100%.</string>
-    <string name="exercise_switchprofileabove100">Perjungti profilį į aukštesnį nei 100%.</string>
-    <string name="exercise_stoploop">Sustabdyti ciklą.</string>
-    <string name="exercise_doitbeforestart">Nustatyti aktyvumo laikiną tikslą prieš fizinį aktyvumą.</string>
-    <string name="exercise_afterstart">Laikinojo tikslo nustatymas po veiklos pradžios duoda prastesnius rezultatus, nei tuo atveju, jei jis buvo nustatytas iš anksto.</string>
+    <string name="exerciseprofile_label">Aktyvumas ir Profiliai</string>
+    <string name="exerciseprofile_whattodo">Kaip naudoti profilius, kad sistema geriausiai susitvarkytų su aerobiniais pratimais?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Perjungti profilį į žemesnį nei 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Perjungti profilį į aukštesnį nei 100%. </string>
+    <string name="exerciseprofile_leaveat100">Palikti 100% profilį.</string>
+    <string name="exerciseprofile_suspendloop">Sustabdyti ciklą.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">Aktyvumas ir Laikini tikslai</string>
+    <string name="exercise_whattodo">Kaip naudoti laikinus tikslus, kad sistema geriausiai susitvarkytų su aerobiniais pratimais?</string>
+    <string name="exercise_settt">Nustatykite laikiną aktyvumo tikslą pradėdami jį tinkamu laiku prieš pradėdami sportuoti.</string>
+    <string name="exercise_setfinished">Pasibaigus fizinei veiklai, nustatykite laikiną aktyvumo tikslą.</string>
+    <string name="exercise_setunchanged">Palikti tikslinę glikemiją nepakeistą.</string>
+    <string name="exercise_15g">Palaukti, kol glikemija nukris žemiau laikino hipoglikemijos tikslo, tada suvalgyti 15 g greitųjų angliavandenių.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">Tema: Ciklas išjungtas/sustabdytas</string>
+    <string name="suspendloop_label">Ciklas išjungtas/sustabdytas</string>
     <string name="suspendloop_doigetinsulin">Ar man leidžiamas insulinas, kai ciklas yra išjungtas / pristabdytas?</string>
     <string name="suspendloop_yes">Taip, bazinis insulinas ir toliau leidžiamas.</string>
     <string name="suspendloop_no">Ne, insulino tiekimas sustabdytas.</string>
-    <string name="basaltest_label">Tema: Bazės, JIF, ir IA testavimas</string>
-    <string name="basaltest_when">Kada turėčiau patvirtinti bazės, JIF ir IA reikšmes?</string>
+    <string name="basaltest_label">Bazės, JIF, ir IA testavimas</string>
+    <string name="basaltest_when">Kada šios reikšmės turėtų būti patikrintos?</string>
     <string name="basaltest_beforeloop">Prieš pradedant naudoti AAPS.</string>
-    <string name="basaltest_havingregularhypo">Kai dažnai kartojasi hipoglikemija.</string>
-    <string name="basaltest_havingregularhyper">Kai dažnai kartojasi hiperglikemija.</string>
+    <string name="basaltest_havingregularhighlow">Kai gliukozės kiekis kraujyje dažnai yra per didelis ar per mažas.</string>
+    <string name="basaltest_weekly">Mažiausiai kartą per savaitę.</string>
+    <string name="basaltest_fixed">Vieną kartą nustatytos ir patvirtintos, šios reikšmės daugiau neturėtų būti keičiamos.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Tema: Būtinos sąlygos</string>
-    <string name="prerequisites_what">Ko man reikia?</string>
+    <string name="prerequisites_label">Būtinosios sąlygos</string>
+    <string name="prerequisites_what">Ko reikia norint įvesti nustatymus ir naudoti AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Patikrinti profilio duomenis (valandines bazes, IA, JIF, IVT).</string>
-    <string name="prerequisites_computer">Kompiuterio APK sukūrimui.</string>
+    <string name="prerequisites_computer">Kompiuterio su įdiegta ir sukonfigūruota Android Studio.</string>
     <string name="prerequisites_phone">Tinkamo telefono.</string>
-    <string name="prerequisites_car">Automobilio.</string>
-    <string name="prerequisites_nightscout">Nightscout, tikslų įveikimui.</string>
+    <string name="prerequisites_pump">Tinkamos insulino pompos, jei ketinate naudotis uždaru ciklu.</string>
+    <string name="prerequisites_nightscout">Nightscout, kad galima būtų išsaugoti ir peržiūrėti visų duomenų bei nustatymų istoriją.</string>
     <string name="prerequisites_tidepoolaccount">Tidepool paskyros.</string>
     <string name="prerequisites_googleaccount">Google paskyros.</string>
     <string name="prerequisites_githubaccount">Github paskyros.</string>
-    <string name="prerequisites_beanandroiddeveloper">Android kūrimo patirties.</string>
+    <string name="prerequisites_beanandroiddeveloper">Turėti programavimo ar kodo redagavimo patirties.</string>
     <string name="prerequisites_own670g">MiniMed 670G pompos.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">Išmaniojo laikrodžio.</string>
     <string name="prerequisites_supportedcgm">Palaikomo NGJ.</string>
-    <string name="update_label">Tema: AndroidAPS atnaujinimas</string>
-    <string name="whatistrue">Kuris teiginys teisingas?</string>
-    <string name="update_git">Jums reikia turėti įdiegtą Git.</string>
-    <string name="update_asap">Atnaujinkite, kai tik bus išleista nauja versija ir tam turėsite pakankamai laiko.</string>
-    <string name="update_keys">Turite naudoti tuos pačius parašo raktus.</string>
+    <string name="prerequisites2_label">Būtinosios sąlygos</string>
+    <string name="prerequisites2_what">Ko reikia norint įvesti nustatymus ir naudoti AndroidAPS?</string>
+    <string name="prerequisites2_profile">Patikrintos profilio informacijos (JIF, IA, bazė, IVT ir pan.).</string>
+    <string name="prerequisites2_device">Suderinamo Android įrenginio (pvz.: išmaniojo telefono, laikrodžio su full Android ar planšetės).</string>
+    <string name="prerequisites2_internet">AndroidAPS reikalingas interneto ryšys, kad veiktų uždaras ciklas.</string>
+    <string name="prerequisites2_supportedcgm">Palaikomo NGJ ir tinkamos programėlės glikemijos duomenims gauti telefone/įrenginyje.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">AndroidAPS atnaujinimas</string>
+    <string name="whatistrue">Pasirinkite visus teisingus atsakymus.</string>
+    <string name="update_git">Git programa turi būti įdiegta ir sukonfigūruota jūsų kompiuteryje.</string>
+    <string name="update_asap">Išleidus atnaujintas AndroidAPS versijas, praėjus tam tikram laikui, ankstesnės versijos gali būti nuotoliniu būdu apribotos.</string>
+    <string name="update_keys">Turėtumėte išsaugoti ir pasižymėti raktų saugyklos vietą ir atnaujinimams naudoti tą patį pasirašymo raktą, kaip ir ankstesniam diegimui.</string>
     <string name="update_neverupdate">Niekada neatnaujinkite, jei sistema veikia gerai.</string>
-    <string name="update_askfriend">Paprašykite savo draugo naujo APK.</string>
+    <string name="update_askfriend">Jei kyla sunkumų kuriant apk failą, galite instaliuoti apk failą, kurį sukūrė draugas.</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">Tema: Gedimų Šalinimas</string>
-    <string name="troubleshooting_wheretoask">Kur ieškoti pagalbos?</string>
-    <string name="troubleshooting_fb">Prisijungti prie AndroidAPS Facebook grupėje.</string>
-    <string name="troubleshooting_wiki">Skaityti AndroidAPS dokumentaciją.</string>
-    <string name="troubleshooting_gitter">Apsilankyti AndroidAPS Gitter kanale.</string>
-    <string name="troubleshooting_googlesupport">Apsilankyti AndroidAPS Google palaikymo tarnyboje</string>
-    <string name="troubleshooting_yourendo">Pasitarti su savo endokrinologu.</string>
+    <string name="troubleshooting_label">Trikčių šalinimas</string>
+    <string name="troubleshooting_wheretoask">Kur galima ieškoti pagalbos su AndroidAPS?</string>
+    <string name="troubleshooting_fb">Galite kreiptis patarimo AndroidAPS Users Facebook grupėje.</string>
+    <string name="troubleshooting_wiki">Jūs turėtumėte skaityti (ir pakartotinai skaityti) AndroidAPS dokumentaciją.</string>
+    <string name="troubleshooting_gitter">AndroidAPS Gitter kambaryje galite paprašyti patarimo ir užregistruoti technines problemas ar klausimus.</string>
+    <string name="troubleshooting_yourendo">Turėtumėte kreiptis į savo diabeto kliniką/endokrinologą.</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">Tema: Insulino įskiepiai</string>
-    <string name="insulin_ultrarapid">Kokio tipo insuliną galiu naudoti su Ultra-Rapid-Oref moduliu?</string>
+    <string name="insulin_label">Insulino įskiepiai</string>
+    <string name="insulin_ultrarapid">Kurį insuliną reikėtų naudoti su Ultra-Rapid Oref įskiepiu?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin R®/\"tradicinį\" žmogaus insuliną.</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Tema: Jautrumo įskiepiai</string>
-    <string name="sensitivity_which">Kuris jautrumo algoritmas turi reguliuojamą laiko intervalą?</string>
+    <string name="sensitivity_label">Jautrumo įskiepiai</string>
+    <string name="sensitivity_which">Pasirinkite visus teisingus atsakymus.</string>
+    <string name="sensitivity_adjust">Jautrumo įskiepiai leidžia AndroidAPS prisitaikyti prie laikinų ar trumpalaikių jautrumo insulinui pokyčių (pavyzdžiui, hormoninių pokyčių ar absorbcijos problemų infuzijos vietoje).</string>
+    <string name="sensitivity_edit">Jautrumo įskiepiai pateikia vartotojui siūlomus bazės, IA santykio ir JIF pakeitimus, kuriuos galima naudoti profiliui redaguoti.</string>
+    <string name="sensitivity_cannula">Pažymėjus kaniulės pakeitimą, Autosens santykis vėl bus grąžintas į 100%.</string>
+    <string name="sensitivity_time">Kai kurios įskiepo parinktys turi konfigūruojamus laiko intervalus, kuriuos gali nustatyti vartotojas.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Koks jautrumo įskiepis turi būti naudojamas su NDM?</string>
-    <string name="wrongcarbs_label">Tema: Angliavandenių įvedimo klaidos</string>
+    <string name="wrongcarbs_label">Angliavandenių įvedimo klaidos</string>
     <string name="wrongcarbs_whattodo">Ką reikia daryti, jei įrašyti neteisingi angliavandeniai?</string>
-    <string name="wrongcarbs_treatmentstab">Skirtuke Terapija ištrinti neteisingus angliavandenių įrašus. Įvesti naujus angliavandenius.</string>
-    <string name="wrongcarbs_addfakeinsulin">Pridėti netikrą insulino dozę naudojantis Užpildymo funkcija</string>
-    <string name="extendedcarbs_label">Tema: Maistas su riebalais ir baltymais</string>
-    <string name="extendedcarbs_handling">Ką darysite, jei maiste yra daug riebalų ar baltymų?</string>
-    <string name="extendedcarbs_useextendedcarbs">Perskaičiuosite riebalus ir baltymus į angliavandenius ir naudokitės \"Ištęstų angliavandenių\" funkcija.</string>
-    <string name="extendedcarbs_add">Perskaičiuosite riebalus ir baltymus į angliavandenius ir įvesite į boluso skaičiuoklę.</string>
-    <string name="extendedcarbs_useextendedbolus">Naudosite ištęsto boluso funkciją padengti riebalus ir baltymus.</string>
+    <string name="wrongcarbs_treatmentstab">Ištrinti neteisingą įrašą Terapijos skiltyje ir įvesti teisingą angliavandenių kiekį.</string>
+    <string name="wrongcarbs_addinsulin">Suleisti bolusą, naudojant infuzijos rinkinio užpildymo funkciją.</string>
+    <string name="wrongcarbs_donothing">Nedaryti nieko - AndroidAPS padarys atitinkamus pakeitimus.</string>
+    <string name="wrongcarbs_bolus">Suleisti bolusą, naudojant mygtuką Insulinas, esantį pagrindiniame lange.</string>
+    <string name="wronginsulin_label">Insulino suleidimo / įrašų klaidos</string>
+    <string name="wronginsulin_whattodo">Ką turėtumėte daryti, jei buvo suleista mažiau insulino nei rodo pompos istorija, pvz. dėl užsikimšimo, neveikiančios kaniulės ar pamiršus po dušo vėl pritvirtinti pompą? </string>
+    <string name="wronginsulin_careportal">Ištrinti insulino suleidimo įrašą per Nightscout Careportal, kad pašalintumėte jį iš pompos istorijos.</string>
+    <string name="wronginsulin_compare">Palyginti įrašus AndroidAPS ir pompos istorijoje.</string>
+    <string name="wronginsulin_prime">Susileisti trūkstamą insulino kiekį švirkštu ar naudojantis infuzinės sistemos užpildymo funkcija.</string>
+    <string name="wronginsulin_donothing">Nieko nedaryti ir leisti AndroidAPS koreguoti padidėjusį gliukozės kiekį kraujyje.</string>
+    <string name="iob_label">Aktyvus insulinas organizme (AIO)</string>
+    <string name="iob_which">Pasirinkite visus teisingus atsakymus.</string>
+    <string name="iob_value">AIO reikšmei įtakos turi nustatyta laikina valandinė bazė.</string>
+    <string name="iob_hightemp">Padidinta laikina bazė nebus nustatyta, jei kraujo glikemija yra žemiau nustatyto tikslo.</string>
+    <string name="iob_negiob">Jei ilgą laiką stebima neigiama AIO reikšmė ir nėra fizinio aktyvumo, tai rodo, kad jūsų nustatymai yra per „agresyvūs“ ir kad jums reikia mažiau insulino nei nustatyta.</string>
+    <string name="iob_posiob">Jei ilgą laiką stebima teigiama AIO reikšmė, tai rodo rezistenciją insulinui arba valgomą, tačiau neįrašomą maistą.</string>
+    <string name="breadgrams_label">Angliavandenių įrašai ir bolusai</string>
+    <string name="breadgrams_grams">Apskaičiuojant ir įrašant angliavandenius, reikia naudoti tik gramus.</string>
+    <string name="breadgrams_exchange">Suvartotus angliavandenius galima įrašyti naudojant atitinkamą perskaičiavimo sistemą (pvz., DAFNE „CHO“ perskaičiavimą ar europinius duonos vienetus).</string>
+    <string name="breadgrams_decay">AndroidAPS naudoja dinaminį modelį, kad įvertintų angliavandenių įsisavinimą ir apskaičiuotų AAO.</string>
+    <string name="breadgrams_calc">Jei gliukozės kiekis kraujyje viršija leistinas ribas (per žemas ar per aukštas), skaičiuotuvas gali pateikti pasiūlymus dėl angliavandenių ar korekcinio boluso.</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">i-AV</string>
+    <string name="extendedcarbs_handling">Kam naudojami i-AV (ištęsti angliavandeniai)?</string>
+    <string name="extendedcarbs_future">Planuojant būsimus angliavandenius, kurie gali būti paskirstyti laiko intervale (panašiai kaip ištęstas boliusas, kai insulinas suleidžiamas dalimis laiko intervale).</string>
+    <string name="extendedcarbs_free">Norint įrašyti netikrus angliavandenius dėl fizinės veiklos, ir kuriuos norite paslėpti nuo AndroidAPS.</string>
+    <string name="extendedcarbs_fat">i-AV (paskirstyti ateityje) gali padėti AndroidAPS susitvarkyti su maistu, turinčiu daug riebalų/baltymų.</string>
+    <string name="extendedcarbs_rescue">Norint įrašyti angliavandenius, kuriuos suvartojote esant žemai glikemijai. </string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Tema: Nuotolinis Stebėjimas</string>
-    <string name="nsclient_howcanyou">Kaip galite stebėti vaiko AAPS nuotoliniu būdu?</string>
-    <string name="nsclient_nightscout">Naudojantis Nightscout svetaine.</string>
-    <string name="nsclient_dexcomfollow">Dexcom Follow, jei naudojate originalią Dexcom programėlę (tik glikemijos duomenys).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow, jei naudojate xDrip.</string>
-    <string name="nsclient_xdripfollower">xDrip sekėjo režimu.</string>
-    <string name="nsclient_looponiphone">Loop app iPhone telefone.</string>
-    <string name="nsclient_spikeiphone">Spike iPhone telefone.</string>
+    <string name="nsclient_label">Nuotolinis stebėjimas</string>
+    <string name="nsclient_howcanyou">Kaip galite stebėti AndroidAPS (pavyzdžiui, jūsų vaikui) nuotoliniu būdu?</string>
+    <string name="nsclient_nightscout">Nuotoliniu būdu stebėti AndroidAPS galite su NS Client ir Nightscout programomis bei Nightscout tinklalapiu.</string>
+    <string name="nsclient_dexcomfollow">Kitos programėlės (pvz. Dexcom follow, Xdrip sekėjo režimu) leidžia sekti tuos pačius parametrus (pvz. glikemijos/sensoriaus reikšmės) nuotoliniu būdu, tačiau naudoja kitus algoritmus, todėl gali pateikti neteisingas AIO ir AAO reikšmes.</string>
+    <string name="nsclient_data">Norint nuotoliniu būdu stebėti AndroidAPS, abu prietaisai turi turėti prieigą prie interneto (pvz., per Wi-Fi arba mobiliojo ryšio duomenis).</string>
+    <string name="nsclient_fullcontrol">NS Client naudojamas nuotoliniam stebėjimui ir pilnai AndroidAPS kontrolei.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Tema: Insulino jautrumo faktorius</string>
-    <string name="isf_increasingvalue">Didesnė JIF reikšmė lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
-    <string name="isf_decreasingvalue">Mažesnė JIF reikšmė lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
-    <string name="isf_noeffect">JIF reikšmės pakeitimas neturi įtakos AAPS leidžiamo insulino kiekiui koreguojant aukštą glikemiją.</string>
-    <string name="isf_preferences">Nustatymuose turite įvesti JIF.</string>
+    <string name="isf_label_exam">Jautrumo insulinui faktorius (JIF)</string>
+    <string name="isf_increasingvalue">Padidinus JIF reikšmes, bus leidžiama daugiau insulino, kad būtų padengtas konkretus angliavandenių kiekis.</string>
+    <string name="isf_decreasingvalue">Sumažinus JIF, insulino bus leidžiama daugiau, kad būtų koreguojama aukštesnė, nei nustatyta glikemija.</string>
+    <string name="isf_noeffect">JIF padidinimas ar sumažinimas neturi įtakos insulino leidimui, kai gliukozės kiekis kraujyje yra žemesnis už tikslinį.</string>
+    <string name="isf_preferences">JIF reikšmė turi būti įrašyta AndroidAPS nustatymuose.</string>
     <string name="isf_profile">Jei profilyje pakeisite JIF vertę, Ciklas į pokytį iškart atsižvelgs.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Tema: Insulino ir angliavandenių santykis</string>
+    <string name="ic_multiple">Jūs galite naudoti daugiau nei vieną IA santykio reikšmę savo profilyje.</string>
+    <string name="ic_isf">Jei profilyje pakeičiate JIF reikšmę, visada taip pat turite pakeisti IA santykį.</string>
+    <string name="ic_label_exam">Insulino ir angliavandenių santykis (IA santykis)</string>
     <string name="ic_increasingvalue">Didesnis insulino ir angliavandenių IA santykis reiškia, kad mažiau insulino reikia padengti tam tikram angliavandenių kiekiui.</string>
     <string name="ic_decreasingvalue">Mažesnis insulino ir angliavandenių IA santykis reiškia, kad mažiau insulino reikia padengti tam tikram angliavandenių kiekiui.</string>
     <string name="ic_noeffect">Jei turite 0 AAO (aktyvių angliavandenių organizme), pakeitus IA, glikemija bus koreguojama kitokiu insulino kiekiu.</string>
+    <string name="ic_different">IA vertė skirsis priklausomai nuo to, ar duonos vienetui (jo pakeitimui) skaičiuojate 10g ar 12g angliavandenių.</string>
+    <string name="ic_meaning">IA reiškia: kiek vienas vienetas insulino dengia duonos vienetų (jo pakeitimo).</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">Tema: Profilio keitimas</string>
-    <string name="profileswitch_pctwillchange"> Kai profilio keitime nustatote 90%…</string>
-    <string name="profileswitch_basalhigher">Bazė bus 10% aukštesnė.</string>
+    <string name="profileswitch_label">Profilio keitimas</string>
+    <string name="profileswitch_pctwillchange"> Kai nustatomas 90% profilio keitimas, kurie atsakymai yra teisingi?</string>
     <string name="profileswitch_basallower">Bazė bus 10% žemesnė.</string>
-    <string name="profileswitch_ichigher">IA reikšmė bus 10% didesnė.</string>
-    <string name="profileswitch_iclower">IA reikšmė bus 10% mažesnė.</string>
     <string name="profileswitch_isfhigher">JIF reikšmė bus 10% didesnė.</string>
-    <string name="profileswitch_isflower">JIF reikšmė bus 10% mažesnė.</string>
-    <string name="profileswitch_overall">Jums bus viso suleista 10% mažiau insulino.</string>
-    <string name="profileswitch_targethigher">Tikslas bus 10% aukštesnis.</string>
-    <string name="profileswitch_targetlower">Tikslas bus 10% žemesnis.</string>
-    <string name="profileswitch_targetbottom">Tik apatinis tikslas bus 10% žemesnis.</string>
+    <string name="profileswitch_iclower">IA santykio reikšmė bus 10% mažesnis skaičius.</string>
+    <string name="profileswitch_unchanged">JIF ir IA santykio reikšmės nebus pakeistos.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Jei atsibundate 1 valanda anksčiau nei įprastai, kaip turėtumėte pranešti AAPS apie savo tvarkaraščio pasikeitimą?</string>
-    <string name="profileswitchtime_1">Perjunkite profilį su laiko poslinkiu +1</string>
-    <string name="profileswitchtime__1">Perjunkite profilį su laiko poslinkiu -1</string>
+    <string name="profileswitch2_label">Profilio keitimas</string>
+    <string name="profileswitch2_pctwillchange"> Kai nustatomas 120% profilio keitimas, kurie atsakymai yra teisingi?</string>
+    <string name="profileswitch2_bghigher">Tikslinė glikemija bus 20% aukštesnė.</string>
+    <string name="profileswitch2_basalhigher">Bazė bus 20% aukštesnė.</string>
+    <string name="profileswitch2_bgunchanged">Tikslinė glikemija nebus pakeista.</string>
+    <string name="profileswitch2_isfhigher">JIF reikšmė bus 20% aukštesnė.</string>
+    <string name="profileswitchtime_label">Profilio keitimas</string>
+    <string name="profileswitchtime_iwant">Jei atsikeliate 2 valandomis anksčiau nei įprastai, kaip turėtumėte pranešti AndroidAPS apie savo tvarkaraščio pasikeitimą?</string>
+    <string name="profileswitchtime_2">Perjunkite profilį su laiko poslinkiu +2</string>
+    <string name="profileswitchtime__2">Perjunkite profilį su laiko poslinkiu -2</string>
+    <string name="profileswitchtime_tt">Nustatyti Netrukus valgysiu laikiną tikslą.</string>
+    <string name="profileswitchtime_100">Perjungti profilį į aukštesnį nei 100%. </string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Perjunkite profilį su laiko poslinkiu +60</string>
-    <string name="profileswitchtime__60">Perjunkite profilį su laiko poslinkiu -60</string>
+    <string name="profileswitch4_label">Profilių pakeitimai</string>
+    <string name="profileswitch4_rates">Bazė, JIF, IA santykiai ir t.t. turėtų būti nustatyti profiliuose.</string>
+    <string name="profileswitch4_internet">Norint aktyvuoti Nightscout profilio pakeitimus, AndroidAPS telefone turi būti interneto ryšys.</string>
+    <string name="profileswitch4_sufficient">Užtenka tik redaguoti profilius pakeičiant reikšmes, kad būtų aktyvuoti visi atlikti pakeitimai.</string>
+    <string name="profileswitch4_multi">Galima nustatyti ir pasirinkti kelis profilius, kad jie atitiktų besikeičiančias aplinkybes (pvz., hormoniniai pokyčiai, pamaininis darbas, darbo dienų/savaitgalių gyvenimo būdas).</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">Tema: Pagalba su valandinėmis bazėmis</string>
+    <string name="basalhelp_label">Pagalba su valandinėmis bazėmis</string>
     <string name="basalhelp_where">Kur kreiptis, jei jums reikia pagalbos nustatant valandines bazes ir pan.? </string>
     <string name="basalhelp_diabetesteam">Į Jūsų endokrinologą ir diabetologą</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Kiti vaistai</string>
-    <string name="other_medication_text">AAPS sumažina valandinę bazę, siekiant padidinti glikemiją. Dėl vaistų iš SGLT2 inhibitorių grupės (Gliflozinas) naudojimo, numatomas glikemijos padidėjimas gali būti neteisingai parodytas ir tokiu būdu gali sukelti pavojingą insulino trūkumą (DKA - ketoacidozę).
- \n Prekių ženklų pavadinimai apima: „Invokana®“, „Forxiga®“, „Jardiance®“, „Steglatro®“, „Suglat®“, „Apleway®“, „Deberza®“, „Synjardy®“, „Vokanamet®“, „Xigduo®“. \n\n Pažadu nenaudoti tokių vaistų, naudojant AAPS, arba prieš vartodamas juos, atjungsiu ciklą.</string>
+    <string name="other_medication_label">Kiti vaistai. Prašome perskaityti toliau pateiktą pranešimą ir pažymėti langelį, kad patvirtintumėte.</string>
+    <string name="other_medication_text">AndroidAPS sumažina bazę ar sustabdo insulino tiekimą, kai reikia padidinti glikemiją. SGLT2 inhibitorių grupės vaistai (gliflozinų) gali blokuoti glikemijos padidėjimą, todėl gali atsirasti pavojingas insulino trūkumas (diabetinė ketoacidozė).
+ \nPrekių ženklų pavadinimai apima: „Invokana®“, „Forxiga®“, „Jardiance®“, „Steglatro®“, „Suglat®“, „Apleway®“, „Deberza®“, „Synjardy®“, „Vokanamet®“, „Xigduo®“.\n\n Pažadu nenaudoti tokių vaistų naudodamas AAPS, arba prieš vartodamas juos, atjungsiu ciklą.</string>
 </resources>

app/src/main/res/values-lt-rLT/objectives.xml

@@ -21,7 +21,7 @@
     <string name="objectives_smb_objective">Dienos metu aktyvuokite papildomas funkcijas, tokias kaip SMB (Super Mikro Bolusas)</string>
     <string name="objectives_auto_objective">Automatizavimo įjungimas</string>
     <string name="objectives_smb_gate">Norėdami, kad SMB veiktų gerai, turite perskaityti dokumentaciją ir padidinti max AIO! Pradžiai patartina skaičiuoti taip: maxAIO=(didžiausia valandinė bazė x 3) + vidutinis bolusas</string>
-    <string name="objectives_auto_gate">Perskaitykite automatizavimo dokumentaciją. Nustatykite pirmąsias paprastas taisykles. Užuot įjungę veiksmus, leiskite AAPS tik rodyti pranešimus. Kai būsite tikri, kad automatizavimas prasidės tinkamu laiku, pakeiskite pranešimą realiu veiksmu.
+    <string name="objectives_auto_gate">Perskaitykite automatizacijos dokumentaciją. Nustatykite pirmąsias paprastas taisykles. Užuot įjungę veiksmus, leiskite AAPS tik rodyti pranešimus. Kai būsite tikri, kad automatizacija prasidės tinkamu laiku, pakeiskite pranešimą realiu veiksmu.
 (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">KG matoma NS</string>
     <string name="objectives_pumpstatusavailableinns">NS matomas pompos statusas</string>
@@ -41,7 +41,7 @@
     <string name="codeaccepted">Kodas priimtas</string>
     <string name="codeinvalid">Neteisingas kodas</string>
     <string name="objectives_exam_objective">Patvirtinkite savo žinias</string>
-    <string name="objectives_exam_gate">Išnagrinėkite ir atsakykite į klausimus teisingai</string>
+    <string name="objectives_exam_gate">Išanalizuokite klausimus.  Į kiekvieną klausimą jums pateikiami keturi galimi atsakymai. Teisingų atsakymų gali būti daugiau nei vienas. Pažymėkite visus teisingus ir pasirinkite PATVIRTINTI.</string>
     <string name="answerdisabledto">Atsakymas sustabdytas: %1$s</string>
     <string name="wronganswer">Neteisingas atsakymas!</string>
     <string name="unfinshed_button">Kitas neužbaigtas</string>

app/src/main/res/values-lt-rLT/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Terapijos saugumas</string>
     <string name="treatmentssafety_maxbolus_title">Maksimalus leistinas bolusas [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Maks. leistini angliavandeniai [g]</string>
+    <string name="nav_preferences_plugin">%1$s Nustatymai</string>
     <string name="nav_preferences">Nustatymai</string>
     <string name="nav_refreshtreatments">Atnaujinti terapiją iš NS</string>
     <string name="nav_resetdb">Iš naujo nustatyti duomenų bazę</string>
@@ -245,6 +246,7 @@
     <string name="valueoutofrange">Vertė %1$s viršija griežtą limitą</string>
     <string name="smscommunicator_pumpconnectwithcode">Pompos prijungimui atsakykite su kodu %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Nepavyko prisijungti prie pompos</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Norėdami atjungti pompą %1$d min., atsakykite kodu %2$s</string>
     <string name="smscommunicator_pumpdisconnected">Pompa atjungta</string>
     <string name="smscommunicator_reconnect">Pompa prijungta</string>
     <string name="smscommunicator_remotecommandnotallowed">Nuotolinis valdymas negalimas</string>
@@ -384,10 +386,13 @@
     <string name="wear_detailedIOB_summary">Rodyti laikrodyje bazės ir bolusų AIO</string>
     <string name="nosuccess">Bandymas nesėkmingas - pasitikrinkite telefoną</string>
     <string name="notavailable">n/a</string>
+    <string name="patientage">Paciento tipas</string>
     <string name="child">Vaikas</string>
     <string name="teenage">Paauglys</string>
     <string name="adult">Suaugęs</string>
     <string name="resistantadult">Insulinui rezistentiškas suaugęs</string>
+    <string name="pregnant">Nėštumas</string>
+    <string name="patientage_summary">Pasirinkite paciento tipą saugumo riboms nustatyti</string>
     <string name="patient_name">Paciento vardas</string>
     <string name="patient_name_summary">Pateikite paciento vardą arba slapyvardį, kad galima būtų atskirti tarp skirtingų konfigūracijų.</string>
     <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Vartotojas</string>
@@ -401,11 +406,18 @@
     <string name="suspendloopfor3h">Sustabdyti ciklą 3 val</string>
     <string name="suspendloopfor10h">Sustabdyti ciklą 10 val</string>
     <string name="suspendloopforXmin">Sustabdyti ciklą %1$d min</string>
+    <string name="disconnectpump">Atjungti pompą</string>
     <string name="disconnectpumpfor15m">Atjungti pompą 15 min</string>
     <string name="disconnectpumpfor30m">Atjungti pompą 30 min</string>
     <string name="disconnectpumpfor1h">Atjungti pompą 1 val</string>
     <string name="disconnectpumpfor2h">Atjungti pompą 2 val</string>
     <string name="disconnectpumpfor3h">Atjungti pompą 3 val</string>
+    <string name="duration15m">15 min</string>
+    <string name="duration30m">30 min</string>
+    <string name="duration1h">1 val.</string>
+    <string name="duration2h">2 val.</string>
+    <string name="duration3h">3 val.</string>
+    <string name="duration10h">10 val.</string>
     <string name="resume">Atnaujinti</string>
     <string name="reconnect">Prijungti pompą</string>
     <string name="smscommunicator_wrongduration">Neteisinga trukmė</string>
@@ -429,6 +441,8 @@
     <string name="statuslights_iage_critical">Insulino kritinio laiko įspėjimas [h]</string>
     <string name="statuslights_sage_warning">Jutiklio ribinio laiko įspėjimas [h]</string>
     <string name="statuslights_sage_critical">Jutiklio kritinio laiko įspėjimas [h]</string>
+    <string name="statuslights_sbat_warning">Įspėjimo apie žemą sensoriaus baterijos lygį riba [%]</string>
+    <string name="statuslights_sbat_critical">Įspėjimo apie kritiškai žemą sensoriaus baterijos lygį riba [%]</string>
     <string name="statuslights_bage_warning">Baterijos ribinio laiko įspėjimas [h]</string>
     <string name="statuslights_bage_critical">Baterijos kritinio laiko įspėjimas [h]</string>
     <string name="statuslights_res_warning">Įspėjimo apie žemą rezervuaro lygį riba [U]</string>
@@ -455,6 +469,12 @@
     <string name="ns_noupload_summary">Visi duomenys, kurie gali būti siunčiami į NS, paliekami. AAPS yra susieta su NS, bet jokie pokyčiai NS nedaromi</string>
     <string name="overview_extendedbolus_cancel_button">Atšaukti ištęstą bolusą</string>
     <string name="doprofileswitch">Profilio keitimas</string>
+    <string name="careportal_sensor_label">Sensorius</string>
+    <string name="careportal_canula_label">Kaniulė</string>
+    <string name="careportal_insulin_label">Insulinas</string>
+    <string name="careportal_pb_label">Pompos baterija</string>
+    <string name="careportal_age_label">amžius:</string>
+    <string name="careportal_level_label">lygis:</string>
     <string name="ns_alarmoptions">Aliarmų nustatymai</string>
     <string name="ns_alarms">Sukurti pranešimus iš NS aliarmų</string>
     <string name="ns_announcements">Sukurkite pranešimus iš NS perspėjimų</string>
@@ -552,8 +572,6 @@
     <string name="overview_editquickwizard_usebasaliob">Bazės AIO apskaičiavimas</string>
     <string name="overview_editquickwizard_usetrend">Tendencijos apskaičiavimas</string>
     <string name="overview_editquickwizard_usesuperbolus">Superboluso apskaičiavimas</string>
-    <string name="yes">Taip</string>
-    <string name="no">Ne</string>
     <string name="positiveonly">Tik teigiamas</string>
     <string name="negativeonly">Tik neigiamas</string>
     <string name="overview_editquickwizard_usecob">AAO apskaičiavimas</string>
@@ -600,8 +618,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">Rezervuare nepakanka insulino bolusui</string>
     <string name="extendedbolusdeliveryerror">Ištęstinio boluso suleidimo klaida</string>
     <string name="insightpump_shortname">Sight</string>
-    <string name="set_neutral_temps_title">Nustatyti neutralią laikiną bazę</string>
-    <string name="set_neutral_temps_summary">Jei įjungta, laikina valandinė bazė bus anuliuota iki kiekvienos valandos pabaigos. Šis metodas gali padėti išvengti kai kurių pompų pypsėjimo ar vibravimo.</string>
     <string name="enablesmbalways">Leisti SMB visada</string>
     <string name="enablesmbalways_summary">Leisti SMB visada, nepriklausomai nuo bolusų. Įmanoma tik naudojant patikimų, filtruotų KG duomenų šaltinį, pvz.: Dexcom G5</string>
     <string name="enablesmbaftercarbs">Leisti SMB po angliavandenių įvedimo</string>
@@ -667,6 +683,7 @@
     <string name="combo_error_failure_reading_changed_basal_rate">Valandinė bazė pompoje pasikeitė, bet nuskaityti nepavyko</string>
     <string name="combo_activity_checking_for_history_changes">Tikrinami istorijos pokyčiai</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Keletas bolusų su tuo pačiu kiekiu buvo importuoti per tą pačią minutę. Tik vienas įrašas gali būti pridėtas. Prašome patikrinti pompą ir rankiniu būdu įveskite bolusą, naudojant Priežiūra skiltį. Įsitikinkite, kad boluso įrašo laikas nesutampa su kitais įrašais.</string>
+    <string name="about_link_urls">\n\ndokumentacija:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <string name="combo_check_date">Paskutinis bolusas įrašytas anksčiau nei prieš 24 val. arba yra ateityje. Prašome patikrinti, ar data pompoje nustatyta teisingai.</string>
     <string name="combo_suspious_bolus_time">Suleisto boluso laikas/data pompoje yra neteisingas, AIO panašu yra nekorektiškas. Prašome patikrinti pompos laiką/datą.</string>
     <string name="profileswitch_ismissing">Neatliktas profilio keitimas. Prašome atlikti profilio keitimą arba paspausti \"Aktyvuoti profilį\" Vietinio profilio (VP) skiltyje.</string>
@@ -749,8 +766,8 @@
     <string name="diawarning">Atminkite: DKS profiliams reikia IVT bent 5 val. IVT = 5 - 6 val DKS profilyje atitinka IVT = 3 val sename (pompos terapijos) insulino profilyje.</string>
     <string name="setupwizard_profile_description">Prašome pasirinkti profilį. Jei pacientas yra vaikas, turite naudoti NS profilį. Jei niekas neseka jūsų Nightscout platformoje, tada geriau pasirinkti Vietinį profilį. Atminkite, kad čia Jūs tik pasirenkate profilio šaltinį. Norėdami jį aktyvuoti, turite atlikti Profilio keitimą</string>
     <string name="setupwizard_aps_description">Pasirinkite vieną iš esamų algoritmų. Jie yra išdėstyti nuo seniausio iki naujausio. Naujesni algoritmai yra galingesni ir agresyvesni. Taigi jei esate naujas vartotojas, geriau pradėti nuo AMA, o ne naujesnio. Nepamirškite perskaityti dokumentaciją ir sukonfigūruoti jį prieš naudojant.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Laukiama RileyLink ryšio...\n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b> Pastaba:</b> sąranką galite tęsti, kai tik inicijuojama pompa.\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Sukonfigūruokite RileyLink žemiau. Pasirinkę RileyLink, galėsite tęsti diegimą, kai tik RileyLink būsena bus „Prisijungta“. Tai gali užtrukti minutę.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Pastaba:</b> Sąranką galite tęsti, kai tik inicijuojama pompa.\n</string>
     <string name="startobjective">Pradėti jūsų pirmąjį tikslą</string>
     <string name="permission">Leidimas</string>
     <string name="askforpermission">Prašyti leidimo</string>
@@ -777,7 +794,6 @@
     <string name="sensitivity_raises_target_title">Jautrumas didina tikslą</string>
     <string name="sensitivity_raises_target_summary">Kai aptinkamas padidėjęs jautrumas insulinui, tikslinis gliukozės lygis padidinamas</string>
     <string name="combo_invalid_setup">Netinkami pompos nustatymai, patikrinkite dokumentaciją ir įsitikinkite, kad Quick info meniu yra pavadintas QUICK INFO, naudojant 360 configuration software.</string>
-    <string name="custom">Pasirinktinis</string>
     <string name="careportal_removestartedevents">Ištrinti \"AndroidAPS paleista\" įrašus</string>
     <string name="storedsettingsfound">Rasti išsaugoti nustatymai</string>
     <string name="allow_hardware_pump_text">Dėmesio: jei aktyvuosite ir prijungsite prie aparatinės pompos, AndroidAPS nukopijuos bazės nustatymus iš profilio į pompą, pakeisdamas esančius nustatymus pompoje. Įsitikinkite, kad turimi bazės nustatymai AndroidAPS yra teisingi. Jei nesate tikri arba nenorite iš naujo keisti bazės nustatymų jūsų pompoje, paspauskite atšaukti ir pakartokite prijungimą prie pompos kitą kartą.</string>
@@ -965,7 +981,9 @@
     <string name="description_source_dexcom">Gauti kraujo gliukozės reikšmes iš modifikuotos Dexcom programėlės.</string>
     <string name="notification">Pranešimas</string>
     <string name="notification_message">Įspėjimas: %1$s</string>
+    <string name="alarm_message">Aliarmas: %1$s</string>
     <string name="message_short">Pranešimas:</string>
+    <string name="alarm_short">Aliarmas:</string>
     <string name="profilepercentage">Profilio procentas</string>
     <string name="percent_u">Procentais [%]:</string>
     <string name="startprofile">Pradėti profilį %1$d%% %2$d min</string>
@@ -1118,6 +1136,7 @@
     <string name="statuslights_copy_ns">Kopijuoti nustatymus iš NS</string>
     <string name="copyexistingvalues">Kopijuoti NS nustatymus (jei yra)?</string>
     <string name="classic_description">Originali išvaizda</string>
+    <string name="lowres_description">Žemos rezoliucijos išvaizda</string>
     <string name="buttonson_description">Mygtukai visada rodomi ekrano apačioje</string>
     <string name="largedisplay_description">Didelis ekranas</string>
     <string name="skin">Išvaizda</string>
@@ -1163,4 +1182,18 @@
     <string name="uploaded_data">Įkelti duomenis</string>
     <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Į jūsų Open Humans paskyrą bus įkelti šie duomenys: glikemijos reikšmės, bolusai, angliavandeniai, priežiūros portalo įvykiai (išskyrus pastabas), ištęstiniai bolusai, profilio pakeitimai, visos paros dozės, laikinos valandinės bazės, laikini tikslai, nustatymai, programos versija, įrenginio modelis ir ekrano matmenys. Konfidenciali ar privati ​​informacija, pvz., Jūsų Nightscout URL arba API slaptažodis, nebus įkelta.</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink statusas:</string>
+    <string name="filter">Filtruoti</string>
+    <string name="copytolocalprofile_invalid">Nepavyksta sukurti vietinio profilio. Profilis neteisingas.</string>
+    <string name="cta_dont_kill_my_app_info">Don\'t kill my app?</string>
+    <string name="alarm">Aliarmas</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Siųsti SMS, jei aptinkamas įrašas apie nepasiekiamą pompą</string>
+    <string name="smscommunicator_pump_ureachable">Pranešti apie nepasiekiamą pompą</string>
+    <string name="advisoralarm">Pranešti apie laiką valgyti</string>
+    <string name="alarminxmin">Pranešti po %1$d min</string>
+    <string name="bolusadvisor">Boluso patarėjas</string>
+    <string name="bolusadvisormessage">Jūsų glikemija yra aukšta. Užuot valgę dabar, turėtumėte palaukti, kol sumažės glikemija. Ar norite dabar susileisti korekcinį bolusą ir nustatyti priminimą, kada ateis laikas valgyti? Tokiu atveju angliavandeniai nebus įrašyti, o po priminimo turėsite vėl naudoti boluso skaičiuoklę.</string>
+    <string name="enablebolusadvisor">Įgalinti boluso patarėją</string>
+    <string name="enablebolusadvisor_summary">Jei jūsų glikemija yra aukšta, naudokite priminimą apie laiką valgyti, o ne Boluso patarėją</string>
+    <string name="time_to_eat">Laikas valgyti!\nĮjunkite Boluso patarėją ir atlikite skaičiavimą dar kartą.</string>
+    <string name="timetoeat">Laikas valgyti</string>
 </resources>

app/src/main/res/values-nl-rNL/exam.xml

@@ -1,167 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Wat is waar over DIA?</string>
-    <string name="dia_label_exam">Thema: Duur van Insuline Actie</string>
-    <string name="dia_minimumis3h">De minimumwaarde is 3 uur.</string>
+    <string name="dia_label_exam">Duur van insuline activiteit (DIA)</string>
+    <string name="dia_profile">Je moet de waarde voor DIA in je profiel instellen.</string>
     <string name="dia_minimumis5h">De minimumwaarde is 5 uur.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Configuration/Config-Builder.html#insuline</string>
-    <string name="dia_meaningisequaltodiapump">De betekenis is gelijk aan die van de DIA-parameter die in uw pomp wordt gebruikt.</string>
-    <string name="dia_valuemustbedetermined">U moet uw eigen waarde bepalen (maar niet minder dan 5 uur).</string>
-    <string name="hypott_label">Thema: Hypo Tijdelijk Streefdoel</string>
-    <string name="hypott_whenhypott">Wat is de primaire reden om een hypo TT in te stellen?</string>
-    <string name="hypott_goinglow">Voorkomen dat BG te laag wordt als er al een tijdelijk basaal van 0 (nul-temp) wordt uitgevoerd.</string>
-    <string name="hypott_preventoversmb">Om te voorkomen dat AAPS te veel insuline toedient na een stijging veroorzaakt door snelwerkende koolhydraten gebruikt voor de behandeling van een lage BG.</string>
+    <string name="dia_meaningisequaltodiapump">Als je er zeker van bent dat de waarde voor DIA die je in je pomp hebt gebruikt voor AndroidAPS, goed werkte, dan is het niet nodig om deze te wijzigen als je begint met loopen.</string>
+    <string name="dia_valuemustbedetermined">Je moet voor jezelf de juiste waarde voor DIA bepalen.</string>
+    <string name="hypott_label">Hypo Tijdelijk streefdoel</string>
+    <string name="hypott_whenhypott">Wat is de primaire reden om een Hypo tijdelijk streefdoel in te stellen?</string>
+    <string name="hypott_wrongbasal">Om te corrigeren voor hypo\'s veroorzaakt door onjuiste basaalstanden.</string>
+    <string name="hypott_preventoversmb">Om te voorkomen dat AndroidAPS overcorrigeert voor een bloedglucosestijging veroorzaakt door de snel werkende koolhydraten die gebruikt worden voor een hypo.</string>
+    <string name="hypott_exercise">Om te corrigeren voor een hypo veroorzaakt door inspanning.</string>
+    <string name="hypott_0basal">Om te voorkomen dat de bloedglucose te laag wordt als er al een tijdelijke basaalstand van 0% actief is.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Welk profiel kan offline worden gebruikt én worden aangepast?</string>
     <string name="offlineprofile_label">Thema: offline profiel</string>
     <string name="offlineprofile_nsprofile">NS-Profiel kan worden gebruikt, maar niet worden aangepast.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Configuration/Config-Builder.html#profiel</string>
-    <string name="pumpdisconnect_label">Onderwerp: Ontkoppelen van de Pomp</string>
-    <string name="pumpdisconnect_letknow">Klik op \'pomp ontkoppelen\' zodat AAPS weet dat er geen insuline wordt afgeleverd.</string>
-    <string name="pumpdisconnect_suspend">Klik op \'lus onderbreken\' zodat AAPS stopt met loopen terwijl de pomp is losgekoppeld.</string>
-    <string name="pumpdisconnect_dontchnage">Verander niets in AAPS, koppel gewoon de pomp af.</string>
+    <string name="pumpdisconnect_label">Reden voor het toepassen van \"Verbreek verbinding met pomp\" in AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">Wat moet er gebeuren wanneer pomp wordt losgekoppeld?</string>
+    <string name="pumpdisconnect_unnecessary">Dit is onnodig omdat er geen isuline toegediend zal worden als de pomp fysiek losgekoppeld is.</string>
+    <string name="pumpdisconnect_missinginsulin">Het voorkomt dat AndroidAPS insuline meerekent, die niet werd toegediend terwijl de pomp fysiek losgekoppeld was. </string>
+    <string name="pumpdisconnect_notstop">Het zal de insulineafgifte niet stoppen als de pomp verbonden blijft.</string>
+    <string name="pumpdisconnect_openloop">Het zal AndroidAPS in open loop modus zetten.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Getting-Started/FAQ.html#overige-instellingen</string>
-    <string name="objectives_label">Onderwerp: AndroidAPS Instellingen</string>
-    <string name="objectives_howtosave">Welke dingen kun je het beste doen om een back-up van uw instellingen te maken?</string>
-    <string name="objectives_exportsettings">Exporteer de instellingen vanuit het menu Onderhoud.</string>
-    <string name="objectives_storeelsewhere">Sla het geëxporteerde bestand op in een andere locatie zoals e-mail, Dropbox, Google-station…</string>
-    <string name="objectives_doexportonstart">Exporteer deze direct na de installatie van AAPS.</string>
-    <string name="objectives_doexportafterchange">Exporteer ze na het wijzigen van instellingen.</string>
-    <string name="objectives_doexportafterobjective">Exporteer ze na het voltooien van een doel.</string>
-    <string name="objectives_doexportafterfirtssettings">Exporteer deze nadat u de eerste instellingen heeft afgemaakt.</string>
+    <string name="objectives_label">AndroidAPS instellingen</string>
+    <string name="objectives2_label">AndroidAPS instellingen</string>
+    <string name="objectives_howtosave">Welke dingen kun je het beste doen om een back-up van je instellingen te maken?</string>
+    <string name="objectives_notesettings">Je hoeft je instellingen niet te exporteren, zolang je ze ergens noteert.</string>
+    <string name="objectives_afterobjective">Exporteer je instellingen nadat je een doel hebt bereikt.</string>
+    <string name="objectives_afterchange">Exporteer je instellingen na het wijzigen van instellingen.</string>
+    <string name="objectives_afterinitialsetup">Exporteer je instellingen nadat je de initiële instellingen hebt voltooid en je voorkeuren hebt ingesteld.</string>
+    <string name="objectives2_maintenance">Exporteer je instellingen lokaal via het Onderhoud-menu.</string>
+    <string name="objectives2_internalstorage">Je instellingenbestand is op je telefoon te vinden in de map Internal Storage/AAPS/preferences.</string>
+    <string name="objectives2_cloud">Kopieer je instellingenbestand naar een veilige locatie buiten je telefoon (bijvoorbeeld met behulp van een cloudopslagdienst, door je telefoon met een kabel met de computer te verbinden, per e-mail, etc.)</string>
+    <string name="objectives2_easyrestore">Als je telefoon beschadigd of verloren raakt, zijn er eenvoudige manieren om zonder back-up op afstand je instellingen te herstellen.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Getting-Started/FAQ.html#welke-spullen-moet-ik bij-me-hebben-voor-noodgevallen</string>
-    <string name="noisycgm_label">Onderwerp: Ruis in CGM-Uitlezingen</string>
+    <string name="noisycgm_label">Ruis in CGM-metingen</string>
     <string name="noisycgm_whattodo">Wat moet er gebeuren als CGM-gegevens ruis vertonen?</string>
-    <string name="nothing">Niets, AAPS zal het oplossen.</string>
-    <string name="noisycgm_pause">Schakel de Loop uit om overdosering te voorkomen.</string>
-    <string name="noisycgm_replacesensor">Vervang de CGM-sensor.</string>
-    <string name="noisycgm_turnoffphone">Schakel de telefoon uit.</string>
+    <string name="noisycgm_nothing">Doe niets - AndroidAPS zal er iets aan doen.</string>
+    <string name="noisycgm_pause">Schakel de closed loop uit om te voorkomen dat de closed loop over- of onderdoseert.</string>
+    <string name="noisycgm_replacesensor">Vervang sensoren die consequent ruis geven of inaccuraat zijn.</string>
+    <string name="noisycgm_checksmoothing">Zorg dat je CGM-app de BG-gegevens vloeiend maakt.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#filteren-van-bloed-glucose-waardes</string>
-    <string name="noisycgm_checksmoothing">Zorg dat uw CGM-app de BG-gegevens vloeiend maakt.</string>
-    <string name="exercise_label">Onderwerp: Fysieke inspanning</string>
-    <string name="exercise_whattodo">Hoe kunt u het systeem helpen zich aan te passen bij sporten?</string>
-    <string name="exercise_setactivitytt">Met behulp van de tijdelijk streefdoel functie.</string>
-    <string name="exercise_switchprofilebelow100">Pas het profiel percentage aan naar een waarde onder de 100%.</string>
-    <string name="exercise_switchprofileabove100">Pas het profiel percentage aan naar een waarde boven de 100%.</string>
-    <string name="exercise_stoploop">Stop de Loop.</string>
-    <string name="exercise_doitbeforestart">Stel een tijdelijk streefdoel in voorafgaand aan het starten met sporten.</string>
-    <string name="exercise_afterstart">Het instellen van een tijdelijk streefdoel nadat u met sporten bent gestart, leidt tot slechtere resultaten dan wanneer u dit enige tijd voorafgaand aan het sporten had ingesteld.</string>
+    <string name="exerciseprofile_label">Beweging en profielen</string>
+    <string name="exerciseprofile_whattodo">Hoe kun je profielen gebruiken om het systeem het beste te helpen omgaan met conditietraining?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Doe een profielwissel naar minder dan 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Doe een profielwissel naar meer dan 100%. </string>
+    <string name="exerciseprofile_leaveat100">Laat het profiel op 100% staan.</string>
+    <string name="exerciseprofile_suspendloop">Onderbreek de loop.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/temptarget.html#activiteit-tijdelijk-streefdoel</string>
+    <string name="exercise_label">Inspanning en tijdelijke doelen</string>
+    <string name="exercise_whattodo">Hoe kun je tijdelijke doelen gebruiken om het systeem het beste te helpen omgaan met conditietraining?</string>
+    <string name="exercise_settt">Stel een Activiteit tijdelijk streefdoel in dat start vóór de inspanning.</string>
+    <string name="exercise_setfinished">Stel een Activiteit tijdelijk streefdoel in dat start na de inspanning.</string>
+    <string name="exercise_setunchanged">Je streefdoel ongewijzigd laten.</string>
+    <string name="exercise_15g">Wachten totdat de bloedclose tot onder het Hypo tijdelijk streefdoel daalt en dan 15 g snelwerkende koolhydraten eten.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/temptarget.html#activiteit-tijdelijk-streefdoel</string>
-    <string name="suspendloop_label">Onderwerp: Uitgeschakelde/onderbroken loop</string>
+    <string name="suspendloop_label">Uitgeschakelde/onderbroken loop</string>
     <string name="suspendloop_doigetinsulin">Ontvang ik insuline wanneer de Loop is uitgeschakeld/onderbroken?</string>
     <string name="suspendloop_yes">Ja, de basale insuline wordt nog steeds geleverd.</string>
     <string name="suspendloop_no">Nee, de levering van insuline is gestopt.</string>
-    <string name="basaltest_label">Onderwerp: Testen van Basaal, ISF en IC</string>
-    <string name="basaltest_when">Wanneer moet ik de basaal, ISF, en KH-waarden uittesten?</string>
-    <string name="basaltest_beforeloop">Voordat ik begin te loopen.</string>
-    <string name="basaltest_havingregularhypo">Wanneer je vaak een lage BG hebt.</string>
-    <string name="basaltest_havingregularhyper">Wanneer je vaak een hoge BG hebt.</string>
+    <string name="basaltest_label">Testen van Basaal, ISF en I:C</string>
+    <string name="basaltest_when">Wanneer moeten deze waarden gevalideerd worden?</string>
+    <string name="basaltest_beforeloop">Voordat je begint met loopen.</string>
+    <string name="basaltest_havingregularhighlow">Wanneer je vaak hoge of lage bloedglucoses hebt.</string>
+    <string name="basaltest_weekly">Minstens één keer per week.</string>
+    <string name="basaltest_fixed">Eenmaal ingesteld en gevalideerd, hoeven deze waarden niet veranderd te worden in de loop der tijd.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Getting-Started/FAQ.html#androidaps-instellingen</string>
-    <string name="prerequisites_label">Onderwerp: Vereisten</string>
-    <string name="prerequisites_what">Wat heb ik nodig?</string>
-    <string name="prerequisites_determinedcorrectprofile">Goed geteste profielgegevens (Basaal, KH ratio, ISF, DIA).</string>
-    <string name="prerequisites_computer">Een computer om een APK te maken.</string>
+    <string name="prerequisites_label">Vereisten</string>
+    <string name="prerequisites_what">Wat is essentieel voor het opzetten en gebruiken van AndroidAPS?</string>
+    <string name="prerequisites_determinedcorrectprofile">Goed geteste profielgegevens (Basaal, KH-ratio, ISF, DIA).</string>
+    <string name="prerequisites_computer">Een computer waarop Android Studio is geïnstalleerd en geconfigureerd.</string>
     <string name="prerequisites_phone">Een geschikte telefoon.</string>
-    <string name="prerequisites_car">Een auto.</string>
-    <string name="prerequisites_nightscout">Nightscout om de doelstellingen te halen.</string>
+    <string name="prerequisites_pump">Een ondersteunde insulinepomp als je van plan bent een closed loop te gebruiken.</string>
+    <string name="prerequisites_nightscout">Nightscout, om een logboek van alle gegevens bij te houden en instellingen te bekijken.</string>
     <string name="prerequisites_tidepoolaccount">Een Tidepool account.</string>
     <string name="prerequisites_googleaccount">Een Google account.</string>
     <string name="prerequisites_githubaccount">Een Github account.</string>
-    <string name="prerequisites_beanandroiddeveloper">Ervaring met Android ontwikkeling.</string>
+    <string name="prerequisites_beanandroiddeveloper">Ervaar met programmeren of code aanpassen.</string>
     <string name="prerequisites_own670g">Een MiniMed 670G pomp.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Module/module.html</string>
     <string name="prerequisites_smartwatch">Een Smartwatch.</string>
     <string name="prerequisites_supportedcgm">Een geschikte CGM.</string>
-    <string name="update_label">Onderwerp: Bijwerken van AndroidAPS</string>
-    <string name="whatistrue">Wat is waar?</string>
-    <string name="update_git">Je moet Git geïnstalleerd hebben.</string>
-    <string name="update_asap">Update zodra nieuwe versie wordt vrijgegeven en je genoeg tijd hebt om het te doen.</string>
-    <string name="update_keys">Gebruik dezelfde ondertekeningssleutels.</string>
+    <string name="prerequisites2_label">Vereisten</string>
+    <string name="prerequisites2_what">Wat is essentieel voor het opzetten en gebruiken van AndroidAPS?</string>
+    <string name="prerequisites2_profile">Gevalideerde informatie om een profiel op te zetten (ISF, I:C ratio, basaalstanden, DIA etc.).</string>
+    <string name="prerequisites2_device">Een ondersteund Android apparaat (bijvoorbeeld een mobiele telefoon, volledig Android-horloge of een tablet).</string>
+    <string name="prerequisites2_internet">AndroidAPS heeft een internetverbinding nodig om in closed loop modus te kunnen werken.</string>
+    <string name="prerequisites2_supportedcgm">Een ondersteunde CGM en geschikte app om bloedglucosewaarden te ontvangen op je telefoon/apparaat.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Module/module.html</string>
+    <string name="update_label">AndroidAPS updaten</string>
+    <string name="whatistrue">Selecteer alle juiste antwoorden.</string>
+    <string name="update_git">Je moet Git geïnstalleerd en geconfigureerd hebben op je computer.</string>
+    <string name="update_asap">Wanneer nieuwe versies van AndroidAPS zijn uitgebracht, kunnen eerdere versies na een bepaalde tijd vanaf afsptand beperkt worden.</string>
+    <string name="update_keys">Je moet de locatie van de keystore onthouden en dezelfde signing key gebruiken voor updates als bij je vorige installatie.</string>
     <string name="update_neverupdate">Doe nooit een update als het systeem goed werkt.</string>
-    <string name="update_askfriend">Vraag uw vriend om de nieuwe APK.</string>
+    <string name="update_askfriend">Als je moeite hebt met het bouwen van de apk, kun je een apk installeren die is gebouwd door een vriend.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Installing-AndroidAPS/Update-to-new-version.html#bijwerken-naar-een-nieuwe-versie</string>
-    <string name="troubleshooting_label">Onderwerp: Problemen oplossen</string>
-    <string name="troubleshooting_wheretoask">Waar kun je hulp vinden?</string>
-    <string name="troubleshooting_fb">Wordt lid van de AndroidAPS Facebook-groep.</string>
-    <string name="troubleshooting_wiki">Lees de volledige AndroidAPS documentatie (kies voor Nederlands in het menu)</string>
-    <string name="troubleshooting_gitter">Bezoek de AndroidAPS Gitter Room.</string>
-    <string name="troubleshooting_googlesupport">Bezoek AndroidAPS Google-ondersteuning</string>
-    <string name="troubleshooting_yourendo">Praat met je internist.</string>
+    <string name="troubleshooting_label">Probleemoplossing</string>
+    <string name="troubleshooting_wheretoask">Waar kan je hulp zoeken voor AndroidAPS?</string>
+    <string name="troubleshooting_fb">Je kunt om advies vragen in de AndroidAPS Users Facebookgroep.</string>
+    <string name="troubleshooting_wiki">Je moet de AndroidAPS documentatie lezen (en opnieuw lezen).</string>
+    <string name="troubleshooting_gitter">Je kunt om advies vragen en technische problemen bespreken in de AndroidAPS Gitter-room.</string>
+    <string name="troubleshooting_yourendo">Je moet hulp vragen aan je behandelteam.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Installing-AndroidAPS/Update-to-new-version.html#problemen-oplossen</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">Onderwerp: Insuline Plugins</string>
-    <string name="insulin_ultrarapid">Welk merk insuline kan worden gebruikt met de \'Ultra-Rapid-Oref\' plugin?</string>
+    <string name="insulin_label">Insuline-plugins</string>
+    <string name="insulin_ultrarapid">Welke insuline gebruik je met de Ultra-Rapid Oref plugin?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid ®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin R®/\"regular\" menselijke insuline.</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Configuration/Config-Builder.html#insuline</string>
-    <string name="sensitivity_label">Thema: Gevoeligheid Plugin</string>
-    <string name="sensitivity_which">Welk gevoeligheidsalgoritme heeft een configureerbaar tijdbereik?</string>
+    <string name="sensitivity_label">Gevoeligheidsplugins</string>
+    <string name="sensitivity_which">Selecteer alle juiste antwoorden.</string>
+    <string name="sensitivity_adjust">Gevoeligheidsplugins stellen AndroidAPS in staat om aan te passen aan tijdelijke of kortstondige veranderingen in insulinegevoeligheid (bijvoorbeeld hormonale veranderingen of problemen met insuline-opname bij de infuusplaats).</string>
+    <string name="sensitivity_edit">Gevoeligheidsplugins bieden de gebruiker suggesties voor wijzigingen aan basaaalstanden, I:C ratio\'s en ISF die kunnen worden gebruikt om het profiel mee aan te passen.</string>
+    <string name="sensitivity_cannula">Het vastleggen van een canulewissel zet de Autosens-ratio terug naar 100%.</string>
+    <string name="sensitivity_time">Sommige van de plugins hebben configureerbare tijdbereiken die kunnen worden ingesteld door de gebruiker.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Welke gevoeligheidsplugin moet worden gebruikt voor de UAM-functie?</string>
-    <string name="wrongcarbs_label">Onderwerp: koolhydraten invoer fouten</string>
+    <string name="wrongcarbs_label">Koolhydraatinvoerfouten</string>
     <string name="wrongcarbs_whattodo">Wat moet u doen als u een onjuiste hoeveelheid koolhydraten hebt ingevoerd?</string>
-    <string name="wrongcarbs_treatmentstab">In Behandelingen verwijdert u de onjuiste invoer. Voer nieuwe koolhydraten in.</string>
-    <string name="wrongcarbs_addfakeinsulin">Voeg nep insuline toe met behulp van de \'Refill\' functie</string>
-    <string name="extendedcarbs_label">Onderwerp: Voedsel met Vet en Eiwit</string>
-    <string name="extendedcarbs_handling">Wat te doen als je eten een grote hoeveelheid vet en/of eiwitten bevat?</string>
-    <string name="extendedcarbs_useextendedcarbs">Reken vetten en eiwitten om naar koolhydraten en gebruik de functie \"Vertraagde koolhydraten (eCarbs)\".</string>
-    <string name="extendedcarbs_add">Reken vetten en eiwitten om naar koolhydraten en voeg dit toe aan de boluscalculator.</string>
-    <string name="extendedcarbs_useextendedbolus">Gebruik een uitgestelde bolus om het effect van vet en eiwitten af te dekken.</string>
+    <string name="wrongcarbs_treatmentstab">Verwijder het onjuiste record in Behandelingen en voer de juiste koolhydraten opnieuw in.</string>
+    <string name="wrongcarbs_addinsulin">Bolus met insuline met behulp van het infusieset uitvulmenu.</string>
+    <string name="wrongcarbs_donothing">Doe niets – AndroidAPS zal de juiste aanpassingen maken.</string>
+    <string name="wrongcarbs_bolus">Bolus met insuline met behulp van de insuline (bolus) knop in het Overzicht.</string>
+    <string name="wronginsulin_label">Insulinetoediening/-invoerfouten</string>
+    <string name="wronginsulin_whattodo">Wat moet je doen wanneer je minder insuline toegediend hebt gekregen dan de geschiedenis van de pomp suggereert, bijvoorbeeld vanwege een verstopping, een lekkende canule of door het vergeten de pomp opnieuw aan te koppelen na een douche? </string>
+    <string name="wronginsulin_careportal">Verwijder de insulinegegevens uit het Nightscout Careportal om deze uit de pompgeschiedenis te verwijderen.</string>
+    <string name="wronginsulin_compare">Vergelijk de waarden in AndroidAPS met de pompgeschiedenis.</string>
+    <string name="wronginsulin_prime">Bolus een deel van je berekende \'gemiste\' insuline door een injectiespuit/pen of door de uitvulfunctie te gebruiken.</string>
+    <string name="wronginsulin_donothing">Doe niets en laat AndroidAPS de resulterende hoge bloedglucosespiegel corrigeren.</string>
+    <string name="iob_label">Insuline aan boord (IOB)</string>
+    <string name="iob_which">Selecteer alle juiste antwoorden.</string>
+    <string name="iob_value">De IOB-waarde wordt beïnvloed door eerdere tijdelijke basaalstanden.</string>
+    <string name="iob_hightemp">Een hoge tijdelijke basaal zal niet worden ingesteld wanneer je bloedsuiker onder het streefdoel ligt.</string>
+    <string name="iob_negiob">Negatieve IOB voor een aanzienlijke periode vrij van inspanning, suggereert dat je profiel te hoog is ingesteld, dus dat er minder insuline nodig is.</string>
+    <string name="iob_posiob">Positieve IOB voor een aanzienlijke periode suggereert insulineresistentie of onaangekondigde maaltijden.</string>
+    <string name="breadgrams_label">Koolhydraatinvoer en bolussen</string>
+    <string name="breadgrams_grams">Alleen grammen moeten worden gebruikt voor het schatten en opgeven van koolhydraten.</string>
+    <string name="breadgrams_exchange">Koolhydraten kunnen worden geregistreerd met behulp van een geschikt uitwisselingssysteem (bv. DAFNE \"CHO\" of Europese \"Bread Units\").</string>
+    <string name="breadgrams_decay">AndroidAPS gebruikt een dynamisch model om koolhydraat\"verval\" te schatten en COB te berekenen.</string>
+    <string name="breadgrams_calc">Als de bloedglucosespiegels buiten aanvaardbare waarden liggen (te laag of te hoog), kan de boluscalculator worden gebruikt om suggesties te doen voor koolhydraat-of insuline-correcties.</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">e-carbs</string>
+    <string name="extendedcarbs_handling">Waarvoor kun je e-carbs (uigestelde koolhydraten) gebruiken?</string>
+    <string name="extendedcarbs_future">Om koolhydraten in de toekomst te plannen, mogelijk verdeeld over een interval (vergelijkbaar met een verlengde bolus die insuline over een interval verspreidt).</string>
+    <string name="extendedcarbs_free">Voor het loggen van koolhydraten voor inspanning die je wilt verbergen voor AndroidAPS.</string>
+    <string name="extendedcarbs_fat">e-cards (verdeeld in de toekomst) kunnen AndroidAPS helpen bij het omgaan met maaltijden met een hoog vet-/eiwitgehalte.</string>
+    <string name="extendedcarbs_rescue">Voor het vastleggen van reddingskoolhydraten die je gebruikt voor de behandeling van een lage bloedglucose. </string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Onderwerp: volgen op afstand</string>
-    <string name="nsclient_howcanyou">Hoe kun je AAPS van je kind op afstand volgen?</string>
-    <string name="nsclient_nightscout">Met behulp van een Nightscout site.</string>
-    <string name="nsclient_dexcomfollow">Dexcom volgapp als u de originele Dexcom app gebruikt (alleen BG).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Volg-app als u gebruik maakt van de xDrip app.</string>
-    <string name="nsclient_xdripfollower">xDrip app in volg-modus.</string>
-    <string name="nsclient_looponiphone">Loop app op de iPhone.</string>
-    <string name="nsclient_spikeiphone">Spike app op de iPhone.</string>
+    <string name="nsclient_label">Bewaking op afstand</string>
+    <string name="nsclient_howcanyou">Hoe kun je AndroidAPS (bijvoorbeeld voor je kind) op afstand bewaken?</string>
+    <string name="nsclient_nightscout">De NS Client-app, Nightscout-app en Nightscout-webpagina maken het mogelijk om AndroidAPS op afstand te volgen.</string>
+    <string name="nsclient_dexcomfollow">Met andere apps (bijv. Dexcom follow, xDrip in follow mode) kun je enkele gegevens (bijv. bloedglucose/sensorwaarden) op afstand volgen, maar deze gebruiken andere algoritmen en kunnen daardoor onjuiste IOB-of COB-waarden tonen.</string>
+    <string name="nsclient_data">Om AndroidAPS op afstand te volgen, moeten beide apparaten internettoegang hebben (bijvoorbeeld via Wi-Fi of mobiele netwerkgegevens).</string>
+    <string name="nsclient_fullcontrol">NS Client ingesteld als een remote follower maakt het mogelijk om AndroidAPS te volgen en er volledige controle over te hebben.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Children/Children.html</string>
-    <string name="isf_label_exam">Thema: Insulinegevoeligheidsfactor</string>
-    <string name="isf_increasingvalue">Hogere ISF-waarden leiden tot minder insulineafgifte wanneer AAPS voor hoge BG corrigeert.</string>
-    <string name="isf_decreasingvalue">Lagere ISF-waarden leiden tot minder insulineafgifte wanneer AAPS voor hoge BG corrigeert.</string>
-    <string name="isf_noeffect">Het wijzigen van de ISF-waarden heeft geen effect op de hoeveelheid insuline die wordt geleverd wanneer AAPS voor hoge BG corrigeert.</string>
-    <string name="isf_preferences">U moet ISF invoeren in Instellingen.</string>
+    <string name="isf_label_exam">Insulinegevoeligheidsfactor (ISF)</string>
+    <string name="isf_increasingvalue">Het verhogen van de ISF-waarde zal leiden tot meer insulinetoediening om een dezelfde hoeveelheid koolhydraten te dekken.</string>
+    <string name="isf_decreasingvalue">Het verlagen van de ISF-waarde leidt tot meer insulinetoediening om een verhoogde bloedglucose te corrigeren.</string>
+    <string name="isf_noeffect">Verhoging of verlaging van de ISF heeft geen effect op de insulinetoediening wanneer de bloedglucosespiegel lager is dan de streefwaarde.</string>
+    <string name="isf_preferences">ISF moet worden ingevoerd in je AndroidAPS-voorkeuren.</string>
     <string name="isf_profile">Het wijzigen van de ISF-waarde in uw profiel is voldoende om de wijziging toe te passen.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Getting-Started/FAQ.html#insuline-gevoeligheids-factor-insulin-sensitivity-factor-ISF-mmol-l-E-of-mg-dl-E</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Thema: KH ratio</string>
-    <string name="ic_increasingvalue">Hogere KH ratios leiden tot minder insuline afgifte voor een bepaalde hoeveelheid koolhydraten.</string>
-    <string name="ic_decreasingvalue">Lagere KH ratios leiden tot minder insuline afgifte voor een bepaalde hoeveelheid koolhydraten.</string>
-    <string name="ic_noeffect">Als je 0 COB hebt zal het veranderen van KH ratio leiden tot een andere hoeveelheid insuline om jouw BG te corrigeren.</string>
-    <string name="ic_different">KH ratio zal anders zijn als je een brood-eenheid telt als 10g of 12g koolhydraten.</string>
-    <string name="ic_meaning">KH ratio betekent: Hoeveel koolhydraten gebruik je voor 1E insuline.</string>
+    <string name="ic_multiple">Je kunt meer dan één waarde voor KH-ratio in je profiel gebruiken.</string>
+    <string name="ic_isf">Als je je ISF verandert in je profiel, moet je ook altijd de KH-ratio veranderen.</string>
+    <string name="ic_label_exam">Koolhydraatratio (KH-ratio)</string>
+    <string name="ic_increasingvalue">Hogere KH-ratio\'s leiden tot minder insulinetoediening voor dezelfde hoeveelheid koolhydraten.</string>
+    <string name="ic_decreasingvalue">Lagere KH-ratio\'s leiden tot minder insulinetoediening voor dezelfde hoeveelheid koolhydraten.</string>
+    <string name="ic_noeffect">Als je 0 COB hebt zal het veranderen van KH-ratio leiden tot een andere hoeveelheid insuline om jouw BG te corrigeren.</string>
+    <string name="ic_different">KH-ratio is anders als je een brood-eenheid telt als10g of als 12g koolhydraten.</string>
+    <string name="ic_meaning">KH-ratio betekent: hoeveel brood-eenheden gebruik je voor 1U insuline.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Getting-Started/FAQ.html#Koolhydraat-ratio-KH-g-E</string>
-    <string name="profileswitch_label">Onderwerp: Profiel wissels</string>
-    <string name="profileswitch_pctwillchange"> Bij het opgeven van 90% in je profiel wissel…</string>
-    <string name="profileswitch_basalhigher">Basalen zullen 10% hoger zijn.</string>
-    <string name="profileswitch_basallower">Basalen zullen 10% lager zijn.</string>
-    <string name="profileswitch_ichigher">De KH ratio zal 10% hoger worden.</string>
-    <string name="profileswitch_iclower">De KH ratio zal 10% lager worden.</string>
+    <string name="profileswitch_label">Profielwissels</string>
+    <string name="profileswitch_pctwillchange"> Welke antwoorden zijn correct bij het opgeven van een 90% profielwissel?</string>
+    <string name="profileswitch_basallower">De basaalstanden worden 10% lager.</string>
     <string name="profileswitch_isfhigher">ISF-waarde wordt 10% hoger.</string>
-    <string name="profileswitch_isflower">ISF-waarde wordt 10% lager.</string>
-    <string name="profileswitch_overall">In totaal zul je ongeveer 10% minder insuline krijgen.</string>
-    <string name="profileswitch_targethigher">Doel zal 10% hoger zijn.</string>
-    <string name="profileswitch_targetlower">Doel zal 10% lager zijn.</string>
-    <string name="profileswitch_targetbottom">Alleen de onderste target zal 10% lager zijn.</string>
+    <string name="profileswitch_iclower">De waarde van de KH-ratio wordt 10% lager.</string>
+    <string name="profileswitch_unchanged">De ISF en KH-ratio blijven ongewijzigd.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Profiles.html?highlight=profilewitch#profiel-wissel</string>
-    <string name="profileswitchtime_iwant">Als u 1 uur eerder dan normaal wakker wordt, hoe moet u dan AAPS van deze wijziging in uw schema op de hoogte stellen?</string>
-    <string name="profileswitchtime_1">Voer een profielwijziging uit met een tijdverschuiving van 1</string>
-    <string name="profileswitchtime__1">Voer een profiel wissel uit met een tijdverschuiving van -1</string>
+    <string name="profileswitch2_label">Profielwissels</string>
+    <string name="profileswitch2_pctwillchange"> Welke antwoorden zijn correct bij het opgeven van een 120% profielwissel?</string>
+    <string name="profileswitch2_bghigher">De streefwaarde wordt 20% hoger.</string>
+    <string name="profileswitch2_basalhigher">De basaalstanden worden 20% hoger.</string>
+    <string name="profileswitch2_bgunchanged">Het BG streefdoel blijft ongewijzigd.</string>
+    <string name="profileswitch2_isfhigher">De ISF-waarde wordt 20% hoger.</string>
+    <string name="profileswitchtime_label">Profielwissels</string>
+    <string name="profileswitchtime_iwant">Als je 2 uur eerder opstaat dan normaal, hoe moet je AndroidAPS dan laten weten dat jouw dagschema is veranderd?</string>
+    <string name="profileswitchtime_2">Voer een profiel wissel uit met een tijdverschuiving van 2</string>
+    <string name="profileswitchtime__2">Voer een profiel wissel uit met een tijdverschuiving van -2</string>
+    <string name="profileswitchtime_tt">Stel een Eet binnenkort Tijdelijk streefdoel in.</string>
+    <string name="profileswitchtime_100">Doe een profielwissel naar meer dan 100%. </string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Profiles.html?highlight=profilewitch#tijd-verschuiving</string>
-    <string name="profileswitchtime_60">Voer een profiel wissel uit met een tijdverschuiving van 60</string>
-    <string name="profileswitchtime__60">Voer een profiel wissel uit met een tijdverschuiving van -60</string>
+    <string name="profileswitch4_label">Aanpassen van profielen</string>
+    <string name="profileswitch4_rates">Basaalstanden, ISF, KH-ratio\'s, etc, moeten in profielen worden ingesteld.</string>
+    <string name="profileswitch4_internet">Om veranderingen in je Nightscout Profiel te activeren, moet je AndroidAPS telefoon met internet verbonden zijn.</string>
+    <string name="profileswitch4_sufficient">Een profiel bewerken is voldoende om eventuele wijzigingen door te voeren.</string>
+    <string name="profileswitch4_multi">Er kunnen meerdere profielen worden ingesteld en geselecteerd om tegemoet te komen aan veranderende omstandigheden (bijvoorbeeld hormonale veranderingen, shift werk-, weekdagen/weekendlevensstijl).</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Module/module.html#goed-individueel-doserings-algoritme-voor-jouw-diabetesbehandeling</string>
-    <string name="basalhelp_label">Onderwerp: Hulp met basaal waarden</string>
+    <string name="basalhelp_label">Hulp met basaalstanden</string>
     <string name="basalhelp_where">Waar je terecht kunt voor hulp met basaal waarden etc.</string>
     <string name="basalhelp_diabetesteam">Jouw behandelaars</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Andere medicatie</string>
-    <string name="other_medication_text">AAPS vermindert BR om bloedsuiker te verhogen. Geneesmiddelen van de groep SGLT2-remmers (gliflozins) kunnen de verwachte toename in BG voorkomen en kunnen dus een gevaarlijk insulinekort (DKA) veroorzaken.
-\nGemeenschappelijke merknamen zijn: Invokana ®, Forxiga ®, Jardiance ®, Steglatro ®, Suglat ®, Apleway ®, Deberza ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\nIk beloof hierbij dat ik dergelijke geneesmiddelen niet zal nemen wanneer ik AAPS gebruik of de lus zal deactiveren voordat ik deze medicijnen gebruik.</string>
+    <string name="other_medication_label">Andere medicijnen. Lees de verklaring hieronder en vink het vakje aan om de verklaring te accepteren.</string>
+    <string name="other_medication_text">AndroidAPS vermindert de basaalstanden of stopt de insulinetoediening om de bloedsuiker te verhogen. Medicijnen in de klasse SGLT2-remmers (gliflozines) kunnen een stijging van bloedglucose voorkomen en kunnen daardoor een gevaarlijk insulinetekort veroorzaken dat leidt tot diabetische ketoacidose.
+\nBekende merknamen zijn: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nIk verklaar dat ik dergelijke medicijnen niet zal gebruiken wanneer ik AndroidAPS gebruik, of dat ik de loop zal deactiveren voordat ik met deze medicijnen start.</string>
 </resources>

app/src/main/res/values-nl-rNL/objectives.xml

@@ -21,7 +21,7 @@
     <string name="objectives_smb_objective">Activeren van extra functies overdag zoals SMB (super micro bolus)</string>
     <string name="objectives_auto_objective">Automatisering inschakelen</string>
     <string name="objectives_smb_gate">Lees de wiki en verhoog maxIOB om SMB goed werkend te krijgen. Een goed begin is maxIOB=gemiddelde maaltijdbolus + 3 x max dagelijkse basaal</string>
-    <string name="objectives_auto_gate">Zorg ervoor dat je goed begrijpt hoe automatisering werkt voordat je jouw eerste eenvoudige regel aanmaakt. In plaats van de regel een actie te laten uitvoeren, laat hem alleen een notificatie tonen. Pas als je zeker weet dat de automatisering op het juiste moment wordt geactiveerd, vervang je de melding door een echte actie. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
+    <string name="objectives_auto_gate">Zorg ervoor dat je goed begrijpt hoe automatisering werkt voordat je jouw eerste eenvoudige regel aanmaakt. In plaats van de regel een actie te laten uitvoeren, laat hem alleen een notificatie tonen. Pas als je zeker weet dat de automatisering op het juiste moment wordt geactiveerd, vervang je de melding door een echte actie. (https://androidaps.readthedocs.io/en/latest/NL/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">BG beschikbaar in NS</string>
     <string name="objectives_pumpstatusavailableinns">Pomp status beschikbaar in NS</string>
     <string name="objectives_manualenacts">Handmatige aanpassingen</string>
@@ -40,7 +40,7 @@
     <string name="codeaccepted">Code geaccepteerd</string>
     <string name="codeinvalid">Code ongeldig</string>
     <string name="objectives_exam_objective">Bewijs je kennis</string>
-    <string name="objectives_exam_gate">Bestudeer en beantwoord de vragen correct</string>
+    <string name="objectives_exam_gate">Beantwoord de vragen.  Bij elke vraag worden vier antwoordmogelijkheden gegeven. Het kan zijn dat er meer dan één antwoord moet worden aangevinkt. Vink alle antwoorden aan die jij denkt dat juist zijn en kies VERIFIEER.</string>
     <string name="answerdisabledto">Beantwoorden uitgeschakeld tot: %1$s</string>
     <string name="wronganswer">Verkeerd antwoord!</string>
     <string name="unfinshed_button">Volgende onvoltooide</string>

app/src/main/res/values-nl-rNL/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Behandelingen veiligheid</string>
     <string name="treatmentssafety_maxbolus_title">Max toegestane bolus [E]</string>
     <string name="treatmentssafety_maxcarbs_title">Max toegestane koolhydraten [g]</string>
+    <string name="nav_preferences_plugin">%1$s Instellingen</string>
     <string name="nav_preferences">Instellingen</string>
     <string name="nav_refreshtreatments">Haal behandelingen op van NS</string>
     <string name="nav_resetdb">Reset database</string>
@@ -22,20 +23,20 @@
     <string name="description_insulin_rapid">Insuline instelling voor Humalog en NovoRapid / NovoLog</string>
     <string name="description_insulin_ultra_rapid">Insuline instelling voor Fiasp</string>
     <string name="description_insulin_lyumjev">Insuline instelling voor Lyumjev</string>
-    <string name="description_insulin_free_peak">Hiermee kan je de piek van de insulineactiviteit definiëren en deze mag alleen worden gebruikt door gevorderde gebruikers</string>
+    <string name="description_insulin_free_peak">Hiermee kan je de piek van de insulineactiviteit definiëren, mag alleen worden gebruikt door gevorderde gebruikers</string>
     <string name="description_loop">Activeer of deactiveer de implementatie die de Loop triggert.</string>
     <string name="description_ns_client">Synchroniseert je data met Nightscout</string>
     <string name="description_ama">Het algoritme uit 2017</string>
     <string name="description_smb">Meest recente algoritme voor gevorderde gebruikers</string>
     <string name="description_overview">Toont de huidige Loop-status en knoppen voor meest gebruikte acties</string>
     <string name="description_persistent_notification">Toont een permanente melding met een beknopt overzicht van hetgeen de Loop momenteel doet</string>
-    <string name="description_profile_local">Maak een profiel dat je offline kunt gebruiken.</string>
+    <string name="description_profile_local">Gebruik profiel(en) die je in AAPS aanmaakt en offline kunt gebruiken.</string>
     <string name="description_profile_nightscout">Gebruik profiel(en) die je hebt aangemaakt in Nightscout</string>
     <string name="description_pump_combo">Pomp integratie voor Accu-Chek Combo pompen, vereist dat ruffy geïnstalleerd is</string>
     <string name="description_pump_mdi">Pomp integratie voor mensen met pen-therapie (meerdere dagelijkse injecties)</string>
     <string name="description_pump_virtual">Pomp integratie voor pompen, waar nog geen driver voor is (Open Loop)</string>
-    <string name="description_sensitivity_aaps">Gevoeligheid wordt berekend op dezelfde manier als Oref0, maar je kunt een tijdframe naar het verleden specificeren. Minimale koolhydraat absorptie is berekend op basis van max koolhydraat absorptie tijd zoals in jouw instellingen.</string>
-    <string name="description_sensitivity_oref1">Gevoeligheid wordt berekend met gegevens van de afgelopen 8 of 24 uur (de meest gevoelige van die twee) en koolhydraten (indien niet geabsorbeerd) worden hiervan afgehaald, na de duur die is opgegeven in de instellingen. Berekend ook UAM.</string>
+    <string name="description_sensitivity_aaps">Gevoeligheid wordt berekend op dezelfde manier als Oref0, maar je kunt zelf instellen hoeveel uren AAPS terugkijkt. Minimale koolhydraat absorptie is berekend op basis van max koolhydraat absorptie tijd zoals in jouw instellingen.</string>
+    <string name="description_sensitivity_oref1">Gevoeligheid wordt berekend met gegevens van de afgelopen 8 of 24 uur (de meest gevoelige van die twee) en koolhydraten (indien niet geabsorbeerd) worden hiervan afgehaald, na de duur die is opgegeven in de instellingen. Berekent ook UAM.</string>
     <string name="description_sensitivity_weighted_average">Gevoeligheid wordt berekend als een gewogen gemiddelde van afwijkingen. Nieuwere afwijkingen wegen hierbij zwaarder. Minimale koolhydraat absorptie is berekend op basis van de max koolhydraat absorptie tijd uit jouw instellingen. Dit algoritme is de snelste in het volgen van wijzigingen van de gevoeligheid.</string>
     <string name="description_source_eversense">Ontvang BG waardes van de aangepaste Eversense app.</string>
     <string name="description_source_glimp">Ontvang BG waardes van Glimp.</string>
@@ -92,7 +93,7 @@
     <string name="configbuilder_profile">Profiel</string>
     <string name="configbuilder_profile_description">Welk profiel moet AndroidAPS gebruiken?</string>
     <string name="configbuilder_aps">APS</string>
-    <string name="configbuilder_aps_description">Welke APS algoritme moet therapie aanpassingen maken?</string>
+    <string name="configbuilder_aps_description">Welk APS algoritme moet therapie aanpassingen maken?</string>
     <string name="configbuilder_general">Algemeen</string>
     <string name="configbuilder_general_description">Dit zijn enkele algemene plugins die handig kunnen zijn.</string>
     <string name="configbuilder_constraints_description">Welke beperkingen worden toegepast?</string>
@@ -164,9 +165,9 @@
     <string name="preferences_import_canceled">Importeren geannuleerd! Instellingen zijn NIET geïmporteerd!</string>
     <string name="preferences_import_impossible">Kan voorkeuren niet importeren!</string>
     <string name="goto_main_try_again">Ga terug naar het hoofdscherm en probeer opnieuw.</string>
-    <string name="old_master_password">Oud hoofdwachtwoord</string>
-    <string name="different_password_used">Dit bestand is geëxporteerd en gecodeerd met een ander hoofdwachtwoord. Geef het oude hoofdwachtwoord op om het bestand te kunnen decoderen.</string>
-    <string name="master_password_will_be_replaced">Als gevolg van het importeren, zal het huidige hoofdwachtwoord worden vervangen door het oude hoofdwachtwoord!</string>
+    <string name="old_master_password">Oud masterwachtwoord</string>
+    <string name="different_password_used">Dit bestand is geëxporteerd en gecodeerd met een ander masterwachtwoord. Geef het oude masterwachtwoord op om het bestand te kunnen decoderen.</string>
+    <string name="master_password_will_be_replaced">Als gevolg van het importeren, zal het huidige masterwachtwoord worden vervangen door het oude masterwachtwoord!</string>
     <string name="preferences_import_list_title">Kies bestand om te importeren</string>
     <string name="check_preferences_before_import">Controleer instellingen voor het importeren:</string>
     <string name="check_preferences_cannot_import">Instellingen kunnen niet worden geïmporteerd!</string>
@@ -331,7 +332,7 @@
     <string name="loop_shortname">LOOP</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LP</string>
-    <string name="overview_shortname">HOME</string>
+    <string name="overview_shortname">OVZ</string>
     <string name="virtualpump_shortname">VPUMP</string>
     <string name="profileviewer_shortname">NSPROFIEL</string>
     <string name="treatments_shortname">BEHAND</string>
@@ -346,8 +347,8 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Standaard waarde: 4 Dit is een combinatie van enerzijds het OpenAPS veiligheid limieten en anderzijds van “3 x max dagelijks basaal; 4x actueel”. Dit betekent dat het basaal niet hoger kan ingesteld worden dan het ingestelde nummer keer het actueel basaal waarbij de limiet in de pomp geen invloed heeft. Dit is een veiligheidsmaatregel om te voorkomen dat patiënten in gevaarlijke laag bereik komen zonder te snappen hoe het algoritme werkt. Nogmaals de standaard waarde is 4x; de meeste zullen deze waarde nooit moeten aanpassen maar zullen eerder andere waardes moeten aanpassen als ze tegen een limiet aanstoten.</string>
     <string name="openapsama_autosens_max_summary">Standaard waarde: 1.2\nDit is een vermenigvuldigingsfactor voor autosense (en binnenkort autotune) die zorgt dat de autosens ratio maximaal 20%% kan zijn. Dit maximum bepaalt in hoeverre je basaal kan worden verhoogd, en hoeveel je ISF en BG doel verlaagd kunnen worden.</string>
     <string name="openapsama_autosens_min_summary">Standaard waarde: 0.7\nDit is de andere kan van de autosens veiligheid limiet. Dit zet een limiet op hoe laag het basaal kan aangepast worden, en hoe hoog het ISF en het streef BG.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens past ook de streefwaardes aan</string>
-    <string name="openapsama_autosens_adjusttargets_summary">Standaardwaarde: waar Dit wordt gebruikt om autosens de bevoegdheid te geven BG doelen aan te passen alsook ISF en basalen</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens past ook het streefdoel aan</string>
+    <string name="openapsama_autosens_adjusttargets_summary">Staat standaard aan\n Wanneer dit aan staat, kan Autosens het BG streefdoel hoger/lager zetten wanneer hij een veranderde insulinegevoeligheid detecteert.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Standaard waarde: 2\nBolus snooze is actief nadat je een maaltijd bolus toegediend hebt, zodat de loop geen tegenvoorstel met een verlaagd tijdelijk basaal doet nadat je gegeten hebt. Het voorbeeld hier van van standaard 2; dus een 3 u DIA betekent dat de bolus snooze gemiddeld 1.5u actief is (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Standaardwaarde: 3,0 (AMA) of 8,0 (SMB). Dit is een instelling voor de standaard koolhydraten absorptie-impact per 5 minuten. De standaard is een verwachte 3mg / dl / 5min. Dit is van invloed op hoe snel COB zijn opgenomen en hoeveel koolhydraten absorptie wordt verwacht, bij het voorspellen van toekomstige BG, wanneer BG meer dan verwacht daalt of niet zoveel stijgt als verwacht.</string>
     <string name="openapsama_link_to_preferncejson_doc_txt">Opgelet!\n Onderstaande waardes moeten normaal gezien niet worden aangepast. KLIK HIER en LEES de tekst zodat je alles volledig BEGRIJPT voordat je een waarde wijzigt.</string>
@@ -405,11 +406,18 @@
     <string name="suspendloopfor3h">Onderbreek loop voor 3u</string>
     <string name="suspendloopfor10h">Onderbreek loop voor 10u</string>
     <string name="suspendloopforXmin">Onderbreek loop voor %1$d min</string>
+    <string name="disconnectpump">Pomp afkoppelen</string>
     <string name="disconnectpumpfor15m">Verbreek verbinding 15min met pomp</string>
     <string name="disconnectpumpfor30m">Verbreek verbinding 30min met pomp</string>
     <string name="disconnectpumpfor1h">Verbreek verbinding 1u met pomp</string>
     <string name="disconnectpumpfor2h">Verbreek verbinding 2u met pomp</string>
     <string name="disconnectpumpfor3h">Verbreek verbinding 3u met pomp</string>
+    <string name="duration15m">15 min</string>
+    <string name="duration30m">30 min</string>
+    <string name="duration1h">1 uur</string>
+    <string name="duration2h">2 uur</string>
+    <string name="duration3h">3 uur</string>
+    <string name="duration10h">10 uur</string>
     <string name="resume">Hervatten</string>
     <string name="reconnect">Opnieuw verbinden met pomp</string>
     <string name="smscommunicator_wrongduration">Verkeerde tijdsduur</string>
@@ -478,7 +486,7 @@
     <string name="openaps">OpenAPS</string>
     <string name="uploader">Uploader</string>
     <string name="configbuilder_sensitivity">Gevoeligheid detectie</string>
-    <string name="configbuilder_sensitivity_description">Welke gevoeligheid algoritme moet worden gebruikt?</string>
+    <string name="configbuilder_sensitivity_description">Welk gevoeligheid algoritme moet worden gebruikt?</string>
     <string name="sensitivity_shortname">SENS</string>
     <string name="sensitivityoref1">Gevoeligheid Oref1</string>
     <string name="sensitivityaaps">Gevoeligheid AAPS</string>
@@ -516,12 +524,12 @@
     <string name="careportal_newnstreatment_percentage_label">Percentage</string>
     <string name="careportal_newnstreatment_timeshift_label">Tijd verschuiving</string>
     <string name="default_temptargets">Standaard tijdelijke streefdoelen</string>
-    <string name="eatingsoon_duration">Eet binnenkort periode</string>
-    <string name="eatingsoon_target">Eet binnenkort doel</string>
-    <string name="activity_duration">Periode van inspanning</string>
-    <string name="activity_target">Activiteits doel</string>
+    <string name="eatingsoon_duration">Eet binnenkort tijdsduur</string>
+    <string name="eatingsoon_target">Eet binnenkort streefdoel</string>
+    <string name="activity_duration">Activiteit tijdsduur</string>
+    <string name="activity_target">Activiteit streefdoel</string>
     <string name="hypo_duration">Hypo tijdsduur</string>
-    <string name="hypo_target">Hypo streefwaarde</string>
+    <string name="hypo_target">Hypo streefdoel</string>
     <string name="reuse">Herbruik</string>
     <string name="wearcontrol_title">Bedieningen via horloge</string>
     <string name="wearcontrol_summary">Stel tijdelijke doelen en bolussen in vanop je horloge.</string>
@@ -564,8 +572,6 @@
     <string name="overview_editquickwizard_usebasaliob">Basaal IOB berekening</string>
     <string name="overview_editquickwizard_usetrend">Trend berekening</string>
     <string name="overview_editquickwizard_usesuperbolus">Superbolus berekening</string>
-    <string name="yes">Ja</string>
-    <string name="no">Nee</string>
     <string name="positiveonly">Enkel positief</string>
     <string name="negativeonly">Enkel negatief</string>
     <string name="overview_editquickwizard_usecob">COB berekening</string>
@@ -612,12 +618,10 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">Niet genoeg insuline aanwezig in reservoir voor de bolus</string>
     <string name="extendedbolusdeliveryerror">Vertraagde bolus toedieningsfout</string>
     <string name="insightpump_shortname">Insight</string>
-    <string name="set_neutral_temps_title">Stel neutraal tijdelijk basaal in</string>
-    <string name="set_neutral_temps_summary">Als deze optie is ingeschakeld, wordt een tijdelijk basaal geannuleerd vlak voor het einde van elk uur. Handige optie voor sommige pompen die elk uur piepen/vibreren zolang een tijdelijk basaal actief is.</string>
     <string name="enablesmbalways">Activeer SMB altijd</string>
-    <string name="enablesmbalways_summary">SMB altijd aan onafhankelijk van bolussen. Enkel mogelijk met een BG bron met goed gefilterde data zoals de G5</string>
+    <string name="enablesmbalways_summary">SMB altijd aan, onafhankelijk van bolussen. Enkel mogelijk met een BG bron met goed gefilterde data zoals de G5 of G6</string>
     <string name="enablesmbaftercarbs">Activeer SMB na koolhydraten</string>
-    <string name="enablesmbaftercarbs_summary">SMB actief gedurende 6u, zelfs met 0 COB. Enkel mogelijk met een BG bron met goed gefilterde data zoals de G5</string>
+    <string name="enablesmbaftercarbs_summary">SMB actief gedurende 6u, zelfs met 0 COB. Enkel mogelijk met een BG bron met goed gefilterde data zoals de G5 of G6</string>
     <string name="enablesmbwithcob">Activeer SMB met Koolhydraten</string>
     <string name="enablesmbwithcob_summary">SMB actief tijdens actieve koolhydraten</string>
     <string name="enablesmbwithtemptarget">Gebruik SMB met tijdelijke streefdoelen</string>
@@ -679,6 +683,7 @@
     <string name="combo_error_failure_reading_changed_basal_rate">Basaal patroon op de pomp is gewijzigd, maar kunnen niet worden uitgelezen</string>
     <string name="combo_activity_checking_for_history_changes">Controle van historiek op wijzigingen</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Verschillende bolussen met dezelfde hoeveelheid op hetzelfde tijdstip zijn geïmporteerd. Er is er maar 1 toegevoegd aan de behandelingen lijst. Controleer op de pomp en voeg eventueel toe via het Careportal menu. Er mogen geen 2 bolussen op hetzelfde tijdstip aanwezig zijn.</string>
+    <string name="about_link_urls">\n\ndocumentatie:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <string name="combo_check_date">De laatste bolus is ouder dan 24 uren of bevind zich in de toekomst. Controleer de datum en tijd in de pomp aub.</string>
     <string name="combo_suspious_bolus_time">Datum/tijd van de geleverde bolus op de pomp is niet correct, IOB is waarschijnlijk foutief. Controleer aub de datum/tijd op de pomp.</string>
     <string name="profileswitch_ismissing">Profiel wissel ontbreekt. Doe aub een profiel wissel of duw op Activeer Profiel in het Lokale profiel.</string>
@@ -717,7 +722,7 @@
     <string name="absorption_cutoff_title">Maximum maaltijd absorptie tijd [uur]</string>
     <string name="absorption_cutoff_summary">Tijdspanne waarbinnen elke maaltijd volledig is opgenomen. Resterende KH worden niet mee gerekend.</string>
     <string name="time">Tijd</string>
-    <string name="overview_show_notes_field_in_dialogs_title">Toon het notities veld in het behandeling dialoog</string>
+    <string name="overview_show_notes_field_in_dialogs_title">Toon notities veld in behandeling dialoogvensters</string>
     <string name="next_button">Volgende</string>
     <string name="previous_button">Vorige</string>
     <string name="nav_setupwizard">Setup Wizard</string>
@@ -735,8 +740,8 @@
     <string name="connectionsettings_title">Verbindings instellingen</string>
     <string name="ns_wifi_allowedssids">Toegelaten SSIDs (gescheiden door puntkomma)</string>
     <string name="ns_allowroaming">Sta verbinding tijdens roaming toe</string>
-    <string name="openapsama_autosens_max">Max autosens factor</string>
-    <string name="openapsama_autosens_min">Min autosens factor</string>
+    <string name="openapsama_autosens_max">Max autosens ratio</string>
+    <string name="openapsama_autosens_min">Min autosens ratio</string>
     <string name="openapsama_bolussnooze_dia_divisor">Bolus snooze dia deler</string>
     <string name="openapsama_max_daily_safety_multiplier">Maximale dagelijkse veiligheids vermeningvuldigings factor</string>
     <string name="openapsama_current_basal_safety_multiplier">Huidige basaalstand veiligheids vermenigvuldigings factor</string>
@@ -761,8 +766,8 @@
     <string name="diawarning">Onthoud: nieuwe insuline profielen vereisen een minimale DIA van 5 uur. DIA 5 – 6h op nieuw profiel is gelijk aan DIA 3h op oude insuline profielen.</string>
     <string name="setupwizard_profile_description">Kies een bron van het profiel. Als de patiënt een kind is, moet u het NS-profiel gebruiken. Als er niemand is die je volgt op Nightscout, zul je waarschijnlijk een lokaal profiel prefereren. Onthoud dat u alleen de profielbron selecteert. Om het te gebruiken, moet u het activeren door \"Profiel wisselen\" uit te voeren</string>
     <string name="setupwizard_aps_description">Selecteer een van beschikbare algoritmen. Ze zijn gesorteerd van oudste naar nieuwste. Nieuwer algoritme is meestal krachtiger en agressiever. Dus als je een nieuwe looper bent, kun je waarschijnlijk beginnen met AMA en niet met de nieuwste. Vergeet niet de OpenAPS-documentatie te lezen en deze vóór gebruik te configureren.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Wachten op verbinding met RileyLink…\n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b>Opmerking:</b> je kunt de setup voortzetten zodra de pomp geïnitialiseerd is.\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Configureer uw RileyLink hieronder. Na het selecteren van een RileyLink, kun je doorgaan zodra de RileyLink status \"Verbonden\" is. Dit kan even duren.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Opmerking:</b> Je kunt doorgaan zodra de pomp is ingesteld.\n</string>
     <string name="startobjective">Start je eerste Doel</string>
     <string name="permission">Toestemming</string>
     <string name="askforpermission">Vragen om toestemming</string>
@@ -789,7 +794,6 @@
     <string name="sensitivity_raises_target_title">Gevoeligheid verhoogt het doel</string>
     <string name="sensitivity_raises_target_summary">Wanneer insulinegevoeligheid wordt gedetecteerd, wordt het BG streefdoel verhoogd</string>
     <string name="combo_invalid_setup">Ongeldige pompinstellingen, controleer de documenten en controleer of het Quick Info-menu QUICK INFO wordt genoemd met behulp van de 360-configuratiesoftware.</string>
-    <string name="custom">Aangepast</string>
     <string name="careportal_removestartedevents">Verwijder AndroidAPS start-meldingen</string>
     <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>
@@ -974,10 +978,12 @@
     <string name="twohours">2u</string>
     <string name="dexcom_app_patched">Dexcom App (patched)</string>
     <string name="dexcom_short">DXCM</string>
-    <string name="description_source_dexcom">Ontvang BG waardes van de aangepaste Dexcom G app.</string>
+    <string name="description_source_dexcom">Ontvang BG waardes van de aangepaste Dexcom app.</string>
     <string name="notification">Notificatie</string>
     <string name="notification_message">Notificatie: %1$s</string>
+    <string name="alarm_message">Alarm: %1$s</string>
     <string name="message_short">Boodsch:</string>
+    <string name="alarm_short">Alarm:</string>
     <string name="profilepercentage">Profiel percentage</string>
     <string name="percent_u">Procent [%]:</string>
     <string name="startprofile">Start profiel %1$d%% voor %2$d min</string>
@@ -1037,8 +1043,8 @@
     <string name="increasingmaxbasal">Verhogen van de maximale basaal waarde omdat de instelling lager is dan het maximum in het profiel</string>
     <string name="smscommunicator_messagebody">Ongeldige inhoud van het bericht</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
-    <string name="format_carbs_ic">%1$.0fg KH ratio: %2$.1f</string>
-    <string name="format_cob_ic">%1$.1fg KH ratio: %2$.1f</string>
+    <string name="format_carbs_ic">%1$.0fg KH-ratio: %2$.1f</string>
+    <string name="format_cob_ic">%1$.1fg KH-ratio: %2$.1f</string>
     <string name="format_percent">%1$d%%</string>
     <string name="boluswizard">Bolus wizard</string>
     <string name="unit_minute_short">min</string>
@@ -1047,12 +1053,12 @@
     <string name="unitsnosemicolon">Eenheden</string>
     <string name="doyouwantswitchprofile">Wilt u van profiel wisselen en de wijzigingen in het huidige profiel ongedaan maken?</string>
     <string name="objectives_button_unfinish">Voltooiing wissen</string>
-    <string name="objectives_button_unstart">Wissen gestart</string>
+    <string name="objectives_button_unstart">Start wissen</string>
     <string name="doyouwantresetstart">Wil je dit leerdoel opnieuw starten? Je kunt je voortgang verliezen.</string>
     <string name="setupwizard_units_prompt">Selecteer eenheden waarin je waarden wilt weergeven</string>
     <string name="ns_ploadlocalprofile">Upload lokale profielwijzigingen naar NS</string>
     <string name="dia_short">DIA</string>
-    <string name="ic_short">KH ratio</string>
+    <string name="ic_short">KH-ratio</string>
     <string name="isf_short">ISF</string>
     <string name="target_short">DOEL</string>
     <string name="clone_label">Dupliceren</string>
@@ -1177,4 +1183,17 @@
     <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">De volgende gegevens worden geüpload naar je Open Humans account: glucosewaarden, bolussen, koolhydraten, careportal-events (met uitzondering van notities), verlengde bolussen, profielwissels, totale dagelijkse doses, tijdelijke basaalstanden, tijdelijke doelen, voorkeuren, app-versie, apparaatmodel en schermafmetingen. Geheime of persoonlijke gegevens zoals je Nightscout-URL of API-secret worden niet geüpload.</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink Status:</string>
     <string name="filter">Filter</string>
+    <string name="copytolocalprofile_invalid">Lokaal profiel kan niet worden gemaakt. Profiel is ongeldig.</string>
+    <string name="cta_dont_kill_my_app_info">Don\'t kill my app?</string>
+    <string name="alarm">Alarm</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Stuur SMS wanneer de pomp onbereikbaar is</string>
+    <string name="smscommunicator_pump_ureachable">Melden wanneer de pomp onbereikbaar is</string>
+    <string name="advisoralarm">Start alarm wanneer het tijd is om te eten</string>
+    <string name="alarminxmin">Start alarm over %1$d min</string>
+    <string name="bolusadvisor">Bolusadviseur</string>
+    <string name="bolusadvisormessage">Je hebt een hoge bloedglucose. In plaats van te eten, is het nu aan te raden om te wachten op een betere bloedglucose. Wil je nu een correctiebolus uitvoeren en je herinneren wanneer het tijd is om te eten? In dit geval worden er geen koolhydraten opgenomen en moet je de wizard opnieuw gebruiken wanneer we je eraan herinneren.</string>
+    <string name="enablebolusadvisor">Bolusadviseur inschakelen</string>
+    <string name="enablebolusadvisor_summary">Gebruik bij een hoge bloedglucose niet de wizard maar een herinnering om met eten te beginnen</string>
+    <string name="time_to_eat">Tijd om te eten!\nVoer de boluswizard opnieuw uit.</string>
+    <string name="timetoeat">Tijd om te eten</string>
 </resources>

app/src/main/res/values-no-rNO/exam.xml

@@ -1,167 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Hva er riktig om DIA?</string>
-    <string name="dia_label_exam">Tema: Insulinvarighet (DIA)</string>
-    <string name="dia_minimumis3h">Minimumsverdien er 3 timer.</string>
-    <string name="dia_minimumis5h">Minimumsverdien er 5 timer.</string>
+    <string name="dia_label_exam">Insulinets virkningstid (DIA)</string>
+    <string name="dia_profile">Du skal sette verdien for DIA i profilen din.</string>
+    <string name="dia_minimumis5h">Minimum tillatt DIA verdi er 5 timer.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">Betydningen er lik DIA verdien angitt i pumpen.</string>
-    <string name="dia_valuemustbedetermined">Du må bestemme din individuelle verdi (men ikke mindre enn 5 timer).</string>
-    <string name="hypott_label">Tema: Hypo Temp Target</string>
-    <string name="hypott_whenhypott">Hva er hovedgrunnen til å velge en hypo TT?</string>
-    <string name="hypott_goinglow">Forhindre at BS går lavt hvis du allerede har en null temp gående.</string>
-    <string name="hypott_preventoversmb">Forhindre at AAPS skal doserer for mye insulin etter en BS stigning forårsaket av hurtigvirkende karbohydrater gitt for å behandle et lavt BS.</string>
+    <string name="dia_meaningisequaltodiapump">Hvis du føler at DIA verdien som du benyttet i pumpen fungerte godt før du tok i bruk AndroidAPS, da er det ikke nødvendig å endre dette når du starter å loope.</string>
+    <string name="dia_valuemustbedetermined">Du må selv bestemme hvilken verdi som passer for DIA.</string>
+    <string name="hypott_label">Hypo Temp-Target (TT)</string>
+    <string name="hypott_whenhypott">Hva er hovedgrunnen til å velge en hypo temp-target?</string>
+    <string name="hypott_wrongbasal">For å korrigere følinger som er forårsaket av feil i dine basalinnstillinger.</string>
+    <string name="hypott_preventoversmb">For å forhindre at AndroidAPS overkorrigerer for hurtigvirkende karbohydrater som er inntatt for å behandle en føling.</string>
+    <string name="hypott_exercise">For å korrigere for en føling som er et resultat av trening.</string>
+    <string name="hypott_0basal">For å forhindre at blodsukkeret blir lavt selv om basaldosen allerede er 0%.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Hvilken profiltype kan brukes og konfigureres offline?</string>
     <string name="offlineprofile_label">Tema: Offline profil</string>
     <string name="offlineprofile_nsprofile">NS profil kan brukes, men ikke konfigureres.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Tema: koble fra pumpen</string>
-    <string name="pumpdisconnect_letknow">Trykk på \"Koble fra pumpen\" slik at AAPS vet at ingen insulin vil bli levert.</string>
-    <string name="pumpdisconnect_suspend">Trykk \"Pause loop\" så AAPS stopper å loope mens pumpen er frakoblet.</string>
-    <string name="pumpdisconnect_dontchnage">Endre ikke på noe i AAPS, koble bare fra pumpen.</string>
+    <string name="pumpdisconnect_label">Årsaker for å velge \"Koble fra pumpen\" i AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">Hva bør gjøres innen du kobler fra pumpen?</string>
+    <string name="pumpdisconnect_unnecessary">Dette er unødvendig siden insulin ikke vil bli levert hvis pumpen er fysisk frakoblet.</string>
+    <string name="pumpdisconnect_missinginsulin">Det hjelper AndroidAPS å forstå at ingen insulin ble levert mens pumpen var fysisk frakoblet</string>
+    <string name="pumpdisconnect_notstop">Insulinleveransen vil ikke stoppes hvis pumpen er fortsatt tilkoblet.</string>
+    <string name="pumpdisconnect_openloop">Det vil sette AndroidAPS i åpen loop tilstand.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Tema: AndroidAPS innstillinger</string>
-    <string name="objectives_howtosave">Hva er beste praksis for å ta backup av dine innstillinger?</string>
-    <string name="objectives_exportsettings">Eksportere dem lokalt fra Vedlikeholds menyen.</string>
-    <string name="objectives_storeelsewhere">Lagre den eksporterte filen til en annen plass som epost, Dropbox, Google Drive…</string>
-    <string name="objectives_doexportonstart">Eksporter dem rett etter installeringen av AAPS.</string>
-    <string name="objectives_doexportafterchange">Eksporter dem rett etter at du har gjort endringer i dine innstillinger.</string>
-    <string name="objectives_doexportafterobjective">Eksporter dem etter at du har fullført et nytt læringsmål.</string>
-    <string name="objectives_doexportafterfirtssettings">Eksporter dem etter at du har avsluttet dine første innstillinger.</string>
+    <string name="objectives_label">AndroidAPS innstillinger</string>
+    <string name="objectives2_label">AndroidAPS innstillinger</string>
+    <string name="objectives_howtosave">Hva er beste metode for å ta backup av dine innstillinger?</string>
+    <string name="objectives_notesettings">Du trenger ikke å eksportere dine innstillinger hvis du har skrevet dem ned.</string>
+    <string name="objectives_afterobjective">Eksporter dine innstillinger etter at du har avsluttet et læringsmål.</string>
+    <string name="objectives_afterchange">Eksporter dine innstillingene etter at du har gjort endringer på noen av dem.</string>
+    <string name="objectives_afterinitialsetup">Eksporter dine innstillinger etter at du har avsluttet de første grunnleggende innstillinger og angitt dine preferanser.</string>
+    <string name="objectives2_maintenance">Eksporter dine innstillinger lokalt ved hjelp av vedlikeholdsmenyen.</string>
+    <string name="objectives2_internalstorage">Den eksporterte innstillings filen finnes i mappen Intern lagring/AAPS/preferences på din mobil.</string>
+    <string name="objectives2_cloud">Kopier din innstillingsfil til en trygg plass utenfor din telefon (f.eks. ved å bruke skylagring, koble mobil til PC via kabel, epost etc.)</string>
+    <string name="objectives2_easyrestore">Hvis din mobil er ødelagt eller mistet, finnes det enkle metoder for å gjenopprette dine innstillinger uten å bruke mobil backup.</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">Emne: CGM-målingern med støy</string>
+    <string name="noisycgm_label">Støy i CGM målinger</string>
     <string name="noisycgm_whattodo">Hva bør gjøres hvis CGM data har støy?</string>
-    <string name="nothing">Ingenting, AAPS vil håndtere det.</string>
-    <string name="noisycgm_pause">Deaktiver loop for å unngå overdosering.</string>
-    <string name="noisycgm_replacesensor">Bytt CGM sensor.</string>
-    <string name="noisycgm_turnoffphone">Slå av telefonen.</string>
+    <string name="noisycgm_nothing">Gjør ingenting - AndroidAPS vil håndtere det.</string>
+    <string name="noisycgm_pause">Deaktiver lukket loop for å unngå mulig over- eller underdosering.</string>
+    <string name="noisycgm_replacesensor">Bytt alltid ut støyete eller unøyaktige sensorer.</string>
+    <string name="noisycgm_checksmoothing">Kontroller at din CGM app leverer glattede data.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">Kontroller at CGM appen din jevner ut BS målinger.</string>
-    <string name="exercise_label">Tema: Trening</string>
-    <string name="exercise_whattodo">Hvordan kan du hjelpe systemet med å håndtere trening?</string>
-    <string name="exercise_setactivitytt">Ved å bruke funksjonen for temp target/mål.</string>
-    <string name="exercise_switchprofilebelow100">Gjør et profilbytte til under 100%.</string>
-    <string name="exercise_switchprofileabove100">Gjør et profilbytte til over 100%.</string>
-    <string name="exercise_stoploop">Stopp loop.</string>
-    <string name="exercise_doitbeforestart">Angi et \"aktivitet\" temp mål før du begynner treningen.</string>
-    <string name="exercise_afterstart">Å angi et \"aktivitet\" temp mål etter at du har startet treningen fører til dårligere resultater enn om man startet før.</string>
+    <string name="exerciseprofile_label">Trening og profiler</string>
+    <string name="exerciseprofile_whattodo">Hvordan kan du bruke profiler for å hjelpe systemet med å håndtere treninger?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Gjør et profilbytte til mindre enn 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Gjør et profilbytte til mer enn 100%</string>
+    <string name="exerciseprofile_leaveat100">La profilen være på 100%.</string>
+    <string name="exerciseprofile_suspendloop">Pause loop.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#active temp-target</string>
+    <string name="exercise_label">Trening og midlertidige målverdier (temp targets)</string>
+    <string name="exercise_whattodo">Hvordan kan du bruke midlertidige målverdier til å hjelpe systemet å håndtere aerobic trening?</string>
+    <string name="exercise_settt">Sett et midlertidig mål for blodsukkeret som starter en passende tid før treningen begynner.</string>
+    <string name="exercise_setfinished">Angi en temp mål for Trening etter at du har avsluttet treningen.</string>
+    <string name="exercise_setunchanged">La målverdien for ditt blodsukker være uforandret.</string>
+    <string name="exercise_15g">Vent til blodsukkeret ditt synker under Hypo temp target og spis så 15 gram med hurtigvirkende karbohydrater.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#active temp-target</string>
-    <string name="suspendloop_label">Tema: Stanset/pauset loop</string>
+    <string name="suspendloop_label">Deaktiver/pause loop</string>
     <string name="suspendloop_doigetinsulin">Får jag insulin når loop er stanset/pauset?</string>
     <string name="suspendloop_yes">Ja, basal insulin vil fortsatt bli levert.</string>
     <string name="suspendloop_no">Nei, levering av insulin er stanset.</string>
-    <string name="basaltest_label">Tema: Basal, ISF og IK testing</string>
-    <string name="basaltest_when">Når bør jeg validere basal, ISF og IK verdier?</string>
-    <string name="basaltest_beforeloop">Før jeg begynner å loope.</string>
-    <string name="basaltest_havingregularhypo">Om du ofte opplever lave BS verdier.</string>
-    <string name="basaltest_havingregularhyper">Om du ofte opplever høye BS verdier.</string>
+    <string name="basaltest_label">Test av basaldoser, ISF og KH ratio</string>
+    <string name="basaltest_when">Når skal disse verdiene testes og verifiseres?</string>
+    <string name="basaltest_beforeloop">Før du starter med looping.</string>
+    <string name="basaltest_havingregularhighlow">Når du opplever hyppige høye eller lave blodsukkerverdier.</string>
+    <string name="basaltest_weekly">Minst en gang i uken.</string>
+    <string name="basaltest_fixed">Når du har innstilt og validert verdiene vil de ikke endre seg over tid.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Tema: Forutsetninger før oppstart</string>
-    <string name="prerequisites_what">Hva trenger jeg?</string>
+    <string name="prerequisites_label">Forutsetninger</string>
+    <string name="prerequisites_what">Hva er nødvendig for å installere og bruke AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Validert profil informasjon (basal, IK, ISF, DIA).</string>
-    <string name="prerequisites_computer">En datamaskin for å lage en APK.</string>
+    <string name="prerequisites_computer">En computer hvor Android Studio er installert og konfigurert.</string>
     <string name="prerequisites_phone">En telefon som støttes.</string>
-    <string name="prerequisites_car">En bil.</string>
-    <string name="prerequisites_nightscout">Nightscout for å klare læringsmålene.</string>
+    <string name="prerequisites_pump">En kompatibel insulinpumpe hvis du planlegger å kjøre lukket loop.</string>
+    <string name="prerequisites_nightscout">Nightscout, for å logge alle dine data og kontrollere dine innstillinger.</string>
     <string name="prerequisites_tidepoolaccount">En Tidepool konto.</string>
     <string name="prerequisites_googleaccount">En Google konto.</string>
     <string name="prerequisites_githubaccount">En Github konto.</string>
-    <string name="prerequisites_beanandroiddeveloper">Erfaring med Android programmering.</string>
+    <string name="prerequisites_beanandroiddeveloper">Erfaring fra programmering eller redigering av kode.</string>
     <string name="prerequisites_own670g">En MiniMed 670G pumpe.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">En smartklokke.</string>
     <string name="prerequisites_supportedcgm">En CGM som støttes.</string>
-    <string name="update_label">Tema: Oppdatering av AndroidAPS</string>
-    <string name="whatistrue">Hva er sant?</string>
-    <string name="update_git">Du må ha Git installert.</string>
-    <string name="update_asap">Oppdater så snart den nye versjonen er publisert og du har nok tid til å gjøre det.</string>
-    <string name="update_keys">Du bør bruke de samme signeringsnøklene.</string>
+    <string name="prerequisites2_label">Forutsetninger</string>
+    <string name="prerequisites2_what">Hva er nødvendig å installere for å bruke AndroidAPS?</string>
+    <string name="prerequisites2_profile">Validert informasjon for å konfigurere din profil (ISF, KH ratio, basal doser, DIA etc.).</string>
+    <string name="prerequisites2_device">En kompatibel Android enhet (f.eks. mobiltelefon, full Android klokke, eller nettbrett).</string>
+    <string name="prerequisites2_internet">AndroidAPS krever en internett forbindelse for å kunne kjøre lukket loop.</string>
+    <string name="prerequisites2_supportedcgm">En støttet CGM og passende app som mottar blodsukkerverdier på mobilen/enheten.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">Oppdatering av AndroidAPS</string>
+    <string name="whatistrue">Kontroller alle riktige svar.</string>
+    <string name="update_git">Du må ha Git installert og konfigurert på din PC.</string>
+    <string name="update_asap">Når oppdaterte versjoner av AndroidAPS lanseres kan tidligere versjoner få begrenset funksjonalitet etter en tidsperiode.</string>
+    <string name="update_keys">Du må lagre og notere lokasjonen for din keystore og benytte samme signeringsnøkkel for bygging av oppdateringen som forrige installasjon.</string>
     <string name="update_neverupdate">Aldri oppdater hvis systemet fungerer bra.</string>
-    <string name="update_askfriend">Spør en venn om den nye APK filen.</string>
+    <string name="update_askfriend">Hvis du har problemer med å bygge apk filen, kan du installere en apk som er bygget av en venn.</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">Tema: Feilsøking</string>
-    <string name="troubleshooting_wheretoask">Hvor skal jeg lete etter hjelp?</string>
-    <string name="troubleshooting_fb">Bli medlem av AndroidAPS Facebook gruppen.</string>
-    <string name="troubleshooting_wiki">Les AndroidAPS dokumentasjonen.</string>
-    <string name="troubleshooting_gitter">Besøk AndroidAPS Gitter rommet.</string>
-    <string name="troubleshooting_googlesupport">Besøk AndroidAPS Google support</string>
-    <string name="troubleshooting_yourendo">Snakk med din diabeteslege.</string>
+    <string name="troubleshooting_label">Feilsøking</string>
+    <string name="troubleshooting_wheretoask">Hvor kan du søke etter hjelp for AndroidAPS?</string>
+    <string name="troubleshooting_fb">Du kan be om råd i Facebookgruppen AndroidAPS Users.</string>
+    <string name="troubleshooting_wiki">Du bør lese (og lese om igjen) AndroidAPS dokumentasjonen.</string>
+    <string name="troubleshooting_gitter">Du kan be om råd og logge tekniske problemer eller hendelser i AndroidAPS Gitter.</string>
+    <string name="troubleshooting_yourendo">Du bør spørre din diabetesklinikk/endokrinolog.</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">Tema: Insulin plugin</string>
-    <string name="insulin_ultrarapid">Hvilke typer insulin kan brukes sammen med insulinprofilen \"Ultra-Rapid-Oref\"?</string>
+    <string name="insulin_label">Insulin plugin modul</string>
+    <string name="insulin_ultrarapid">Hvilken insulin skal du bruke sammens med Ultra-Rapid Oref modulen?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">Novorapid®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin R®/\"regulært\" humant insulin.</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Tema: Sensitivitet plugin</string>
-    <string name="sensitivity_which">Hvilken sensitivitetsalgoritme har et konfigurerbart tidsintervall?</string>
+    <string name="sensitivity_label">Sensitivitets plugin</string>
+    <string name="sensitivity_which">Kontroller alle riktige svar.</string>
+    <string name="sensitivity_adjust">Sensitivitets plugin gjør det mulig for AndroidAPS å gjøre midlertidige og kortvarige justeringer av insulin sensitivitet (f. eks. hormonelle forandringer eller problemer med absorpsjon ved innstikkstedet).</string>
+    <string name="sensitivity_edit">Sensitivitets plugin gir brukeren forslag til endringer i basaldoser, KH ratio og ISF som kan benyttes til å redigere profilen.</string>
+    <string name="sensitivity_cannula">Hvis du logger bytte av kanyle vil Autosens verdien tilbakestilles til 100%.</string>
+    <string name="sensitivity_time">Noen plugins har konfigurerbare tidsintervall som kan settes av brukeren.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Hvilken sensitivitets plugin må anvendes for å bruke UAM funksjonen?</string>
-    <string name="wrongcarbs_label">Tema: Feilaktig registrering av karbohydrater</string>
+    <string name="wrongcarbs_label">Feil i KH angivelse</string>
     <string name="wrongcarbs_whattodo">Hva skal du gjøre hvis du har gjort en feilaktig registrering av karbohydrater?</string>
-    <string name="wrongcarbs_treatmentstab">I Behandlinger, slett den feilaktige registreringen og legg inn karbohydrater på nytt.</string>
-    <string name="wrongcarbs_addfakeinsulin">Legg inn falsk insulin ved å bruke prime/fyll funksjonen</string>
-    <string name="extendedcarbs_label">Tema: Mat med fett og protein</string>
-    <string name="extendedcarbs_handling">Hva skal du gjøre om maten inneholder store mengder fett og/eller proteiner?</string>
-    <string name="extendedcarbs_useextendedcarbs">Regn om fett og proteiner til karbohydrater og bruk eKarbo funksjonen.</string>
-    <string name="extendedcarbs_add">Regn om fett og proteiner til karbohydrater og legg det til bolus beregningen.</string>
-    <string name="extendedcarbs_useextendedbolus">Bruk forlenget bolus til å dekke inntaket av fett og proteiner.</string>
+    <string name="wrongcarbs_treatmentstab">Fjern den feilaktige registreringen i Behandlinger og legg inn riktig verdi for karbohydrater.</string>
+    <string name="wrongcarbs_addinsulin">Gi insulinbolus ved å bruke prime funksjonen for infusjonssettet.</string>
+    <string name="wrongcarbs_donothing">Gjør ingenting - AndroidAPS vil gjøre nødvendige justeringer.</string>
+    <string name="wrongcarbs_bolus">Gi bolus ved hjelp av Insulin knappen på hjem/oversikts siden.</string>
+    <string name="wronginsulin_label">Feil i insulin levering/registrering</string>
+    <string name="wronginsulin_whattodo">Hva ska du gjøre hvis du har fått mindre insulin enn hva pumpens historikk viser, f.eks. på grunn av okklusjon, feil med kanyle eller om du har glemt å koble på pumpen etter en dusj</string>
+    <string name="wronginsulin_careportal">Fjern insulindata fra Nightscout slik at det slettes fra pumpens historikk.</string>
+    <string name="wronginsulin_compare">Sammenligne verdier i AndroidAPS og pumpehistorikk.</string>
+    <string name="wronginsulin_prime">Gi en bolus med en del av det insulinet du mangler enten med penn eller ved å bruke prime funksjonen.</string>
+    <string name="wronginsulin_donothing">Ikke gjør noe og la AndroidAPS korrigere eventuelle høye blodsukkerverdier.</string>
+    <string name="iob_label">Aktivt insulin (IOB)</string>
+    <string name="iob_which">Marker alle riktige svar.</string>
+    <string name="iob_value">IOB verdi påvirkes av midlertidige temp basaler.</string>
+    <string name="iob_hightemp">Høy temp basal vil ikke bli gitt når ditt blodsukker er under målverdi.</string>
+    <string name="iob_negiob">Negativ IOB i en lengre periode selv om du ikke trener tyder på at profilen din gir for mye insulin og kanskje bør reduseres i innstillingene.</string>
+    <string name="iob_posiob">Positiv IOB for en lengre periode tyder på enten økt insulinresistens eller uannonserte måltider.</string>
+    <string name="breadgrams_label">Karbohydrater og bolus</string>
+    <string name="breadgrams_grams">Bare gram skal benyttes for å estimere og registrere spiste karbohydrater.</string>
+    <string name="breadgrams_exchange">Karbohydrater som konsumeres kan registreres ved hjelp av et passende byttesystem (f.eks. DAFNE \"CHO\" eller europeiske \"brødenheter\").</string>
+    <string name="breadgrams_decay">AndroidAPS bruker en dynamisk modell til å beregne karbohydrat opptaket og beregne COB.</string>
+    <string name="breadgrams_calc">Hvis blodsukkernivået er utenfor akseptable verdier (for lavt eller for høy), kan boluskalkulatoren brukes til å gi forslag til korreksjoner for karbohydrater eller insulin.</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">e-Karbo</string>
+    <string name="extendedcarbs_handling">Hva kan du bruke e-karbohydrater (forlengede karbohydrater) til?</string>
+    <string name="extendedcarbs_future">For å angi karbohydrater i fremtiden og/eller fordele dem over et tidsintervall (tilsvarende en forlenget bolus over et intervall).</string>
+    <string name="extendedcarbs_free">For å logge \"frie\" treningskarbohydrater som du vil skjule for AndroidAPS.</string>
+    <string name="extendedcarbs_fat">E-karbo som er fordelt i fremtiden kan hjelpe AndroidAPS å håndtere måltider som er fett/proteinrike.</string>
+    <string name="extendedcarbs_rescue">For å registrere karbohydrater som brukes til å korrigere lavt blodsukker</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Tema: Fjernovervåking</string>
-    <string name="nsclient_howcanyou">Hvordan kan du overvåke AAPS for ditt barn på avstand?</string>
-    <string name="nsclient_nightscout">Ved å bruke Nightscout.</string>
-    <string name="nsclient_dexcomfollow">Dexcom Follow app hvis du bruker Dexcom appen (bare for BS).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow hvis du bruker xDrip appen.</string>
-    <string name="nsclient_xdripfollower">xDrip app kjører i følger-modus.</string>
-    <string name="nsclient_looponiphone">Loop app på iPhone.</string>
-    <string name="nsclient_spikeiphone">Spike app på iPhone.</string>
+    <string name="nsclient_label">Fjernovervåking</string>
+    <string name="nsclient_howcanyou">Hvordan kan du overvåke AndroidAPS (for eksempel for ditt barn) på avstand?</string>
+    <string name="nsclient_nightscout">NS Client appen, Nightscout app og websiden for Nightscout gir alle muligheter for å følge AndroidAPS på avstand.</string>
+    <string name="nsclient_dexcomfollow">Andre apper (f.eks. Dexcom follow, xDrip som kjører i følger modus) lar deg følge noen parametere (f.eks. blodsukker/sensor verdier) på avstand, men bruker forskjellige beregningsmetoder og kan derfor vise andre IOB eller COB verdier.</string>
+    <string name="nsclient_data">For å følge AndroidAPS på avstand må begge enhetene ha Internett-tilgang (f.eks. via Wi-Fi eller mobildata).</string>
+    <string name="nsclient_fullcontrol">NS Client som brukes som en ekstern følger vil både overvåke og gi full kontroll over AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Tema: Insulin sensitivitetsfaktor (ISF)</string>
-    <string name="isf_increasingvalue">Høyere ISF verdier fører til mindre insulintilførsel når AAPS korrigerer for høyt BS.</string>
-    <string name="isf_decreasingvalue">Lavere ISF verdier fører til mindre insulintilførsel når AAPS korrigerer for høyt BS.</string>
-    <string name="isf_noeffect">Endring av ISF verdier har ingen effekt på mengden insulin som tilføres når AAPS korrigerer høyt BS.</string>
-    <string name="isf_preferences">Du må angi ISF i Innstillinger.</string>
+    <string name="isf_label_exam">Insulin Sensitivitetsfaktor (ISF)</string>
+    <string name="isf_increasingvalue">Økte ISF-verdiene vil føre til levering av mer insulin for å dekke opp en viss mengde karbohydrater.</string>
+    <string name="isf_decreasingvalue">Lavere ISF verdier fører til mer insulintilførsel for å korrigere blodsukker som ligger over målnivået.</string>
+    <string name="isf_noeffect">Å øke eller senke ISF har ingen effekt på tilførselen av insulin når blodsukkeret er lavere enn målverdien.</string>
+    <string name="isf_preferences">ISF bør angis i dine AndroidAPS innstillinger.</string>
     <string name="isf_profile">Å endre ISF verdien i din profil er tilstrekkelig for å ta i bruk endringen.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Tema: Insulin-karbo (IK) forholdet</string>
-    <string name="ic_increasingvalue">Høyere IK forhold fører til at mindre insulin leveres for en gitt mengde karbohydrater.</string>
-    <string name="ic_decreasingvalue">Lavere IK forhold fører til at mindre insulin leveres for en gitt mengde karbohydrater.</string>
+    <string name="ic_multiple">Du kan bruke mer enn én verdi for KH ratio i profilen din.</string>
+    <string name="ic_isf">Hvis du endrer ISF i profilen din, bør du alltid endre KH ration din.</string>
+    <string name="ic_label_exam">Insulin til Karbohydratratio (KH ratio)</string>
+    <string name="ic_increasingvalue">Høyere insulin til karbohydrat forhold (KH ratio) fører til at mindre insulin leveres for en gitt mengde karbohydrater.</string>
+    <string name="ic_decreasingvalue">Lavere insulin karbohydratforhold fører til at mindre insulin leveres for en gitt mengde karbohydrater.</string>
     <string name="ic_noeffect">Hvis du har 0 COB, vil endring av IK forholdet føre til endring av insulinmengden som trengs for å korrigere ditt BS nivå.</string>
     <string name="ic_different">IK vil være forskjellig hvis du regner en skive brød som 10g eller 12g.</string>
     <string name="ic_meaning">IK betyr: Hvor mange brødenheter som dekkes av 1E insulin.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Tema: Profilbytte</string>
-    <string name="profileswitch_pctwillchange"> Når man angir 90% i profilbytte…</string>
-    <string name="profileswitch_basalhigher">Basal vil være 10% høyere.</string>
-    <string name="profileswitch_basallower">Basal vil være 10% lavere.</string>
-    <string name="profileswitch_ichigher">IK verdien vil være 10% høyere.</string>
-    <string name="profileswitch_iclower">IK verdien vil være 10% lavere.</string>
+    <string name="profileswitch_label">Profil bytte</string>
+    <string name="profileswitch_pctwillchange"> Hvilke svar er korrekte når du spesifiserer et profilbytte på 90%?</string>
+    <string name="profileswitch_basallower">Basaldoser vil være 10% lavere.</string>
     <string name="profileswitch_isfhigher">ISF verdien vil være 10% høyere.</string>
-    <string name="profileswitch_isflower">ISF verdien vil være 10% lavere.</string>
-    <string name="profileswitch_overall">Du vil få omtrent 10% mindre insulin totalt.</string>
-    <string name="profileswitch_targethigher">Mål BS vil bli 10% høyere.</string>
-    <string name="profileswitch_targetlower">Mål BS vil bli 10% lavere.</string>
-    <string name="profileswitch_targetbottom">Bare laveste BS grenseverdi vil bli 10% lavere.</string>
+    <string name="profileswitch_iclower">Verdien av KH ratio vil være 10 % lavere.</string>
+    <string name="profileswitch_unchanged">ISF og KH ratio er uendret.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Hvis du våkner 1t tidligere enn normalt, hvordan skal du varsle AAPS om endringen i døgnrytmen din?</string>
-    <string name="profileswitchtime_1">Gjøre et profilbytte med en tidsforskyvning på 1t</string>
-    <string name="profileswitchtime__1">Gjøre et profil bytte med en tidsforskyvning på -1t</string>
+    <string name="profileswitch2_label">Profil bytte</string>
+    <string name="profileswitch2_pctwillchange"> Når du spesifiserer et profilbytte på 120%, hvilke svar er korrekte?</string>
+    <string name="profileswitch2_bghigher">Blodsukkermålet vil være 20% høyere.</string>
+    <string name="profileswitch2_basalhigher">Basaldoser vil være 20% høyere.</string>
+    <string name="profileswitch2_bgunchanged">Blodsukkermålet vil være uforandret.</string>
+    <string name="profileswitch2_isfhigher">ISF vil være 20% høyere.</string>
+    <string name="profileswitchtime_label">Profil bytte</string>
+    <string name="profileswitchtime_iwant">Hvis du står opp 2 timer tidligere enn vanlig, hvordan forteller du AndroidAPS om endringen i døgnrytmen din?</string>
+    <string name="profileswitchtime_2">Gjør et profilbytte med en tidsforskyvning på 2</string>
+    <string name="profileswitchtime__2">Gjør et profilbytte med en tidsforskyvning på -2</string>
+    <string name="profileswitchtime_tt">Angi et \"spise snart\" midlertidig temp target.</string>
+    <string name="profileswitchtime_100">Gjør et profilbytte til mer enn 100%</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Gjør et profilbytte med en tidsforskyvning på 60</string>
-    <string name="profileswitchtime__60">Gjør et profilbytte med en tidsforskyvning på -60</string>
+    <string name="profileswitch4_label">Endring av profil</string>
+    <string name="profileswitch4_rates">Basalrater, ISF, KH ratio, etc., bør defineres i profiler.</string>
+    <string name="profileswitch4_internet">Aktivering av endringer i Nightscout profilen din krever at din AndroidAPS telefon er koblet til Internett.</string>
+    <string name="profileswitch4_sufficient">Å redigere verdier i profilen din er tilstrekkelig for å aktivere profilendringen.</string>
+    <string name="profileswitch4_multi">Flere profiler kan defineres og velges for å håndtere endringer i omstendigheter (f.eks. hormonelle endringer, skift arbeid, hverdager/helgedager).</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">Tema: Hjelp med basaldoser</string>
+    <string name="basalhelp_label">Hjelp med basaldoser</string>
     <string name="basalhelp_where">Hvor finner du hjelp for basaldoser m. m.</string>
     <string name="basalhelp_diabetesteam">Ditt diabetesteam</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Annen medisinering</string>
-    <string name="other_medication_text">AAPS senker basalen for å øke glukosemengden i blodet. Medisiner av typen SGLT2-hemmere (glifloziner) kan motvirke den forventede økningen i BS og som kan resultere i livsfarlig insulinmangel eller ketoacidose (DKA). \nVanlige merker i markedet: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\n
-Jeg lover herved å ALDRI ta slike medisiner samtidig som jeg bruker AAPS, eller jeg kommer til å ta en pause i looping så lenge jeg bruker slik medisin.</string>
+    <string name="other_medication_label">Annen medisinering. Vennligst les utsagnet nedenfor, og sjekk deretter boksen for å godta erklæringen.</string>
+    <string name="other_medication_text">AndroidAPS reduserer basaldoser eller utsetter insulindoser for å øke blodsukkerverdier. Medisiner av typen SGLT2 hemmere (gliflozins) kan redusere eller hemme forventet økning i blodsukker og kan derfor føre til akutt og farlig høyt blodsukker ketoacidose (DKA).
+\nVanlige medisinnavn er: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nJeg lover å ikke ta slike medisiner mens jeg bruker AndroidAPS og vil deaktivere bruken av loop mens jeg bruker slik medisin.</string>
 </resources>

app/src/main/res/values-no-rNO/objectives.xml

@@ -21,7 +21,7 @@
     <string name="objectives_smb_objective">Aktiver ekstra funksjoner for bruk på dagtid, slik som SMB (Super Micro Bolus)</string>
     <string name="objectives_auto_objective">Aktiver Automatisering</string>
     <string name="objectives_smb_gate">Du må lese wiki og øke din maxIOB for å få SMB til å fungere. Et godt utgangspunkt er maxIOB = gjennomsnittlig måltidsbolus + 3*max daglig basal</string>
-    <string name="objectives_auto_gate">Les dokumentasjonen på hvordan Automatisering virker. Lag din første enkle regel. I stedet for å utføre en behandling, få AAPS AAPS til å bare vise en melding. Kun når du er sikker på at Automatisering virker riktig kan du erstatte meldingsvarselet med en behandlingskommando. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
+    <string name="objectives_auto_gate">Les dokumentasjonen på hvordan Automatisering virker. La din første regel være enkel. I stedet for å utføre en behandling, få AAPS til å vise en melding i stedet. Kun når du er sikker på at Automatisering aktiveres korrekt kan du erstatte meldingsvarselet med en behandlingskommando. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">BS tilgjengelig i NS</string>
     <string name="objectives_pumpstatusavailableinns">Pumpe status tilgjengelig i NS</string>
     <string name="objectives_manualenacts">Manuell kommando</string>
@@ -36,11 +36,11 @@
     <string name="objectives_useloop">Vis innholdet i Loop plugin</string>
     <string name="objectives_usescale">Test skaleringsfunksjonen ved et langt trykk på BS grafen</string>
     <string name="objectives_button_enter">Angi</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Hvis du har minst 3 måneder erfaring med andre lukkede loop systemer kan du kanskje kvalifisere for en kode som lar deg hoppe over Læringsmålene. Se https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives for mer detaljer.</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Om du kan dokumentere minst 3 måneders erfaring med et annet lukket loop system så kan det hende du kvalifiserer for å hoppe over læringsmålene. Se https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives for flere detaljer.</string>
     <string name="codeaccepted">Kode akseptert</string>
     <string name="codeinvalid">Kode ugyldig</string>
     <string name="objectives_exam_objective">Bevis kunnskapen din</string>
-    <string name="objectives_exam_gate">Studer og besvare spørsmålene riktig</string>
+    <string name="objectives_exam_gate">Studer spørsmålene. Hvert spørsmål har fire svaralternativer. Det kan være flere enn ett riktig svar. Marker alle riktige svar og velg KONTROLLER.</string>
     <string name="answerdisabledto">Besvarelser deaktivert til: %1$s</string>
     <string name="wronganswer">Feil svar!</string>
     <string name="unfinshed_button">Neste uferdig</string>

app/src/main/res/values-no-rNO/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Sikkerhetsbegrensninger for behandlinger</string>
     <string name="treatmentssafety_maxbolus_title">Maks tillat bolus [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Maks tillat karbo [g]</string>
+    <string name="nav_preferences_plugin">%1$s innstillinger</string>
     <string name="nav_preferences">Innstillinger</string>
     <string name="nav_refreshtreatments">Oppdater behandlinger fra NS</string>
     <string name="nav_resetdb">Nullstill databasene</string>
@@ -405,11 +406,18 @@
     <string name="suspendloopfor3h">Pause loop i 3t</string>
     <string name="suspendloopfor10h">Pause loop i 10t</string>
     <string name="suspendloopforXmin">Pause loop i %1$d min</string>
+    <string name="disconnectpump">Frakoble pumpe</string>
     <string name="disconnectpumpfor15m">Koble fra pumpen i 15 min</string>
     <string name="disconnectpumpfor30m">Koble fra pumpen i 30 min</string>
     <string name="disconnectpumpfor1h">Koble fra pumpen i 1t</string>
     <string name="disconnectpumpfor2h">Koble fra pumpen i 2t</string>
     <string name="disconnectpumpfor3h">Koble fra pumpen i 3t</string>
+    <string name="duration15m">15 min</string>
+    <string name="duration30m">30 min</string>
+    <string name="duration1h">1 time</string>
+    <string name="duration2h">2 timer</string>
+    <string name="duration3h">3 timer</string>
+    <string name="duration10h">10 timer</string>
     <string name="resume">Gjenoppta</string>
     <string name="reconnect">Tilkoble pumpen</string>
     <string name="smscommunicator_wrongduration">Feil varighet</string>
@@ -564,8 +572,6 @@
     <string name="overview_editquickwizard_usebasaliob">Basal IOB beregning</string>
     <string name="overview_editquickwizard_usetrend">Trend beregning</string>
     <string name="overview_editquickwizard_usesuperbolus">Superbolus beregning</string>
-    <string name="yes">Ja</string>
-    <string name="no">Nei</string>
     <string name="positiveonly">Bare positive</string>
     <string name="negativeonly">Bare negative</string>
     <string name="overview_editquickwizard_usecob">COB beregning</string>
@@ -612,8 +618,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">Ikke nok insulin til bolus i ampullen</string>
     <string name="extendedbolusdeliveryerror">Forlenget bolus feilet</string>
     <string name="insightpump_shortname">Sight</string>
-    <string name="set_neutral_temps_title">Sett nøytrale temp basaler</string>
-    <string name="set_neutral_temps_summary">Hvis aktivert så vil den stoppe en temp basal rett før hver hele time for å stoppe noen pumpers varsler/vibreringer på hver hele time.</string>
     <string name="enablesmbalways">Aktiverer alltid SMB</string>
     <string name="enablesmbalways_summary">Aktiver alltid SMB uavhengig av boluser. Bare mulig med en bra filtrert BS kilde som f.eks. Dexcom G5/G6</string>
     <string name="enablesmbaftercarbs">Aktiver SMB etter karbohydrater</string>
@@ -762,8 +766,8 @@
     <string name="diawarning">Husk: nye insulinprofiler krever en DIA på minst 5t. DIA 5-6t på ny profil er lik DIA 3t på gamle insulinprofiler.</string>
     <string name="setupwizard_profile_description">Vennligst velg kilde for din profil. Hvis pasienten er et barn anbefales det å bruke NS profil. Hvis ingen følger deg på Nightscout anbefales det å bruke en Lokal Profil. Husk at du her kun velger hvor profilen din ligger lagret. For å bruke den må du velge Profilbytte</string>
     <string name="setupwizard_aps_description">Velg en av de tilgjengelige algoritmene. De er sortert fra eldst til nyest. De nyeste algoritmene er vanligvis mer kraftfull og aggressiv. Hvis du er en ny looper kan det være fornuftig å starte med AMA og ikke den siste. Ikke glem å lese OpenAPS dokumentasjonen og konfigurer algoritmen før den brukes.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Venter på RileyLink tilkobling...\n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b>Merk:</b> Du kan fortsette oppsettet når pumpen er initialisert.\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Vennligst konfigurer din RileyLink under. Etter å ha valgt en RileyLink, vil det være mulig å fortsette konfigureringen når RileyLink statusen er \"Tilkoblet\". Dette kan ta et minutt.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Merk:</b> Du kan fortsette oppsettet når pumpen er satt opp.\n</string>
     <string name="startobjective">Start første læringsmål</string>
     <string name="permission">Tillatelse</string>
     <string name="askforpermission">Spør om tillatelse</string>
@@ -790,7 +794,6 @@
     <string name="sensitivity_raises_target_title">Sensitivitet øker BS målverdi</string>
     <string name="sensitivity_raises_target_summary">Når systemet oppdager økt insulinsensitivitet, vil BS målverdi økes</string>
     <string name="combo_invalid_setup">Ugyldig oppsett av pumpen. Les dokumentasjonen og sjekk at Quick Info menyen heter QUICK INFO ved hjelp av 360 programvaren.</string>
-    <string name="custom">Tilpasset</string>
     <string name="careportal_removestartedevents">Basis AndroidAPS startet</string>
     <string name="storedsettingsfound">Lagrede innstillinger funnet</string>
     <string name="allow_hardware_pump_text">Varsel: Hvis du aktiverer og kobler til en pumpe, så vil AndroidAPS kopiere basal innstillinger fra din profil over til pumpen og overskrive verdiene som er lagret der. Sjekk at du har riktige basal verdier i AndroidAPS. Hvis du ikke er sikker eller ikke ønsker å overskrive basal verdiene i pumpen, trykk avbryt og koble til pumpen senere.</string>
@@ -978,7 +981,9 @@
     <string name="description_source_dexcom">Motta BS verdier fra den patchede Dexcom appen.</string>
     <string name="notification">Varsling</string>
     <string name="notification_message">Varsel: %1$s</string>
+    <string name="alarm_message">Alarm: %1$s</string>
     <string name="message_short">Meld:</string>
+    <string name="alarm_short">Alarm:</string>
     <string name="profilepercentage">Profil prosent</string>
     <string name="percent_u">Prosent [%]:</string>
     <string name="startprofile">Start profil %1$d%% i %2$d min</string>
@@ -1180,4 +1185,15 @@
     <string name="filter">Filter</string>
     <string name="copytolocalprofile_invalid">Klarte ikke å opprette lokal profil. Profilen er ikke gyldig.</string>
     <string name="cta_dont_kill_my_app_info">Avslutte app?</string>
+    <string name="alarm">Alarm</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Send SMS hvis det ikke oppnås kontakt med pumpa</string>
+    <string name="smscommunicator_pump_ureachable">Rapporter når pumpe ikke kan tilkobles</string>
+    <string name="advisoralarm">Aktiver alarm når det er på tide å spise</string>
+    <string name="alarminxmin">Aktiver alarm om %1$d min</string>
+    <string name="bolusadvisor">Bolusguide</string>
+    <string name="bolusadvisormessage">Du har høyt blodsukker. I stedet for å spise nå er det bedre å utsette det til du har et lavere blodsukker. Ønsker du å sette en korrigerings bolus nå og få en påminnelse om når den er på tide å spise? I dette tilfellet vil ingen karbohydrater registreres nå, og du må bruke måltids veiviseren igjen når vi gir deg en påminnelse.</string>
+    <string name="enablebolusadvisor">Aktiver boluskalkulator</string>
+    <string name="enablebolusadvisor_summary">Få påminnelse om å spise i stedet for å bruke wizard når du har høyt blodsukker</string>
+    <string name="time_to_eat">Nå må du spise!\Bruk bolus veiviseren og beregn på nytt.</string>
+    <string name="timetoeat">Nå må du spise</string>
 </resources>

app/src/main/res/values-pl-rPL/exam.xml

@@ -1,167 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Co jest prawdą w przypadku DIA?</string>
-    <string name="dia_label_exam">Temat: Czas działania insuliny (DIA)</string>
-    <string name="dia_minimumis3h">Wartość minimalna to 3 godziny.</string>
-    <string name="dia_minimumis5h">Wartość minimalna to 5 godzin.</string>
+    <string name="dia_label_exam">Czas działania insuliny (DIA)</string>
+    <string name="dia_profile">Powinieneś ustawić wartość dla DIA w swoim profilu.</string>
+    <string name="dia_minimumis5h">Minimalna dopuszczalna wartość to 5 godzin.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">Znaczenie jest takie same jak parametru DIA używanego w Twojej pompie.</string>
-    <string name="dia_valuemustbedetermined">Konieczne jest określenie indywidualnej wartości (ale nie mniej niż 5 godzin).</string>
-    <string name="hypott_label">Temat: Cel tymczasowy Hipo</string>
-    <string name="hypott_whenhypott">Jaki jest podstawowy powód, aby ustawić hypo TT?</string>
-    <string name="hypott_goinglow">Aby zapobiec spadkowi poziomu przy obecnie działąjącym zerowaniu bazy.</string>
-    <string name="hypott_preventoversmb">Aby przeciwdziałać AAPS przed podaniem zbyt dużej ilości insuliny po wzroście spowodowanym szybko działającymi węglowodanami użytymi do leczenia niskiego poziomu.</string>
+    <string name="dia_meaningisequaltodiapump">Jeśli jesteś zadowolony z wartości dla DIA, która była użyta w twojej pompie przed wykorzystaniem AndroidAPS, nie ma potrzeby jej zmiany, gdy zaczniesz używać pętli.</string>
+    <string name="dia_valuemustbedetermined">Powinieneś określić dla siebie odpowiednią wartość DIA.</string>
+    <string name="hypott_label">Cel tymczasowy dla Hipo</string>
+    <string name="hypott_whenhypott">Jaki jest główny powód do ustawienia celu tymczasowego Hipo?</string>
+    <string name="hypott_wrongbasal">Aby skorygować hipoglikemię spowodowaną nieprawidłowymi ustawieniami dawki podstawowej.</string>
+    <string name="hypott_preventoversmb">Aby zapobiec nadmiernemu korygowaniu przez AndroidAPS wzrostu poziomu glukozy we krwi spowodowanego przez szybko działające węglowodany stosowane w leczeniu hipoglikemii.</string>
+    <string name="hypott_exercise">Korekta hipoglikemii wywołanej wysiłkiem fizycznym.</string>
+    <string name="hypott_0basal">Aby zapobiec spadkowi poziomu glukozy we krwi, jeśli jest już uruchomiona tymczasowa dawka podstawowa wynosząca 0%.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Który profil może być używany i skonfigurowany w trybie offline?</string>
     <string name="offlineprofile_label">Temat: Profil w trybie offline</string>
     <string name="offlineprofile_nsprofile">Profil NS może być używany, ale nie jest skonfigurowany.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Temat: Odłączanie od pompy</string>
-    <string name="pumpdisconnect_letknow">Naciśnij \"WYłącz pompę\" aby AAPS wiedział, że insulina nie jest dostarczana.</string>
-    <string name="pumpdisconnect_suspend">Naciśnij \"Wstrzymaj pętlę\"aby AAPS zatrzymał pętlę, gdy pompa jest odłączona.</string>
-    <string name="pumpdisconnect_dontchnage">Nie zmieniaj niczego w AAPS, po prostu odłącz pompę.</string>
+    <string name="pumpdisconnect_label">Powody zastosowania funkcji \"Odłącz pompę\" w AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">Co należy zrobić przy rozłączeniu pompy?</string>
+    <string name="pumpdisconnect_unnecessary">Nie jest to konieczne, ponieważ insulina nie zostanie dostarczona, jeśli pompa jest fizycznie odłączona.</string>
+    <string name="pumpdisconnect_missinginsulin">Zapobiega to wliczaniu przez AndroidAPS insuliny, która nie została podana, gdy pompa była fizycznie odłączona. </string>
+    <string name="pumpdisconnect_notstop">Nie zatrzyma podawania insuliny, jeśli pompa pozostanie podłączona.</string>
+    <string name="pumpdisconnect_openloop">Spowoduje to wysłanie AndroidAPS do trybu pętli otwartej.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Temat: Ustawienia AndroidAPS</string>
-    <string name="objectives_howtosave">Jakie są sprawdzone procedury tworzenia kopii zapasowych ustawień?</string>
-    <string name="objectives_exportsettings">Lokalnie wyeksportuj je z menu Konserwacja.</string>
-    <string name="objectives_storeelsewhere">Zapisz wyeksportowany plik w innym miejscu, np. wyślij e-mailem, prześlij na Dropbox, dysk Google…</string>
-    <string name="objectives_doexportonstart">Wyeksportuj je zaraz po instalacji AAPS.</string>
-    <string name="objectives_doexportafterchange">Wyeksportuj je po wprowadzeniu zmian.</string>
-    <string name="objectives_doexportafterobjective">Wyeksportuj je po wykonaniu zadania.</string>
-    <string name="objectives_doexportafterfirtssettings">Wyeksportuj je po zakończeniu wstępnych ustawień.</string>
+    <string name="objectives_label">Ustawienia AndroidAPS</string>
+    <string name="objectives2_label">Ustawienia AndroidAPS</string>
+    <string name="objectives_howtosave">Jakie są najlepsze procedury tworzenia kopii zapasowych swoich ustawień?</string>
+    <string name="objectives_notesettings">Nie ma potrzeby eksportowania ustawień, pod warunkiem, że zrobisz z nich notatki.</string>
+    <string name="objectives_afterobjective">Wyeksportuj ustawienia po zakończeniu realizacji zadania sprawdzającego.</string>
+    <string name="objectives_afterchange">Wyeksportuj ustawienia po zmianie każdego z ustawień.</string>
+    <string name="objectives_afterinitialsetup">Wyeksportuj ustawienia po zakończeniu początkowej konfiguracji i ustawieniu preferencji.</string>
+    <string name="objectives2_maintenance">Wyeksportuj ustawienia lokalnie, korzystając z menu konserwacji.</string>
+    <string name="objectives2_internalstorage">Twój plik ustawień znajduje się w folderze Pamięć wewnętrzna / AAPS / preferencje w telefonie.</string>
+    <string name="objectives2_cloud">Skopiuj plik preferencji w bezpieczne miejsce poza telefonem (np. Korzystając z dysku w chmurze, podłączając kabel do komputera, e-mail itp.)</string>
+    <string name="objectives2_easyrestore">Jeśli Twój telefon zostanie uszkodzony lub zgubiony, zastosowanie łatwe sposoby na zdalne odzyskanie ustawień bez kopii zapasowej.</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">Temat: Szumy w odczytach z CGM</string>
+    <string name="noisycgm_label">Szumy w odczytach z CGM</string>
     <string name="noisycgm_whattodo">Co powinno być wykonane gdy dane CGM są zaszumione?</string>
-    <string name="nothing">Nic, AAPS sobie z tym poradzi.</string>
-    <string name="noisycgm_pause">Wyłącz pętlę, by unilknąć przedawkowania insuliny.</string>
-    <string name="noisycgm_replacesensor">Wymień czujnik CGM.</string>
-    <string name="noisycgm_turnoffphone">Wyłącz telefon.</string>
+    <string name="noisycgm_nothing">Nic nie rób - AndroidAPS sobie z tym poradzi.</string>
+    <string name="noisycgm_pause">Wyłącz pętlę zamkniętą, aby uniknąć możliwego przedawkowania lub niedoszacowania.</string>
+    <string name="noisycgm_replacesensor">Wymieniaj stale zaszumione lub niewłaściwie wskazujące sensory.</string>
+    <string name="noisycgm_checksmoothing">Sprawdź, czy aplikacja CGM zapewnia wygładzone dane.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">Sprawdź, czy Twój CGM wygładza dane poziomu cukru.</string>
-    <string name="exercise_label">Temat: Ćwiczenia</string>
-    <string name="exercise_whattodo">Jak możesz pomóc aby system poradził sobie z ćwiczeniami?</string>
-    <string name="exercise_setactivitytt">Korzystanie z funkcji tymczasowego docelowego poziomu cukru.</string>
-    <string name="exercise_switchprofilebelow100">Wykonaj zmianę profilu poniżej 100%.</string>
-    <string name="exercise_switchprofileabove100">Wykonaj zmianę profilu powyżej 100%.</string>
-    <string name="exercise_stoploop">Zatrzymaj pętlę.</string>
-    <string name="exercise_doitbeforestart">Ustaw cel tymczasowy Ćwiczenia przed rozpoczęciem ćwiczeń.</string>
-    <string name="exercise_afterstart">Ustawienie celu tymczasowego Ćwiczenia po rozpoczęciu ćwiczeń prowadzi do gorszych wynikow poziomu niż przy jego wcześniejszym rozpoczęciu.</string>
+    <string name="exerciseprofile_label">Ćwiczenia fizyczne i profile</string>
+    <string name="exerciseprofile_whattodo">Jak wykorzystać profile, aby najlepiej pomóc systemowi radzić sobie z ćwiczeniami aerobowymi?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Wykonaj zmianę profilu na poniżej 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Wykonaj zmianę profilu na powyżej 100%</string>
+    <string name="exerciseprofile_leaveat100">Pozostaw profil ustawiony na 100%.</string>
+    <string name="exerciseprofile_suspendloop">Wstrzymaj pętle.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">Ćwiczenie fizyczne i cele tymczasowe</string>
+    <string name="exercise_whattodo">Jak wykorzystać cele tymczasowe, aby jak najlepiej pomóc systemowi radzić sobie z ćwiczeniami aerobowymi?</string>
+    <string name="exercise_settt">Ustaw cel poziomu glukozy we krwi \"ćwiczenia\" w odpowiednim czasie przed rozpoczęciem ćwiczeń fizycznych.</string>
+    <string name="exercise_setfinished">Ustaw cel poziomu glukozy we krwi \"ćwiczenia\" w odpowiednim czasie po zakończeniu ćwiczeń fizycznych.</string>
+    <string name="exercise_setunchanged">Pozostaw cel poziomu glukozy we krwi niezmieniony.</string>
+    <string name="exercise_15g">Poczekaj, aż poziom glukozy we krwi spadnie poniżej celu tymczasowego \"Hipo\", a następnie zjedz 15 g szybko działających węglowodanów.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">Temat: Wyłączona/Zawieszona pętla</string>
+    <string name="suspendloop_label">Wyłączona/zawieszona pętla</string>
     <string name="suspendloop_doigetinsulin">Czy otrzymuję insulinę, gdy pętla jest wyłączona/zawieszona?</string>
     <string name="suspendloop_yes">Tak, insulina bazowa nadal jest dostarczana.</string>
     <string name="suspendloop_no">Nie, podawanie insuliny jest zatrzymane.</string>
-    <string name="basaltest_label">Temat: Testowanie Bazy, ISF i IC</string>
-    <string name="basaltest_when">Kiedy powinienem zweryfikować wartości bazy, ISF i IC?</string>
-    <string name="basaltest_beforeloop">Zanim zacznę używać pętli.</string>
-    <string name="basaltest_havingregularhypo">Gdy często występują niskie poziomy cukru.</string>
-    <string name="basaltest_havingregularhyper">Gdy często występują wysokie poziomy cukru.</string>
+    <string name="basaltest_label">Testowanie dawki bazowej, ISF i I:C</string>
+    <string name="basaltest_when">Kiedy należy sprawdzić poprawność tych wartości?</string>
+    <string name="basaltest_beforeloop">Zanim zaczniesz używać pętli.</string>
+    <string name="basaltest_havingregularhighlow">W przypadku częstego występowania wysokiego lub niskiego stężenia glukozy we krwi.</string>
+    <string name="basaltest_weekly">Co najmniej raz w tygodniu.</string>
+    <string name="basaltest_fixed">Po ustawieniu i zweryfikowaniu wartości te nie powinny zmieniać się w czasie.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Temat: Wymagania wstępne</string>
-    <string name="prerequisites_what">Czego potrzebuję?</string>
+    <string name="prerequisites_label">Wymagania wstępne</string>
+    <string name="prerequisites_what">Co jest niezbędne do skonfigurowania i używania AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Sprawdzone informacje profilowe (Basal, IC, ISF, DIA).</string>
-    <string name="prerequisites_computer">Komputer do utworzenia pliku APK.</string>
+    <string name="prerequisites_computer">Komputer z zainstalowanym i skonfigurowanym programem Android Studio.</string>
     <string name="prerequisites_phone">Obsługiwany telefon.</string>
-    <string name="prerequisites_car">Samochód.</string>
-    <string name="prerequisites_nightscout">Nightscout, aby przejść przez zadania.</string>
+    <string name="prerequisites_pump">Kompatybilna pompa insulinowa, jeśli planujesz uruchomienie pętli zamkniętej.</string>
+    <string name="prerequisites_nightscout">Nightscout, aby zachować dziennik wszystkich danych i przeglądać ustawienia.</string>
     <string name="prerequisites_tidepoolaccount">Konto Tidepool.</string>
     <string name="prerequisites_googleaccount">Konto Google.</string>
     <string name="prerequisites_githubaccount">Konto Github.</string>
-    <string name="prerequisites_beanandroiddeveloper">Doświadczenie w rozwoju systemu Android.</string>
+    <string name="prerequisites_beanandroiddeveloper">Doświadczenie w programowaniu lub edycji kodu.</string>
     <string name="prerequisites_own670g">Pompa MiniMed 670G.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">Smartwatch.</string>
     <string name="prerequisites_supportedcgm">Obsługiwany CGM.</string>
-    <string name="update_label">Temat: Aktualizacja AndroidAPS</string>
-    <string name="whatistrue">Co jest prawdą?</string>
-    <string name="update_git">Musisz mieć zainstalowany Git.</string>
-    <string name="update_asap">Aktualizuj tak szybko jak nowe wersja zostanie opublikowana i znajdziesz czas do jej wprowadzenia.</string>
-    <string name="update_keys">Należy używać tych samych kluczy do podpisywania.</string>
+    <string name="prerequisites2_label">Wymagania wstępne</string>
+    <string name="prerequisites2_what">Co jest niezbędne do skonfigurowania i używania AndroidAPS?</string>
+    <string name="prerequisites2_profile">Sprawdzone informacje umożliwiające skonfigurowanie profilu (współczynniki ISF, I:C, dawki bazowe, DIA itp.).</string>
+    <string name="prerequisites2_device">Kompatybilne urządzenie z systemem Android (np. telefon komórkowy, zegarek z pełnym systemem Android lub tablet).</string>
+    <string name="prerequisites2_internet">AndroidAPS wymaga połączenia internetowego do działania w zamkniętej pętli.</string>
+    <string name="prerequisites2_supportedcgm">Wspierany CGM i odpowiednia aplikacja, aby otrzymywać wartości glukozy we krwi na telefonie/urządzeniu.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">Aktualizowanie AndroidAPS</string>
+    <string name="whatistrue">Sprawdź/Zaznacz wszystkie prawidłowe odpowiedzi.</string>
+    <string name="update_git">Musisz mieć zainstalowany i skonfigurowany Git na komputerze.</string>
+    <string name="update_asap">Po wydaniu zaktualizowanych wersji AndroidAPS wcześniejsze wersje mogą być zdalnie ograniczone po określonym czasie.</string>
+    <string name="update_keys">Powinieneś/powinnaś zapisać i zanotować lokalizację swojego klucza i użyć tego samego klucza do aktualizacji jak dla poprzedniej instalacji.</string>
     <string name="update_neverupdate">Nigdy nie aktualizuj, jeśli system działa dobrze.</string>
-    <string name="update_askfriend">Poproś swojego przyjaciela o nowy plik APK.</string>
+    <string name="update_askfriend">Jeśli masz trudności z budową apk, możesz zainstalować apk zbudowany przez znajomego.</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">Temat: Rozwiązywanie problemów</string>
-    <string name="troubleshooting_wheretoask">Gdzie szukać pomocy?</string>
-    <string name="troubleshooting_fb">Dołącz do głównej grupy AndroidAPS na Facebooku.</string>
-    <string name="troubleshooting_wiki">Przeczytaj dokumentację AndroidAPS.</string>
-    <string name="troubleshooting_gitter">Odwiedź pokój Gitter na temat AndroidAPS.</string>
-    <string name="troubleshooting_googlesupport">Odwiedź stronę pomocy technicznej AndroidAPS Google</string>
-    <string name="troubleshooting_yourendo">Porozmawiaj ze swoim endokrynologiem/diabetologiem.</string>
+    <string name="troubleshooting_label">Rozwiązywanie problemów</string>
+    <string name="troubleshooting_wheretoask">Gdzie możesz szukać pomocy z AndroidAPS?</string>
+    <string name="troubleshooting_fb">Możesz poprosić o poradę w grupie użytkowników AndroidAPS na Facebooku.</string>
+    <string name="troubleshooting_wiki">Należy przeczytać (i ponownie przeczytać) dokumentację AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Możesz poprosić o poradę i zarejestrować problemy techniczne w pokoju AndroidAPS Gitter.</string>
+    <string name="troubleshooting_yourendo">Należy zwrócić się do diabetologa lub lekarza endokrynologa.</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">Temat: Wtyczki insuliny</string>
-    <string name="insulin_ultrarapid">Jakiej marki insuliny można używać z wtyczką Ultra-Rapid-Oref?</string>
+    <string name="insulin_label">Wtyczki insuliny</string>
+    <string name="insulin_ultrarapid">Która insulina powinna być używana z wtyczką Ultra-Rapid Oref?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_novorapid">NovoRapid ® /Novolog ®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid ® /Humulin R ®/\"zwykła\" insulina ludzka.</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Temat: Wtyczka wrażliwości</string>
-    <string name="sensitivity_which">Który algorytm czułości ma konfigurowalny zakres czasu?</string>
+    <string name="sensitivity_label">Wtyczki wrażliwości</string>
+    <string name="sensitivity_which">Sprawdź/Zaznacz wszystkie prawidłowe odpowiedzi.</string>
+    <string name="sensitivity_adjust">Wtyczki wrażliwości pozwalają AndroidAPS dostosować się do czasowych lub krótkotrwałych zmian wrażliwości na insulinę (na przykład zmiany hormonalne lub problemy z wchłanianiem w miejscu wkłucia).</string>
+    <string name="sensitivity_edit">Wtyczki wrażliwości dostarczają użytkownikowi sugerowane zmiany w dawkach bazowych, współczynnikach I:C i ISF, które mogą być używane do edycji profilu.</string>
+    <string name="sensitivity_cannula">Rejestracja zmiany wkłucia spowoduje zresetowanie współczynnika Autosens z powrotem do 100%.</string>
+    <string name="sensitivity_time">Niektóre z opcji wtyczki mają konfigurowalne zakresy czasu, które mogą być ustawiane przez użytkownika.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Jakiej wtyczki wykrywania wrażliwości należy użyć dla funkcji UAM?</string>
-    <string name="wrongcarbs_label">Temat: Błędy wprowadzania węglowodanów</string>
+    <string name="wrongcarbs_label">Błędy wprowadzania węglowodanów</string>
     <string name="wrongcarbs_whattodo">Co powinieneś zrobić, gdy wprowadziłeś niewłaściwą ilość węglowodanów?</string>
-    <string name="wrongcarbs_treatmentstab">W karcie Leczenie (Treatments), usuń niewłaściwy wpis węglowodanów. Wprowadź ponownie właściwą wartość.</string>
-    <string name="wrongcarbs_addfakeinsulin">Dodaj fałszywą insulinę za pomocą funkcji napełniania</string>
-    <string name="extendedcarbs_label">Temat: Posiłki z tłuszczami i białkami</string>
-    <string name="extendedcarbs_handling">Co zrobić, jeśli twoje jedzenie zawiera dużą ilość tłuszczu i/lub białek?</string>
-    <string name="extendedcarbs_useextendedcarbs">Przelicz tłuszcz i białka na węglowodany i użyj funkcji „Rozszerzone węglowodany” eCarbs.</string>
-    <string name="extendedcarbs_add">Przelicz tłuszcz i białka na węglowodany i dodaj je do kalkulacji bolusa.</string>
-    <string name="extendedcarbs_useextendedbolus">Użyj przedłużonego bolusa, aby pokryć tłuszcz i białka.</string>
+    <string name="wrongcarbs_treatmentstab">Usuń niepoprawny wpis w leczeniu (Treat) i wprowadź poprawną nową wartość węglowodanów.</string>
+    <string name="wrongcarbs_addinsulin">Bolus z insuliną z użyciem menu rozpoczęcia/wypełnienia zestawu infuzyjnego.</string>
+    <string name="wrongcarbs_donothing">Nic nie rób - AndroidAPS dokona odpowiednich zmian.</string>
+    <string name="wrongcarbs_bolus">Bolus z insuliną za pomocą przycisku Insulina (bolus) na karcie głównej.</string>
+    <string name="wronginsulin_label">Błędy w dostarczaniu/wpisywaniu insuliny</string>
+    <string name="wronginsulin_whattodo">Co należy zrobić, jeśli otrzymano mniej insuliny niż sugeruje historia pompy, np. z powodu niedrożności, uszkodzonej kaniuli lub zapomnienia o ponownym podłączeniu pompy po prysznicu? </string>
+    <string name="wronginsulin_careportal">Usuń dane insuliny z portalu Nightscout aby usunąć je z historii pompy.</string>
+    <string name="wronginsulin_compare">Porównaj wartości w AndroidAPS i historii pompy.</string>
+    <string name="wronginsulin_prime">Podaj obliczoną dawkę „pominiętej” insuliny za pomocą strzykawki / wstrzykiwacza lub za pomocą pompy funkcji wypełnienia.</string>
+    <string name="wronginsulin_donothing">Nie rób nic i pozwól AndroidAPS na skorygowanie każdego uzyskanego wysokiego stężenia glukozy we krwi.</string>
+    <string name="iob_label">Aktywna insulina (IOB)</string>
+    <string name="iob_which">Sprawdź/Zaznacz wszystkie prawidłowe odpowiedzi.</string>
+    <string name="iob_value">Na wartość IOB mają wpływ wykonane tymczasowe dawki bazowe.</string>
+    <string name="iob_hightemp">Wysoka tymczasowa dawka bazowa nie zostanie podana, gdy twóje poziom cukru we krwi jest poniżej poziomu docelowego.</string>
+    <string name="iob_negiob">Negatywne IOB utrzymujące się przez znaczny okres czasu bez wysiłku fizycznego sugeruje, że Twój profil jest zbyt silny i mniej insuliny jest wymagane w Twoich ustawieniach.</string>
+    <string name="iob_posiob">Pozytywne IOB utrzymujące się przez znaczny okres czasu sugeruje insulinooporność lub niezapowiedziany (niewprowadzony do AAPS) posiłek.</string>
+    <string name="breadgrams_label">Wprowadzanie węglowodanów i bolusów</string>
+    <string name="breadgrams_grams">Do szacowania i zapisywania spożywanych węglowodanów należy używać tylko gramów.</string>
+    <string name="breadgrams_exchange">Spożywane węglowodany mogą być rejestrowane przy użyciu odpowiednich zamiennych jednostek systemowych (np. DAFNE \"CHO\" wymienia lub europejskich \"jednostek chlebowych\").</string>
+    <string name="breadgrams_decay">AndroidAPS wykorzystuje model dynamiczny do szacowania „wchłaniania” węglowodanów i obliczania COB.</string>
+    <string name="breadgrams_calc">Jeśli poziom glukozy we krwi jest poza dopuszczalnymi wartościami (zbyt niski lub zbyt wysoki), kalkulator bolusa może być stosowany w celu dostarczenia sugestii dotyczących korekty węglowodanów lub insuliny.</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">e-carbs (e-węgle)</string>
+    <string name="extendedcarbs_handling">Do czego możesz użyć e-węgli (węglowodanów wydłużonych)?</string>
+    <string name="extendedcarbs_future">W celu zaplanowania ilości węglowodanów w przyszłości, możliwych do dystrybucji w interwałach czasowych (podobnie do przedłużonego bolusa rozprowadzającego insulinę w odstępie czasowym).</string>
+    <string name="extendedcarbs_free">Aby rejestrować \"darmowe\" węglowodany wysiłkowe, które chcesz ukryć przed AndroidAPS.</string>
+    <string name="extendedcarbs_fat">e-węgle (dystrybuowane w przyszłości) mogą pomóc AndroidAPS w radzeniu sobie z wysokotłuszczowym/białkowym posiłkiem.</string>
+    <string name="extendedcarbs_rescue">Do rejestrowania węglowodanów ratunkowych spożytych do leczenia niskiego poziomu cukru we krwi. </string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Temat: Monitorowanie zdalne</string>
-    <string name="nsclient_howcanyou">Jak zdalnie monitorować AAPS swojego dziecka?</string>
-    <string name="nsclient_nightscout">Korzystanie ze strony Nightscout.</string>
-    <string name="nsclient_dexcomfollow">Aplikacja Dexcom Follo, jeśli korzystasz z oryginalnej aplikacji Dexcom (tylko BG).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow, jeśli korzystasz z aplikacji xDrip.</string>
-    <string name="nsclient_xdripfollower">xDrip działa w trybie śledzenia (follower).</string>
-    <string name="nsclient_looponiphone">Aplikacja Loop na iPhone\'a.</string>
-    <string name="nsclient_spikeiphone">Aplikacja Spike na iPhone\'a.</string>
+    <string name="nsclient_label">Zdalny monitoring</string>
+    <string name="nsclient_howcanyou">Jak można zdalnie monitorować AndroidAPS (na przykład dla dziecka)?</string>
+    <string name="nsclient_nightscout">Aplikacja NS klient, aplikacja Nightscout i strona Nightscout pozwalają na zdalną obserwację AndroidAPS.</string>
+    <string name="nsclient_dexcomfollow">Inne aplikacje (np. Dexcom follow, xDrip uruchomione w trybie śledzenia) pozwalają na śledzenie niektórych parametrów (np. poziom glukozy/wartości sensora) na odległość, ale używają różnych algorytmów, więc pokazywać nieprezcyzyjne wartości IOB lub COB.</string>
+    <string name="nsclient_data">Aby zdalnie śledzić AndroidAPS, oba urządzenia muszą mieć dostęp do Internetu (np. przez Wi-Fi lub dane mobilne/komórkowe).</string>
+    <string name="nsclient_fullcontrol">Klient NS używany do śledzenia zdalneg będzie monitorował i zapewniał pełną kontrolę nad systemem AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Temat: Współczynnik wrażliwości na insulinę (ISF)</string>
-    <string name="isf_increasingvalue">Wyższe wartości ISF prowadzą do mniejszej ilości podanej insuliny gdy AAPS koryguje wysoki poziom cukru.</string>
-    <string name="isf_decreasingvalue">Niższe wartości ISF prowadzą do mniejszej dawki insuliny gdy AAPS koryguje wysoki poziom cukru.</string>
-    <string name="isf_noeffect">Zmiana wartości ISF nie ma wpływu na ilość insuliny dostarczanej, gdy AAPS koryguje wysoki poziom cukru.</string>
-    <string name="isf_preferences">Musisz wprowadzić ISF w Preferencjach.</string>
+    <string name="isf_label_exam">Wskaźnik wrażliwości na insulinę (ISF)</string>
+    <string name="isf_increasingvalue">Podwyższenie wartości ISF doprowadzi do zwiększenia ilości insuliny w celu pokrycia określonej ilości węglowodanów.</string>
+    <string name="isf_decreasingvalue">Obniżenie wartości ISF prowadzi do zwiększenia dawki insuliny w celu skorygowania stężenia glukozy we krwi powyżej wartości docelowej.</string>
+    <string name="isf_noeffect">Podwyższenie lub obniżenie ISF nie ma wpływu na dostarczanie insuliny, gdy stężenie glukozy we krwi jest poniżej wartości docelowej.</string>
+    <string name="isf_preferences">ISF należy wprowadzić w preferencjach AndroidAPS.</string>
     <string name="isf_profile">Zmiana wartości ISF w profilu wystarczy, aby zastosować zmianę.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Temat: Węglowodany na jednostkę Insuliny (IC)</string>
-    <string name="ic_increasingvalue">Wyższe wartości ICprowadzą do mniejszej ilości insuliny dostarczonej do podanej ilości węglowodanów.</string>
-    <string name="ic_decreasingvalue">Niższe wartości IC prowadzą do mniejszej ilości insuliny podanej do wprowadzonej ilości węglowodanów.</string>
+    <string name="ic_multiple">Możesz użyć więcej niż jednej wartości dla stosunku I:C w swoim profilu.</string>
+    <string name="ic_isf">Jeśli zmienisz ISF w swoim profilu, zawsze powinieneś również zmienić swój stosunek I:C.</string>
+    <string name="ic_label_exam">Stosunek insuliny do węglowodanów (stosunek I:C)</string>
+    <string name="ic_increasingvalue">Wyższe wartości I:C prowadzą do mniejszej ilości insuliny dostarczonej dla danej ilości węglowodanowych.</string>
+    <string name="ic_decreasingvalue">Niższe wartości I:C prowadzą do mniejszej ilości insuliny dostarczonej dla danej ilości węglowodanowych.</string>
     <string name="ic_noeffect">Załóżmy, że masz 0 COB. Zmiana IC doprowadzi do podania innej ilości insuliny w celu skorygowania twojej wartości BG.</string>
     <string name="ic_different">IC będzie inny, jeśli policzysz jednostkę chlebową (wymiennik węglowodanów) jako 10g lub 12g.</string>
     <string name="ic_meaning">Znaczenie IC to: Ile jednostek chlebowych (wymienników węglowodanowych) jest pokrytych 1U insuliny.</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">Temat: Przełączanie profili</string>
-    <string name="profileswitch_pctwillchange"> Jeśli podasz 90% podczas zmiany profilu… </string>
-    <string name="profileswitch_basalhigher">Baza będzie o 10% wyższa.</string>
+    <string name="profileswitch_label">Zmiana profilu</string>
+    <string name="profileswitch_pctwillchange"> Określając 90% zmianę profilu, które odpowiedzi są prawdziwe?</string>
     <string name="profileswitch_basallower">Baza będzie o 10% niższa.</string>
-    <string name="profileswitch_ichigher">Wartość IC będzie o 10% wyższa.</string>
-    <string name="profileswitch_iclower">Wartość IC będzie o 10% niższa.</string>
     <string name="profileswitch_isfhigher">Wartość ISF będzie o 10% wyższa.</string>
-    <string name="profileswitch_isflower">Wartość ISF będzie o 10% niższa.</string>
-    <string name="profileswitch_overall">Otrzymasz w sumie około 10% mniej insuliny.</string>
-    <string name="profileswitch_targethigher">Cel będzie wyższy o 10%.</string>
-    <string name="profileswitch_targetlower">Cel będzie o 10% niższy.</string>
-    <string name="profileswitch_targetbottom">Tylko dolny cel będzie o 10% niższy.</string>
+    <string name="profileswitch_iclower">Wartość współczynnika I:C będzie mniejsza o 10%.</string>
+    <string name="profileswitch_unchanged">Współczynniki ISF i I:C nie ulegną zmianie.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Jeśli obudzisz się o 1h wcześniej niż zwykle, to jak należy powiadomić AAPS o zmianie w harmonogramie?</string>
-    <string name="profileswitchtime_1">Wprowadź zmianę profilu ze zmianą czasu równą 1</string>
-    <string name="profileswitchtime__1">Wprowadź zmianę profilu ze zmianą czasu równą -1</string>
+    <string name="profileswitch2_label">Zmiana profilu</string>
+    <string name="profileswitch2_pctwillchange"> Po ustawieniu zmiany wartości profilu na 120%, które odpowiedzi są prawdziwe?</string>
+    <string name="profileswitch2_bghigher">Docelowy poziom glukozy we krwi będzie o 20% wyższy.</string>
+    <string name="profileswitch2_basalhigher">Dawki bazowe będą o 20% wyższe.</string>
+    <string name="profileswitch2_bgunchanged">Docelowy poziom glukozy we krwi nie ulegnie zmianie.</string>
+    <string name="profileswitch2_isfhigher">Wartość ISF będzie o 20% wyższa.</string>
+    <string name="profileswitchtime_label">Zmiana profilu</string>
+    <string name="profileswitchtime_iwant">Jeśli obudzisz się 2 godziny wcześniej niż zwykle, jak należy powiadomić AndroidAPS o zmianie w harmonogramie?</string>
+    <string name="profileswitchtime_2">Wprowadź zmianę profilu ze zmianą czasu równą 2</string>
+    <string name="profileswitchtime__2">Wprowadź zmianę profilu ze zmianą czasu równą -2</string>
+    <string name="profileswitchtime_tt">Ustaw cel tymczasowy wkrótce posiłek.</string>
+    <string name="profileswitchtime_100">Wykonaj zmianę profilu na powyżej 100%.</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Wprowadź zmianę profilu ze zmianą czasu równą 60</string>
-    <string name="profileswitchtime__60">Wprowadź zmianę profilu ze zmianą czasu równą -60</string>
+    <string name="profileswitch4_label">Zmiany w profilach</string>
+    <string name="profileswitch4_rates">Dawki bazowe, współczynniki ISF, I:C itp., powinny być ustawione w profilach.</string>
+    <string name="profileswitch4_internet">Aktywacja zmian w profilu Nightscout wymaga połączenia z Internetem twojego telefonu z AndroidAPS.</string>
+    <string name="profileswitch4_sufficient">Edycja profili w celu zmiany wartości wystarczy, aby uaktywnić wszelkie wprowadzone zmiany.</string>
+    <string name="profileswitch4_multi">Można skonfigurować i wybrać wiele profili, aby uwzględnić zmieniające się okoliczności (np. Zmiany hormonalne, praca zmianowa, tryb życia w dni powszednie / weekendy).</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">Temat: Pomoc z dawkami podstawowymi (bazą)</string>
+    <string name="basalhelp_label">Pomoc z dawkami bazowymi</string>
     <string name="basalhelp_where">Gdzie uzyskać pomoc w sprawie dawek podstawowych itp.</string>
     <string name="basalhelp_diabetesteam">Twój zespół cukrzycowy</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Inne leki</string>
-    <string name="other_medication_text">AAPS zmniejsza BR w celu podniesienia poziomu cukru we krwi. Leki z grupy inhibitorów SGLT2 (gliflozyny) mogą zapobiegać spodziewanemu wzrostowi stężenia glukozy we krwi, a zatem mogą powodować niebezpieczny niedobór insuliny (DKA).
-\nWspólne nazwy marek to: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®. \n\n Obiecuję, że nie będę brać takich leków podczas używania AAPS lub dezaktywuję pętlę przed użyciem tych leków.</string>
+    <string name="other_medication_label">Inne leki. Przeczytaj poniższe oświadczenie, a następnie zaznacz pole, aby zaakceptować oświadczenie.</string>
+    <string name="other_medication_text">AndroidAPS zmniejsza dawki podstawowe lub wstrzymuje dostarczanie insuliny, aby podnieść poziom cukru we krwi. Leki z klasy inhibitorów SGLT2 (gliflozyny) mogą zapobiegać wzrostowi poziomu glukozy we krwi, a tym samym mogą powodować niebezpieczny niedobór insuliny prowadzący do DKA.
+\nPowszechne nazwy tych leków to: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\n Niniejszym deklaruję, że nie będę przyjmować takich leków, podczas korzystania z AndroidAPS lub dezaktywuje pętlę przed użyciem takich leków.</string>
 </resources>

app/src/main/res/values-pl-rPL/objectives.xml

@@ -21,7 +21,7 @@
     <string name="objectives_smb_objective">Włączanie dodatkowych funkcji do użytku, jak SMB (Super Mikro Bolusy)</string>
     <string name="objectives_auto_objective">Włączanie automatyzacji</string>
     <string name="objectives_smb_gate">Musisz przeczytać wiki i zwiększyć maxIOB, aby SMB działało dobrze! Dobrym początkiem jest maxIOB = średni bolus + 3 x maks. dzienna dawka bazowa</string>
-    <string name="objectives_auto_gate">Przeczytaj dokumenty jak działa automatyzacja. Skonfiguruj swoje pierwsze proste zasady. Na początku zamiast działań pozwól AAPS wyświetlać powiadomienia. Gdy jesteś pewien, że automatyzacja jest uruchamiana we właściwym czasie, zastąp powiadomienie prawdziwymi działaniami. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
+    <string name="objectives_auto_gate">Przeczytaj dokumentację dotyczącą działania automatyzacji. Skonfiguruj swoje pierwsze proste zasady. Zamiast działania niech AAPS wyświetli tylko powiadomienie. Gdy masz pewność, że automatyzacja zostaje uruchomiona we właściwym czasie, zastąp powiadomienie rzeczywistą akcją. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">BG dostępne w NS</string>
     <string name="objectives_pumpstatusavailableinns">Status pompy dostępny w NS</string>
     <string name="objectives_manualenacts">Ręczne zarządzanie</string>
@@ -36,11 +36,11 @@
     <string name="objectives_useloop">Wyświetl zawartość wtyczki Pętla (Loop)</string>
     <string name="objectives_usescale">Użyj funkcji skalowania przez dłuższe przytrzymanie wykresu glikemii</string>
     <string name="objectives_button_enter">Wprowadź</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Jeśli masz co najmniej 3 miesiące doświadczenia w zamkniętej pętli z innymi systemami, możesz zakwalifikować się do otrzymania kodu do pominięcia etapu nauki. Zobacz https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-targets.</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Jeśli masz co najmniej 3 miesiące doświadczenia w zamkniętej pętli z innymi systemami, możesz kwalifikować się do kodu umożliwiającego pominięcie celów. Szczegółowe informacje można znaleźć pod adresem https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives.</string>
     <string name="codeaccepted">Kod został zaakceptowany</string>
     <string name="codeinvalid">Niepoprawny kod</string>
     <string name="objectives_exam_objective">Potwierdź swoje umiejętności</string>
-    <string name="objectives_exam_gate">Ucz się i odpowiadaj poprawnie na pytania</string>
+    <string name="objectives_exam_gate">Przestudiuj pytania.  Na każde pytanie masz cztery możliwe odpowiedzi. Może być więcej niż jedna poprawna odpowiedź. Sprawdź wszystkie poprawne i wybierz WERYFIKUJ.</string>
     <string name="answerdisabledto">Odpowiadanie wyłączone na: %1$s</string>
     <string name="wronganswer">Odpowiedź nieprawidłowa!</string>
     <string name="unfinshed_button">Następny niedokończony</string>

app/src/main/res/values-pl-rPL/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Bezpieczeństwo leczenia</string>
     <string name="treatmentssafety_maxbolus_title">Maks. dopuszczalny bolus [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Maks. dopuszczalne węglowodany [g]</string>
+    <string name="nav_preferences_plugin">%1$s Ustawienia</string>
     <string name="nav_preferences">Ustawienia</string>
     <string name="nav_refreshtreatments">Odśwież/pobierz zdarzenia z NS</string>
     <string name="nav_resetdb">Zresetuj bazy danych</string>
@@ -405,11 +406,18 @@
     <string name="suspendloopfor3h">Wstrzymaj pętlę na 3h</string>
     <string name="suspendloopfor10h">Wstrzymaj pętlę na 10 h</string>
     <string name="suspendloopforXmin">Wstrzymaj pętlę na %1$d min</string>
+    <string name="disconnectpump">Odłącz pompę</string>
     <string name="disconnectpumpfor15m">Wyłącz pompę na 15 min</string>
     <string name="disconnectpumpfor30m">Wyłącz pompę na 30 min</string>
     <string name="disconnectpumpfor1h">Wyłącz pompę na 1 h</string>
     <string name="disconnectpumpfor2h">Wyłącz pompę na 2 h</string>
     <string name="disconnectpumpfor3h">Wyłącz pompę na 3 h</string>
+    <string name="duration15m">15 min</string>
+    <string name="duration30m">30 min</string>
+    <string name="duration1h">1 godzina</string>
+    <string name="duration2h">2 godziny</string>
+    <string name="duration3h">3 godziny</string>
+    <string name="duration10h">10 godzin</string>
     <string name="resume">Wznów</string>
     <string name="reconnect">Połącz ponownie pompę</string>
     <string name="smscommunicator_wrongduration">Zły czas trwania</string>
@@ -565,8 +573,6 @@
     <string name="overview_editquickwizard_usebasaliob">Obliczenia IOB</string>
     <string name="overview_editquickwizard_usetrend">Obliczenia trendu</string>
     <string name="overview_editquickwizard_usesuperbolus">Obliczenia Superbolusa</string>
-    <string name="yes">Tak</string>
-    <string name="no">Nie</string>
     <string name="positiveonly">Tylko pozytywne</string>
     <string name="negativeonly">Tylko negatywne</string>
     <string name="overview_editquickwizard_usecob">Obliczenia COB</string>
@@ -613,8 +619,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">Za mało insuliny na bolus pozostało w zbiorniku</string>
     <string name="extendedbolusdeliveryerror">Błąd dostarczania bolusa przedłużonego</string>
     <string name="insightpump_shortname">Sight</string>
-    <string name="set_neutral_temps_title">Ustawiaj neutralne bazy tymczasowe</string>
-    <string name="set_neutral_temps_summary">Jeśli ta opcja jest włączona, anuluje tymczasową wartość bazową przed końcem każdej godziny. Może to pomóc wyciszyć alarmy/wibracje związane z TBR występujące co godzinę w niektórych pompach.</string>
     <string name="enablesmbalways">Włącz SMB (Super Mikro Bolusy) zawsze</string>
     <string name="enablesmbalways_summary">Włącz SMB (Super Mikro Bolusy) zawsze, niezależnie od bolusów. Możliwe jedynie ze źródłem BG (poziomu cukru) z dobrym filtrowaniem, jak aplikacja G5</string>
     <string name="enablesmbaftercarbs">Włącz SMB po węglowodanach</string>
@@ -680,6 +684,7 @@
     <string name="combo_error_failure_reading_changed_basal_rate">Dawka podstawowa zmieniła się na pompie, ale jej odczyt nie powiódł się</string>
     <string name="combo_activity_checking_for_history_changes">Sprawdzanie zmian w historii</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Wielokrotne bolusy o tej samej wielkości w tej samej minucie zostały właśnie zaimportowane. Do leczenia można dodać tylko jeden taki rekord. Sprawdź pompę i ręcznie dodaj zapis bolusa za pomocą zakładki PortalOpieki. Upewnij się, że tworzysz bolus z czasem, którego nie używa żaden inny bolus.</string>
+    <string name="about_link_urls">\n\ndokumentacja:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <string name="combo_check_date">Ostatni bolus jest starszy niż 24 godziny lub jest w przyszłości. Sprawdź, czy data na pompie jest ustawiona prawidłowo.</string>
     <string name="combo_suspious_bolus_time">Czas/data dostarczonego bolusa na pompie wydaje się błędna, IOB jest prawdopodobnie niepoprawny. Sprawdź czas/datę pompy.</string>
     <string name="profileswitch_ismissing">Brakuje ZmianyProfilu. Proszę wykonać ZmianęProfilu lub nacisnąć \"Aktywuj Profil\" w ProfiluLokalnym</string>
@@ -762,8 +767,8 @@
     <string name="diawarning">Pamiętaj: nowe profile insuliny wymagają ustawienia DIA (czas działania insuliny) powyżej 5h. DIA między 5-6h na nowym profilu odpowiada 3h DIA na starych profilach insuliny.</string>
     <string name="setupwizard_profile_description">Proszę wybrać źródło profilu. Jeśli pacjent jest dzieckiem, należy skorzystać z profilu Nightscout. Jeśli nikt nie obserwuje twojej terapii przez Nightscout, prawdopodobnie wolisz profil Lokalny. Przypomnienie - wybierasz tylko źródło profilu. Musisz go później aktywować za pomocą \"Przełącznika profilu\"</string>
     <string name="setupwizard_aps_description">Wybierz jeden z dostępnych algorytmów. Ułożone są one od najstarszych do najnowszych. Nowszy algorytm jest zazwyczaj bardziej wydajny i agresywny. Jeśli jesteś nowym użytkownikiem, lepiej zacznij od zaawansowanego asystenta posiłku AMA, a nie od najnowszego algorytmu. Zapoznaj się koniecznie z dokumentacją OpenAPS przed wybraniem odpowiedniego algorytmu i jego konfiguracją.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Oczekiwanie na połączenie RileyLink…\n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b>Uwaga:</b> Możesz kontynuować konfigurację po zainicjowaniu pompy.\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Proszę skonfigurować RileyLink poniżej. Po wybraniu RileyLink, możliwe będzie kontynuowanie konfiguracji, gdy status RileyLink będzie \"Połączony\". To może zająć minutę.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Uwaga:</b> Możesz kontynuować konfigurację po skonfigurowaniu pompy.\n</string>
     <string name="startobjective">Rozpocznij swoje pierwsze Zadanie</string>
     <string name="permission">Uprawnienia</string>
     <string name="askforpermission">Zapytaj o uprawnienia</string>
@@ -790,7 +795,6 @@
     <string name="sensitivity_raises_target_title">Wrażliwość podnosi docelowy poziom glukozy</string>
     <string name="sensitivity_raises_target_summary">Po zwiększeniu wrażliwości zwiększ docelowy poziom glukozy</string>
     <string name="combo_invalid_setup">Nieprawidłowa konfiguracja pompy, sprawdź dokumentację i zweryfikuj, czy menu Quick Info nazwano QUICK INFO za pomocą oprogramowania konfiguracyjnego 360.</string>
-    <string name="custom">Niestandardowe</string>
     <string name="careportal_removestartedevents">Wyczyść zdarzenia \"Start AndroidAPS\"</string>
     <string name="storedsettingsfound">Znaleziono zapisane ustawienia</string>
     <string name="allow_hardware_pump_text">Uwaga: Jeśli aktywujesz połączenie z pompą inną niż wirtualna, AndroidAPS skopiuje ustawienia bazy do profilu pompy, zastępując istniejące ustawienia w niej zapisane. Upewnij się, że ustawienia bazy w AndroidAPS są poprawne. Jeśli nie jesteś pewien lub nie chcesz nadpisywać podstawowych ustawień pompy, naciśnij przycisk anuluj i połącz ponownie w innym czasie.</string>
@@ -978,7 +982,9 @@
     <string name="description_source_dexcom">Pobieraj wartości BG ze spatchowanej aplikacji Dexcom.</string>
     <string name="notification">Powiadomienie</string>
     <string name="notification_message">Powiadomienie: %1$s</string>
+    <string name="alarm_message">Alarm: %1$s</string>
     <string name="message_short">Inf:</string>
+    <string name="alarm_short">Alarm:</string>
     <string name="profilepercentage">Procent profilu</string>
     <string name="percent_u">Procent [%]:</string>
     <string name="startprofile">Uruchom profil %1$d%% na %2$d min</string>
@@ -1177,4 +1183,18 @@
     <string name="uploaded_data">Przesłane dane</string>
     <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Następujące dane zostaną przesłane na konto Open Humans: wartości Glikemii, bolusy, węglowodany, zdarzenia z portalu opieki (z wyjątkiem notatek), rozszerzone bolusy, przełączenia profilu, całkowite dawki dobowe, bazy tymczasowe, cele tymczasowe, preferencje, wersja aplikacji, model urządzenia i wymiary ekranu. Dane niejawne lub prywatne, takie jak adres URL strony Nightscout lub klucz autoryzacji API, nie zostaną przesłane.</string>
     <string name="setupwizard_pump_riley_link_status">Stan RileyLink:</string>
+    <string name="filter">Filtr</string>
+    <string name="copytolocalprofile_invalid">Nie można utworzyć profilu lokalnego. Profil jest niepoprawny.</string>
+    <string name="cta_dont_kill_my_app_info">Nie zabij mojej aplikacji?</string>
+    <string name="alarm">Alarm</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Wyślij SMS, jeśli wyzwolone jest zdarzenie pompy nieosiągalnej</string>
+    <string name="smscommunicator_pump_ureachable">Zgłoś pompę nieosiągalną</string>
+    <string name="advisoralarm">Uruchom alarm kiedy będzie czas na jedzenie</string>
+    <string name="alarminxmin">Uruchom alarm za %1$d min</string>
+    <string name="bolusadvisor">Doradca bolusa</string>
+    <string name="bolusadvisormessage">Masz wysoki poziom. Zamiast jeść teraz, zaleca się poczekać na wyrównanie poziomu cukru. Czy chcesz teraz wykonać korekcyjny bolus i otrzymać przypomnienie, kiedy nadejdzie czas na posiłek? W tym przypadku żadne węglowodany nie zostaną zarejestrowane i należy ponownie użyć kreatora, gdy zostanie otrzymane przypomnienie.</string>
+    <string name="enablebolusadvisor">Włącz doradcę bolusa</string>
+    <string name="enablebolusadvisor_summary">Użyj przypomnienia, aby rozpocząć jedzenie zamiast kreatora podczas wysokiej glikemii</string>
+    <string name="time_to_eat">Czas jeść!\nUruchom kreatora bolusa i zrób obliczenia ponownie.</string>
+    <string name="timetoeat">Czas na jedzenie</string>
 </resources>

app/src/main/res/values-pt-rBR/exam.xml

@@ -1,165 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">O que é verdade sobre o DIA?</string>
-    <string name="dia_label_exam">Tópico: Duração da Ação de Insulina</string>
-    <string name="dia_minimumis3h">O valor mínimo é de 3 horas.</string>
-    <string name="dia_minimumis5h">O valor mínimo é de 5 horas.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">O significado é igual ao parâmetro DIA usado na bomba.</string>
-    <string name="dia_valuemustbedetermined">Você tem que determinar o seu valor individual (mas não menos de 5 horas).</string>
-    <string name="hypott_label">Tópico: Hipo Temp-Alvo</string>
-    <string name="hypott_whenhypott">Qual é a razão principal para definir TT hipoglicemia?</string>
-    <string name="hypott_goinglow">Para evitar que a glicose fique baixa se já estiver em funcionamento um temp zero.</string>
-    <string name="hypott_preventoversmb">Para evitar o AAPS dose muita insulina após uma subida rápida causada por carboidratos de atuação rápida para tratar hipoglicemia.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Qual perfil pode ser usado e configurado offline?</string>
     <string name="offlineprofile_label">Tópico: Perfil Offline</string>
     <string name="offlineprofile_nsprofile">Perfil NS pode ser usado, mas não configurado.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Tópico: Desconectando-se da bomba</string>
-    <string name="pumpdisconnect_letknow">Clique em \'Desligar bomba\' para que o AAPS saiba que nenhuma insulina será entregue.</string>
-    <string name="pumpdisconnect_suspend">Clique em \'Suspender loop\' para que AAPS pare o looping enquanto a bomba estiver desconectada.</string>
-    <string name="pumpdisconnect_dontchnage">Não altere nada no AAPS, apenas desconecte a bomba.</string>
+    <string name="pumpdisconnect_whattodo">O que deve ser feito ao desligar a bomba?</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Tópico: Configurações do AndroidAPS</string>
-    <string name="objectives_howtosave">Quais são as melhores práticas para fazer backup de suas configurações?</string>
-    <string name="objectives_exportsettings">Exporte-as localmente do menu Manutenção.</string>
-    <string name="objectives_storeelsewhere">Salve o arquivo exportado para outro local como e-mail, Dropbox, Google drive…</string>
-    <string name="objectives_doexportonstart">Exporte-as logo após a instalação do AAPS.</string>
-    <string name="objectives_doexportafterchange">Exportá-los depois de fazer alterações de configuração.</string>
-    <string name="objectives_doexportafterobjective">Exportá-los depois de completar um objetivo.</string>
-    <string name="objectives_doexportafterfirtssettings">Exporte-as quando concluir as configurações iniciais.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
-    <string name="noisycgm_label">Tópico: Leituras do CGM imprecisas</string>
     <string name="noisycgm_whattodo">O que deve ser feito se os dados do CGM são irregulares?</string>
-    <string name="nothing">Nada, AAPS vai lidar com isso.</string>
-    <string name="noisycgm_pause">Desativar o loop para evitar sobredosagem.</string>
-    <string name="noisycgm_replacesensor">Substitua o sensor CGM.</string>
-    <string name="noisycgm_turnoffphone">Desligue o telefone.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">Verifique que a app do CGM suaviza os dados da Glicose.</string>
-    <string name="exercise_label">Tópico: Exercício</string>
-    <string name="exercise_whattodo">Como você pode ajudar o sistema a lidar com exercícios?</string>
-    <string name="exercise_setactivitytt">Usando o recurso de alvo-temp.</string>
-    <string name="exercise_switchprofilebelow100">Faça um mudança de perfil abaixo de 100%.</string>
-    <string name="exercise_switchprofileabove100">Fazer uma mudança de perfil acima de 100%.</string>
-    <string name="exercise_stoploop">Pare o loop.</string>
-    <string name="exercise_doitbeforestart">Definir um alvo-temp de atividade antes de iniciar o exercício.</string>
-    <string name="exercise_afterstart">Definir um alvo-temp de atividade após iniciar o exercício leva a resultados piores do que se iniciado antes.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">Tópico: Loop Desativado/Suspenso</string>
     <string name="suspendloop_doigetinsulin">Eu recebo insulina quando o loop estiver desativado/suspenso?</string>
     <string name="suspendloop_yes">Sim, a insulina basal continua a ser entregue.</string>
     <string name="suspendloop_no">Não, a entrega da insulina está parada.</string>
-    <string name="basaltest_label">Tópico: Testando Basal, ISF e IC</string>
-    <string name="basaltest_when">Quando devo validar os valores de basal, ISF e IC?</string>
-    <string name="basaltest_beforeloop">Antes de começar com o loop.</string>
-    <string name="basaltest_havingregularhypo">Quando ocorrer frequentemente glicemia baixa.</string>
-    <string name="basaltest_havingregularhyper">Quando ocorrer frequentemente glicemia alta.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Tópico: Pré-requisitos</string>
-    <string name="prerequisites_what">O que eu preciso?</string>
     <string name="prerequisites_determinedcorrectprofile">Informações do perfil validadas (Basal, IC, FSI, DIA).</string>
-    <string name="prerequisites_computer">Um computador para criar um APK.</string>
     <string name="prerequisites_phone">Um telefone compatível.</string>
-    <string name="prerequisites_car">Um carro.</string>
-    <string name="prerequisites_nightscout">Nightscout para passar os objetivos.</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 de desenvolvimento Android.</string>
     <string name="prerequisites_own670g">Uma bomba MiniMed 670G.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">Um Smartwatch.</string>
     <string name="prerequisites_supportedcgm">Um CGM compatível.</string>
-    <string name="update_label">Tópico: Atualização do AndroidAPS</string>
-    <string name="whatistrue">O que é verdade?</string>
-    <string name="update_git">Você precisa ter o Git instalado.</string>
-    <string name="update_asap">Atualizar assim que nova versão for lançada e tiver tempo suficiente para fazer isso.</string>
-    <string name="update_keys">Você deve utilizar as mesmas chaves de assinatura.</string>
     <string name="update_neverupdate">Nunca atualize se o sistema estiver funcionando bem.</string>
-    <string name="update_askfriend">Peça ao seu amigo para a nova APK.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Tópico: Resolução de Problemas</string>
-    <string name="troubleshooting_wheretoask">Onde procurar ajuda?</string>
-    <string name="troubleshooting_fb">Entrar no grupo AndroidAPS do Facebook.</string>
-    <string name="troubleshooting_wiki">Leia a documentação do AndroidAPS.</string>
-    <string name="troubleshooting_gitter">Visite a sala do AndroidAPS no Gitter.</string>
-    <string name="troubleshooting_googlesupport">Visite o suporte do Google para o AndroidAPS</string>
-    <string name="troubleshooting_yourendo">Fale com seu endocrinologista.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Tópico: Plugins de Insulina</string>
-    <string name="insulin_ultrarapid">Qual marca de insulina pode ser usada com o plugin \'Ultra-Rapid-Oref\'?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid ®</string>
     <string name="insulin_humalog">Humalog ®</string>
-    <string name="insulin_actrapid">Actrapid ®</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Tópico: Plugins de Sensibilidade</string>
-    <string name="sensitivity_which">Qual algoritmo de sensibilidade tem um intervalo de tempo configurável?</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Qual plugin de sensibilidade deve ser usado para o recurso UAM?</string>
-    <string name="wrongcarbs_label">Tópico: Erros de Entrada de Carboidratos</string>
     <string name="wrongcarbs_whattodo">O que deve fazer se tiver feito uma entrada incorrecta de carboidratos?</string>
-    <string name="wrongcarbs_treatmentstab">Em Tratamentos, excluir a entrada incorrecta de carboidratos. Insira novos carboidratos.</string>
-    <string name="wrongcarbs_addfakeinsulin">Adicionar falsa insulina usando a função de Refill</string>
-    <string name="extendedcarbs_label">Tópico: Alimentos com Gordura e Proteína</string>
-    <string name="extendedcarbs_handling">O que fazer se sua comida contiver uma grande quantidade de gordura e/ou proteínas?</string>
-    <string name="extendedcarbs_useextendedcarbs">Recalcule gordura e proteínas para carboidrato e use o recurso \"Carbs estentido\".</string>
-    <string name="extendedcarbs_add">Recalcular gordura e proteínas em carboidrato e adicioná-lo ao cálculo de bolus.</string>
-    <string name="extendedcarbs_useextendedbolus">Use o bolus estendido para cobrir gordura e proteínas.</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Tópico: Monitorização Remota</string>
-    <string name="nsclient_howcanyou">Como você pode monitorar AAPS da sua criança remotamente?</string>
-    <string name="nsclient_nightscout">Usando o site do Nightscout.</string>
-    <string name="nsclient_dexcomfollow">Dexcom Follow app se você estiver usando o aplicativo Dexcom original(apenas Glicemia).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow se você estiver usando o aplicativo xDrip.</string>
-    <string name="nsclient_xdripfollower">xDrip rodando no modo follower.</string>
-    <string name="nsclient_looponiphone">Aplicativo Loop no iPhone.</string>
-    <string name="nsclient_spikeiphone">Aplicativo Spike no iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Tópico: Fator de Sensibilidade de Insulina</string>
-    <string name="isf_increasingvalue">Valores elevados de FSI levam a uma entrega de menos insulina quando o AAPS corrige glicemia alta.</string>
-    <string name="isf_decreasingvalue">Valores baixos de FSI levam a uma entrega de menos insulina quando o AAPS corrige glicemia alta.</string>
-    <string name="isf_noeffect">Alterar os valores FSI não tem efeito sobre a quantidade de insulina entregue quando a AAPS corrige glicemia alta.</string>
-    <string name="isf_preferences">Você precisa inserir o ISF nas Preferências.</string>
     <string name="isf_profile">Alterar o valor do ISF no seu perfil é o suficiente para aplicar a alteração.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Tópico: Porporção IC</string>
-    <string name="ic_increasingvalue">Proporções IC mais altos levam a menos insulina entregue para uma dada quantidade de carboidratos.</string>
-    <string name="ic_decreasingvalue">Proporções IC mais baixos levam a menos insulina entregue para uma dada quantidade de carboidratos.</string>
     <string name="ic_noeffect">Se tiver 0 COB, alterar a proporção IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da glicemia.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Tópico: Alternando Perfil</string>
-    <string name="profileswitch_pctwillchange"> Ao especificar 90% na mudança de perfil…</string>
-    <string name="profileswitch_basalhigher">Os basais serão 10% maiores.</string>
-    <string name="profileswitch_basallower">Os basais serão 10% menores.</string>
-    <string name="profileswitch_ichigher">O valor do IC será 10% maior.</string>
-    <string name="profileswitch_iclower">O valor do IC será 10% menor.</string>
-    <string name="profileswitch_isfhigher">O valor do ISF será 10% maior.</string>
-    <string name="profileswitch_isflower">O valor do ISF será 10% menor.</string>
-    <string name="profileswitch_overall">Você receberá aproximadamente 10% menos insulina no total.</string>
-    <string name="profileswitch_targethigher">O alvo será 10% maior.</string>
-    <string name="profileswitch_targetlower">O alvo será 10% menor.</string>
-    <string name="profileswitch_targetbottom">Só o alvo inferior será 10% menor.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Se acordar 1h mais cedo do que o normal, como deve notificar a AAPS da mudança no seu horário?</string>
-    <string name="profileswitchtime_1">Iniciar uma mudança de perfil com uma alteração de turno de 1</string>
-    <string name="profileswitchtime__1">Iniciar uma mudança de perfil com uma alteração de turno de -1</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Iniciar uma mudança de perfil com uma alteração de turno de 60</string>
-    <string name="profileswitchtime__60">Iniciar uma mudança de perfil com uma alteração de turno de -60</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
-    <string name="basalhelp_label">Tópico: Ajuda com taxas basais</string>
     <string name="basalhelp_where">Onde procurar ajuda para taxas basais e etc.</string>
     <string name="basalhelp_diabetesteam">Sua equipe de diabetes</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Outra Medicação</string>
-    <string name="other_medication_text">AAPS reduz Basal para aumentar o açúcar no sangue. As drogas do grupo de inibidores de SGLT2 (gliflozins) podem evitar o aumento esperado da glicose e, assim, podem produzir uma deficiência de insulina perigosa (DKA).
-\nOs nomes comuns de marca são: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nPrometo que não vou tomar tais drogas ao usar o AAPS ou vou desativar o loop antes de usar essas drogas.</string>
 </resources>

app/src/main/res/values-pt-rBR/objectives.xml

@@ -21,7 +21,6 @@
     <string name="objectives_smb_objective">Ativando recursos adicionais para uso durante o dia, como SMB</string>
     <string name="objectives_auto_objective">A ativar a automação</string>
     <string name="objectives_smb_gate">Deverá ler a wiki e aumentar a IOB máx para que os SMBs funcionem devidamente! Inicialmente poderá considerar maxIOB=média dos bólus + 3 x a basal máxima</string>
-    <string name="objectives_auto_gate">Leia os documentos de como a automação funciona. Configure primeiro regras simples. Em vez de ação deixe AAPS apresentar apenas a notificação. Quando tem certeza de automação é acionada no momento certo substitua a notificação por ação real. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">Glic disponível no NS</string>
     <string name="objectives_pumpstatusavailableinns">Estado da Bomba disponível no NS</string>
     <string name="objectives_manualenacts">Execução manual</string>
@@ -36,11 +35,9 @@
     <string name="objectives_useloop">Mostrar conteúdo do plugin Loop</string>
     <string name="objectives_usescale">Utilizar a função de escala premindo longamente gráfico Glic</string>
     <string name="objectives_button_enter">Inserir</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se tiver pelo menos 3 meses de experiência com Close Loop com outros sistemas, pode-se qualificar para um código para ignorar objetivos. Ver https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives para mais detalhes.</string>
     <string name="codeaccepted">Código aceito</string>
     <string name="codeinvalid">Código inválido</string>
     <string name="objectives_exam_objective">Prove seu conhecimento</string>
-    <string name="objectives_exam_gate">Estude e responda as perguntas corretamente</string>
     <string name="answerdisabledto">Resposta desativada para: %1$s</string>
     <string name="wronganswer">Resposta errada!</string>
     <string name="unfinshed_button">Próximo inacabado</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -509,8 +509,6 @@
     <string name="overview_editquickwizard_usebasaliob">Cálculo de Basal IOB</string>
     <string name="overview_editquickwizard_usetrend">Cálculo tendência</string>
     <string name="overview_editquickwizard_usesuperbolus">Cálculo de superbolus</string>
-    <string name="yes">Sim</string>
-    <string name="no">Não</string>
     <string name="positiveonly">Positivo apenas</string>
     <string name="negativeonly">Negativo apenas</string>
     <string name="overview_editquickwizard_usecob">Cálculo COB</string>
@@ -723,7 +721,6 @@
     <string name="sensitivity_raises_target_title">Sensibilidade aumenta o alvo</string>
     <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
     <string name="combo_invalid_setup">Configuração da bomba inválida, verifique a documentação e se o menu de informações rápidas está nomeado de QUICK INFO utilizando o programa de configuração 360.</string>
-    <string name="custom">Personalizado</string>
     <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
     <string name="storedsettingsfound">Configurações encontradas</string>
     <string name="allow_hardware_pump_text">Atenção: Se conectar à sua bomba física e ativar o perfil, o AndroidAPS irá copiar as definições desse perfil para as definições da bomba, apagando o memorizado na bomba. Por favor verifique que o que preencheu no perfil do app tem os mesmos valores que estão na bomba. Em caso contrário pressione imediatamente cancelar e corrija antes de voltar a ligar à bomba.</string>

app/src/main/res/values-pt-rPT/exam.xml

@@ -1,165 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">O que é verdade sobre DIA?</string>
-    <string name="dia_label_exam">Tópico: Duração da Acção de Insulina (DIA)</string>
-    <string name="dia_minimumis3h">O valor mínimo é de 3 horas.</string>
-    <string name="dia_minimumis5h">O valor mínimo é de 5 horas.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">O significado é igual ao parâmetro DIA usado na bomba.</string>
-    <string name="dia_valuemustbedetermined">É necessário determinar o seu valor individual (mas não menos de 5 horas).</string>
-    <string name="hypott_label">Tópico: Alvo-Temp. Hipo</string>
-    <string name="hypott_whenhypott">O que é a razão principal para definir TT hipoglicemia?</string>
-    <string name="hypott_goinglow">Para evitar que a Glic fique baixa se já estiver em funcionamento um temp zero.</string>
-    <string name="hypott_preventoversmb">Para evitar o AAPS dosear demasiada insulina após uma subida rápida causada por hidratos de actuação rápida para tratar hipoglicemia.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Qual perfil pode ser usado e configurado offline?</string>
     <string name="offlineprofile_label">Tópico: Perfil Offline</string>
     <string name="offlineprofile_nsprofile">Perfil NS pode ser usado, mas não configurado.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Tópico: Desligar a Bomba</string>
-    <string name="pumpdisconnect_letknow">Clique em \'Desligar bomba\' para que o AAPS saiba que nenhuma insulina está a ser administrada.</string>
-    <string name="pumpdisconnect_suspend">Clique em \'Suspender loop\' para que AAPS pare o looping enquanto a bomba estiver desconectada.</string>
-    <string name="pumpdisconnect_dontchnage">Não altere nada no AAPS, apenas desconecte a bomba.</string>
+    <string name="pumpdisconnect_whattodo">O que deve ser feito ao desligar a bomba?</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Tópico: Definições do AndroidAPS</string>
-    <string name="objectives_howtosave">Quais são as práticas recomendadas para fazer cópia de segurança das configurações?</string>
-    <string name="objectives_exportsettings">Exportá-las localmente a partir do menu Manutenção.</string>
-    <string name="objectives_storeelsewhere">Armazenar ficheiro exportado para outro local como e-mail, Dropbox, Google drive…</string>
-    <string name="objectives_doexportonstart">Exportá-los logo após a instalação do AAPS.</string>
-    <string name="objectives_doexportafterchange">Exportá-los depois de fazer alterações de configuração.</string>
-    <string name="objectives_doexportafterobjective">Exportá-los depois de completar um objectivo.</string>
-    <string name="objectives_doexportafterfirtssettings">Exportá-los quando terminar as configurações iniciais.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
-    <string name="noisycgm_label">Tópico: Leituras Irregulares CGM</string>
     <string name="noisycgm_whattodo">O que deve ser feito se os dados do CGM são irregulares?</string>
-    <string name="nothing">Nada, AAPS vai lidar com isso.</string>
-    <string name="noisycgm_pause">Desactivar o loop para evitar sobredosagem.</string>
-    <string name="noisycgm_replacesensor">Substituir o sensor CGM.</string>
-    <string name="noisycgm_turnoffphone">Desligue o telefone.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">Verifique que a app do CGM suaviza os dados da Glicose.</string>
-    <string name="exercise_label">Tópico: Exercício</string>
-    <string name="exercise_whattodo">Como você pode ajudar o sistema a lidar com exercícios?</string>
-    <string name="exercise_setactivitytt">Usando o recurso de alvo-temp.</string>
-    <string name="exercise_switchprofilebelow100">Fazer uma mudança de perfil inferior a 100%.</string>
-    <string name="exercise_switchprofileabove100">Fazer uma mudança de perfil acima de 100%.</string>
-    <string name="exercise_stoploop">Parar o loop.</string>
-    <string name="exercise_doitbeforestart">Definir um alvo-temp de actividade antes de iniciar o exercício.</string>
-    <string name="exercise_afterstart">Definir um alvo-temp de actividade após iniciar o exercício leva a resultados piores do que se iniciado antes.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">Tópico: Loop Desactivado/Suspenso</string>
     <string name="suspendloop_doigetinsulin">Eu recebo insulina quando o loop estiver desactivado/suspenso?</string>
     <string name="suspendloop_yes">Sim, a insulina basal continua a ser administrada.</string>
     <string name="suspendloop_no">Não, administração da insulina está parada.</string>
-    <string name="basaltest_label">Topic: Testar Basal, FSI e IC</string>
-    <string name="basaltest_when">Quando devo validar valores das basais, FSI e de IC?</string>
-    <string name="basaltest_beforeloop">Antes de começar com o looping.</string>
-    <string name="basaltest_havingregularhypo">Quando ocorrer frequentemente Glic baixa.</string>
-    <string name="basaltest_havingregularhyper">Quando ocorrer frequentemente Glic alta.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Tópico: Pré-requisitos</string>
-    <string name="prerequisites_what">O que preciso?</string>
     <string name="prerequisites_determinedcorrectprofile">Informações do perfil validadas (Basal, IC, FSI, DIA).</string>
-    <string name="prerequisites_computer">Um computador para criar um APK.</string>
     <string name="prerequisites_phone">Um telefone compatível.</string>
-    <string name="prerequisites_car">Um Carro.</string>
-    <string name="prerequisites_nightscout">Nightscout para passar os objectivos.</string>
     <string name="prerequisites_tidepoolaccount">Uma conta Tidepool.</string>
     <string name="prerequisites_googleaccount">Uma conta Google.</string>
     <string name="prerequisites_githubaccount">Uma conta Github.</string>
-    <string name="prerequisites_beanandroiddeveloper">Experiência de desenvolvimento Android.</string>
     <string name="prerequisites_own670g">Uma bomba MiniMed 670G.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">Um Smartwatch.</string>
     <string name="prerequisites_supportedcgm">Um CGM Suportado.</string>
-    <string name="update_label">Tópico: Actualização do AndroidAPS</string>
-    <string name="whatistrue">O que é verdadeiro?</string>
-    <string name="update_git">Você precisa ter o Git instalado.</string>
-    <string name="update_asap">Actualizar assim que nova versão for lançada e tiver tempo suficiente para fazer isso.</string>
-    <string name="update_keys">Você deve utilizar as mesmas chaves de assinatura.</string>
     <string name="update_neverupdate">Nunca actualize se o sistema estiver a funcionar bem.</string>
-    <string name="update_askfriend">Pergunte ao seu amigo pelo novo APK.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Tópico: Resolução de Problemas</string>
-    <string name="troubleshooting_wheretoask">Onde ir para obter ajuda?</string>
-    <string name="troubleshooting_fb">Adira ao grupo do Facebook AndroidAPS.</string>
-    <string name="troubleshooting_wiki">Leia a documentação do AndroidAPS.</string>
-    <string name="troubleshooting_gitter">Visite AndroidAPS Gitter Room.</string>
-    <string name="troubleshooting_googlesupport">Visite o suporte AndroidAPS Google</string>
-    <string name="troubleshooting_yourendo">Fale com seu endócrinologista.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Tópico: Plugins de Insulina</string>
-    <string name="insulin_ultrarapid">Qual marca de insulina pode ser usada com o plugin \'Ultra-Rapid-Oref\'?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid ®</string>
     <string name="insulin_humalog">Humalog ®</string>
-    <string name="insulin_actrapid">Actrapid ®</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Tópico: Plugins de Sensibilidade</string>
-    <string name="sensitivity_which">Qual algoritmo de sensibilidade tem um intervalo de tempo configurável?</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Qual plugin de sensibilidade deve ser usado para o recurso UAM?</string>
-    <string name="wrongcarbs_label">Tópico: Erros de Entrada de Hidratos</string>
     <string name="wrongcarbs_whattodo">O que deve fazer se tiver feito uma entrada incorrecta de hidratos?</string>
-    <string name="wrongcarbs_treatmentstab">Em Tratamentos, excluir a entrada incorrecta de hidratos. Insira novos hidratos.</string>
-    <string name="wrongcarbs_addfakeinsulin">Como adicionar insulina falsa utilizando a função Recarregar</string>
-    <string name="extendedcarbs_label">Tópico: Alimentos com Gordura e Proteína</string>
-    <string name="extendedcarbs_handling">O que fazer se a comida contém uma grande quantidade de gordura e/ou proteínas?</string>
-    <string name="extendedcarbs_useextendedcarbs">Recalcular gordura e proteínas em hidratos e usar recurso de \"Hidratos Prolongados\".</string>
-    <string name="extendedcarbs_add">Recalcular gordura e proteínas em hidratos e adicionar ao cálculo de bólus.</string>
-    <string name="extendedcarbs_useextendedbolus">Use o bólus estendido para cobrir gordura e proteínas.</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Tópico: Monitorização Remota</string>
-    <string name="nsclient_howcanyou">Como pode monitorizar AAPS do seu filho remotamente?</string>
-    <string name="nsclient_nightscout">Usando um site Nightscout.</string>
-    <string name="nsclient_dexcomfollow">App Dex om Follow se estiver a usar a app original Dexcom (Glic apenas).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow se estiver a usar a app xDrip.</string>
-    <string name="nsclient_xdripfollower">xDrip a correr no modo seguidor.</string>
-    <string name="nsclient_looponiphone">App de Loop no iPhone.</string>
-    <string name="nsclient_spikeiphone">App Spike no iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Tópico: Factor de Sensibilidade de Insulina</string>
-    <string name="isf_increasingvalue">Valores elevados de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
-    <string name="isf_decreasingvalue">Valores baixos de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
-    <string name="isf_noeffect">Alterar os valores FSI não tem efeito sobre a quantidade de insulina administrada quando a AAPS corrige Glic alta.</string>
-    <string name="isf_preferences">É necessário inserir FSI nas Preferências.</string>
     <string name="isf_profile">A alteração do valor do FSI no seu perfil é suficiente para aplicar a mudança.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Tópico: Rácio IC</string>
-    <string name="ic_increasingvalue">Rácios IC mais altos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
-    <string name="ic_decreasingvalue">Rácios IC mais baixos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
     <string name="ic_noeffect">Se tiver 0 COB, alterar o rácio IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da Glic.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Tópico: Mudança De Perfil</string>
-    <string name="profileswitch_pctwillchange"> Ao especificar 90% na mudança de perfil…</string>
-    <string name="profileswitch_basalhigher">Basais são 10% superiores.</string>
-    <string name="profileswitch_basallower">Basais serão 10% inferiores.</string>
-    <string name="profileswitch_ichigher">Valor IC será 10% superior.</string>
-    <string name="profileswitch_iclower">Valor IC será 10% inferior.</string>
-    <string name="profileswitch_isfhigher">O valor FSI será 10% mais alto.</string>
-    <string name="profileswitch_isflower">O valor FSI será 10% mais baixo.</string>
-    <string name="profileswitch_overall">Você receberá aproximadamente 10% menos insulina no total.</string>
-    <string name="profileswitch_targethigher">Alvo será 10% superior.</string>
-    <string name="profileswitch_targetlower">Alvo será 10% inferior.</string>
-    <string name="profileswitch_targetbottom">Só alvo inferior será 10% menor.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Se acordar 1h mais cedo do que o normal, como deve notificar a AAPS da mudança no seu horário?</string>
-    <string name="profileswitchtime_1">Iniciar uma mudança de perfil com uma alteração de turno de 1</string>
-    <string name="profileswitchtime__1">Iniciar uma mudança de perfil com uma alteração de turno de -1</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Iniciar uma mudança de perfil com uma alteração de turno de 60</string>
-    <string name="profileswitchtime__60">Iniciar uma mudança de perfil com uma alteração de turno de -60</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
-    <string name="basalhelp_label">Tópico: Ajuda com taxas de basal</string>
     <string name="basalhelp_where">Onde ir para obter ajuda com rácios da basal, etc.</string>
     <string name="basalhelp_diabetesteam">A sua equipa da diabetes</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Outra Medicação</string>
-    <string name="other_medication_text">AAPS reduz Basal para aumentar o açúcar no sangue. As drogas do grupo de inibidores de SGLT2 (gliflozins) podem evitar o aumento esperado da Glic e, assim, podem produzir uma deficiência de insulina perigosa (DKA).
-\nOs nomes comuns de marca são: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nPrometo que não vou tomar tais drogas ao usar o AAPS ou vou desactivar o loop antes de usar essas drogas.</string>
 </resources>

app/src/main/res/values-pt-rPT/objectives.xml

@@ -21,7 +21,6 @@
     <string name="objectives_smb_objective">Activando recursos adicionais para uso durante o dia, como SMB</string>
     <string name="objectives_auto_objective">A activar a automação</string>
     <string name="objectives_smb_gate">Deverá ler a wiki e aumentar a IOB máx para que os SMBs funcionem devidamente! Inicialmente poderá considerar maxIOB=média dos bólus + 3 x a basal máxima</string>
-    <string name="objectives_auto_gate">Leia os documentos de como a automação funciona. Configure primeiro regras simples. Em vez de acção deixe AAPS apresentar apenas a notificação. Quando tem certeza de automação é accionada no momento certo substitua a notificação por acção real. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">Glic disponível no NS</string>
     <string name="objectives_pumpstatusavailableinns">Estado da Bomba disponível no NS</string>
     <string name="objectives_manualenacts">Execução manual</string>
@@ -36,11 +35,9 @@
     <string name="objectives_useloop">Mostrar conteúdo do plugin Loop</string>
     <string name="objectives_usescale">Utilizar a função de escala premindo longamente gráfico Glic</string>
     <string name="objectives_button_enter">Inserir</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se tiver pelo menos 3 meses de experiência com Close Loop com outros sistemas, pode-se qualificar para um código para ignorar objectivos. Ver https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives para mais detalhes.</string>
     <string name="codeaccepted">Código aceite</string>
     <string name="codeinvalid">Código inválido</string>
     <string name="objectives_exam_objective">Prove seu conhecimento</string>
-    <string name="objectives_exam_gate">Estude e responda as perguntas correctamente</string>
     <string name="answerdisabledto">Responder desactivado até: %1$s</string>
     <string name="wronganswer">Resposta errada!</string>
     <string name="unfinshed_button">Próximo inacabado</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -384,10 +384,12 @@
     <string name="wear_detailedIOB_summary">Dividir IOB entre IOB de bolus e de basal na face do relógio</string>
     <string name="nosuccess">sem efeito - por favor verifique no telemóvel</string>
     <string name="notavailable">n/d</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">Gravidez</string>
     <string name="patient_name">Nome do Paciente</string>
     <string name="patient_name_summary">Por favor, forneça nome do paciente ou alcunha para diferenciar entre várias configurações</string>
     <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Utilizador</string>
@@ -455,6 +457,12 @@
     <string name="ns_noupload_summary">Todos os dados enviados para NS são descartados. AAPS está conectado ao NS, mas não é feita nenhuma alteração no NS</string>
     <string name="overview_extendedbolus_cancel_button">Cancelar Bólus Prolongado</string>
     <string name="doprofileswitch">Fazer Mudança De Perfil</string>
+    <string name="careportal_sensor_label">Sensor</string>
+    <string name="careportal_canula_label">Cânula</string>
+    <string name="careportal_insulin_label">Insulina</string>
+    <string name="careportal_pb_label">Bateria da Bomba</string>
+    <string name="careportal_age_label">idade:</string>
+    <string name="careportal_level_label">nível:</string>
     <string name="ns_alarmoptions">Opções Alarme</string>
     <string name="ns_alarms">Criar notificações dos alarmes NS</string>
     <string name="ns_announcements">Criar notificações a partir dos anúncios NS</string>
@@ -552,8 +560,6 @@
     <string name="overview_editquickwizard_usebasaliob">Cálculo de Basal IOB</string>
     <string name="overview_editquickwizard_usetrend">Cálculo tendência</string>
     <string name="overview_editquickwizard_usesuperbolus">Cálculo de superbolus</string>
-    <string name="yes">Sim</string>
-    <string name="no">Não</string>
     <string name="positiveonly">Positivo apenas</string>
     <string name="negativeonly">Negativo apenas</string>
     <string name="overview_editquickwizard_usecob">Cálculo COB</string>
@@ -600,8 +606,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">Não há insulina suficiente no reservatório para bolus</string>
     <string name="extendedbolusdeliveryerror">Erro na administração Bólus Prolongado</string>
     <string name="insightpump_shortname">Visão</string>
-    <string name="set_neutral_temps_title">Definir basais temporárias neutras</string>
-    <string name="set_neutral_temps_summary">Se activado, ele irá cancelar basal temporária antes do final de cada hora. Este método pode ajudar a parar o sinal sonoro/vibração em algumas bombas, de hora em hora.</string>
     <string name="enablesmbalways">SMB sempre activado</string>
     <string name="enablesmbalways_summary">SMB sempre activo independentemente dos bolus. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
     <string name="enablesmbaftercarbs">Activar SMB após hidratos</string>
@@ -775,7 +779,6 @@
     <string name="sensitivity_raises_target_title">Sensibilidade aumenta o alvo</string>
     <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
     <string name="combo_invalid_setup">Configuração da bomba inválida, verifique a documentação e se o menu de informações rápidas está nomeado de QUICK INFO utilizando o programa de configuração 360.</string>
-    <string name="custom">Personalizado</string>
     <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
     <string name="storedsettingsfound">Configurações encontradas</string>
     <string name="allow_hardware_pump_text">Atenção: Se conectar à sua bomba física e activar o perfil, o AndroidAPS irá copiar as definições desse perfil para as definições da bomba, apagando o memorizado na bomba. Por favor verifique que o que preencheu no perfil da app tem os mesmos valores que estão na bomba. Em caso contrario pressione imediatamente cancelar e corrija antes de voltar a ligar à bomba.</string>
@@ -963,6 +966,7 @@
     <string name="notification">Notificação</string>
     <string name="notification_message">Notificação: %1$s</string>
     <string name="message_short">Mnsg:</string>
+    <string name="alarm_short">Alarme:</string>
     <string name="profilepercentage">Percentagem do Perfil</string>
     <string name="percent_u">Percentagem [%]:</string>
     <string name="startprofile">Iniciar perfil %1$d%% para %2$d min</string>
@@ -1086,6 +1090,7 @@
     <string name="smscommunicator_otp_pin_summary">Dígitos adicionais que devem ser memorizados e colados no final de cada Uma-Senha-Única que seja gerada</string>
     <string name="smscomunicator_tab_otp_label">Configuração do Autenticador</string>
     <string name="smscommunicator_code_verify_label">Código para verificar:</string>
+    <string name="smscommunicator_code_verify_hint">OTP + PIN</string>
     <string name="smscommunicator_otp_reset_btn">Repor Autenticadores</string>
     <string name="smscommunicator_otp_reset_title">Repor Chave Autenticador</string>
     <string name="smscommunicator_otp_reset_prompt">Tem certeza de redefinir chave Authenticador? Ele tornará todos os Authenticators configurados actualmente como inválidos, e precisará de os configurar novamente.</string>
@@ -1139,4 +1144,6 @@
     <string name="only_upload_if_connected_to_wifi">Apenas enviar se ligado ao Wi-Fi</string>
     <string name="only_upload_if_charging">Apenas enviar se estiver a carregar</string>
     <string name="uploaded_data">Dados Enviados</string>
+    <string name="filter">Filtro</string>
+    <string name="alarm">Alarme</string>
 </resources>

app/src/main/res/values-ro-rRO/exam.xml

@@ -1,165 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Care afirmații despre DIA sunt adevărate?</string>
-    <string name="dia_label_exam">Subiect: Durata de acțiune a insulinei</string>
-    <string name="dia_minimumis3h">Valoarea minimă este de 3 ore.</string>
-    <string name="dia_minimumis5h">Valoarea minimă este de 5 ore.</string>
+    <string name="dia_label_exam">Durata de Acțiune a Insulinei (DIA)</string>
+    <string name="dia_profile">Ar trebui să setaţi valoarea pentru DIA în profilul dumneavoastră.</string>
+    <string name="dia_minimumis5h">Valoarea minimă permisă este de 5 ore.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">Este vorba despre ceva ce este egal cu parametrul DIA folosit în pompa dumneavoastră.</string>
-    <string name="dia_valuemustbedetermined">Va trebui să vă determinați valoarea individuală (dar nu mai mică de 5 ore).</string>
-    <string name="hypott_label">Subiect: Țintă hipo temp</string>
-    <string name="hypott_whenhypott">Care este scopul principal pentru care se stabilește o bazală temporară de hipo?</string>
-    <string name="hypott_goinglow">Pentru a preveni o scădere a glicemiei dacă este deja activă o bazală zero.</string>
-    <string name="hypott_preventoversmb">Pentru evitarea supradozării de insulină de către AAPS, după o creștere cauzată de carbohidrați rapizi folosiți pentru tratarea unui hipo.</string>
+    <string name="dia_meaningisequaltodiapump">Dacă considerați ca fiind bună valoarea DIA pe care aţi utilizat-o în pompa dumneavoastră înainte de AndroidAPS și a funcţionat bine, nu este necesară modificarea acesteia atunci când începeţi să faceţi looping.</string>
+    <string name="dia_valuemustbedetermined">Ar trebui să determinaţi dumneavoastră valoarea corespunzătoare pentru DIA.</string>
+    <string name="hypott_label">Țintă-Temporară Hipoglicemie</string>
+    <string name="hypott_whenhypott">Care este motivul principal pentru a stabili o țintă temporară de hipoglicemie?</string>
+    <string name="hypott_wrongbasal">Pentru a corecta hipoglicemiile cauzate de setările de rată bazală incorecte.</string>
+    <string name="hypott_preventoversmb">Pentru a preveni supracorectarea de către AndroidAPS a unei creșteri a glicemiei cauzată de carbohidrații cu acțiune rapidă utilizați pentru a trata o hipoglicemie.</string>
+    <string name="hypott_exercise">Pentru corectarea unui episod hipoglicemic indus ca rezultat al exerciţiului fizic.</string>
+    <string name="hypott_0basal">Pentru a preveni scăderea glicemiei, dacă este deja în funcţiune o rată bazală temporară de 0% a glicemiei.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Ce profil se va folosi și configura offline?</string>
     <string name="offlineprofile_label">Subiect: Profil Offline</string>
     <string name="offlineprofile_nsprofile">Profilul NS poate fi folosit, dar nu modificat.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Subiect: Deconectarae de la pompă</string>
-    <string name="pumpdisconnect_letknow">Apăsați ‘Deconectează pompa’ astfel încât AAPS să știe că nu se va putea livra insulină.</string>
-    <string name="pumpdisconnect_suspend">Apăsați ‘Suspendă bucla’ astfel încât AAPS să dezactiveze bucla atâta timp cât pompa este deconectată.</string>
-    <string name="pumpdisconnect_dontchnage">Nu modificați nimic în AAPS, doar deconectați pompa.</string>
+    <string name="pumpdisconnect_label">Motive pentru aplicarea \"Deconectează pompa\" în AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">Ce trebuie să faceți atunci când deconectați pompa?</string>
+    <string name="pumpdisconnect_unnecessary">Acest lucru nu este necesar deoarece insulina nu va fi eliberată dacă pompa este deconectată fizic.</string>
+    <string name="pumpdisconnect_missinginsulin">Aceasta previne contabilizarea de către AndroidAPS a insulinei care nu a fost administrată în timp ce pompa este deconectată fizic</string>
+    <string name="pumpdisconnect_notstop">Nu va opri administrarea insulinei dacă pompa rămâne conectată.</string>
+    <string name="pumpdisconnect_openloop">Va seta AndroidAPS în modul buclă deschisă.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Subiect: Setări AndroidAPS</string>
+    <string name="objectives_label">Setări AndroidAPS</string>
+    <string name="objectives2_label">Setări AndroidAPS</string>
     <string name="objectives_howtosave">Care sunt cele mai bune metode de a păstra o copie de siguranță a setărilor AndroidAPS?</string>
-    <string name="objectives_exportsettings">Export pe un mediu de stocare local folosind meniul Mentenanță.</string>
-    <string name="objectives_storeelsewhere">Stocarea fișierului exportat într-un alt loc, precum email, Dropbox, Google drive…</string>
-    <string name="objectives_doexportonstart">Exportarea imedia după instalarea AAPS.</string>
-    <string name="objectives_doexportafterchange">Exportați-le după ce modificați setările.</string>
-    <string name="objectives_doexportafterobjective">Exportaţi-le după finalizarea unui obiectiv.</string>
-    <string name="objectives_doexportafterfirtssettings">Exportarea atunci când ați terminat setarea inițială.</string>
+    <string name="objectives_notesettings">Nu este nevoie să exportați setările dvs. cu condiția să le notați.</string>
+    <string name="objectives_afterobjective">Exportă setările după ce termini de completat un obiectiv.</string>
+    <string name="objectives_afterchange">Exportă setările după ce modifici oricare dintre setările tale.</string>
+    <string name="objectives_afterinitialsetup">Exportă setările după ce termini configurarea inițială și ai setat Preferințele.</string>
+    <string name="objectives2_maintenance">Exportă setările local folosind meniul de întreţinere.</string>
+    <string name="objectives2_internalstorage">Fișierul de setări se găsește în folderul Internal Storage/AAPS/preferences pe telefonul dvs.</string>
+    <string name="objectives2_cloud">Copiați fișierul de preferințe într-o locație sigură în afara telefonului dvs. (de ex. folosind un spațiu de stocare online cloud, conectând un cablu la un computer, un e-mail etc.)</string>
+    <string name="objectives2_easyrestore">În cazul în care telefonul este deteriorat sau pierdut, există modalități simple de a vă recupera setările fără o copie de rezervă.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
-    <string name="noisycgm_label">Subiect: Citiri zgomotoase ale glicemiei</string>
+    <string name="noisycgm_label">Citiri zgomotoase ale CGM</string>
     <string name="noisycgm_whattodo">Ce ar trebui făcut dacă valorile CGM sunt nesigure?</string>
-    <string name="nothing">Nimic, AAPS se va descurca.</string>
-    <string name="noisycgm_pause">Dezactivați bucla închisă pentru a evita supra-dozarea.</string>
-    <string name="noisycgm_replacesensor">Se va înlocui senzorul CGM.</string>
-    <string name="noisycgm_turnoffphone">Se va opri telefonul.</string>
+    <string name="noisycgm_nothing">Nu faceți nimic - AndroidAPS se va ocupa de acest lucru.</string>
+    <string name="noisycgm_pause">Dezactivaţi bucla închisă pentru a evita o posibilă supradozare sau subdozare.</string>
+    <string name="noisycgm_replacesensor">Înlocuiți senzorii zgomotoși sau inexacti.</string>
+    <string name="noisycgm_checksmoothing">Verificaţi că aplicaţia dumneavoastră CGM furnizează date filtrate.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">Verificați dacă aplicația de senzor normalizează valorile glicemiei.</string>
-    <string name="exercise_label">Subiect: Exerciții fizice</string>
-    <string name="exercise_whattodo">Cum puteți ajuta sistemul să facă față exercițiilor fizice?</string>
-    <string name="exercise_setactivitytt">Folosirea funcționalității de țintă temporară.</string>
-    <string name="exercise_switchprofilebelow100">Se va face un schimb de profil de sub 100%.</string>
-    <string name="exercise_switchprofileabove100">Se va face o schimbare de profil de peste 100%.</string>
-    <string name="exercise_stoploop">Se va opri bucla.</string>
-    <string name="exercise_doitbeforestart">Setați o valoare-țintă temporară de activitate înainte de a începe exercițiul fizic.</string>
-    <string name="exercise_afterstart">Setarea unei valori-țintă temporare pentru activitate după ce exercițiul fizic a început generează rezultate mai proaste decât dacă ar fi fost setată înainte.</string>
+    <string name="exerciseprofile_label">Exercițiu și Profiluri</string>
+    <string name="exerciseprofile_whattodo">Cum poți folosi profilurile pentru a ajuta sistemul să facă față exercițiilor aerobe?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Faceți un schimb de profil la mai puțin de 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Faceți un schimb de profil la peste 100%</string>
+    <string name="exerciseprofile_leaveat100">Lasă profilul setat la 100%.</string>
+    <string name="exerciseprofile_suspendloop">Suspendă bucla.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">Activitate fizica și Ținte Temporare</string>
+    <string name="exercise_whattodo">Cum puteți utiliza Ținte Temporare pentru a ajuta sistemul să facă față exercițiilor aerobe?</string>
+    <string name="exercise_settt">Stabiliţi o ţintă a glicemiei pentru activitate începând cu un interval de timp adecvat înainte de începerea exerciţiului.</string>
+    <string name="exercise_setfinished">Stabiliţi o ţintă a glicemiei pentru activitate după încheierea exerciţiului.</string>
+    <string name="exercise_setunchanged">Lăsaţi valoarea ţintă a glicemiei dumneavoastră neschimbată.</string>
+    <string name="exercise_15g">Aşteptaţi până când glicemia scade sub Ținta Temporară de hipoglicemie şi apoi mâncaţi 15 g de carbohidraţi cu acţiune rapidă.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">Subiect: Dezactivarea/Suspendarea buclei închise</string>
+    <string name="suspendloop_label">Buclă dezactivată/suspendată</string>
     <string name="suspendloop_doigetinsulin">Primesc insulina atunci când bucla închisă este dezactivata/suspendata?</string>
     <string name="suspendloop_yes">Da, insulina bazală este livrată în continuare.</string>
     <string name="suspendloop_no">Nu, livrarea de insulină este oprită.</string>
-    <string name="basaltest_label">Subiect: Bazală, ISF și testare IC</string>
-    <string name="basaltest_when">Când ar trebui să validez bazalele, ISF și valorile IC?</string>
-    <string name="basaltest_beforeloop">Înainte de pornirea buclei.</string>
-    <string name="basaltest_havingregularhypo">Atunci când hipoglicemiile apar frecvent.</string>
-    <string name="basaltest_havingregularhyper">Atunci când hiperglicemiile apar frecvent.</string>
+    <string name="basaltest_label">Testare rate bazale, ISF și rație I:C</string>
+    <string name="basaltest_when">Când ar trebui să fie validate aceste valori?</string>
+    <string name="basaltest_beforeloop">Înainte de a începe folosirea buclei inchise.</string>
+    <string name="basaltest_havingregularhighlow">Când aveţi frecvent valori crescute sau scăzute ale glicemiei.</string>
+    <string name="basaltest_weekly">Cel puţin o dată pe săptămână.</string>
+    <string name="basaltest_fixed">Odată setate și validate, aceste valori nu ar trebui să se modifice în timp.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Subiect: Cerințe preliminare</string>
-    <string name="prerequisites_what">Ce am nevoie?</string>
+    <string name="prerequisites_label">Cerinţe preliminare</string>
+    <string name="prerequisites_what">Ce este esențial pentru a configura și a utiliza AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Profil validat (ratele bazale, IC, ISF, DIA).</string>
-    <string name="prerequisites_computer">Un calculator pentru a crea APK-ul.</string>
+    <string name="prerequisites_computer">Un computer cu Android Studio instalat și configurat.</string>
     <string name="prerequisites_phone">Un telefon compatibil.</string>
-    <string name="prerequisites_car">O mașină.</string>
-    <string name="prerequisites_nightscout">Nightscout pentru a finaliza obiectivele.</string>
+    <string name="prerequisites_pump">O pompă de insulină compatibilă dacă intenţionaţi să rulaţi o buclă închisă.</string>
+    <string name="prerequisites_nightscout">Nightscout, pentru a păstra un jurnal cu toate datele și pentru evaluarea setărilor.</string>
     <string name="prerequisites_tidepoolaccount">Un cont Tidepool.</string>
     <string name="prerequisites_googleaccount">Un cont de Google.</string>
     <string name="prerequisites_githubaccount">Un cont de Github.</string>
-    <string name="prerequisites_beanandroiddeveloper">Experiență în dezvoltarea Android.</string>
+    <string name="prerequisites_beanandroiddeveloper">Experiență în programare sau editare cod.</string>
     <string name="prerequisites_own670g">O pompă MiniMed 670G.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">Un ceas inteligent.</string>
     <string name="prerequisites_supportedcgm">Un sistem de senzori CGM compatibil.</string>
-    <string name="update_label">Subiect: Actualizarea AndroidAPS</string>
-    <string name="whatistrue">Ce este adevărat?</string>
-    <string name="update_git">Aveți nevoie de Git instalat.</string>
-    <string name="update_asap">Actualizați când o versiune noua este lansată și aveți timp să o instalați.</string>
-    <string name="update_keys">Ar trebui sa folosiți aceleași chei de semnare.</string>
+    <string name="prerequisites2_label">Cerințe preliminare</string>
+    <string name="prerequisites2_what">Ce este esențial pentru a configura și a utiliza AndroidAPS?</string>
+    <string name="prerequisites2_profile">Informații validate pentru crearea unui profil (ISF, I:C, rate bazale, DIA etc.).</string>
+    <string name="prerequisites2_device">Un dispozitiv Android compatibil (de ex. telefon mobil, ceas Android sau tabletă).</string>
+    <string name="prerequisites2_internet">AndroidAPS necesită o conexiune la internet pentru a putea rula în buclă închisă.</string>
+    <string name="prerequisites2_supportedcgm">Un CGM suportat si o aplicatie corespunzatoare pentru a primi valorile glicemiei pe telefon/dispozitiv.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">Actualizarea AndroidAPS</string>
+    <string name="whatistrue">Bifați toate răspunsurile corecte.</string>
+    <string name="update_git">Trebuie să ai Git instalat și configurat pe calculator.</string>
+    <string name="update_asap">Când versiunile actualizate ale AndroidAPS sunt lansate, versiunile anterioare pot fi limitate de la distanță după un anumit timp.</string>
+    <string name="update_keys">Ar trebui să salvați și să rețineți locația keystore-ului dvs. și să utilizați aceeași cheie de semnare pentru actualizări ca și pentru instalarea anterioară.</string>
     <string name="update_neverupdate">Nu actualizați niciodată dacă sistemul funcționează corect.</string>
-    <string name="update_askfriend">Cereți unui prieten noul APK.</string>
+    <string name="update_askfriend">Dacă aveți dificultăți la construirea aplicației, puteți instala o aplicație care a fost construită de un prieten.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Subiect: Rezolvarea Problemelor</string>
-    <string name="troubleshooting_wheretoask">Unde căutați ajutor?</string>
-    <string name="troubleshooting_fb">Alăturaţi-vă grupului de Facebook AndroidAPS.</string>
-    <string name="troubleshooting_wiki">Citiți documentația AndroidAPS.</string>
-    <string name="troubleshooting_gitter">Vizitați canalul AndroidAPS pe Gitter.</string>
-    <string name="troubleshooting_googlesupport">Vizitați AndroidAPS Google support</string>
-    <string name="troubleshooting_yourendo">Vă consultați cu diabetologul.</string>
+    <string name="troubleshooting_label">Depanare</string>
+    <string name="troubleshooting_wheretoask">Unde puteți căuta ajutor pentru AndroidAPS?</string>
+    <string name="troubleshooting_fb">Puteti cere sfaturi in grupul AndroidAPS Users Facebook.</string>
+    <string name="troubleshooting_wiki">Ar trebui să citiți (și să re-citiți) documentația AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Puteți solicita sfaturi și să înregistrați probleme tehnice în camera AndroidAPS Gitter.</string>
+    <string name="troubleshooting_yourendo">Ar trebui să întrebați medicul diabetolog.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Subiect: Plugin-uri pentru Insulină</string>
-    <string name="insulin_ultrarapid">Ce brand de insulină poate fi folosit cu plugin-ul ‘Ultra-Rapid-Oref’?</string>
+    <string name="insulin_label">Plugin-uri insulină</string>
+    <string name="insulin_ultrarapid">Ce insulină trebuie să utilizaţi cu plugin-ul Ultra-Rapid Oref?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin R®/insulină umană \"regular\".</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Subiect: Plugin-uri pentru sensibilitate</string>
-    <string name="sensitivity_which">Ce algoritm de sensibilitate are un interval de timp configurabil?</string>
+    <string name="sensitivity_label">Plugin-uri de sensibilitate</string>
+    <string name="sensitivity_which">Bifați toate răspunsurile corecte.</string>
+    <string name="sensitivity_adjust">Plugin-urile de sensibilitate permit AndroidAPS să se ajusteze pentru modificări temporare sau de scurtă durată ale sensibilității la insulină (de exemplu, modificări hormonale sau probleme cu absorbția la locul perfuziei).</string>
+    <string name="sensitivity_edit">Plugin-urile de sensibilitate oferă utilizatorului sugestii pentru modificarea ratelor bazale, raportului I:C și ISF care pot fi utilizate pentru a edita profilul.</string>
+    <string name="sensitivity_cannula">Înregistrarea unei schimbări de canula va reseta raportul Autosens înapoi la 100%.</string>
+    <string name="sensitivity_time">Unele dintre opțiunile plugin-ului au intervale de timp configurabile care pot fi setate de către utilizator.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Ce plugin de sensibilitate trebuie folosit pentru funcționalitatea UAM?</string>
-    <string name="wrongcarbs_label">Subiect: Erori la introducerea carbohidraților</string>
+    <string name="wrongcarbs_label">Erori la introducerea carbohidraților</string>
     <string name="wrongcarbs_whattodo">Ce ar trebui sa faceți dacă ați introdus o cantitate de carbohidrați greșită?</string>
-    <string name="wrongcarbs_treatmentstab">În secțiunea Tratamente, ștergeți intrarea greșită. Introduceți din nou cantitatea de carbohidrați.</string>
-    <string name="wrongcarbs_addfakeinsulin">Adăugați unități false de insulina folosind funcția de Reîncărcare</string>
-    <string name="extendedcarbs_label">Subiect: Alimente cu Lipide și Proteine</string>
-    <string name="extendedcarbs_handling">Cum procedați atunci când mâncarea conține o cantitate mare de lipide și\/sau proteine?</string>
-    <string name="extendedcarbs_useextendedcarbs">Convertiți lipidele și proteinele în carbohidrați și folosiți funcționalitatea de \"Carbohidrați extinși\".</string>
-    <string name="extendedcarbs_add">Convertiți lipidele și proteinele în carbohidrați și adăugați-i la calcularea bolusului.</string>
-    <string name="extendedcarbs_useextendedbolus">Folosiți bolusul extins pentru a acoperi lipidele și proteinele.</string>
+    <string name="wrongcarbs_treatmentstab">Ştergeţi intrarea incorectă din Tratamente şi introduceţi noua valoare de carbohidrați corectă.</string>
+    <string name="wrongcarbs_addinsulin">Introdu un bolus de insulina folosind meniul de Amorsare.</string>
+    <string name="wrongcarbs_donothing">Nu fa nimic - AndroidAPS va face ajustările corespunzătoare.</string>
+    <string name="wrongcarbs_bolus">Introdu un bolus de insulina folosind butonul Insulina din meniul principal.</string>
+    <string name="wronginsulin_label">Erori de livrare/introducere insulină</string>
+    <string name="wronginsulin_whattodo">Ce trebuie să faci dacă ai primit mai putină insulină decât sugerează istoricul pompei, de exemplu datorită unei ocluzii, a unei canule defecte sau pentru ca ai uitat sa reatașezi pompa după un dus? </string>
+    <string name="wronginsulin_careportal">Șterge datele despre insulină din Nightscout Careportal pentru a le înlătura din istoricul pompei.</string>
+    <string name="wronginsulin_compare">Compară valorile din AndroidAPS cu cele din istoricul pompei.</string>
+    <string name="wronginsulin_prime">Bolusati o cantitate parțiala de insulina din insulina calculata ca fiind lipsa utilizând seringa/penul sau amorsarea.</string>
+    <string name="wronginsulin_donothing">Nu faceți nimic și permiteți AndroidAPS să corecteze valorile mari ale glicemiei.</string>
+    <string name="iob_label">Insulină activă (IOB)</string>
+    <string name="iob_which">Bifați toate răspunsurile corecte.</string>
+    <string name="iob_value">Valoarea IOB este afectată de bazalele temporare emise.</string>
+    <string name="iob_hightemp">Rata bazala ridicata temporara nu va fi livrata atunci când glicemia este sub nivelul țintă.</string>
+    <string name="iob_negiob">Un IOB negativ pentru o perioadă substanțială în absența exercițiilor fizice sugerează că profilul tău este prea puternic și este nevoie de mai puţină insulină în setările inițiale.</string>
+    <string name="iob_posiob">Un IOB pozitiv pentru o perioadă substanţială sugerează rezistenţă la insulină sau mese neanunțate.</string>
+    <string name="breadgrams_label">Carbohidrați si bolusuri</string>
+    <string name="breadgrams_grams">Pentru estimarea și înregistrarea carbohidraților consumați trebuie utilizate numai grame.</string>
+    <string name="breadgrams_exchange">Carbohidraţii consumaţi pot fi înregistraţi folosind un sistem de schimb corespunzător (de ex. schimburi DAFNE \"CHO\" sau \"Unităţi De Pâine\" europene).</string>
+    <string name="breadgrams_decay">AndroidAPS foloseşte un model dinamic pentru a estima \"digestia\" carbohidraților şi a calcula COB.</string>
+    <string name="breadgrams_calc">Dacă valorile glicemiei sunt în afara valorilor acceptabile (prea mici sau prea mari), calculatorul bolus poate fi utilizat pentru a oferi sugestii pentru corecţiile cu carbohidrați sau insulină.</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">e-carbs</string>
+    <string name="extendedcarbs_handling">Pentru ce ați putea utiliza e-carbohidrati (carbohidrati extinsi)?</string>
+    <string name="extendedcarbs_future">Pentru a introduce carbohidrați în viitor, posibil distribuiți pe un interval de timp (similar cu a seta un bolus extins pe un interval de timp).</string>
+    <string name="extendedcarbs_free">Pentru a înregistra carbohidrați acoperiți de exerciții fizice pe care vreți sa ii ascundeți de AndroidAPS.</string>
+    <string name="extendedcarbs_fat">e-carbohidrati (distribuiți în viitor) pot ajuta AndroidAPS în abordarea meselor bogate în grăsimi/proteine.</string>
+    <string name="extendedcarbs_rescue">Pentru a înregistra carbohidrații folosiți la tratarea hipoglicemiei</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Subiect: Monitorizarea la distanţă</string>
-    <string name="nsclient_howcanyou">Cum puteți monitoriza AAPS-ul copilului dumneavoastră de la distanță?</string>
-    <string name="nsclient_nightscout">Folosind un site Nightscout.</string>
-    <string name="nsclient_dexcomfollow">Aplicația Dexcom Flollow dacă folosiți aplicația Dexcom originală (doar valorile glicemiei).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow dacă folosiți aplicația xDrip.</string>
-    <string name="nsclient_xdripfollower">Aplicația xDrip în modul \"follower\".</string>
-    <string name="nsclient_looponiphone">Aplicația Loop pe iPhone.</string>
-    <string name="nsclient_spikeiphone">Aplicația Spike pe iPhone.</string>
+    <string name="nsclient_label">Monitorizare la distanţă</string>
+    <string name="nsclient_howcanyou">Cum puteți monitoriza AndroidAPS (de exemplu pentru copilul dumneavoastră) de la distanță?</string>
+    <string name="nsclient_nightscout">Aplicația NS Client, aplicaţia Nightscout şi pagina de web Nightscout vă permit să urmăriți AndroidAPS de la distanță.</string>
+    <string name="nsclient_dexcomfollow">Alte aplicații (de exemplu, Dexcom follow, xDrip care rulează în modul de urmărire) vă permit să urmăriți unii parametri (de exemplu, valorile glucozei/senzorilor de sânge) de la distanţă, dar utilizează algoritmi diferiţi, astfel încât e posibil să aveţi valori incorecte IOB sau COB.</string>
+    <string name="nsclient_data">Pentru a urmări AndroidAPS de la distanță, ambele dispozitive trebuie să aibă acces la internet (de exemplu, prin Wi-Fi sau date de rețea mobilă).</string>
+    <string name="nsclient_fullcontrol">NS Client folosit ca urmăritor la distanță va monitoriza și va permite controlul complet al AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Subiect: Factorul de Sensibilitate la Insulină (ISF)</string>
-    <string name="isf_increasingvalue">Valorile ISF mai mari determina livrarea unor cantități mai mici de insulina atunci când AAPS corectează hiperglicemiile.</string>
-    <string name="isf_decreasingvalue">Valorile ISF mai mici determina livrarea unor cantități mai mici de insulina atunci când AAPS corectează hiperglicemiile.</string>
-    <string name="isf_noeffect">Modificările ISF nu au nicio influență asupra cantităților de insulina livrate atunci când AAPS corectează hiperglicemiile.</string>
-    <string name="isf_preferences">Trebuie sa setați ISF in Preferințe.</string>
+    <string name="isf_label_exam">Factor de sensibilitate la insulină (ISF)</string>
+    <string name="isf_increasingvalue">Creşterea valorilor ISF va duce la o cantitate mai mare de insulină administrată pentru a acoperi o anumită cantitate de carbohidraţi.</string>
+    <string name="isf_decreasingvalue">Reducerea valorilor ISF duce la o cantitate mai mare de insulină administrată pentru a corecta valorile glicemiei peste ţintă.</string>
+    <string name="isf_noeffect">Creşterea sau scăderea ISF nu are nici un efect asupra livrării de insulină atunci când nivelul glucozei din sânge este sub ţintă.</string>
+    <string name="isf_preferences">ISF ar trebui introdus în Preferințele AndroidAPS.</string>
     <string name="isf_profile">Schimbarea valorii ISF în profil este suficientă pentru a produce efecte.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Subiect: Rația insulină-carbohidrați (IC)</string>
-    <string name="ic_increasingvalue">Valorile IC mai mari determină o cantitate mai mică de insulină livrată pentru o cantitate dată de carbohidrați.</string>
-    <string name="ic_decreasingvalue">Valorile IC mai mici determină o cantitate mai mică de insulină livrată pentru o cantitate dată de carbohidrați.</string>
+    <string name="ic_multiple">Poți folosi mai mult de o valoare pentru raportul I:C în profilul tău.</string>
+    <string name="ic_isf">Dacă schimbaţi ISF în profilul dumneavoastră, ar trebui să vă schimbaţi întotdeauna și raportul I:C.</string>
+    <string name="ic_label_exam">Raport insulină per carbohidrați (ICR)</string>
+    <string name="ic_increasingvalue">Rapoarte ICR mai mari duc la livrarea unei cantintăți de insulină pentru o anumită cantitate de carbohidrați.</string>
+    <string name="ic_decreasingvalue">Valorile ICR mai mici conduc la livrarea unei cantități mai mici de insulină pentru o anumită cantitate de carbohidrați.</string>
     <string name="ic_noeffect">Dacă aveți 0 CoB (carbohidrați activi), schimbarea IC va determina modificarea cantității de insulină livrată pentru a corecta glicemia.</string>
+    <string name="ic_different">Valoarea IC va fi diferita dacă considerați 1BE (unitate de pâine) ca 10g sau 12g glucide.</string>
+    <string name="ic_meaning">IC înseamnă: Câte unități de pâine (BE) sunt acoperite de 1 unitate de insulină.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Subiect: Schimbarea de profil</string>
-    <string name="profileswitch_pctwillchange"> Atunci când se specifică 90% la schimbarea de profil…</string>
-    <string name="profileswitch_basalhigher">Ratele bazale vor fi cu 10% mai mari.</string>
+    <string name="profileswitch_label">Schimbare profil</string>
+    <string name="profileswitch_pctwillchange"> Când specificați un schimb de profil de 90% care sunt răspunsurile adevărate?</string>
     <string name="profileswitch_basallower">Ratele bazale vor fi cu 10% mai mici.</string>
-    <string name="profileswitch_ichigher">Valoarea IC va fi cu 10% mai mare.</string>
-    <string name="profileswitch_iclower">Valoarea IC va fi cu 10% mai mica.</string>
     <string name="profileswitch_isfhigher">Valoarea ISF va fi cu 10% mai mare.</string>
-    <string name="profileswitch_isflower">Valoarea ISF va fi cu 10% mai mică.</string>
-    <string name="profileswitch_overall">Veți primi în total cam cu 10% mai puțină insulină.</string>
-    <string name="profileswitch_targethigher">Intervalul-ţintă va fi cu 10% mai mare.</string>
-    <string name="profileswitch_targetlower">Intervalul-ţintă va fi cu 10% mai mic.</string>
-    <string name="profileswitch_targetbottom">Doar valoarea-ţintă inferioară va fi cu 10% mai mică.</string>
+    <string name="profileswitch_iclower">Valoarea raportului I:C va fi cu 10% mai mic.</string>
+    <string name="profileswitch_unchanged">ISF și ICR  nu vor fi schimbate.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Dacă va treziți cu o ora mai devreme decât de obicei, cum veți anunța AAPS de schimbarea din programul dumneavoastră?</string>
-    <string name="profileswitchtime_1">Inițiați o schimbare de profil cu decalaj de timp de 1</string>
-    <string name="profileswitchtime__1">Inițiați o schimbare de profil cu decalaj de timp de -1</string>
+    <string name="profileswitch2_label">Schimbare profil</string>
+    <string name="profileswitch2_pctwillchange"> Când specificați un schimb de profil de 120% care sunt răspunsurile adevărate?</string>
+    <string name="profileswitch2_bghigher">Ținta pentru glicemie va fi cu 20% mai mare.</string>
+    <string name="profileswitch2_basalhigher">Ratele bazale vor fi cu 20% mai mari.</string>
+    <string name="profileswitch2_bgunchanged">Glicemia ţintă nu se va modifica.</string>
+    <string name="profileswitch2_isfhigher">Valoarea ISF va fi cu 20% mai mare.</string>
+    <string name="profileswitchtime_label">Schimbare profil</string>
+    <string name="profileswitchtime_iwant">Dacă va treziți cu o ora mai devreme decât de obicei, cum veți anunța AndroidAPS de schimbarea din programul dumneavoastră?</string>
+    <string name="profileswitchtime_2">Inițiați o schimbare de profil cu decalaj de timp de 2</string>
+    <string name="profileswitchtime__2">Inițiați o schimbare de profil cu decalaj de timp de -2</string>
+    <string name="profileswitchtime_tt">Fixaţi o Țintă Temporară mănânc în curând.</string>
+    <string name="profileswitchtime_100">Faceți un schimb de profil de peste 100%</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Inițiați o schimbare de profil cu decalaj de timp de 60</string>
-    <string name="profileswitchtime__60">Inițiați o schimbare de profil cu decalaj de timp de -60</string>
+    <string name="profileswitch4_label">Modificări ale profilurilor</string>
+    <string name="profileswitch4_rates">Ratele bazale, ISF, I:C etc. ar trebui stabilite în profiluri.</string>
+    <string name="profileswitch4_internet">Activarea modificărilor la profilul Nightscout necesită ca telefonul AndroidAPS să aibă o conexiune la internet.</string>
+    <string name="profileswitch4_sufficient">Editarea profilurilor pentru a modifica valorile este suficientă pentru a adopta orice modificări făcute.</string>
+    <string name="profileswitch4_multi">Profilurile multiple pot fi setate şi selectate pentru a ţine cont de circumstanţele schimbătoare (de exemplu, modificări hormonale, muncă în schimburi, stil de viață în zilele lucrătoare/weekend).</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
-    <string name="basalhelp_label">Subiect: Ajutor pentru ratele bazale</string>
+    <string name="basalhelp_label">Ajutor cu ratele bazale</string>
     <string name="basalhelp_where">Unde căutați ajutor pentru a seta ratele bazale etc.</string>
     <string name="basalhelp_diabetesteam">Medicul dumneavoastră diabetolog</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Alte tratamente</string>
-    <string name="other_medication_text">AAPS reduce ratele bazale pentru a crește glicemia. Medicamentele din grupa inhibitorilor SGLT2 (gliflozins) pot împiedica această creștere a glicemiei si, prin urmare, pot mări riscul de cetoacidoza diabetica (DKA).
-\nBranduri comune sunt: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nDeclar pe propria răspundere că nu voi lua asemenea medicamente cât folosesc AAPS sau că voi dezactiva bucla închisă înainte de le folosi.</string>
+    <string name="other_medication_label">Alt Medicament. Vă rugăm să citiţi declaraţia de mai jos şi apoi să bifaţi caseta pentru a accepta declaraţia.</string>
+    <string name="other_medication_text">AndroidAPS reduce ratele bazale sau suspendă livrarea de insulină pentru a creşte glicemia. Medicamentele din clasa inhibitori SGLT2 (gliflozine) pot preveni creşteri ale glicemiei şi, prin urmare, pot produce o deficienţă de insulină periculoasă ce ar putea conduce la cetoacidoză diabetică.
+\nNume de marcă comune sunt: Invokana ®, Forxiga ®, Jardiance ®, Stellatro ®, Suglat ®, Apleway ®, Debreerza ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\nVă promit că nu voi lua astfel de medicamente atunci când utilizez AndroidAPS sau va dezactiva bucla înainte de a folosi astfel de medicamente.</string>
 </resources>

app/src/main/res/values-ro-rRO/objectives.xml

@@ -40,7 +40,7 @@
     <string name="codeaccepted">Cod acceptat</string>
     <string name="codeinvalid">Cod invalid</string>
     <string name="objectives_exam_objective">Dovediți-vă cunoștințele</string>
-    <string name="objectives_exam_gate">Studiați și răspundeți corect la întrebări</string>
+    <string name="objectives_exam_gate">Studiați întrebările. Vi se dau patru răspunsuri posibile pentru fiecare întrebare. Poate exista mai mult de un răspuns corect. Vă rugăm să bifați toate cele care sunt corecte și selectați VERIFICA.</string>
     <string name="answerdisabledto">Posibilitatea de a răspunde este dezactivată până la: %1$s</string>
     <string name="wronganswer">Răspuns greșit!</string>
     <string name="unfinshed_button">Următoarea nefinalizată</string>

app/src/main/res/values-ro-rRO/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Setări siguranță tratament</string>
     <string name="treatmentssafety_maxbolus_title">Bolus maxim admis [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Carbohidrați admiși maxim [g]</string>
+    <string name="nav_preferences_plugin">%1$s Preferințe</string>
     <string name="nav_preferences">Preferințe</string>
     <string name="nav_refreshtreatments">Reîncarcă tratamentele din NS</string>
     <string name="nav_resetdb">Resetează bazele de date</string>
@@ -245,6 +246,7 @@
     <string name="valueoutofrange">Valoarea %1$s este mai mare decât limita stabilită</string>
     <string name="smscommunicator_pumpconnectwithcode">Pentru a conecta pompa raspundeti cu codul %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Conectarea cu pompa a esuat</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Pentru a deconecta pompa timp de %1$d minute, răspundeți cu: %2$s</string>
     <string name="smscommunicator_pumpdisconnected">Pompă deconectată</string>
     <string name="smscommunicator_reconnect">Pompă reconectată</string>
     <string name="smscommunicator_remotecommandnotallowed">Comanda de la distanță nu este permisă</string>
@@ -384,10 +386,13 @@
     <string name="wear_detailedIOB_summary">Separă IOB în bolus și IOB bazal pe ceas</string>
     <string name="nosuccess">fără succes - verificați telefonul</string>
     <string name="notavailable">indisponibil</string>
+    <string name="patientage">Tip de pacient</string>
     <string name="child">Copil</string>
     <string name="teenage">Adolescent</string>
     <string name="adult">Adult</string>
     <string name="resistantadult">Adult rezistent la insulină</string>
+    <string name="pregnant">Sarcină</string>
+    <string name="patientage_summary">Te rog confirmă tipul de pacient pentru a stabilii limitele de siguranță</string>
     <string name="patient_name">Numele pacientului</string>
     <string name="patient_name_summary">Vă rugăm să furnizați numele sau porecla pacientului pentru a diferenția între configurări</string>
     <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Utilizator</string>
@@ -401,11 +406,18 @@
     <string name="suspendloopfor3h">Suspendă bucla pentru 3h</string>
     <string name="suspendloopfor10h">Suspendă bucla pentru 10 h</string>
     <string name="suspendloopforXmin">Pune pauză buclei pentru %1$d min</string>
+    <string name="disconnectpump">Deconectează pompa</string>
     <string name="disconnectpumpfor15m">Deconectează pompa pentru 15 min</string>
     <string name="disconnectpumpfor30m">Deconectează pompa pentru 30 min</string>
     <string name="disconnectpumpfor1h">Deconectează pompa pentru 1h</string>
     <string name="disconnectpumpfor2h">Deconectează pompa pentru 2h</string>
     <string name="disconnectpumpfor3h">Deconectează pompa pentru 3h</string>
+    <string name="duration15m">15 min</string>
+    <string name="duration30m">30 min</string>
+    <string name="duration1h">1 oră</string>
+    <string name="duration2h">2 ore</string>
+    <string name="duration3h">3 ore</string>
+    <string name="duration10h">10 ore</string>
     <string name="resume">Restabilește</string>
     <string name="reconnect">Reconectaţi pompa</string>
     <string name="smscommunicator_wrongduration">Durată greșită</string>
@@ -429,6 +441,8 @@
     <string name="statuslights_iage_critical">Prag critic vechime insulină [h]</string>
     <string name="statuslights_sage_warning">Prag de avertizare vechime senzor [h]</string>
     <string name="statuslights_sage_critical">Prag critic vechime senzor [h]</string>
+    <string name="statuslights_sbat_warning">Prag de avertizare nivel baterie senzor [%]</string>
+    <string name="statuslights_sbat_critical">Prag nivel critic baterie senzor [%]</string>
     <string name="statuslights_bage_warning">Prag de avertizare nivel baterie [h]</string>
     <string name="statuslights_bage_critical">Prag critic nivel baterie [h]</string>
     <string name="statuslights_res_warning">Pragul de avertisment pentru insulina din rezervor [U]</string>
@@ -455,6 +469,12 @@
     <string name="ns_noupload_summary">Toate trimiterile de date către NS sunt oprite. AAPS este conectat la NS dar nu se fac schimbări în NS</string>
     <string name="overview_extendedbolus_cancel_button">Renunță la bolusul extins</string>
     <string name="doprofileswitch">Schimbă profilul</string>
+    <string name="careportal_sensor_label">Senzor</string>
+    <string name="careportal_canula_label">Canulă</string>
+    <string name="careportal_insulin_label">Insulină</string>
+    <string name="careportal_pb_label">Baterie pompă</string>
+    <string name="careportal_age_label">vârstă:</string>
+    <string name="careportal_level_label">nivel:</string>
     <string name="ns_alarmoptions">Opțiuni alarmare</string>
     <string name="ns_alarms">Creare notificări din alarmele NS</string>
     <string name="ns_announcements">Creare notificări din anunţurile NS</string>
@@ -552,8 +572,6 @@
     <string name="overview_editquickwizard_usebasaliob">Calcul IOB bazală</string>
     <string name="overview_editquickwizard_usetrend">Calcul pantă</string>
     <string name="overview_editquickwizard_usesuperbolus">Calcul superbolus</string>
-    <string name="yes">Da</string>
-    <string name="no">Nu</string>
     <string name="positiveonly">Doar pozitiv</string>
     <string name="negativeonly">Doar negativ</string>
     <string name="overview_editquickwizard_usecob">Calcul COB</string>
@@ -600,8 +618,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">Nu este suficientă insulină în rezervor</string>
     <string name="extendedbolusdeliveryerror">Eroare de livrare a bolusului extins</string>
     <string name="insightpump_shortname">Obiectiv</string>
-    <string name="set_neutral_temps_title">Setați bazale temporare neutre</string>
-    <string name="set_neutral_temps_summary">Dacă este activată, va anula o bazală temporară înainte de sfârșitul fiecărei ore. Aceasta metoda poate ajuta la oprirea vibrațiilor/bipurilor orare pe anumite pompe.</string>
     <string name="enablesmbalways">Activează SMB întotdeauna</string>
     <string name="enablesmbalways_summary">Activează SMB întotdeauna independent de bolusuri. Este posibil doar în cazul unei surse de glicemii filtrate, cum ar fi G5</string>
     <string name="enablesmbaftercarbs">Activează SMB după carbohidrați</string>
@@ -667,6 +683,7 @@
     <string name="combo_error_failure_reading_changed_basal_rate">Rata bazală schimbată în pompă, dar nu s-a putut actualiza</string>
     <string name="combo_activity_checking_for_history_changes">Se verifică schimbările în istoric</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Mai multe bolusuri de aceeași valoare au fost importate. Doar o singură înregistrare va fi adăugată în tratamente. Verifcați manual în pompă și adăugați înregistrările folosind Careportal. Asigurați-vă că veți crea un bolus care nu se suprapune peste altul în timp.</string>
+    <string name="about_link_urls">\n\ndocumentație:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <string name="combo_check_date">Ultimul bolus este mai vechi de 24 ore sau este în viitor. Verificați ca data să fie configurată corect în pompă.</string>
     <string name="combo_suspious_bolus_time">Ora/data bolusului livrat de pompă pare eronat, IOB este probabil incorect. Verificați ora/data pompei.</string>
     <string name="profileswitch_ismissing">Lipsă SchimbareProfil. Efectuați o schimbare de profil sau apăsați \"Activare profil\" în ProfilulLocal.</string>
@@ -749,7 +766,7 @@
     <string name="diawarning">Reamintire: noile profiluri necesită o durată de acțiune a insulinei (DIA) de cel puțin 5 ore. DIA de 5-6 ore în profilurile noi sunt echivalente cu DIA 3 ore din profilele vechi.</string>
     <string name="setupwizard_profile_description">Selectați sursa sau profilul. Dacă pacientul este copil, ar fi bine să alegeți un profil NS. Dacă nu aveți profil NS, puteți alege profil local. De aici alegeți doar sursa profilului; pentru a utiliza acest profil, trebuie să îl activați prin executarea unei \"Schimbări de profil\"</string>
     <string name="setupwizard_aps_description">Alegeți unul dintre algoritmii disponibili. Algoritmii sunt aranjați de la cel mai vechi spre cel mai nou. Algoritmii mai noi sunt, de obicei, mai puternici și mai agresivi. De aceeea, dacă sunteți la început, ar fi indicat să porniți cu AMA și nu cu cel mai nou. Este important să parcurgeți documentația OpenAPS și să îl configurați corect înainte de a folosi aplicația.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Se așteaptă conexiunea la RileyLink…\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Vă rugăm configuraţi RileyLink mai jos. După selectarea unui RileyLink, va fi posibil să continuaţi setarea odată ce starea RieyLink este \"Connected\". Acest lucru ar putea dura un minut.\n</string>
     <string name="setupwizard_pump_pump_not_initialized"><b>Notă:</b> Puteți continua configurarea imediat ce pompa a fost inițializată.\n</string>
     <string name="startobjective">Începeți primul obiectiv</string>
     <string name="permission">Permisiune</string>
@@ -777,7 +794,6 @@
     <string name="sensitivity_raises_target_title">Sensibilitatea la insulină crește targetul</string>
     <string name="sensitivity_raises_target_summary">Când este detectată sensibilitate la insulină, crește targetul</string>
     <string name="combo_invalid_setup">Setare pompă invalidă, verificați documentația și asigurați-vă că meniul Quick Info este denumit QUICK INFO, folosind aplicația 360 Configuration Software.</string>
-    <string name="custom">Personalizat</string>
     <string name="careportal_removestartedevents">AndroidAPS pornit curat</string>
     <string name="storedsettingsfound">Au fost găsite setări stocate</string>
     <string name="allow_hardware_pump_text">Atenție: Dacă activați și conectați o pompă fizică, AndroidAPS va copia setările bazalelor din profilurile din aplicație în pompă, suprascriindu-le pe cele existente deja în pompă. Asigurați-vă că aveți setările corecte ale bazalelor în AndroidAPS. Dacă aveți dubii sau nu doriți suprascrierea setărilor bazalelor existente în pompă, apăsați butonul de anulare și repetați acțiunea mai târziu.</string>
@@ -965,7 +981,9 @@
     <string name="description_source_dexcom">Primește valori glicemie de la aplicația Dexcom modificată.</string>
     <string name="notification">Notificare</string>
     <string name="notification_message">Notificare: %1$s</string>
+    <string name="alarm_message">Alarmă: %1$s</string>
     <string name="message_short">Msj:</string>
+    <string name="alarm_short">Alarmă:</string>
     <string name="profilepercentage">Procentajul profilului</string>
     <string name="percent_u">Procent [%]:</string>
     <string name="startprofile">Utilizează profilul %1$d%% pentru %2$d min</string>
@@ -1097,6 +1115,9 @@
     <string name="smscommunicator_otp_reset_title">Resetați cheia pentru Authenticator</string>
     <string name="smscommunicator_otp_reset_prompt">Sunteți sigur că vreți sa resetați cheia pentru Authenticator? Acest lucru va invalida toți Authenticatorii configurați și va trebui să ii setați din nou.</string>
     <string name="smscommunicator_otp_reset_successful">S-a generat o nouă cheie pentru Authenticator! Vă rugăm să utilizați QRCode actualizat pentru a configura autentificatori.</string>
+    <string name="smscommunicator_otp_export_title">Se exporta secretul OTP</string>
+    <string name="smscommunicator_otp_export_prompt">Sunteţi sigur că doriţi să copiaţi secretul OTP în clipboard?\n\nS-ar putea să aveţi nevoie doar dacă aplicaţia dumneavoastră de autentificare are probleme de scanare a QRCode, doriţi să o introduceţi manual sau doriţi să configuraţi token-ul hardware OTP folosind aplicaţia dedicată.</string>
+    <string name="smscommunicator_otp_export_successful">Secret OTP (în formatul Base32) exportat şi copiat în clipboard. Lipiţi-l în autentificator sau in hardware OTP burner!</string>
     <string name="smscommunicator_otp_step1_install_header">1. Instalați Authenticator</string>
     <string name="smscommunicator_otp_step2_provisioning_header">2. Scanați codul pentru a seta codurile unice pentru AndroidAPS</string>
     <string name="smscommunicator_otp_step3_test_header">3. Testați o parolă unică</string>
@@ -1115,6 +1136,7 @@
     <string name="statuslights_copy_ns">Copiați setările din NS</string>
     <string name="copyexistingvalues">Copiaţi setările NS (dacă există)?</string>
     <string name="classic_description">Tema originală</string>
+    <string name="lowres_description">Skin de rezoluție redusă</string>
     <string name="buttonson_description">Butoanele sunt afișate întotdeauna în partea de jos a ecranului</string>
     <string name="largedisplay_description">Display mare</string>
     <string name="skin">Tema</string>
@@ -1159,4 +1181,19 @@
     <string name="worker_state">Stare prelucrare: %s</string>
     <string name="uploaded_data">Date încărcate</string>
     <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Următoarele date vor fi încărcate în contul Open Humans: glicemii, evenimente careportal (cu excepția notelor), bolusuri extinse, schimbări de profil, doze zilnice totale, bazale temporare, ținte temporare, preferințe, versiunea aplicației, model dispozitiv și dimensiunile ecranului. Informațiile secrete sau private, cum ar fi URL-ul Nightscout sau secretul API, nu vor fi încărcate.</string>
+    <string name="setupwizard_pump_riley_link_status">Stare RileyLink:</string>
+    <string name="filter">Filtru</string>
+    <string name="copytolocalprofile_invalid">Nu se poate crea profilul local. Profilul este invalid.</string>
+    <string name="cta_dont_kill_my_app_info">Nu-mi opri aplicația?</string>
+    <string name="alarm">Alarmă</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Trimite SMS dacă este generata o alarma de eroare conexiune pompa</string>
+    <string name="smscommunicator_pump_ureachable">Raportează eroare conexiune pompa</string>
+    <string name="advisoralarm">Rulează alarma când este timpul să mănânci</string>
+    <string name="alarminxmin">Rulează alarma în %1$d min</string>
+    <string name="bolusadvisor">Consilier bolus</string>
+    <string name="bolusadvisormessage">Glicemia ta e mare. In loc sa mănânci acum, este recomandat sa mai aștepți un pic. Vrei sa faci un bolus de corecție acum si sa setezi o alarma pentru a manca mai târziu? In acest caz, nu vor fi înregistrați carbohidrați si va trebui sa folosești calculatorul de bolus din nou când îți vom reaminti.</string>
+    <string name="enablebolusadvisor">Activare consilier bolus</string>
+    <string name="enablebolusadvisor_summary">Folosește o alarma de reamintire pentru a începe sa mănânci în loc de calculatorul de bolus în timpul hiperglicemiei</string>
+    <string name="time_to_eat">Timpul sa mănânci!\nRuleaza Calculatorul de Bolus pentru a face calculele din nou.</string>
+    <string name="timetoeat">Timpul sa mănânci</string>
 </resources>

app/src/main/res/values-ru-rRU/exam.xml

@@ -1,169 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Что верно о длительности работы инсулина DIA?</string>
-    <string name="dia_label_exam">Тема: продолжительность действия инсулина DIA</string>
-    <string name="dia_minimumis3h">Минимальное значение 3 часа.</string>
-    <string name="dia_minimumis5h">Минимальное значение 5 часов.</string>
+    <string name="dia_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">Равно параметру продолжительность действия инсулина DIA помпы.</string>
-    <string name="dia_valuemustbedetermined">Следует определить свое индивидуальное значение (но не менее 5 часов).</string>
-    <string name="hypott_label">Тема: Временная цель Hypo</string>
-    <string name="hypott_whenhypott">Что является основной причиной для установки временной цели TT гипо?</string>
-    <string name="hypott_goinglow">Предотвратить падение ГК, если уже запущен нулевой временный базал.</string>
-    <string name="hypott_preventoversmb">Чтобы AAPS не давал слишком много инсулина после роста, вызваного быстродействующими углеводами данными на купирование гипо.</string>
+    <string name="dia_meaningisequaltodiapump">Если вы удовлетворены значением DIA в помпе до AndroidAPS, то при запуске цикла изменять это значение не требуется.</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_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">Тема: Отключение от помпы</string>
-    <string name="pumpdisconnect_letknow">Нажать «Отключить помпу», чтобы AAPS знал, что инсулин не подается.</string>
-    <string name="pumpdisconnect_suspend">Нажать \'Приостановить цикл\', чтобы AAPS перестал выполнять цикл, когда помпа отсоединена.</string>
-    <string name="pumpdisconnect_dontchnage">Ничего не менять в AAPS, просто отключить помпу.</string>
+    <string name="pumpdisconnect_whattodo">Что следует делать при отсоединении помпы?</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Тема: Параметры AndroidAPS</string>
-    <string name="objectives_howtosave">Как эффективнее сохранить свои настройки?</string>
-    <string name="objectives_exportsettings">Локально экспортировать их из меню Обслуживание.</string>
-    <string name="objectives_storeelsewhere">Хранить экспортированный файл в другом месте, например, отправив по электронной почте, Dropbox, Google drive…</string>
-    <string name="objectives_doexportonstart">Экспортировать их сразу после установки AAPS.</string>
-    <string name="objectives_doexportafterchange">Экспортировать их после внесения изменений в параметры.</string>
-    <string name="objectives_doexportafterobjective">Экспортировать их после завершения цели.</string>
-    <string name="objectives_doexportafterfirtssettings">Экспортировать их при завершении начальной настройки.</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">Тема: Зашумленные данные мониторинга</string>
     <string name="noisycgm_whattodo">Что следует делать, если данные мониторинга зашумлены?</string>
-    <string name="nothing">Ничего, алгоритм AAPS сам справится с этим.</string>
-    <string name="noisycgm_pause">Отключите цикл, чтобы избежать чрезмерной дозировки.</string>
-    <string name="noisycgm_replacesensor">Заменить сенсор.</string>
-    <string name="noisycgm_turnoffphone">Выключить телефон.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">Убедитесь, что приложение мониторинга сглаживает данные ГК.</string>
-    <string name="exercise_label">Тема: Нагрузки</string>
-    <string name="exercise_whattodo">Как помочь системе справиться с физическими нагрузками?</string>
-    <string name="exercise_setactivitytt">Использование функции временная цель TT.</string>
-    <string name="exercise_switchprofilebelow100">Задать профиль ниже 100%.</string>
-    <string name="exercise_switchprofileabove100">Задать профиль выше 100%.</string>
-    <string name="exercise_stoploop">Остановить цикл.</string>
-    <string name="exercise_doitbeforestart">Задать временную цель Нагрузка перед началом активности.</string>
-    <string name="exercise_afterstart">Установка временной цели TT после начала активности приводит к худшим результатам, чем если бы была задана заранее.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</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">Тема: Определение базальной скорости, чувствительности к инсулину ISF и соотношения инсулин- углеводы IC</string>
-    <string name="basaltest_when">Когда следует определить значения базала, ISF и IC?</string>
-    <string name="basaltest_beforeloop">Перед тем, как начать пользоваться AAPS.</string>
-    <string name="basaltest_havingregularhypo">При частых низких ГК.</string>
-    <string name="basaltest_havingregularhyper">При частых высоких ГК.</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">Что необходимо?</string>
     <string name="prerequisites_determinedcorrectprofile">Проверенные данные профиля (базал, инс-углеводы IC, фактор чувствительности к инсулину ISF, длительность действия инсулина DIA).</string>
-    <string name="prerequisites_computer">Компьютер для создания APK.</string>
     <string name="prerequisites_phone">Поддерживаемый телефон.</string>
-    <string name="prerequisites_car">Автомобиль.</string>
-    <string name="prerequisites_nightscout">Nightscout для передачи целей.</string>
     <string name="prerequisites_tidepoolaccount">Учетная запись Tidepool.</string>
     <string name="prerequisites_googleaccount">Учетная запись Google.</string>
     <string name="prerequisites_githubaccount">Учетная запись Github.</string>
-    <string name="prerequisites_beanandroiddeveloper">Опыт разработки Android.</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">Поддерживаемый мониторинг.</string>
-    <string name="update_label">Тема: Обновление AndroidAPS</string>
-    <string name="whatistrue">Что верно?</string>
-    <string name="update_git">Вы должны иметь установленный Git.</string>
-    <string name="update_asap">Обновлять, как только выпускается новая версия и есть достаточно времени для этого.</string>
-    <string name="update_keys">Следует использовать те же ключи подписи.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="whatistrue">Отметьте все правильные ответы.</string>
     <string name="update_neverupdate">Никогда не обновлять, если система работает хорошо.</string>
-    <string name="update_askfriend">Попросить новую версию APK у друга.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Тема: Устранение неполадок</string>
-    <string name="troubleshooting_wheretoask">Куда обращаться за помощью?</string>
-    <string name="troubleshooting_fb">Присоединиться к группе AndroidAPS на Facebook.</string>
-    <string name="troubleshooting_wiki">Читайте документацию AndroidAPS.</string>
-    <string name="troubleshooting_gitter">Посетить чат Gitter AndroidAPS.</string>
-    <string name="troubleshooting_googlesupport">Посетить поддержку AndroidAPS Google</string>
-    <string name="troubleshooting_yourendo">Поговорить с эндокринологом.</string>
+    <string name="troubleshooting_label">Устранение неполадок</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
  
 Context | Edit Context</string>
-    <string name="insulin_label">Тема: Модули инсулина</string>
-    <string name="insulin_ultrarapid">Какой тип инсулина можно использовать с модулем Ultra-Rapid-Oref?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">Новорапид®</string>
     <string name="insulin_humalog">Хумалог®</string>
-    <string name="insulin_actrapid">Актрапид®</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_which">Отметьте все правильные ответы.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Какой модуль чувствительности должен использоваться для функции UAM?</string>
-    <string name="wrongcarbs_label">Тема: Ошибки записи углеводов</string>
     <string name="wrongcarbs_whattodo">Что нужно делать, если сделан неправильный ввод углеводов?</string>
-    <string name="wrongcarbs_treatmentstab">На вкладке Лечение/назначения удалите неправильные записи углеводов. Вводите новые углеводы.</string>
-    <string name="wrongcarbs_addfakeinsulin">Добавить фиктивный инсулин с помощью функции Заполнение</string>
-    <string name="extendedcarbs_label">Тема: Продукты с содержанием жиров и белков</string>
-    <string name="extendedcarbs_handling">Что делать, если ваша еда содержит большое количество жиров и/или белков?</string>
-    <string name="extendedcarbs_useextendedcarbs">Пересчитать жир и белки в углеводах и использовать функцию \"Пролонгированные углеводы\".</string>
-    <string name="extendedcarbs_add">Пересчитать жир и белки в углеводах и добавить их в калькулятор болюса.</string>
-    <string name="extendedcarbs_useextendedbolus">Использовать пролонгированный болюс для покрытия жиров и белков.</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_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Тема: Удаленный мониторинг</string>
-    <string name="nsclient_howcanyou">Как можно дистанционно отслеживать AAPS вашего ребенка?</string>
-    <string name="nsclient_nightscout">С помощью сайта Nightscout.</string>
-    <string name="nsclient_dexcomfollow">Приложение Dexcom Follow, если вы используете оригинальное приложение Dexcom (только ГК).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow, если вы используете приложение xDrip.</string>
-    <string name="nsclient_xdripfollower">xDrip в режиме follower.</string>
-    <string name="nsclient_looponiphone">Приложения Loop на iPhone.</string>
-    <string name="nsclient_spikeiphone">Приложения Spike на iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Тема: Коэффициент чувствительности к инсулину</string>
-    <string name="isf_increasingvalue">Более высокие значения ISF приводят к меньшей подаче инсулина, когда AAPS исправляет высокую ГК.</string>
-    <string name="isf_decreasingvalue">Более низкие значения ISF приводят к меньшей подаче инсулина, когда AAPS исправляет высокую ГК.</string>
-    <string name="isf_noeffect">Изменение значений ISF никак не влияет на количество инсулина, подаваемого AAPS при коррекции высокой ГК.</string>
-    <string name="isf_preferences">Необходимо ввести ISF в Настройках.</string>
     <string name="isf_profile">Изменение значения ISF в профиле достаточно для применения изменений.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Тема: Соотношение инсулин-углеводы IC</string>
-    <string name="ic_increasingvalue">Более высокие коэффициенты инсулин-углеводы IC приводят к уменьшению инсулина на данное количество углеводов.</string>
-    <string name="ic_decreasingvalue">Более низкие коэффициенты инсулин-углеводы IC приводят к уменьшению инсулина на данное количество углеводов.</string>
     <string name="ic_noeffect">Если у вас 0 активных углеводов COB, изменение соотношения инсулин-углеводы IC приведет к иному количеству инсулина на коррекцию данной ГК.</string>
     <string name="ic_different">Соотношение инсулин-углеводы IC изменится если принимать ХЕ за 10 или 12г.</string>
     <string name="ic_meaning">Смысл соотношения инсулин-углеводы IC таков: сколько хлебных единиц покрываются одной ед. инсулина.</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_basalhigher">Базал будет на 10% выше.</string>
-    <string name="profileswitch_basallower">Базал будет на 10% ниже.</string>
-    <string name="profileswitch_ichigher">Значение IC будет на 10% больше.</string>
-    <string name="profileswitch_iclower">Значение IC будет на 10% ниже.</string>
-    <string name="profileswitch_isfhigher">Значение ISF будет на 10% выше.</string>
-    <string name="profileswitch_isflower">Значение ISF будет на 10% ниже.</string>
-    <string name="profileswitch_overall">В общей сложности вы получите на 10% меньше инсулина.</string>
-    <string name="profileswitch_targethigher">Целевое значение ГК будет на 10% выше.</string>
-    <string name="profileswitch_targetlower">Целевое значение ГК будет на 10% ниже.</string>
-    <string name="profileswitch_targetbottom">Только нижняя цель будет ниже на 10%.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Если вы просыпаетесь на 1ч раньше, чем обычно, как вы должны уведомлять AAPS об изменении вашего графика?</string>
-    <string name="profileswitchtime_1">Выполнить переключение профиля со сдвигом времени 1</string>
-    <string name="profileswitchtime__1">Выполнить переключение профиля со сдвигом времени -1</string>
+    <string name="profileswitchtime_2">Выполнить переключение профиля со сдвигом времени 2</string>
+    <string name="profileswitchtime__2">Выполнить переключение профиля со сдвигом времени -2</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Выполнить переключение профиля со сдвигом времени 60</string>
-    <string name="profileswitchtime__60">Выполнить переключение профиля со сдвигом времени -60</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
-    <string name="basalhelp_label">Тема: Скорость базала. Справка</string>
     <string name="basalhelp_where">Куда обращаться за помощью по скорости базала и т. д.</string>
     <string name="basalhelp_diabetesteam">Ваши эндокринологи</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Другие препараты</string>
-    <string name="other_medication_text">ААPS понижает базал, чтобы повысить уровень сахара в крови. Препараты из группы ингибиторов SGLT2 (глифлозинов) могут предотвратить ожидаемый рост ГК и, следовательно, привести к опасной недостаточности инсулина (диабетическому кетоацитозу DKA).
-\nНаиболее распространенные коммерческие наименования:® Invokana, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\n Настоящим подтверждаю, что не буду принимать такие препараты при использовании AAPS или буду отключать AAPS перед их употреблением.</string>
 </resources>

app/src/main/res/values-ru-rRU/objectives.xml

@@ -21,7 +21,6 @@
     <string name="objectives_smb_objective">Активация таких доп функций для дневного времени как супер микро болюс SMB</string>
     <string name="objectives_auto_objective">Включение автоматизации</string>
     <string name="objectives_smb_gate">Прочтите wiki и увеличьте maxIOB чтобы супер микро болюс SMB заработал как положено! Хорошее начало – maxIOB = средний болюс на еду + троекратный максимальный суточный базал</string>
-    <string name="objectives_auto_gate">Прочтите документацию по автоматизации. Настройте свои первые простые правила. Вместо действия позвольте AAPS только выводить уведомления. Если вы уверены, что автоматизация инициируется в нужное время, замените уведомление реальным действием.</string>
     <string name="objectives_bgavailableinns">гликемия доступна в NS</string>
     <string name="objectives_pumpstatusavailableinns">Статус помпы доступен в NS</string>
     <string name="objectives_manualenacts">Ввод вручную</string>
@@ -36,11 +35,9 @@
     <string name="objectives_useloop">Просмотр содержимого модуля Цикл Loop</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">Если у вас есть хотя бы три месяца работы с замкнутым циклом с другими системами, то можно получить код пропуска. Подробности смотрите по адресу https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives.</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>

app/src/main/res/values-ru-rRU/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Безопасность терапии</string>
     <string name="treatmentssafety_maxbolus_title">Макс разрешенный болюс [U] ед.</string>
     <string name="treatmentssafety_maxcarbs_title">Макс разрешенные углеводы (г)</string>
+    <string name="nav_preferences_plugin">Настройки %1$s</string>
     <string name="nav_preferences">Настройки</string>
     <string name="nav_refreshtreatments">Синхронизировать назначения с NS</string>
     <string name="nav_resetdb">обнулить базы</string>
@@ -564,8 +565,6 @@
     <string name="overview_editquickwizard_usebasaliob">Расчет базального активного инсулина IOB</string>
     <string name="overview_editquickwizard_usetrend">Расчет тренда</string>
     <string name="overview_editquickwizard_usesuperbolus">Расчет супер болюса</string>
-    <string name="yes">Да</string>
-    <string name="no">Нет</string>
     <string name="positiveonly">Только положительные</string>
     <string name="negativeonly">Только отрицательные</string>
     <string name="overview_editquickwizard_usecob">Вычисление активных углеводов COB</string>
@@ -612,8 +611,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">В резервуаре недостаточно инсулина для болюса</string>
     <string name="extendedbolusdeliveryerror">Подача пролонгированного болюса не состоялась</string>
     <string name="insightpump_shortname">Поле обзора</string>
-    <string name="set_neutral_temps_title">Установить нейтральные временные базалы</string>
-    <string name="set_neutral_temps_summary">Если эта опция включена, то она отменяет временный базал до конца каждого часа. Такой метод помогает прекратить почасовую вибрацию некоторых помп.</string>
     <string name="enablesmbalways">Всегда включать супер микро болюс SMB</string>
     <string name="enablesmbalways_summary">Всегда включать супер микро болюс SMB независимо от болюсов. Возможно только для источников СК с хорошей фильтрацией данных вроде G5</string>
     <string name="enablesmbaftercarbs">Активировать супер микро болюс SMB после углеводов</string>
@@ -764,8 +761,8 @@ Context | Edit Context</string>
     <string name="diawarning">Напоминание: новые профили инсулина требуют как минимум 5 часов длительности действия DIA. 5-6 часовая DIA эквивалентна трехчасовой на старых профилях.</string>
     <string name="setupwizard_profile_description">Пожалуйста выберите источник профиля. Если пациент ребенок пользуйтесь профилем Nightscout. Если никто не отслеживает ваш СК на NS, вы вероятно предпочтете Локальный профиль. Напоминание - вы всего лишь выбираете профиль. Активируйте его \"Переключателем профиля\"</string>
     <string name="setupwizard_aps_description">Выберите один из доступных алгоритмов. Они расположены от самых старых к самым новым. Более новый алгоритм обычно мощнее и агрессивнее. Если вы новый пользователь возможно вам лучше начать с помощника болюса AMA а не с новейшего алгоритма. Читайте документацию OpenAPS и определите свою конфигурацию.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Ожидание соединения RileyLink\n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b>Примечание:</b> После инициализации помпы вы можете продолжить установку\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Сконфигурируйте RileyLink. После выбора RileyLink можно будет продолжить установку если состояние RileyLink \"Соединено\". Это может занять минуту.\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>
@@ -792,7 +789,6 @@ Context | Edit Context</string>
     <string name="sensitivity_raises_target_title">Чувствительность поднимает цель</string>
     <string name="sensitivity_raises_target_summary">При обнаружении чувствительности целевой уровень глюкозы повышается</string>
     <string name="combo_invalid_setup">Недопустимые установки помпы, проверьте документацию и убедитесь, что меню Quick Info называется QUICK INFO, используя приложение 360 для конфигурации помпы.</string>
-    <string name="custom">Пользовательские</string>
     <string name="careportal_removestartedevents">AndroidAPS перезапущен</string>
     <string name="storedsettingsfound">Найдены сохраненные параметры</string>
     <string name="allow_hardware_pump_text">Внимание: Если вы активируете подключение к невиртуальной помпе, AndroidAPS скопирует настройки базала в профиль помпы, перезаписывая существующие настройки, хранящиеся в ней. Убедитесь, что настройки базала в AndroidAPS корректны. Если вы не уверены или не хотите перезаписать настройки базала на помпу, нажмите отменить и повторите подключение в другое время.</string>
@@ -980,7 +976,9 @@ Context | Edit Context</string>
     <string name="description_source_dexcom">Получать данные ГК от модифицированного приложения Dexcom.</string>
     <string name="notification">Уведомление</string>
     <string name="notification_message">Уведомление: %1$s</string>
+    <string name="alarm_message">Сигнал оповещения: %1$s</string>
     <string name="message_short">Сообщение:</string>
+    <string name="alarm_short">Сигнал:</string>
     <string name="profilepercentage">Процент профиля</string>
     <string name="percent_u">Процент [%]:</string>
     <string name="startprofile">Начать профиль %1$d%% на %2$d мин</string>
@@ -1180,5 +1178,9 @@ Context | Edit Context</string>
     <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">На ваш аккаунт Open Humans будут загружены следующие данные: значения ГК, события careportal (за исключением примечаний), пролонгированные болюсы, переключения профиля, суммарные суточные дозы, временные базалы, временные цели, настройки, версии приложения, модель устройства и размеры экрана. Секретная или конфиденциальная информация, такая как адрес вашего сайта Nightscout или API secret, не будет загружена.</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="alarm">Сигнал</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Отправить SMS, если инициируется запись о недоступности помпы</string>
+    <string name="smscommunicator_pump_ureachable">Сообщить о недоступности помпы</string>
 </resources>

app/src/main/res/values-sk-rSK/exam.xml

@@ -1,167 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Čo je pravda o DIA?</string>
-    <string name="dia_label_exam">Téma: Doba trvania účinku inzulínu</string>
-    <string name="dia_minimumis3h">Minimálna hodnota je 3 hodiny.</string>
+    <string name="dia_label_exam">Doba pôsobenia inzulínu (DIA)</string>
+    <string name="dia_profile">Mali by ste nastaviť hodnotu DIA vo vašom profile.</string>
     <string name="dia_minimumis5h">Minimálna hodnota je 5 hodín.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#inzulin</string>
-    <string name="dia_meaningisequaltodiapump">Význam je rovnaký, ako parameter DIA používaný vo vašej pumpe.</string>
-    <string name="dia_valuemustbedetermined">Musíte určiť svoju, individuálnu hodnotu (ale nie menej ako 5 hodín).</string>
-    <string name="hypott_label">Téma: Dočasný cieľ Hypo</string>
-    <string name="hypott_whenhypott">Čo je hlavným dôvodom pre nastavenie dočasného cieľa Hypoglykémie?</string>
-    <string name="hypott_goinglow">Zabrániť nízkej glykémii, pokiaľ už je spustený nulový dočasný bazál.</string>
-    <string name="hypott_preventoversmb">Aby sa zabránilo AAPS podaniu príliš veľkého množstva inzulínu po vzostupe glykémie, spôsobenom rýchlymi sacharidmi použitými k liečbe hypoglykémie.</string>
+    <string name="dia_meaningisequaltodiapump">Pokiaľ ste spokojní s tým, že hodnota DIA použitá v pumpe pred AndroidAPS dobre fungovala, nie je potrebné ju meniť, keď začínate s uzavretým okruhom.</string>
+    <string name="dia_valuemustbedetermined">Mali by ste si pre seba určiť príslušnú hodnotu DIA.</string>
+    <string name="hypott_label">Dočasný cieľ pri hypoglykémii</string>
+    <string name="hypott_whenhypott">Čo je primárnym dôvodom k nastaveniu dočasného cieľa Hypoglykémie?</string>
+    <string name="hypott_wrongbasal">Upravovať hypoglykémie, spôsobené nesprávnym nastavením bazálu.</string>
+    <string name="hypott_preventoversmb">Aby sa zabránilo prehnanej korekcii, spôsobenej rýchlymi sacharidmi, použitými k liečbe hypoglykémie.</string>
+    <string name="hypott_exercise">Napraviť hypo, ako dôsledok fyzickej aktivity.</string>
+    <string name="hypott_0basal">Aby sa zabránilo zníženiu hladiny glukózy v krvi, pokiaľ už beží 0% dočasný bazál.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Ktorý profil je možné použiť a konfigurovať offline?</string>
     <string name="offlineprofile_label">Téma: Offline profil</string>
     <string name="offlineprofile_nsprofile">NS profil môže byť použitý, ale nenakonfigurovaný.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Téma: Odpojenie od pumpy</string>
-    <string name="pumpdisconnect_letknow">Kliknite na \"Odpojiť pumpu\", aby AAPS vedelo, že nie je podávaný žiadny inzulín.</string>
-    <string name="pumpdisconnect_suspend">Kliknite na tlačítko \"Pozastaviť uzavretý okruh\", aby AAPS zastavil uzavretý okruh na dobu, kým je pumpa odpojená.</string>
-    <string name="pumpdisconnect_dontchnage">Nemeňte nič v AAPS, iba odpojte pumpu.</string>
+    <string name="pumpdisconnect_label">Dôvody pre použitie \"Odpojiť pumpu\" v AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">Čo je potrebné urobiť, pri odpojení pumpy?</string>
+    <string name="pumpdisconnect_unnecessary">Toto je zbytočné, pretože inzulín nebude vydaný v prípade, že je pumpa fyzicky odpojená.</string>
+    <string name="pumpdisconnect_missinginsulin">Zabraňuje AndroidAPS započítať inzulín, ktorý nebol vydaný, keď je pumpa fyzicky odpojená.</string>
+    <string name="pumpdisconnect_notstop">Nezastaví vydávanie inzulínu, pokiaľ pumpa zostane pripojená.</string>
+    <string name="pumpdisconnect_openloop">Prepne AndroidAPS do režimu otvoreného okruhu.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#dalsi-nastaveni</string>
-    <string name="objectives_label">Téma: Nastavenie AndroidAPS</string>
-    <string name="objectives_howtosave">Aké sú odporúčané postupy pre zálohovanie Vašich nastavení?</string>
-    <string name="objectives_exportsettings">Exportovať ich lokálne z menu Údržby.</string>
-    <string name="objectives_storeelsewhere">Uložte exportovaný súbor na iné miesto, ako napr. E-mail, Dropbox, Google Drive...</string>
-    <string name="objectives_doexportonstart">Exportujte ich ihneď po inštalácii AAPS.</string>
-    <string name="objectives_doexportafterchange">Exportujte ich po vykonaní zmien v nastaveniach.</string>
-    <string name="objectives_doexportafterobjective">Exportujte ich po dokončení cieľa.</string>
-    <string name="objectives_doexportafterfirtssettings">Exportujte ich, akonáhle dokončíte úvodné nastavenia.</string>
+    <string name="objectives_label">AndroidAPS nastavenia</string>
+    <string name="objectives2_label">AndroidAPS nastavenia</string>
+    <string name="objectives_howtosave">Aké sú najlepšie postupy pre zálohovanie vašich nastavení?</string>
+    <string name="objectives_notesettings">Nastavenia nie je potrebné exportovať za predpokladu, že ste si ich zapísali.</string>
+    <string name="objectives_afterobjective">Exportujte svoje nastavenia po dokončení cieľa.</string>
+    <string name="objectives_afterchange">Exportujte svoje nastavenia, po zmene ktoréhokoľvek z vašich nastavení.</string>
+    <string name="objectives_afterinitialsetup">Exportujte svoje nastavenia po dokončení počiatočného nastavenia a nastavenia preferencií.</string>
+    <string name="objectives2_maintenance">Exportujte vaše nastavenia lokálne pomocou menu údržby.</string>
+    <string name="objectives2_internalstorage">Súbor nastavení sa nachádza v zložke Interné úložisko/AAPS/Preferences vašeho telefónu.</string>
+    <string name="objectives2_cloud">Skopírujte súbor s vašimi nastaveniami do bezpečného umiestnenia mimo telefón (napr. pomocou cloudového disku, pripojením kábla k počítaču, E-mailom a pod.)</string>
+    <string name="objectives2_easyrestore">Ak je váš telefón poškodený, alebo stratený, existujú jednoduché spôsoby, ako vzdialene obnoviť vaše nastavenia bez zálohovania.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#jake-vybaveni-pro-pripad-nouze-se-doporucuje-brat-s-sebou</string>
-    <string name="noisycgm_label">Téma: Šum dát zo senzora</string>
+    <string name="noisycgm_label">Šum dát zo senzora</string>
     <string name="noisycgm_whattodo">Čo je potrebné urobiť v prípade, že CGM dáta poskakujú?</string>
-    <string name="nothing">Nič, uzavretý okruh si s tým poradí.</string>
-    <string name="noisycgm_pause">Zakážte uzavretý okruh, aby ste sa vyhli predávkovaniu inzulínom.</string>
-    <string name="noisycgm_replacesensor">Vymeňte senzor.</string>
-    <string name="noisycgm_turnoffphone">Vypnúť telefón.</string>
+    <string name="noisycgm_nothing">Nič nerob, uzavretý okruh sa s tým vysporiada.</string>
+    <string name="noisycgm_pause">Deaktivujte uzavretý okruh, aby nedošlo k predávkovaniu, alebo poddávkovaniu.</string>
+    <string name="noisycgm_replacesensor">Nahraďte trvalo zašumené, alebo nepresné senzory.</string>
+    <string name="noisycgm_checksmoothing">Overte, či vaša aplikácia CGM vyhladzuje glykémie.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#vyhlazovani-zarusenych-dat-glykemii</string>
-    <string name="noisycgm_checksmoothing">Overte, že vaša aplikácia CGM vyhladzuje glykémie.</string>
-    <string name="exercise_label">Téma: Šport a pohyb</string>
-    <string name="exercise_whattodo">Ako môžete pomôcť systému vysporiadať sa so športom a pohybom?</string>
-    <string name="exercise_setactivitytt">Použitie funkcie dočasný cieľ.</string>
-    <string name="exercise_switchprofilebelow100">Prepnúť na profil pod 100 %.</string>
-    <string name="exercise_switchprofileabove100">Prepnúť na profil nad 100 %.</string>
-    <string name="exercise_stoploop">Zastaviť uzavretý okruh.</string>
-    <string name="exercise_doitbeforestart">Nastaviť dočasný cieľ aktivity pred zahájením cvičenia.</string>
-    <string name="exercise_afterstart">Nastavenie dočasného cieľa aktivity až po zahájení cvičenia, vedie k horšiemu výsledku, ako v prípade, keby bol spustený dopredu.</string>
+    <string name="exerciseprofile_label">Cvičenie a profily</string>
+    <string name="exerciseprofile_whattodo">Ako môžete použiť profily, aby ste mohli najlepšie pomocou systému riešiť aeróbne cvičenie?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Prepnúť na profil pod 100 %.</string>
+    <string name="exerciseprofile_switchprofileabove100">Prepnúť profil na viac ako 100 %.</string>
+    <string name="exerciseprofile_leaveat100">Ponechajte profil nastavený na hodnotu 100%.</string>
+    <string name="exerciseprofile_suspendloop">Pozastavte uzavretý okruh.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/temptarget.html#docasny-cil-pri-pohybove-aktivite</string>
+    <string name="exercise_label">Cvičenie a dočasné ciele</string>
+    <string name="exercise_whattodo">Ako môžete použiť dočasné ciele pre najlepšiu pomoc pri práci so systémom pri aeróbnom cvičení?</string>
+    <string name="exercise_settt">Nastavte cieľovú hodnotu glykémie vo vhodnej dobe pred zahájením cvičenia.</string>
+    <string name="exercise_setfinished">Po ukončení cvičenia nastavte cieľovú hodnotu glykémie.</string>
+    <string name="exercise_setunchanged">Nechajte svoju cieľovú glykémiu bez zmeny.</string>
+    <string name="exercise_15g">Počkajte, kým glykémia neklesne pod Váš dočasný cieľ hypoglykémia a potom zjedzte 15 g rýchlych sacharidov.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/temptarget.html#docasny-cil-pri-pohybove-aktivite</string>
-    <string name="suspendloop_label">Téma: Deaktivovaný/Pozastavený uzavretý okruh</string>
+    <string name="suspendloop_label">Deaktivovaný/pozastavený uzavretý okruh</string>
     <string name="suspendloop_doigetinsulin">Dostávam inzulín, keď je uzavretý okruh deaktivovaný/pozastavený?</string>
     <string name="suspendloop_yes">Áno, bazálny inzulín je podávaný naďalej.</string>
     <string name="suspendloop_no">Nie, podávanie inzulínu je zastavené.</string>
-    <string name="basaltest_label">Téma: Testovanie bazálu, ISF a IC</string>
-    <string name="basaltest_when">Kedy mám overiť hodnoty bazálov, ISF a IC?</string>
+    <string name="basaltest_label">Testovanie bazálu, ISF a IC</string>
+    <string name="basaltest_when">Kedy majú byť tieto hodnoty overené?</string>
     <string name="basaltest_beforeloop">Predtým, ako začnem používať uzavretý okruh.</string>
-    <string name="basaltest_havingregularhypo">Pokiaľ máte často nízke glykémie.</string>
-    <string name="basaltest_havingregularhyper">Pokiaľ máte často vysoké glykémie.</string>
+    <string name="basaltest_havingregularhighlow">Pri častom výskyte vysokej, alebo nízkej hladiny glykémie v krvi.</string>
+    <string name="basaltest_weekly">Minimálne raz týždenne.</string>
+    <string name="basaltest_fixed">Akonáhle sú tieto hodnoty nastavené a overené, nemali by sa časom meniť.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#nastaveni-androidaps</string>
-    <string name="prerequisites_label">Téma: Nevyhnutné predpoklady</string>
-    <string name="prerequisites_what">Čo potrebujem?</string>
+    <string name="prerequisites_label">Požiadavky</string>
+    <string name="prerequisites_what">Čo je nevyhnutné pre nastavenie a používanie AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Overené informácie o profile (Bazál, IC, ISF, DIA).</string>
-    <string name="prerequisites_computer">Počítač na vytvorenie APK.</string>
+    <string name="prerequisites_computer">Počítač s nainštalovanou a nakonfigurovanou aplikáciou Android Studio.</string>
     <string name="prerequisites_phone">Podporovaný telefón.</string>
-    <string name="prerequisites_car">Auto.</string>
-    <string name="prerequisites_nightscout">Nightscout, kvôli splneniu cieľov.</string>
+    <string name="prerequisites_pump">Kompatibilná inzulínová pumpa, pokiaľ plánujete spustenie uzavretého okruhu.</string>
+    <string name="prerequisites_nightscout">Nightscout pre záznam všetkých dát a kontrolu nastavení.</string>
     <string name="prerequisites_tidepoolaccount">Tidepool účet.</string>
     <string name="prerequisites_googleaccount">Google účet.</string>
     <string name="prerequisites_githubaccount">Github účet.</string>
-    <string name="prerequisites_beanandroiddeveloper">Skúsenosti s vývojom pre Android.</string>
+    <string name="prerequisites_beanandroiddeveloper">Skúsenosti s programovaním, alebo úpravou kódu.</string>
     <string name="prerequisites_own670g">Pumpu MiniMed 670G.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Module/module.html</string>
     <string name="prerequisites_smartwatch">Inteligentné hodinky.</string>
     <string name="prerequisites_supportedcgm">Podporovaný CGM.</string>
-    <string name="update_label">Téma: Aktualizácia AndroidAPS</string>
-    <string name="whatistrue">Čo je pravda?</string>
-    <string name="update_git">Musíte mať nainštalovaný Git.</string>
-    <string name="update_asap">Aktualizujte hneď, akonáhle se uvoľní nová verzia a budete mať dostatok času na to, to urobiť.</string>
-    <string name="update_keys">Mali by ste používať rovnaké podpisové kľúče.</string>
+    <string name="prerequisites2_label">Požiadavky</string>
+    <string name="prerequisites2_what">Čo je nevyhnutné pre nastavenie a používanie AndroidAPS?</string>
+    <string name="prerequisites2_profile">Overené informácie pre nastavenie profilu (ISF, pomer I:C, bazálne dávky, DIA atď.).</string>
+    <string name="prerequisites2_device">Kompatibilné Android zariadenie (napr. mobilný telefón, Android hodinky, alebo tablet).</string>
+    <string name="prerequisites2_internet">AndroidAPS vyžaduje pripojenie k internetu pre spustenie uzavretého okruhu.</string>
+    <string name="prerequisites2_supportedcgm">Podporované CGM a vhodná aplikácia pre prijímanie glykémií v telefóne/zariadení.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Module/module.html</string>
+    <string name="update_label">Aktualizácia AndroidAPS</string>
+    <string name="whatistrue">Zaškrtnite všetky správne odpovede.</string>
+    <string name="update_git">Musíte mať nainštalovaný a nakonfigurovaný Git na vašom počítači.</string>
+    <string name="update_asap">Pokiaľ sú uvoľnené aktualizované verzie AndroidAPS, staršie verzie môžu byť po určitej dobe vzdialene obmedzené.</string>
+    <string name="update_keys">Mali by ste uložiť a zaznamenať umiestnenie úložiska kľúčov a použiť rovnaký podpisový kľúč pre aktualizácie, ako pre vašu predchádzajúcu inštaláciu.</string>
     <string name="update_neverupdate">Nikdy neaktualizujte, pokiaľ systém funguje dobre.</string>
-    <string name="update_askfriend">Požiadajte kamaráta o novú verziu APK.</string>
+    <string name="update_askfriend">Ak máte problém s vytvorením apk, môžete nainstalovať apk, ktorý bol vytvorený priateľom.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Installing-AndroidAPS/Update-to-new-version.html</string>
-    <string name="troubleshooting_label">Téma: Riešenie problémov</string>
-    <string name="troubleshooting_wheretoask">Kde hľadať pomoc?</string>
-    <string name="troubleshooting_fb">Pripojte sa do facebookovej skupiny AndroidAPS.</string>
-    <string name="troubleshooting_wiki">Prečítajte si dokumentáciu AndroidAPS.</string>
-    <string name="troubleshooting_gitter">Navštívte miestnosť AndroidAPS na Gitter kanáli.</string>
-    <string name="troubleshooting_googlesupport">Navštívte Google podporu AndroidAPS</string>
-    <string name="troubleshooting_yourendo">Porozprávajte sa so svojím diabetológom.</string>
+    <string name="troubleshooting_label">Riešenie problémov</string>
+    <string name="troubleshooting_wheretoask">Kde môžete hľadať pomoc s AndroidAPS?</string>
+    <string name="troubleshooting_fb">Môžete požiadať o radu vo Facebookovej skupine používateľov AndroidAPS.</string>
+    <string name="troubleshooting_wiki">Mali by ste si prečítať (a znovu prečítať) dokumentáciu k AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Môžete požiadať o radu a nahlásiť technické problémy, alebo chyby na Gitteri.</string>
+    <string name="troubleshooting_yourendo">Mali by ste se spýtať svojho lekára/endokrinológa.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/index.html#poradce-pri-potizich</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Téma: Inzulínové moduly</string>
-    <string name="insulin_ultrarapid">Aký druh inzulínu môže byť použitý s modulom \'Ultra-Rýchlý-Oref\'?</string>
+    <string name="insulin_label">Pluginy Inzulín</string>
+    <string name="insulin_ultrarapid">Ktorý inzulín by ste mali používať s pluginom Ultra-rýchly Oref?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_novorapid">NovoRapid ® /Humalog ®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_actrapid">Actrapid ®/Humulin R ®/\"bežný\" ľudský inzulín.</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#inzulin</string>
-    <string name="sensitivity_label">Téma: Moduly citlivosti</string>
-    <string name="sensitivity_which">Ktorý algoritmus citlivosti má konfigurovateľnú dobu detekcie?</string>
+    <string name="sensitivity_label">Pluginy Citlivosť</string>
+    <string name="sensitivity_which">Zaškrtnite všetky správne odpovede.</string>
+    <string name="sensitivity_adjust">Pluginy citlivosti umožňujú AndroidAPS prispôsobiť sa dočasným, alebo krátkodobým zmenám v citlivosti inzulínu (napríklad hormonálne zmeny, alebo problémy s absorbciou na infúznom mieste).</string>
+    <string name="sensitivity_edit">Pluginy citlivosti poskytujú používateľovi návrh zmien bazálnych hodnôt, I:C pomerov a ISF, ktoré môžu byť použité k úprave profilu.</string>
+    <string name="sensitivity_cannula">Výmena kanyly, alebo zmena profilu automaticky nastaví Autosense späť na 100%.</string>
+    <string name="sensitivity_time">Niektoré pluginy majú konfigurovateľné časové rozmedzie, ktoré môže nastaviť používateľ.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#detekce-citlivosti</string>
-    <string name="sensitivityuam_which">Ktorý modul citlivosti musí byť použitý pre funkciu UAM (rozpoznanie neoznámeného jedla)?</string>
-    <string name="wrongcarbs_label">Téma: Chyby pri zadávaní sacharidov</string>
+    <string name="wrongcarbs_label">Chyby pri zadávaní sacharidov</string>
     <string name="wrongcarbs_whattodo">Čo by ste mali urobiť, pokiaľ ste chybne zadali sacharidy?</string>
-    <string name="wrongcarbs_treatmentstab">V Ošetreniach odstráňte chybnú položku. Zadajte nové sacharidy.</string>
-    <string name="wrongcarbs_addfakeinsulin">Pridať falošný inzulín pomocou funkcie \"Plnenie/Doplňovanie\".</string>
-    <string name="extendedcarbs_label">Téma: Jedlo s tukom a bielkovinami</string>
-    <string name="extendedcarbs_handling">Čo robiť, keď jedlo obsahuje veľké množstvo tukov a/alebo bielkovín?</string>
-    <string name="extendedcarbs_useextendedcarbs">Prepočítajte tuky a bielkoviny na sacharidy a použite funkciu „Rozložené sacharidy“.</string>
-    <string name="extendedcarbs_add">Prepočítajte tuky a bielkoviny na sacharidy a pridajte ich do výpočtu bolusu.</string>
-    <string name="extendedcarbs_useextendedbolus">Použite predĺžený bolus, aby ste pokryli tuky a bielkoviny.</string>
+    <string name="wrongcarbs_treatmentstab">Odstráňte nesprávny záznam v Ošetreniach a zadajte správnu novú hodnotu sacharidov.</string>
+    <string name="wrongcarbs_addinsulin">Pošlite inzulín pomocou plnenie/doplňovanie.</string>
+    <string name="wrongcarbs_donothing">Nič nerobte – AndroidAPS urobí vhodné úpravy.</string>
+    <string name="wrongcarbs_bolus">Pošlite inzulín pomocou ikony Inzulín v prehľade.</string>
+    <string name="wronginsulin_label">Chyby pri podávaní inzulínu</string>
+    <string name="wronginsulin_whattodo">Čo by ste mali urobiť, pokiaľ ste dostali menej inzulínu, než ukazuje história pumpy, napr. v dôsledku oklúzie, vadnej kanyly, alebo zabudnutia na opätovné pripojenie pumpy po sprche?</string>
+    <string name="wronginsulin_careportal">Odstráňte dáta z Nightscoutu pre odstránenie z histórie pumpy.</string>
+    <string name="wronginsulin_compare">Porovnajte hodnoty v AndroidAPS a histórii pumpy.</string>
+    <string name="wronginsulin_prime">Pošlite bolus na vypočítaný „chýbajúci“ inzulín buď injekčnou striekačkou, alebo perom, alebo pomocou plnenia na pumpe.</string>
+    <string name="wronginsulin_donothing">Nerobte nič a dovoľte AndroidAPS upraviť akúkoľvek výslednú vysokú hladinu glukózy v krvi.</string>
+    <string name="iob_label">Aktívny inzulín (IOB)</string>
+    <string name="iob_which">Zaškrtnite všetky správne odpovede.</string>
+    <string name="iob_value">Hodnota IOB je ovplyvnená vydanými dočasnými bazálmi.</string>
+    <string name="iob_hightemp">Vysoký dočasný bazál nebude spustený, pokiaľ je Vaša glykémia nižšia, ako cieľ.</string>
+    <string name="iob_negiob">Negatívne IOB po značnú dobu bez cvičenia naznačuje, že váš profil je príliš \"silný\" a vo vašom profile je potrebného menej inzulínu.</string>
+    <string name="iob_posiob">Pozitívne IOB na značnú dobu naznačuje rezistenciu voči inzulínu, alebo neohlásené jedlo.</string>
+    <string name="breadgrams_label">Zadávanie sacharidov a bolusov</string>
+    <string name="breadgrams_grams">Iba gramy by mali byť použité pre odhad a záznam spotrebovaných sacharidov.</string>
+    <string name="breadgrams_exchange">Spotrebované sacharidy je možné zaznamenávať pomocou vhodného systému (napr. \"sacharidové jednotky\").</string>
+    <string name="breadgrams_decay">AndroidAPS používa dynamický model k odhadu vstrebávania sacharidov a k výpočtu COB.</string>
+    <string name="breadgrams_calc">Pokiaľ sú hladiny glykémie v krvi mimo prijateľných hodnôt (príliš nízke, alebo príliš vysoké), môže byť použitá bolusová kalkulačka k podávaniu návrhov na sacharidy, alebo na korekčný bolus.</string>
+    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#inzulinovosacharidovy-pomer-ic-g-u</string>
+    <string name="extendedcarbs_label">e-sacharidy</string>
+    <string name="extendedcarbs_handling">Na čo by ste mohli použiť e-sacharidy (predĺžené sacharidy)?</string>
+    <string name="extendedcarbs_future">Pre plánovanie budúcich sacharidov, prípadne distribuovaných v intervale (podobné predĺženému bolusu).</string>
+    <string name="extendedcarbs_free">Pre zaznamenávanie \'falošných\' sacharidov pri cvičení, ktoré chcete skryť pred AndroidAPS.</string>
+    <string name="extendedcarbs_fat">e-sacharidy (distribuované v budúcnosti) môžu AndroidAPS pomôcť pri narábaní s jedlami s vysokým obsahom tukov/bielkovín.</string>
+    <string name="extendedcarbs_rescue">Pre zaznamenávanie rýchlych sacharidov, použitých k liečbe nízkej hladiny glukózy v krvi.</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Téma: Vzdialené sledovanie</string>
-    <string name="nsclient_howcanyou">Ako môžete na diaľku monitorovať AAPS svojho dieťaťa?</string>
-    <string name="nsclient_nightscout">Pomocou stránky Nightscout.</string>
-    <string name="nsclient_dexcomfollow">Dexcom follow aplikácia, pokiaľ používate originálnu aplikáciu Dexcom (iba hodnoty glykémie).</string>
-    <string name="nsclient_dexcomfollowxdrip">Aplikácia Dexcom Follow, pokiaľ používate aplikáciu xDrip.</string>
-    <string name="nsclient_xdripfollower">Aplikácia xDrip v režime sledovania (Follower).</string>
-    <string name="nsclient_looponiphone">Aplikácia Loop na iPhone.</string>
-    <string name="nsclient_spikeiphone">Aplikácia Spike na iPhone.</string>
+    <string name="nsclient_label">Vzdialený monitoring</string>
+    <string name="nsclient_howcanyou">Ako môžete vzdialene monitorovať AndroidAPS (napríklad svoje dieťa)?</string>
+    <string name="nsclient_nightscout">NS Client aplikácia, aplikácia Nightscout a webová stránka Nightscout umožnujú sledovať AndroidAPS vzdialene.</string>
+    <string name="nsclient_dexcomfollow">Ďalšia aplikácia (např. Dexcom follow, xDrip bežiaci v režime sledovania) vám umožňujú sledovať niektoré parametre (napr. hodnoty glykémie) na diaľku, ale použitie rôznych algoritmov môže mať vplyv na nepresné hodnoty IOB nebo COB.</string>
+    <string name="nsclient_data">Ak chcete sledovať AndroidAPS na diaľku, musia mať obe zariadenia prístup k internetu (napr. cez Wi-Fi, alebo mobilná dátová sieť).</string>
+    <string name="nsclient_fullcontrol">NSClient umožňuje oboje: monitorovať a poskytovať plnú kontrolu nad AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Children/Children.html</string>
-    <string name="isf_label_exam">Téma: Citlivosť na inzulín</string>
-    <string name="isf_increasingvalue">Vyššie hodnoty ISF vedú k menšej dávke inzulínu pri korigovaní vysokej glykémie.</string>
-    <string name="isf_decreasingvalue">Nižšie hodnoty ISF vedú k menšej dávke inzulínu pri korigovaní vysokej glykémie.</string>
-    <string name="isf_noeffect">Zmena hodnoty ISF nemá vplyv na dávku inzulínu, keď AAPS koriguje vysokú glykémiu.</string>
-    <string name="isf_preferences">Musíte zadať citlivosť v Nastaveniach.</string>
+    <string name="isf_label_exam">Citlivosť inzulínu (ISF)</string>
+    <string name="isf_increasingvalue">Zvýšenie hodnôt citlivosti povedie k väčšej dodávke inzulínu na pokrytie určitého množstva sacharidov.</string>
+    <string name="isf_decreasingvalue">Zníženie hodnôt citlivosti vedie k väčšiemu množstvu inzulínu na korekciu vyššej glykémie.</string>
+    <string name="isf_noeffect">Zvýšenie, alebo zníženie citlivosti nemá žiadny vplyv na výdaj inzulínu, pokiaľ sú hladiny glukózy v krvi pod cieľovou hodnotou.</string>
+    <string name="isf_preferences">ISF by mala byť zadaná v nastaveniach AndroidAPS.</string>
     <string name="isf_profile">Zmena hodnoty citlivosti vo vašom profile stačí k tomu, aby se táto zmena použila.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#korekcni-faktor-citlivost-na-inzulin-isf-mmol-l-u-nebo-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Téma: Inzulínovo-sacharidový pomer</string>
-    <string name="ic_increasingvalue">Vyššie hodnoty IC vedú k menšej dávke inzulínu ku rovnakému množstvu sacharidov.</string>
-    <string name="ic_decreasingvalue">Nižšie hodnoty IC vedú k menšej dávke inzulínu ku rovnakému množstvu sacharidov.</string>
+    <string name="ic_multiple">Vo svojom profile môžete použiť viac ako jednu hodnotu I:C pomeru.</string>
+    <string name="ic_isf">Ak zmeníte ISF vo svojom profile, mali by ste vždy zmeniť aj I:C pomer.</string>
+    <string name="ic_label_exam">Inzulínosacharidový pomer (I:C)</string>
+    <string name="ic_increasingvalue">Vyššie hodnoty I:C vedú k menšej dávke inzulínu ku rovnakému množstvu sacharidov.</string>
+    <string name="ic_decreasingvalue">Nižšie hodnoty I:C vedú k menšej dávke inzulínu ku rovnakému množstvu sacharidov.</string>
     <string name="ic_noeffect">Pokiaľ máte 0 COB, zmena inzulíno-sacharidového pomeru povedie k inému množstvu inzulínu vydanému pre korekciu glykémie.</string>
     <string name="ic_different">Inzulíno-sacharidový pomer sa bude líšiť podľa toho, či počítate sacharidovú jednotku ako 10 g, alebo ako 12 g sacharidov.</string>
     <string name="ic_meaning">Inzulíno-sacharidový pomer vyjadruje: koľko sacharidových jednotiek pokryje 1 jednotka inzulínu.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#inzulino-sacharidovy-pomer-cr-g-u</string>
-    <string name="profileswitch_label">Téma: Prepínanie profilu</string>
-    <string name="profileswitch_pctwillchange">Keď v prepnutí profilu zadáte 90 %…</string>
-    <string name="profileswitch_basalhigher">Bazály budú o 10 % vyššie.</string>
+    <string name="profileswitch_label">Prepnutie profilu</string>
+    <string name="profileswitch_pctwillchange"> Keď zadáte 90% profil, ktoré odpovede sú pravdivé?</string>
     <string name="profileswitch_basallower">Bazály budú o 10 % nižšie.</string>
-    <string name="profileswitch_ichigher">Hodnota inzulíno-sacharidového pomeru bude o 10 % vyššia.</string>
-    <string name="profileswitch_iclower">Hodnota inzulíno-sacharidového pomeru bude o 10 % nižšia.</string>
     <string name="profileswitch_isfhigher">Hodnota citlivosti bude o 10 % vyššia.</string>
-    <string name="profileswitch_isflower">Hodnota citlivosti bude o 10 % nižšia.</string>
-    <string name="profileswitch_overall">Celkovo dostanete o cca. 10 % inzulínu menej.</string>
-    <string name="profileswitch_targethigher">Cieľ bude o 10 % vyšší.</string>
-    <string name="profileswitch_targetlower">Cieľ bude o 10 % nižší.</string>
-    <string name="profileswitch_targetbottom">Iba dolný cieľ bude o 10 % nižší.</string>
+    <string name="profileswitch_iclower">Hodnota pomeru I:C bude o 10% nižšia.</string>
+    <string name="profileswitch_unchanged">Hodnoty ISF a I:C budú nezmenené.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html?highlight=p%C5%99epnut%C3%AD%20profilu</string>
-    <string name="profileswitchtime_iwant">Pokiaľ sa prebudíte o 1h skôr než obvykle, ako by ste mali oznámiť AAPS túto zmenu?</string>
-    <string name="profileswitchtime_1">Urobte prepnutie profilu s posunom času 1</string>
-    <string name="profileswitchtime__1">Urobte prepnutie profilu s posunom času -1</string>
+    <string name="profileswitch2_label">Prepnutie profilu</string>
+    <string name="profileswitch2_pctwillchange"> Keď zadáte 120% profil, ktoré odpovede sú pravdivé?</string>
+    <string name="profileswitch2_bghigher">Cieľová glykémia bude o 20 % vyššia.</string>
+    <string name="profileswitch2_basalhigher">Bazály budú o 20 % vyššie.</string>
+    <string name="profileswitch2_bgunchanged">Cieľová glykémia sa nezmení.</string>
+    <string name="profileswitch2_isfhigher">Hodnota citlivosti bude o 20 % vyššia.</string>
+    <string name="profileswitchtime_label">Prepnutie profilu</string>
+    <string name="profileswitchtime_iwant">Pokiaľ sa prebudíte o 2 hodiny skôr než obvykle, ako by ste mali oznámiť AAPS túto zmenu?</string>
+    <string name="profileswitchtime_2">Urobte prepnutie profilu s posunom času 2</string>
+    <string name="profileswitchtime__2">Urobte prepnutie profilu s posunom času -2</string>
+    <string name="profileswitchtime_tt">Nastavte dočasný cieľ pre blížiace sa jedlo.</string>
+    <string name="profileswitchtime_100">Prepnúť profil na viac ako 100 %.</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html#posun-casu</string>
-    <string name="profileswitchtime_60">Urobte prepnutie profilu s posunom času 60</string>
-    <string name="profileswitchtime__60">Urobte prepnutie profilu s posunom času -60</string>
+    <string name="profileswitch4_label">Zmeny profilov</string>
+    <string name="profileswitch4_rates">V profiloch by mali byť nastavené bazálne dávky, ISF, I:C pomery, atď.</string>
+    <string name="profileswitch4_internet">Aktivácia zmien vašeho profilu Nightscout vyžaduje, aby váš telefón s AndroidAPS mal k dispozícii pripojenie k internetu.</string>
+    <string name="profileswitch4_sufficient">Úprava profilov za účelom zmeny hodnôt je dostatočná k vykonaniu všetkých urobených zmien.</string>
+    <string name="profileswitch4_multi">Je možné nastaviť a vybrať z viacerých profilov za účelom prispôsobenia sa meniacim sa okolnostiam (napr. hormonálne zmeny, práca na smeny, pracovné dni/životný štýl cez víkend).</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Module/module.html#spravny-individualni-algoritmus-davkovani-pro-lecbu-vaseho-diabetu</string>
-    <string name="basalhelp_label">Téma: Pomoc s bazálmi</string>
+    <string name="basalhelp_label">Pomoc s bazálmi</string>
     <string name="basalhelp_where">Kam ísť pre pomoc s bazálmi a pod.</string>
     <string name="basalhelp_diabetesteam">K Vášmu lekárovi</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Iné Lieky</string>
+    <string name="other_medication_label">Ostatné lieky. Prečítajte si prosím nižšie uvedené prehlásenie a potom zaškrtnite políčko pre prijatie prehlásenia.</string>
     <string name="other_medication_text">AAPS znižuje bazály na zvýšenie hladiny cukru v krvi. Lieky zo skupiny inhibítorov SGLT2 (gliflozíny) môžu zabrániť očakávanému zvýšeniu hodnoty glykémie a tak môžu produkovať nebezpečný nedostatok inzulínu (ketoacidózu).
-\nSpoločné značky sú: Invokana ®, Forxiga ®, Jardiance ®, Steglatro ®, Suglat ®, Apleway ®, Deberza ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\n. Týmto sľubujem, že tieto lieky neberiem pri používaní AAPS, alebo deaktivujem uzavretý okruh pred užívaním týchto liekov.</string>
+\nBežné značky sú: Invokana ®, Forxiga ®, Jardiance ®, Steglatro ®, Suglat ®, Apleway ®, Deberza ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\n. Týmto sľubujem, že tieto lieky neberiem pri používaní AAPS, alebo deaktivujem uzavretý okruh pred užívaním týchto liekov.</string>
 </resources>

app/src/main/res/values-sk-rSK/objectives.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="objectives_button_start">Začiatok</string>
-    <string name="objectives_button_verify">Overenie</string>
+    <string name="objectives_button_verify">Kontrola</string>
     <string name="nth_objective">%1$d. Cieľ</string>
     <string name="objectivenotstarted">Výukový cieľ %1$d nespustený</string>
     <string name="objectivenotfinished">Výukový cieľ %1$d nedokončený</string>
@@ -40,7 +40,7 @@
     <string name="codeaccepted">Kód akceptovaný</string>
     <string name="codeinvalid">Neplatný kód</string>
     <string name="objectives_exam_objective">Preukážte svoje znalosti</string>
-    <string name="objectives_exam_gate">Preštudujte a správne odpovedajte na otázky</string>
+    <string name="objectives_exam_gate">Preštudujte si otázky. Dostali ste štyri možné odpovede na každú otázku. Môže existovať viac ako jedna správna odpoveď. Zaškrtnite všetky správne odpovede a potvrďte voľbou KONTROLA.</string>
     <string name="answerdisabledto">Odpovedanie zakázané do: %1$s</string>
     <string name="wronganswer">Nesprávna odpoveď!</string>
     <string name="unfinshed_button">Ďalšia nedokončená</string>

app/src/main/res/values-sk-rSK/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Bezpečnosť zadania ošetrenia</string>
     <string name="treatmentssafety_maxbolus_title">Maximálny povolený bolus [JI]</string>
     <string name="treatmentssafety_maxcarbs_title">Maximálne povolené množstvo sacharidov [g]</string>
+    <string name="nav_preferences_plugin">Nastavenie pluginu %1$s</string>
     <string name="nav_preferences">Nastavenia</string>
     <string name="nav_refreshtreatments">Obnoviť ošetrenia z NS</string>
     <string name="nav_resetdb">Vymaž databázu</string>
@@ -405,11 +406,18 @@
     <string name="suspendloopfor3h">Pozastaviť uzavretý okruh na 3 h</string>
     <string name="suspendloopfor10h">Pozastaviť uzavretý okruh na 10 h</string>
     <string name="suspendloopforXmin">Pozastaviť uzavretý okruh na %1$d min</string>
+    <string name="disconnectpump">Odpojenie pumpy</string>
     <string name="disconnectpumpfor15m">Odpojiť pumpu na 15 min</string>
     <string name="disconnectpumpfor30m">Odpojiť pumpu na 30 min</string>
     <string name="disconnectpumpfor1h">Odpojiť pumpu na 1 h</string>
     <string name="disconnectpumpfor2h">Odpojiť pumpu na 2 h</string>
     <string name="disconnectpumpfor3h">Odpojiť pumpu na 3 h</string>
+    <string name="duration15m">15 minút</string>
+    <string name="duration30m">30 minút</string>
+    <string name="duration1h">1 hodina</string>
+    <string name="duration2h">2 hodiny</string>
+    <string name="duration3h">3 hodiny</string>
+    <string name="duration10h">10 hodiny</string>
     <string name="resume">Pokračovať</string>
     <string name="reconnect">Znovu pripojiť pumpu</string>
     <string name="smscommunicator_wrongduration">Nesprávna doba trvania</string>
@@ -564,8 +572,6 @@
     <string name="overview_editquickwizard_usebasaliob">Výpočet bazálneho IOB</string>
     <string name="overview_editquickwizard_usetrend">Výpočet trendu</string>
     <string name="overview_editquickwizard_usesuperbolus">Výpočet superbolusu</string>
-    <string name="yes">Áno</string>
-    <string name="no">Nie</string>
     <string name="positiveonly">Iba kladné</string>
     <string name="negativeonly">Iba záporné</string>
     <string name="overview_editquickwizard_usecob">Výpočet COB</string>
@@ -612,8 +618,6 @@
     <string name="combo_reservoir_level_insufficient_for_bolus">Nedostatok inzulínu v zásobníku pre takýto bolus</string>
     <string name="extendedbolusdeliveryerror">Chyba pri podávaní predĺženého bolusu</string>
     <string name="insightpump_shortname">Sight</string>
-    <string name="set_neutral_temps_title">Nastaviť neutrálny dočasný bazál</string>
-    <string name="set_neutral_temps_summary">Ak je povolená táto možnosť, zastaví sa dočasný bazál pred koncom každej hodiny. To môže u niektorých púmp pomôcť zastaviť pípanie/vibrácie na celú hodinu.</string>
     <string name="enablesmbalways">Vždy povoliť SMB</string>
     <string name="enablesmbalways_summary">Povoliť SMB nezávisle na bolusoch. Možno iba zo zdrojom glykémií s dobrým filtrovaním dát, ako napr. G5</string>
     <string name="enablesmbaftercarbs">Povoliť SMB po jedle</string>
@@ -762,8 +766,8 @@
     <string name="diawarning">Prosím, zapamätajte si: Nové inzulínové profily vyžadujú DIA minimálne 5h. DIA 5-6 hodín zodpovedá zhruba nastaveniam 3h na starších typoch profilu.</string>
     <string name="setupwizard_profile_description">Vyberte zdroj profilov. Pokiaľ ide o dieťa, využijete pravdepodobne NS profil. Pokiaľ Vás nikto cez NS nesleduje, budete pravdepodobne preferovať lokálny profil. Uvedomte si, že nastavujete iba zdroj profilov. Na to aby se naozaj profil začal používať, je potrebné vykonať aktiváciu profilu použitím funkcie \"Prepnutie profilu\"</string>
     <string name="setupwizard_aps_description">Vyberte jeden z algoritmov. Sú zoradené od najstaršieho po najnovší. Novší je obvykle lepší a agresívnejší, ale vyžaduje presnejšie nastavenie. Preto pokiaľ s uzavretým okruhom začínate, mali by ste najskôr vybrať jen AMA a nie ten posledný. Nezabudnite si prečítať dokumentáciu k OpenAPS a prejsť nastavenia, kým ho začnete používať.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Čakám na pripojenie RileyLink…\n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b>Poznámka:</b> Po inicializácii pumpy môžete pokračovať v nastavení.\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Prosím nakonfigurujte svoj RileyLink nižšie. Po výbere RileyLinku bude možné pokračovať v nastavení, akonáhle je stav RileyLinku \"Pripojené\". Táto akcia môže chvíľku trvať.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Poznámka:</b> Po nastavení pumpy môžete pokračovať v nastavení.\n</string>
     <string name="startobjective">Spusťte prvý cieľ</string>
     <string name="permission">Povolenie</string>
     <string name="askforpermission">Vyžiadať si povolenie</string>
@@ -790,7 +794,6 @@
     <string name="sensitivity_raises_target_title">Citlivosť zvyšuje cieľ</string>
     <string name="sensitivity_raises_target_summary">Ak je zistená vyššia citlivosť, zvýši cieľovú hladinu glykémie</string>
     <string name="combo_invalid_setup">Chybné nastavenie pumpy. Prejdite si dokumentáciu a presvedčte sa, že menu Quick Info se nazýva QUICK INFO, s použitím 360° Configuration Software.</string>
-    <string name="custom">Voliteľný</string>
     <string name="careportal_removestartedevents">Vymazať udalosti \"AndroidAPS reštartovaný\"</string>
     <string name="storedsettingsfound">Nájdené uložené nastavenia</string>
     <string name="allow_hardware_pump_text">POZOR: Pokiaľ aktivujete a pripojíte skutočnú pumpu, AndroidAPS nakopíruje (a bude udržiavať) nastavenie bazálu z aktívneho profilu do pumpy. Nastavenie bazálu v pumpe bude prepísané. Pokiaľ si nieste istí, alebo nechcete prepísať bazály v pumpe, stlačte Zrušiť a opakujte prepnutie na inú pumpu neskôr.</string>
@@ -978,7 +981,9 @@
     <string name="description_source_dexcom">Prijímaj hodnoty glykémie z upravenej Dexcom aplikácie.</string>
     <string name="notification">Notifikácia</string>
     <string name="notification_message">Notifikácia: %1$s</string>
+    <string name="alarm_message">Výstraha: %1$s</string>
     <string name="message_short">Spr:</string>
+    <string name="alarm_short">Alarm:</string>
     <string name="profilepercentage">Percentuálny profil</string>
     <string name="percent_u">Percentá [%]:</string>
     <string name="startprofile">Začiatok profilu %1$d%% na %2$d min</string>
@@ -1180,4 +1185,15 @@
     <string name="filter">Filter</string>
     <string name="copytolocalprofile_invalid">Nie je možné vytvoriť lokálny profil. Profil je neplatný.</string>
     <string name="cta_dont_kill_my_app_info">Nepotláčať moju aplikáciu?</string>
+    <string name="alarm">Alarm</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Odoslať SMS, pokiaľ pumpa nie je dostupná</string>
+    <string name="smscommunicator_pump_ureachable">Nahlásiť nedostupnú pumpu</string>
+    <string name="advisoralarm">Spustiť výstrahu, keď je čas na jedlo</string>
+    <string name="alarminxmin">Spustiť výstrahu za %1$d min</string>
+    <string name="bolusadvisor">Bolusový poradca</string>
+    <string name="bolusadvisormessage">Máte vysokú glykémiu. Namiesto jedla doporučujeme počkať na lepšiu glykémiu a pripomenúť, keď bude čas na jedlo. Prajete si poslať korekčný bolus a pripomenúť, keď bude čas na jedlo? V tomto prípade nebudú zapísané žiadne sacharidy, a neskôr musíte opäť spustiť kalkulačku, akonáhle vám to pripomenieme.</string>
+    <string name="enablebolusadvisor">Povoliť bolusového poradcu</string>
+    <string name="enablebolusadvisor_summary">Pri vysokej glykémii spustiť pripomienku na jedlo namiesto kalkulačky</string>
+    <string name="time_to_eat">Čas na jedlo!\nSpustite Bolusovú kalkulačku a urobte výpočet znova.</string>
+    <string name="timetoeat">Čas na jedlo</string>
 </resources>

app/src/main/res/values-sv-rSE/exam.xml

@@ -1,168 +1,216 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Vad är sant om DIA?</string>
-    <string name="dia_label_exam">Ämne: Insulinduration</string>
-    <string name="dia_minimumis3h">Minimivärdet är 3 timmar.</string>
-    <string name="dia_minimumis5h">Minimivärdet är 5 timmar.</string>
+    <string name="dia_label_exam">Insulinduration (DIA)</string>
+    <string name="dia_profile">Du bör ange värdet för DIA i din profil.</string>
+    <string name="dia_minimumis5h">Det minsta tillåtna värdet är 5 timmar.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">Det är samma som värdet Insulinduration som används i pumpen.</string>
-    <string name="dia_valuemustbedetermined">Du måste bestämma ditt individuella värde (men inte mindre än 5 timmar).</string>
-    <string name="hypott_label">Ämne: \"Hypo\" temp mål</string>
-    <string name="hypott_whenhypott">Vad är främsta skälet till att sätta ett \"hypo\" temp mål?</string>
-    <string name="hypott_goinglow">För att förhindra BG från att gå lågt om du redan har en nolltemp igång.</string>
-    <string name="hypott_preventoversmb">För att förhindra att AAPS tillför för mycket insulin efter en BG-höjning orsakad av snabbverkande kolhydrater som använts för att behandla ett lågt BG.</string>
+    <string name="dia_meaningisequaltodiapump">Om du tycker att värdet för DIA som du använde i din pump före AndroidAPS fungerade väl, behöver du inte ändra det här när du börjar looping.</string>
+    <string name="dia_valuemustbedetermined">Du bör själv fastställa det lämpliga värdet för DIA.</string>
+    <string name="hypott_label">Hypo tempmål</string>
+    <string name="hypott_whenhypott">Vad är huvudskälet till att ange ett hypo tempmål?</string>
+    <string name="hypott_wrongbasal">För att korrigera känningar som orsakas av felaktiga basalinställningar.</string>
+    <string name="hypott_preventoversmb">För att förhindra att AndroidAPS överkorrigerar för de snabbverkande kolhydraterna som används för att behandla en insulinkänning.</string>
+    <string name="hypott_exercise">För att korrigera för en känning om ett resultat av motion.</string>
+    <string name="hypott_0basal">För att förhindra att blodsockret blir lågt även om basaldosen redan är 0%.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Vilken profiltyp kan användas och konfigureras offline?</string>
     <string name="offlineprofile_label">Ämne: Offlineprofil</string>
     <string name="offlineprofile_nsprofile">NS-profil kan användas, men inte konfigureras.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Ämne: Koppla från pumpen</string>
-    <string name="pumpdisconnect_letknow">Klicka på \"Koppla loss pump\" så att AAPS vet att inget insulin levereras.</string>
-    <string name="pumpdisconnect_suspend">Klicka på \"pausa loopen\" så att AAPS slutar att loopa medan pumpen inte är ansluten.</string>
-    <string name="pumpdisconnect_dontchnage">Ändra inte på någonting i AAPS, koppla bara bort pumpen.</string>
+    <string name="pumpdisconnect_label">Skäl för att använda \"Koppla bort pump\" i AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">Vad bör göras när pumpen kopplas bort?</string>
+    <string name="pumpdisconnect_unnecessary">Detta är onödigt eftersom insulin ändå inte kommer levereras om pumpen är fysiskt bortkopplad.</string>
+    <string name="pumpdisconnect_missinginsulin">Det hjälper AndroidAPS att förstå att inget insulin levereras medan pumpen är fysiskt bortkopplad. </string>
+    <string name="pumpdisconnect_notstop">Insulinleveransen kommer inte att stoppas om pumpen fortsätter vara ansluten.</string>
+    <string name="pumpdisconnect_openloop">Det kommer att ställa AndroidAPS i open loop-läge.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Ämne: AndroidAPS inställningar</string>
-    <string name="objectives_howtosave">Vad är bästa praxis för att säkerhetskopiera dina inställningar?</string>
-    <string name="objectives_exportsettings">Lokalt exportera dem från underhållsmenyn.</string>
-    <string name="objectives_storeelsewhere">Spara den exporterade filen till ett annat ställe som e-post, Dropbox, Google Drive…</string>
-    <string name="objectives_doexportonstart">Exportera dem direkt efter installationen av AAPS.</string>
-    <string name="objectives_doexportafterchange">Exportera dem efter att gjort ändringar i inställningarna.</string>
-    <string name="objectives_doexportafterobjective">Exportera dem efter att ha slutfört ett mål.</string>
-    <string name="objectives_doexportafterfirtssettings">Exportera dem när du är klar med initiala inställningar.</string>
+    <string name="objectives_label">Inställningar för AndroidAPS</string>
+    <string name="objectives2_label">Inställningar för AndroidAPS</string>
+    <string name="objectives_howtosave">Vilka är de rekommenderade metoderna för att säkerhetskopiera dina inställningar?</string>
+    <string name="objectives_notesettings">Du behöver inte exportera dina inställningar om du antecknar dem.</string>
+    <string name="objectives_afterobjective">Exportera dina inställningar när du har slutfört ett mål.</string>
+    <string name="objectives_afterchange">Exportera dina inställningar efter att ha ändrat någon av dina inställningar.</string>
+    <string name="objectives_afterinitialsetup">Exportera dina inställningar när du har slutfört grundinstallationen och har justerat dina inställningar.</string>
+    <string name="objectives2_maintenance">Exportera dina inställningar lokalt med hjälp av underhållsmenyn.</string>
+    <string name="objectives2_internalstorage">Din inställningsfil finns i mappen Internt lagringsutrymme/AAPS/preferences på telefonen.</string>
+    <string name="objectives2_cloud">Kopiera din inställningsfilen till en säker plats utanför din telefon (t.ex. genom att använda molnlagring, ansluta med en kabel till datorn, e-post, etc.)</string>
+    <string name="objectives2_easyrestore">Om telefonen är skadad eller borttappad finns det enkla sätt att återställa dina inställningar utan säkerhetskopia.</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">Ämne: Brusiga CGM-avläsningar</string>
+    <string name="noisycgm_label">Brusiga CGM-värden</string>
     <string name="noisycgm_whattodo">Vad bör göras om CGM-datat är brusigt?</string>
-    <string name="nothing">Inget, AAPS tar hand om det.</string>
-    <string name="noisycgm_pause">Inaktivera loopen för att undvika överdosering.</string>
-    <string name="noisycgm_replacesensor">Byt CGM-sensor.</string>
-    <string name="noisycgm_turnoffphone">Stäng av telefonen.</string>
+    <string name="noisycgm_nothing">Gör inget-AndroidAPS tar hand om det.</string>
+    <string name="noisycgm_pause">Inaktivera closed loop-läge för att undvika över- eller underdosering.</string>
+    <string name="noisycgm_replacesensor">Byt ut brusiga eller felaktiga sensorer.</string>
+    <string name="noisycgm_checksmoothing">Kontrollera att din CGM-app ger utjämnade data.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">Kontrollera att CGM-appen jämnar ut BG-data.</string>
-    <string name="exercise_label">Ämne: Träning</string>
-    <string name="exercise_whattodo">Hur kan du hjälpa systemet att hantera fysisk aktivitet?</string>
-    <string name="exercise_setactivitytt">Användning av funktionen för temp mål.</string>
-    <string name="exercise_switchprofilebelow100">Gör ett profilbyte med mindre än 100%.</string>
-    <string name="exercise_switchprofileabove100">Gör ett profilbyte med mer än 100%.</string>
-    <string name="exercise_stoploop">Pausa loopen.</string>
-    <string name="exercise_doitbeforestart">Ange ett \"aktivitet\" temp mål innan du börjar träna.</string>
-    <string name="exercise_afterstart">Att ställa in ett \"aktivitet\" temp mål efter träning leder till sämre resultat än om du börjar innan.</string>
+    <string name="exerciseprofile_label">Träning och profiler</string>
+    <string name="exerciseprofile_whattodo">Hur kan du använda profiler för att bäst hjälpa systemet att hantera aerobisk träning?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Gör ett profilbyte till mindre än 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Gör ett profilbyte till mer än 100%. </string>
+    <string name="exerciseprofile_leaveat100">Lämna profilen på 100%.</string>
+    <string name="exerciseprofile_suspendloop">Pausa loopen.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">Träning och tillfälliga mål</string>
+    <string name="exercise_whattodo">Hur kan man använda tillfälliga mål för att på bästa sätt hjälpa systemet att hantera aerobisk träning?</string>
+    <string name="exercise_settt">Ställ in temp mål för Träning vid en lämplig tidpunkt innan motionen påbörjas.</string>
+    <string name="exercise_setfinished">Ställ in temp mål för Träning efter avslutad träning.</string>
+    <string name="exercise_setunchanged">Lämna ditt målvärde oförändrat.</string>
+    <string name="exercise_15g">Vänta tills blodglukosnivån sjunker under ditt Hypo temp mål och sen äter du 15 g av snabbverkande kolhydrater.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">Ämne: Avstängd / pausad loop</string>
+    <string name="suspendloop_label">Inaktiverad/pausad loop</string>
     <string name="suspendloop_doigetinsulin">Får jag insulin när loopen är avstängd eller pausad?</string>
     <string name="suspendloop_yes">Ja. Basalinsulin fortsätter att levereras.</string>
     <string name="suspendloop_no">Nej, leverans av insulin är stoppad.</string>
-    <string name="basaltest_label">Ämne: Basal, ISF, och IC-testning</string>
-    <string name="basaltest_when">När ska jag validera basaler, ISF-och IC-värden?</string>
-    <string name="basaltest_beforeloop">Innan jag börjar loopa.</string>
-    <string name="basaltest_havingregularhypo">Om du upplever låga värden ofta.</string>
-    <string name="basaltest_havingregularhyper">Om du upplever höga värden ofta.</string>
+    <string name="basaltest_label">Test av basaldoser, ISF och KH-kvot</string>
+    <string name="basaltest_when">När ska dessa värden testas?</string>
+    <string name="basaltest_beforeloop">Innan loopning påbörjas.</string>
+    <string name="basaltest_havingregularhighlow">När du upplever frekvent högt eller lågt blodsocker.</string>
+    <string name="basaltest_weekly">Minst en gång i veckan.</string>
+    <string name="basaltest_fixed">När du väl har ställt in och validerat dessa värden bör dessa värden inte ändras över tiden.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Ämne: Krav innan start</string>
-    <string name="prerequisites_what">Vad behöver jag?</string>
+    <string name="prerequisites_label">Förutsättningar</string>
+    <string name="prerequisites_what">Vad är nödvändigt för att installera och använda AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Validerad profilinformation (Basal, IC, ISF, DIA).</string>
-    <string name="prerequisites_computer">En dator för att skapa en APK.</string>
+    <string name="prerequisites_computer">En dator med Android Studio installerad och konfigurerad.</string>
     <string name="prerequisites_phone">En telefon som stöds.</string>
-    <string name="prerequisites_car">En bil.</string>
-    <string name="prerequisites_nightscout">Nightscout för att klara målen.</string>
+    <string name="prerequisites_pump">En kompatibel insulinpump om du planerar att köra closed loop.</string>
+    <string name="prerequisites_nightscout">Nightscout, för att logga allt data och få en överblick över inställningar.</string>
     <string name="prerequisites_tidepoolaccount">Ett Tidepool-konto.</string>
     <string name="prerequisites_googleaccount">Ett Google-konto.</string>
     <string name="prerequisites_githubaccount">Ett Github-konto.</string>
-    <string name="prerequisites_beanandroiddeveloper">Erfarenhet av Android-utveckling.</string>
+    <string name="prerequisites_beanandroiddeveloper">Erfarenhet av programmering eller redigering av kod.</string>
     <string name="prerequisites_own670g">En MiniMed 670G pump.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">En smart klocka.</string>
     <string name="prerequisites_supportedcgm">En CGM som stöds.</string>
-    <string name="update_label">Ämne: Uppdatering av AndroidAPS</string>
-    <string name="whatistrue">Vad är sant?</string>
-    <string name="update_git">Du måste ha Git installerat.</string>
-    <string name="update_asap">Uppdatera så snart den nya versionen har släppts och har tillräckligt med tid för att göra det.</string>
-    <string name="update_keys">Du bör använda samma signeringsnycklar.</string>
+    <string name="prerequisites2_label">Förutsättningar</string>
+    <string name="prerequisites2_what">Vad är nödvändigt för att installera och använda AndroidAPS?</string>
+    <string name="prerequisites2_profile">Validerad information för att konfigurera en profil (ISF, KH-kvot, basaldoser, DIA osv.).</string>
+    <string name="prerequisites2_device">En kompatibel Android-enhet (t.ex. mobiltelefon, full Android-klocka eller surfplatta).</string>
+    <string name="prerequisites2_internet">AndroidAPS kräver en Internetanslutning för att kunna köras i closed loop.</string>
+    <string name="prerequisites2_supportedcgm">En stödd CGM och lämplig app för att ta emot blodsockervärden på telefonen/enheten.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">Uppdaterar AndroidAPS</string>
+    <string name="whatistrue">Markera ett eller flera alternativ.</string>
+    <string name="update_git">Du måste ha Git installerat och konfigurerat på din dator.</string>
+    <string name="update_asap">När uppdaterade versioner av AndroidAPS släpps, kan de tidigare versionerna bli tidsbegränsade.</string>
+    <string name="update_keys">Du bör spara och notera platsen för ditt keystore och använda samma signeringsnyckel för uppdateringar som för den föregående installationen.</string>
     <string name="update_neverupdate">Uppdatera aldrig om systemet fungerar bra.</string>
-    <string name="update_askfriend">Be din vän om den nya APK-filen.</string>
+    <string name="update_askfriend">Om du har problem att bygga apk-filen, kan du installera en apk som har byggts av en vän.</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">Ämne: Felsökning</string>
-    <string name="troubleshooting_wheretoask">Var ska jag leta efter hjälp?</string>
-    <string name="troubleshooting_fb">Gå med i AndroidAPS Facebook-grupp.</string>
-    <string name="troubleshooting_wiki">Läs AndroidAPS-dokumentationen.</string>
-    <string name="troubleshooting_gitter">Besök AndroidAPS Gitter-rum.</string>
-    <string name="troubleshooting_googlesupport">Besök AndroidAPS Google-support</string>
-    <string name="troubleshooting_yourendo">Tala med din endokrinolog.</string>
+    <string name="troubleshooting_label">Felsökning</string>
+    <string name="troubleshooting_wheretoask">Var kan du leta efter hjälp med AndroidAPS?</string>
+    <string name="troubleshooting_fb">Du kan be om råd i Facebookgruppen AndroidAPS Users.</string>
+    <string name="troubleshooting_wiki">Du bör läsa (och läsa om) AndroidAPS dokumentation.</string>
+    <string name="troubleshooting_gitter">Du kan be om råd och logga tekniska problem eller problem i AndroidAPS Gitter-rum.</string>
+    <string name="troubleshooting_yourendo">Du bör fråga din diabetesklinik/endokrinolog.</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">Ämne: Insticksmoduler för insulin</string>
-    <string name="insulin_ultrarapid">Vilket insulin kan användas med insulinprofilen Ultra-Rapid-Oref?</string>
+    <string name="insulin_label">Insulininställningar</string>
+    <string name="insulin_ultrarapid">Vilket insulin ska du använda med insticksprogrammet Ultra-Rapid Oref?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid ®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog ®</string>
-    <string name="insulin_actrapid">Actrapid ®</string>
+    <string name="insulin_actrapid">Actrapid ®/Humalin R ®/\"reguljärt\" human-insulin.</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Ämne: Insticksmoduler för känslighetsavkänning</string>
-    <string name="sensitivity_which">Vilken känslighetsalgoritm har ett konfigurerbart tidsintervall?</string>
+    <string name="sensitivity_label">Insticksprogram för känslighet</string>
+    <string name="sensitivity_which">Markera ett eller flera alternativ.</string>
+    <string name="sensitivity_adjust">Insticksprogram för känslighet gör det möjligt för AndroidAPS att justera för tillfälliga förändringar i insulinkänsligheten (t. ex. hormonella förändringar eller problem med absorption vid infusionsstället).</string>
+    <string name="sensitivity_edit">Insticksprogram för känslighet ger användaren föreslagna ändringar av basaldoser, KH-kvoter och insulinkänslighetsfaktorer som kan användas för att redigera profilen.</string>
+    <string name="sensitivity_cannula">Om du loggar ett kanylbyte återställs autosens-värdet tillbaka till 100%.</string>
+    <string name="sensitivity_time">Vissa av insticksprogrammen har konfigurerbara tidsintervall som kan ställas in av användaren.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Vilken känslighetsplugin måste användas för att kunna använda UAM-funktionen?</string>
-    <string name="wrongcarbs_label">Ämne: Felaktig inmatning av kolhydrater</string>
+    <string name="wrongcarbs_label">Fel i KH-inmatning</string>
     <string name="wrongcarbs_whattodo">Vad ska du göra om du har gjort en felaktig inmatning?</string>
-    <string name="wrongcarbs_treatmentstab">I Behandlingar, ta bort den felaktiga posten. Ange nya kolhydrater.</string>
-    <string name="wrongcarbs_addfakeinsulin">Lägg till en falsk bolus genom att använda påfyllningsfunktionen</string>
-    <string name="extendedcarbs_label">Ämne: Mat med fett och protein</string>
-    <string name="extendedcarbs_handling">Vad ska du göra om din mat innehåller en stor mängd fett och/eller proteiner?</string>
-    <string name="extendedcarbs_useextendedcarbs">Räkna fett och proteiner till kolhydrater och använda eCarbs-funktionen.</string>
-    <string name="extendedcarbs_add">Räkna om fett och proteiner till kolhydrater och lägga till det i bolusberäkningen.</string>
-    <string name="extendedcarbs_useextendedbolus">Använd förlängd bolus för att täcka fett och protein.</string>
+    <string name="wrongcarbs_treatmentstab">Ta bort den felaktiga posten i Behandlingar och ange rätt kolhydratmängd.</string>
+    <string name="wrongcarbs_addinsulin">Ge bolus med insulin med hjälp av förfyllningsmenyn för infusionssetet.</string>
+    <string name="wrongcarbs_donothing">Gör inget - AndroidAPS kommer att göra lämpliga justeringar.</string>
+    <string name="wrongcarbs_bolus">Ge bolus med hjälp av knappen Insulin på hem/översiktssidan.</string>
+    <string name="wronginsulin_label">Fel i bolusinmatning</string>
+    <string name="wronginsulin_whattodo">Vad ska du göra om du fått mindre insulin än vad pumpens historik visar, t.ex. på grund av en ocklusion, en felaktig kanyl eller om du glömt att sätta fast pumpen efter en dusch? </string>
+    <string name="wronginsulin_careportal">Ta bort insulindata från Nightscout för att ta bort den från pumpens historik.</string>
+    <string name="wronginsulin_compare">Jämför värden i AndroidAPS och pumphistoriken.</string>
+    <string name="wronginsulin_prime">Ge en bolus med en del av det insulin du saknar antingen med penna eller genom att använda förfyllningsfunktionen.</string>
+    <string name="wronginsulin_donothing">Gör ingenting och låt AndroidAPS korrigera eventuella höga blodglukosnivåer.</string>
+    <string name="iob_label">Aktivt Insulin (IOB)</string>
+    <string name="iob_which">Markera ett eller flera alternativ.</string>
+    <string name="iob_value">IOB-värdet påverkas av temp basaler.</string>
+    <string name="iob_hightemp">Hög temp basal kommer inte att ges när ditt BG-värde är under målet.</string>
+    <string name="iob_negiob">Negativ IOB under en längre period även om du inte motionerat, tyder på att din profil ger för mycket insulin.</string>
+    <string name="iob_posiob">Positiv IOB under en längre period tyder på insulinresistens eller oannonserade måltider (UAM).</string>
+    <string name="breadgrams_label">Kolhydrater och bolus</string>
+    <string name="breadgrams_grams">Endast gram får användas för att uppskatta och registrera kolhydrater som konsumeras.</string>
+    <string name="breadgrams_exchange">Kolhydrater som konsumeras kan registreras med hjälp av ett lämpligt utbytessystem (t.ex. DAFNE \"CHO\" eller europeiska \"Brödenheter\").</string>
+    <string name="breadgrams_decay">AndroidAPS använder en dynamisk modell för att uppskatta kolhydratsupptag och beräkna COB.</string>
+    <string name="breadgrams_calc">Om blodglukosnivån ligger utanför normala värden (för lågt eller för högt) kan boluskalkylatorn användas för att ge förslag om KH- eller insulinkorrektioner.</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">e-carbs</string>
+    <string name="extendedcarbs_handling">Vad kan du använda e-carbs (förlängda kolhydrater) till?</string>
+    <string name="extendedcarbs_future">För att schemalägga framtida kolhydrater och/eller fördela över ett intervall (likt en förlängd bolus fördelar insulin över ett intervall).</string>
+    <string name="extendedcarbs_free">För att logga \"fria\" motionskolhydrater som du vill dölja för AndroidAPS.</string>
+    <string name="extendedcarbs_fat">E-carbs sparade i framtiden kan hjälpa AndroidAPS att hantera måltider som är fett- och/eller proteinrika.</string>
+    <string name="extendedcarbs_rescue">För att logga kolhydrater som getts för att korrigera ett lågt Bg-värde. </string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Ämne: Fjärrövervakning</string>
-    <string name="nsclient_howcanyou">Hur kan du övervaka AAPS för ditt barn på distans?</string>
-    <string name="nsclient_nightscout">Med hjälp av en Nightscout webbplats.</string>
-    <string name="nsclient_dexcomfollow">Appen Dexcom Follow om du använder Dexcoms app (endast BG).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow om du använder xDrip på barnets mobil.</string>
-    <string name="nsclient_xdripfollower">xDrip i följarläge.</string>
-    <string name="nsclient_looponiphone">Appen Loop för iPhone.</string>
-    <string name="nsclient_spikeiphone">Appen Spike för iPhone.</string>
+    <string name="nsclient_label">Fjärrövervakning</string>
+    <string name="nsclient_howcanyou">Hur kan du övervaka AndroidAPS (till exempel för ditt barn) på distans?</string>
+    <string name="nsclient_nightscout">NS Client-appen, Nightscout-app och webbsidan för Nightscout tillåter att du följer AndroidAPS på distans.</string>
+    <string name="nsclient_dexcomfollow">Andra appar (t.ex. Dexcom Follow, xDrip i följarläge) gör att du kan följa vissa parametrar (t.ex. BG-värden) men använder andra algoritmer så IOB och COB kanske inte överenstämmer.</string>
+    <string name="nsclient_data">För att följa AndroidAPS måste båda enheterna ha Internetåtkomst (via WiFi eller mobildata).</string>
+    <string name="nsclient_fullcontrol">NS Client som används som följare kommer både kunna övervaka och ge full kontroll över AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Ämne: Insulinkänslighetsfaktor (ISF)</string>
-    <string name="isf_increasingvalue">Högre ISF-värden leder till mindre insulintillförsel när AAPS korrigerar för högt BG.</string>
-    <string name="isf_decreasingvalue">Lägre ISF-värden leder till mindre insulintillförsel när AAPS korrigerar för högt BG.</string>
-    <string name="isf_noeffect">Ändringar av ISF-värden påverkar inte det insulin som levereras när AAPS korrigerar för högt BG.</string>
-    <string name="isf_preferences">Du måste ange ISF i Inställningar.</string>
+    <string name="isf_label_exam">Insulinkänslighetsfaktor (ISF)</string>
+    <string name="isf_increasingvalue">Högre ISF-värden kommer att leda till mer insulin för att täcka en viss mängd kolhydrater.</string>
+    <string name="isf_decreasingvalue">Lägre ISF-värden kommer att leda till mer insulin för att korrigera högt blodsocker.</string>
+    <string name="isf_noeffect">Att höja eller sänka ISF har ingen effekt på insulinleveransen när blodglukosnivån är lägre än målet.</string>
+    <string name="isf_preferences">ISF bör anges i dina AndroidAPS-inställningar.</string>
     <string name="isf_profile">Om du ändrar ISF-värdet i din profil är det tillräckligt för att tillämpa ändringen.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Ämne: KH-kvot</string>
-    <string name="ic_increasingvalue">Högre IC-kvot leder till mindre insulin som levereras för en given mängd kolhydrater.</string>
-    <string name="ic_decreasingvalue">Lägre IC-kvot leder till mindre insulin som levereras för en given mängd kolhydrater.</string>
+    <string name="ic_multiple">Du kan använda mer än ett värde för KH-kvot i din profil.</string>
+    <string name="ic_isf">Om du ändrar din ISF-profil i din profil bör du alltid ändra din KH-kvot också.</string>
+    <string name="ic_label_exam">Insulin till kolhydratförhållandet (I:C förhållande)</string>
+    <string name="ic_increasingvalue">Högre kolhydratskvot leder till att mindre insulin levereras för en given mängd kolhydrater.</string>
+    <string name="ic_decreasingvalue">Lägre kolhydratskvot leder till att mindre insulin levereras för en given mängd kolhydrater.</string>
     <string name="ic_noeffect">Om du har 0 COB, kommer en förändring av IC-kvoten leda till en annan mängd insulin för att korrigera din BG-nivå.</string>
     <string name="ic_different">IC kommer att vara annorlunda om du räknar brödenheter (utbytesenhet) som 10g eller 12g.</string>
     <string name="ic_meaning">IC betyder: Hur många brödenheter (utbytesenheter) som omfattas av 1U insulin.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Ämne: Profilbyte</string>
-    <string name="profileswitch_pctwillchange"> När du anger 90% i profilbytet…</string>
-    <string name="profileswitch_basalhigher">kommer basalerna bli 10% högre.</string>
-    <string name="profileswitch_basallower">kommer basalerna bli 10% lägre.</string>
-    <string name="profileswitch_ichigher">kommer IC-värdet bli 10% högre.</string>
-    <string name="profileswitch_iclower">kommer IC-värdet bli 10% lägre.</string>
-    <string name="profileswitch_isfhigher">kommer ISF-värdet bli 10% högre.</string>
-    <string name="profileswitch_isflower">kommer ISF-värdet bli 10% lägre.</string>
-    <string name="profileswitch_overall">Du kommer att få cirka 10% mindre insulin totalt.</string>
-    <string name="profileswitch_targethigher">kommer målet justeras upp med 10%.</string>
-    <string name="profileswitch_targetlower">kommer målet justeras ner med 10%.</string>
-    <string name="profileswitch_targetbottom">kommer endast den nedre målgränsen bli 10% lägre.</string>
+    <string name="profileswitch_label">Profilbyte</string>
+    <string name="profileswitch_pctwillchange"> När du anger ett profilbyte till 90%, vilka svar är sanna?</string>
+    <string name="profileswitch_basallower">Basaldoserna kommer att bli 10% lägre.</string>
+    <string name="profileswitch_isfhigher">ISF kommer att bli 10% högre.</string>
+    <string name="profileswitch_iclower">KH-kvoten kommer att bli 10% lägre.</string>
+    <string name="profileswitch_unchanged">ISF och KH-kvoterna kommer att vara oförändrade.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Om du vaknar upp 1 timme tidigare än vanligt, hur ska du meddela AAPS om ändringen i ditt schema?</string>
-    <string name="profileswitchtime_1">Gör ett profilbyte med en tidsförskjutning av 1</string>
-    <string name="profileswitchtime__1">Gör ett profilbyte med en tidsförskjutning av -1</string>
+    <string name="profileswitch2_label">Profilbyte</string>
+    <string name="profileswitch2_pctwillchange"> När du anger ett profilbyte till 120%, vilka svar är sanna?</string>
+    <string name="profileswitch2_bghigher">Blodglukosmålet kommer att bli 20% högre.</string>
+    <string name="profileswitch2_basalhigher">Basaldoserna kommer att bli 20% högre.</string>
+    <string name="profileswitch2_bgunchanged">Blodglukosmålet ändras inte.</string>
+    <string name="profileswitch2_isfhigher">ISF kommer att bli 20% högre.</string>
+    <string name="profileswitchtime_label">Profilbyte</string>
+    <string name="profileswitchtime_iwant">Om du stiger upp 2 timmar tidigare än vanligt, hur kan du informera AndroidAPS om ändringen i ditt schema?</string>
+    <string name="profileswitchtime_2">Gör ett profilbyte med en tidsförskjutning av 2</string>
+    <string name="profileswitchtime__2">Gör ett profilbyte med en tidsförskjutning av -2</string>
+    <string name="profileswitchtime_tt">Sätt ett \"Äta snart\" temp mål.</string>
+    <string name="profileswitchtime_100">Gör ett profilbyte till mer än 100%. </string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Gör ett profilbyte med en tidsförskjutning av 60</string>
-    <string name="profileswitchtime__60">Gör ett profilbyte med en tidsförskjutning av -60</string>
+    <string name="profileswitch4_label">Ändringar av profiler</string>
+    <string name="profileswitch4_rates">Basaldoser, ISF, KH-kvoter och dylikt bör anges i profiler.</string>
+    <string name="profileswitch4_internet">För att aktivera ändringar i din Nightscoutprofil krävs att din AndroidAPS-telefon har Internetanslutning.</string>
+    <string name="profileswitch4_sufficient">Att redigera profiler för att ändra värden är tillräckligt för att genomföra eventuella ändringar.</string>
+    <string name="profileswitch4_multi">Flera profiler kan ställas in och väljas för att hantera förändrade omständigheter (t.ex. hormonella förändringar, skiftarbete, vardagar/helg).</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">Ämne: Hjälp med basaldoser</string>
+    <string name="basalhelp_label">Hjälp med basaldoser</string>
     <string name="basalhelp_where">Var man hittar hjälp för basaldoser m. m.</string>
     <string name="basalhelp_diabetesteam">Ditt diabetesteam</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Annan medicinering</string>
-    <string name="other_medication_text">AAPS sänker basalen för att höja glukosmängden i blodet. Mediciner av typen SGLT2-hämmare (glifloziner) kan motverka eller förhindra den väntade glukoshöjningen vilket kan leda till akut insulinbrist och ketoacidos (DKA). 
+    <string name="other_medication_label">Annan medicin. Läs nedanstående förklaring och markera sedan rutan för att acceptera deklarationen.</string>
+    <string name="other_medication_text">AAPS sänker basaldosen för att höja blodglukosvärdet. Mediciner av typen SGLT2-hämmare (glifloziner) kan motverka eller förhindra den väntade glukoshöjningen vilket kan leda till akut insulinbrist och ketoacidos (DKA). 
 \nVanliga märken som finns på marknaden: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\n
 Jag lovar härmed att inte ta sådana läkemedel medan jag använder AAPS eller kommer att pausa loopen innan jag tar dessa läkemedel.</string>
 </resources>

app/src/main/res/values-sv-rSE/objectives.xml

@@ -21,7 +21,7 @@
     <string name="objectives_smb_objective">Aktiverar ytterligare funktioner för användning dagtid, t ex SMB</string>
     <string name="objectives_auto_objective">Aktivera automatisering</string>
     <string name="objectives_smb_gate">Du måste läsa på wikin och öka max IOB för att få SMB att fungera bra. En bra start är att sätta max IOB till din genomsnittliga måltidsbolus plus 3 gånger den högsta basalen du har under ett dygn</string>
-    <string name="objectives_auto_gate">Läs dokumentationen hur automatisering fungerar. Konfigurera dina första enkla regler. I stället för att ange en åtgärd, låt bara AAPS visa en avisering. När du är säker på att automatisering utlöses vid rätt tidpunkt ersätt aviseringen med verklig åtgärd. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
+    <string name="objectives_auto_gate">Läs dokumentationen hur automatisering fungerar. Konfigurera dina första enkla regler. I stället för att ange en åtgärd, låt bara AAPS visa en avisering. När du är säker på att automatisering utlöses vid rätt tidpunkt kan du ersätta aviseringen med verklig åtgärd. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">BG är tillängligt i Nightscout</string>
     <string name="objectives_pumpstatusavailableinns">Pumpstatus tillgängligt i Nightscout</string>
     <string name="objectives_manualenacts">Manuella justeringar</string>
@@ -40,12 +40,12 @@
     <string name="codeaccepted">Koden godkänd</string>
     <string name="codeinvalid">Koden är felaktig</string>
     <string name="objectives_exam_objective">Bevisa dina kunskaper</string>
-    <string name="objectives_exam_gate">Studera och besvara frågor på rätt sätt</string>
+    <string name="objectives_exam_gate">Studera frågorna.  Ni får fyra möjliga svar på varje fråga. Det kan finnas mer än ett korrekt svar. Kontrollera alla de som är korrekta och välj Kontrollera.</string>
     <string name="answerdisabledto">Svarsfunktionen inaktiverad till: %1$s</string>
     <string name="wronganswer">Fel svar</string>
     <string name="unfinshed_button">Nästa icke slutförda</string>
     <string name="requestcode">Begärd kod: %1$s</string>
-    <string name="objectives_hint">(kontrollera alla korrekta svar)</string>
+    <string name="objectives_hint">(markera ett eller flera alternativ)</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>

app/src/main/res/values-sv-rSE/strings.xml

@@ -7,6 +7,7 @@
     <string name="treatmentssafety_title">Säkerhetsbegränsningar</string>
     <string name="treatmentssafety_maxbolus_title">Max tillåten bolus [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Max tillåtna KH [g]</string>
+    <string name="nav_preferences_plugin">Inställningar för %1$s</string>
     <string name="nav_preferences">Inställningar</string>
     <string name="nav_refreshtreatments">Uppdatera behandlingar från Nightscout</string>
     <string name="nav_resetdb">Återställ databaserna</string>
@@ -406,11 +407,18 @@ Eversense-appen.</string>
     <string name="suspendloopfor3h">Pausa loop i 3 timmar</string>
     <string name="suspendloopfor10h">Pausa loop i 10 timmar</string>
     <string name="suspendloopforXmin">Pausa loop i %1$d min</string>
+    <string name="disconnectpump">Koppla ifrån pump</string>
     <string name="disconnectpumpfor15m">Koppla loss pump i 15 min</string>
     <string name="disconnectpumpfor30m">Koppla loss pump i 30 min</string>
     <string name="disconnectpumpfor1h">Koppla loss pump i 1 timme</string>
     <string name="disconnectpumpfor2h">Koppla loss pump i 2 timmar</string>
     <string name="disconnectpumpfor3h">Koppla loss pump i 3 timmar</string>
+    <string name="duration15m">15 min</string>
+    <string name="duration30m">30 min</string>
+    <string name="duration1h">1 tim</string>
+    <string name="duration2h">2 tim</string>
+    <string name="duration3h">3 tim</string>
+    <string name="duration10h">10 tim</string>
     <string name="resume">Återuppta</string>
     <string name="reconnect">Återanslut Pump</string>
     <string name="smscommunicator_wrongduration">Fel duration</string>
@@ -565,8 +573,6 @@ Eversense-appen.</string>
     <string name="overview_editquickwizard_usebasaliob">Använd basal-IOB</string>
     <string name="overview_editquickwizard_usetrend">Använd BG-trend</string>
     <string name="overview_editquickwizard_usesuperbolus">Använd superbolus</string>
-    <string name="yes">Ja</string>
-    <string name="no">Nej</string>
     <string name="positiveonly">Endast positiva</string>
     <string name="negativeonly">Endast negativa</string>
     <string name="overview_editquickwizard_usecob">Använd COB</string>
@@ -613,8 +619,6 @@ Eversense-appen.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Inte tillräckligt med insulin i reservoaren för att ge bolus</string>
     <string name="extendedbolusdeliveryerror">Förlängd bolus misslyckad</string>
     <string name="insightpump_shortname">Sight</string>
-    <string name="set_neutral_temps_title">Sätt neutrala temp basaler</string>
-    <string name="set_neutral_temps_summary">Om aktiverad, kommer en eventuell temporär basal automatiskt avbrytas före utgången av varje timme. Denna metod kan förhindra att vissa pumpar piper/vibrerar.</string>
     <string name="enablesmbalways">Använd alltid SMB</string>
     <string name="enablesmbalways_summary">Använd alltid SMB oberoende av bolus. Endast möjligt med en bra filtrerad BG-källa, t ex Dexcom G5.</string>
     <string name="enablesmbaftercarbs">Använd SMB efter kolhydrater</string>
@@ -680,6 +684,7 @@ Eversense-appen.</string>
     <string name="combo_error_failure_reading_changed_basal_rate">Basalen ändrad i pumpen, men det gick inte att läsa till vad</string>
     <string name="combo_activity_checking_for_history_changes">Letar efter förändringar i historiken</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Flera bolusar med samma mängd insulin importerades just. Endast en kan läggas till i Careportal. Vänligen kontrollera pumpen och gör ändringar i Careportal manuellt vid behov. Observera att man bara kan ha en bolus per klockslag.</string>
+    <string name="about_link_urls">\n\ndokumentation:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <string name="combo_check_date">Den senaste bolusen är äldre än 24 timmar eller i framtiden. Vänligen kontrollera tid och datum i pumpen.</string>
     <string name="combo_suspious_bolus_time">Tid/datum för bolusen verkar fel. IOB är troligen missvisande. Vänligen kontrollera tid och datum i pumpen.</string>
     <string name="profileswitch_ismissing">Profilbyte saknas. Vänligen gör ett profilbyte eller tryck Aktivera profil under Lokal Profil.</string>
@@ -762,8 +767,8 @@ Eversense-appen.</string>
     <string name="diawarning">Kom ihåg: De nya insulinprofilerna kräver en duration (DIA) på minst 5 timmar. En DIA på 5-6 timmar enligt de nya profilerna är ungefär lika med DIA 3 timmar enligt de gamla insulinprofilerna.</string>
     <string name="setupwizard_profile_description">Vänligen välj källa för profil. Om patienten är ett barn bör du använda NS profil. Om ingen följer dig på Nightscout kommer du förmodligen föredra lokal profil. Kom ihåg att du endast väljer profilkälla här. För att använda den måste du aktivera den genom att köra ”Byt Profil”</string>
     <string name="setupwizard_aps_description">Välj en av dessa algoritmer. De sorteras från den äldsta till nyaste. Nyare algoritm är oftast mer kraftfull och mer aggressiv. Om du är ny som loopanvändare vill du förmodligen börja med AMA och inte med senaste. Glöm inte att läsa dokumentationen om OpenAPS och konfigurera algoritmen innan användning.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Väntar på Riley Link-anslutning...\n</string>
-    <string name="setupwizard_pump_pump_not_initialized">Du kan fortsätta installationen först när pumpen har initierats.\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Konfigurera din Riley Link nedan. När du har valt en Riley Link kan du fortsätta installationen när status är \"Ansluten\". Det här kan ta en minut.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized">Du kan fortsätta installationen först när pumpen har konfigurerats.\n</string>
     <string name="startobjective">Påbörja ditt första mål</string>
     <string name="permission">Behörighet</string>
     <string name="askforpermission">Be om behörighet</string>
@@ -790,7 +795,6 @@ Eversense-appen.</string>
     <string name="sensitivity_raises_target_title">Insulinkänslighet höjer mål-BG</string>
     <string name="sensitivity_raises_target_summary">Om systemet upptäcker tillfällig insulinkänslighet, höj mål-BG för att på så sätt minska insulindoseringen</string>
     <string name="combo_invalid_setup">Felaktig pumpinstallation. Kontrollera dokumentationen och verifiera att Snabbmenyn heter QUICK INFO med hjälp av 360-mjukvaran.</string>
-    <string name="custom">Anpassad</string>
     <string name="careportal_removestartedevents">Rensa alla \"AndroidAPS startad\"</string>
     <string name="storedsettingsfound">Tidigare sparade inställningar hittade</string>
     <string name="allow_hardware_pump_text">Varning: Om du aktiverar och ansluter en pump, kommer AndroidAPS skriva över pumpens basalprofil med den aktiva profilen i AndroidAPS. Se till att ha rätt inställningar i appen innan du ansluter. Om du är osäker, tryck på Avbryt och anslut pumpen på nytt vid ett senare tillfälle.</string>
@@ -978,7 +982,9 @@ Eversense-appen.</string>
     <string name="description_source_dexcom">Ta emot BG-data från den modifierade Dexcom-appen.</string>
     <string name="notification">Avisering</string>
     <string name="notification_message">Avisering: %1$s</string>
+    <string name="alarm_message">Larm: %1$s</string>
     <string name="message_short">Medd:</string>
+    <string name="alarm_short">Larm:</string>
     <string name="profilepercentage">Procent av profil</string>
     <string name="percent_u">Procent [%]:</string>
     <string name="startprofile">Byt till profil %1$d%% i %2$d min</string>
@@ -1177,4 +1183,18 @@ Eversense-appen.</string>
     <string name="uploaded_data">Uppladdad data</string>
     <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Följande data kommer att överföras till ditt Open Humans-konto: Glukosvärden, careportalhändelser (utom anteckningar), utökade bolusar, profilbyten, totala dagliga doser, temp basaler, temp mål, inställningar, appversion, enhetsmodell och skärmstorlek. Hemlig eller privat information, t. ex. din Nightscout-adress eller API-hemlighet, kommer inte att överföras.</string>
     <string name="setupwizard_pump_riley_link_status">Riley Link-status:</string>
+    <string name="filter">Filter</string>
+    <string name="copytolocalprofile_invalid">Kan inte att skapa den lokala profilen. Profilen är ogiltig.</string>
+    <string name="cta_dont_kill_my_app_info">Döda inte min app?</string>
+    <string name="alarm">Larm</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Skicka SMS om pumpen inte kan nås</string>
+    <string name="smscommunicator_pump_ureachable">Rapportera om pump inte kan nås</string>
+    <string name="advisoralarm">Larma när det är dags att äta</string>
+    <string name="alarminxmin">Larma om %1$d min</string>
+    <string name="bolusadvisor">Bolusguide</string>
+    <string name="bolusadvisormessage">Ditt blodsocker är högt. Istället för att äta är det rekommenderat att vänta tills det sjunker. Vill du göra en korrektionsbolus nu och påminna dig när det är dags att äta? I det här fallet kommer inga kolhydrater att registreras nu, utan du måste ange måltiden på nytt i kalkylatorn.</string>
+    <string name="enablebolusadvisor">Aktivera bolusguiden</string>
+    <string name="enablebolusadvisor_summary">Använd påminnelse om att börja äta istället för kalkylatorn under hög glykemi</string>
+    <string name="time_to_eat">Dags att äta!\nKör bolusguiden igen för ny beräkning.</string>
+    <string name="timetoeat">Dags att äta</string>
 </resources>

app/src/main/res/values-tr-rTR/strings.xml

@@ -406,8 +406,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="overview_editquickwizard_usebasaliob">Bazal IOB hesaplaması</string>
     <string name="overview_editquickwizard_usetrend">Trend hesapla</string>
     <string name="overview_editquickwizard_usesuperbolus">Super Bolus hesapla</string>
-    <string name="yes">Evet</string>
-    <string name="no">Hayır</string>
     <string name="positiveonly">Sadece pozitif</string>
     <string name="negativeonly">Sadece negatif</string>
     <string name="overview_editquickwizard_usecob">COB (Aktif Karbonhidrat) hesaplaması</string>
@@ -606,7 +604,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="low_temptarget_lowers_sensitivity_title">Düşük geçici hedefler duyarlılığı azaltır</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Geçici Hedefi < 100 duyarlılığı düşürün]]></string>
     <string name="combo_invalid_setup">Geçersiz pompa kurulumu, dokümanları kontrol edin ve Hızlı Bilgi menüsünün 360 konfigürasyon yazılımını kullanarak QUICK INFO olarak adlandırıldığını doğrulayın.</string>
-    <string name="custom">Özel</string>
     <string name="careportal_removestartedevents">Temiz AndroidAPS başladı</string>
     <string name="storedsettingsfound">Saklanan ayarlar bulundu</string>
     <string name="allow_hardware_pump_text">Dikkat: Eğer bir donanım pompasını etkinleştirir ve bağlarsanız, AndroidAPS, bazal ayarları profilden pompaya aktaracaktır ve pompada kayıtlı mevcut bazal oranlarının üzerine yazacaktır. AndroidAPS\'de doğru ayarların olduğundan emin olun. Emin değilseniz veya pompanızdaki bazal ayarların üzerine yazmak istemiyorsanız, iptal tuşuna basın ve daha sonra tekrar deneyin.</string>