Merge remote-tracking branch 'ns/dev' into careportal

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

@@ -13,6 +13,7 @@ import info.nightscout.androidaps.databinding.DialogCalibrationBinding
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.XdripCalibrations
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
@@ -28,6 +29,7 @@ class CalibrationDialog : DialogFragmentWithDate() {
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var xdripCalibrations: XdripCalibrations
     @Inject lateinit var uel: UserEntryLogger
+    @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
 
     private var _binding: DialogCalibrationBinding? = null
 
@@ -51,7 +53,7 @@ class CalibrationDialog : DialogFragmentWithDate() {
         super.onViewCreated(view, savedInstanceState)
 
         val units = profileFunction.getUnits()
-        val bg = Profile.fromMgdlToUnits(GlucoseStatus(injector).glucoseStatusData?.glucose
+        val bg = Profile.fromMgdlToUnits(glucoseStatusProvider.glucoseStatusData?.glucose
             ?: 0.0, units)
         if (units == Constants.MMOL)
             binding.bg.setParams(savedInstanceState?.getDouble("bg")

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

@@ -21,7 +21,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.Translator
@@ -43,6 +43,7 @@ class CareDialog : DialogFragmentWithDate() {
     @Inject lateinit var translator: Translator
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var repository: AppRepository
+    @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
 
     private val disposable = CompositeDisposable()
 
@@ -136,7 +137,7 @@ class CareDialog : DialogFragmentWithDate() {
             }
         }
 
-        val bg = Profile.fromMgdlToUnits(GlucoseStatus(injector).glucoseStatusData?.glucose
+        val bg = Profile.fromMgdlToUnits(glucoseStatusProvider.glucoseStatusData?.glucose
             ?: 0.0, profileFunction.getUnits())
         val bgTextWatcher: TextWatcher = object : TextWatcher {
             override fun afterTextChanged(s: Editable) {}

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt

@@ -16,6 +16,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -44,7 +45,8 @@ open class OpenAPSAMAPlugin @Inject constructor(
     private val profiler: Profiler,
     private val fabricPrivacy: FabricPrivacy,
     private val dateUtil: DateUtil,
-    private val repository: AppRepository
+    private val repository: AppRepository,
+    private val glucoseStatusProvider: GlucoseStatusProvider
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.APS)
     .fragmentClass(OpenAPSAMAFragment::class.java.name)
@@ -81,7 +83,7 @@ open class OpenAPSAMAPlugin @Inject constructor(
         aapsLogger.debug(LTag.APS, "invoke from $initiator tempBasalFallback: $tempBasalFallback")
         lastAPSResult = null
         val determineBasalAdapterAMAJS = DetermineBasalAdapterAMAJS(ScriptReader(context), injector)
-        val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
+        val glucoseStatus = glucoseStatusProvider.glucoseStatusData
         val profile = profileFunction.getProfile()
         val pump = activePlugin.activePump
         if (profile == null) {

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

@@ -18,6 +18,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HardLimits
@@ -45,7 +46,8 @@ open class OpenAPSSMBPlugin @Inject constructor(
     private val profiler: Profiler,
     private val sp: SP,
     private val dateUtil: DateUtil,
-    private val repository: AppRepository
+    private val repository: AppRepository,
+    private val glucoseStatusProvider: GlucoseStatusProvider
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.APS)
     .fragmentClass(OpenAPSSMBFragment::class.java.name)
@@ -89,7 +91,7 @@ open class OpenAPSSMBPlugin @Inject constructor(
     override fun invoke(initiator: String, tempBasalFallback: Boolean) {
         aapsLogger.debug(LTag.APS, "invoke from $initiator tempBasalFallback: $tempBasalFallback")
         lastAPSResult = null
-        val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
+        val glucoseStatus = glucoseStatusProvider.glucoseStatusData
         val profile = profileFunction.getProfile()
         val pump = activePlugin.activePump
         if (profile == null) {

app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt

@@ -8,12 +8,12 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.IobTotal
-import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.events.*
-import info.nightscout.androidaps.events.EventExtendedBolusChange
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.events.EventNewBasalProfile
+import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.events.EventTempBasalChange
+import info.nightscout.androidaps.interfaces.PluginDescription
-import info.nightscout.androidaps.events.EventTreatmentChange
+import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
@@ -21,9 +21,8 @@ import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
-import info.nightscout.androidaps.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.services.Intents
 import info.nightscout.androidaps.utils.DefaultValueHelper
@@ -51,7 +50,7 @@ class DataBroadcastPlugin @Inject constructor(
     private val activePlugin: ActivePluginProvider,
     private var receiverStatusStore: ReceiverStatusStore,
     private val config: Config,
-    private val databaseHelper: DatabaseHelperInterface
+    private val glucoseStatusProvider: GlucoseStatusProvider
 
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
@@ -123,14 +122,14 @@ class DataBroadcastPlugin @Inject constructor(
 
     private fun bgStatus(bundle: Bundle) {
         val lastBG = iobCobCalculatorPlugin.lastBg() ?: return
-        val glucoseStatus = GlucoseStatus(injector).glucoseStatusData ?: return
+        val glucoseStatus = glucoseStatusProvider.glucoseStatusData ?: return
 
         bundle.putDouble("glucoseMgdl", lastBG.value)   // last BG in mgdl
         bundle.putLong("glucoseTimeStamp", lastBG.timestamp) // timestamp
         bundle.putString("units", profileFunction.getUnits()) // units used in AAPS "mg/dl" or "mmol"
         bundle.putString("slopeArrow", lastBG.trendArrow.text) // direction arrow as string
         bundle.putDouble("deltaMgdl", glucoseStatus.delta) // bg delta in mgdl
-        bundle.putDouble("avgDeltaMgdl", glucoseStatus.avgDelta) // average bg delta
+        bundle.putDouble("avgDeltaMgdl", glucoseStatus.shortAvgDelta) // average bg delta
         bundle.putDouble("high", defaultValueHelper.determineHighLine()) // predefined top value of in range (green area)
         bundle.putDouble("low", defaultValueHelper.determineLowLine()) // predefined bottom  value of in range
     }

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

@@ -48,7 +48,7 @@ import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizar
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
 import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore
 import info.nightscout.androidaps.plugins.general.wear.events.EventWearInitiateAction
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
@@ -117,6 +117,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     @Inject lateinit var databaseHelper: DatabaseHelperInterface
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var repository: AppRepository
+    @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
 
     private val disposable = CompositeDisposable()
 
@@ -590,7 +591,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             binding.infoLayout.arrow.setImageResource(trendCalculator.getTrendArrow(lastBG).directionToIcon())
             binding.infoLayout.arrow.setColorFilter(color)
 
-            val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
+            val glucoseStatus = glucoseStatusProvider.glucoseStatusData
             if (glucoseStatus != null) {
                 binding.infoLayout.deltaLarge.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
                 binding.infoLayout.deltaLarge.setTextColor(color)

app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt

@@ -16,6 +16,7 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -42,7 +43,8 @@ class PersistentNotificationPlugin @Inject constructor(
     private val context: Context,
     private val notificationHolder: NotificationHolderInterface,
     private val dummyServiceHelper: DummyServiceHelper,
-    private val iconsProvider: IconsProvider
+    private val iconsProvider: IconsProvider,
+    private val glucoseStatusProvider: GlucoseStatusProvider
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
     .neverVisible(true)
@@ -130,13 +132,13 @@ class PersistentNotificationPlugin @Inject constructor(
             var line1aa: String
             val units = profileFunction.getUnits()
             val lastBG = iobCobCalculatorPlugin.lastBg()
-            val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
+            val glucoseStatus = glucoseStatusProvider.glucoseStatusData
             if (lastBG != null) {
                 line1aa = lastBG.valueToUnitsString(units)
                 line1 = line1aa
                 if (glucoseStatus != null) {
                     line1 += ("  Δ" + Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
-                        + " avgΔ" + Profile.toSignedUnitsString(glucoseStatus.avgDelta, glucoseStatus.avgDelta * Constants.MGDL_TO_MMOLL, units))
+                        + " avgΔ" + Profile.toSignedUnitsString(glucoseStatus.shortAvgDelta, glucoseStatus.shortAvgDelta * Constants.MGDL_TO_MMOLL, units))
                     line1aa += "  " + lastBG.trendArrow.symbol
                 } else {
                     line1 += " " +

app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt

@@ -36,6 +36,7 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui
 import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.receivers.BundleStore
@@ -78,6 +79,7 @@ class SmsCommunicatorPlugin @Inject constructor(
     private val dateUtil: DateUtil,
     private val uel: UserEntryLogger,
     private val nsUpload: NSUpload,
+    private val glucoseStatusProvider: GlucoseStatusProvider,
     private val repository: AppRepository
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
@@ -322,7 +324,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             val agoMin = (agoMilliseconds / 60.0 / 1000.0).toInt()
             reply = resourceHelper.gs(R.string.sms_lastbg) + " " + lastBG.valueToUnitsString(units) + " " + String.format(resourceHelper.gs(R.string.sms_minago), agoMin) + ", "
         }
-        val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
+        val glucoseStatus = glucoseStatusProvider.glucoseStatusData
         if (glucoseStatus != null) reply += resourceHelper.gs(R.string.sms_delta) + " " + Profile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", "
         activePlugin.activeTreatments.updateTotalIOBTreatments()
         val bolusIob = activePlugin.activeTreatments.lastCalculationTreatments.round()

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java

@@ -51,6 +51,7 @@ import info.nightscout.androidaps.plugins.general.wear.WearPlugin;
 import info.nightscout.androidaps.plugins.general.wear.events.EventWearConfirmAction;
 import info.nightscout.androidaps.plugins.general.wear.events.EventWearInitiateAction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.receivers.ReceiverStatusStore;
@@ -62,7 +63,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public class WatchUpdaterService extends WearableListenerService implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
-    @Inject public HasAndroidInjector injector;
+    @Inject public GlucoseStatusProvider glucoseStatusProvider;
     @Inject public AAPSLogger aapsLogger;
     @Inject public WearPlugin wearPlugin;
     @Inject public ResourceHelper resourceHelper;
@@ -282,7 +283,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         GlucoseValue lastBG = iobCobCalculatorPlugin.lastBg();
         // Log.d(TAG, logPrefix + "LastBg=" + lastBG);
         if (lastBG != null) {
-            GlucoseStatus glucoseStatus = new GlucoseStatus(injector).getGlucoseStatusData();
+            GlucoseStatus glucoseStatus = glucoseStatusProvider.getGlucoseStatusData();
 
             if (googleApiClient != null && !googleApiClient.isConnected() && !googleApiClient.isConnecting()) {
                 googleApiConnect();
@@ -323,7 +324,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         } else {
             dataMap.putString("slopeArrow", slopeArrow(glucoseStatus.getDelta()));
             dataMap.putString("delta", deltastring(glucoseStatus.getDelta(), glucoseStatus.getDelta() * Constants.MGDL_TO_MMOLL, units));
-            dataMap.putString("avgDelta", deltastring(glucoseStatus.getAvgDelta(), glucoseStatus.getAvgDelta() * Constants.MGDL_TO_MMOLL, units));
+            dataMap.putString("avgDelta", deltastring(glucoseStatus.getShortAvgDelta(), glucoseStatus.getShortAvgDelta() * Constants.MGDL_TO_MMOLL, units));
         }
         dataMap.putLong("sgvLevel", sgvLevel);
         dataMap.putDouble("sgvDouble", lastBG.getValue());
@@ -386,7 +387,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         if (last_bg == null) return;
 
         List<GlucoseValue> graph_bgs = repository.compatGetBgReadingsDataFromTime(startTime, true).blockingGet();
-        GlucoseStatus glucoseStatus = new GlucoseStatus(injector).getGlucoseStatusData(true);
+        GlucoseStatus glucoseStatus = glucoseStatusProvider.getGlucoseStatusData(true);
 
         if (!graph_bgs.isEmpty()) {
             DataMap entries = dataMapSingleBG(last_bg, glucoseStatus);

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

@@ -22,6 +22,7 @@ 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.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.CarbTimer
@@ -57,6 +58,7 @@ class BolusWizard @Inject constructor(
     @Inject lateinit var config: Config
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var carbTimer: CarbTimer
+    @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
 
     init {
         injector.androidInjector().inject(this)
@@ -181,7 +183,7 @@ class BolusWizard @Inject constructor(
         }
 
         // Insulin from 15 min trend
-        glucoseStatus = GlucoseStatus(injector).glucoseStatusData
+        glucoseStatus = glucoseStatusProvider.glucoseStatusData
         glucoseStatus?.let {
             if (useTrend) {
                 trend = it.shortAvgDelta

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

@@ -10,6 +10,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
@@ -32,6 +33,7 @@ class QuickWizardEntry @Inject constructor(private val injector: HasAndroidInjec
     @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
 
     lateinit var storage: JSONObject
     var position: Int = -1
@@ -114,7 +116,7 @@ class QuickWizardEntry @Inject constructor(private val injector: HasAndroidInjec
         }
         if (loopPlugin.isEnabled(loopPlugin.getType()) && loopPlugin.isSuperBolus) superBolus = false
         // Trend
-        val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
+        val glucoseStatus = glucoseStatusProvider.glucoseStatusData
         var trend = false
         if (useTrend() == YES) {
             trend = true

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

@@ -153,7 +153,6 @@
     <string name="smscommunicator_loophasbeenenabled">Loop is geaktiveerd</string>
     <string name="smscommunicator_loopisenabled">Lus geaktiveer</string>
     <string name="valuelimitedto">%1$.2f beperk tot %2$.2f</string>
-    <string name="valueoutofrange">Waarde %1$s is uit harde perke</string>
     <string name="smscommunicator_remotecommandnotallowed">Afstandbeheerde bevel word nie toegelaat nie</string>
     <string name="smscommunicator_remotebolusnotallowed">Afstandbeheerde bolus nie beskikbaar nie. Probeer later weer.</string>
     <string name="smscommunicator_profilereplywithcode">Om profiel te verander na %1$s %2$d%% antwoord met %3$s</string>

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

@@ -194,7 +194,6 @@
     <string name="smscommunicator_loophasbeenenabled">APS е активиран</string>
     <string name="smscommunicator_loopisenabled">APS е включен</string>
     <string name="valuelimitedto">%1$.2f ограничен до %2$.2f</string>
-    <string name="valueoutofrange">Стойността %1$s е извън ограниченията</string>
     <string name="smscommunicator_pumpconnectwithcode">За свързване с помпа отговорете с код %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Връзката с помпата е неуспешна</string>
     <string name="smscommunicator_pumpdisconnectwithcode">За да спрете помпата за %1$d минути отговорете с код %2$s</string>

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

@@ -194,7 +194,7 @@
     <string name="smscommunicator_loophasbeenenabled">Smyčka byla povolena</string>
     <string name="smscommunicator_loopisenabled">Smyčka je povolena</string>
     <string name="valuelimitedto">%1$.2f omezeno na %2$.2f</string>
-    <string name="valueoutofrange">Hodnota %1$s je mimo přednastavený rozsah</string>
+    <string name="valueoutofrange">»%1$s« je mimo pevně nastavené limity</string>
     <string name="smscommunicator_pumpconnectwithcode">Chcete-li připojit pumpu, odpovězte pomocí SMS s kódem %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Připojení k pumpě selhalo</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Chcete-li odpojit pumpu na %1$d minut, odpovězte pomocí SMS s kódem %2$s</string>
@@ -904,4 +904,14 @@
     <string name="email_address">E-mailová adresa</string>
     <string name="privacy_settings">Nastavení soukromí</string>
     <string name="privacy_summary">Pokud chcete být upozorněni na selhání aplikace, můžete zadat volitelně e-mailovou adresu. Toto není automatizovaná služba. Vývojáři vás budou kontaktovat v nebezpečných situacích.</string>
+    <string name="profile_low_target">Dolní cíl profilu</string>
+    <string name="profile_high_target">Horní cíl profilu</string>
+    <string name="temp_target_low_target">Dolní hodnota dočasného cíle</string>
+    <string name="temp_target_high_target">Horní hodnota dočasného cíle</string>
+    <string name="temp_target_value">Hodnota dočasného cíle</string>
+    <string name="profile_dia">Hodnota DIA profilu</string>
+    <string name="profile_sensitivity_value">Hodnota citlivosti profilu</string>
+    <string name="profile_max_daily_basal_value">Maximální hodnota bazálu profilu</string>
+    <string name="current_basal_value">Aktuální hodnota bazálu</string>
+    <string name="profile_carbs_ratio_value">Inzulino-sacharidový poměr profilu</string>
 </resources>

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

@@ -194,7 +194,7 @@
     <string name="smscommunicator_loophasbeenenabled">Lopp wurde aktiviert.</string>
     <string name="smscommunicator_loopisenabled">Loop ist aktiviert.</string>
     <string name="valuelimitedto">%1$.2f limitiert auf %2$.2f</string>
-    <string name="valueoutofrange">Wert %1$s ist außerhalb des festen Limits.</string>
+    <string name="valueoutofrange">»%1$s« ist außerhalb der fest programmierten Grenzen</string>
     <string name="smscommunicator_pumpconnectwithcode">Um die Pumpe zu verbinden, antworte mit dem Code %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Verbindung zur Pumpe fehlgeschlagen</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Um die Verbindung zur Pumpe für %1$d Minuten zu trennen, antworte mit dem Code %2$s</string>
@@ -905,4 +905,14 @@ Unerwartetes Verhalten.</string>
     <string name="email_address">E‐Mail‐Adresse</string>
     <string name="privacy_settings">Privatsphäre-Einstellungen</string>
     <string name="privacy_summary">Du kannst optional eine E-Mail-Adresse angeben, wenn Du bei Absturzberichten kontaktiert werden möchtest. Dies ist keine Automatik, Du wirst von den Entwicklern in gefährlichen Situationen kontaktiert. </string>
+    <string name="profile_low_target">Profil unteres Ziel</string>
+    <string name="profile_high_target">Profil oberes Ziel</string>
+    <string name="temp_target_low_target">Temp. Ziel unterer Wert</string>
+    <string name="temp_target_high_target">Temp. Ziel oberer Wert</string>
+    <string name="temp_target_value">Temp. Ziel Wert</string>
+    <string name="profile_dia">Profil Insulinwirkdauer</string>
+    <string name="profile_sensitivity_value">Profil Sensitivitätswert</string>
+    <string name="profile_max_daily_basal_value">Profil max. Basalwert</string>
+    <string name="current_basal_value">Aktueller Basalwert</string>
+    <string name="profile_carbs_ratio_value">Profil KH-Faktor</string>
 </resources>

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

@@ -155,7 +155,6 @@
     <string name="smscommunicator_loophasbeenenabled">Το κύκλωμα ενεργοποιήθηκε</string>
     <string name="smscommunicator_loopisenabled">Κύκλωμα ενεργοποιημένο</string>
     <string name="valuelimitedto">Το %1$.2f περιορίζεται σε %2$.2f</string>
-    <string name="valueoutofrange">Η τιμή %1$s είναι έξω από τα όρια</string>
     <string name="smscommunicator_remotecommandnotallowed">Δεν επιτρέπεται απομακρυσμένη εντολή</string>
     <string name="smscommunicator_remotebolusnotallowed">Απομακρυσμένο bolus μη διαθέσιμο. Δοκιμάστε ξανά αργότερα.</string>
     <string name="smscommunicator_profilereplywithcode">Για αλλαγή προφίλ σε %1$s %2$d%% στείλτε κωδικό %3$s</string>

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

@@ -194,7 +194,6 @@
     <string name="smscommunicator_loophasbeenenabled">Lazo se ha activado</string>
     <string name="smscommunicator_loopisenabled">Lazo activo</string>
     <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
-    <string name="valueoutofrange">El valor %1$s está fuera de límites</string>
     <string name="smscommunicator_pumpconnectwithcode">Para conectar la infusora responder con el código %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Error al conectar a la bomba</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Para desconectar la bomba durante %1$dminutos responde con el código %2$s</string>

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

@@ -195,7 +195,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smscommunicator_loophasbeenenabled">La Boucle a été activée</string>
     <string name="smscommunicator_loopisenabled">La Boucle est activée</string>
     <string name="valuelimitedto">%1$.2f limité à %2$.2f</string>
-    <string name="valueoutofrange">La valeur %1$s est en dehors des limites</string>
+    <string name="valueoutofrange">\"%1$s\" est en dehors des limites</string>
     <string name="smscommunicator_pumpconnectwithcode">Pour connecter la pompe, renvoyez le code %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Echec de la connexion pompe</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Pour déconnecter la pompe pendant %1$d min, renvoyez le code %2$s</string>
@@ -905,4 +905,14 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="email_address">Adresse e-mail</string>
     <string name="privacy_settings">Paramètres de confidentialité</string>
     <string name="privacy_summary">Vous pouvez fournir une adresse e-mail facultative si vous voulez être informé des plantages de l\'application. Ce n\'est pas un service automatisé. Vous serez contacté par les développeurs dans des situations dangereuses.</string>
+    <string name="profile_low_target">Cible basse du profil</string>
+    <string name="profile_high_target">Cible haute du profil</string>
+    <string name="temp_target_low_target">Valeur basse de cible temporaire</string>
+    <string name="temp_target_high_target">Valeur haute de cible temporaire</string>
+    <string name="temp_target_value">Valeur de cible temporaire</string>
+    <string name="profile_dia">Valeur DAI du profil</string>
+    <string name="profile_sensitivity_value">Valeur de sensibilité du profil</string>
+    <string name="profile_max_daily_basal_value">Basale maximale du profil</string>
+    <string name="current_basal_value">Basale actuelle</string>
+    <string name="profile_carbs_ratio_value">Rapport glucides/insuline de profil</string>
 </resources>

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

@@ -194,7 +194,7 @@
     <string name="smscommunicator_loophasbeenenabled">Il loop è stato abilitato</string>
     <string name="smscommunicator_loopisenabled">Il loop è abilitato</string>
     <string name="valuelimitedto">%1$.2f limitato a %2$.2f</string>
-    <string name="valueoutofrange">Il valore %1$s è fuori limite massimo</string>
+    <string name="valueoutofrange">»%1$s« è fuori dai limiti consentiti</string>
     <string name="smscommunicator_pumpconnectwithcode">Per connettere il micro rispondi col codice %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Connessione al micro fallita</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Per disconnettere il micro per %1$d minuti rispondi col codice %2$s</string>
@@ -904,4 +904,14 @@
     <string name="email_address">Indirizzo email</string>
     <string name="privacy_settings">Impostazioni privacy</string>
     <string name="privacy_summary">Puoi fornire un indirizzo e-mail opzionale se desideri essere avvisato in caso di arresti anomali dell\'app. Questo non è un servizio automatizzato. Sarai contattato dagli sviluppatori in situazioni pericolose.</string>
+    <string name="profile_low_target">Target basso (profilo)</string>
+    <string name="profile_high_target">Target alto (profilo)</string>
+    <string name="temp_target_low_target">Valore inferiore target temporaneo</string>
+    <string name="temp_target_high_target">Valore superiore target temporaneo</string>
+    <string name="temp_target_value">Valore target temporaneo</string>
+    <string name="profile_dia">Valore DIA (profilo)</string>
+    <string name="profile_sensitivity_value">Valore sensibilità (profilo)</string>
+    <string name="profile_max_daily_basal_value">Valore max basale (profilo)</string>
+    <string name="current_basal_value">Valore basale corrente</string>
+    <string name="profile_carbs_ratio_value">Valore rapporto CHO (profilo)</string>
 </resources>

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

@@ -14,7 +14,7 @@
     <string name="objectives_maxiobzero_objective">מתחילים לסגור את הלולאה עם השהיה עקב רמת גלוקוז נמוכה</string>
     <string name="objectives_maxiobzero_gate">הרץ בלולאה סגורה עם ערך IOB מקסימלי = 0 למשך מספר ימים, עם מעט ארועי השהיה עקב גלוקוז נמוך (LGS)</string>
     <string name="objectives_maxiob_objective">כוונון הלולאה הסגורה, תוך העלאה של ערך ה- IOB מעל 0 ובסופו של דבר הורדת ערכי המטרה של רמת הסוכר</string>
-    <string name="objectives_maxiob_gate">לפני הורדת ערך רמת הסוכר, הפעל במשך מס\' ימים, עם לפחות לילה אחד ללא התרעת רמת סוכר נמוכה</string>
+    <string name="objectives_maxiob_gate">לפני הורדת ערך רמת הסוכר, הפעילו במשך מס\' ימים, עם לפחות לילה אחד ללא התרעת רמת סוכר נמוכה</string>
     <string name="objectives_autosens_objective">במידת הצורך, בצעו התאמת בזאלי ויחסים, ולאחר מכן הפעילו את Autosens</string>
     <string name="objectives_autosens_gate">שבוע של הפעלה מוצלחת של הלולאה במשך שעות היום, עם הוספת ערכי פחמימות רגילים</string>
     <string name="objectives_ama_objective">הפעלת פונקציות נוספות לשימוש במשך היום, לדוגמה AMA (סיוע ארוחות מתקדם)</string>

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

@@ -194,7 +194,7 @@
     <string name="smscommunicator_loophasbeenenabled">הלולאה הופעלה</string>
     <string name="smscommunicator_loopisenabled">לולאה פעילה</string>
     <string name="valuelimitedto">%1$.2f מוגבלת ל- %2$.2f</string>
-    <string name="valueoutofrange">ערך %1$s הינו מחוץ לתחום</string>
+    <string name="valueoutofrange">»הערך %1$s« מחוץ לתחום הקשיח</string>
     <string name="smscommunicator_pumpconnectwithcode">לחיבור המשאבה יש להשיב עם הקוד %1$s</string>
     <string name="smscommunicator_pumpconnectfail">החיבור אל המשאבה נכשל</string>
     <string name="smscommunicator_pumpdisconnectwithcode">לניתוק המשאבה למשך %1$d דקות השיבו עם הקוד %2$s</string>
@@ -520,7 +520,7 @@
     <string name="apsselected">נבחר APS</string>
     <string name="nsclienthaswritepermission">ל-NSClient יש הרשאת כתיבה</string>
     <string name="closedmodeenabled">מצב סגור מופעל</string>
-    <string name="maxiobset">IOB מקסימלי הוגדר כראוי</string>
+    <string name="maxiobset">ערך IOB מקסימלי הוגדר כראוי</string>
     <string name="hasbgdata">ערכי סוכר זמינים מהמקור הנבחר</string>
     <string name="extendedbolusdeliveryerror">שגיאה במתן הבולוס הממושך</string>
     <string name="enablesmbalways">הפעלת SMB תמיד</string>
@@ -586,8 +586,8 @@
     <string name="smbdisabledinpreferences">SMB מושבת בהעדפות</string>
     <string name="uamdisabledinpreferences">UAM מושבת בהעדפות</string>
     <string name="uamdisabledoref1notselected">UAM מושבת מפני שהוא מסתמך על תוסף רגישות של Oref1</string>
-    <string name="maxbasalmultiplier">מכפלת בזאלי מירבי</string>
+    <string name="maxbasalmultiplier">מכפלת בזאלי מרבי</string>
-    <string name="maxdailybasalmultiplier">מכפלת בזאלי יומי מירבי</string>
+    <string name="maxdailybasalmultiplier">מכפלת בזאלי יומי מרבי</string>
     <string name="smb_frequency_exceeded">ניתן בולוס ב-3 הדקות האחרונות, מדלג על SMB</string>
     <string name="basal_set_correctly">הבזאלי הוגדר כהלכה</string>
     <string name="limitingextendedbolus">הגבלת בולוס ממושך ל- %1$.1f יח\' בגלל %2$s</string>
@@ -627,7 +627,7 @@
     <string name="openapsama_autosens_max">יחס Autosens מקסימלי</string>
     <string name="openapsama_autosens_min">יחס Autosens מינימלי</string>
     <string name="openapsama_bolussnooze_dia_divisor">נמנום בולוס - מחלק משך פעילות אינסולין</string>
-    <string name="openapsama_max_daily_safety_multiplier">מכפלת בטיחות בזאלי יומי מירבי</string>
+    <string name="openapsama_max_daily_safety_multiplier">מכפלת בטיחות בזאלי יומי מרבי</string>
     <string name="openapsama_current_basal_safety_multiplier">מכפלת בטיחות בזאלי נוכחי</string>
     <string name="value_unavailable_short">לא זמין</string>
     <string name="virtualpump_type">סוג משאבה וירטואלית</string>
@@ -904,4 +904,14 @@
     <string name="email_address">כתובת דוא\"ל</string>
     <string name="privacy_settings">הגדרות פרטיות</string>
     <string name="privacy_summary">אם תרצו, תוכלו לספק כתובת דוא\"ל כדי לקבל דיווח על קריסות יישום. שירות זה אינו אוטומטי. המפתחים יצרו איתכם קשר במצבים מסוכנים.</string>
+    <string name="profile_low_target">ערך המטרה הנמוך של הפרופיל</string>
+    <string name="profile_high_target">ערך המטרה הגבוה של הפרופיל</string>
+    <string name="temp_target_low_target">ערך תחתון של המטרה הזמנית</string>
+    <string name="temp_target_high_target">ערך עליון של המטרה הזמנית</string>
+    <string name="temp_target_value">ערך המטרה הזמני</string>
+    <string name="profile_dia">ערך DIA של הפרופיל</string>
+    <string name="profile_sensitivity_value">ערך הרגישות של הפרופיל</string>
+    <string name="profile_max_daily_basal_value">ערך מינון בזאלי מרבי של הפרופיל</string>
+    <string name="current_basal_value">מינון בזאלי נוכחי</string>
+    <string name="profile_carbs_ratio_value">יחס הפחמימות של הפרופיל</string>
 </resources>

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

@@ -166,7 +166,6 @@
     <string name="smscommunicator_loophasbeenenabled">Loop가 실행되었습니다.</string>
     <string name="smscommunicator_loopisenabled">Loop가 실행중입니다.</string>
     <string name="valuelimitedto">%1$.2f, %2$.2f으로 제한됨</string>
-    <string name="valueoutofrange">%1$s값이 하드한계를 벗어났습니다</string>
     <string name="smscommunicator_remotecommandnotallowed">원격 명령이 허가되지 않았습니다</string>
     <string name="smscommunicator_remotebolusnotallowed">원격 주입이 불가능합니다. 나중에 다시 시도해주세요.</string>
     <string name="smscommunicator_profilereplywithcode">프로파일 %1$s %2$d%%로 변경하려면 %3$s 를 입력하고 답장하세요</string>

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

@@ -192,7 +192,6 @@
     <string name="smscommunicator_loophasbeenenabled">Ciklas buvo įjungtas</string>
     <string name="smscommunicator_loopisenabled">Ciklas įjungtas</string>
     <string name="valuelimitedto">%1$.2f apribotas iki %2$.2f</string>
-    <string name="valueoutofrange">Vertė %1$s viršija griežtą limitą</string>
     <string name="smscommunicator_pumpconnectwithcode">Pompos prijungimui atsakykite su kodu %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Nepavyko prisijungti prie pompos</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Norėdami atjungti pompą %1$d min., atsakykite kodu %2$s</string>

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

@@ -194,7 +194,6 @@
     <string name="smscommunicator_loophasbeenenabled">Loop was ingeschakeld</string>
     <string name="smscommunicator_loopisenabled">Loop is ingeschakeld</string>
     <string name="valuelimitedto">%1$.2f gelimiteerd tot %2$.2f</string>
-    <string name="valueoutofrange">Waarde %1$s valt buiten de toegestane harde limieten</string>
     <string name="smscommunicator_pumpconnectwithcode">Om verbinding te maken met pomp antwoord met code %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Verbinding maken met pomp is mislukt</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Om de pomp te ontkoppelen gedurende %1$d minuten antwoord met code %2$s</string>

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

@@ -194,7 +194,7 @@
     <string name="smscommunicator_loophasbeenenabled">Loop har blitt aktivert</string>
     <string name="smscommunicator_loopisenabled">Loop er aktivert</string>
     <string name="valuelimitedto">%1$.2f begrenset til %2$.2f</string>
-    <string name="valueoutofrange">Verdien %1$s er utenfor angitt begrensning</string>
+    <string name="valueoutofrange">»%1$s« er utenfor lovlige grenseverdier</string>
     <string name="smscommunicator_pumpconnectwithcode">For å koble til pumpen, svar med kode %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Tilkobling til pumpen mislyktes</string>
     <string name="smscommunicator_pumpdisconnectwithcode">For å koble fra pumpen i %1$d minutter, svar med koden %2$s</string>
@@ -904,4 +904,14 @@
     <string name="email_address">E-postadresse</string>
     <string name="privacy_settings">Personverninnstillinger</string>
     <string name="privacy_summary">Du kan oppgi valgfri e-postadresse hvis du ønsker å bli varslet om krasj. Dette er ikke en automatisert tjeneste. Du vil bli kontaktet av utviklere ved farlige hendelser.</string>
+    <string name="profile_low_target">Profil lavt blodsukkermål</string>
+    <string name="profile_high_target">Profil høyt blodsukkermål</string>
+    <string name="temp_target_low_target">Midlertidig mål bunnverdi</string>
+    <string name="temp_target_high_target">Midlertidig mål toppverdi</string>
+    <string name="temp_target_value">Midlertidig målverdi</string>
+    <string name="profile_dia">Profil insulinvarighet (DIA)</string>
+    <string name="profile_sensitivity_value">Profil sensitivitetsverdi (IF)</string>
+    <string name="profile_max_daily_basal_value">Profil maksimal basal dose</string>
+    <string name="current_basal_value">Aktiv basal dose</string>
+    <string name="profile_carbs_ratio_value">Profil karbohydratfaktor (IK)</string>
 </resources>

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

@@ -194,7 +194,6 @@
     <string name="smscommunicator_loophasbeenenabled">Pętla (Loop) została włączona</string>
     <string name="smscommunicator_loopisenabled">Pętla (Loop) jest włączona</string>
     <string name="valuelimitedto">%1$.2f ograniczone do %2$.2f</string>
-    <string name="valueoutofrange">Wartość %1$s jest poza dopuszczalną granicą</string>
     <string name="smscommunicator_pumpconnectwithcode">Aby podłączyć pompę odpowiedz kodem %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Połączenie z pompą nie powiodło się</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Aby odłączyć pompę na %1$d minut odpowiedz kodem %2$s</string>

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

@@ -181,7 +181,6 @@
     <string name="smscommunicator_loophasbeenenabled">Loop foi ativado</string>
     <string name="smscommunicator_loopisenabled">Loop ativado</string>
     <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
-    <string name="valueoutofrange">O valor %1$s está fora dos limites permitidos</string>
     <string name="smscommunicator_pumpdisconnected">Bomba desconectada</string>
     <string name="smscommunicator_reconnect">Bomba reconectada</string>
     <string name="smscommunicator_remotecommandnotallowed">O comando remoto não é permitido</string>

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">O que é verdade sobre DIA?</string>
-    <string name="dia_label_exam">Duração da Acção de Insulina (DIA)</string>
+    <string name="dia_label_exam">Duração da Acção da Insulina (DIA)</string>
     <string name="dia_profile">Deve definir o valor da DIA no seu perfil.</string>
     <string name="dia_minimumis5h">O valor mínimo permitido são 5 horas.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">Se estiver satisfeito com o valor para a DIA que utilizou na bomba antes do AndroidAPS e funcionou bem, não há necessidade de alterar isso quando inicia o loop.</string>
+    <string name="dia_meaningisequaltodiapump">Se estiver satisfeito com o valor da DIA que utilizava na bomba antes da AndroidAPS e que funcionava bem, não há necessidade de o alterar quando iniciar o loop.</string>
-    <string name="dia_valuemustbedetermined">Deve determinar para si mesmo o valor adequado para a DIA.</string>
+    <string name="dia_valuemustbedetermined">Deve determinar para o seu valor adequado para a DIA.</string>
     <string name="hypott_label">Hipo Alvo-Temp</string>
     <string name="hypott_whenhypott">Qual é a principal razão para definir um alvo temporário?</string>
     <string name="hypott_wrongbasal">Para corrigir hipos causadas por configurações de taxa de basal incorretas.</string>
@@ -110,7 +110,7 @@
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
     <string name="insulin_label">Plugins de Insulina</string>
-    <string name="insulin_ultrarapid">Qual insulina deve utilizar com o plugin Ultra-Rapid Oref?</string>
+    <string name="insulin_ultrarapid">Que insulina deve utilizar com o plugin Oref Ultra-Rápida ?</string>
     <string name="insulin_fiasp">Fiasp®</string>
     <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog ®</string>
@@ -193,8 +193,8 @@
     <string name="profileswitch2_isfhigher">FSI será 20% maior.</string>
     <string name="profileswitchtime_label">Troca de Perfil</string>
     <string name="profileswitchtime_iwant">Se você se levanta 2 horas mais cedo do que o normal, como deve notificar o AndroidAPS da alteração no seu horário?</string>
-    <string name="profileswitchtime_2">Iniciar uma mudança de perfil com uma alteração de turno de 2</string>
+    <string name="profileswitchtime_2">Iniciar uma mudança de perfil com um deslocamento temporal de 2</string>
-    <string name="profileswitchtime__2">Iniciar uma mudança de perfil com uma alteração de turno de -2</string>
+    <string name="profileswitchtime__2">Iniciar uma mudança de perfil com uma deslocamento temporal de -2</string>
     <string name="profileswitchtime_tt">Defina um alvo temporário de comer brevemente.</string>
     <string name="profileswitchtime_100">Faça troca de perfil para mais de 100%. </string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>

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

@@ -33,7 +33,7 @@
     <string name="description_pump_mdi">Integração para as pessoas que fazem múltiplas injeções diárias para a sua terapia de diabetes</string>
     <string name="description_pump_virtual">Integração para as bombas que não têm qualquer driver ainda (Open Loop)</string>
     <string name="description_sensitivity_aaps">A sensibilidade é calculada da mesma forma que Oref0, mas pode especificar o período de tempo para o passado. A absorção mínima de hidratos de carbono é calculada a partir do tempo máximo de absorção de hidratos de carbono das preferências.</string>
-    <string name="description_sensitivity_oref1">A sensibilidade é calculada a partir de dados das últimas 8h ou 24h (usando qualquer um que é mais sensível). Hidratos são cortados (se não absorvidos) após o tempo especificado nas preferências. O Plugin também calcula o UAM.</string>
+    <string name="description_sensitivity_oref1">A sensibilidade é calculada a partir de dados das últimas 8h ou 24h (usando o que é mais sensível). Os hidratos de carbono são descartados (se não absorvidos) após o tempo especificado nas preferências. O Plugin também calcula o RNA.</string>
     <string name="description_sensitivity_weighted_average">A sensibilidade é calculada como uma média ponderada de desvios. Desvios mais recentes têm maior peso. A absorção mínima de hidratos de carbono é calculada a partir do tempo máximo de absorção de hidratos de carbono das preferências. Este algoritmo é o mais rápido em seguir as mudanças de sensibilidade.</string>
     <string name="description_source_eversense">Receber valores Glicose da aplicação Eversense modificada.</string>
     <string name="description_source_glimp">Receber valores Glicose do Glimp.</string>
@@ -194,7 +194,7 @@
     <string name="smscommunicator_loophasbeenenabled">Loop foi activado</string>
     <string name="smscommunicator_loopisenabled">Loop activado</string>
     <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
-    <string name="valueoutofrange">O valor %1$s está fora dos limites permitidos</string>
+    <string name="valueoutofrange">»%1$s« está fora dos limites máximos</string>
     <string name="smscommunicator_pumpconnectwithcode">Para ligar a bomba responda com o código %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Ligação à bomba falhou</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Para remover a bomba por %1$d minutos responda com o código %2$s</string>
@@ -449,21 +449,21 @@
     <string name="ns_localbroadcasts">Activar transmissões para outras aplicações (como xDrip+). Não habilite se tiver mais de uma instância de AAPS ou ClienteNS instalado!</string>
     <string name="ns_localbroadcasts_title">Activar partilha local.</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="enableuam">Activar UAM</string>
+    <string name="enableuam">Activar RNA</string>
     <string name="enablesmb">Activar SMB</string>
     <string name="enablesmb_summary">Use Super Micro Boluses em vez de basal temp para uma acção mais rápida</string>
-    <string name="enableuam_summary">Detecção de Refeições Não Introduzidas</string>
+    <string name="enableuam_summary">Deteção de Refeições Não Anunciadas (RNA)</string>
-    <string name="insulin_oref_peak">Tempo Pico da curva de IOB</string>
+    <string name="insulin_oref_peak">Tempo do Pico da curva de IOB</string>
     <string name="insulin_peak_time">Tempo Pico [min]</string>
     <string name="free_peak_oref">Oref Pico-Livre</string>
-    <string name="rapid_acting_oref">Oref Acção Rápida</string>
+    <string name="rapid_acting_oref">Oref Acção-Rápida</string>
-    <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
+    <string name="ultrarapid_oref">Oref Ultra-Rápida</string>
     <string name="lyumjev">Lyumjev</string>
     <string name="dia_too_short">Duração de Acção da Insulina (DIA) de %1$f demasiado curto - corrigido para %2$f!</string>
     <string name="activate_profile">Activar perfil</string>
     <string name="invalid">INVÁLIDO</string>
     <string name="careportal_newnstreatment_percentage_label">Percentagem</string>
-    <string name="careportal_newnstreatment_timeshift_label">Alteração Turno</string>
+    <string name="careportal_newnstreatment_timeshift_label">Deslocamento temporal</string>
     <string name="default_temptargets">Alvo-Temp padrão</string>
     <string name="eatingsoon_duration">duração comerbreve</string>
     <string name="eatingsoon_target">alvo comerbreve</string>
@@ -500,8 +500,8 @@
     <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
     <string name="smbinterval_summary">Com que frequência em min os SMBs serão dados</string>
     <string name="smbmaxminutes_summary">Limite de minutos de basal para SMB</string>
-    <string name="uamsmbmaxminutes">UAM SMB máx minutos</string>
+    <string name="uamsmbmaxminutes">RNA SMB máx minutos</string>
-    <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para UAM</string>
+    <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para RNA</string>
     <string name="carbsReqThreshold">Mínimo De Hidratos Necessários Para Sugestão</string>
     <string name="carbsReqThreshold_summary">Mínimo de gramas de hidratos de carbono ara exibir um alerta de sugestão de hidratos. As sugestões de hidratos abaixo deste número não activarão uma notificação.</string>
     <string name="dexcomg5_xdripupload_title">Enviar dados Glicose para xDrip+</string>
@@ -584,8 +584,8 @@
     <string name="closedmodedisabledinpreferences">Loop fecchado disabilitado nas preferências</string>
     <string name="autosensdisabledinpreferences">Autosens desabilitado nas preferências</string>
     <string name="smbdisabledinpreferences">SMB desactivado nas configurações</string>
-    <string name="uamdisabledinpreferences">UAM desactivado nas configurações</string>
+    <string name="uamdisabledinpreferences">RNA desactivada nas configurações</string>
-    <string name="uamdisabledoref1notselected">UAM desactivado porque confia no plugin de sensibilidade Oref1</string>
+    <string name="uamdisabledoref1notselected">RNA desactivada porque confia no plugin de sensibilidade Oref1</string>
     <string name="maxbasalmultiplier">multiplicador de basal máx</string>
     <string name="maxdailybasalmultiplier">multiplicador de basal máx diária</string>
     <string name="smb_frequency_exceeded">Um bólus foi administrado nos últimos 3 minutos, a ignorar SMB</string>
@@ -800,8 +800,8 @@
     <string name="chartmenu">Menu do Gráfico</string>
     <string name="loop_smbrequest_time_label">Hora de solicitação SMB</string>
     <string name="loop_smbexecution_time_label">Hora de execução do SMB</string>
-    <string name="loop_tbrrequest_time_label">Hora de solicitação Basal Temp</string>
+    <string name="loop_tbrrequest_time_label">Hora de solicitação da BT</string>
-    <string name="loop_tbrexecution_time_label">Hora de execução Basal Temp</string>
+    <string name="loop_tbrexecution_time_label">Hora de execução da BT</string>
     <!-- SMS Communicator & OTP Authenticator -->
     <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">da app Authenticator para: %1$s seguido pelo PIN</string>
     <string name="smscommunicator_otp_pin">PIN obrigatório adicional no token final</string>
@@ -900,4 +900,18 @@
     <string name="cannula">Cânula</string>
     <string name="userentry">Entrada de Utilizador</string>
     <string name="common_values">Utilize valores da sua maior refeição que normalmente come\n</string>
+    <string name="summary_email_for_crash_report">Este endereço de email irá anexado aos relatórios de erros para que possamos entrar em contato consigo em casos urgentes. É opcional.</string>
+    <string name="email_address">Endereço de email</string>
+    <string name="privacy_settings">Definições de privacidade</string>
+    <string name="privacy_summary">Opcionalmente pode fornecer um endereço de e-mail se quiser ser notificado sobre os erros da app. Este não é um serviço automatizado. Será contactado por desenvolvedores em situações perigosas.</string>
+    <string name="profile_low_target">Perfil Alvo Baixo</string>
+    <string name="profile_high_target">Perfil Alvo Alto</string>
+    <string name="temp_target_low_target">Valor Alvo Temporário Inferior</string>
+    <string name="temp_target_high_target">Valor Alvo Temporário Superior</string>
+    <string name="temp_target_value">Valor Alvo Temporário</string>
+    <string name="profile_dia">Valor Perfil DIA</string>
+    <string name="profile_sensitivity_value">Valor Perfil Sensibilidade</string>
+    <string name="profile_max_daily_basal_value">Valor Perfil Basal Máxima</string>
+    <string name="current_basal_value">Valor Actual Basal</string>
+    <string name="profile_carbs_ratio_value">Valor Perfil Rácio Hidratos</string>
 </resources>

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

@@ -194,7 +194,6 @@
     <string name="smscommunicator_loophasbeenenabled">Bucla a fost activată</string>
     <string name="smscommunicator_loopisenabled">Bucla este activată</string>
     <string name="valuelimitedto">%1$.2f este limitată la %2$.2f</string>
-    <string name="valueoutofrange">Valoarea %1$s este mai mare decât limita stabilită</string>
     <string name="smscommunicator_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>

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

@@ -194,7 +194,7 @@
     <string name="smscommunicator_loophasbeenenabled">зцикл был активирован</string>
     <string name="smscommunicator_loopisenabled">зцикл работает</string>
     <string name="valuelimitedto">%1$.2f ограничено до %2$.2f</string>
-    <string name="valueoutofrange">Значение %1$s недопустимо</string>
+    <string name="valueoutofrange">»%1$s«за пределами жестких ограничений</string>
     <string name="smscommunicator_pumpconnectwithcode">Чтобы подсоединить помпу ответьте кодом %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Ошибка подключения к помпе</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Для разъединения с помпой на %1$d мин ответьте кодом %2$s</string>
@@ -906,4 +906,14 @@ Context | Edit Context</string>
     <string name="email_address">Адрес электронной почты</string>
     <string name="privacy_settings">Настройки конфиденцальности</string>
     <string name="privacy_summary">Вы можете указать дополнительно адрес электронной почты, если хотите получать уведомления о сбоях приложения; что является не автоматизированной рассылкой, а способом связи с разработчиками в опасных ситуациях.</string>
+    <string name="profile_low_target">Нижнее целевое значение профиля</string>
+    <string name="profile_high_target">Верхнее целевое значение профиля</string>
+    <string name="temp_target_low_target">Нижнее значение временного целевого уровня</string>
+    <string name="temp_target_high_target">Верхнее значение временного целевого уровня</string>
+    <string name="temp_target_value">Временное целевое значение</string>
+    <string name="profile_dia">Значение длительности действия инсулина DIA в профиле</string>
+    <string name="profile_sensitivity_value">Значение чувствительности в профиле</string>
+    <string name="profile_max_daily_basal_value">Максимальное значение базала в профиле</string>
+    <string name="current_basal_value">Текущее значение базала</string>
+    <string name="profile_carbs_ratio_value">Коэффициент углеводов в профиле</string>
 </resources>

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

@@ -194,7 +194,6 @@
     <string name="smscommunicator_loophasbeenenabled">Uzavretý okruh bol aktivovaný</string>
     <string name="smscommunicator_loopisenabled">Uzavretý okruh je aktivovaný</string>
     <string name="valuelimitedto">%1$.2f obmedzené na %2$.2f</string>
-    <string name="valueoutofrange">Hodnota %1$s je mimo prednastavený rozsah</string>
     <string name="smscommunicator_pumpconnectwithcode">Ak chcete pripojiť pumpu, odpovedzte pomocou SMS s kódom %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Pripojenie k pumpe zlyhalo</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Ak chcete odpojiť pumpu na %1$d minút, odpovedzte pomocou SMS s kódom %2$s</string>
@@ -900,4 +899,8 @@
     <string name="cannula">Kanyla</string>
     <string name="userentry">Vstup používateľa</string>
     <string name="common_values">Použite hodnoty pre najväčšie jedlo, aké obvykle jete\n</string>
+    <string name="summary_email_for_crash_report">Táto e-mailová adresa bude pripojená ku správam o zlyhaniach, aby sme vás mohli kontaktovať v naliehavých prípadoch. Je to dobrovoľné.</string>
+    <string name="email_address">Emailová adresa</string>
+    <string name="privacy_settings">Nastavenia súkromia</string>
+    <string name="privacy_summary">Pokiaľ chcete byť upozornení na zlyhanie aplikácie, môžete zadať voliteľne e-mailovú adresu. Toto nie je automatizovaná služba. Vývojári vás budú kontaktovať v nebezpečných situáciách.</string>
 </resources>

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

@@ -8,6 +8,7 @@
     <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>
@@ -40,12 +41,14 @@
     <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="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="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>

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

@@ -195,7 +195,7 @@ Eversense-appen.</string>
     <string name="smscommunicator_loophasbeenenabled">Loop aktiverad</string>
     <string name="smscommunicator_loopisenabled">Loop är aktiverad</string>
     <string name="valuelimitedto">%1$.2f begränsat till %2$.2f</string>
-    <string name="valueoutofrange">Värdet %1$s är utanför hård begränsning</string>
+    <string name="valueoutofrange">»%1$s« är utanför de hårda gränserna</string>
     <string name="smscommunicator_pumpconnectwithcode">För att ansluta pumpen, svara med kod %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Anslutning till pump misslyckades</string>
     <string name="smscommunicator_pumpdisconnectwithcode">För att koppla från pumpen i %1$d minuter, svara med kod %2$s</string>
@@ -398,6 +398,7 @@ Eversense-appen.</string>
     <string name="basal_shortname">Bas</string>
     <string name="deviation_shortname">Dev</string>
     <string name="activity_shortname">Akt</string>
+    <string name="bgi_shortname">-BGI</string>
     <string name="abs_insulin_shortname">Abs</string>
     <string name="devslope_shortname">Devslope</string>
     <string name="nav_about">Om</string>
@@ -471,6 +472,7 @@ Eversense-appen.</string>
     <string name="activity_target">Mål vid träning</string>
     <string name="hypo_duration">Hypo [min]</string>
     <string name="hypo_target">Mål vid Hypo</string>
+    <string name="reuse_profile_pct_hours">Återanvänd %1$d%% %2$dtim</string>
     <string name="wearcontrol_title">Kontrollera från klockan</string>
     <string name="wearcontrol_summary">Sätt temp målvärde och ange behandlingar från klockan.</string>
     <string name="food">Matdatabas</string>
@@ -568,6 +570,7 @@ Eversense-appen.</string>
     <string name="ns_autobackfill_summary">Hämta saknad BG-data från Nightscout</string>
     <string name="loop_smbsetbypump_label">SMB satt i pump</string>
     <string name="overview_show_activity">Insulinaktivitet (5m)</string>
+    <string name="overview_show_bgi">Blodglukospåverkan</string>
     <string name="overview_show_sensitivity">Känslighet (Sens)</string>
     <string name="overview_show_deviations">Avvikelser (Dev)</string>
     <string name="overview_show_cob">Aktiva KH (COB)</string>
@@ -892,4 +895,24 @@ Eversense-appen.</string>
     <string name="timetoeat">Dags att äta</string>
     <string name="fabric_upload_disabled">Uppladdning av kraschloggar inaktiverad!</string>
     <string name="graph_menu_divider_header">Graf</string>
+    <string name="chart_menu">Diagrammeny</string>
+    <string name="clear_filter">Rensa filter</string>
+    <string name="trend_arrow">Trendpil</string>
+    <string name="cannula">Kanyl</string>
+    <string name="userentry">Angivet av användare</string>
+    <string name="common_values">Använd värden för den största måltiden som du vanligen äter\n</string>
+    <string name="summary_email_for_crash_report">Den här mejladressen kommer att bifogas till kraschrapporter så att vi kan kontakta dig i brådskande fall. Det är frivilligt.</string>
+    <string name="email_address">E-postadress</string>
+    <string name="privacy_settings">Sekretessinställningar</string>
+    <string name="privacy_summary">Du kan ange valfri e-postadress om du vill få meddelanden om appkrascher. Det här är ingen automatiserad tjänst. Du kommer att kontaktas av utvecklare i farliga situationer.</string>
+    <string name="profile_low_target">Nedre målvärde för profilen</string>
+    <string name="profile_high_target">Övre målvärde för profilen</string>
+    <string name="temp_target_low_target">Nedre värde för temp mål</string>
+    <string name="temp_target_high_target">Övre värde för temp mål</string>
+    <string name="temp_target_value">Temp målvärde</string>
+    <string name="profile_dia">Profilens DIA</string>
+    <string name="profile_sensitivity_value">Profilens insulinkänslighetsvärde</string>
+    <string name="profile_max_daily_basal_value">Maximal basaldos för profil</string>
+    <string name="current_basal_value">Nuvarande basaldos</string>
+    <string name="profile_carbs_ratio_value">Profilens KH-kvot</string>
 </resources>

app/src/main/res/values-ta-rIN/exam.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/main/res/values-ta-rIN/objectives.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
+    <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
+    <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <!-- SMS Communicator & OTP Authenticator -->
+</resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -152,7 +152,6 @@
     <string name="smscommunicator_loophasbeenenabled">闭环已经被启用</string>
     <string name="smscommunicator_loopisenabled">闭环被启用</string>
     <string name="valuelimitedto">%1$.2f 超过 %2$.2f的限制</string>
-    <string name="valueoutofrange">值 %1$s 超过了硬限制</string>
     <string name="smscommunicator_remotecommandnotallowed">远程命令没有被允许</string>
     <string name="smscommunicator_remotebolusnotallowed">远程大剂量不可用。请稍后再试。</string>
     <string name="smscommunicator_profilereplywithcode">要切换配置文件到 %1$s %2$d%% 请回复代码 %3$s</string>

app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt

@@ -23,6 +23,7 @@ import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
 import info.nightscout.androidaps.plugins.general.maintenance.LoggerUtils
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
@@ -136,6 +137,9 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
         constraintChecker = ConstraintChecker(activePlugin)
 
+        val glucoseStatusProvider = GlucoseStatusProvider(aapsLogger = aapsLogger, iobCobCalculatorPlugin = iobCobCalculatorPlugin)
+
+
         danaPump = DanaPump(aapsLogger, sp, injector)
         hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, nsUpload)
         objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, Config(), uel)
@@ -143,8 +147,8 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         danaRPlugin = DanaRPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy)
         danaRSPlugin = DanaRSPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
         insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsInterface, sp, commandQueue, profileFunction, nsUpload, context, uploadQueue, Config(), dateUtil, databaseHelper, repository)
-        openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsInterface, iobCobCalculatorPlugin, hardLimits, profiler, sp, dateUtil, repository)
+        openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsInterface, iobCobCalculatorPlugin, hardLimits, profiler, sp, dateUtil, repository, glucoseStatusProvider)
-        openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsInterface, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy, dateUtil, repository)
+        openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsInterface, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy, dateUtil, repository, glucoseStatusProvider)
         safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, BuildHelper(Config(), loggerUtils), treatmentsInterface, Config())
         val constraintsPluginsList = ArrayList<PluginBase>()
         constraintsPluginsList.add(safetyPlugin)

app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt

@@ -27,7 +27,7 @@ import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
 import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
@@ -91,10 +91,6 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
                 it.resourceHelper = resourceHelper
                 it.otp = otp
             }
-            if (it is GlucoseStatus) {
-                it.aapsLogger = aapsLogger
-                it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
-            }
         }
     }
 
@@ -121,8 +117,9 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
             repository.runTransactionForResult(anyObject<InsertTemporaryTargetAndCancelCurrentTransaction>())
         ).thenReturn(Single.just(InsertTemporaryTargetAndCancelCurrentTransaction.TransactionResult().apply {
         }))
+        val glucoseStatusProvider = GlucoseStatusProvider(aapsLogger = aapsLogger, iobCobCalculatorPlugin = iobCobCalculatorPlugin)
 
-        smsCommunicatorPlugin = SmsCommunicatorPlugin(injector, aapsLogger, resourceHelper, aapsSchedulers, sp, constraintChecker, rxBus, profileFunction, fabricPrivacy, activePlugin, commandQueue, loopPlugin, iobCobCalculatorPlugin, xdripCalibrations, otp, Config(), DateUtil(context), uel, nsUpload, repository)
+        smsCommunicatorPlugin = SmsCommunicatorPlugin(injector, aapsLogger, resourceHelper, aapsSchedulers, sp, constraintChecker, rxBus, profileFunction, fabricPrivacy, activePlugin, commandQueue, loopPlugin, iobCobCalculatorPlugin, xdripCalibrations, otp, Config(), DateUtil(context), uel, nsUpload, glucoseStatusProvider, repository)
         smsCommunicatorPlugin.setPluginEnabled(PluginType.GENERAL, true)
         Mockito.doAnswer { invocation: InvocationOnMock ->
             val callback = invocation.getArgument<Callback>(1)

app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt

@@ -16,6 +16,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
@@ -59,10 +60,7 @@ class BolusWizardTest : TestBase() {
                 it.commandQueue = commandQueue
                 it.loopPlugin = loopPlugin
                 it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
-            }
+                it.glucoseStatusProvider = GlucoseStatusProvider(aapsLogger = aapsLogger, iobCobCalculatorPlugin = iobCobCalculatorPlugin)
-            if (it is GlucoseStatus) {
-                it.aapsLogger = aapsLogger
-                it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
             }
         }
     }

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

@@ -20,6 +20,7 @@ import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseTrigg
 import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerChanged
 import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerClone
 import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerRemove
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.services.LastLocationDataContainer
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -39,6 +40,7 @@ abstract class Trigger(val injector: HasAndroidInjector) {
     @Inject lateinit var treatmentsInterface: TreatmentsInterface
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorInterface
+    @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
 
     init {
         injector.androidInjector().inject(this)

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

@@ -46,7 +46,7 @@ class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) {
     }
 
     override fun shouldRun(): Boolean {
-        val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
+        val glucoseStatus = glucoseStatusProvider.glucoseStatusData
         if (glucoseStatus == null && comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) {
             aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
             return true

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

@@ -64,7 +64,7 @@ class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
     }
 
     override fun shouldRun(): Boolean {
-        val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
+        val glucoseStatus = glucoseStatusProvider.glucoseStatusData
             ?: return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) {
                 aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
                 true

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

@@ -7,6 +7,7 @@
     <string name="automation_missing_trigger">Prosím, zadajte aspoň jednu podmienku.</string>
     <string name="automation_missing_action">Prosím, zadajte aspoň jednu akciu.</string>
     <string name="alarm_message">Výstraha: %1$s</string>
+    <string name="alarm_short">Alarm:</string>
     <string name="message_short">Spr:</string>
     <string name="alreadyenabled">Už aktivované</string>
     <string name="alreadydisabled">Už deaktivované</string>
@@ -88,6 +89,7 @@
     <string name="glucose_u">Glykémia [%1$s]:</string>
     <string name="lastboluslabel">Od posledného bolusu</string>
     <string name="lastboluscompared">Čas posledného bolusu: pred %1$s %2$s min </string>
+    <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="iob_u">IOB [JI]:</string>
     <string name="distance_short">Vzdial. [m]:</string>

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

@@ -7,6 +7,7 @@
     <string name="automation_missing_trigger">Specificera åtminstone en utlösare.</string>
     <string name="automation_missing_action">Specificera åtminstone en åtgärd.</string>
     <string name="alarm_message">Larm: %1$s</string>
+    <string name="alarm_short">Larm:</string>
     <string name="message_short">Medd:</string>
     <string name="alreadyenabled">Redan aktiverad</string>
     <string name="alreadydisabled">Redan inaktiverad</string>
@@ -88,6 +89,7 @@
     <string name="glucose_u">BG [%1$s]:</string>
     <string name="lastboluslabel">Senaste bolus</string>
     <string name="lastboluscompared">Senaste bolus %1$s %2$s min sedan</string>
+    <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="iob_u">IOB [U]:</string>
     <string name="distance_short">Dist [m]:</string>

automation/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt

@@ -15,6 +15,7 @@ import info.nightscout.androidaps.plugins.general.automation.elements.InputBg
 import info.nightscout.androidaps.plugins.general.automation.elements.InputTempTarget
 import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.services.LastLocationDataContainer
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -57,6 +58,7 @@ open class TriggerTestBase : TestBaseWithProfile() {
                 it.treatmentsInterface = treatmentsInterface
                 it.activePlugin = activePlugin
                 it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
+                it.glucoseStatusProvider = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin)
             }
             if (it is TriggerBg) {
                 it.profileFunction = profileFunction
@@ -83,10 +85,6 @@ open class TriggerTestBase : TestBaseWithProfile() {
             if (it is InputTempTarget) {
                 it.profileFunction = profileFunction
             }
-            if (it is GlucoseStatus) {
-                it.aapsLogger = aapsLogger
-                it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
-            }
             if (it is StaticLabel) {
                 it.resourceHelper = resourceHelper
             }

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

@@ -3,6 +3,7 @@
     <string name="description_pump_combo">Ovládač pumpy pre Accu-Check Combo, vyžaduje nainštalovanú aplikáciu Ruffy</string>
     <string name="combo_programming_bolus">Programovanie pumpy pre bolus</string>
     <string name="combo_pump_state_label">Stav</string>
+    <string name="combo_pump_activity_label">Aktivita</string>
     <string name="combo_no_pump_connection">Žiadne spojenie už %1$d min</string>
     <string name="combo_tbr_remaining">%1$d%% (%2$d min zostáva)</string>
     <string name="combo_pump_state_initializing">Inicializácia</string>

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

@@ -3,6 +3,7 @@
     <string name="description_pump_combo">Pumpintegration för Accu-Chek Combo. Kräver att Ruffy är installerat</string>
     <string name="combo_programming_bolus">Programmerar bolus i pump</string>
     <string name="combo_pump_state_label">Läge</string>
+    <string name="combo_pump_activity_label">Insulinaktivitet (5m)</string>
     <string name="combo_no_pump_connection">Ingen anslutning på %1$d min</string>
     <string name="combo_tbr_remaining">%1$d%% (%2$d min återstår)</string>
     <string name="combo_pump_state_initializing">Initierar</string>

combo/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.kt

@@ -1,147 +1,28 @@
 package info.nightscout.androidaps.plugins.iob.iobCobCalculator
 
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.interfaces.IobCobCalculatorInterface
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.Round
-import java.util.*
-import javax.inject.Inject
-import kotlin.math.roundToLong
 
-class GlucoseStatus(private val injector: HasAndroidInjector) {
+data class GlucoseStatus(
+    val glucose: Double,
+    val noise: Double = 0.0,
+    val delta: Double = 0.0,
+    val shortAvgDelta: Double = 0.0,
+    val longAvgDelta: Double = 0.0,
+    val date: Long = 0L
+) {
 
-    @Inject lateinit var aapsLogger: AAPSLogger
+    fun log(): String = "Glucose: " + DecimalFormatter.to0Decimal(glucose) + " mg/dl " +
-    @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorInterface
-
-    var glucose = 0.0
-    var noise = 0.0
-    var delta = 0.0
-    var avgDelta = 0.0
-    var shortAvgDelta = 0.0
-    var longAvgDelta = 0.0
-    var date = 0L
-
-    init {
-        injector.androidInjector().inject(this)
-    }
-
-    fun log(): String {
-        return "Glucose: " + DecimalFormatter.to0Decimal(glucose) + " mg/dl " +
         "Noise: " + DecimalFormatter.to0Decimal(noise) + " " +
         "Delta: " + DecimalFormatter.to0Decimal(delta) + " mg/dl" +
         "Short avg. delta: " + " " + DecimalFormatter.to2Decimal(shortAvgDelta) + " mg/dl " +
         "Long avg. delta: " + DecimalFormatter.to2Decimal(longAvgDelta) + " mg/dl"
-    }
-
-    fun round(): GlucoseStatus {
-        glucose = Round.roundTo(glucose, 0.1)
-        noise = Round.roundTo(noise, 0.01)
-        delta = Round.roundTo(delta, 0.01)
-        avgDelta = Round.roundTo(avgDelta, 0.01)
-        shortAvgDelta = Round.roundTo(shortAvgDelta, 0.01)
-        longAvgDelta = Round.roundTo(longAvgDelta, 0.01)
-        return this
-    }
-
-    val glucoseStatusData: GlucoseStatus?
-        get() = getGlucoseStatusData(false)
-
-    fun getGlucoseStatusData(allowOldData: Boolean): GlucoseStatus? {
-        synchronized(iobCobCalculatorPlugin.dataLock) {
-            val data = iobCobCalculatorPlugin.bgReadings
-            val sizeRecords = data.size
-            if (sizeRecords == 0) {
-                aapsLogger.debug(LTag.GLUCOSE, "sizeRecords==0")
-                return null
-            }
-            if (data[0].timestamp < DateUtil.now() - 7 * 60 * 1000L && !allowOldData) {
-                aapsLogger.debug(LTag.GLUCOSE, "oldData")
-                return null
-            }
-            val now = data[0]
-            val nowDate = now.timestamp
-            var change: Double
-            if (sizeRecords == 1) {
-                val status = GlucoseStatus(injector)
-                status.glucose = now.value
-                status.noise = 0.0
-                status.shortAvgDelta = 0.0
-                status.delta = 0.0
-                status.longAvgDelta = 0.0
-                status.avgDelta = 0.0 // for OpenAPS MA
-                status.date = nowDate
-                aapsLogger.debug(LTag.GLUCOSE, "sizeRecords==1")
-                return status.round()
-            }
-            val nowValueList = ArrayList<Double>()
-            val lastDeltas = ArrayList<Double>()
-            val shortDeltas = ArrayList<Double>()
-            val longDeltas = ArrayList<Double>()
-
-            // Use the latest sgv value in the now calculations
-            nowValueList.add(now.value)
-            for (i in 1 until sizeRecords) {
-                if (data[i].value > 38) {
-                    val then = data[i]
-                    val thenDate = then.timestamp
-
-                    val minutesAgo = ((nowDate - thenDate) / (1000.0 * 60)).roundToLong()
-                    // multiply by 5 to get the same units as delta, i.e. mg/dL/5m
-                    change = now.value - then.value
-                    val avgDel = change / minutesAgo * 5
-                    aapsLogger.debug(LTag.GLUCOSE, "$then minutesAgo=$minutesAgo avgDelta=$avgDel")
-
-                    // use the average of all data points in the last 2.5m for all further "now" calculations
-                    if (0 < minutesAgo && minutesAgo < 2.5) {
-                        // Keep and average all values within the last 2.5 minutes
-                        nowValueList.add(then.value)
-                        now.value = average(nowValueList)
-                        // short_deltas are calculated from everything ~5-15 minutes ago
-                    } else if (2.5 < minutesAgo && minutesAgo < 17.5) {
-                        //console.error(minutesAgo, avgDelta);
-                        shortDeltas.add(avgDel)
-                        // last_deltas are calculated from everything ~5 minutes ago
-                        if (2.5 < minutesAgo && minutesAgo < 7.5) {
-                            lastDeltas.add(avgDel)
-                        }
-                        // long_deltas are calculated from everything ~20-40 minutes ago
-                    } else if (17.5 < minutesAgo && minutesAgo < 42.5) {
-                        longDeltas.add(avgDel)
-                    } else {
-                        // Do not process any more records after >= 42.5 minutes
-                        break
-                    }
-                }
-            }
-            val status = GlucoseStatus(injector)
-            status.glucose = now.value
-            status.date = nowDate
-            status.noise = 0.0 //for now set to nothing as not all CGMs report noise
-            status.shortAvgDelta = average(shortDeltas)
-            if (lastDeltas.isEmpty()) {
-                status.delta = status.shortAvgDelta
-            } else {
-                status.delta = average(lastDeltas)
-            }
-            status.longAvgDelta = average(longDeltas)
-            status.avgDelta = status.shortAvgDelta // for OpenAPS MA
-            aapsLogger.debug(LTag.GLUCOSE, status.log())
-            return status.round()
-        }
-    }
-
-    companion object {
-
-        fun average(array: ArrayList<Double>): Double {
-            var sum = 0.0
-            if (array.size == 0) return 0.0
-            for (value in array) {
-                sum += value
-            }
-            return sum / array.size
-        }
-    }
 }
+
+fun GlucoseStatus.asRounded() = copy(
+    glucose = Round.roundTo(glucose, 0.1),
+    noise = Round.roundTo(noise, 0.01),
+    delta = Round.roundTo(delta, 0.01),
+    shortAvgDelta = Round.roundTo(shortAvgDelta, 0.01),
+    longAvgDelta = Round.roundTo(longAvgDelta, 0.01)
+)

core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusProvider.kt

@@ -0,0 +1,112 @@
+package info.nightscout.androidaps.plugins.iob.iobCobCalculator
+
+import dagger.Reusable
+import info.nightscout.androidaps.interfaces.IobCobCalculatorInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.DateUtil
+import java.util.*
+import javax.inject.Inject
+import kotlin.math.roundToLong
+
+@Reusable
+class GlucoseStatusProvider @Inject constructor(private val aapsLogger: AAPSLogger, private val iobCobCalculatorPlugin: IobCobCalculatorInterface) {
+
+    val glucoseStatusData: GlucoseStatus?
+        get() = getGlucoseStatusData()
+
+    fun getGlucoseStatusData(allowOldData: Boolean = false): GlucoseStatus? {
+        synchronized(iobCobCalculatorPlugin.dataLock) {
+            val data = iobCobCalculatorPlugin.bgReadings
+            val sizeRecords = data.size
+            if (sizeRecords == 0) {
+                aapsLogger.debug(LTag.GLUCOSE, "sizeRecords==0")
+                return null
+            }
+            if (data[0].timestamp < DateUtil.now() - 7 * 60 * 1000L && !allowOldData) {
+                aapsLogger.debug(LTag.GLUCOSE, "oldData")
+                return null
+            }
+            val now = data[0]
+            val nowDate = now.timestamp
+            var change: Double
+            if (sizeRecords == 1) {
+                aapsLogger.debug(LTag.GLUCOSE, "sizeRecords==1")
+                return GlucoseStatus(
+                    glucose = now.value,
+                    noise = 0.0,
+                    delta = 0.0,
+                    shortAvgDelta = 0.0,
+                    longAvgDelta = 0.0,
+                    date = nowDate
+                ).asRounded()
+            }
+            val nowValueList = ArrayList<Double>()
+            val lastDeltas = ArrayList<Double>()
+            val shortDeltas = ArrayList<Double>()
+            val longDeltas = ArrayList<Double>()
+
+            // Use the latest sgv value in the now calculations
+            nowValueList.add(now.value)
+            for (i in 1 until sizeRecords) {
+                if (data[i].value > 38) {
+                    val then = data[i]
+                    val thenDate = then.timestamp
+
+                    val minutesAgo = ((nowDate - thenDate) / (1000.0 * 60)).roundToLong()
+                    // multiply by 5 to get the same units as delta, i.e. mg/dL/5m
+                    change = now.value - then.value
+                    val avgDel = change / minutesAgo * 5
+                    aapsLogger.debug(LTag.GLUCOSE, "$then minutesAgo=$minutesAgo avgDelta=$avgDel")
+
+                    // use the average of all data points in the last 2.5m for all further "now" calculations
+                    if (0 < minutesAgo && minutesAgo < 2.5) {
+                        // Keep and average all values within the last 2.5 minutes
+                        nowValueList.add(then.value)
+                        now.value = average(nowValueList)
+                        // short_deltas are calculated from everything ~5-15 minutes ago
+                    } else if (2.5 < minutesAgo && minutesAgo < 17.5) {
+                        //console.error(minutesAgo, avgDelta);
+                        shortDeltas.add(avgDel)
+                        // last_deltas are calculated from everything ~5 minutes ago
+                        if (2.5 < minutesAgo && minutesAgo < 7.5) {
+                            lastDeltas.add(avgDel)
+                        }
+                        // long_deltas are calculated from everything ~20-40 minutes ago
+                    } else if (17.5 < minutesAgo && minutesAgo < 42.5) {
+                        longDeltas.add(avgDel)
+                    } else {
+                        // Do not process any more records after >= 42.5 minutes
+                        break
+                    }
+                }
+            }
+            val shortAverageDelta = average(shortDeltas)
+            val delta = if (lastDeltas.isEmpty()) {
+                shortAverageDelta
+            } else {
+                average(lastDeltas)
+            }
+            return GlucoseStatus(
+                glucose = now.value,
+                date = nowDate,
+                noise = 0.0, //for now set to nothing as not all CGMs report noise
+                shortAvgDelta = shortAverageDelta,
+                delta = delta,
+                longAvgDelta = average(longDeltas),
+            ).also { aapsLogger.debug(LTag.GLUCOSE, it.log()) }.asRounded()
+        }
+    }
+
+    companion object {
+
+        fun average(array: ArrayList<Double>): Double {
+            var sum = 0.0
+            if (array.size == 0) return 0.0
+            for (value in array) {
+                sum += value
+            }
+            return sum / array.size
+        }
+    }
+}

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

@@ -118,6 +118,7 @@
     <string name="dismiss">POTVRDIT</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth Low Energy nepodporováno.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy není podporováno, nebo zařízení není spárováno.</string>
     <string name="ble_not_enabled">Bluetooth není povoleno.</string>
     <string name="location_not_found_title">Zjišťování polohy není povoleno</string>
     <string name="location_not_found_message">Pro vyhledání Bluetooth zařízení na novějších telefonech musí být povoleno zjišťování polohy. AAPS vás nesleduje a po provedení párování můžete tuto volbu opět zakázat.</string>

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

@@ -118,6 +118,7 @@
     <string name="dismiss">VERWERFEN</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth-Low-Energy nicht unterstützt.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy nicht unterstützt oder Gerät nicht verbunden.</string>
     <string name="ble_not_enabled">Bluetooth nicht aktiviert.</string>
     <string name="location_not_found_title">Standortdienst ist nicht aktiviert</string>
     <string name="location_not_found_message">Auf neueren Geräten muss für die Bluetooth-Erkennung der Standortdienst aktiviert sein. AAPS speichert keine Standortdaten und der Dienst kann nach erfolgreichem Pairing wieder deaktiviert werden.</string>

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

@@ -12,7 +12,7 @@
     <string name="goingtodeliver">%1$.2f U vont être injectées</string>
     <string name="waitingforpump">Attente connection pompe</string>
     <string name="connectingfor">Connexion à %1$d en cours</string>
-    <string name="bolusdelivering">%1$.2f U en cours d\'injection</string>
+    <string name="bolusdelivering">%1$.2f U ont été injectées</string>
     <string name="handshaking">Connexion</string>
     <string name="connecting">Connection en cours</string>
     <string name="connected">Connectée</string>
@@ -118,6 +118,7 @@
     <string name="dismiss">REJETER</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth Low Energy non pris en charge.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy non pris en charge ou appareil non appairé.</string>
     <string name="ble_not_enabled">Bluetooth désactivé.</string>
     <string name="location_not_found_title">Localisation désactivée</string>
     <string name="location_not_found_message">La localisation doit être activée sur les nouveaux appareils pour que la recherche Bluetooth fonctionne. AAPS n\'enregistre pas votre localisation et la localisation peut être désactivée après l\'appairage.</string>

core/src/main/res/values-fr-rFR/validator.xml

@@ -1,2 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Seuls les chiffres sont autorisés.</string>
+    <string name="error_only_numeric_digits_range_allowed">Seuls les chiffres entre %1$s et %2$s sont autorisés.</string>
+    <string name="error_this_field_cannot_contain_special_character">Ce champ ne doit pas contenir de caractères spéciaux</string>
+    <string name="error_only_standard_letters_are_allowed">Seules les lettres sont autorisées</string>
+    <string name="error_field_must_not_be_empty">Le champ ne doit pas être vide</string>
+    <string name="error_email_address_not_valid">Adresse e-mail invalide</string>
+    <string name="error_creditcard_number_not_valid">Le numéro de carte de crédit est invalide</string>
+    <string name="error_phone_not_valid">Numéro de téléphone invalide</string>
+    <string name="error_domain_not_valid">Nom de domaine invalide</string>
+    <string name="error_ip_not_valid">Adresse IP invalide</string>
+    <string name="error_url_not_valid">Le lien web (url) est invalide</string>
+    <string name="error_notvalid_personname">Prénom ou le nom de famille invalide.</string>
+    <string name="error_notvalid_personfullname">Nom complet invalide.</string>
+    <string name="error_date_not_valid">Format invalide</string>
+    <string name="error_mustbe4digitnumber">Doit avoir 4 chiffres</string>
+    <string name="error_mustbe6digitnumber">Doit avoir 6 chiffres</string>
+    <string name="error_mustbe12hexadidits">Doit avoir 12 caractères parmi ABCDEF0123456789</string>
+    <string name="error_mustbe8hexadidits">Doit avoir 8 caractères parmi ABCDEF0123456789</string>
+    <string name="error_mustbe4hexadidits">Doit avoir 4 caractères parmi ABCDEF0123456789</string>
+    <string name="error_not_a_minimum_length">Longueur minimale non respectée</string>
+    <string name="error_pin_not_valid">Le PIN doit avoir entre 3 et 6 chiffres différents et non en série</string>
+</resources>

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

@@ -118,6 +118,7 @@
     <string name="dismiss">RIMUOVI</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth Low Energy non supportato.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy non supportato o dispositivo non associato.</string>
     <string name="ble_not_enabled">Bluetooth non abilitato.</string>
     <string name="location_not_found_title">La localizzazione non è abilitata</string>
     <string name="location_not_found_message">Affinché la ricerca bluetooth funzioni sui dispositivi più recenti, la localizzazione deve essere abilitata, ma può essere disabilitata dopo l\'associazione. AAPS non tiene traccia della tua posizione.</string>

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

@@ -118,6 +118,7 @@
     <string name="dismiss">Avvis</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Lavenergi Bluetooth BLE er ikke støttet.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy er ikke støttet eller enheten er ikke paret.</string>
     <string name="ble_not_enabled">Bluetooth er ikke aktivert.</string>
     <string name="location_not_found_title">Stedstjeneste er ikke aktivert</string>
     <string name="location_not_found_message">Bluetooth søk på nye mobiler virker bare når posisjonstjeneste er aktivert. AAPS lagrer ikke dine posisjonsdata og den kan derfor slås av etter vellykket sammenkobling.</string>

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

@@ -73,9 +73,11 @@
     <string name="bolusdelivered">Bólus %1$.2f U administrado com sucesso</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="novalidbasalrate">Nenhum valor de basal válido foi lido da bomba</string>
+    <string name="limitingmaxiob">A limitar IOB máx. para %1$.1f U porque %2$s</string>
     <string name="unsafeusage">uso não seguro</string>
     <string name="pump_unreachable">Bomba inacessível</string>
     <string name="extended_bolus">Bólus Prolongado</string>
+    <string name="pump_time_updated">Hora da bomba actualizada</string>
     <string name="exit">Sair</string>
     <string name="serial_number">Número de Série</string>
     <string name="removerecord">Remover registo</string>
@@ -116,6 +118,7 @@
     <string name="dismiss">DISPENSAR</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth Low Energy não suportado.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy não suportado ou dispositivo não emparalhado.</string>
     <string name="ble_not_enabled">Bluetooth não está activado.</string>
     <string name="location_not_found_title">Localização Não Está Activa</string>
     <string name="location_not_found_message">Para a Pesquisa Bluetooth funcionar em dispositivos mais recentes, a localização deve ser activada. AAPS não acompanha a sua localização e pode ser desactivada após o emparelhamento bem-sucedido.</string>

core/src/main/res/values-pt-rPT/validator.xml

@@ -1,2 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Apenas dígitos numéricos são permitidos.</string>
+    <string name="error_only_numeric_digits_range_allowed">Apenas são permitidos dígitos numéricos dentro do intervalo de %1$s - %2$s.</string>
+    <string name="error_this_field_cannot_contain_special_character">Este campo não pode conter qualquer caractere especial</string>
+    <string name="error_only_standard_letters_are_allowed">Apenas letras padrão são permitidas</string>
+    <string name="error_field_must_not_be_empty">Este campo não deve estar vazio</string>
+    <string name="error_email_address_not_valid">Endereço de e-mail inválido</string>
+    <string name="error_creditcard_number_not_valid">Número do cartão de crédito não é válido</string>
+    <string name="error_phone_not_valid">Número de telefone inválido</string>
+    <string name="error_domain_not_valid">Nome do domínio não válido</string>
+    <string name="error_ip_not_valid">Endereço IP inválido</string>
+    <string name="error_url_not_valid">O URL não é válido</string>
+    <string name="error_notvalid_personname">Não é um nome ou sobrenome válido.</string>
+    <string name="error_notvalid_personfullname">Nome completo inválido.</string>
+    <string name="error_date_not_valid">Formato inválido</string>
+    <string name="error_mustbe4digitnumber">Deve ser um número de 4 dígitos</string>
+    <string name="error_mustbe6digitnumber">Deve ser um número de 6 dígitos</string>
+    <string name="error_mustbe12hexadidits">Deve ter 12 caracteres de ABCDEF0123456789</string>
+    <string name="error_mustbe8hexadidits">Deve ter 8 caracteres de ABCDEF0123456789</string>
+    <string name="error_mustbe4hexadidits">Deve ter 4 caracteres de ABCDEF0123456789</string>
+    <string name="error_not_a_minimum_length">Não tem o tamanho mínimo</string>
+    <string name="error_pin_not_valid">Pino deve ser de 3 a 6 dígitos, não iguais ou em série</string>
+</resources>

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

@@ -118,6 +118,7 @@
     <string name="dismiss">ОТКЛОНИТЬ</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth с низким энергопотреблением не поддерживается.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy не поддерживается или устройство не сопряжено.</string>
     <string name="ble_not_enabled">Bluetooth не включен.</string>
     <string name="location_not_found_title">Геолокация не включена</string>
     <string name="location_not_found_message">Для обнаружения Bluetooth на новых устройствах необходимо включить геолокацию. AAPS не отслеживает ваше местоположение и может быть отключен после успешного сопряжения.</string>

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

@@ -69,6 +69,40 @@
     <string name="pairing">Párovanie</string>
     <string name="yes">Áno</string>
     <string name="no">Nie</string>
+    <string name="loopdisabled">UZAVRETÝ OKRUH DEAKTIVOVANÝ OBMEDZENÍM</string>
+    <string name="bolusdelivered">Bolus %1$.2f JI podaný úspešne</string>
+    <string name="virtualpump_resultok">OK</string>
+    <string name="novalidbasalrate">Nenačítaný žiadny platný bazál z pumpy</string>
+    <string name="limitingmaxiob">Max IOB obmedzený na %1$.1f JI: %2$s</string>
+    <string name="unsafeusage">nebezpečné použitie</string>
+    <string name="pump_unreachable">Pumpa nedostupná</string>
+    <string name="extended_bolus">Predĺžený bolus</string>
+    <string name="pump_time_updated">Čas v pumpe bol aktualizovaný</string>
+    <string name="exit">Koniec</string>
+    <string name="serial_number">Sériové číslo</string>
+    <string name="removerecord">Odstrániť záznam</string>
+    <string name="loopisdisabled">Uzavretý okruh je deaktivovaný</string>
+    <string name="alarm">Alarm</string>
+    <string name="disableloop">Deaktivovať uzavretý okruh</string>
+    <string name="enableloop">Aktivovať uzavretý okruh</string>
+    <string name="resumeloop">Pokračovať v uzavretom okruhu</string>
+    <string name="suspendloop">Pozastaviť uzavretý okruh</string>
+    <string name="duration_min_label">Trvanie [min]</string>
+    <string name="notification">Notifikácia</string>
+    <string name="noprofile">Zatiaľ nebol načítaný žiadny profil z NS</string>
+    <string name="exists">existuje</string>
+    <string name="notexists">neexistuje</string>
+    <string name="glucose">Glykémia</string>
+    <string name="iob">IOB</string>
+    <string name="cob">COB</string>
+    <string name="name_short">Meno:</string>
+    <string name="time">Čas</string>
+    <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="loading">Načítavanie...</string>
+    <string name="event_time_label">Čas udalosti</string>
+    <string name="notes_label">Poznámky</string>
+    <string name="remove_button">Vymazať</string>
+    <string name="addnew">Pridať nový</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Max bazál obmedzený na %1$.2f JI/h: %2$s</string>
     <string name="pumplimit">limit pumpy</string>

core/src/main/res/values-sk-rSK/validator.xml

@@ -1,2 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Povolené sú iba číslice.</string>
+    <string name="error_only_numeric_digits_range_allowed">Povolené sú iba čísla v rozsahu %1$s - %2$s.</string>
+    <string name="error_this_field_cannot_contain_special_character">Toto pole nemôže obsahovať žiadne špeciálne znaky</string>
+    <string name="error_only_standard_letters_are_allowed">Sú povolené iba štandardné písmená</string>
+    <string name="error_field_must_not_be_empty">Toto pole nesmie byť prázdne</string>
+    <string name="error_email_address_not_valid">E-mailová adresa je neplatná</string>
+    <string name="error_creditcard_number_not_valid">Číslo kreditnej karty je neplatné</string>
+    <string name="error_phone_not_valid">Neplatné telefónne číslo</string>
+    <string name="error_domain_not_valid">Názov domény je neplatný</string>
+    <string name="error_ip_not_valid">IP Adresa je neplatná</string>
+    <string name="error_url_not_valid">Webová adresa je neplatná</string>
+    <string name="error_notvalid_personname">Neplatné krstné meno, alebo priezvisko.</string>
+    <string name="error_notvalid_personfullname">Nie je platné celé meno.</string>
+    <string name="error_date_not_valid">Formát nie je platný</string>
+    <string name="error_mustbe4digitnumber">Musí byť 4-miestne číslo</string>
+    <string name="error_mustbe6digitnumber">Musí byť 6-miestne číslo</string>
+    <string name="error_mustbe12hexadidits">Musí byť 12 znakov ABCDEF0123456789</string>
+    <string name="error_mustbe8hexadidits">Musí byť 8 znakov ABCDEF0123456789</string>
+    <string name="error_mustbe4hexadidits">Musí obsahovať 4 znaky ABCDEF0123456789</string>
+    <string name="error_not_a_minimum_length">Nie je splnená minimálna dĺžka</string>
+    <string name="error_pin_not_valid">PIN by mal byť z 3 až 6 číslic, nie rovnakých, alebo za sebou nasledujúcich číslic</string>
+</resources>

core/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    Keys-->
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Protection-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!-- Maintenance -->
+    <!-- VersionChecker -->
+    <!-- Permissions -->
+    <!-- WeekdayPicker -->
+</resources>

core/src/main/res/values-ta-rIN/validator.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

core/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt

@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.plugins.iob.iobCalculator
 
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.interfaces.IobCobCalculatorInterface
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.asRounded
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.T
 import org.junit.Assert
@@ -30,88 +30,74 @@ class GlucoseStatusTest : TestBase() {
     @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorInterface
 
-    val injector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is GlucoseStatus) {
-                it.aapsLogger = aapsLogger
-                it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
-            }
-        }
-    }
-
     @Test fun toStringShouldBeOverloaded() {
-        val glucoseStatus = GlucoseStatus(injector)
+        val glucoseStatus = GlucoseStatus(glucose = 0.0, noise = 0.0, delta = 0.0, shortAvgDelta = 0.0, longAvgDelta = 0.0, date = 0)
         Assert.assertEquals(true, glucoseStatus.log().contains("Delta"))
     }
 
     @Test fun roundTest() {
-        val glucoseStatus = GlucoseStatus(injector)
+        val glucoseStatus = GlucoseStatus(glucose = 100.11111, noise = 0.0, delta = 0.0, shortAvgDelta = 0.0, longAvgDelta = 0.0, date = 0)
-        glucoseStatus.glucose = 100.11111
+        Assert.assertEquals(100.1, glucoseStatus.asRounded().glucose, 0.0001)
-        Assert.assertEquals(100.1, glucoseStatus.round().glucose, 0.0001)
     }
 
     @Test fun calculateValidGlucoseStatus() {
         PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateValidBgData())
-        val glucoseStatus = GlucoseStatus(injector).glucoseStatusData!!
+        val glucoseStatus = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin).glucoseStatusData!!
         Assert.assertEquals(214.0, glucoseStatus.glucose, 0.001)
         Assert.assertEquals(-2.0, glucoseStatus.delta, 0.001)
         Assert.assertEquals(-2.5, glucoseStatus.shortAvgDelta, 0.001) // -2 -2.5 -3 deltas are relative to current value
-        Assert.assertEquals(-2.5, glucoseStatus.avgDelta, 0.001) // the same as short_avgdelta
         Assert.assertEquals(-2.0, glucoseStatus.longAvgDelta, 0.001) // -2 -2 -2 -2
         Assert.assertEquals(1514766900000L, glucoseStatus.date) // latest date
     }
 
     @Test fun calculateMostRecentGlucoseStatus() {
         PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateMostRecentBgData())
-        val glucoseStatus: GlucoseStatus = GlucoseStatus(injector).glucoseStatusData!!
+        val glucoseStatus: GlucoseStatus = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin).glucoseStatusData!!
         Assert.assertEquals(215.0, glucoseStatus.glucose, 0.001) // (214+216) / 2
         Assert.assertEquals(-1.0, glucoseStatus.delta, 0.001)
         Assert.assertEquals(-1.0, glucoseStatus.shortAvgDelta, 0.001)
-        Assert.assertEquals(-1.0, glucoseStatus.avgDelta, 0.001)
         Assert.assertEquals(0.0, glucoseStatus.longAvgDelta, 0.001)
         Assert.assertEquals(1514766900000L, glucoseStatus.date) // latest date, even when averaging
     }
 
     @Test fun oneRecordShouldProduceZeroDeltas() {
         PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateOneCurrentRecordBgData())
-        val glucoseStatus: GlucoseStatus = GlucoseStatus(injector).glucoseStatusData!!
+        val glucoseStatus: GlucoseStatus = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin).glucoseStatusData!!
         Assert.assertEquals(214.0, glucoseStatus.glucose, 0.001)
         Assert.assertEquals(0.0, glucoseStatus.delta, 0.001)
         Assert.assertEquals(0.0, glucoseStatus.shortAvgDelta, 0.001) // -2 -2.5 -3 deltas are relative to current value
-        Assert.assertEquals(0.0, glucoseStatus.avgDelta, 0.001) // the same as short_avgdelta
         Assert.assertEquals(0.0, glucoseStatus.longAvgDelta, 0.001) // -2 -2 -2 -2
         Assert.assertEquals(1514766900000L, glucoseStatus.date) // latest date
     }
 
     @Test fun insufficientDataShouldReturnNull() {
         PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateInsufficientBgData())
-        val glucoseStatus: GlucoseStatus? = GlucoseStatus(injector).glucoseStatusData
+        val glucoseStatus: GlucoseStatus? = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin).glucoseStatusData
         Assert.assertEquals(null, glucoseStatus)
     }
 
     @Test fun oldDataShouldReturnNull() {
         PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateOldBgData())
-        val glucoseStatus: GlucoseStatus? = GlucoseStatus(injector).glucoseStatusData
+        val glucoseStatus: GlucoseStatus? = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin).glucoseStatusData
         Assert.assertEquals(null, glucoseStatus)
     }
 
     @Test fun returnOldDataIfAllowed() {
         PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateOldBgData())
-        val glucoseStatus: GlucoseStatus? = GlucoseStatus(injector).getGlucoseStatusData(true)
+        val glucoseStatus: GlucoseStatus? = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin).getGlucoseStatusData(true)
         Assert.assertNotEquals(null, glucoseStatus)
     }
 
     @Test fun averageShouldNotFailOnEmptyArray() {
-        Assert.assertEquals(0.0, GlucoseStatus.average(ArrayList()), 0.001)
+        Assert.assertEquals(0.0, GlucoseStatusProvider.average(ArrayList()), 0.001)
     }
 
     @Test fun calculateGlucoseStatusForLibreTestBgData() {
         PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateLibreTestData())
-        val glucoseStatus: GlucoseStatus = GlucoseStatus(injector).glucoseStatusData!!
+        val glucoseStatus: GlucoseStatus = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin).glucoseStatusData!!
         Assert.assertEquals(100.0, glucoseStatus.glucose, 0.001) //
         Assert.assertEquals(-10.0, glucoseStatus.delta, 0.001)
         Assert.assertEquals(-10.0, glucoseStatus.shortAvgDelta, 0.001)
-        Assert.assertEquals(-10.0, glucoseStatus.avgDelta, 0.001)
         Assert.assertEquals(-10.0, glucoseStatus.longAvgDelta, 0.001)
         Assert.assertEquals(1514766900000L, glucoseStatus.date) // latest date
     }

dana/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

insight/src/main/res/values-fr-rFR/alert_descriptions.xml

@@ -4,6 +4,7 @@
     <string name="alert_w31_description"><![CDATA[Volume dans le réservoir : <b>%1$s U</b>]]></string>
     <string name="alert_w32_description">Changer la batterie.</string>
     <string name="alert_w33_description">Régler heure/date.</string>
+    <string name="alert_w34_description">Contacter l\'assistance Accu-Chek.</string>
     <string name="alert_w36_description"><![CDATA[Quantité : <b>%1$d%%</b><br/>Durée : <b>%2$s h</b>]]></string>
     <string name="alert_w38_description"><![CDATA[Programmée: <b>%1$s U</b><br/>Délivrée: <b>%2$s U</b>]]></string>
     <string name="alert_m20_description">Insérer le réservoir.</string>
@@ -12,9 +13,12 @@
     <string name="alert_m23_description">Vérifier l\'état de la pompe.</string>
     <string name="alert_m24_description">Remplacer le dispositif de perfusion.</string>
     <string name="alert_m25_description">Contacter l\'assistance Accu-Check.</string>
+    <string name="alert_m26_description">Changer le réservoir.</string>
     <string name="alert_m27_description">Recommencer le transfert des données.</string>
+    <string name="alert_m28_description">Vérifier l\'état de la pompe.</string>
     <string name="alert_m29_description">Choisir le type de pile.</string>
     <string name="alert_m30_description">Choisir le type de réservoir.</string>
     <string name="alert_e6_description">Remplacer pile et réservoir.</string>
+    <string name="alert_e10_description">Changer le réservoir.</string>
     <string name="alert_e13_description">Changer la langue.</string>
 </resources>

insight/src/main/res/values-fr-rFR/alert_titles.xml

@@ -3,6 +3,7 @@
     <string name="alert_r1_title">Injecter le Bolus</string>
     <string name="alert_r2_title">Bolus manqués</string>
     <string name="alert_r3_title">Réveil</string>
+    <string name="alert_r4_title">Remplacer le dispositif de perfusion</string>
     <string name="alert_r7_title">DBT terminé</string>
     <string name="alert_w31_title">Réservoir bas</string>
     <string name="alert_w32_title">Batterie faible</string>

insight/src/main/res/values-pt-rPT/alert_titles.xml

@@ -4,12 +4,12 @@
     <string name="alert_r2_title">Bolus Não Administrado</string>
     <string name="alert_r3_title">Alarme</string>
     <string name="alert_r4_title">Mudar o conjunto de infusão</string>
-    <string name="alert_r7_title">DBT concluído</string>
+    <string name="alert_r7_title">DBT concluída</string>
     <string name="alert_w31_title">Reservatório quase vazio</string>
     <string name="alert_w32_title">Bateria fraca</string>
     <string name="alert_w33_title">Hora/Data inválida</string>
     <string name="alert_w34_title">Fora da Garantia</string>
-    <string name="alert_w36_title">DBT cancelado</string>
+    <string name="alert_w36_title">DBT cancelada</string>
     <string name="alert_w38_title">Bolus cancelado</string>
     <string name="alert_w39_title">Aviso de periodo de empréstimo</string>
     <string name="alert_m20_title">Cartucho não inserido</string>

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

@@ -34,7 +34,7 @@
     <string name="disable_vibration">Desactivar vibrações na entrega manual de bólus</string>
     <string name="disable_vibration_summary">Para bólus e bólus estendidos (só disponível com o firmware Insight 3.x)</string>
     <string name="disable_vibration_auto">Desactivar vibrações na entrega automática de bólus</string>
-    <string name="disable_vibration_auto_summary">Para SMB e Basal Temp com emulação DBT (só disponível com firmware Insight 3.x)</string>
+    <string name="disable_vibration_auto_summary">Para SMB e Basal Temporária com emulação DBT (só disponível com firmware Insight 3.x)</string>
     <string name="timeout_during_handshake">Tempo de operação excedido - reinicar bluetooth</string>
     <string name="pump_stopped">Bomba parada</string>
     <string name="pump_started">Bomba iniciada</string>
@@ -64,7 +64,7 @@
     <string name="log_battery_changes">Registar mudanças de bateria</string>
     <string name="log_operating_mode_changes">Alterações do modo de funcionamento de registo</string>
     <string name="log_alerts">Alertas de registo</string>
-    <string name="enable_tbr_emulation">Activar a emulação DBT</string>
+    <string name="enable_tbr_emulation">Activar a emulação da DBT</string>
     <string name="enable_tbr_emulation_summary">Utilizar bólus prolongados em vez de basais temporárias para contornar o limite de 250%%</string>
     <string name="disconnect_delay">Atraso de remoção [s]</string>
     <string name="max_recovery_duration">Duração máxima da recuperação [s]</string>

insight/src/main/res/values-sk-rSK/alert_descriptions.xml

@@ -2,7 +2,9 @@
 <resources>
     <string name="alert_r7_description"><![CDATA[Množstvo: <b>%1$d%%</b>\nTrvanie: <b>%2$s h</b>]]></string>
     <string name="alert_w31_description"><![CDATA[Objem zásobníka: <b>%1$s U</b>]]></string>
+    <string name="alert_w32_description">Vymeňte batériu.</string>
     <string name="alert_w33_description">Nastaviť čas/dátum.</string>
+    <string name="alert_w34_description">Kontaktujte podporu Accu-Check.</string>
     <string name="alert_w36_description"><![CDATA[Množstvo: <b>%1$d%%</b><br/>Trvanie: <b>%2$s h</b>]]></string>
     <string name="alert_w38_description"><![CDATA[Nastavené: <b>%1$s U</b><br/>Podané: <b>%2$s U</b>]]></string>
     <string name="alert_m20_description">Vložte zásobník.</string>
@@ -11,9 +13,12 @@
     <string name="alert_m23_description">Skontrolujte stav pumpy.</string>
     <string name="alert_m24_description">Vymeňte infúzny set.</string>
     <string name="alert_m25_description">Kontaktujte podporu Accu-Check.</string>
+    <string name="alert_m26_description">Vymeňte zásobník.</string>
     <string name="alert_m27_description">Obnoviť sťahovanie dát.</string>
+    <string name="alert_m28_description">Skontrolujte stav pumpy.</string>
     <string name="alert_m29_description">Nastavte typ batérie.</string>
     <string name="alert_m30_description">Nastavte typ zásobníka.</string>
     <string name="alert_e6_description">Vymeňte batériu a zásobník.</string>
+    <string name="alert_e10_description">Vymeňte zásobník.</string>
     <string name="alert_e13_description">Zmeniť jazyk.</string>
 </resources>

insight/src/main/res/values-sv-rSE/alert_descriptions.xml

@@ -2,7 +2,9 @@
 <resources>
     <string name="alert_r7_description"><![CDATA[Mängd: <b>%1$d%%</b>\nDuration: <b>%2$s h</b>]]></string>
     <string name="alert_w31_description"><![CDATA[Insulinreservoar: <b>%1$s U</b>]]></string>
+    <string name="alert_w32_description">Byt batteri.</string>
     <string name="alert_w33_description">Ställ in tid/datum.</string>
+    <string name="alert_w34_description">Kontakta Accu-Cheks support.</string>
     <string name="alert_w36_description"><![CDATA[Mängd: <b>%1$d%%</b><br/>Duration: <b>%2$s h</b>]]></string>
     <string name="alert_w38_description"><![CDATA[Angivet: <b>%1$s U</b><br/>Levererat: <b>%2$s U</b>]]></string>
     <string name="alert_m20_description">Sätt i reservoar.</string>
@@ -11,9 +13,12 @@
     <string name="alert_m23_description">Kontrollera pumpstatus.</string>
     <string name="alert_m24_description">Byt infusionsset.</string>
     <string name="alert_m25_description">Kontakta Accu-Cheks support.</string>
+    <string name="alert_m26_description">Byt reservoar.</string>
     <string name="alert_m27_description">Hämta data på nytt.</string>
+    <string name="alert_m28_description">Kontrollera pumpstatus.</string>
     <string name="alert_m29_description">Ange typ av batteri.</string>
     <string name="alert_m30_description">Ange typ av reservoar.</string>
     <string name="alert_e6_description">Byt batteri och reservoar.</string>
+    <string name="alert_e10_description">Byt reservoar.</string>
     <string name="alert_e13_description">Byt språk.</string>
 </resources>

insight/src/main/res/values-sv-rSE/alert_titles.xml

@@ -3,6 +3,7 @@
     <string name="alert_r1_title">Leverera bolus</string>
     <string name="alert_r2_title">Missad bolus</string>
     <string name="alert_r3_title">Väckarklocka</string>
+    <string name="alert_r4_title">Byt infusionsset</string>
     <string name="alert_r7_title">Temp basal avslutad</string>
     <string name="alert_w31_title">Låg nivå reservoar</string>
     <string name="alert_w32_title">Låg batterinivå</string>

insight/src/main/res/values-ta-rIN/alert_codes.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

insight/src/main/res/values-ta-rIN/alert_descriptions.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

insight/src/main/res/values-ta-rIN/alert_titles.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

insight/src/main/res/values-ta-rIN/exceptions.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

insight/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -51,13 +51,13 @@
     <string name="medtronic_pump_history">Histórico da Bomba Medtronic</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">Cancelou o Bolus, depois de ele já ter sido definido na Bomba. Uma vez que a Bomba Medtronic não suporta cancelamento, precisará de cancelar manualmente. Coloque a Bomba no modo de Suspender e depois Retome (se ainda quiser cancelar). A aplicação irá obter as alterações, na próxima actualização (em menos de 5 minutos).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler o DBT actual.</string>
+    <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler a DBT actual.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Não foi possível cancelar o DBT actual. A parar a operação.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Não foi possível cancelar a DBT actual. A parar a operação.</string>
     <string name="medtronic_cmd_set_profile_pattern_overflow">Falhou Definir Perfil devido aos seguintes padrões, tem uma taxa de basal muito grande: %1$s</string>
     <string name="medtronic_cmd_bolus_could_not_be_delivered">O bólus não pôde ser administrado.</string>
     <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bólus não foi administado, porque o quantidade de insulina disponível (%1$.2f) é menor que o bólus necessário (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">DBT não pode ser definido.</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">DBT não pode ser definida.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Não foi possível cancelar o DBT actual.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Não foi possível cancelar a DBT actual.</string>
     <string name="medtronic_cmd_basal_profile_could_not_be_set">Perfil Basal não pôde ser definido.</string>
     <string name="medtronic_cmd_basal_profile_not_set_is_same">Perfil Basal é o mesmo, então não será definido novamente.</string>
     <string name="medtronic_cmd_desc_get_history">Obter Histórico - Página %1$d (%2$d/16)</string>

medtronic/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+</resources>

omnipod-common/src/main/res/values-pt-rPT/strings.xml

@@ -18,8 +18,10 @@
     <string name="omnipod_common_error_bolus_did_not_succeed">Bólus não foi bem-sucedido.</string>
     <string name="omnipod_common_error_failed_to_set_profile_empty_profile">Falha ao definir o perfil basal: recebido um perfil vazio. Certifique-se de ativar o seu perfil basal.</string>
     <string name="omnipod_common_error_set_initial_basal_schedule_no_profile">Não há perfil basal activo. Certifique-se de activar o seu perfil basal.</string>
+    <string name="omnipod_common_error_unsupported_custom_command">Comando personalizado não suportado: %1$s</string>
     <string name="omnipod_common_error_failed_to_refresh_status">Falhou ao actualizar o estado</string>
     <string name="omnipod_common_error_failed_to_refresh_status_on_startup">Falha ao actualizar estado na inicialização</string>
+    <string name="omnipod_common_error_failed_to_silence_alerts">Falha ao silenciar alertas</string>
     <string name="omnipod_common_error_failed_to_suspend_delivery">Falha ao suspender a administração</string>
     <string name="omnipod_common_error_failed_to_set_time">Falha ao definir a hora</string>
     <string name="omnipod_common_error_failed_to_resume_delivery">Falha ao retomar a administração</string>
@@ -37,15 +39,20 @@
     <string name="omnipod_common_confirmation_expiration_alerts_updated">Configuração de alerta foi actualizada no Pod.</string>
     <string name="omnipod_common_confirmation_time_on_pod_updated">A hora no Pod foi actualizada.</string>
     <string name="omnipod_common_confirmation_suspended_delivery">Toda administração de insulina foi suspensa.</string>
+    <string name="omnipod_common_confirmation_silenced_alerts">Alertas activos foram silenciados.</string>
     <string name="omnipod_common_confirmation_delivery_resumed">A administração de insulina foi retomada.</string>
     <!-- Omnipod - Overview -->
     <string name="omnipod_common_overview_button_set_time">Definir hora</string>
     <string name="omnipod_common_overview_button_suspend_delivery">Suspender</string>
     <string name="omnipod_common_overview_button_resume_delivery">Retomar Administração</string>
     <string name="omnipod_common_overview_button_pod_management">Gestão Pod</string>
+    <string name="omnipod_common_overview_button_silence_alerts">Silenciar Alertas</string>
     <string name="omnipod_common_overview_pod_status">Estado do Pod</string>
     <string name="omnipod_common_overview_total_delivered">Total Administrado</string>
     <string name="omnipod_common_overview_total_delivered_value">%1$.2f U</string>
+    <string name="omnipod_common_overview_pod_unique_id">ID Único</string>
+    <string name="omnipod_common_overview_lot_number">Número de LOTE</string>
+    <string name="omnipod_common_overview_pod_sequence_number">Número da Sequência</string>
     <string name="omnipod_common_overview_pod_expiry_date">Pod Expira</string>
     <string name="omnipod_common_overview_last_connection">Última Ligação</string>
     <string name="omnipod_common_overview_last_bolus">Último Bólus</string>
@@ -93,13 +100,14 @@
     <string name="omnipod_common_preferences_bolus_beeps_enabled">Beeps bólus activados</string>
     <string name="omnipod_common_preferences_basal_beeps_enabled">Beeps de basal activados</string>
     <string name="omnipod_common_preferences_smb_beeps_enabled">Beeps SMB activado</string>
-    <string name="omnipod_common_preferences_tbr_beeps_enabled">Beeps TBR activados</string>
+    <string name="omnipod_common_preferences_tbr_beeps_enabled">Beeps DBT activados</string>
     <string name="omnipod_common_preferences_suspend_delivery_button_enabled">Mostrar Botão Suspender Administração no separador Omnipod</string>
     <string name="omnipod_common_preferences_time_change_enabled">Detecção de DST/Fuso Horário Activado</string>
     <string name="omnipod_common_preferences_expiration_reminder_enabled">Lembrete de expiração activado</string>
     <string name="omnipod_common_preferences_expiration_reminder_hours_before_shutdown">Horas antes de desligar</string>
     <string name="omnipod_common_preferences_low_reservoir_alert_enabled">Alerta de reservatório baixo activado</string>
     <string name="omnipod_common_preferences_low_reservoir_alert_units">No. Unidades</string>
+    <string name="omnipod_common_preferences_automatically_silence_alerts">Silenciar automaticamente alertas do Pod</string>
     <string name="omnipod_common_preferences_category_other">Outro</string>
     <string name="omnipod_common_preferences_category_alerts">Alertas</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Beeps de Confirmação</string>
@@ -126,6 +134,7 @@
     <string name="omnipod_common_cmd_get_pod_info">Obter Pod Info</string>
     <string name="omnipod_common_cmd_set_time">Definir Hora</string>
     <string name="omnipod_common_cmd_configure_alerts">Configurar Alertas</string>
+    <string name="omnipod_common_cmd_silence_alerts">Silenciar Alertas</string>
     <string name="omnipod_common_cmd_suspend_delivery">Suspender Administração</string>
     <string name="omnipod_common_cmd_resume_delivery">Retomar Administração</string>
     <string name="omnipod_common_cmd_unknown_entry">Entrada Desconhecida</string>

omnipod-common/src/main/res/values-sk-rSK/strings.xml

@@ -2,17 +2,198 @@
 <resources>
     <!-- Omnipod - Keys -->
     <!-- Omnipod - Pod Management -->
+    <string name="omnipod_common_pod_management_title">Správa Podu</string>
+    <string name="omnipod_common_pod_management_heading_actions">Akcie</string>
+    <string name="omnipod_common_pod_management_heading_tools">Nástroje</string>
+    <string name="omnipod_common_pod_management_button_activate_pod">Aktivovať Pod</string>
+    <string name="omnipod_common_pod_management_button_deactivate_pod">Deaktivovať Pod</string>
+    <string name="omnipod_common_pod_management_button_discard_pod">Vyradiť Pod</string>
+    <string name="omnipod_common_pod_management_discard_pod_confirmation">Pokiaľ zahodíte Pod, už s ním nebudete môcť komunikovať. Mali by ste to urobiť iba vtedy, pokiaľ celá komunikácia s Podom trvalo zlyháva. Pokiaľ stále môžete komunikovať s Podom, použite možnosť <b>Deaktivovať Pod</b>.\n\nPokiaľ si prajete pokračovať, uistite sa prosím, že odstránite Pod z tela!</string>
+    <string name="omnipod_common_pod_management_button_play_test_beep">Prehrať testovacie pípnutie</string>
+    <string name="omnipod_common_pod_management_button_playing_test_beep">Prehrávanie testovacieho pípnutia…</string>
+    <string name="omnipod_common_pod_management_button_pod_history">História Podu</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_common_error_pod_not_attached">Žiadny aktívny Pod</string>
+    <string name="omnipod_common_error_set_basal_failed">Nastavenie bazálneho profilu zlyhalo.</string>
+    <string name="omnipod_common_error_bolus_did_not_succeed">Podanie bolusu nebolo úspešné.</string>
+    <string name="omnipod_common_error_failed_to_set_profile_empty_profile">Nepodarilo sa nastaviť bazálny profil: bol prijatý prázdny profil. Uistite sa, že ste aktivovali svoj bazálny profil.</string>
+    <string name="omnipod_common_error_set_initial_basal_schedule_no_profile">Žiadny bazálny profil nie je aktívny. Uistite sa, že ste aktivovali svoj bazálny profil.</string>
+    <string name="omnipod_common_error_unsupported_custom_command">Nepodporovaný vlastný príkaz: %1$s</string>
+    <string name="omnipod_common_error_failed_to_refresh_status">Nepodarilo sa obnoviť stav</string>
+    <string name="omnipod_common_error_failed_to_refresh_status_on_startup">Nepodarilo se aktualizovať stav pri spustení</string>
+    <string name="omnipod_common_error_failed_to_silence_alerts">Nepodarilo sa potvrdiť výstrahy</string>
+    <string name="omnipod_common_error_failed_to_suspend_delivery">Nepodarilo sa pozastaviť podávanie inzulínu</string>
+    <string name="omnipod_common_error_failed_to_set_time">Nepodarilo sa nastaviť čas</string>
+    <string name="omnipod_common_error_failed_to_resume_delivery">Podávanie inzulínu sa nepodarilo spustiť</string>
+    <string name="omnipod_common_error_failed_to_initialize_pod">Nepodarilo sa inicializovať Pod</string>
+    <string name="omnipod_common_error_failed_to_insert_cannula">Nepodarilo sa vložiť kanylu</string>
+    <string name="omnipod_common_error_pod_fault_activation_time_exceeded">Bol prekročený čas aktivácie Podu. Tento Pod sa už nedá aktivovať.</string>
+    <string name="omnipod_common_error_failed_to_verify_activation_progress">Nepodarilo sa overiť priebeh aktivácie. Skúste to znova.</string>
+    <string name="omnipod_common_error_pod_suspended">Pod pozastavený</string>
+    <string name="omnipod_common_error_failed_to_play_test_beep">Nepodarilo se prehrať testovacie pípnutie</string>
+    <string name="omnipod_common_error_time_out_of_sync">Čas na Pode nie je synchronizovaný. Aktualizujte prosím čas na záložke Omnipod.</string>
+    <string name="omnipod_common_error_unexpected_exception">Došlo k neočakávanej chybe. Prosíme o jej nahlásenie! (%1$s: %2$s).</string>
     <!-- Omnipod - Confirmation -->
+    <string name="omnipod_common_confirmation">Potvrdenie</string>
+    <string name="omnipod_common_confirmation_time_or_timezone_change">Čas a/alebo časová zóna zmenená na Pode.</string>
+    <string name="omnipod_common_confirmation_expiration_alerts_updated">Nastavenie výstrahy bolo v Pode aktualizované.</string>
+    <string name="omnipod_common_confirmation_time_on_pod_updated">Čas na Pode bol aktualizovaný.</string>
+    <string name="omnipod_common_confirmation_suspended_delivery">Všetko podávanie inzulínu bolo pozastavené.</string>
+    <string name="omnipod_common_confirmation_silenced_alerts">Aktívne výstrahy boli potvrdené.</string>
+    <string name="omnipod_common_confirmation_delivery_resumed">Podávanie inzulínu bolo obnovené.</string>
     <!-- Omnipod - Overview -->
+    <string name="omnipod_common_overview_button_set_time">Nastavenie času</string>
+    <string name="omnipod_common_overview_button_suspend_delivery">Pozastavenia</string>
+    <string name="omnipod_common_overview_button_resume_delivery">Pokračovať v dodávaní inzulínu</string>
+    <string name="omnipod_common_overview_button_pod_management">Správa Podu</string>
+    <string name="omnipod_common_overview_button_silence_alerts">Stíšiť alarmy</string>
+    <string name="omnipod_common_overview_pod_status">Stav Podu</string>
+    <string name="omnipod_common_overview_total_delivered">Celkovo podané</string>
+    <string name="omnipod_common_overview_total_delivered_value">%1$.2f JI</string>
+    <string name="omnipod_common_overview_pod_unique_id">Jedinečné ID</string>
+    <string name="omnipod_common_overview_lot_number">Číslo šarže</string>
+    <string name="omnipod_common_overview_pod_sequence_number">Poradové číslo</string>
+    <string name="omnipod_common_overview_pod_expiry_date">Expirácia Podu</string>
+    <string name="omnipod_common_overview_last_connection">Posledné spojenie</string>
+    <string name="omnipod_common_overview_last_bolus">Posledný bolus</string>
+    <string name="omnipod_common_overview_temp_basal_rate">Dočasná bazálna dávka</string>
+    <string name="omnipod_common_overview_base_basal_rate">Základná hodnota bazálu</string>
+    <string name="omnipod_common_overview_reservoir">Zásobník</string>
+    <string name="omnipod_common_overview_pod_active_alerts">Výstrahy aktívneho Podu</string>
+    <string name="omnipod_common_overview_firmware_version">Verzia firmvéru</string>
+    <string name="omnipod_common_overview_time_on_pod">Čas na Pode</string>
+    <string name="omnipod_common_overview_temp_basal_value">%1$.2fJI/h @%2$s (%3$d/%4$d minút)</string>
+    <string name="omnipod_common_overview_reservoir_value">Zostáva %1$.2f JI</string>
+    <string name="omnipod_common_overview_reservoir_value_over50">Zostáva viac ako 50 JI</string>
+    <string name="omnipod_common_overview_errors">Chyby</string>
     <!-- Omnipod - Wizard Base -->
+    <string name="omnipod_common_wizard_button_cancel">Zrušiť</string>
+    <string name="omnipod_common_wizard_button_finish">Dokončiť</string>
+    <string name="omnipod_common_wizard_button_next">Ďalšia</string>
+    <string name="omnipod_common_wizard_button_retry">Opakovať</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Deaktivovať Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Vyradiť Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Doposiaľ ste nedokončili všetky kroky. Ste si istý, že chcete ukončiť prácu?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Ukončiť</string>
     <!-- Omnipod - Pod Activation Wizard -->
+    <string name="omnipod_common_pod_activation_wizard_start_pod_activation_title">Naplniť Pod</string>
+    <string name="omnipod_common_pod_activation_wizard_initialize_pod_title">Inicializovať Pod</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_title">Nasaďte Pod</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_text">Pripravte infúzne miesto. Odstráňte krytku ihly a náplasti a nalepte Pod.\n\nPokiaľ sa kanyla odlepí, stlačíte <b>Zrušiť</b> a zahoďte Pod.\n\nStlačte <b>Ďalšia</b> pre vloženie kanyly a spustenie bazálu.</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">Keď stlačíte <b>OK</b>, kanyla se vloží. Uistite sa, že ste pripojili Pod k infuznemu miestu.</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_title">Vložiť kanylu</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_text">Snažím sa nastaviť počiatočný základný bazál a vložiť kanylu.\n\nPo úspešnom vložení kanyly môžete stlačiť tlačítko <b>Ďalšia</b>.</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_title">Pod aktivovaný</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_text">Pod je teraz aktívny.\n\nVáš bazál bol naprogramovaný a kanyla bola vložená.\n\nOverte prosím, že kanyla bola vložená správne a prípadne vymeňte Pod.</string>
     <!-- Omnipod - Pod Deactivation Wizard -->
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_title">Deaktivovať Pod</string>
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text">Stlačte<b>Ďalšia</b> pre deaktiváciu Podu.\n\n<b>Poznámka:</b> Úplne zastavíte podávanie inzulínu a deaktivujete Pod.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_title">Deaktivácia Podu</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_text">Deaktivácia Podu.\n\nPo úspešnom dokončení deaktivácie môžete stlačiť <b>Ďalšia</b>.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_title">Pod deaktivovaný</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_text">Pod deaktivovaný.\n\nOdstráňte Pod z tela a znehodnoťte ho.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_title">Pod vyradený</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_text">Stav Podu bol vyradený. Podávanie inzulínu nebolo pozastavené, pretože Pod nebol riadne deaktivovaný!\n\nOdstráňte Pod z vašeho tela a recyklujte ho.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod_confirmation">Pokiaľ tento Pod vyradíte, nebudete s ním už mocť komunikovať. Túto operáciu by ste mali urobiť iba v prípade, že celá komunikácia s týmto Podom trvale zlyháva. Naozaj chcete vyradiť Pod?</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod">Vyradiť Pod</string>
     <!-- Omnipod - Preferences -->
+    <string name="omnipod_common_preferences_bolus_beeps_enabled">Pípnutie pri boluse povolené</string>
+    <string name="omnipod_common_preferences_basal_beeps_enabled">Pípnutie pri bazále povolené</string>
+    <string name="omnipod_common_preferences_smb_beeps_enabled">Pípnutie pri SMB povolené</string>
+    <string name="omnipod_common_preferences_tbr_beeps_enabled">Pípnutie pri TBR povolené</string>
+    <string name="omnipod_common_preferences_suspend_delivery_button_enabled">Zobraziť tlačítko \"Pozastaviť podávanie\" na záložke Omnipod</string>
+    <string name="omnipod_common_preferences_time_change_enabled">Letný čas / Detekcia časového pásma povolená</string>
+    <string name="omnipod_common_preferences_expiration_reminder_enabled">Pripomenutie vypršania platnosti povolené</string>
+    <string name="omnipod_common_preferences_expiration_reminder_hours_before_shutdown">Hodiny pred vypnutím</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_enabled">Upozornenie na nízký stav zásobníka povolené</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_units">Počet jednotiek</string>
+    <string name="omnipod_common_preferences_automatically_silence_alerts">Automaticky potvrdzovať výstrahy Podu</string>
+    <string name="omnipod_common_preferences_category_other">Iné</string>
+    <string name="omnipod_common_preferences_category_alerts">Výstrahy</string>
+    <string name="omnipod_common_preferences_category_confirmation_beeps">Potvrdzovacie pípnutia</string>
     <!-- Omnipod - Pod Status -->
+    <string name="omnipod_common_pod_status_no_active_pod">Žiadny aktívny Pod</string>
+    <string name="omnipod_common_pod_status_waiting_for_activation">Prebieha inštalácia (čaká sa na aktiváciu Podu)</string>
+    <string name="omnipod_common_pod_status_waiting_for_cannula_insertion">Inštalácia prebieha (čaká sa na vloženie kanyly)</string>
+    <string name="omnipod_common_pod_status_running">V prevádzke</string>
+    <string name="omnipod_common_pod_status_suspended">Pozastavené</string>
+    <string name="omnipod_common_pod_status_pod_fault">Chyba Podu</string>
+    <string name="omnipod_common_pod_status_activation_time_exceeded">Bol prekročený čas aktivácie</string>
+    <string name="omnipod_common_pod_status_inactive">Neaktívny</string>
+    <string name="omnipod_common_pod_status_pod_fault_description">Chyba Podu: %1$03d %2$s</string>
     <!-- Omnipod - Commands -->
+    <string name="omnipod_common_cmd_deactivate_pod">Deaktivovať Pod</string>
+    <string name="omnipod_common_cmd_discard_pod">Vyradiť Pod</string>
+    <string name="omnipod_common_cmd_set_bolus">Nastavovanie bolusu</string>
+    <string name="omnipod_common_cmd_cancel_bolus">Zrušiť bolus</string>
+    <string name="omnipod_common_cmd_set_tbr">Nastavovanie dočasného bazálu</string>
+    <string name="omnipod_common_cmd_cancel_tbr_by_driver">Zrušiť dočasný bazál (interne ovládačom)</string>
+    <string name="omnipod_common_cmd_cancel_tbr">Zrušiť dočasný bazál</string>
+    <string name="omnipod_common_cmd_set_basal_schedule">Nastaviť plán bazálu</string>
+    <string name="omnipod_common_cmd_get_pod_status">Zistiť stav Podu</string>
+    <string name="omnipod_common_cmd_get_pod_info">Zistiť informácie o Pode</string>
+    <string name="omnipod_common_cmd_set_time">Nastaviť čas</string>
+    <string name="omnipod_common_cmd_configure_alerts">Nastaviť výstrahy</string>
+    <string name="omnipod_common_cmd_silence_alerts">Stíšiť alarmy</string>
+    <string name="omnipod_common_cmd_suspend_delivery">Pozastaviť dodávanie inzulínu</string>
+    <string name="omnipod_common_cmd_resume_delivery">Pokračovať v dodávaní inzulínu</string>
+    <string name="omnipod_common_cmd_unknown_entry">Neznáma položka</string>
+    <string name="omnipod_common_cmd_initialize_pod">Inicializovať Pod</string>
+    <string name="omnipod_common_cmd_insert_cannula">Vložiť kanylu</string>
+    <string name="omnipod_common_cmd_read_pulse_log">Čítať protokol pulzov</string>
+    <string name="omnipod_common_cmd_set_fake_suspended_tbr">Nastaviť falošný dočasný bazál, pretože Pod je pozastavený</string>
+    <string name="omnipod_common_cmd_cancel_fake_suspended_tbr">Zrušiť falošný dočasný bazál ktorý bol vytvorený, pretože Pod bol pozastavený</string>
+    <string name="omnipod_common_cmd_split_tbr">Rozdeliť dočasný bazál kvôli neistej chybe pri zrušení</string>
+    <string name="omnipod_common_cmd_beep_config">Nastavenie pípnutia</string>
+    <string name="omnipod_common_cmd_play_test_beep">Prehrať testovacie pípnutie</string>
     <!-- Omnipod - Alerts -->
+    <string name="omnipod_common_alert_finish_pairing_reminder">Pripomienka ukončenia párovania</string>
+    <string name="omnipod_common_alert_finish_setup_reminder_reminder">Pripomienka ukončenia nastavenia</string>
+    <string name="omnipod_common_alert_expiration">Pod čoskoro expiruje</string>
+    <string name="omnipod_common_alert_expiration_advisory">Pod čoskoro expiruje</string>
+    <string name="omnipod_common_alert_shutdown_imminent">Vypnutie je bezprostredné</string>
+    <string name="omnipod_common_alert_low_reservoir">Nízka hladina zásobníka</string>
+    <string name="omnipod_common_alert_unknown_alert">Neznáma výstraha</string>
     <!-- Omnipod - Short status -->
+    <string name="omnipod_common_short_status_no_active_pod">Žiadny aktívny Pod</string>
+    <string name="omnipod_common_short_status_last_connection">Posledné spoj: pred %1$d min</string>
+    <string name="omnipod_common_short_status_last_bolus">Posledný Bolus: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_temp_basal">Doč. bazál: %1$s</string>
+    <string name="omnipod_common_short_status_extended_bolus">Predl. bolus: %1$s</string>
+    <string name="omnipod_common_short_status_reservoir">Zásobník: %1$sJI</string>
     <!-- Omnipod - Other -->
+    <string name="omnipod_common_yes">Áno</string>
+    <string name="omnipod_common_no">Nie</string>
+    <string name="omnipod_common_ok">OK</string>
+    <string name="omnipod_common_cancel">Zrušiť</string>
+    <string name="omnipod_common_warning">Upozornenie</string>
     <!-- Omnipod - Times -->
+    <string name="omnipod_common_moments_ago">Pred chvíľou</string>
+    <string name="omnipod_common_less_than_a_minute_ago">Pred menej ako minútou</string>
+    <string name="omnipod_common_composite_time">%1$s a %2$s</string>
+    <string name="omnipod_common_time_ago">pred %1$s min</string>
+    <plurals name="omnipod_common_minutes">
+        <item quantity="one">%1$d minúta</item>
+        <item quantity="few">%1$d minút</item>
+        <item quantity="many">%1$d minút</item>
+        <item quantity="other">%1$d minút</item>
+    </plurals>
+    <plurals name="omnipod_common_hours">
+        <item quantity="one">%1$d hodina</item>
+        <item quantity="few">%1$d hodín</item>
+        <item quantity="many">%1$d hodín</item>
+        <item quantity="other">%1$d hodín</item>
+    </plurals>
+    <plurals name="omnipod_common_days">
+        <item quantity="one">%1$d deň</item>
+        <item quantity="few">%1$d dní</item>
+        <item quantity="many">%1$d dní</item>
+        <item quantity="other">%1$d dní</item>
+    </plurals>
+    <plurals name="omnipod_common_pod_alerts">
+        <item quantity="one">Výstraha Podu: %1$s</item>
+        <item quantity="few">Výstrahy Podu: %1$s</item>
+        <item quantity="many">Výstrahy Podu: %1$s</item>
+        <item quantity="other">Výstrahy Podu: %1$s</item>
+    </plurals>
 </resources>

omnipod-common/src/main/res/values-sv-rSE/strings.xml

@@ -2,17 +2,186 @@
 <resources>
     <!-- Omnipod - Keys -->
     <!-- Omnipod - Pod Management -->
+    <string name="omnipod_common_pod_management_title">Podhantering</string>
+    <string name="omnipod_common_pod_management_heading_actions">Åtgärder</string>
+    <string name="omnipod_common_pod_management_heading_tools">Verktyg</string>
+    <string name="omnipod_common_pod_management_button_activate_pod">Aktivera Pod</string>
+    <string name="omnipod_common_pod_management_button_deactivate_pod">Inaktivera pod</string>
+    <string name="omnipod_common_pod_management_button_discard_pod">Ta bort Pod</string>
+    <string name="omnipod_common_pod_management_discard_pod_confirmation">Om du tar bort Pod, kommer du inte att kunna kommunicera med den längre. Du bör bara göra detta när all kommunikation med Pod ständigt misslyckas. Om du fortfarande kan kommunicera med Pod, använd alternativet <b>Inaktivera Pod</b>.\n\nOm du vill fortsätta, se till att ta bort Pod från kroppen!</string>
+    <string name="omnipod_common_pod_management_button_play_test_beep">Spela upp testljud</string>
+    <string name="omnipod_common_pod_management_button_playing_test_beep">Spelar testljud…</string>
+    <string name="omnipod_common_pod_management_button_pod_history">Pod-historik</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_common_error_pod_not_attached">Ingen aktiv pod</string>
+    <string name="omnipod_common_error_set_basal_failed">Lyckades inte sätta basalprofilen.</string>
+    <string name="omnipod_common_error_bolus_did_not_succeed">Bolus misslyckades.</string>
+    <string name="omnipod_common_error_failed_to_set_profile_empty_profile">Det gick inte att ställa in basalprofilen: Tog emot en tom profil. Se till att du aktiverar basalprofilen.</string>
+    <string name="omnipod_common_error_set_initial_basal_schedule_no_profile">Ingen basalprofil är aktiv. Se till att du aktiverar basalprofilen.</string>
+    <string name="omnipod_common_error_unsupported_custom_command">Anpassat kommando stöds ej: %1$s</string>
+    <string name="omnipod_common_error_failed_to_refresh_status">Det gick inte att uppdatera status</string>
+    <string name="omnipod_common_error_failed_to_refresh_status_on_startup">Det gick inte att uppdatera status vid start</string>
+    <string name="omnipod_common_error_failed_to_silence_alerts">Det gick inte att kvittera larm</string>
+    <string name="omnipod_common_error_failed_to_suspend_delivery">Det gick inte att stoppa leverans</string>
+    <string name="omnipod_common_error_failed_to_set_time">Det gick inte att ange tid</string>
+    <string name="omnipod_common_error_failed_to_resume_delivery">Misslyckades återuppta leveransen</string>
+    <string name="omnipod_common_error_failed_to_initialize_pod">Misslyckades att initiera Pod</string>
+    <string name="omnipod_common_error_failed_to_insert_cannula">Misslyckades att skjuta in kanylen</string>
+    <string name="omnipod_common_error_pod_fault_activation_time_exceeded">Podens aktiveringstid har överskridits. Denna Pod kan inte längre aktiveras.</string>
+    <string name="omnipod_common_error_failed_to_verify_activation_progress">Det gick inte att verifiera aktiveringen. Försök igen.</string>
+    <string name="omnipod_common_error_pod_suspended">Pod pausad</string>
+    <string name="omnipod_common_error_failed_to_play_test_beep">Det gick inte att spela testpip</string>
+    <string name="omnipod_common_error_time_out_of_sync">Tiden på Podden är ur synk. Vänligen uppdatera tiden i Omnipod fliken.</string>
+    <string name="omnipod_common_error_unexpected_exception">Ett oväntat fel uppstod. Vänligen rapportera! (%1$s: %2$s).</string>
     <!-- Omnipod - Confirmation -->
+    <string name="omnipod_common_confirmation">Bekräftelse</string>
+    <string name="omnipod_common_confirmation_time_or_timezone_change">Tid och/eller tidszon ändrad på Pod.</string>
+    <string name="omnipod_common_confirmation_expiration_alerts_updated">Varningskonfigurationen har uppdaterats i Pod.</string>
+    <string name="omnipod_common_confirmation_time_on_pod_updated">Tiden på Pod har uppdaterats.</string>
+    <string name="omnipod_common_confirmation_suspended_delivery">All insulinleverans har stoppats.</string>
+    <string name="omnipod_common_confirmation_silenced_alerts">Aktiva varningar har kvitterats.</string>
+    <string name="omnipod_common_confirmation_delivery_resumed">Insulinleveransen har återupptagits.</string>
     <!-- Omnipod - Overview -->
+    <string name="omnipod_common_overview_button_set_time">Ställ in tid</string>
+    <string name="omnipod_common_overview_button_suspend_delivery">Pausa</string>
+    <string name="omnipod_common_overview_button_resume_delivery">Återuppta insulintillförsel</string>
+    <string name="omnipod_common_overview_button_pod_management">Omnipod</string>
+    <string name="omnipod_common_overview_button_silence_alerts">Kvittera Larm</string>
+    <string name="omnipod_common_overview_pod_status">Pod-status</string>
+    <string name="omnipod_common_overview_total_delivered">Totalt levererat</string>
+    <string name="omnipod_common_overview_total_delivered_value">%1$.2fU</string>
+    <string name="omnipod_common_overview_pod_unique_id">Unikt ID</string>
+    <string name="omnipod_common_overview_lot_number">LOT-nummer</string>
+    <string name="omnipod_common_overview_pod_sequence_number">Sekvensnummer</string>
+    <string name="omnipod_common_overview_pod_expiry_date">Pod går ut</string>
+    <string name="omnipod_common_overview_last_connection">Senaste anslutning</string>
+    <string name="omnipod_common_overview_last_bolus">Senaste bolus</string>
+    <string name="omnipod_common_overview_temp_basal_rate">Temp basaldos</string>
+    <string name="omnipod_common_overview_base_basal_rate">Profilens basaldos</string>
+    <string name="omnipod_common_overview_reservoir">Reservoar</string>
+    <string name="omnipod_common_overview_pod_active_alerts">Aktiva pod-varningar</string>
+    <string name="omnipod_common_overview_firmware_version">Firmwareversion</string>
+    <string name="omnipod_common_overview_time_on_pod">Tid i Pod</string>
+    <string name="omnipod_common_overview_temp_basal_value">%1$.2fU/h @%2$s (%3$d/%4$d min)</string>
+    <string name="omnipod_common_overview_reservoir_value">%1$.2f U återstår</string>
+    <string name="omnipod_common_overview_reservoir_value_over50">Mer än 50 U kvar</string>
+    <string name="omnipod_common_overview_errors">Fel</string>
     <!-- Omnipod - Wizard Base -->
+    <string name="omnipod_common_wizard_button_cancel">Avbryt</string>
+    <string name="omnipod_common_wizard_button_finish">Slutför</string>
+    <string name="omnipod_common_wizard_button_next">Nästa</string>
+    <string name="omnipod_common_wizard_button_retry">Försök igen</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Inaktivera pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Ta bort Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Du har inte gjort alla steg än. Är du säker på att du vill avsluta?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Avsluta</string>
     <!-- Omnipod - Pod Activation Wizard -->
+    <string name="omnipod_common_pod_activation_wizard_start_pod_activation_title">Fyll Pod</string>
+    <string name="omnipod_common_pod_activation_wizard_initialize_pod_title">Initiera Pod</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_title">Fäst Pod</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_text">Förbered infusionsplatsen. Ta bort Podens nålskydd och fäst Pod på infusionsplatsen.\n\nOm kanylen sticker ut, tryck <b>Avbryt</b> och kassera din Pod.\n\nTryck <b>Nästa</b> för att skjuta in kanylen och påbörja basaleverans.</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">När du trycker på <b>OK</b>, kommer kanylen att skjutas in. Se till att du har fäst Poden på infusionsplatsen.</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_title">Skjut in kanylen</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_text">Försöker ställa in basalprogram och skjuta in kanylen.\n\nNär kanylen är på plats kan du trycka på <b>Nästa</b>.</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_title">Pod aktiverad</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_text">Den nya Poden är nu aktiv.\n\nDitt basalprogram har lagrats och kanylen är inne.\n\nKontrollera att kanylen har skjutits in på rätt sätt. Byt Pod om du tror att den inte har gjort det.</string>
     <!-- Omnipod - Pod Deactivation Wizard -->
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_title">Inaktivera pod</string>
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text">Tryck på <b>Nästa</b> för att inaktivera podden.\n\n<b>OBS!</b> Det här stoppar all insulintillförsel och inaktiverar podden.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_title">Inaktiverar Pod</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_text">Inaktiverar Pod.\n\nNär inaktiveringen har slutförts kan du trycka på <b>Nästa</b>.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_title">Pod inaktiverad</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_text">Din Pod har inaktiverats.\n\nTa bort Pod från kroppen och lämna in för återvinning.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_title">Pod kasserad</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_text">Podden har tagits bort. Insulinleveransen har inte stoppats eftersom podden inte har inaktiverats korrekt!\n\nTa bort podden från kroppen och lämna in för återvinning.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod_confirmation">Om du tar bort podden, kommer du inte att kunna kommunicera med den längre. Du bör bara göra detta när all kommunikation med Pod fortsätter att misslyckas. Är du säker på att du vill ta bort podden?</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod">Ta bort Pod</string>
     <!-- Omnipod - Preferences -->
+    <string name="omnipod_common_preferences_bolus_beeps_enabled">Bolus pip aktiverade</string>
+    <string name="omnipod_common_preferences_basal_beeps_enabled">Basalpip aktiverade</string>
+    <string name="omnipod_common_preferences_smb_beeps_enabled">SMB-pip aktiverade</string>
+    <string name="omnipod_common_preferences_tbr_beeps_enabled">Temp basal-pip aktiverade</string>
+    <string name="omnipod_common_preferences_suspend_delivery_button_enabled">Visa knapp för Pausa Leverans i Omnipod-fliken</string>
+    <string name="omnipod_common_preferences_time_change_enabled">Automatisk avkänning av tidszon aktiverad</string>
+    <string name="omnipod_common_preferences_expiration_reminder_enabled">Påminnelse för utgångstid aktiverad</string>
+    <string name="omnipod_common_preferences_expiration_reminder_hours_before_shutdown">Timmar före avstängning</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_enabled">Varning för låg reservoar aktiverad</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_units">Antal Enheter</string>
+    <string name="omnipod_common_preferences_automatically_silence_alerts">Kvittera Podlarm automatiskt</string>
+    <string name="omnipod_common_preferences_category_other">Annat</string>
+    <string name="omnipod_common_preferences_category_alerts">Varningar</string>
+    <string name="omnipod_common_preferences_category_confirmation_beeps">Bekräftelsepip</string>
     <!-- Omnipod - Pod Status -->
+    <string name="omnipod_common_pod_status_no_active_pod">Ingen aktiv pod</string>
+    <string name="omnipod_common_pod_status_waiting_for_activation">Konfiguration pågår (väntar på Pod-aktivering)</string>
+    <string name="omnipod_common_pod_status_waiting_for_cannula_insertion">Konfiguration pågår (väntar på kanylinsättning)</string>
+    <string name="omnipod_common_pod_status_running">Körs</string>
+    <string name="omnipod_common_pod_status_suspended">Pausad</string>
+    <string name="omnipod_common_pod_status_pod_fault">Podfel</string>
+    <string name="omnipod_common_pod_status_activation_time_exceeded">Aktiveringstiden har överskridits</string>
+    <string name="omnipod_common_pod_status_inactive">Inaktiv</string>
+    <string name="omnipod_common_pod_status_pod_fault_description">Podfel: %1$03d %2$s</string>
     <!-- Omnipod - Commands -->
+    <string name="omnipod_common_cmd_deactivate_pod">Inaktivera pod</string>
+    <string name="omnipod_common_cmd_discard_pod">Ta bort Pod</string>
+    <string name="omnipod_common_cmd_set_bolus">Leverera bolus</string>
+    <string name="omnipod_common_cmd_cancel_bolus">Avbryt Bolus</string>
+    <string name="omnipod_common_cmd_set_tbr">Sätt temp basal</string>
+    <string name="omnipod_common_cmd_cancel_tbr_by_driver">Avbryt temp basal (internt av drivrutinen)</string>
+    <string name="omnipod_common_cmd_cancel_tbr">Avbryt temporär basal</string>
+    <string name="omnipod_common_cmd_set_basal_schedule">Ange basaldoser</string>
+    <string name="omnipod_common_cmd_get_pod_status">Hämta Pod-status</string>
+    <string name="omnipod_common_cmd_get_pod_info">Hämta Pod-information</string>
+    <string name="omnipod_common_cmd_set_time">Ställ in tid</string>
+    <string name="omnipod_common_cmd_configure_alerts">Konfigurera varningar</string>
+    <string name="omnipod_common_cmd_silence_alerts">Kvittera Larm</string>
+    <string name="omnipod_common_cmd_suspend_delivery">Pausa insulintillförsel</string>
+    <string name="omnipod_common_cmd_resume_delivery">Återuppta insulintillförsel</string>
+    <string name="omnipod_common_cmd_unknown_entry">Okänd post</string>
+    <string name="omnipod_common_cmd_initialize_pod">Initiera Pod</string>
+    <string name="omnipod_common_cmd_insert_cannula">Skjut in kanylen</string>
+    <string name="omnipod_common_cmd_read_pulse_log">Läs pulslogg</string>
+    <string name="omnipod_common_cmd_set_fake_suspended_tbr">Ställ in simulerad temp basal eftersom podden är avaktiverad</string>
+    <string name="omnipod_common_cmd_cancel_fake_suspended_tbr">Avbryt simulerad temp basal eftersom podden är avaktiverad</string>
+    <string name="omnipod_common_cmd_split_tbr">Dela upp temp basal på grund av okänt fel vid avbrott</string>
+    <string name="omnipod_common_cmd_beep_config">Pipkonfiguration</string>
+    <string name="omnipod_common_cmd_play_test_beep">Spela upp testljud</string>
     <!-- Omnipod - Alerts -->
+    <string name="omnipod_common_alert_finish_pairing_reminder">Påminnelse att slutföra parkoppling</string>
+    <string name="omnipod_common_alert_finish_setup_reminder_reminder">Påminnelse att slutföra installation</string>
+    <string name="omnipod_common_alert_expiration">Pod löper snart ut</string>
+    <string name="omnipod_common_alert_expiration_advisory">Pod löper snart ut</string>
+    <string name="omnipod_common_alert_shutdown_imminent">Pod kommer snart att stängas av</string>
+    <string name="omnipod_common_alert_low_reservoir">Låg reservoar</string>
+    <string name="omnipod_common_alert_unknown_alert">Okänd varning</string>
     <!-- Omnipod - Short status -->
+    <string name="omnipod_common_short_status_no_active_pod">Ingen aktiv pod</string>
+    <string name="omnipod_common_short_status_last_connection">Sen ansl: %1$d min sedan</string>
+    <string name="omnipod_common_short_status_last_bolus">Sen Bolus: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_temp_basal">Temp: %1$s</string>
+    <string name="omnipod_common_short_status_extended_bolus">Förl: %1$s</string>
+    <string name="omnipod_common_short_status_reservoir">Res: %1$sU</string>
     <!-- Omnipod - Other -->
+    <string name="omnipod_common_yes">Ja</string>
+    <string name="omnipod_common_no">Nej</string>
+    <string name="omnipod_common_ok">OK</string>
+    <string name="omnipod_common_cancel">Avbryt</string>
+    <string name="omnipod_common_warning">Varning</string>
     <!-- Omnipod - Times -->
+    <string name="omnipod_common_moments_ago">nyss</string>
+    <string name="omnipod_common_less_than_a_minute_ago">mindre än en minut sedan</string>
+    <string name="omnipod_common_composite_time">%1$s och %2$s</string>
+    <string name="omnipod_common_time_ago">%1$s sedan</string>
+    <plurals name="omnipod_common_minutes">
+        <item quantity="one">%1$d min</item>
+        <item quantity="other">%1$d min</item>
+    </plurals>
+    <plurals name="omnipod_common_hours">
+        <item quantity="one">%1$d tim</item>
+        <item quantity="other">%1$d tim</item>
+    </plurals>
+    <plurals name="omnipod_common_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dagar</item>
+    </plurals>
 </resources>

omnipod-common/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Wizard Base -->
+    <!-- Omnipod - Pod Activation Wizard -->
+    <!-- Omnipod - Pod Deactivation Wizard -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Commands -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - Short status -->
+    <!-- Omnipod - Other -->
+    <!-- Omnipod - Times -->
+</resources>

omnipod-dash/src/main/res/values-pt-rPT/strings.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Dash - Description -->
+    <string name="omnipod_dash_pump_description">Integração para a Omnipod Dash (o novo modelo, habilitado para o Bluetooth com uma proteção de agulha azul).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_bluetooth_status">Estado do Bluetooth</string>
+    <string name="omnipod_dash_bluetooth_address">Endereço Bluetooth</string>
 </resources>

omnipod-dash/src/main/res/values-sk-rSK/strings.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Dash - Description -->
+    <string name="omnipod_dash_pump_description">Integrácia pumpy pre Omnipod Dash (nový model s funkciou Bluetooth a modrým krytom).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_bluetooth_status">Stav Bluetooth</string>
+    <string name="omnipod_dash_bluetooth_address">Adresa Bluetooth</string>
 </resources>

omnipod-dash/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Omnipod Dash - Description -->
+    <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - Overview -->
+</resources>

omnipod-eros/src/main/res/values-pt-rPT/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Eros - Description -->
+    <string name="omnipod_eros_pump_description">Integração da bomba para Omnipod Eros (o modelo mais antigo). Requer um dispositivo RileyLink com pelo menos firmware versão 2.0.</string>
     <!-- Omnipod Eros - Keys -->
     <!-- Omnipod Eros - Overview -->
     <!-- Omnipod Eros - Preferences -->
@@ -10,7 +11,7 @@
     <string name="omnipod_eros_preferences_riley_link_stats_button_enabled">Mostrar botão de Estatísticas do RileyLink no menu de Gestão do Pod</string>
     <string name="omnipod_eros_preferences_battery_change_logging_enabled">Activar o registo de mudança da bateria em Acções</string>
     <string name="omnipod_eros_preferences_category_riley_link">RileyLink</string>
-    <string name="omnipod_eros_preferences_notification_uncertain_tbr_sound_enabled">Som activado para notificações DBT incerto</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_tbr_sound_enabled">Som activado para notificações incertas da DBT</string>
     <string name="omnipod_eros_preferences_notification_uncertain_smb_sound_enabled">Som activado para notificações SMB incerto</string>
     <string name="omnipod_eros_preferences_notification_uncertain_bolus_sound_enabled">Som activado para notificações de bolús incerto</string>
     <!-- Omnipod Eros - History -->
@@ -46,8 +47,8 @@
     <string name="omnipod_eros_error_set_basal_failed_delivery_suspended">Falha na configuração do perfil basal. A administração está suspensa! Por favor, retome manualmente a administração a partir do separador Omnipod.</string>
     <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">O cancelamento de basal temporária pode ter falhado. Por favor, actualize manualmente o estado do Pod no separador Omnipod.</string>
     <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Falha ao configurar basal temporária. Se uma basal temporária foi executada anteriormente, ela pode ter sido cancelada. Por favor, actualize manualmente o estado do Pod no separador Omnipod.</string>
-    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Configuração de basal temporária pode ter falhado basal. Se uma basal temp foi executada anteriormente, ela foi cancelada. Por favor, actualize manualmente o estado do Pod no separador Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Configuração de basal temporária pode ter feito falhar a basal. Se uma basal temporária foi executada anteriormente, ela foi cancelada. Por favor, actualize manualmente o estado do Pod no separador Omnipod.</string>
-    <string name="omnipod_eros_error_set_temp_basal_failed_validation">A duração do DBT deve ser maior que zero e um múltiplo de %1$s minutos.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_validation">A duração da DBT deve ser maior que zero e um múltiplo de %1$s minutos.</string>
     <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">Configuração da hora pode ter falhado. A administração pode estar suspensa! Por favor, actualize manualmente o estado do Pod no separador Omnipod e retome a administração, se necessário.</string>
     <string name="omnipod_eros_error_set_time_failed_delivery_suspended">Configuração da Hora falhou. A administração está suspensa! Por favor, retome manualmente a administração no separador do Omnipod.</string>
     <string name="omnipod_eros_error_failed_to_read_pulse_log">Falha ao ler o Pulse Log</string>
@@ -55,7 +56,7 @@
     <string name="omnipod_eros_error_operation_not_possible_no_configuration">A operação não é possível.\n\nPrecisa configurar o Omnipod primeiro, antes de pode usar esta operação.</string>
     <string name="omnipod_eros_error_bolus_failed_uncertain">Não é possível verificar se o bólus foi bem sucedido. Por favor, verifique manualmente se o Pod está administrar bólus ouvindo os cliques. &lt;b&gt;Se tem certeza de que o bólus não foi bem sucedido, deve apagar manualmente a entrada de bólus dos Tratamentos, mesmo se clicar em \'Cancelar Bólus\' agora! &lt;b&gt;&lt;/b&gt;</string>
     <string name="omnipod_eros_error_bolus_failed_uncertain_smb">Não é possível verificar se o bólus SMB (%1$.2f U) foi bem sucedido. <b>Se tiver certeza de que o Bólus não foi bem sucedido, deve excluir manualmente a entrada SMB a partir de Tratamentos.</b></string>
-    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">Uma basal temporária está sendo executada no Pod, mas o AAPS não está ciente desta basal temporária. Por favor, cancele sua basal temporária manualmente.</string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">Uma basal temporária está sendo executada no Pod, mas a AAPS não está ciente desta basal temporária. Por favor, cancele a sua basal temporária manualmente.</string>
     <!-- Omnipod Eros - Pod Management -->
     <string name="omnipod_eros_pod_management_button_riley_link_stats">Estatísticas do RileyLink</string>
     <string name="omnipod_eros_pod_management_waiting_for_riley_link_connection">À espera de ligação RileyLink…</string>

omnipod-eros/src/main/res/values-sk-rSK/strings.xml

@@ -1,13 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Eros - Description -->
+    <string name="omnipod_eros_pump_description">Integrácia pumpy pre Omnipod Eros (starší model s priehľadným krytom ihly). Vyžaduje zariadenie RileyLink s firmware aspoň verzie 2.0.</string>
     <!-- Omnipod Eros - Keys -->
     <!-- Omnipod Eros - Overview -->
     <!-- Omnipod Eros - Preferences -->
+    <string name="omnipod_eros_preferences_riley_link_configuration">Konfigurácia RileyLinku</string>
+    <string name="omnipod_eros_preferences_category_notifications">Notifikácie</string>
+    <string name="omnipod_eros_preferences_pulse_log_button_enabled">Zobraziť tlačítko Pulzný Log v menu Správa Podu</string>
+    <string name="omnipod_eros_preferences_riley_link_stats_button_enabled">Zobraziť tlačítko Štatistika RileyLink v menu Správa Podu</string>
+    <string name="omnipod_eros_preferences_battery_change_logging_enabled">V Akciách povoliť zaznamenávanie výmeny batérie</string>
+    <string name="omnipod_eros_preferences_category_riley_link">RileyLink</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_tbr_sound_enabled">Zvuk upozornenia pre neistý dočasný bazál povolený</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_smb_sound_enabled">Zvuk upozornenia pre neistý SMB povolený</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_bolus_sound_enabled">Zvuk upozornenia pre neistý bolus povolený</string>
     <!-- Omnipod Eros - History -->
+    <string name="omnipod_eros_history_title">História Podu</string>
+    <string name="omnipod_eros_history_item_description">Popis</string>
+    <string name="omnipod_eros_history_item_source">Zdroj</string>
+    <string name="omnipod_eros_history_item_date">Dátum</string>
+    <string name="omnipod_eros_history_type">Typ:</string>
+    <string name="omnipod_eros_history_bolus_value">%1$.2f JI</string>
+    <string name="omnipod_eros_history_bolus_value_with_carbs">%1$.2f JI, SACH=%2$.1f g</string>
+    <string name="omnipod_eros_history_tbr_value">Rýchlosť: %1$.2f JI, Doba trvania: %2$d minút</string>
     <!-- Omnipod Eros - Short Status -->
+    <string name="omnipod_eros_short_status_riley_link_battery">RLBat: %1$d</string>
     <!-- Omnipod Eros - Error -->
+    <string name="omnipod_eros_error_riley_link_address_invalid">Neplatná adresa RileyLinku.</string>
+    <string name="omnipod_eros_error_crc_mismatch">Komunikácia zlyhala: overenie integrity správy zlyhalo</string>
+    <string name="omnipod_eros_error_invalid_packet_type">Komunikácia zlyhala: boli prijaté neplatné pakety z Podu</string>
+    <string name="omnipod_eros_error_invalid_progress_state">Komunikácia zlyhala: Pod je v chybnom stave</string>
+    <string name="omnipod_eros_error_invalid_response">Komunikácia zlyhala: bola prijatá neplatná odozva z Podu</string>
+    <string name="omnipod_eros_error_invalid_message_sequence_number">Komunikácia zlyhala: bola prijatá správa s neplatným poradovým číslom z Podu</string>
+    <string name="omnipod_eros_error_invalid_message_address">Komunikácia zlyhala: bola prijatá správa s neplatnou adresou z Podu</string>
+    <string name="omnipod_eros_error_message_decoding_failed">Komunikácia zlyhala: nepodarilo se dekódovať správu z Podu</string>
+    <string name="omnipod_eros_error_nonce_resync_failed">Komunikácia zlyhala: opakovaná synchronizácia Nonce hodnoty zlyhala</string>
+    <string name="omnipod_eros_error_nonce_out_of_sync">Komunikácia zlyhala: hodnota Nonce nebola synchronizovaná</string>
+    <string name="omnipod_eros_error_not_enough_data">Komunikácia zlyhala: nedostatok dát prijatých z Podu</string>
+    <string name="omnipod_eros_error_pod_fault">Bola zistená chyba Podu (%1$03d %2$s). Deaktivujte Pod a spustite nový</string>
+    <string name="omnipod_eros_error_pod_returned_error_response">Komunikácia zlyhala: Pod vrátil chybovú odozvu</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_riley_link">Žiadna odpoveď od RileyLinku</string>
+    <string name="omnipod_eros_error_communication_failed_riley_link_interrupted">RileyLink prerušený</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_pod">Žiadna odpoveď z Podu</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_might_be_suspended">Nastavenie bazálneho profilu zlyhalo. Podávanie môže byť pozastavené! Manuálne obnovte stav Podu zo záložky Omnipod a pokračujte v podávaní, ak je to potrebné.</string>
+    <string name="omnipod_eros_error_set_basal_might_have_failed_delivery_might_be_suspended">Nastavenie bazálneho profilu zlyhalo. Podávanie môže byť pozastavené! Manuálne obnovte stav Podu zo záložky Omnipod a pokračujte v podávaní, ak je to potrebné.</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_suspended">Nastavenie bazálneho profilu zlyhalo. Podávanie je pozastavené! Manuálne obnovte podávanie zo záložky Omnipod.</string>
+    <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">Zrušenie dočasného bazalu mohlo zlyhať. Manuálne obnovte stav Podu zo záložky Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Nastavenie dočasného bazálu zlyhalo. Ak bol predtým spustený dočasný bazál, mohol byť zrušený. Manuálne obnovte stav Podu zo záložky Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Nastavenie dočasného bazálu mohlo byť neúspešné. Ak bol predtým spustený dočasný bazál, mohol byť zrušený. Manuálne obnovte stav Podu zo záložky Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_validation">Doba trvania TBR musí byť väčšia ako nula, a musí byť násobkom %1$s minút.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">Nastavenie času, pravdepodobne zlyhalo. Podávanie môže byť pozastavené! Manuálne obnovte stav Podu zo záložky Omnipod a pokračujte v podávaní, ak je to potrebné.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_suspended">Nastavenie času zlyhalo. Podávanie je pozastavené! Manuálne obnovte podávanie zo záložky Omnipod.</string>
+    <string name="omnipod_eros_error_failed_to_read_pulse_log">Zlyhalo načítanie Pulse Log</string>
+    <string name="omnipod_eros_error_automatic_time_or_timezone_change_failed">Nepodarilo sa automaticky zmeniť čas na Pode. Mali by ste ručne synchronizovať čas na záložke Omnipod.</string>
+    <string name="omnipod_eros_error_operation_not_possible_no_configuration">Operácia nie je možná.\n\nNajskôr je nutné nakonfigurovať Omnipod, kým bude možné túto funkciu použiť.</string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain">Nedá sa overiť, či bol bolus úspešný. Prosím manuálne overte, či Váš Pod podáva bolus počúvaním klikania. <b>Ak ste si istý, že bolus nebol úspešný, mali by ste ručne odstrániť záznam o boluse z ošetrení, aj keď kliknete na \'Zrušiť bolus\' teraz!</b></string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain_smb">Nedá sa overiť, či bol bolus SMB (%1$.2f JI) úspešne podaný. <b>Pokiaľ ste si istý, že bolus nebol podaný, mali by ste ručne odstrániť položku SMB z Ošetrení.</b></string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">Dočasný bazál na Pode prebieha, ale AAPS o tomto dočasnom bazále nevie. Prosím zrušte svoj dočasný bazál ručne.</string>
     <!-- Omnipod Eros - Pod Management -->
+    <string name="omnipod_eros_pod_management_button_riley_link_stats">Štatistika RileyLink</string>
+    <string name="omnipod_eros_pod_management_waiting_for_riley_link_connection">Čakám na pripojenie RileyLink…</string>
+    <string name="omnipod_eros_pod_management_button_reset_riley_link_config">Resetovať konfiguráciu RileyLinku</string>
+    <string name="omnipod_eros_pod_management_button_read_pulse_log">Čítať protokol pulzov</string>
+    <string name="omnipod_eros_pod_management_button_reading_pulse_log">Čítanie protokolu pulzov…</string>
+    <string name="omnipod_eros_pod_management_pulse_log">Pulse Log</string>
+    <string name="omnipod_eros_pod_management_pulse_log_value">Protokol pulzov (skopírované do schránky)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">Naplňte nový Pod dostatkom inzulínu na 3 dni.\n\nSledujte dve pípnutia z Podu v priebehu procesu plnenia. Tieto ukazujú, že minimálne množstvo 85U bolo naplnené. Uistite sa, že striekačka je úplne vyprázdnená a to aj po vypočutí dvoch pípnutí.\n\nPo naplnení Podu, prosím, stlačte <b>Ďalšia</b>.\n\n<b>Poznámka:</b> zatiaľ nesnímajte kryt z ihly.\n<b>Poznámka:</b>prosím umiestnite RileyLink vo zvislej polohe blízko Podu.</string>
+    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Snažíte sa spárovať nový Pod a naplniť ho.\n\nKeď bol úspešne dokončený inicializačný proces, môžete stlačiť tlačítko <b>Ďalšia</b>.\n\n<b>Poznámka:</b> položte RileyLink vo vzpriamenej polohe a umiestnite ho pár centimetrov od Podu.</string>
     <!-- Omnipod Eros - Other -->
+    <string name="omnipod_eros_uncertain">neznáme</string>
 </resources>

omnipod-eros/src/main/res/values-sv-rSE/strings.xml

@@ -1,13 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Eros - Description -->
+    <string name="omnipod_eros_pump_description">Pumpintegration för Omnipod Eros (den äldre modellen med ett genomskinligt nålskydd). Kräver en rileyLink-enhet med minst firmware version 2.0.</string>
     <!-- Omnipod Eros - Keys -->
     <!-- Omnipod Eros - Overview -->
     <!-- Omnipod Eros - Preferences -->
+    <string name="omnipod_eros_preferences_riley_link_configuration">Konfiguration av Riley Link</string>
+    <string name="omnipod_eros_preferences_category_notifications">Notiser</string>
+    <string name="omnipod_eros_preferences_pulse_log_button_enabled">Visa Pulse Log-knapp i menyn Podhantering</string>
+    <string name="omnipod_eros_preferences_riley_link_stats_button_enabled">Visa knappen Riley Link-statistik i menyn Pod-hantering</string>
+    <string name="omnipod_eros_preferences_battery_change_logging_enabled">Aktivera inloggning av batteribyte i Åtgärder</string>
+    <string name="omnipod_eros_preferences_category_riley_link">Riley Link</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_tbr_sound_enabled">Ljud aktiverade för osäker tempbasal</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_smb_sound_enabled">Ljud aktiverade för osäker SMB</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_bolus_sound_enabled">Ljud aktiverade för osäker bolus</string>
     <!-- Omnipod Eros - History -->
+    <string name="omnipod_eros_history_title">Pod-historik</string>
+    <string name="omnipod_eros_history_item_description">Beskrivning</string>
+    <string name="omnipod_eros_history_item_source">Källa</string>
+    <string name="omnipod_eros_history_item_date">Datum</string>
+    <string name="omnipod_eros_history_type">Typ:</string>
+    <string name="omnipod_eros_history_bolus_value">%1$.2fU</string>
+    <string name="omnipod_eros_history_bolus_value_with_carbs">%1$.2f U, KH=%2$.1f g</string>
+    <string name="omnipod_eros_history_tbr_value">Dos: %1$.2f U, Duration: %2$d min</string>
     <!-- Omnipod Eros - Short Status -->
+    <string name="omnipod_eros_short_status_riley_link_battery">RLBatt: %1$d</string>
     <!-- Omnipod Eros - Error -->
+    <string name="omnipod_eros_error_riley_link_address_invalid">Riley Link adress felaktig.</string>
+    <string name="omnipod_eros_error_crc_mismatch">Kommunikationsfel: Lyckades inte verifiera meddelandet</string>
+    <string name="omnipod_eros_error_invalid_packet_type">Kommunikationsfel: Mottog ett ogiltigt datapaket från pod</string>
+    <string name="omnipod_eros_error_invalid_progress_state">Kommunikationsfel: Pod är i fel tillstånd</string>
+    <string name="omnipod_eros_error_invalid_response">Kommunikationsfel: Mottog ett felaktig svar från pod</string>
+    <string name="omnipod_eros_error_invalid_message_sequence_number">Kommunikationsfel: Tog emot ett meddelande med ett ogiltigt sekvensnummer från podden</string>
+    <string name="omnipod_eros_error_invalid_message_address">Kommunikationsfel: Tog emot ett meddelande med en ogiltig adress från podden</string>
+    <string name="omnipod_eros_error_message_decoding_failed">Kommunikationsfel: Misslyckades avkoda meddelandet från pod</string>
+    <string name="omnipod_eros_error_nonce_resync_failed">Kommunikationsfel: \"nonce resync\" misslyckades</string>
+    <string name="omnipod_eros_error_nonce_out_of_sync">Kommunikationsfel: \"nonce\" är inte i synk</string>
+    <string name="omnipod_eros_error_not_enough_data">Kommunikationsfel: Mottog inte tillräckligt mycket data från pod</string>
+    <string name="omnipod_eros_error_pod_fault">Ett pod-fel (%1$03d %2$s) har upptäckts. Vänligen inaktivera din pod och starta en ny</string>
+    <string name="omnipod_eros_error_pod_returned_error_response">Kommunikationsfel: Pod returnerade ett fel</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_riley_link">Riley Link svarar inte</string>
+    <string name="omnipod_eros_error_communication_failed_riley_link_interrupted">Länken till Riley Link bröts</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_pod">Inget svar från pod</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_might_be_suspended">Det gick inte att ställa in basalprofilen. Leveransen kan vara avstängd! Uppdatera Pod-status manuellt från Omnipod-fliken och återuppta leveransen om det behövs.</string>
+    <string name="omnipod_eros_error_set_basal_might_have_failed_delivery_might_be_suspended">Det gick inte att ställa in basalprofilen. Leveransen kan vara avstängd! Uppdatera Pod-status manuellt från Omnipod-fliken och återuppta leveransen om det behövs.</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_suspended">Det gick inte att ställa in basalprofilen. Leveransen är avstängd! Återuppta leverans manuellt från Omnipod-fliken.</string>
+    <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">Misslyckades troligen att avbryta temp basaldos. Uppdatera Pod-status manuellt från Omnipod-fliken.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Temp basal-inställningen misslyckades. Om en temp basal kördes tidigare, kan den ha avbrutits. Uppdatera Pod-status manuellt från Omnipod-fliken.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Temp basal-inställningen kan ha misslyckats. Om en temp basal kördes tidigare, kan den ha avbrutits. Uppdatera Pod-status manuellt från Omnipod-fliken.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_validation">Längden på en temp basal måste vara större än noll och en multipel av %1$s minuter.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">Tidsuppdatering av podden kan ha misslyckats. Leveransen kan vara avstängd! Uppdatera Pod-status manuellt från Omnipod-fliken och återuppta leveransen om det behövs.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_suspended">Tidsuppdatering av podden misslyckades. Leveransen kan vara avstängd! Uppdatera Pod-status manuellt från Omnipod-fliken och återuppta leveransen om det behövs.</string>
+    <string name="omnipod_eros_error_failed_to_read_pulse_log">Misslyckades att läsa Pulsloggen</string>
+    <string name="omnipod_eros_error_automatic_time_or_timezone_change_failed">Det gick inte att automatiskt ändra tiden på Pod. Du bör synkronisera tiden manuellt på fliken Omnipod.</string>
+    <string name="omnipod_eros_error_operation_not_possible_no_configuration">Operationen inte möjlig.\n\n Du måste konfigurera Omnipod innan du kan använda denna funktion.</string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain">Det går inte att verifiera om bolus slutfördes. Kontrollera manuellt att din Pod levererar genom att lyssna på klick. <b>Om du är säker på att bolus misslyckades, bör du manuellt ta bort posten från Behandlingar, även om du klickar på \"Avbryt bolus\" nu!</b></string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain_smb">Det gick inte att verifiera om SMB bolus (%1$.2f U) lyckades. <b>Om du är säker på att bolus misslyckades, bör du manuellt ta bort posten från Behandlingar.</b></string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">En temp basal körs på podden, men AAPS är inte medveten om denna. Vänligen avbryt din tillfälliga basal manuellt.</string>
     <!-- Omnipod Eros - Pod Management -->
+    <string name="omnipod_eros_pod_management_button_riley_link_stats">Riley Link-statistik</string>
+    <string name="omnipod_eros_pod_management_waiting_for_riley_link_connection">Väntar på RileyLink-anslutning…</string>
+    <string name="omnipod_eros_pod_management_button_reset_riley_link_config">Återställ Riley Link-konfiguration</string>
+    <string name="omnipod_eros_pod_management_button_read_pulse_log">Läs pulslogg</string>
+    <string name="omnipod_eros_pod_management_button_reading_pulse_log">Läser pulslogg…</string>
+    <string name="omnipod_eros_pod_management_pulse_log">Pulslogg</string>
+    <string name="omnipod_eros_pod_management_pulse_log_value">Pulslogg (kopierad till klippbordet)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">Fyll en ny Pod med tillräckligt med insulin i 3 dagar.\n\nLyssna på två pip från Pod under fyllningsprocessen. Dessa tyder på att den minsta mängden (85U) har nåtts. Var noga med att helt tömma fyllnadssprutan, även efter att ha hört de två pipen.\n\nEfter fyllning av Pod, tryck <b>Nästa</b>.\n\n<b>Obs:</b> Ta inte bort Pods nålskydd ännu.\n<b>Obs:</b> Placera Riley Link i ett upprätt läge och placera Pod några centimeter därifrån.</string>
+    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Försöker parkoppla den nya Poden och förfylla den.\n\nNär initieringsprocessen har slutförts kan du trycka på <b>Nästa</b>.\n\n<b>Obs:</b> placera Riley Link i ett upprätt läge och placera Pod några centimeter bort från den.</string>
     <!-- Omnipod Eros - Other -->
+    <string name="omnipod_eros_uncertain">osäker</string>
 </resources>

omnipod-eros/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Omnipod Eros - Description -->
+    <!-- Omnipod Eros - Keys -->
+    <!-- Omnipod Eros - Overview -->
+    <!-- Omnipod Eros - Preferences -->
+    <!-- Omnipod Eros - History -->
+    <!-- Omnipod Eros - Short Status -->
+    <!-- Omnipod Eros - Error -->
+    <!-- Omnipod Eros - Pod Management -->
+    <!-- Omnipod Eros - Pod Activation Wizard -->
+    <!-- Omnipod Eros - Other -->
+</resources>

rileylink/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL keys -->
+    <!-- RL BLE Config -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RileyLink - Common -->
+    <!-- RileyLink - Preferences -->
+</resources>

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

@@ -88,7 +88,7 @@
     <string name="action_preset_3">Predefinição 3</string>
     <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Valor livre</string>
     <string name="action_confirm">CONFIRMAR</string>
-    <string name="action_timeshift">alteração turno</string>
+    <string name="action_timeshift">Deslocamento temporal</string>
     <string name="action_bolus">bólus</string>
     <string name="bolus_progress">Progresso do Bólus</string>
     <string name="press_to_cancel">pressione para cancelar</string>

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

@@ -90,6 +90,9 @@
     <string name="action_confirm">BEKRÄFTA</string>
     <string name="action_timeshift">tidsförskjutning</string>
     <string name="action_bolus">bolus</string>
+    <string name="bolus_progress">Bolusförlopp</string>
+    <string name="press_to_cancel">tryck för att avbryta</string>
+    <string name="cancel_bolus">AVBRYT BOLUS</string>
     <string name="status_pump">Pump</string>
     <string name="status_loop">APS</string>
     <string name="status_cpp">CPP</string>
@@ -129,4 +132,8 @@
     <string name="digitalstyle_pref_your_color">Färg:</string>
     <string name="digitalstyle_pref_your_color_saturation">Färgmättnad:</string>
     <string name="digitalstyle_pref_your_color_opacity">Opacitet:</string>
+    <string name="bolus_progress_channel_name">AAPS Bolusförlopp</string>
+    <string name="bolus_progress_silent_channel_name">AAPS Bolusförlopp (tyst)</string>
+    <string name="bolus_progress_channel_description">Bolusförlopp och avbryt</string>
+    <string name="bolus_progress_silent_channel_description">Bolusförlopp och avbryt med mindre vibrationer</string>
 </resources>

wear/src/main/res/values-ta-rIN/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>