Merge remote-tracking branch 'upstream/2.7.0-rc5' into omnipod_eros_dev_upstream_merge

.github/workflows/gradle-ci-workflow.yaml

@@ -1,33 +0,0 @@
-name: Gradle CI
-
-on:
-  - push
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Create NDK path
-        run: sudo mkdir -p /usr/local/lib/android/sdk/ndk && sudo chmod 777 /usr/local/lib/android/sdk/ndk
-      - name: Cache NDKs
-        id: cache-ndk
-        uses: actions/cache@v2
-        with:
-          path: /usr/local/lib/android/sdk/ndk
-          key: ${{ runner.os }}-ndk-21.0.6113669-21.1.6352462
-      - name: Install NDK 21.0.6113669
-        run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT}
-      - name: Install NDK 21.1.6352462
-        run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.1.6352462" --sdk_root=${ANDROID_SDK_ROOT}
-      - uses: eskatos/gradle-command-action@v1
-        with:
-          arguments: assembleFullDebug
-          wrapper-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true

app/build.gradle

@@ -126,7 +126,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.7-omnipod-0.4.1-SNAPSHOT"
+        version "2.7.0-rc5"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
@@ -245,7 +245,6 @@ dependencies {
     implementation project(':danar')
     implementation project(':rileylink')
     implementation project(':medtronic')
-    implementation project(':omnipod')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'

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

@@ -28,7 +28,6 @@ import javax.inject.Singleton
         WizardModule::class,
         RileyLinkModule::class,
         MedtronicModule::class,
-        OmnipodModule::class,
         APSModule::class,
         PreferencesModule::class,
         OverviewModule::class,

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

@@ -34,7 +34,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyL
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.OmnipodFragment
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment
 import info.nightscout.androidaps.plugins.source.BGSourceFragment
 import info.nightscout.androidaps.plugins.treatments.TreatmentsFragment
@@ -66,7 +65,6 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesLoopFragment(): LoopFragment
     @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
     @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): MedtronicFragment
-    @ContributesAndroidInjector abstract fun contributesOmnipodFragment(): OmnipodFragment
     @ContributesAndroidInjector abstract fun contributesNSProfileFragment(): NSProfileFragment
     @ContributesAndroidInjector abstract fun contributesNSClientFragment(): NSClientFragment
     @ContributesAndroidInjector abstract fun contributesSmsCommunicatorFragment(): SmsCommunicatorFragment

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

@@ -1,50 +0,0 @@
-package info.nightscout.androidaps.dependencyInjection
-
-import dagger.Module
-import dagger.Provides
-import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
-import info.nightscout.androidaps.plugins.pump.omnipod.data.RLHistoryItemOmnipod
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager
-import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager
-import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsPodStateManager
-import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.PodHistoryActivity
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.PodManagementActivity
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod.InitActionFragment
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod.InitPodTask
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.pages.InitPodRefreshAction
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.pages.PodInfoFragment
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.removepod.RemoveActionFragment
-
-@Module
-@Suppress("unused")
-abstract class OmnipodModule {
-
-    // Activities
-    @ContributesAndroidInjector
-    abstract fun contributesPodManagementActivity(): PodManagementActivity
-    @ContributesAndroidInjector abstract fun contributesPodHistoryActivity(): PodHistoryActivity
-
-    // Fragments
-    @ContributesAndroidInjector abstract fun initActionFragment(): InitActionFragment
-    @ContributesAndroidInjector abstract fun removeActionFragment(): RemoveActionFragment
-    @ContributesAndroidInjector abstract fun podInfoFragment(): PodInfoFragment
-
-    // Service
-    @ContributesAndroidInjector
-    abstract fun omnipodCommunicationManagerProvider(): OmnipodRileyLinkCommunicationManager
-    @ContributesAndroidInjector abstract fun aapsOmnipodManagerProvider(): AapsOmnipodManager
-
-    // Data
-    @ContributesAndroidInjector abstract fun initPodRefreshAction(): InitPodRefreshAction
-    @ContributesAndroidInjector abstract fun podStateManager(): PodStateManager
-    @ContributesAndroidInjector abstract fun initPodTask(): InitPodTask
-    @ContributesAndroidInjector abstract fun omnipodPumpPlugin(): OmnipodPumpPlugin
-    @ContributesAndroidInjector abstract fun contributesRLHistoryItemOmnipod(): RLHistoryItemOmnipod
-
-    companion object {
-        @Provides
-        fun podStateManagerProvider(aapsPodStateManager: AapsPodStateManager): PodStateManager = aapsPodStateManager
-    }
-}

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

@@ -40,7 +40,6 @@ import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
-import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
@@ -148,12 +147,6 @@ abstract class PluginsModule {
     @IntKey(150)
     abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
 
-    @Binds
-    @PumpDriver
-    @IntoMap
-    @IntKey(155)
-    abstract fun bindOmnipodPumpPlugin(plugin: OmnipodPumpPlugin): PluginBase
-
     @Binds
     @NotNSClient
     @IntoMap

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

@@ -10,7 +10,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley
 import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
-import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.service.RileyLinkOmnipodService
 import info.nightscout.androidaps.services.AlarmSoundService
 import info.nightscout.androidaps.services.DataService
 import info.nightscout.androidaps.services.LocationService
@@ -30,5 +29,4 @@ abstract class ServicesModule {
     @ContributesAndroidInjector abstract fun contributesInsightConnectionService(): InsightConnectionService
     @ContributesAndroidInjector abstract fun contributesRileyLinkService(): RileyLinkService
     @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService
-    @ContributesAndroidInjector abstract fun contributesRileyLinkOmnipodService(): RileyLinkOmnipodService
 }

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

@@ -156,9 +156,9 @@ class CareDialog : DialogFragmentWithDate() {
         if (options == EventType.BGCHECK || options == EventType.QUESTION || options == EventType.ANNOUNCEMENT) {
             val type =
                 when {
-                    actions_care_meter.isChecked  -> "Finger"
-                    actions_care_sensor.isChecked -> "Sensor"
-                    else                          -> "Manual"
+                    actions_care_meter.isChecked  -> CareportalEvent.FINGER
+                    actions_care_sensor.isChecked -> CareportalEvent.SENSOR
+                    else                          -> CareportalEvent.MANUAL
                 }
             actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_glucosetype) + ": " + translator.translate(type))
             actions.add(resourceHelper.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(profileFunction, actions_care_bg.value) + " " + resourceHelper.gs(unitResId))

app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java

@@ -392,7 +392,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
             }
 
             // Prepare for pumps using % basals
-            if (pump.getPumpDescription().tempBasalStyle == PumpDescription.PERCENT) {
+            if (pump.getPumpDescription().tempBasalStyle == PumpDescription.PERCENT && allowPercentage()) {
                 result.usePercent = true;
             }
             result.percent = (int) (result.rate / profile.getBasal() * 100);
@@ -650,7 +650,6 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
      */
 
     private void applyTBRRequest(APSResult request, Profile profile, Callback callback) {
-        boolean allowPercentage = virtualPumpPlugin.isEnabled(PluginType.PUMP);
 
         if (!request.tempBasalRequested) {
             if (callback != null) {
@@ -681,7 +680,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
 
         long now = System.currentTimeMillis();
         TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(now);
-        if (request.usePercent && allowPercentage) {
+        if (request.usePercent && allowPercentage()) {
             if (request.percent == 100 && request.duration == 0) {
                 if (activeTemp != null) {
                     getAapsLogger().debug(LTag.APS, "applyAPSRequest: cancelTempBasal()");
@@ -784,6 +783,10 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
         commandQueue.bolus(detailedBolusInfo, callback);
     }
 
+    private boolean allowPercentage() {
+        return virtualPumpPlugin.isEnabled(PluginType.PUMP);
+    }
+
     public void disconnectPump(int durationInMinutes, Profile profile) {
         PumpInterface pump = activePlugin.getActivePump();
 

app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/OpenDatasetRequestMessage.kt

@@ -14,7 +14,7 @@ class OpenDatasetRequestMessage (val serialNumber : String): BaseMessage() {
     @Expose
     var deviceId: String = TidepoolUploader.PUMP_TYPE + ":" + serialNumber
     @Expose
-    var time = DateUtil.toISOAsUTC(DateUtil.now())
+    var time: String = DateUtil.toISOAsUTC(DateUtil.now())
     @Expose
     var timezoneOffset = (DateUtil.getTimeZoneOffsetMs() / T.mins(1).msecs()).toInt()
     @Expose
@@ -23,7 +23,7 @@ class OpenDatasetRequestMessage (val serialNumber : String): BaseMessage() {
     @Expose
     var client = ClientInfo()
     @Expose
-    var computerTime = DateUtil.toISONoZone(DateUtil.now())
+    var computerTime: String = DateUtil.toISONoZone(DateUtil.now())
     @Expose
     var dataSetType = "continuous"
     @Expose
@@ -37,7 +37,7 @@ class OpenDatasetRequestMessage (val serialNumber : String): BaseMessage() {
     @Expose
     var timeProcessing = "none"
     @Expose
-    var timezone = TimeZone.getDefault().id
+    var timezone: String = TimeZone.getDefault().id
     @Expose
     var version = BuildConfig.VERSION_NAME
 

app/src/main/java/info/nightscout/androidaps/plugins/insulin/ActivityGraph.java

@@ -49,8 +49,8 @@ public class ActivityGraph extends GraphView {
 
         for (long time = 0; time <= hours * 60 * 60 * 1000; time += 5 * 60 * 1000L) {
             Iob iob = t.iobCalc(time, dia);
-            activityArray.add(new DataPoint(time / 60 / 1000, iob.activityContrib));
-            iobArray.add(new DataPoint(time / 60 / 1000, iob.iobContrib));
+            activityArray.add(new DataPoint(time / 60.0 / 1000, iob.activityContrib));
+            iobArray.add(new DataPoint(time / 60.0 / 1000, iob.iobContrib));
         }
 
         DataPoint[] activityDataPoints = new DataPoint[activityArray.size()];

app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java

@@ -155,7 +155,7 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
         Arrays.sort(deviations);
 
         double percentile = IobCobCalculatorPlugin.percentile(deviations, 0.50);
-        double basalOff = percentile * (60 / 5) / sens;
+        double basalOff = percentile * (60.0 / 5.0) / sens;
         double ratio = 1 + (basalOff / profile.getMaxDailyBasal());
 
         if (percentile < 0) { // sensitive

app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java

@@ -159,7 +159,7 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
         for (int i = 0; i < data.size(); i++) {
             long reversedWeigth = data.keyAt(i);
             double value = data.valueAt(i);
-            double weight = (hightestWeight - reversedWeigth) / 2;
+            double weight = (hightestWeight - reversedWeigth) / 2.0;
             weights += weight;
             weightedsum += weight * value;
         }

app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java

@@ -9,6 +9,9 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 
 import java.util.Iterator;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.text.DateFormat;
 
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
@@ -84,6 +87,7 @@ public class JSONFormatter {
 
         private String visit(final Object object, final int indent) throws JSONException {
             String ret = "";
+            Long n;
             if (object instanceof JSONArray) {
                 ret += visit((JSONArray) object, indent);
             } else if (object instanceof JSONObject) {
@@ -92,7 +96,19 @@ public class JSONFormatter {
                 if (object instanceof String) {
                     ret += write("\"" + ((String) object).replace("<", "&lt;").replace(">", "&gt;") + "\"", indent);
                 } else {
-                    ret += write(String.valueOf(object), indent);
+                    // try to detect Date as milliseconds
+                    if (object instanceof Long) {
+                        n = (Long) object;
+                        if (n > 1580000000000L && n < 2000000000000L) { // from 2020.01.26 to 2033.05.18 it is with high probability a date object
+                            Date date = new Date(n);
+                            DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            ret += write(formatter.format(date), indent);
+                        } else {
+                            ret += write(String.valueOf(object), indent);
+                        }
+                    } else {
+                        ret += write(String.valueOf(object), indent);
+                    }
                 }
             }
             return ret;
@@ -107,4 +123,4 @@ public class JSONFormatter {
             return ret;
         }
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt

@@ -76,7 +76,7 @@ class TirCalculator @Inject constructor(
         val tit30 = calculate(30, lowTitMgdl, highTitMgdl)
         val averageTit30 = averageTIR(tit30)
         return HtmlHelper.fromHtml(
-            "<br><b>" + resourceHelper.gs(R.string.tir) + ":</b><br>" +
+            "<br><b>" + resourceHelper.gs(R.string.tir) + " (" + Profile.toCurrentUnitsString(profileFunction, lowTirMgdl) + "-" + Profile.toCurrentUnitsString(profileFunction, highTirMgdl) + "):</b><br>" +
                 toText(resourceHelper, tir7) +
                 "<br><b>" + resourceHelper.gs(R.string.average) + " (" + Profile.toCurrentUnitsString(profileFunction, lowTirMgdl) + "-" + Profile.toCurrentUnitsString(profileFunction, highTirMgdl) + "):</b><br>" +
                 averageTir7.toText(resourceHelper, tir7.size()) + "<br>" +

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

@@ -44,17 +44,13 @@
                         android:textSize="90dp"
                         android:textStyle="bold" />
 
-                    <TextView
+                    <ImageView
                         android:id="@+id/overview_arrow"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginTop="-5dp"
-                        android:paddingLeft="-2dp"
-                        android:paddingRight="-2dp"
-                        android:text="→"
-                        android:textSize="50sp"
-                        android:textStyle="bold" />
+                        android:paddingTop="18dp"
+                        android:src="@drawable/ic_flat" />
 
                     <TextView
                         android:id="@+id/overview_deltashort"

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

@@ -905,22 +905,4 @@
     <string name="boluswizard">Bolus slimjan</string>
     <string name="unit_minute_short">min</string>
     <!-- SMS Communicator & OTP Authenticator -->
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Nooit gekontak nie</string>
-    <string name="medtronic_pump_status_waking_up">Besig om te wek</string>
-    <string name="medtronic_pump_status_error_comm">Fout met kommunikasie</string>
-    <string name="medtronic_pump_status_timeout_comm">Te lank op kommunikasie gewag</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pomp onbeskikbaar</string>
-    <string name="medtronic_pump_status_invalid_config">Ongeldige konfigirasie</string>
-    <string name="medtronic_pump_status_active">Aktief</string>
-    <string name="medtronic_pump_status_sleeping">Slaap</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
-    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
 </resources>

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

@@ -1082,7 +1082,6 @@
     <string name="objectives_button_unfinish">Изчисти приключение</string>
     <string name="objectives_button_unstart">Изчисти стартираните</string>
     <string name="doyouwantresetstart">Искате ли да нулирате прогреса си?</string>
-    <string name="time_or_timezone_change">Време и/или промяна на часовата зона на помпата</string>
     <string name="nopumpselected">Не е избрана помпа</string>
     <string name="setupwizard_units_prompt">Изберете единиците, в които искате да работите</string>
     <string name="ns_ploadlocalprofile">Качване на локални промени в НС профила</string>
@@ -1159,7 +1158,6 @@
     <string name="authorizationfailed">Удостоверяването неуспешно</string>
     <string name="overview_show_absinsulin">Абсолютен инсулин</string>
     <string name="master_password_summary">Главната парола се използва за архивиране на настройки и за подмяна на защитата в приложението. Запомни я или я пази на сигурно място.</string>
-    <string name="passwords_dont_match">Паролите не съвпадат</string>
     <string name="current_master_password">Сегашна главна парола</string>
     <string name="statuslights">Индикатори</string>
     <string name="statuslights_copy_ns">Копиране на настройки от NS</string>
@@ -1168,123 +1166,6 @@
     <string name="buttonson_description">Бутоните винаги се показват на дъното на екрана.</string>
     <string name="largedisplay_description">Голям екран</string>
     <string name="skin">Тема</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Никога не сме се свързвали</string>
-    <string name="medtronic_pump_status_waking_up">Събуждане</string>
-    <string name="medtronic_pump_status_error_comm">Грешка в комуникацията</string>
-    <string name="medtronic_pump_status_timeout_comm">Изтичане на времето за връзка</string>
-    <string name="medtronic_pump_status_pump_unreachable">Помпата е недостъпна</string>
-    <string name="medtronic_pump_status_invalid_config">Грешна конфигурация</string>
-    <string name="medtronic_pump_status_active">Активна</string>
-    <string name="medtronic_pump_status_sleeping">Спинка си</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Интеграция на помпата Omnipod, изисква RileyLink устройство (с фърмуер минимум 2.0 ) .</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Звук при болус активен</string>
-    <string name="omnipod_config_beep_basal_enabled">Звук при базал активен</string>
-    <string name="omnipod_config_beep_smb_enabled">Звук при SMB активен</string>
-    <string name="omnipod_config_beep_tbr_enabled">Звук при временен базал активен</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Опции за отстраняване на грешки в под активирани</string>
-    <string name="omnipod_config_timechange_enabled">Разрешено е DST/Timezone</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Под Mgmt</string>
-    <string name="omnipod_pod_status">Статус на под</string>
-    <string name="omnipod_reservoir_left">%1$.2f Е остават</string>
-    <string name="omnipod_reservoir_over50">Над 50 Е</string>
-    <string name="omnipod_pod_address">Адрес на под</string>
-    <string name="omnipod_pod_expiry">Срокът на пода изтича</string>
-    <string name="omnipod_pod_name_no_info">Няма информация.</string>
-    <string name="omnipod_pod_no_pod_connected">Няма активен под</string>
-    <string name="omnipod_pod_not_initalized">Под не е инициализиран</string>
-    <string name="omnipod_pod_active_alerts">Сигнали за активен под</string>
-    <string name="omnipod_ack_short">Ack Предупреждения</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">Забранено действие.\n\n Първо трябва да конфигурурате Omnipod , преди да използвате тази операция,.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Операцията не е възможна.\n\n Трябва да изчакате няколко минути, докато AAPS се опита да зададе профил за първи път.</string>
-    <string name="omnipod_error_illegal_init_action_type">Неправилен PodInitActionType: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Няма активен под.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Грешка при проверка на командата</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Непредвидена грешка. Моля, докладвайте! (тип: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Неуспешна комуникация: получени грешни входни параметри.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Връзката е неуспешна: таймаут.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Комуникацията е неуспешна: възникнала е неочаквана грешка. Моля, докладвайте!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Неуспешна комуникация: проверката на целостта на съобщението е неуспешна.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Неуспешна комуникация: получени грешни входни параметри.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Съобщението е неуспешно: Pod е в лошо състояние.</string>
-    <string name="omnipod_driver_error_invalid_response">Неуспешна комуникация: получени грешни входни параметри.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Неуспешна комуникация: получи съобщение с невалиден номер на последователност от Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Неуспешна комуникация: получи съобщение с невалиден номер на последователност от Pod.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Неуспешна комуникация: получени грешни входни параметри.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Комуникацията е неуспешна: nonce ресинхронизирането е неуспешно.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Комуникацията е неуспешна: nonce ресинхронизирането е неуспешно.</string>
-    <string name="omnipod_driver_error_not_enough_data">Комуникацията е неуспешна: няма достатъчно данни, получени от Pod.</string>
-    <string name="omnipod_driver_error_pod_fault">Грешка на Pod (%1$03d %2$s). Моля, деактивирайте вашия Pod и стартирайте нов.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Комуникацията е неуспешна: Pod върна отговор с грешка.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Управление на Pod</string>
-    <string name="omnipod_cmd_init_pod">Инициализация на Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Деактивирай под</string>
-    <string name="omnipod_cmd_reset_pod">Нулиране на под</string>
-    <string name="omnipod_cmd_pod_history">История на под</string>
-    <string name="omnipod_cmd_set_bolus">Стартирай болус</string>
-    <string name="omnipod_cmd_cancel_bolus">Отмяна на болус</string>
-    <string name="omnipod_cmd_set_tbr">Приложи временен базал</string>
-    <string name="omnipod_cmd_cancel_tbr">Отказ на базал</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Отказ на базал</string>
-    <string name="omnipod_cmd_set_basal_schedule">Задаване на график за базал</string>
-    <string name="omnipod_cmd_get_pod_status">Получу статус на под</string>
-    <string name="omnipod_cmd_get_pod_info">Получи информация за Pod</string>
-    <string name="omnipod_cmd_set_time">Задаване на час</string>
-    <string name="omnipod_cmd_configure_alerts">Конфигуриране на аларми</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Потвърждение на аларми</string>
-    <string name="omnipod_cmd_suspend_delivery">Спиране на доставката на инсулин</string>
-    <string name="omnipod_cmd_resume_delivery">Подновяване на доставката</string>
-    <string name="omnipod_cmd_unknown_entry">Непознат запис</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1fЕ</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Скорост: %1$.1f U, Продължителност: %2$d мин.</string>
-    <string name="omnipod_cmd_reset_pod_desc">Ако натиснете <b>OK</b>, състоянието на Pod ще бъде нулирано и няма да можете да общувате с него повече. Правете това, само ако вече не можеш да се свързвате с него. Ако все още можете да общувате с Под, моля, използвайте опцията <b>Деактивирай Pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">Историята на Pod не е достъпна в момента.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Напълни Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nНапълнете с достатъчно инсулин за 3 дни.\n\nИзчакайте два сигнала от Pod по време на процеса на зареждане. Те показват, че е вмъкнат минималният размер от 85U. Уверете се, че сте изпразнил напълно спринцовката, дори след като сте чули двата сигнала.\n\nСлед пълнене на Pod, моля натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> не вадете капачката на капсулата на Podв този момент.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Пълнене</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Опитвам се да се сдвоя с Pod.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> задръжте Pod много близо до RileyLink в този момент.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Прикрепете Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nПодгответе мястото за инфузия. Отстранете капачката на Pod и лепенката и прикрепете капсулата към мястото за инфузия.\n\nАко канюла стърчи, моля натиснете <b>Отказ</b> и изхвърлете вашия Pod.\n\nПрес <b>Следваща</b> да се вмъкне канюлата и да започне базалната доставка.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Вмъкване на канюла</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Опитвам се да определя първоначалния базален график и да вмъкна канюлата.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Информация за Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\Podе активна.\n\nВашият базален график е програмиран и канюлата вмъкната.\n\nМоля, проверете дали канюлата е поставена правилно или заменете Pod, ако чувствате, че не е.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Деактивирай Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nНатиснете <b>Следващ</b> , за да деактивирате Pod.\n\n<b>Забележка:</b> Това ще спре всички доставки на инсулин и деактивира Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Деактивиране на Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Деактивиране на Pod.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> Ако деактивирането непрекъснато се проваля, моля натиснете <b>Отказ</b> и използвайте опция <b>Нулирай Pod</b> , за да възстановите състоянието на Pod.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod изключен.\n\nмоля, извадете Pod от тялото си и го хвърли.</string>
-    <string name="omnipod_init_pod_pair_pod">Сдвояване на под</string>
-    <string name="omnipod_init_pod_prime_pod">Пълнене на под</string>
-    <string name="omnipod_init_pod_fill_cannula">Напълни канула</string>
-    <string name="omnipod_init_pod_set_basal_profile">Приложи базалният профил</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Отмяна</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Деактивирай под</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Интеграция на Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Край на напомняне за сдвояване</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Край на напомнянето за настройка</string>
-    <string name="omnipod_alert_expiration">Подът скоро ще изтече</string>
-    <string name="omnipod_alert_expiration_advisory">Подът скоро ще изтече</string>
-    <string name="omnipod_alert_shutdown_imminent">Спирането е неизбежно</string>
-    <string name="omnipod_alert_low_reservoir">Минимален инсулин в резервоара</string>
-    <string name="omnipod_alert_unknown_alert">Непозната аларма</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Задаването на базален профил може да е неуспешно. Доставката на инсулин може да бъде спряна! Моля, опреснете статуса на под.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Стартиране на временен базал неуспешно. Ако е имало вече такъв, той може да е бил отменен! Моля, обновете статуса на пода.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Задаването на време може да е неуспешно. Доставката на инсулин може да бъде спряна! Моля, опреснете статуса на под.</string>
-    <string name="omnipod_bolus_failed_uncertain">Не може да се провери статус на болус. Моля, уверете се, че вашият под е стартирал болус или го отменете.</string>
-    <string name="omnipod_rl_stats">Статистика на RL</string>
-    <string name="omnipod_read_pulse_log_short">Pulse лог</string>
     <string name="comapareprofile">Сравняване на профили</string>
     <string name="nav_profilehelper">Профил съветник</string>
     <string name="motoldefaultprofile">Профил по подразбиране</string>

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

@@ -559,6 +559,7 @@
     <string name="pump_unreachable">Pumpa nedostupná</string>
     <string name="missed_bg_readings">Chybějící glykémie</string>
     <string name="raise_notifications_as_android_notifications">Používat systémové notifikace pro výstrahy a oznámení</string>
+    <string name="gradually_increase_notification_volume">Postupně zvyšovat hlasitost výstrah a oznámení</string>
     <string name="localalertsettings_title">Místní výstrahy</string>
     <string name="enable_missed_bg_readings_alert">Výstraha při nedostupných glykémiích</string>
     <string name="enable_pump_unreachable_alert">Výstraha při nedostupné pumpě</string>
@@ -1082,7 +1083,6 @@
     <string name="objectives_button_unfinish">Vymazat dokončeno</string>
     <string name="objectives_button_unstart">Vymazat start</string>
     <string name="doyouwantresetstart">Chcete resetovat začátek cíle? Můžete přijít o svůj pokrok.</string>
-    <string name="time_or_timezone_change">Změna času a/nebo časové zóny pumpy</string>
     <string name="nopumpselected">Nevybrána žádná pumpa</string>
     <string name="setupwizard_units_prompt">Vyberte jednotky, ve kterých chcete zobrazit hodnoty</string>
     <string name="ns_ploadlocalprofile">Odeslat změny lokálního profilu do NS</string>
@@ -1159,7 +1159,6 @@
     <string name="authorizationfailed">Autorizace selhala</string>
     <string name="overview_show_absinsulin">Absolutní inzulin</string>
     <string name="master_password_summary">Hlavní heslo se používá pro šifrování zálohy a pro \"přebití\" zabezpečení v aplikaci. Dobře si ho zapamatujte nebo uložte na bezpečném místě.</string>
-    <string name="passwords_dont_match">Hesla se neshodují</string>
     <string name="current_master_password">Aktuální hlavní heslo</string>
     <string name="statuslights">Stavové indikátory</string>
     <string name="statuslights_copy_ns">Zkopírovat nastavení z NS</string>
@@ -1168,123 +1167,6 @@
     <string name="buttonson_description">Tlačítka jsou vždy zobrazena v dolní části obrazovky</string>
     <string name="largedisplay_description">Velký displej</string>
     <string name="skin">Vzhled</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Nikdy nekontaktováno</string>
-    <string name="medtronic_pump_status_waking_up">Probouzení</string>
-    <string name="medtronic_pump_status_error_comm">Chyba komunikace</string>
-    <string name="medtronic_pump_status_timeout_comm">Vypršel časový limit komunikace</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pumpa nedostupná</string>
-    <string name="medtronic_pump_status_invalid_config">Neplatná konfigurace</string>
-    <string name="medtronic_pump_status_active">Aktivní</string>
-    <string name="medtronic_pump_status_sleeping">Spící</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integrace pumpy pro Omnipod, vyžaduje zařízení RileyLink (s firmwarem alespoň 2.0).</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Pípnutí při bolusu povoleno</string>
-    <string name="omnipod_config_beep_basal_enabled">Pípnutí při bazálu povoleno</string>
-    <string name="omnipod_config_beep_smb_enabled">Pípnutí při SMB povoleno</string>
-    <string name="omnipod_config_beep_tbr_enabled">Pípnutí při TBR povoleno</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Možnosti ladění podu povoleny</string>
-    <string name="omnipod_config_timechange_enabled">Letní čas / Detekce časového pásma povoleny</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Správa Podu</string>
-    <string name="omnipod_pod_status">Stav Podu</string>
-    <string name="omnipod_reservoir_left">Zbývá %1$.2f U</string>
-    <string name="omnipod_reservoir_over50">Více než 50 U</string>
-    <string name="omnipod_pod_address">Adresa Podu</string>
-    <string name="omnipod_pod_expiry">Expirace Podu</string>
-    <string name="omnipod_pod_name_no_info">Žádné info</string>
-    <string name="omnipod_pod_no_pod_connected">Žádný Pod není připojen</string>
-    <string name="omnipod_pod_not_initalized">Není inicializován</string>
-    <string name="omnipod_pod_active_alerts">Výstrahy aktivního Podu</string>
-    <string name="omnipod_ack_short">Potrvdit upozornění</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">Operace není možná.\n\nNejdříve je nutné nakonfigurovat Omnipod, než bude možné tuto funkci použít.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Operace není možná.\n\n Je třeba několik minut počkat, dokud se AAPS nepokusí poprvé nastavit profil.</string>
-    <string name="omnipod_error_illegal_init_action_type">Neplatný atribut PodInitActionType: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Žádný aktivní Pod.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Ověření příkazu se nezdařilo.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Došlo k neočekávané chybě. Nahlaste ji! (typ: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Komunikace selhala: byly přijaty neplatné vstupní parametry.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Komunikace selhala: časový limit vypršel.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Komunikace se nezdařila: došlo k neočekávané chybě. Prosím nahlašte!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Komunikace selhala: ověření integrity zprávy se nezdařilo.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Komunikace selhala: byly přijaty neplatné pakety z podu.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Komunikace selhala: Pod je v chybném stavu.</string>
-    <string name="omnipod_driver_error_invalid_response">Komunikace selhala: byla přijata neplatná odezva z Podu.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Komunikace selhala: od Podu byla přijata zpráva s neplatným pořadovým číslem.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Komunikace selhala: od Podu byla přijata zpráva s neplatnou adresou.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Komunikace selhala: nepodařilo se dekódovat zprávu z Podu.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Komunikace selhala: opaková synchronizace hodnoty Nonce se nezdařila.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Komunikace selhala: hodnota Nonce nebyla synchronizována.</string>
-    <string name="omnipod_driver_error_not_enough_data">Komunikace selhala: nedostatek dat přijatých z Podu.</string>
-    <string name="omnipod_driver_error_pod_fault">Byla zjištěna chyba Podu (%1$03d %2$s). Deaktivujte Pod a spusťte nový.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Komunikace selhala: Pod vrátil chybovou odezvu.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Správa Podu</string>
-    <string name="omnipod_cmd_init_pod">Inicializovat Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Deaktivovat Pod</string>
-    <string name="omnipod_cmd_reset_pod">Resetovat Pod</string>
-    <string name="omnipod_cmd_pod_history">Historie Podu</string>
-    <string name="omnipod_cmd_set_bolus">Nastavit bolsu</string>
-    <string name="omnipod_cmd_cancel_bolus">Zrušit bolus</string>
-    <string name="omnipod_cmd_set_tbr">Nastavit dočasný bazál</string>
-    <string name="omnipod_cmd_cancel_tbr">Zrušit dočasný bazál (interně ovladačem)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Zrušit dočasný bazál (nuceně uživatelem)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Nastavit plán bazálu</string>
-    <string name="omnipod_cmd_get_pod_status">Zjistit stav Podu</string>
-    <string name="omnipod_cmd_get_pod_info">Zjistit informace o Podu</string>
-    <string name="omnipod_cmd_set_time">Nastavit čas</string>
-    <string name="omnipod_cmd_configure_alerts">Konfigurovat výstrahy</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Potvrdit výstrahy</string>
-    <string name="omnipod_cmd_suspend_delivery">Pozastavit dodávání inzulínu</string>
-    <string name="omnipod_cmd_resume_delivery">Obnovit dodávání inzulínu</string>
-    <string name="omnipod_cmd_unknown_entry">Neznámá položka</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, Sach=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Rychlost: %1$.1f U, doba trvání: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Pokud stisknete <b>OK</b>, stav Podu bude vynuceně resetován a již nebudete moci komunikovat s Podem. Udělejte to pouze v případě, že s Podem již nelze komunikovat. Pokud stále můžete komunikovat s Podem, použijte volbu <b>Deaktivovat Pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">Historie Podu není v daném okamžiku k dispozici.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Naplňte Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nNaplňte nový Pod dostatkem inzulínu na 3 dny.\n\nSledujte dvě pípnutí z Podu během procesu plnění. Tyto ukazují, že minimální množství 85U bylo naplněno. Ujistěte se, že stříkačka je zcela vyprázdněná a to i po vyslechnutí dvou pípnutí.\n\nPo naplnění Podu, prosím, stiskněte <b>Další</b>.\n\n<b>Poznámka:</b> prozatím nesundavejte kryt jehly.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Plnění</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Snažím se spárovat s novým Podem a naplnit ho.\n\nJakmile budou zaškrtnuty všechny položky, můžete stisknout <b>Další</b>.\n\n<b>Poznámka:</b> ponechte prosím Pod velmi blízko RileyLinku.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Nasaďte Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPřipravte infuzní místo. Odstraňte krytku jehly a náplasti a nalepte Pod.\n\nPokud se kanyla odlepí, stiskněte <b>Zrušit</b> a zahoďte Pod.\n\nStiskněte <b>Další</b> pro vložení kanyly a spuštění bazálů.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Vkládání kanyly</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Snažím se nastavit počáteční základní bazální plán a vložit kanylu.\n\nPři zaškrtnutí všech položek můžete stisknout tlačítko <b>Další</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Pod Info</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod je nyní aktivní.\n\nVáš bazál byl naprogramován a kanyla byla vložena.\n\nOvěřte, prosím, že kanyla byla vložena správně a případně vyměňte Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Deaktivovat Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nStiskněte <b>Další</b> pro deaktivaci Podu.\n\n<b>Poznámka:</b> Zastavíte veškerý výdej inzulínu a deaktivujete Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Deaktivace Podu</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Deaktivace Podu.\n\nKdyž jsou zaškrtnuty všechny položky, můžete stisknout <b>Další</b>.\n\n<b>Poznámka:</b> Pokud deaktivace nepřetržitě selhává, prosím stiskněte <b>Zrušit</b> a použijte možnost <b>Resetovat Pod</b> pro resetování stavu Podu.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deaktivován.\n\nOdstraňte Pod z těla a znehodnoťte jej.</string>
-    <string name="omnipod_init_pod_pair_pod">Párování Podu</string>
-    <string name="omnipod_init_pod_prime_pod">Plnění Podu</string>
-    <string name="omnipod_init_pod_fill_cannula">Plnění kanyly</string>
-    <string name="omnipod_init_pod_set_basal_profile">Nastavit bazální profil</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Zrušit podávání</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Deaktivovat Pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Integrace pumpy pro Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Upomínka dokončení párování</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Upomínka dokončení nastavení</string>
-    <string name="omnipod_alert_expiration">Životnost Podu brzy skončí</string>
-    <string name="omnipod_alert_expiration_advisory">Pod brzy vyprší</string>
-    <string name="omnipod_alert_shutdown_imminent">Blíží se vypnutí</string>
-    <string name="omnipod_alert_low_reservoir">Nízký stav zásobníku</string>
-    <string name="omnipod_alert_unknown_alert">Neznámá výstraha</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Nastavení bazálního profilu se možná nezdařilo. Výdej může být pozastaven! Obnovte prosím stav Podu.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Nastavení dočasného bazálu mohlo být neúspěšné. Pokud je dočasný bazál již spuštěn, mohl by být zrušen! Aktualizujte prosím stav Podu.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Nastavení času se možná nezdařilo. Výdej může být pozastaven! Obnovte prosím stav Podu.</string>
-    <string name="omnipod_bolus_failed_uncertain">Nelze ověřit, zda byl bolus úspěšný. Ověřte prosím, zda Váš Pod dodává bolus nebo ho zrušte.</string>
-    <string name="omnipod_rl_stats">Statistika RL</string>
-    <string name="omnipod_read_pulse_log_short">Pulse Log</string>
     <string name="comapareprofile">Porovnat profily</string>
     <string name="nav_profilehelper">Pomocník s profilem</string>
     <string name="motoldefaultprofile">Výchozí profil</string>

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

@@ -400,7 +400,7 @@
     <string name="wear_detailedIOB_title">Zeige detailliertes IOB</string>
     <string name="wear_detailedIOB_summary">Differenziere IOB in Bolus- und Basal-IOB auf dem Watchface</string>
     <string name="nosuccess">Nicht erfolgreich - bitte Telefon prüfen</string>
-    <string name="notavailable">nicht verfügbar</string>
+    <string name="notavailable">n/a</string>
     <string name="patientage">Patientenalter</string>
     <string name="child">Kind</string>
     <string name="teenage">Teenager</string>
@@ -559,6 +559,7 @@
     <string name="pump_unreachable">Pumpe ist nicht erreichbar</string>
     <string name="missed_bg_readings">BZ-Werte fehlen</string>
     <string name="raise_notifications_as_android_notifications">Benutze Systemmeldungen für Alarme und Meldungen</string>
+    <string name="gradually_increase_notification_volume">Passe die Lautstärke für Alarme und Hinweise etwas an. </string>
     <string name="localalertsettings_title">Lokale Alarme</string>
     <string name="enable_missed_bg_readings_alert">Alarm, wenn keine Glukose-Daten empfangen werden</string>
     <string name="enable_pump_unreachable_alert">Alarm, wenn die Pumpe nicht erreichbar ist</string>
@@ -1083,7 +1084,6 @@ Unerwartetes Verhalten.</string>
     <string name="objectives_button_unfinish">Ziel erneut öffnen</string>
     <string name="objectives_button_unstart">Ziel neu starten</string>
     <string name="doyouwantresetstart">Möchtest Du den Start der Ziele zurücksetzen? Du verlierst Deine Fortschritte.</string>
-    <string name="time_or_timezone_change">Zeit- und/oder Zeitzonenänderung an der Pumpe</string>
     <string name="nopumpselected">Keine Pumpe ausgewählt</string>
     <string name="setupwizard_units_prompt">Wähle die Einheit, in der die Werte angezeigt werden sollen.</string>
     <string name="ns_ploadlocalprofile">Lade die Änderungen des lokalen Profils zu NS hoch.</string>
@@ -1160,7 +1160,6 @@ Unerwartetes Verhalten.</string>
     <string name="authorizationfailed">Autorisierung fehlgeschlagen</string>
     <string name="overview_show_absinsulin">Gesamtinsulin</string>
     <string name="master_password_summary">Das Master-Passwort wird für die Backup-Verschlüsselung und zur Außerkraftsetzung der Sicherheit in der Anwendung verwendet. Merke es Dir oder bewahre es an einem sicheren Ort auf.</string>
-    <string name="passwords_dont_match">Die Passwörter stimmen nicht überein.</string>
     <string name="current_master_password">Aktuelles Master-Passwort</string>
     <string name="statuslights">Statusanzeige</string>
     <string name="statuslights_copy_ns">Einstellung aus NS kopieren</string>
@@ -1169,124 +1168,6 @@ Unerwartetes Verhalten.</string>
     <string name="buttonson_description">Schaltflächen werden immer am unteren Rand des Bildschirms angezeigt</string>
     <string name="largedisplay_description">Großer Bildschirm</string>
     <string name="skin">Erscheinungsbild</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Nie verbunden</string>
-    <string name="medtronic_pump_status_waking_up">Aufwecken</string>
-    <string name="medtronic_pump_status_error_comm">Fehler bei der Kommunikation</string>
-    <string name="medtronic_pump_status_timeout_comm">Zeitüberschreitung bei Kommunikation</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pumpe ist nicht erreichbar</string>
-    <string name="medtronic_pump_status_invalid_config">Ungültige Einstellung</string>
-    <string name="medtronic_pump_status_active">Aktiv</string>
-    <string name="medtronic_pump_status_sleeping">Schläft</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Um den Omnipod nutzen zu können, brauchst Du einen RileyLink (mind. Firmware 2.0).</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Bolus-Piep aktiviert</string>
-    <string name="omnipod_config_beep_basal_enabled">Basal-Piep aktiviert</string>
-    <string name="omnipod_config_beep_smb_enabled">SMB-Piep aktiviert</string>
-    <string name="omnipod_config_beep_tbr_enabled">TBR-Piep aktiviert</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Pod-Debugging-Optionen aktiviert</string>
-    <string name="omnipod_config_timechange_enabled">Sommerzeit/Zeitzonen-Erkennung aktiviert</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Pod Mgmt</string>
-    <string name="omnipod_pod_status">Pod Status</string>
-    <string name="omnipod_reservoir_left">%1$.2f IE übrig</string>
-    <string name="omnipod_reservoir_over50">über 50 IE</string>
-    <string name="omnipod_pod_address">Pod Adresse</string>
-    <string name="omnipod_pod_expiry">Pod läuft ab</string>
-    <string name="omnipod_pod_name_no_info">Keine Info</string>
-    <string name="omnipod_pod_no_pod_connected">Kein Pod verbunden</string>
-    <string name="omnipod_pod_not_initalized">Nicht initialisiert</string>
-    <string name="omnipod_pod_active_alerts">Aktive Pod-Warnungen</string>
-    <string name="omnipod_ack_short">Alarm bestätigen</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">Aktion ist nicht möglich.\n\n Du musst zuerst den Omnipod konfigurieren, bevor Du diese Operation verwenden kannst.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Aktion ist nicht möglich.\n\n Du musst ein paar Minuten warten bis AAPS versucht, das Profil zum ersten Mal zu setzen.</string>
-    <string name="omnipod_error_illegal_init_action_type">Illegal PodInitActionType: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Kein aktiver Pod.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Kommandoprüfung fehlgeschlagen</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Es ist ein unerwarteter Fehler aufgetreten. Bitte melden! (Typ: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Kommunikation fehlgeschlagen: Ungültige Eingabeparameter empfangen.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Keine Verbindung: Zeitüberschreitung</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Keine Verbindung: Es ist ein unerwarteter Fehler aufgetreten. Bitte melden!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Kommunikation fehlgeschlagen: Die Überprüfung der Nachrichtenintegrität ist fehlgeschlagen.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Kommunikation fehlgeschlagen: Es wurde ein ungültiges Paket vom Pod empfangen.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Kommunikation fehlgeschlagen: Der Pod befindet sich in einem falschen Status.</string>
-    <string name="omnipod_driver_error_invalid_response">Kommunikation fehlgeschlagen: Es wurde eine ungültige Antwort vom Pod empfangen.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Kommunikation fehlgeschlagen: Ungültige Zeichenfolge vom Pod empfangen.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Kommunikation fehlgeschlagen: Ungültige Adresse vom Pod empfangen.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Kommunikation fehlgeschlagen: Nachricht vom Pod konnte nicht decodiert werden.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Kommunikation fehlgeschlagen: Nonce resync fehlgeschlagen.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Kommunikation fehlgeschlagen: Nonce nicht synchronisiert</string>
-    <string name="omnipod_driver_error_not_enough_data">Kommunikation fehlgeschlagen: Nicht genügend Daten vom Pod empfangen.</string>
-    <string name="omnipod_driver_error_pod_fault">Ein Pod-Fehler (%1$03d %2$s) wurde festgestellt. Bitte deaktiviere den Pod und starte einen neuen.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Kommunikation fehlgeschlagen: Fehlerhafte Antwort vom Pod.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Pod Management</string>
-    <string name="omnipod_cmd_init_pod">Init Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Pod deaktivieren</string>
-    <string name="omnipod_cmd_reset_pod">Pod zurücksetzen</string>
-    <string name="omnipod_cmd_pod_history">Pod Historie</string>
-    <string name="omnipod_cmd_set_bolus">Setze Bolus</string>
-    <string name="omnipod_cmd_cancel_bolus">Bolus abbrechen</string>
-    <string name="omnipod_cmd_set_tbr">Setze Temporäre Basalrate</string>
-    <string name="omnipod_cmd_cancel_tbr">Temporäre Basalrate abbrechen (intern über den Treiber)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Temporäre Basalrate abbrechen (vom Benutzer erzwungen)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Basalrate festlegen</string>
-    <string name="omnipod_cmd_get_pod_status">Pod-Status abrufen</string>
-    <string name="omnipod_cmd_get_pod_info">Pod-Info abrufen</string>
-    <string name="omnipod_cmd_set_time">Zeit einstellen</string>
-    <string name="omnipod_cmd_configure_alerts">Warnungen konfigurieren</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Alarme bestätigen</string>
-    <string name="omnipod_cmd_suspend_delivery">Abgabe abbrechen</string>
-    <string name="omnipod_cmd_resume_delivery">Abgabe wieder aufnehmen</string>
-    <string name="omnipod_cmd_unknown_entry">Unbekannte Eingabe</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f IE</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f IE, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Rate: %1$.1f IE, Dauer: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Wenn Du <b>OK</b> klickst, wird die Verbindung zum Pod zwangsweise getrennt und Du wirst Dich nicht mehr mit ihm verbinden können.
-Mache das nur, wenn AAPS nicht mehr mit dem Pod kommunizieren kann. Wenn dies noch geht, nutze stattdessen die Option <b>Deaktiviere Pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">Pod Historie derzeit nicht verfügbar.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Befülle den Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nBefülle den neuen Pod mit ausreichend Insulin für 3 Tage.\n\nAchte auch zwei Pieptöne vom Pod während des Füllens. Diese zeigen an, dass der Pod mit der Mindestmenge von 85 IE befüllt wurde. Leere die Spritze komplett, auch wenn Du die beiden Pieptöne gehört hast.\n\nKlicke <b>Weiter</b> nachdem Du den Pod befüllt hast.\n\n<b>Hinweis:</b> Entferne den Nadelschutz des Pods noch nicht.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Befüllen</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Versuche Dich mit dem neuen Pod zu verbinden und befülle ihn.\n\nWenn alle Anzeigen angehakt sind, kannst Du <b>Weiter</b> klicken.\n\n<b>Hinweis:</b> Pod und RileyLink müssen dabei sehr nah beieinander sein.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Befestige den Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nBereite die Infusionsstelle vor. Entferne den Nadelschutz des Pods und die Schutzfolie über dem Kleber. Klebe dann den Pod an die gewünschte Körperstelle.\n\nFalls die Kanüle herausragt, klicke <b>Abbrechen</b> und verwirf den Pod.\n\nKlicke <b>Weiter</b>; um die Kanüle zu setzen und die Insulinabgabe zu beginnen.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Kanüle setzen</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Erste Basalrate und Kanüle werden nun gesetzt.\n\nWenn alle Häkchen gesetzt sind, kannst Du <b>Weiter</b> klicken.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Pod Info</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nDer Pod ist jetzt aktiv.\n\nDeine Basalrate ist programmiert und die Kanüle wurde gesetzt.\n\nBitte überprüfe, ob die Kanüle korrekt gesetzt wurde und ersetze den Pod, wenn Du das Gefühl hast, dass dies nicht erfolgreich war.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Pod deaktivieren</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nDrücke <b>Weiter</b> um den Pod zu deaktivieren.\n\n<b>Hinweis:</b> Dies unterbricht die gesamte Insulinabgabe und deaktiviert den Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Deaktiviere den Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Deaktiviere den Pod.\n\nWenn alle Häkchen gesetzt sind, kannst Du <b>Weiter</b>drücken.\n\n<b>Hinweis:</b> Wenn das Deaktivieren fortwährend fehlschlägt, drücke bitte <b>Abbrechen</b> und verwende die Option <b>Reset Pod</b>, um den Pod Status zwangsweise zurückzusetzen.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deaktiviert.\n\nBitte entferne den Pod von Deinem Körper und entsorge ihn.</string>
-    <string name="omnipod_init_pod_pair_pod">Pod verbinden</string>
-    <string name="omnipod_init_pod_prime_pod">Pod befüllen</string>
-    <string name="omnipod_init_pod_fill_cannula">Kanüle befüllen</string>
-    <string name="omnipod_init_pod_set_basal_profile">Basalprofil setzen</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Abgabe abbrechen</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Pod deaktivieren</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Integration für Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Erinnerung Kopplung beendet</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Erinnerung Setup beendet</string>
-    <string name="omnipod_alert_expiration">Pod läuft in Kürze ab</string>
-    <string name="omnipod_alert_expiration_advisory">Pod läuft in Kürze ab</string>
-    <string name="omnipod_alert_shutdown_imminent">Herunterfahren steht unmittelbar bevor</string>
-    <string name="omnipod_alert_low_reservoir">Niedriger Reservoirstand</string>
-    <string name="omnipod_alert_unknown_alert">Unbekannter Alarm</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Das Festlegen der Basalrate evtl. fehlgeschlagen. Insulinabgabe wird evtl. ausgesetzt! Aktualisiere den Pod-Status.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Das Festlegen der temporären Basalrate evtl. fehlgeschlagen. Sofern eine temporäre Basalrate bestand, wurde diese ggf. beendet! Aktualisiere den Pod-Status.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Das Festlegen der Zeit evtl. fehlgeschlagen. Insulinabgabe wird evtl. ausgesetzt! Aktualisiere den Pod-Status.</string>
-    <string name="omnipod_bolus_failed_uncertain">Erfolgreiche Bolusabgabe konnte nicht sicher ermittelt werden. Stelle sicher, dass der Pod Insulin abgibt oder brich den Bolus ab.</string>
-    <string name="omnipod_rl_stats">RL Stats</string>
-    <string name="omnipod_read_pulse_log_short">Pulse Log</string>
     <string name="comapareprofile">Profile vergleichen</string>
     <string name="nav_profilehelper">Profil-Helfer</string>
     <string name="motoldefaultprofile">Standard-Profil</string>

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

@@ -916,22 +916,4 @@
     <string name="boluswizard">Οδηγός Bolus</string>
     <string name="unit_minute_short">min</string>
     <!-- SMS Communicator & OTP Authenticator -->
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Ποτέ δεν επικοινωνήσατε</string>
-    <string name="medtronic_pump_status_waking_up">Ξύπνημα</string>
-    <string name="medtronic_pump_status_error_comm">Σφάλμα με επικοινωνία</string>
-    <string name="medtronic_pump_status_timeout_comm">Λήξη χρόνου επικοινωνίας</string>
-    <string name="medtronic_pump_status_pump_unreachable">Η αντλία δεν είναι διαθέσιμη</string>
-    <string name="medtronic_pump_status_invalid_config">Μη έγκυρη παραμετροποίηση</string>
-    <string name="medtronic_pump_status_active">Ενεργή</string>
-    <string name="medtronic_pump_status_sleeping">Sleeping</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
-    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
 </resources>

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

@@ -156,6 +156,7 @@
     <string name="overview_tempbasal_button">Basal Temporal</string>
     <string name="overview_extendedbolus_button">Bolo extendido</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout versión:</string>
+    <string name="missing_carbs">Falta %1$d g</string>
     <string name="exported">Preferencias exportadas</string>
     <string name="export_to">Exportar ajustes a</string>
     <string name="import_from">Importar configuración de</string>
@@ -171,6 +172,8 @@
     <string name="password_preferences_decrypt_prompt">Se le solicitará la contraseña maestra, que es necesaria para descifrar las preferencias importadas.</string>
     <string name="preferences_export_canceled">¡Exportación cancelada! ¡Las preferencias NO se han exportado!</string>
     <string name="preferences_import_canceled">¡Importación cancelada! ¡Las preferencias NO se han importado!</string>
+    <string name="preferences_import_impossible">¡No se pueden importar preferencias!</string>
+    <string name="goto_main_try_again">Por favor, vuelve a la pantalla principal e inténtalo de nuevo.</string>
     <string name="preferences_import_list_title">Seleccionar fichero para importar</string>
     <string name="check_preferences_before_import">Por favor, compruebe las preferencias antes de importar:</string>
     <string name="check_preferences_cannot_import">¡Las preferencias no se pueden importar!</string>
@@ -232,6 +235,10 @@
     <string name="smscommunicator_remotebolusmindistance_summary">Número mínimo de minutos que deben transcursar entre un bolus remoto y el siguiente</string>
     <string name="smscommunicator_remotebolusmindistance">Cuántos minutos deben transcurrir, al menos, entre un bolo y el siguiente</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">Por su seguridad, para editar esta preferencia es necesario añadir al menos 2 números de teléfono.</string>
+    <string name="bolusdelivered">Bolo %1$.2fU enviado correctamente</string>
+    <string name="bolusrequested">Entregando %1$.2f U</string>
+    <string name="smscommunicator_bolusdelivered">Bolo %1$.2fU enviado correctamente</string>
+    <string name="smscommunicator_mealbolusdelivered">Bolo de comida %1$.2f U entregado con éxito</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Objetivo %1$s para %2$d minutos</string>
     <string name="smscommunicator_tt_set">Objetivo %1$s para %2$d minutos establecido correctamente</string>
     <string name="smscommunicator_tt_canceled">Objetivo temporal cancelado con éxito</string>
@@ -255,7 +262,9 @@
     <string name="smscommunicator_reconnect">Bomba reconectada</string>
     <string name="smscommunicator_remotecommandnotallowed">Comando remoto no permitido</string>
     <string name="smscommunicator_remotebolusnotallowed">El bolo remoto no está disponible. Inténtalo de nuevo más tarde.</string>
+    <string name="smscommunicator_basalreplywithcode">Para iniciar una basal de %1$.2fU/h durante %2$d min, responder con el código %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Para cambiar el perfil a %1$s %2$d%% responder con el código %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Para iniciar un bolo extendido de %1$.2fU durante %2$d minutos, responder con el código %3$s</string>
     <string name="smscommunicator_carbsreplywithcode">Para introducir %1$dg en %2$s responder con código %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Para iniciar una basal de %1$d%% durante %2$d min, responder con el código %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Para cancelar lazo por %1$d minutos responde con código %2$s</string>
@@ -264,6 +273,7 @@
     <string name="smscommunicator_loopdisablereplywithcode">Para desactivar el lazo responder con código %1$s</string>
     <string name="smscommunicator_tempbasalset">Basal temporal %1$.2fU/h para %2$d min iniciada correctamente</string>
     <string name="smscommunicator_extendedset">Bolo ampliado de %1$.2fU durante %2$d min se inició correctamente</string>
+    <string name="smscommunicator_carbsset">Carbohidratos %1$d  g ingresados correctamente</string>
     <string name="smscommunicator_carbsfailed">Error al introducir %1$dg de carbohidratos</string>
     <string name="smscommunicator_tempbasalset_percent">Basal temporal de %1$d%% durante %2$d min iniciada correctamente</string>
     <string name="smscommunicator_tempbasalfailed">Fallo inicio basal temporal</string>
@@ -637,6 +647,7 @@
     <string name="enablesmbwithtemptarget">Habilitar SMB con Objetivos Temporales</string>
     <string name="enablesmbwithtemptarget_summary">Habilitar SMB cuando hay un Objetivo Temporal (TT) activo (ComerPronto, Actividad)</string>
     <string name="enablesmbwithhightemptarget">Habilitar SMB con Objetivo Temporal Alto</string>
+    <string name="enablesmbwithhightemptarget_summary">Habilitar SMB cuando hay un objetivo temporal alto activo (ejercicio, superior a 100 mg/dl o 5.5 mmol/l)</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">Carbohidratos</string>
     <string name="overview_buttons_selection">Botones</string>
@@ -670,6 +681,7 @@
     <string name="do_not_bolus_record_only">No administrar Bolo, solo anotar</string>
     <string name="category">Categoría</string>
     <string name="subcategory">Subcategoría</string>
+    <string name="bolusrecordedonly">Bolo sólo se registrará (no será entregado por la bomba)</string>
     <string name="ns_autobackfill_summary">Rellenar BGs perdidos desde NS</string>
     <string name="loop_smbsetbypump_label">SMB administrado por bomba</string>
     <string name="overview_show_activity">Actividad</string>
@@ -786,6 +798,7 @@
     <string name="askforpermission">Pedir permiso</string>
     <string name="needsystemwindowpermission">La aplicación necesita permiso de ventana del sistema para las notificaciones</string>
     <string name="needlocationpermission">La aplicación necesita permiso de ubicación para la exploración de BT e identificación de WiFi</string>
+    <string name="needstoragepermission">La aplicación necesita permiso de almacenamiento para poder almacenar archivos de registro y valores de exportación</string>
     <string name="request">Solicitar</string>
     <string name="insulinsourcesetup">Configurar complemento de insulina</string>
     <string name="exit">Salir</string>
@@ -841,6 +854,7 @@
     <string name="code_compare">¿Coinciden los códigos mostrados en este dispositivo y en su infusor?</string>
     <string name="insight_pairing">Insight sincronizada</string>
     <string name="insight_local">Accu-Chek Insight</string>
+    <string name="insight_delivered">%1$.2f U / %2$.2f U entregado</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Tubo cambiado</string>
     <string name="pump_time_updated">Hora del infusor actualizada</string>
@@ -898,6 +912,7 @@
     <string name="short_status_extended">Multionda: %1$.2f / %2$.2f U durante %3$d min</string>
     <string name="short_status_multiwave">Multionda: %1$.2f / %2$.2f U durante %3$d min</string>
     <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">Reser.: %1$.2f U</string>
     <string name="short_status_battery">Batería.: %1$d%%</string>
     <string name="max_recovery_duration">Max. duración de recuperación [s]</string>
     <string name="min_recovery_duration">Min. duración de recuperación [s]</string>
@@ -1040,6 +1055,8 @@
     <string name="sendsmsactionlabel">Enviar a %1$s</string>
     <string name="sendsmsactiondescription">Enviar SMS a todos los números</string>
     <string name="sendsmsactiontext">Mandar mensaje SMS</string>
+    <string name="cobvsiob">COB vs IOB</string>
+    <string name="bolusconstraintappliedwarn">Restricción de bolo aplicada: %1$.2f U a %2$.2f U</string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>! Se ha detectado una absorción lenta de hidratos de carbono: %2$d%% de tiempo. Compruebe de nuevo su calculo. Los COB se pueden sobrestimar, por lo que ¡se podría administrar más insulina de la cuenta!</font>]]></string>
     <string name="partialboluswizard">Administrar esta parte del resultado del asistente de bolos [%]</string>
     <string name="deliverpartofboluswizard">El asistente de bolos realiza el cálculo, pero solo se entrega esta parte de la insulina calculada. Útil con el algoritmo SMB.</string>
@@ -1065,7 +1082,6 @@
     <string name="objectives_button_unfinish">Limpieza finalizada</string>
     <string name="objectives_button_unstart">Limpieza iniciada</string>
     <string name="doyouwantresetstart">¿Desea reiniciar el objetivo? Puedes perder tu progreso.</string>
-    <string name="time_or_timezone_change">Cambio de hora y/o huso horario en la bomba</string>
     <string name="nopumpselected">Ninguna bomba seleccionada</string>
     <string name="setupwizard_units_prompt">Seleccione las unidades en las que desea visualizar los valores</string>
     <string name="ns_ploadlocalprofile">Subir cambios de perfil local a NS</string>
@@ -1090,6 +1106,7 @@
     <string name="nav_survey">Encuesta</string>
     <string name="invalidage">Entrada de edad no válida</string>
     <string name="invalidweight">Peso no válido</string>
+    <string name="invalidpct">Entrada % invalida</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">Promedio</string>
     <string name="tir">TIR</string>
@@ -1141,7 +1158,6 @@
     <string name="authorizationfailed">Ha fallado la autorización</string>
     <string name="overview_show_absinsulin">Insulina en total</string>
     <string name="master_password_summary">La contraseña maestra se usa para cifrar la copia de seguridad y para sustituir la seguridad en la aplicación. Recordar o almacenar en sitio seguro.</string>
-    <string name="passwords_dont_match">Contraseñas no coinciden</string>
     <string name="current_master_password">Contraseña maestra actual</string>
     <string name="statuslights">Luces de estado</string>
     <string name="statuslights_copy_ns">Copiar ajustes de NS</string>
@@ -1150,128 +1166,15 @@
     <string name="buttonson_description">Los botones siempre se muestran en la parte inferior de la pantalla</string>
     <string name="largedisplay_description">Pantalla grande</string>
     <string name="skin">Tema</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Nunca conectados</string>
-    <string name="medtronic_pump_status_waking_up">En fase de inicio</string>
-    <string name="medtronic_pump_status_error_comm">Error con la comunicación</string>
-    <string name="medtronic_pump_status_timeout_comm">Tiempo de espera en la comunicación</string>
-    <string name="medtronic_pump_status_pump_unreachable">Infusora no alcanzable</string>
-    <string name="medtronic_pump_status_invalid_config">Configuración no válida</string>
-    <string name="medtronic_pump_status_active">Activo</string>
-    <string name="medtronic_pump_status_sleeping">Suspendida</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">La integración de la bomba para Omnipod requiere el dispositivo RileyLink (con al menos 2,0 firmware).</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Aviso de bolo activado</string>
-    <string name="omnipod_config_beep_basal_enabled">Aviso de basal activado</string>
-    <string name="omnipod_config_beep_smb_enabled">Aviso de SMB activado</string>
-    <string name="omnipod_config_beep_tbr_enabled">Aviso de TBT activado</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Opciones de depuración de Pod habilitadas</string>
-    <string name="omnipod_config_timechange_enabled">Detección de DST/Timezone habilitada</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Pod Mgmt</string>
-    <string name="omnipod_pod_status">Estado de Pod</string>
-    <string name="omnipod_reservoir_left">%1$.2f U restantes</string>
-    <string name="omnipod_reservoir_over50">Más De 50 U</string>
-    <string name="omnipod_pod_address">Dirección de Pod</string>
-    <string name="omnipod_pod_expiry">Pod Caduca</string>
-    <string name="omnipod_pod_name_no_info">Sin info</string>
-    <string name="omnipod_pod_no_pod_connected">Sin Pod conectado</string>
-    <string name="omnipod_pod_not_initalized">No Inicializado</string>
-    <string name="omnipod_pod_active_alerts">Alertas de Pod activas</string>
-    <string name="omnipod_ack_short">Alertas Ack</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">La operación no es posible.\n\nDebe configurar Omnipod primero, antes de poder usar esta operación.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">La operación no es posible.\n\n Necesitas esperar unos minutos, hasta que AAPS intente establecer el perfil por primera vez.</string>
-    <string name="omnipod_error_illegal_init_action_type">Ilegal PodInitActionType: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Ningún pod activo.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Falló la verificación del comando.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Error inesperado. Por favor, informe! (tipo: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Comunicación fallida: se han recibido parámetros de entrada inválidos.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Comunicación fallida: tiempo de espera.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">La comunicación ha fallado: error inesperado. ¡Por favor, Informe!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Comunicación fallida: falló la verificación de integridad del mensaje.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">La comunicación ha fallado: se ha recibido un paquete no válido del Pod.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">La comunicación ha fallado: el Pod está en un estado incorrecto.</string>
-    <string name="omnipod_driver_error_invalid_response">La comunicación ha fallado: se ha recibido una respuesta no válida del Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Ha fallado la comunicación: se ha recibido un mensaje con un número de secuencia no válido del Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_address">La comunicación ha fallado: se ha recibido un mensaje con una dirección no válida desde el Pod.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">La comunicación ha fallado: no se ha podido descodificar el mensaje del Pod.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">La comunicación ha fallado: nonce resync ha fallado.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Comunicación fallida: nonce no sincronizada.</string>
-    <string name="omnipod_driver_error_not_enough_data">La comunicación ha fallado: no se han recibido suficientes datos del Pod.</string>
-    <string name="omnipod_driver_error_pod_fault">Un error de Pod (%1$03d %2$s) se ha detectado. Por favor, desactive su Pod e inicie uno nuevo.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">La comunicación ha fallado: el Pod ha devuelto una respuesta de error.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Administración de Pod</string>
-    <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Desactivar Pod</string>
-    <string name="omnipod_cmd_reset_pod">Restablecer Pod</string>
-    <string name="omnipod_cmd_pod_history">Historial de Pod</string>
-    <string name="omnipod_cmd_set_bolus">Establecer Bolo</string>
-    <string name="omnipod_cmd_cancel_bolus">Cancelar Bolus</string>
-    <string name="omnipod_cmd_set_tbr">Establecer la basal temporal</string>
-    <string name="omnipod_cmd_cancel_tbr">Cancelar Basal Temporal (Internamente por controlador)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Cancelar Basal Temporal (forzado por el usuario)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Establecer Planificación Basal</string>
-    <string name="omnipod_cmd_get_pod_status">Obtener estado de Pod</string>
-    <string name="omnipod_cmd_get_pod_info">Obtener información de Pod</string>
-    <string name="omnipod_cmd_set_time">Establecer hora</string>
-    <string name="omnipod_cmd_configure_alerts">Configurar alertas</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Confirmar Alertas</string>
-    <string name="omnipod_cmd_suspend_delivery">Suspender la entrega</string>
-    <string name="omnipod_cmd_resume_delivery">Reanudar la entrega</string>
-    <string name="omnipod_cmd_unknown_entry">Entrada desconocida</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1fU</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Tasa: %1$.1f U, Duración: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Si pulsa <b>OK</b>, el estado de Pod se restablecerá por la fuerza y ya no podrá comunicarse con el Pod. Hágalo sólo si ya no puede comunicarse con el Pod. Si todavía puede comunicarse con el Pod, utilice la opción <b>Desactivar Pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">Historial del Pod no disponible en el momento.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Llenar el Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nLlenar el nuevo Pod con suficiente insulina durante 3 días.\n\nEscucha dos pitidos del Pod durante el proceso de llenado. Esto indica que se ha insertado la cantidad mínima de 85U. Asegúrese de vaciar completamente la jeringa, incluso después de escuchar los dos pitidos.\n\nDespués de llenar el Pod, por favor pulse <b>Next</b>.\n\n<b>Nota:</b> no retire el capuchón de la aguja del Pod en este momento.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Cebado</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Intentando emparejar con el nuevo Pod y primarlo.\n\nCuando todos los elementos están marcados, puedes pulsar <b>Siguiente</b>.\n\n<b>Nota:</b> por favor mantenga el Pod muy cerca del RileyLink en este momento.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Adherir el Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPreparar el sitio de infusión. Retire el capuchón de la aguja del Pod y el adhesivo y aplique el Pod al sitio de perfusión.\n\nSi la cánula se queda fuera, por favor presione <b>Cancel</b> y descarte su Pod.\n\nPress <b>Next</b> para insertar la cánula y comenzar la entrega basal.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Insertar cánula</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Intentando establecer la programación basal inicial e insertar la cánula.\n\nCuando todos los elementos están marcados, puede pulsar <b>Siguiente</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Pod Info</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nEl Pod ahora está activo.\n\nSu horario basal ha sido programado y la cánula ha sido insertada.\n\nPor favor, verifique que la cánula ha sido insertada correctamente y reemplace su Pod si usted siente que no lo ha hecho.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Desactivar Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nPulsa <b>Siguiente</b> para desactivar el Pod.\n\n<b>Nota:</b> Esto suspenderá toda la entrega insulina y desactivará el Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Desactivando el Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Desactivando el Pod.\n\nCuando se comprueban todos los elementos, puede pulsar <b>Next</b>.\n\n<b>Nota:</b> Si la desactivación falla, por favor pulse <b>Cancelar</b> y utilice la opción <b>Restablecer Pod</b> para restablecer por la fuerza el estado de Pod.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod desactivado.\n\nPor favor, retire el Pod de su cuerpo y desecharlo.</string>
-    <string name="omnipod_init_pod_pair_pod">Emparejar Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Llenado de cánula del Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Llenar cánula</string>
-    <string name="omnipod_init_pod_set_basal_profile">Establecer el perfil basal</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Cancelar entrega</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Desactivar Pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Integración de la bomba para Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Finalizar recordatorio de emparejamiento</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Recordatorio de configuración finalizado</string>
-    <string name="omnipod_alert_expiration">Pod a punto de caducar</string>
-    <string name="omnipod_alert_expiration_advisory">Pod a punto de caducar</string>
-    <string name="omnipod_alert_shutdown_imminent">El apagado es inminente</string>
-    <string name="omnipod_alert_low_reservoir">Reservorio bajo</string>
-    <string name="omnipod_alert_unknown_alert">Alerta desconocida</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">La configuración del perfil basal podría haber fallado. ¡La entrega podría ser suspendida! Por favor, actualiza el estado de Pod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">La configuración de basal temporal podría haber fallado. Si ya se está ejecutando una basal temporal, ¡puede que haya sido cancelada! Por favor, actualice el estado del pod.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Ajuste de la hora puede ser que haya fallado. La entrega puede ser suspendido! Por favor, actualizar estado de Pod.</string>
-    <string name="omnipod_bolus_failed_uncertain">No se puede verificar si el bolo ha sido exitoso. Por favor verifique que su Pod está poniendo bolo o cancele el bolo.</string>
-    <string name="omnipod_rl_stats">Estadísticas del RL</string>
-    <string name="omnipod_read_pulse_log_short">Registro de pulso</string>
     <string name="comapareprofile">Comparar perfiles</string>
     <string name="nav_profilehelper">Asistente de perfil</string>
+    <string name="motoldefaultprofile">Perfil predeterminado</string>
     <string name="currentprofile">Perfil actual</string>
     <string name="availableprofile">Perfil disponible</string>
     <string name="profiletype">Tipo de perfil</string>
     <string name="formatwithtdd">Edad: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwittddandpct">Edad: %1$.0f TDD: %2$.0f U %3$d%%</string>
     <string name="formatwithweight">Edad: %1$.0f Peso: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% de basal</string>
+    <string name="dpvdefaultprofile">Perfil DPV por defecto</string>
 </resources>

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

@@ -1083,7 +1083,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="objectives_button_unfinish">Refaire l\'objectif</string>
     <string name="objectives_button_unstart">Suppression démarrée</string>
     <string name="doyouwantresetstart">Voulez-vous réinitialiser le début de l\'objectif ? Vous risquez de perdre vos progrès.</string>
-    <string name="time_or_timezone_change">Heure et/ou fuseau horaire changé sur la pompe</string>
     <string name="nopumpselected">Aucune pompe sélectionnée</string>
     <string name="setupwizard_units_prompt">Sélectionnez les unités dans lesquelles vous souhaitez afficher les valeurs</string>
     <string name="ns_ploadlocalprofile">Remonter les modifications de profil local dans NS</string>
@@ -1160,7 +1159,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="authorizationfailed">Echec de l\'authentification</string>
     <string name="overview_show_absinsulin">Insuline absolue</string>
     <string name="master_password_summary">Le mot de passe principal est utilisé pour crypter les sauvegardes et superviser la sécurité de l\'application. Rappelez-vous en ou stockez le en lieu sûr.</string>
-    <string name="passwords_dont_match">Les mots de passe ne correspondent pas</string>
     <string name="current_master_password">Mot de passe principal actuel</string>
     <string name="statuslights">Voyants d\'état</string>
     <string name="statuslights_copy_ns">Copier les paramètres depuis NS</string>
@@ -1169,123 +1167,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="buttonson_description">Les boutons sont toujours affichés en bas de l\'écran</string>
     <string name="largedisplay_description">Grand écran</string>
     <string name="skin">Thème</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Jamais contacté</string>
-    <string name="medtronic_pump_status_waking_up">Réveil en cours</string>
-    <string name="medtronic_pump_status_error_comm">Erreur de communication</string>
-    <string name="medtronic_pump_status_timeout_comm">Expiration du délai d\'attente en communication</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pompe hors de portée</string>
-    <string name="medtronic_pump_status_invalid_config">Configuration non valable</string>
-    <string name="medtronic_pump_status_active">Activé</string>
-    <string name="medtronic_pump_status_sleeping">En veille</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">L\'intégration de la pompe Omnipod nécessite un boitier RileyLink (avec au minimum un firmware 2.0).</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Bip Bolus Activé</string>
-    <string name="omnipod_config_beep_basal_enabled">Bip Basal Activé</string>
-    <string name="omnipod_config_beep_smb_enabled">Bip SMB activé</string>
-    <string name="omnipod_config_beep_tbr_enabled">Bip DBT Activé</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Options de débogage Pod activées</string>
-    <string name="omnipod_config_timechange_enabled">Changement de Zone/Heure Activé</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Pod</string>
-    <string name="omnipod_pod_status">État du Pod</string>
-    <string name="omnipod_reservoir_left">%1$.2f U restantes</string>
-    <string name="omnipod_reservoir_over50">Plus de 50 U</string>
-    <string name="omnipod_pod_address">Adresse du Pod</string>
-    <string name="omnipod_pod_expiry">Pod Expiré</string>
-    <string name="omnipod_pod_name_no_info">Pas d\'infos</string>
-    <string name="omnipod_pod_no_pod_connected">Pas de Pod Connecté</string>
-    <string name="omnipod_pod_not_initalized">Non initialisé</string>
-    <string name="omnipod_pod_active_alerts">Activer Alertes Pod</string>
-    <string name="omnipod_ack_short">Valid Alert</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">Operation impossible.\n\nVous devez d\'abord configurer l\'Omnipod pour pouvoir faire cette operation.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Operation impossible.\n\nVous devez attendre quelques minutes, jusqu\'à ce que AAPS tente de définir le profil pour la première fois.</string>
-    <string name="omnipod_error_illegal_init_action_type">type d\'action d\'init Pod non autorisée : %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Pas de Pod Actif.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Échec de vérification de la commande.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Erreur inconnue. Veuillez signaler ! (type : %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Échec de communication : paramètres d\'entrées reçus invalides.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Échec de communication : délai expiré.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Échec de communication : Erreur inconnue. Veuillez signaler !</string>
-    <string name="omnipod_driver_error_crc_mismatch">Échec de communication : vérification de l\'intégrité du message échouée.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Échec de communication : paquet reçu du Pod invalide.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Échec de communication : état du Pod incorrect.</string>
-    <string name="omnipod_driver_error_invalid_response">Échec de communication : réponse invalide reçue du Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Échec de communication : message reçu du Pod avec un numéro de séquence invalide.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Échec de communication : message reçu du Pod avec une adresse invalide.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Échec de communication : échec du décodage du message reçu du Pod.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Échec de communication : resynchro nonce échouée.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Échec de communication : nonce non synchro.</string>
-    <string name="omnipod_driver_error_not_enough_data">Échec de communication : pas assez de données reçues du Pod.</string>
-    <string name="omnipod_driver_error_pod_fault">Un défaut du Pod a été détecté (%1$03d %2$s). Veuillez désactiver votre Pod et en démarrer un nouveau.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Échec de communication : le Pod a renvoyé un message d\'erreur.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Gestion Pod</string>
-    <string name="omnipod_cmd_init_pod">Init Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Désactiver Pod</string>
-    <string name="omnipod_cmd_reset_pod">Réinit. Pod</string>
-    <string name="omnipod_cmd_pod_history">Historique Pod</string>
-    <string name="omnipod_cmd_set_bolus">Définir Bolus</string>
-    <string name="omnipod_cmd_cancel_bolus">Annuler Bolus</string>
-    <string name="omnipod_cmd_set_tbr">Définir le Basal Temporaire</string>
-    <string name="omnipod_cmd_cancel_tbr">Basal Temp Annulée (en interne par le pilote)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Basal Temp Annulée (par l\'utilisateur)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Définir le schéma de basal</string>
-    <string name="omnipod_cmd_get_pod_status">État du Pod</string>
-    <string name="omnipod_cmd_get_pod_info">Infos du Pod</string>
-    <string name="omnipod_cmd_set_time">Régler L\'heure</string>
-    <string name="omnipod_cmd_configure_alerts">Configurer les alertes</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Valider les Alertes</string>
-    <string name="omnipod_cmd_suspend_delivery">Suspendre l\'injection</string>
-    <string name="omnipod_cmd_resume_delivery">Pousuivre l\'injection</string>
-    <string name="omnipod_cmd_unknown_entry">Entrée inconnue</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, Gluc=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Débit : %1$.1f U, Durée : %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Si vous appuyez sur <b>OK</b>, le Pod sera réinitialisé et vous ne pourrez plus communiquer avec lui. Ne le faite que si vous ne pouvez plus communiquer avec le Pod. Si vous pouvez toujours communiquer avec lui, veuillez utiliser l\'option <b>Désactiver Pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">Historique Pod non disponible pour le moment.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Remplir le Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nRemplir le nouveau Pod avec suffisamment d\'insuline pendant 3 jours.\n\nÉcoutez les deux bips du Pod pendant le processus de remplissage. Ils indiquent que la quantité minimale de 85U a été ajouté. Assurez-vous de vider complètement la seringue de remplissage, même après avoir entendu les deux bips.\n\nAprès avoir rempli le Pod, veuillez appuyer sur <b>Suivant</b>.\n\n<b>Remarque :</b> Ne retirez pas la protection de l\'aiguille du Pod pour le moment.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Amorçage</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Tentative d\'appairage et d\'amorçage du nouveau Pod.\n\nQuand tous les items sont cochées, appuyez sur <b>Suivant</b>.\n\n<b>Remarque :</b> Veuillez maintenir le Pod tout près du RileyLink en ce moment.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Collez le Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPréparez le site d\'injection. Enlevez la protection de l\'aiguille et le support adhésif et collez le Pod sur le site d\'injection.\n\nSi la canule se colle, appuyez sur <b>Annuler</b> et jetez votre Pod.\n\nAppuyez sur <b>Suivant</b> pour insérer la canule et démarrer l\'injection de la basal.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Insertion canule</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Tentative de définir le schéma de basal et d\'insertion de la canule.\n\nQuand tous les items sont cochés, appuyez sur <b>Suivant</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Infos Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nLe Pod est maintenant actif.\n\nVos débits de basal ont été programmés et la canule a été insérée.\n\nVeuillez verifier que la canule a été insérée correctement et remplacez votre Pod si vous pensez que ce n\'est pas le cas.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Désactiver Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nAppuyez sur <b>Suivant</b> pour désactiver le Pod.\n\n<b>Remarque :</b> Cela suspendra l\'injection de l\'insuline et désactivera le Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Désactivation du Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Désactivation du Pod.\n\nQuand tous les items sont cochés, appuyez sur <b>Suivant</b>.\n\n<b>Remarque :</b> Si la désactivation échoue en permanence, appuyez sur <b>Annuler</b> et utilisez l\'option <b>Réinit. Pod</b> pour réinitialiser l\'état du Pod.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod désactivé.\n\nVeuillez enlever le Pod de votre corps et le jeter.</string>
-    <string name="omnipod_init_pod_pair_pod">Appairer le Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Amorcer le Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Remplir tubulure</string>
-    <string name="omnipod_init_pod_set_basal_profile">Définir profil de basal</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Annuler l\'injection</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Désactiver Pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Intégration de la pompe Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Rappel fin d\'appairage</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Rappel fin de configuration</string>
-    <string name="omnipod_alert_expiration">Le Pod expire bientôt</string>
-    <string name="omnipod_alert_expiration_advisory">Le Pod expire bientôt</string>
-    <string name="omnipod_alert_shutdown_imminent">Arrêt imminent</string>
-    <string name="omnipod_alert_low_reservoir">Réservoir bas</string>
-    <string name="omnipod_alert_unknown_alert">Alerte inconnue</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Le paramétrage du profil basal a peut-être échoué. L\'injection pourrait être suspendue ! Veuillez actualiser l\'état du pod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Le réglage de la basal temp a peut-être échoué. S\'il y avait déjà un DBT en cours, cela a peut-être été annulé ! Veuillez actualiser le statut du pod.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Le paramétrage de l\'heure a peut-être échoué. L\'injection pourrait être suspendue ! Veuillez actualiser l\'état du pod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Impossible de vérifier si le bolus a réussi. Vérifiez que votre Pod délivre le bolus ou annulez le bolus.</string>
-    <string name="omnipod_rl_stats">État RL</string>
-    <string name="omnipod_read_pulse_log_short">Enreg. Pulse</string>
     <string name="comapareprofile">Comparer les profils</string>
     <string name="nav_profilehelper">Assistant Profil</string>
     <string name="motoldefaultprofile">Profil par défaut</string>

app/src/main/res/values-ga-rIE/strings.xml

@@ -17,14 +17,4 @@
     <string name="careportal_pbage_label_short">PBAGE</string>
     <string name="openaps_short">OAPS</string>
     <!-- SMS Communicator & OTP Authenticator -->
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
-    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
 </resources>

app/src/main/res/values-hr-rHR/strings.xml

@@ -5,14 +5,4 @@
     <!--    <string name="ga_lang" translatable="false">Irish</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
-    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
 </resources>

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

@@ -44,7 +44,7 @@
     <string name="objectives_exam_objective">Dai prova della tua conoscenza</string>
     <string name="objectives_exam_gate">Studia e rispondi correttamente alle domande</string>
     <string name="answerdisabledto">Risposta disabilitata fino a: %1$s</string>
-    <string name="wronganswer">Risposta sbagliata!</string>
+    <string name="wronganswer">Risposta errata!</string>
     <string name="unfinshed_button">Prossimo N.C.</string>
     <string name="requestcode">Codice richiesta: %1$s</string>
     <string name="objectives_hint">(segna tutte le risposte corrette)</string>

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

@@ -1082,7 +1082,6 @@
     <string name="objectives_button_unfinish">Cancella completamento</string>
     <string name="objectives_button_unstart">Cancella avvio</string>
     <string name="doyouwantresetstart">Vuoi resettare l\'avvio dell\'obiettivo? Potresti perdere i tuoi progressi.</string>
-    <string name="time_or_timezone_change">Cambio di ora e/o fuso orario sul micro</string>
     <string name="nopumpselected">Nessun micro selezionato</string>
     <string name="setupwizard_units_prompt">Seleziona le unità in cui vuoi visualizzare i valori</string>
     <string name="ns_ploadlocalprofile">Carica modifiche al profilo locale in NS</string>
@@ -1159,7 +1158,6 @@
     <string name="authorizationfailed">Autorizzazione fallita</string>
     <string name="overview_show_absinsulin">Insulina assoluta</string>
     <string name="master_password_summary">La password master viene utilizzata per la crittografia del backup e per gestire la sicurezza nell\'applicazione. Ricordala o conservala in un luogo sicuro.</string>
-    <string name="passwords_dont_match">Le password non coincidono</string>
     <string name="current_master_password">Password Master corrente</string>
     <string name="statuslights">Indicatori di stato</string>
     <string name="statuslights_copy_ns">Copia impostazioni da NS</string>
@@ -1168,123 +1166,6 @@
     <string name="buttonson_description">I tasti vengono sempre visualizzati nella parte inferiore dello schermo</string>
     <string name="largedisplay_description">Visualizzazione ampia</string>
     <string name="skin">Tema</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Mai connesso</string>
-    <string name="medtronic_pump_status_waking_up">Risveglio</string>
-    <string name="medtronic_pump_status_error_comm">Errore nella comunicazione</string>
-    <string name="medtronic_pump_status_timeout_comm">Timeout della comunicazione</string>
-    <string name="medtronic_pump_status_pump_unreachable">Micro irraggiungibile</string>
-    <string name="medtronic_pump_status_invalid_config">Configurazione non valida</string>
-    <string name="medtronic_pump_status_active">Attivo</string>
-    <string name="medtronic_pump_status_sleeping">In sospensione</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integrazione del microinfusore Omnipod, richiede un dispositivo RileyLink (con almeno il firmware 2.0).</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">BIP bolo abilitato</string>
-    <string name="omnipod_config_beep_basal_enabled">BIP basale abilitato</string>
-    <string name="omnipod_config_beep_smb_enabled">BIP SMB abilitato</string>
-    <string name="omnipod_config_beep_tbr_enabled">BIP TBR abilitato</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Opzioni debug pod abilitate</string>
-    <string name="omnipod_config_timechange_enabled">Rilevamento ora legale/fuso orario abilitato</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">GSTN pod</string>
-    <string name="omnipod_pod_status">Stato pod</string>
-    <string name="omnipod_reservoir_left">%1$.2f U rimanenti</string>
-    <string name="omnipod_reservoir_over50">Oltre 50 U</string>
-    <string name="omnipod_pod_address">Indirizzo pod</string>
-    <string name="omnipod_pod_expiry">Scadenza pod</string>
-    <string name="omnipod_pod_name_no_info">No info</string>
-    <string name="omnipod_pod_no_pod_connected">Nessun pod connesso</string>
-    <string name="omnipod_pod_not_initalized">Non inizializzato</string>
-    <string name="omnipod_pod_active_alerts">Attiva avvisi pod</string>
-    <string name="omnipod_ack_short">Conferma avvisi</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">Operazione non possibile.\n\nDevi prima configurare Omnipod.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Operazione non possibile.\n\n Devi attendere qualche minuto che AAPS imposti il profilo per la prima volta.</string>
-    <string name="omnipod_error_illegal_init_action_type">Illegal PodInitActionType: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Nessun pod attivo.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Verifica comando fallita.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Si è verificato un errore imprevisto. Segnalalo! (%1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Comunicazione fallita: ricevuti parametri di input non validi.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Comunicazione fallita: timeout.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Comunicazione fallita: si è verificato un errore imprevisto. Segnalalo!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Comunicazione fallita: verifica dell\'integrità del messaggio fallita.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Comunicazione fallita: ricevuto un pacchetto non valido dal pod.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Comunicazione fallita: il pod è in uno stato non corretto.</string>
-    <string name="omnipod_driver_error_invalid_response">Comunicazione fallita: ricevuta una risposta non valida dal pod.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Comunicazione fallita: ricevuto dal pod un messaggio con una sequenza numerica non valida.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Comunicazione fallita: ricevuto dal pod un messaggio con un indirizzo non valido.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Comunicazione fallita: non si è riuscito a decodificare il messaggio dal pod.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Comunicazione fallita: risincronizzazione \'nonce\' non riuscita.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Comunicazione fallita: \'nonce\' non sincronizzato.</string>
-    <string name="omnipod_driver_error_not_enough_data">Comunicazione fallita: non abbastanza dati ricevuti dal pod.</string>
-    <string name="omnipod_driver_error_pod_fault">È stato rilevato un guasto al pod (%1$03d %2$s). Disattiva il tuo pod e avviane uno nuovo.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Comunicazione fallita: il pod ha restituito una risposta di errore.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Gestione pod</string>
-    <string name="omnipod_cmd_init_pod">Inizializza pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Disattiva pod</string>
-    <string name="omnipod_cmd_reset_pod">Resetta pod</string>
-    <string name="omnipod_cmd_pod_history">Storico pod</string>
-    <string name="omnipod_cmd_set_bolus">Imposta bolo</string>
-    <string name="omnipod_cmd_cancel_bolus">Cancella bolo</string>
-    <string name="omnipod_cmd_set_tbr">Imposta basale temporanea</string>
-    <string name="omnipod_cmd_cancel_tbr">Cancella basale temporanea (internamente dal driver)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Cancella basale temporanea (forzato da utente)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Imposta piano basale</string>
-    <string name="omnipod_cmd_get_pod_status">Ottieni stato pod</string>
-    <string name="omnipod_cmd_get_pod_info">Ottieni info pod</string>
-    <string name="omnipod_cmd_set_time">Imposta ora</string>
-    <string name="omnipod_cmd_configure_alerts">Configurazione avvisi</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Conferma avvisi</string>
-    <string name="omnipod_cmd_suspend_delivery">Sospendi erogazione</string>
-    <string name="omnipod_cmd_resume_delivery">Riprendi erogazione</string>
-    <string name="omnipod_cmd_unknown_entry">Inserimento sconosciuto</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Tasso: %1$.1f U, Durata: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Se premi <b>OK</b>, lo stato del pod verrà resettato forzatamente e non potrai più comunicare con il pod. Fallo solo se non riesci più a comunicare con il pod. Se puoi ancora a comunicare con il pod, utilizza l\'opzione <b>Disattiva pod</b> .</string>
-    <string name="omnipod_cmd_pod_history_na">Storico pod non disponibile al momento.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Riempi il pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nRiempi il nuovo pod con abbastanza insulina per 3 giorni.\n\nResta in ascolto di due bip dal pod durante il processo di riempimento. Questi indicano che è stata inserita la quantità minima di 85U. Assicurati di svuotare completamente la siringa di riempimento, anche dopo aver sentito i due segnali acustici.\n\nDopo il riempimento del pod, premi <b>Avanti</b>.\n\n<b>Nota:</b> non rimuovere la protezione dell\'ago del pod in questo momento.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Caricamento</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Prova associazione nuovo pod e caricamento.\n\nQuando tutti gli elementi sono stati controllati, puoi premere <b>Avanti</b>.\n\n<b>Nota:</b> mantieni il pod molto vicino al RileyLink in questo momento.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Collega il pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPrepara il sito di infusione. Rimuovi la protezione dell\'ago del pod e il supporto adesivo e attacca il pod al sito di infusione.\n\nSe la cannula fuoriesce premi <b>Annulla</b> e cambia il tuo pod.\n\nPremi <b>Avanti</b> per inserire la cannula e iniziare l\'erogazione della basale.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Inserimento cannula</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Prova impostazione piano basale iniziale e inserimento cannula.\n\nQuando tutti gli elementi sono stati controllati, puoi premere <b>Avanti</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Info pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nIl pod è adesso attivo.\n\nIl tuo piano basale è stato programmato e la cannula è stata inserita.\n\nVerifica che la cannula sia stata inserita correttamente e sostituisci il tuo pod se avverti il contrario.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Disattiva pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nPremi <b>Avanti</b> per disattivare il pod.\n\n<b>Nota:</b> Questo sospenderà tutta l\'erogazione di insulina e disattiverà il pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Disattivazione del pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Disattivazione del pod.\n\nQuando tutti gli elementi sono stati controllati, puoi premere <b>Avanti</b>.\n\n<b>Nota:</b> Se la disattivazione fallisce continuamente, premi <b>Annulla</b> e usa l\'opzione <b>Resetta pod</b> per resettare forzatamente lo stato del pod.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod disattivato.\n\nRimuovi il pod dal tuo corpo e gettalo.</string>
-    <string name="omnipod_init_pod_pair_pod">Associa pod</string>
-    <string name="omnipod_init_pod_prime_pod">Carica pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Riempi cannula</string>
-    <string name="omnipod_init_pod_set_basal_profile">Imposta profilo basale</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Cancella erogazione</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Disattiva pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Integrazione del microinfusore Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Fine promemoria associazione</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Fine promemoria configurazione</string>
-    <string name="omnipod_alert_expiration">Il pod scadrà presto</string>
-    <string name="omnipod_alert_expiration_advisory">Il pod scadrà presto</string>
-    <string name="omnipod_alert_shutdown_imminent">L\'arresto è imminente</string>
-    <string name="omnipod_alert_low_reservoir">Livello serbatoio basso</string>
-    <string name="omnipod_alert_unknown_alert">Avviso sconosciuto</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">L\'impostazione del profilo basale potrebbe essere fallita. L\'erogazione potrebbe essere sospesa! Ricarica lo stato del pod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">L\'impostazione della basale temporanea potrebbe essere fallita. Se era già in esecuzione una basale temporanea, questa potrebbe essere stata cancellata! Ricarica lo stato del pod.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">L\'impostazione dell\'ora potrebbe essere fallita. L\'erogazione potrebbe essere sospesa! Ricarica lo stato del pod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Impossibile verificare che il bolo sia riuscito. Verifica che il tuo pod stia erogando il bolo oppure cancellalo.</string>
-    <string name="omnipod_rl_stats">Statistiche RL</string>
-    <string name="omnipod_read_pulse_log_short">Log impulsi</string>
     <string name="comapareprofile">Compara profili</string>
     <string name="nav_profilehelper">Assistente profilo</string>
     <string name="motoldefaultprofile">Profilo predefinito</string>

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

@@ -12,14 +12,4 @@
     <string name="description_ns_client">מסנכרן את הנתונים שלך עם Nightscout</string>
     <string name="description_profile_nightscout">יבא פרופיל מ- Nightscout</string>
     <!-- SMS Communicator & OTP Authenticator -->
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
-    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
 </resources>

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

@@ -1005,22 +1005,4 @@
     <string name="loop_tbrrequest_time_label">임시 Basal 요청시간</string>
     <string name="loop_tbrexecution_time_label">임시 Basal 실행시간</string>
     <!-- SMS Communicator & OTP Authenticator -->
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">연결되지 않은</string>
-    <string name="medtronic_pump_status_waking_up">시작중</string>
-    <string name="medtronic_pump_status_error_comm">연결오류</string>
-    <string name="medtronic_pump_status_timeout_comm">연결시간초과</string>
-    <string name="medtronic_pump_status_pump_unreachable">펌프에 연결할 수 없습니다</string>
-    <string name="medtronic_pump_status_invalid_config">유효하지 않은 설정</string>
-    <string name="medtronic_pump_status_active">활성</string>
-    <string name="medtronic_pump_status_sleeping">대기</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
-    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
 </resources>

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

@@ -156,6 +156,7 @@
     <string name="overview_tempbasal_button">Laikina bazė</string>
     <string name="overview_extendedbolus_button">Ištęstas bolusas</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout versija:</string>
+    <string name="missing_carbs">Trūksta %1$d g</string>
     <string name="exported">Nustatymai eksportuoti</string>
     <string name="export_to">Eksportuoti nustatymus</string>
     <string name="import_from">Importuoti nustatymus iš</string>
@@ -234,6 +235,10 @@
     <string name="smscommunicator_remotebolusmindistance_summary">Minimalus minučių skaičius, kuris turi praeiti nuo vieno boluso, suleisto nuotoliniu būdu iki kito</string>
     <string name="smscommunicator_remotebolusmindistance">Kiek mažiausiai minučių turi praeiti tarp vieno ir kito boluso</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">Jūsų saugumui, norėdami redaguoti šį pasirinkimą, jums reikia pridėti ne mažiau kaip 2 telefono numerius.</string>
+    <string name="bolusdelivered">%1$.2f vv bolusas sėkmingai suleistas</string>
+    <string name="bolusrequested">Bus suleista %1$.2f vv</string>
+    <string name="smscommunicator_bolusdelivered">%1$.2f vv bolusas sėkmingai suleistas</string>
+    <string name="smscommunicator_mealbolusdelivered">Bolusas %1$.2f vv sėkmingai suleistas</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Tikslas %1$s %2$d min.</string>
     <string name="smscommunicator_tt_set">Tikslas %1$s %2$d min. nustatytas sėkmingai</string>
     <string name="smscommunicator_tt_canceled">Laikinas tikslas atšauktas sėkmingai</string>
@@ -257,7 +262,9 @@
     <string name="smscommunicator_reconnect">Pompa prijungta</string>
     <string name="smscommunicator_remotecommandnotallowed">Nuotolinis valdymas negalimas</string>
     <string name="smscommunicator_remotebolusnotallowed">Nuotolinis bolusas negalimas. Bandykite vėliau.</string>
+    <string name="smscommunicator_basalreplywithcode">Norėdami aktyvuoti %1$.2f vv/val bazę, kurios trukmė %2$d min, atsakykite kodu %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Norėdami perjungti profilį %1$s %2$d%%, atsakykite kodu %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Norint pradėti ištęstinį bolusą %1$.2f vv %2$d min., atsakykite kodu %3$s</string>
     <string name="smscommunicator_carbsreplywithcode">Įvedimui %1$dg %2$s atsakykite kodu %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Norėdami aktyvuoti %1$d%% bazę %2$d min., atsakykite kodu %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Norėdami sustabdyti Ciklą %1$d min., atsakykite kodu %2$s</string>
@@ -266,6 +273,7 @@
     <string name="smscommunicator_loopdisablereplywithcode">Ciklo išjungimui atsakykite su kodu %1$s</string>
     <string name="smscommunicator_tempbasalset">%1$.2f vv/val laikina bazė, kurios trukmė %2$d min., aktyvuota sėkmingai</string>
     <string name="smscommunicator_extendedset">%1$.2f vv ištęstas bolusas, kurio trukmė %2$d min., aktyvuotas sėkmingai</string>
+    <string name="smscommunicator_carbsset">%1$d g angliavandenių įrašyti sėkmingai</string>
     <string name="smscommunicator_carbsfailed">Įvesti %1$dg angliavandenių nepavyko</string>
     <string name="smscommunicator_tempbasalset_percent">%1$d%% laikina bazė, kurios trukmė %2$d min., aktyvuota sėkmingai</string>
     <string name="smscommunicator_tempbasalfailed">Laikina bazė neaktyvuota</string>
@@ -846,6 +854,7 @@
     <string name="code_compare">Ar kodas, kurį matote įrenginyje, sutampa su pompos kodu?</string>
     <string name="insight_pairing">Insight sujungimas</string>
     <string name="insight_local">Accu-Chek Insight</string>
+    <string name="insight_delivered">%1$.2f vv iš %2$.2f vv suleista</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Kateteris pakeistas</string>
     <string name="pump_time_updated">Pompos laikas pakeistas</string>
@@ -903,6 +912,7 @@
     <string name="short_status_extended">Ištęstas: %1$.2f / %2$.2f V %3$d min</string>
     <string name="short_status_multiwave">Daugiabangis: %1$.2f / %2$.2f vv %3$d min</string>
     <string name="short_status_tdd">BPD: %1$.2f</string>
+    <string name="short_status_reservoir">Rez.: %1$.2f vv</string>
     <string name="short_status_battery">Bat.: %1$d%%</string>
     <string name="max_recovery_duration">Didž. atkūrimo trukmė [s]</string>
     <string name="min_recovery_duration">Min. atkūrimo trukmė [s]</string>
@@ -1045,6 +1055,8 @@
     <string name="sendsmsactionlabel">Siųsti SMS: %1$s</string>
     <string name="sendsmsactiondescription">Siųsti SMS į visus numerius</string>
     <string name="sendsmsactiontext">Išsiųsti SMS žinutę su tekstu</string>
+    <string name="cobvsiob">AAO prieš AIO</string>
+    <string name="bolusconstraintappliedwarn">Pritaikytas boluso apribojimas: %1$.2f vv iki %2$.2f vv</string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Nustatytas lėtas angliavandenių įsisavinimas: %2$d%% laiko. Dar karą patikrinkite savo skaičiavimus. AAO gali būti pervertinti, todėl gali būti suleista per daug insulino!!!!!</font>]]></string>
     <string name="partialboluswizard">Suleisti šią boluso skaičiuoklės rezultato dalį [%]</string>
     <string name="deliverpartofboluswizard">Boluso skaičiuoklė atlieka skaičiavimus, tačiau tik dalis apskaičiuoto insulino yra suleidžiama. Naudinga kartu su SMB algoritmu.</string>
@@ -1070,7 +1082,6 @@
     <string name="objectives_button_unfinish">Išvalyti užbaigtus</string>
     <string name="objectives_button_unstart">Išvalyti pradėtus</string>
     <string name="doyouwantresetstart">Ar norite iš naujo nustatyti tikslų pradžią? Jūs galite prarasti jau pasiektus.</string>
-    <string name="time_or_timezone_change">Laiko ir/ar laiko zonos pakeitimas pompoje</string>
     <string name="nopumpselected">Pompa nepasirinkta</string>
     <string name="setupwizard_units_prompt">Pasirinkite vienetus, kurių vertes norite parodyti</string>
     <string name="ns_ploadlocalprofile">Įkelti vietinio profilio pakeitimus į NS</string>
@@ -1147,7 +1158,6 @@
     <string name="authorizationfailed">Autorizacija nepavyko</string>
     <string name="overview_show_absinsulin">Insulinas absoliučiais vienetais</string>
     <string name="master_password_summary">Pagrindinis slaptažodis naudojamas atsarginiam šifravimui ir programos saugumo ignoravimui. Atsiminkite jį arba laikykite užsirašę saugioje vietoje.</string>
-    <string name="passwords_dont_match">Slaptažodžiai nesutampa</string>
     <string name="current_master_password">Dabartinis pagrindinis slaptažodis</string>
     <string name="statuslights">Būklės indikatoriai</string>
     <string name="statuslights_copy_ns">Kopijuoti nustatymus iš NS</string>
@@ -1156,123 +1166,6 @@
     <string name="buttonson_description">Mygtukai visada rodomi ekrano apačioje</string>
     <string name="largedisplay_description">Didelis ekranas</string>
     <string name="skin">Išvaizda</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Niekada nebuvo sujungta</string>
-    <string name="medtronic_pump_status_waking_up">Pažadinimas</string>
-    <string name="medtronic_pump_status_error_comm">Ryšio klaida</string>
-    <string name="medtronic_pump_status_timeout_comm">Ryšiui skirtas laikas baigėsi</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pompa nepasiekiama</string>
-    <string name="medtronic_pump_status_invalid_config">Neteisinga konfigūracija</string>
-    <string name="medtronic_pump_status_active">Aktyvi</string>
-    <string name="medtronic_pump_status_sleeping">Užmigusi</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Omnipod pompos integracijai reikalingas RileyLink (programinės įrangos versija ne mažiau 2.0).</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Boluso signalas įjungtas</string>
-    <string name="omnipod_config_beep_basal_enabled">Bazės signalas įjungtas</string>
-    <string name="omnipod_config_beep_smb_enabled">SMB signalas įjungtas</string>
-    <string name="omnipod_config_beep_tbr_enabled">Laikinos bazės signalas įjungtas</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Įgalintos POD derinimo galimybės</string>
-    <string name="omnipod_config_timechange_enabled">Vasaros laiko/laiko juostos aptikimas įgalintas</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">POD valdymas</string>
-    <string name="omnipod_pod_status">POD būklė</string>
-    <string name="omnipod_reservoir_left">liko %1$.2f U</string>
-    <string name="omnipod_reservoir_over50">Daugiau nei 50 U</string>
-    <string name="omnipod_pod_address">POD adresas</string>
-    <string name="omnipod_pod_expiry">POD laikas pasibaigs</string>
-    <string name="omnipod_pod_name_no_info">Nėra informacijos</string>
-    <string name="omnipod_pod_no_pod_connected">POD neprijungta</string>
-    <string name="omnipod_pod_not_initalized">Nepavyko paleisti</string>
-    <string name="omnipod_pod_active_alerts">Aktyvaus POD signalai</string>
-    <string name="omnipod_ack_short">Priimti pranešimus</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">Operacija negalima.\n\n Pirmiausia turite sukonfigūruoti Omnipod pompą prieš atliekant šią operaciją.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Operacija negalima.\n\n Jūs turite palaukti kelias minutes, kol AAPS bando nustatyti profilį pirmą kartą.</string>
-    <string name="omnipod_error_illegal_init_action_type">Neteisingas inicijavimo tipas:%1$s</string>
-    <string name="omnipod_error_pod_not_attached">Nėra aktyvaus POD.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Komandos patikra nepavyko.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Įvyko netikėta klaida. Prašome pranešti! (tipas: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Ryšio klaida: gauti neteisingi įvesties parametrai.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Ryšio klaida: skirtas laikas baigėsi.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Ryšio klaida: įvyko netikėta klaida. Prašome pranešti!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Ryšio klaida: pranešimo vientisumo patikra nepavyko.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Ryšio klaida: netinkami įvesties iš POD parametrai.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Ryšio klaida: Pod būklė yra netinkama.</string>
-    <string name="omnipod_driver_error_invalid_response">Ryšio klaida: gautas netinkamas atsakymas iš POD.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Ryšio klaida: iš POD gautas pranešimas su negaliojančiu serijos numeriu.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Ryšio klaida: iš POD gautas pranešimas su netinkamu adresu.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Ryšio klaida: nepavyko iššifruoti pranešimo iš POD.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Ryšio klaida: nepavyko iš naujo sinchronizuoti Nonce.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Ryšio klaida: Nonce nebuvo sinchronizuota.</string>
-    <string name="omnipod_driver_error_not_enough_data">Ryšio klaida: nepakankamai duomenų gauta iš POD.</string>
-    <string name="omnipod_driver_error_pod_fault">Aptikta POD klaida (%1$03d %2$s). Išjunkite POD ir pradėkite naują.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Ryšio klaida: POD pateikė klaidos atsakymą.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">POD valdymas</string>
-    <string name="omnipod_cmd_init_pod">Inicijuoti POD</string>
-    <string name="omnipod_cmd_deactivate_pod">Išjungti POD</string>
-    <string name="omnipod_cmd_reset_pod">Atstatyti POD</string>
-    <string name="omnipod_cmd_pod_history">POD istorija</string>
-    <string name="omnipod_cmd_set_bolus">Nustatyti bolusą</string>
-    <string name="omnipod_cmd_cancel_bolus">Atšaukti bolusą</string>
-    <string name="omnipod_cmd_set_tbr">Nustatyti laikiną bazę</string>
-    <string name="omnipod_cmd_cancel_tbr">Atšaukti laikiną bazę (vidinis valdiklis)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Atšaukti laikiną bazę (Inicijuota vartotojo)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Nustatyti bazės tvarkaraštį</string>
-    <string name="omnipod_cmd_get_pod_status">Gauti POD būklę</string>
-    <string name="omnipod_cmd_get_pod_info">Gauti POD informaciją</string>
-    <string name="omnipod_cmd_set_time">Nustatyti laiką</string>
-    <string name="omnipod_cmd_configure_alerts">Konfigūruoti perspėjimus</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Patvirtinti perspėjimus</string>
-    <string name="omnipod_cmd_suspend_delivery">Sustabdyti suleidimą</string>
-    <string name="omnipod_cmd_resume_delivery">Atnaujinti suleidimą</string>
-    <string name="omnipod_cmd_unknown_entry">Nežinomas Įrašas</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f vv</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f vv, AV=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Kiekis: %1$.1f vv, Trukmė: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Jei spustelėsite <b>OK</b>, ryšys su POD bus priverstinai nutrauktas ir nebegalėsite prie jo prisijungti. Atlikite tai tik tada, kai AAPS nebegali bendrauti su POD. Jei ryšys su POD vis tiek veikia, naudokite parinktį <b>Išjungti POD</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">POD istorija šiuo metu nėra prieinama.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Užpildyti POD</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nUžpildykite naują POD insulinu, kurio pakaktų 3 dienas.\n\nTaip pat atkreipkite dėmesį į du pyptelėjimus iš POD, kai pildote. Tai rodo, kad rezervuaras buvo užpildytas mažiausiai 85vv. Visiškai ištuštinkite švirkštą, net jei girdėjote du pyptelėjimus.\n\nUžpildę POD, spustelėkite <b>Kitas</b>.\n\n <b>Pastaba:</b> vykdant šiuos veiksmus, nenuimkite POD adatos apsauginio dangtelio.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Užpildymas</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Pabandykite suporuoti naują POD ir užpildykite jį.\n\nKai pažymėti visi elemetai, galite spustelėti <b>Kitas</b>.\n\n <b>Pastaba:</b> POD ir RileyLink turi būti būti labai arti vienas kito.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Prijunkite POD</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nParuoškite infuzijos vietą. Nuimkite adatos apsauginį dangtelį, pleistro apsaugą ir užklijuokite POD ant infuzijos vietos.\n\nJei kaniulė atšoks, paspauskite <b>Atšaukti</b> ir pakeiskite POD.\n\nSpauskite <b>Kitas</b>, norėdami įvesti kaniulę ir pradėti leisti insuliną.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Įvedama kaniulė</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Mėginkite nustatyti pradinį bazės profilį ir įvesti kaniulę.\n\nKai visi elementai yra patikrinti, galite paspausti <b>Kitas</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">POD informacija</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPOD yra aktyvus.\n\nJūsų bazės profilis yra suprogramuotas ir kaniulė įvesta.\n\nPatikrinkite, ar kaniulė buvo tinkamai įvesta, ir, jei jaučiate, kad taip nėra, pakeiskite POD.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Išjungti POD</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nSpustelėkite<b>Kitas</b>, kad išjungtumėte POD.\n\n<b>Pastaba:</b> Tai sustabdys insulino leidimą ir išjungs POD.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">POD išjungimas</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">POD išjungimas.\n\nJei visi elementai pažymėti, galite paspausti <b>Kitas</b>.\n\n <b>Pastaba:</b> Jei išjungimas vis nepavyksta, paspauskite <b> Atšaukti</b> ir naudokite parinktį <b>Atstatyti POD </b>, kad priverstinai atkurtumėte POD būklę.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">POD išjungtas.\n\nNuimkite POD nuo odos ir jį išmeskite.</string>
-    <string name="omnipod_init_pod_pair_pod">POD suporavimas</string>
-    <string name="omnipod_init_pod_prime_pod">POD užpildymas</string>
-    <string name="omnipod_init_pod_fill_cannula">Kaniulės užpildymas</string>
-    <string name="omnipod_init_pod_set_basal_profile">Nustatyti bazės profilį</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Atšauti insulino leidimą</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Išjungti POD</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Integracija su Omnipod Dash pompa.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Priminimas apie suporavimo pabaigą</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Priminimas apie sąrankos pabaigą</string>
-    <string name="omnipod_alert_expiration">POD galiojimas greitai baigsis</string>
-    <string name="omnipod_alert_expiration_advisory">POD galiojimas greitai baigsis</string>
-    <string name="omnipod_alert_shutdown_imminent">Išjungimas yra neišvengiamas</string>
-    <string name="omnipod_alert_low_reservoir">Žemas rezervuaro lygis</string>
-    <string name="omnipod_alert_unknown_alert">Nežinomas perspėjimas</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Gali nepavykti nustatyti bazės profilio. Insulino leidimas gali būti sustabdytas! Atkurkite POD būseną.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Laikinos valandinės bazės nustatymas gali būti nesėkmingas. Jei laikina valandinė bazė iki šiol buvo nustatyta ir galioja, ji gali būti atšaukta! Atnaujinkite POD būseną.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Laiko nustatymas gali būti nesėkmingas. Insulino leidimas gali būti sustabdytas! Atkurkite POD būseną.</string>
-    <string name="omnipod_bolus_failed_uncertain">Neįmanoma patikrinti, ar bolusas suleistas sėkmingai. Patikrinkite, ar jūsų POD leidžia bolusą, arba bolusą atšaukite.</string>
-    <string name="omnipod_rl_stats">RL statistika</string>
-    <string name="omnipod_read_pulse_log_short">Pulse žurnalas</string>
     <string name="comapareprofile">Palyginti profilius</string>
     <string name="nav_profilehelper">Profilio pagalbininkas</string>
     <string name="motoldefaultprofile">Numatytasis profilis</string>

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

@@ -1065,7 +1065,6 @@
     <string name="objectives_button_unfinish">Voltooiing wissen</string>
     <string name="objectives_button_unstart">Wissen gestart</string>
     <string name="doyouwantresetstart">Wil je dit leerdoel opnieuw starten? Je kunt je voortgang verliezen.</string>
-    <string name="time_or_timezone_change">Tijd en/of tijdzone wijzigen op de pomp</string>
     <string name="nopumpselected">Geen pomp geselecteerd</string>
     <string name="setupwizard_units_prompt">Selecteer eenheden waarin je waarden wilt weergeven</string>
     <string name="ns_ploadlocalprofile">Upload lokale profielwijzigingen naar NS</string>
@@ -1140,7 +1139,6 @@
     <string name="authorizationfailed">Authorisatie mislukt</string>
     <string name="overview_show_absinsulin">Absolute insuline</string>
     <string name="master_password_summary">Het masterwachtwoord wordt gebruikt voor het versleutelen van backups en om de app-beveiligingen te kunnen overschrijven. Onthoud het goed of bewaar het op een veilige plaats.</string>
-    <string name="passwords_dont_match">Wachtwoorden komen niet overeen</string>
     <string name="current_master_password">Huidig masterwachtwoord</string>
     <string name="statuslights">Statusindicatoren</string>
     <string name="statuslights_copy_ns">Kopieer instellingen van NS</string>
@@ -1149,122 +1147,5 @@
     <string name="buttonson_description">Knoppen worden altijd weergegeven aan de onderkant van het scherm</string>
     <string name="largedisplay_description">Groot scherm</string>
     <string name="skin">Skin</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Nooit verbonden</string>
-    <string name="medtronic_pump_status_waking_up">Ontwaken</string>
-    <string name="medtronic_pump_status_error_comm">Communicatiefout</string>
-    <string name="medtronic_pump_status_timeout_comm">Time-out op de communicatie</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pomp niet bereikbaar</string>
-    <string name="medtronic_pump_status_invalid_config">Ongeldige configuratie</string>
-    <string name="medtronic_pump_status_active">Actief</string>
-    <string name="medtronic_pump_status_sleeping">Slapend</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Pomp integratie voor Omnipod, vereist RileyLink (met firmware 2.0 of hoger).</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Bolus pieptoon ingeschakeld</string>
-    <string name="omnipod_config_beep_basal_enabled">Basaal pieptoon ingeschakeld</string>
-    <string name="omnipod_config_beep_smb_enabled">SMB pieptoon ingeschakeld</string>
-    <string name="omnipod_config_beep_tbr_enabled">Tijdelijk basaal pieptoon ingeschakeld</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Pod debugging opties ingeschakeld</string>
-    <string name="omnipod_config_timechange_enabled">DST/tijdzone detectie ingeschakeld</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Pod Beheer</string>
-    <string name="omnipod_pod_status">Pod Status</string>
-    <string name="omnipod_reservoir_left">%1$.2f E over</string>
-    <string name="omnipod_reservoir_over50">Meer dan 50 E</string>
-    <string name="omnipod_pod_address">Pod adres</string>
-    <string name="omnipod_pod_expiry">Pod verloopt</string>
-    <string name="omnipod_pod_name_no_info">Geen info</string>
-    <string name="omnipod_pod_no_pod_connected">Geen pod verbonden</string>
-    <string name="omnipod_pod_not_initalized">Niet geïnitialiseerd</string>
-    <string name="omnipod_pod_active_alerts">Actieve pod alarmen</string>
-    <string name="omnipod_ack_short">Alarmen bevestigen</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">Bewerking is niet mogelijk.\n\nJe moet eerst Omnipod ingesteld hebben, voordat je deze bewerking kunt gebruiken.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Bewerking is niet mogelijk.\n\nJe moet enkele minuten wachten, totdat AAPS voor de eerste keer probeert om het profiel in te stellen.</string>
-    <string name="omnipod_error_illegal_init_action_type">Ongeldig PodInitActionType: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Geen actieve pod.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Opdracht verificatie is mislukt.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Er is een onverwachte fout opgetreden. Rapporteer dit alsjeblieft! (type: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Communicatie mislukt: ongeldige invoerparameters ontvangen.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Communicatie mislukt: timeout.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Communicatie mislukt: er is een onvoorziene fout opgetreden. Rapporteer dit alsjeblieft!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Communicatie mislukt: berichtintegriteit kon niet worden geverifieerd.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Communicatie mislukt: ongeldige gegevens ontvangen van de Pod.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Communicatie mislukt: de Pod bevindt zich in een verkeerde staat.</string>
-    <string name="omnipod_driver_error_invalid_response">Communicatie mislukt: ongeldig antwoord ontvangen van de Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Communicatie mislukt: bericht met ongeldig volgnummer ontvangen van de Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Communicatie mislukt: bericht met ongeldig adres ontvangen van de Pod.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Communicatie is mislukt: kon bericht van de Pod niet decoderen.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Communicatie mislukt: nonce resync is mislukt.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Communicatie mislukt: nonce out of sync.</string>
-    <string name="omnipod_driver_error_not_enough_data">Communicatie mislukt: onvoldoende gegevens ontvangen van de Pod.</string>
-    <string name="omnipod_driver_error_pod_fault">Een pod-fout (%1$03d %2$s) is gedetecteerd. Deactiveer je Pod en start een nieuwe.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Communicatie mislukt: de Pod heeft een foutrespons gegeven.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Pod Beheer</string>
-    <string name="omnipod_cmd_init_pod">Initialiseer Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Deactiveer Pod</string>
-    <string name="omnipod_cmd_reset_pod">Reset Pod</string>
-    <string name="omnipod_cmd_pod_history">Pod Historie</string>
-    <string name="omnipod_cmd_set_bolus">Bolus instellen</string>
-    <string name="omnipod_cmd_cancel_bolus">Annuleer Bolus</string>
-    <string name="omnipod_cmd_set_tbr">Instellen Tijdelijke Basaal</string>
-    <string name="omnipod_cmd_cancel_tbr">Annuleer Tijdelijk Basaal (Intern door stuurprogramma)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Annuleer Tijdelijk Basaal (Geforceerd door gebruiker)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Basaalprofiel instellen</string>
-    <string name="omnipod_cmd_get_pod_status">Pod status ophalen</string>
-    <string name="omnipod_cmd_get_pod_info">Pod info ophalen</string>
-    <string name="omnipod_cmd_set_time">Tijd instellen</string>
-    <string name="omnipod_cmd_configure_alerts">Configureer alarmen</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Bevestig alarmen</string>
-    <string name="omnipod_cmd_suspend_delivery">Onderbreek toediening</string>
-    <string name="omnipod_cmd_resume_delivery">Hervat toediening</string>
-    <string name="omnipod_cmd_unknown_entry">Onbekende invoer</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f E</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f E, KH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Basaal: %1$.1f E, Duur: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Als je op <b>OK</b> klikt, zal de Pod gedwongen worden gereset en kun je niet meer communiceren met de Pod. Doe dit alleen als je al niet meer met de Pod kunt communiceren. Als je nog wel kunt communiceren met de Pod, gebruik dan de optie <b>Deactiveer Pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">Pod Historie momenteel niet beschikbaar.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Vul de Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nVul de nieuwe Pod met voldoende insuline voor 3 dagen.\n\nLuister of je twee piepjes hoort tijdens het vullen. Deze geven aan dat de minimum hoeveelheid van 85E is bereikt. Ook als je de twee piepjes hebt gehoord ga je verder met vullen totdat de vulspuit volledig leeg is.\n\nNa het vullen van de Pod druk je op <b>Volgende</b>.\n\n<b>Opmerking:</b> verwijder de beschermkap van de Pod naald nog niet!</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Uitvullen</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Probeer te koppelen met de nieuwe Pod en laat de Pod de naald uitvullen.\n\nWanneer alle onderdelen zijn afgerond, druk je op <b>Volgende</b>.\n\n<b>Opmerking:</b> Houd de Pod goed dicht bij de RileyLink terwijl je dit doet.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Plaats de Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nBereid het plaatsen voor. Verwijder de beschermdop van de naald en haal de papiertjes van de sticker.\n\n(Mocht je zien dat de canule uitsteekt, druk dan op <b>Annuleren</b> en begin overnieuw met een andere Pod.)\n\nBevestig de Pod op de huid. Druk op <b>Volgende</b> om de canule te gaan inschieten en de insulinetoediening te laten starten.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Canule inschieten</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">De basaalstand wordt ingesteld en de canule wordt ingeschoten.\n\nWanneer alle onderdelen zijn afgerond, druk je op <b>Volgende</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Pod Info</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nDe Pod is nu actief.\n\nJouw basaalprofiel is ingeladen in de Pod en de canule is ingebracht.\n\nControleer of de canule correct is geplaatst en vervang de Pod als je denkt dat er iets is misgegaan.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Deactiveer Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nDruk op <b>Volgende</b> om de Pod te deactiveren.\n\n<b>Opmerking:</b> Hiermee wordt de insuline toediening gestopt en wordt de Pod gedeactiveerd.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Deactiveren van de Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Deactiveren van de Pod.\n\nWanneer alle onderdelen zijn afgerond, druk je op <b>Volgende</b>.\n\n<b>Opmerking:</b> Als deactiveren herhaaldelijk niet wil lukken, druk je op <b>Annuleren</b> en gebruik de optie <b>Reset Pod</b> om de Pod-status geforceerd te deactiveren.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod gedeactiveerd.\n\nVerwijder de Pod van je lichaam en gooi hem weg.</string>
-    <string name="omnipod_init_pod_pair_pod">Pod Koppelen</string>
-    <string name="omnipod_init_pod_prime_pod">Pod Uitvullen</string>
-    <string name="omnipod_init_pod_fill_cannula">Canule vullen</string>
-    <string name="omnipod_init_pod_set_basal_profile">Instellen Basaal Profiel</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Annuleer toediening</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Deactiveer Pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Pomp integratie voor Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Herinnering koppeling afronden</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Herinnering setup afronden</string>
-    <string name="omnipod_alert_expiration">Pod verloopt binnenkort</string>
-    <string name="omnipod_alert_expiration_advisory">Pod verloopt binnenkort</string>
-    <string name="omnipod_alert_shutdown_imminent">Schakelt zeer binnenkort uit</string>
-    <string name="omnipod_alert_low_reservoir">Laag reservoir</string>
-    <string name="omnipod_alert_unknown_alert">Onbekend alarm</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Het instellen van basaal profiel is mogelijk mislukt. De toediening is misschien gestopt! Vernieuw de status van Pod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Het instellen van tijdelijk basaal is mogelijk mislukt. Als er al een tijdelijk basaal actief was, is dat misschien geannuleerd! Vernieuw de status van de Pod.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Het instellen van de tijd is mogelijk mislukt. De toediening is misschien gestopt! Vernieuw de status van Pod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Kan niet controleren of de bolus is geslaagd. Controleer of de Pod de bolus aan het toedienen is of annuleer de bolus.</string>
-    <string name="omnipod_rl_stats">RL Statistieken</string>
-    <string name="omnipod_read_pulse_log_short">Pulsen Log</string>
     <string name="nav_profilehelper">Profiel hulp</string>
 </resources>

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

@@ -1066,7 +1066,6 @@
     <string name="objectives_button_unfinish">Wyczyść skończone</string>
     <string name="objectives_button_unstart">Wyczyść rozpoczęte</string>
     <string name="doyouwantresetstart">Czy chcesz zresetować czas rozpoczęcia zadania? Możesz utracić postępy.</string>
-    <string name="time_or_timezone_change">Zmiana czasu i/lub strefy czasowej w pompie</string>
     <string name="nopumpselected">Nie wybrano pompy</string>
     <string name="setupwizard_units_prompt">Wybierz jednostki, w których chcesz wyświetlać wartości</string>
     <string name="ns_ploadlocalprofile">Prześlij zmiany w profilu lokalnym do NS</string>
@@ -1142,7 +1141,6 @@
     <string name="authorizationfailed">Autoryzacja nie powiodła się</string>
     <string name="overview_show_absinsulin">Cała insulina</string>
     <string name="master_password_summary">Hasło główne jest używane do szyfrowania kopii zapasowych i przełamania zabezpieczeń w aplikacji. Zapamiętaj je lub przechowuj w bezpiecznym miejscu.</string>
-    <string name="passwords_dont_match">Hasła się nie zgadzają!</string>
     <string name="current_master_password">Aktualne hasło główne</string>
     <string name="statuslights">Wskaźniki stanu</string>
     <string name="statuslights_copy_ns">Kopiowanie ustawień z NS</string>
@@ -1151,123 +1149,6 @@
     <string name="buttonson_description">Przyciski są zawsze wyświetlane na dole ekranu</string>
     <string name="largedisplay_description">Duży ekran</string>
     <string name="skin">Motyw</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Nigdy nie połączona</string>
-    <string name="medtronic_pump_status_waking_up">Wybudzanie</string>
-    <string name="medtronic_pump_status_error_comm">Błąd komunikacji</string>
-    <string name="medtronic_pump_status_timeout_comm">Przekroczony limit czasu połączenia</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pompa nieosiągalna</string>
-    <string name="medtronic_pump_status_invalid_config">Nieprawidłowe ustawienia</string>
-    <string name="medtronic_pump_status_active">Aktywna</string>
-    <string name="medtronic_pump_status_sleeping">Uśpiona</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integracja pompy Omnipod, wymaga RileyLink (z firmwarem 2.0 lub wyższym).</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Sygnał dźwiękowy bolusa włączony</string>
-    <string name="omnipod_config_beep_basal_enabled">Sygnał dźwiękowy bazy włączony</string>
-    <string name="omnipod_config_beep_smb_enabled">Sygnał dźwiękowy SMB włączony</string>
-    <string name="omnipod_config_beep_tbr_enabled">Sygnał dźwiękowy TBR (tymczasowej dawk bazowej) włączony</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Włączone opcje debugowania PODów</string>
-    <string name="omnipod_config_timechange_enabled">Włączone wykrywanie stref czasowych</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Pod Mgmt</string>
-    <string name="omnipod_pod_status">Status Pod</string>
-    <string name="omnipod_reservoir_left">%1$.2f U zostało</string>
-    <string name="omnipod_reservoir_over50">Ponad 50 U</string>
-    <string name="omnipod_pod_address">Adres Pod</string>
-    <string name="omnipod_pod_expiry">Pod traci ważność</string>
-    <string name="omnipod_pod_name_no_info">Brak informacji</string>
-    <string name="omnipod_pod_no_pod_connected">Pod nie podłączony</string>
-    <string name="omnipod_pod_not_initalized">Nie zainicjowany</string>
-    <string name="omnipod_pod_active_alerts">Aktywne alarmy Pod</string>
-    <string name="omnipod_ack_short">Alerty ack</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">To działanie nie jest możliwe.\n\n Musisz skonfigurować Omnipod przed uruchomieniem tego działania.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Operacja nie jest możliwa.\n\n Trzeba poczekać kilka minut, aż AAPS spróbuje ustawić profil pierwszy raz.</string>
-    <string name="omnipod_error_illegal_init_action_type">Niedozwolone działanie PodInitActionType: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Brak aktywnego Pod.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Nieudana weryfikacja polecenia.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Wystąpił nieoczekiwany błąd. Proszę zgłosić! (typ: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Komunikacja nie powiodła się: odebrano niepoprawne parametry wejściowe.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Komunikacja nie powiodła się: przekroczono limit czasu.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Komunikacja nie powiodła się: wystąpił nieoczekiwany błąd. Proszę zgłosić!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Komunikacja nie powiodła się: weryfikacja integralności komunikatu nie powiodła się.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Komunikacja nie powiodła się: odebrano niepoprawny pakiet (komunikat) z Poda.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Komunikacja nie powiodła się: Pod jest w niewłaściwym stanie.</string>
-    <string name="omnipod_driver_error_invalid_response">Komunikacja nie powiodła się: odebrano niepoprawną odpowiedź (pakiet) z Poda.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Komunikacja nie powiodła się: odebrano komunikat z niepoprawną sekwencją liczb z Poda.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Komunikacja nie powiodła się: odebrano komunikat z niepoprawną adresacją z Poda.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Komunikacja nie powiodła się: nie powiodło się dekodowanie komunikatu z Poda.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Komunikacja nie powiodła się: nonce resync nie powiodło się.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Komunikacja nie powiodła się: nonce nie jest zsynchronizowane.</string>
-    <string name="omnipod_driver_error_not_enough_data">Komunikacja nie powiodła się: brak wystarczającej ilości danych odebranych z Poda.</string>
-    <string name="omnipod_driver_error_pod_fault">Błąd Pod. (%1$03d %2$s) został wykryty. Zdezaktywuj swój Pod i uruchom nowy.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Komunikacja nie powiodła się: Pod zwrócił odpowiedź o błędzie.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Zarządzanie Pod</string>
-    <string name="omnipod_cmd_init_pod">Uruchom Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Odłącz Pod</string>
-    <string name="omnipod_cmd_reset_pod">Resetuj Pod</string>
-    <string name="omnipod_cmd_pod_history">Historia Pod</string>
-    <string name="omnipod_cmd_set_bolus">Podanie bolusa</string>
-    <string name="omnipod_cmd_cancel_bolus">Anulowanie bolusa</string>
-    <string name="omnipod_cmd_set_tbr">Ustaw tymczasową dawkę bazową</string>
-    <string name="omnipod_cmd_cancel_tbr">Anuluj tymczasową bazę (wewnętrznie przez sterownik)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Anuluj tymczasową bazę (wymuszone przez użytkownika)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Ustaw harmonogram Dawki bazowej</string>
-    <string name="omnipod_cmd_get_pod_status">Pobierz status Pod</string>
-    <string name="omnipod_cmd_get_pod_info">Pobierz informacje o Pod</string>
-    <string name="omnipod_cmd_set_time">Ustaw czas</string>
-    <string name="omnipod_cmd_configure_alerts">Konfigurowanie alertów</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Potwierdź alerty</string>
-    <string name="omnipod_cmd_suspend_delivery">Wstrzymaj podawanie</string>
-    <string name="omnipod_cmd_resume_delivery">Wznów podawanie</string>
-    <string name="omnipod_cmd_unknown_entry">Nieznany Wpis</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Dawka: %1$.1f U, Czas: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Jeśli naciśniesz <b>OK</b>, stan Pod zostanie wyzerowany i nie będziesz mógł więcej komunikować się z tym Podem. Zrób to tylko wtedy, gdy nie możesz się z nim skmunikować. Jeśli nadal można komunikować się z Podem, skorzystaj z opcji <b>Odłącz Pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">Historia Pod nie jest dostępna w tej chwili.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Napełnij Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nNapełnij nowego Poda z wystarczającą ilością insuliny przez 3 dni.\n\nNasłuchuj dwóch sygnałów dźwiękowych z Poda podczas procesu napełniania. Wskazują one, że minimalna ilość 85U została wypełniona. Należy upewnić się, że ampułkostrzykawka jest całkowicie pusta, nawet po odsłuchaniu dwóch sygnałów dźwiękowych.\n\nPo napełnieniu Poda, należy nacisnąć <b>Dalej</b>.\n\n<b>Uwaga:</b> nie usuwaj w tym czasie osłonki igłowej Poda.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Wypełnianie</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Próba sparowania z nowym Podem i wypełnienia go.\n\nKiedy wszystkie elementy są sprawdzone, można nacisnąć <b>Następny</b>.\n\n<b>Uwaga:</b> prosimy o trzymanie w tym czasie Poda bardzo blisko RileyLink.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Przymocuj Poda</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPrzygotowanie miejsca do infuzji. Zdjąć osłonkę igły i zabezpieczenie plastra i przykleić Pod do skóry w miejscu wkłucia.\n\nJeśli kaniula odkleja się, proszę wcisnąć <b>Anuluj</b> i odczepić Pod.\n\nNaciśnij <b>Następny</b> w celu wprowadzenia kaniuli i rozpoczęcia podawania bazy.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Wprowadzanie kaniuli</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Próba ustawienia początkowego planu bazowego i wprowadzeia kaniuli.\n\nKiedy wszystkie elementy są sprawdzane, można nacisnąć <b>Następny</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Informacje o Podzie</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod jest teraz aktywny.\n\nTwój plan dawki bazowej został zaprogramowany i wprowadzono kaniulę w miejsce wkłucia.\n\nSprawdź, czy kaniula została prawidłowo włożona i wymień swój Pod, jeśli czujesz, że nie.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Odłącz Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nNaciśnij <b>Następny</b> w celu odłączenia Poda.\n\n<b>Uwaga:</b> To spowoduje zawieszenie wszystkich dostaw insuliny i dezaktywację Poda.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Odłączanie Poda</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Deaktywacja Pod.\n\nKiedy wszystkie elementy są zaznaczone, możesz nacisnąć <b>Następna</b>.\n\n<b>Uwaga:</b> Jeśli deaktywacja w sposób ciągły nie powodzi się, należy nacisnąć <b>Anuluj</b> i użyć opcji <b>Reset Pod</b>, aby wymusić zresetowanie stanu Pod.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod odłączony.\n\nProszę odkleić Pod od ciała i wyrzucić go.</string>
-    <string name="omnipod_init_pod_pair_pod">Sparuj Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Wypełnij Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Wypełnij kaniulę</string>
-    <string name="omnipod_init_pod_set_basal_profile">Ustaw profil dawki bazowej</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Anulowanie podawania</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Odłącz Pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Integracja pompy dla Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Zakończ przypomnienie parowania</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Zakończ przypomnienie o konfiguracji</string>
-    <string name="omnipod_alert_expiration">Pod wkrótce straci ważność</string>
-    <string name="omnipod_alert_expiration_advisory">Pod wkrótce straci ważność</string>
-    <string name="omnipod_alert_shutdown_imminent">Wyłączenie jest nieuchronne</string>
-    <string name="omnipod_alert_low_reservoir">Niski poziom w zbiorniku</string>
-    <string name="omnipod_alert_unknown_alert">Nieznany alarm</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Ustawienie profilu podstawowego mogło się nie powieść. Podawanie mogło zostać zawieszone! Odśwież status Pod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Ustawienie bazy tymczasowej mogło się nie powieść. Jeśli była już uruchomiona baza tymczasowa, to mogła zostać odwołana! Odśwież status Pod.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Ustawienie czasu mogło się nie powieść. Podawanie mogło zostać zawieszone! Odśwież status Pod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Nie można sprawdzić, czy podano bolus. Upewnij się, że Twój Pod podaje bolus lub odwołaj go.</string>
-    <string name="omnipod_rl_stats">Statystyki RL</string>
-    <string name="omnipod_read_pulse_log_short">Logi pulsów omnipod</string>
     <string name="comapareprofile">Porównaj profile</string>
     <string name="nav_profilehelper">Pomocnik profilu</string>
     <string name="motoldefaultprofile">Profil domyślny</string>

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

@@ -1093,35 +1093,10 @@
     <string name="authorizationfailed">Falha na autorização</string>
     <string name="overview_show_absinsulin">Insulina absoluta</string>
     <string name="master_password_summary">Password Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
-    <string name="passwords_dont_match">As passwords não coincidem</string>
     <string name="current_master_password">Senha mestra atual</string>
     <string name="statuslights_copy_ns">Copiar definições do NS</string>
     <string name="classic_description">Tema original</string>
     <string name="buttonson_description">Botões são sempre exibidos na parte inferior da tela</string>
     <string name="largedisplay_description">Mostrador Grande</string>
     <string name="skin">Tema</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Nunca contatado</string>
-    <string name="medtronic_pump_status_waking_up">A acordar</string>
-    <string name="medtronic_pump_status_error_comm">Erro com comunicação</string>
-    <string name="medtronic_pump_status_timeout_comm">Tempo limite para comunicação</string>
-    <string name="medtronic_pump_status_pump_unreachable">Bomba inacessível</string>
-    <string name="medtronic_pump_status_invalid_config">Configuração inválida</string>
-    <string name="medtronic_pump_status_active">Ativo</string>
-    <string name="medtronic_pump_status_sleeping">A dormir</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
-    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_cmd_deactivate_pod">Desativado Pod</string>
-    <string name="omnipod_cmd_set_bolus">Definir Bólus</string>
-    <string name="omnipod_cmd_set_tbr">Definir Basal temporário</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
-    <string name="omnipod_init_pod_set_basal_profile">Definir Perfil Basal</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Desativado Pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
 </resources>

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

@@ -156,6 +156,7 @@
     <string name="overview_tempbasal_button">BasalTemp</string>
     <string name="overview_extendedbolus_button">Bólus Prolongado</string>
     <string name="configbuilder_nightscoutversion_label">Versão Nightscout:</string>
+    <string name="missing_carbs">A faltar %1$d g</string>
     <string name="exported">Preferências exportadas</string>
     <string name="export_to">Exportar configurações para</string>
     <string name="import_from">Importar configurações de</string>
@@ -234,6 +235,10 @@
     <string name="smscommunicator_remotebolusmindistance_summary">Número mínimo de minutos que deve decorrer entre um bólus remoto e o próximo</string>
     <string name="smscommunicator_remotebolusmindistance">Quantos minutos deve decorrer, pelo menos, entre um bólus e o próximo</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">Para sua segurança, para editar esta preferência você precisa adicionar pelo menos 2 números de telefone.</string>
+    <string name="bolusdelivered">Bólus %1$.2f U administrador com sucesso</string>
+    <string name="bolusrequested">A ser administrado %1$.2f U</string>
+    <string name="smscommunicator_bolusdelivered">Bólus %1$.2f U administrador com sucesso</string>
+    <string name="smscommunicator_mealbolusdelivered">Bólus de Refeição %1$.2f U administrado com sucesso</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Alvo %1$s para %2$d minutos</string>
     <string name="smscommunicator_tt_set">Alvo %1$s para %2$d minutos definido com sucesso</string>
     <string name="smscommunicator_tt_canceled">Alvo Temp cancelado com êxito</string>
@@ -257,7 +262,9 @@
     <string name="smscommunicator_reconnect">Bomba ligada novamente</string>
     <string name="smscommunicator_remotecommandnotallowed">O comando remoto não é permitido</string>
     <string name="smscommunicator_remotebolusnotallowed">O bólus remoto não está disponível. Tente novamente mais tarde.</string>
+    <string name="smscommunicator_basalreplywithcode">Para iniciar basal %1$.2f U/h por %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Para mudar o perfil para %1$s %2$d%% responda com o código %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Para iniciar bólus prolongado %1$.2f U por %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_carbsreplywithcode">Para inserir %1$dg em %2$s responda com código %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Para suspender o loop por %1$d minutos resposta com código %2$s</string>
@@ -266,6 +273,7 @@
     <string name="smscommunicator_loopdisablereplywithcode">Para desactivar o loop responda com o código %1$s</string>
     <string name="smscommunicator_tempbasalset">Basal temporária %1$.2fU/h para %2$d min iniciada com êxito</string>
     <string name="smscommunicator_extendedset">Bólus prolongado %1$.2fU/h para %2$d min iniciado com êxito</string>
+    <string name="smscommunicator_carbsset">Hidratos %1$d  g inseridos com sucesso</string>
     <string name="smscommunicator_carbsfailed">Introdução de %1$dg de hidratos falhou</string>
     <string name="smscommunicator_tempbasalset_percent">Basal temporária %1$d%% U/h durante%2$d min iniciada com êxito</string>
     <string name="smscommunicator_tempbasalfailed">Início basal temp falhou </string>
@@ -551,6 +559,7 @@
     <string name="pump_unreachable">Bomba inacessível</string>
     <string name="missed_bg_readings">Leituras Glic. perdidas</string>
     <string name="raise_notifications_as_android_notifications">Usar as notificações do sistema para alertas e notificações</string>
+    <string name="gradually_increase_notification_volume">Aumentar gradualmente o volume de alertas e notificações</string>
     <string name="localalertsettings_title">Alertas local</string>
     <string name="enable_missed_bg_readings_alert">Alerta caso nenhuma glicemia seja recebida</string>
     <string name="enable_pump_unreachable_alert">Alerta caso não seja possivel alcançar a bomba</string>
@@ -846,6 +855,7 @@
     <string name="code_compare">Os códigos exibidos neste dispositivo e na sua bomba correspondem?</string>
     <string name="insight_pairing">Emparelhamento Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
+    <string name="insight_delivered">%1$.2f U / %2$.2f U administrado</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Tubo mudado</string>
     <string name="pump_time_updated">Hora da bomba actualizada</string>
@@ -903,6 +913,7 @@
     <string name="short_status_extended">Prolongado: %1$.2f / %2$.2f U por %3$d min</string>
     <string name="short_status_multiwave">Multionda: %1$.2f / %2$.2f U por %3$d min</string>
     <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">Reser.: %1$.2f U</string>
     <string name="short_status_battery">Bat.: %1$d%%</string>
     <string name="max_recovery_duration">Duração máxima da recuperação [s]</string>
     <string name="min_recovery_duration">Duração mínima da recuperação [s]</string>
@@ -1045,6 +1056,8 @@
     <string name="sendsmsactionlabel">Enviar SMS: %1$s</string>
     <string name="sendsmsactiondescription">Enviar SMS para todos os números</string>
     <string name="sendsmsactiontext">Enviar SMS com texto</string>
+    <string name="cobvsiob">COB vs IOB</string>
+    <string name="bolusconstraintappliedwarn">Restrição de bólus aplicada: %1$.2f U a %2$.2f U</string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Absorção lenta de hidratos detectada: %2$d%% do tempo. Verifique o seu cálculo. COB pode estar sobreestimado, assim mais insulina pode ser dada !!!</font>]]></string>
     <string name="partialboluswizard">Administrar esta parte do resultado do assistente de bólus [%]</string>
     <string name="deliverpartofboluswizard">Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é administada. Útil com o algoritmo SMB.</string>
@@ -1070,7 +1083,6 @@
     <string name="objectives_button_unfinish">Limpar terminado</string>
     <string name="objectives_button_unstart">Limpar iniciado</string>
     <string name="doyouwantresetstart">Deseja reiniciar o objectivo? Pode perder seu progresso.</string>
-    <string name="time_or_timezone_change">Alterar Hora e/ou Fuso Horário na Bomba</string>
     <string name="nopumpselected">Nenhuma bomba seleccionada</string>
     <string name="setupwizard_units_prompt">Seleccione as unidades em que deseja exibir os valores</string>
     <string name="ns_ploadlocalprofile">Carregar as alterações do perfil local para NS</string>
@@ -1147,7 +1159,6 @@
     <string name="authorizationfailed">Falha na autorização</string>
     <string name="overview_show_absinsulin">Insulina absoluta</string>
     <string name="master_password_summary">Senha Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
-    <string name="passwords_dont_match">As senhas não coincidem</string>
     <string name="current_master_password">Senha Mestre actual</string>
     <string name="statuslights">Luzes de Estado</string>
     <string name="statuslights_copy_ns">Copiar definições do NS</string>
@@ -1156,123 +1167,6 @@
     <string name="buttonson_description">Os botões são sempre exibidos na parte inferior do ecrã</string>
     <string name="largedisplay_description">Mostrador Grande</string>
     <string name="skin">Tema gráfico</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Nunca contactado</string>
-    <string name="medtronic_pump_status_waking_up">A acordar</string>
-    <string name="medtronic_pump_status_error_comm">Erro com comunicação</string>
-    <string name="medtronic_pump_status_timeout_comm">Tempo limite para comunicação</string>
-    <string name="medtronic_pump_status_pump_unreachable">Bomba inacessível</string>
-    <string name="medtronic_pump_status_invalid_config">Configuração inválida</string>
-    <string name="medtronic_pump_status_active">Activo</string>
-    <string name="medtronic_pump_status_sleeping">A dormir</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integração de bomba para Omnipod, requer RileyLink (com pelo menos firmware 2.0) dispositivo.</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Sinal Bólus Activado</string>
-    <string name="omnipod_config_beep_basal_enabled">Sinal Basal Activado</string>
-    <string name="omnipod_config_beep_smb_enabled">Sinal SMB Activado</string>
-    <string name="omnipod_config_beep_tbr_enabled">Sinal DBT Activado</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Opções de Depuração do Pod habilitadas</string>
-    <string name="omnipod_config_timechange_enabled">Detecção de DST/Fuso Horário Activado</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Gestão Pod</string>
-    <string name="omnipod_pod_status">Estado do Pod</string>
-    <string name="omnipod_reservoir_left">%1$.2f U restante</string>
-    <string name="omnipod_reservoir_over50">Mais de 50 U</string>
-    <string name="omnipod_pod_address">Endereço do Pod</string>
-    <string name="omnipod_pod_expiry">Pod Expira</string>
-    <string name="omnipod_pod_name_no_info">Sem info</string>
-    <string name="omnipod_pod_no_pod_connected">Nenhum Pod ligado</string>
-    <string name="omnipod_pod_not_initalized">Não inicializado</string>
-    <string name="omnipod_pod_active_alerts">Alertas Pod Activos</string>
-    <string name="omnipod_ack_short">Reco Alertas</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_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_error_operation_not_possible_no_profile">A operação não é possível.\n\n Precisa de esperar alguns minutos, até que AAPS tente definir o perfil para a primeira vez.</string>
-    <string name="omnipod_error_illegal_init_action_type">PodInitActionType Ilegal: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Nenhum Pod Activo.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">A verificação do comando falhou.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Ocorreu um erro inesperado. Por favor reporte! (digite: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Falha na comunicação: foram recebidos parâmetros de entrada inválidos.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Falha na comunicação: tempo limite.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Falha na comunicação: ocorreu um erro inesperado. Por favor, reporte!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Falha na comunicação: mensagem de falha de verificação de integridade.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Falha na comunicação: recebeu um pacote inválido do Pod.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Falha na comunicação: o Pod está em um estado errado.</string>
-    <string name="omnipod_driver_error_invalid_response">Falha na comunicação: recebeu uma resposta inválida do Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Falha na comunicação: recebeu uma mensagem com número de sequência inválido do Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Falha na comunicação: recebeu uma mensagem com um endereço inválido do Pod.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Falha na comunicação: falha ao descodificar a mensagem do Pod.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Falha na comunicação: nonce resync falhou.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Falha na comunicação: nonce fora de sincronização.</string>
-    <string name="omnipod_driver_error_not_enough_data">Falha na comunicação: não há dados suficientes recebidos do Pod.</string>
-    <string name="omnipod_driver_error_pod_fault">Uma falha de Pod (%1$03d %2$s) foi detectada. Por favor, desactive o Pod e inicie um novo.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Falha na comunicação: o Pod devolveu uma resposta de erro.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Gestão Pod</string>
-    <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Desactivar Pod</string>
-    <string name="omnipod_cmd_reset_pod">Repor Pod</string>
-    <string name="omnipod_cmd_pod_history">Histórico do Pod</string>
-    <string name="omnipod_cmd_set_bolus">Definir Bólus</string>
-    <string name="omnipod_cmd_cancel_bolus">Cancelar Bólus</string>
-    <string name="omnipod_cmd_set_tbr">Definir Basal Temporária</string>
-    <string name="omnipod_cmd_cancel_tbr">Cancelar Basal Temporária (Forçado pelo controlador)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Cancelar Basal Temporária (Forçado pelo utilizador)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Definir Programação Basal</string>
-    <string name="omnipod_cmd_get_pod_status">Obter Status do Pod</string>
-    <string name="omnipod_cmd_get_pod_info">Obter Pod Info</string>
-    <string name="omnipod_cmd_set_time">Definir Hora</string>
-    <string name="omnipod_cmd_configure_alerts">Configurar Alertas</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Reconhecer Alertas</string>
-    <string name="omnipod_cmd_suspend_delivery">Suspender Administração</string>
-    <string name="omnipod_cmd_resume_delivery">Retomar Administração</string>
-    <string name="omnipod_cmd_unknown_entry">Entrada Desconhecida</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, HC=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Taxa: %1$.1f U, Duração: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Se pressionar <b>OK</b>, o estado do Pod vai ser forçado a redefinir e você não será capaz de comunicar mais com o Pod. Faça isso somente se você não pode comunicar mais com o Pod. Se ainda pode comunicar com o Pod, por favor, use o <b>Desactivar Pod</b> opção.</string>
-    <string name="omnipod_cmd_pod_history_na">Histórico do Pod não disponível no momento.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Encher o Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nPreencher o novo Pod com insulina suficiente para 3 dias.\n\nOuvir dois sinais sonoros a partir do Pod durante o processo de enchimento. Isso indica que a quantidade mínima de 85U foi inserida. Certifique-se de esvaziar completamente a seringa, mesmo depois de ouvir dois sinais sonoros.\n\nDepois de preencher o Pod, por favor, pressione <b>Próximo</b>.\n\n<b>Nota:</b> não remova a tampa da agulha do Pod neste momento.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">A Purgar</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">A tentar emparelhar com o novo Pod e purgá-lo.\n\nQuando todos os itens forem verificados, pode pressionar <b>Próximo</b>.\n\n<b>Nota:</b> por favor, mantenha o Pod muito perto do RileyLink neste momento.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Anexar o Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPrepare o local de infusão. Remova a tampa da agulha do Pod e o adesivo e fixe o Pod no local de infusão.\n\nSe a canula sair, por favor, pressione <b>Cancelar</b> e descarte o seu Pod.\n\nPressione <b>Próximo</b> para inserir a canula e começar a administração da basal.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">A inserir canula</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">A tentar definir um plano da basal inicial e inserir canula.\n\nQuando todos os itens estiverem verificados, pode pressionar <b>Próximo</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Info Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nO Pod está agora activo.\n\nO seu plano de basal foi programado e a canula foi inserida.\n\nPor favor, verifique se a canula foi inserida correctamente e substitua o seu Pod se você se sente que não.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Desactivar Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nPressione <b>Próximo</b> para desactivar o Pod.\n\n<b>Nota:</b> Isto irá suspender toda a administração de insulina e desactivar o Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">A Desactivar Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">A desactivar o Pod.\n\nQuando todos os itens forem verificados, pode pressionar <b>Próximo</b>.\n\n<b>Nota:</b> Se desactivar falhar continuamente, por favor, pressione <b>Cancelar</b> e use o <b>Repor Pod</b> opção para forçar a repor o estado do Pod.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod desactivado.\n\nPor favor, remova o Pod do seu corpo e descarte-o.</string>
-    <string name="omnipod_init_pod_pair_pod">Emparelhar Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Purgar Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Enchimento de Canula</string>
-    <string name="omnipod_init_pod_set_basal_profile">Definir Perfil Basal</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Cancelar Administração</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Desactivar Pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Integração da Bomba para Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Lembrete Terminar Configuração</string>
-    <string name="omnipod_alert_expiration">Pod vai expirar em breve</string>
-    <string name="omnipod_alert_expiration_advisory">Pod vai expirar em breve</string>
-    <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
-    <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
-    <string name="omnipod_alert_unknown_alert">Alerta desconhecido</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Pode ter falhado ao definir perfil da basal. A administração pode estar suspensa! Por favor, actualize o estado do Pod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Pode ter falhado ao definir basal temporária. Se houve uma basal temporária já em execução, pode ter sido cancelada! Por favor, actualize o estado do Pod.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Pode ter falhado ao definir a hora. A administração pode estar suspensa! Por favor, actualize o estado do Pod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Não é possível verificar se o bólus foi bem-sucedido. Por favor, verifique se o Pod está administrar ou cancelar o bólus.</string>
-    <string name="omnipod_rl_stats">Estatísticas RL</string>
-    <string name="omnipod_read_pulse_log_short">Registo de Pulse</string>
     <string name="comapareprofile">Comparar Perfis</string>
     <string name="nav_profilehelper">Assistente de Perfil</string>
     <string name="motoldefaultprofile">Perfil Padrão</string>

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

@@ -1070,7 +1070,6 @@
     <string name="objectives_button_unfinish">Șterge starea \"Terminat\"</string>
     <string name="objectives_button_unstart">Șterge starea \"Început\"</string>
     <string name="doyouwantresetstart">Doriți să reîncepeți obiectivul? Vă puteți pierde progresul.</string>
-    <string name="time_or_timezone_change">Schimbare oră și/sau fus orar în pompă</string>
     <string name="nopumpselected">Nicio pompă selectată</string>
     <string name="setupwizard_units_prompt">Selectați unitățile în care doriți să afișați valorile</string>
     <string name="ns_ploadlocalprofile">Transmiteți modificările profilului local către NS</string>
@@ -1147,7 +1146,6 @@
     <string name="authorizationfailed">Autorizarea a eșuat</string>
     <string name="overview_show_absinsulin">Insulină totală</string>
     <string name="master_password_summary">Parola master (principală) este folosită pentru criptarea copiilor de rezervă și pentru a suprascrie securitatea în aplicație. Rețineți-o sau păstrați-o într-un loc sigur.</string>
-    <string name="passwords_dont_match">Parolele nu coincid</string>
     <string name="current_master_password">Parola principală curentă</string>
     <string name="statuslights">Lumini de stare</string>
     <string name="statuslights_copy_ns">Copiați setările din NS</string>
@@ -1156,123 +1154,6 @@
     <string name="buttonson_description">Butoanele sunt afișate întotdeauna în partea de jos a ecranului</string>
     <string name="largedisplay_description">Display mare</string>
     <string name="skin">Tema</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Niciodată contactată</string>
-    <string name="medtronic_pump_status_waking_up">Se pornește</string>
-    <string name="medtronic_pump_status_error_comm">Eroare de comunicație</string>
-    <string name="medtronic_pump_status_timeout_comm">Comunicația nu a reușit la timp</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pompă indisponibilă</string>
-    <string name="medtronic_pump_status_invalid_config">Configurație invalidă</string>
-    <string name="medtronic_pump_status_active">Activă</string>
-    <string name="medtronic_pump_status_sleeping">În repaus</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integrare pompa pentru Omnipod, necesită dispozitivul RileyLink (cu versiune firmware de cel puțin 2.0).</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Bip pentru Bolus Activat</string>
-    <string name="omnipod_config_beep_basal_enabled">Bip pentru Bazală Activat</string>
-    <string name="omnipod_config_beep_smb_enabled">Bip pentru SMB Activat</string>
-    <string name="omnipod_config_beep_tbr_enabled">Bip pentru TBR Activat</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Opțiuni de depanare Pod Activate</string>
-    <string name="omnipod_config_timechange_enabled">Detectare DST/fus orar activată</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Pod Mgmt</string>
-    <string name="omnipod_pod_status">Status Pod</string>
-    <string name="omnipod_reservoir_left">%1$.2f U rămase</string>
-    <string name="omnipod_reservoir_over50">Peste 50 U</string>
-    <string name="omnipod_pod_address">Adresă Pod</string>
-    <string name="omnipod_pod_expiry">Pod-ul expiră</string>
-    <string name="omnipod_pod_name_no_info">Nu există informații</string>
-    <string name="omnipod_pod_no_pod_connected">Niciun Pod conectat</string>
-    <string name="omnipod_pod_not_initalized">Neiniţializat</string>
-    <string name="omnipod_pod_active_alerts">Alerte pod active</string>
-    <string name="omnipod_ack_short">Alerte de confirmare</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">Operațiunea nu este posibilă.\n\nTrebuie să configuraţi Omnipod înainte de a putea efectua această operațiune.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Operaţiunea nu este posibilă.\n\n Trebuie să aşteptaţi câteva minute până când AAPS încearcă să seteze profilul pentru prima dată.</string>
-    <string name="omnipod_error_illegal_init_action_type">Acțiune PodInitActionType ilegala: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Niciun Pod activ.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Verificarea comenzii a eşuat.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">A apărut o eroare neașteptată. Vă rugăm să o raportați! (tip: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Comunicarea a eșuat: s-au primit parametri de intrare incorecți.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Comunicarea a eșuat: timpul a expirat.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Comunicarea a eşuat: a apărut o eroare neaşteptată. Vă rugăm să o raportaţi!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Comunicarea a eşuat: verificarea integrităţii mesajului a eşuat.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Comunicarea a eşuat: a fost primit un pachet invalid de la Pod.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Comunicarea a eșuat: Pod-ul este într-o stare incorectă.</string>
-    <string name="omnipod_driver_error_invalid_response">Comunicarea a eșuat: s-a primit un răspuns incorect de la Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Comunicarea a eșuat: s-a primit un mesaj cu un număr de secvență invalid de la Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Comunicarea a eșuat: s-a primit un mesaj cu o adresă invalidă de la Pod.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Comunicarea a eșuat: nu s-a reușit decodarea mesajului de la Pod.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Comunicarea a eșuat: resincronizarea nonce nu a reușit.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Comunicarea a eșuat: nonce nu poate fi sincronizată.</string>
-    <string name="omnipod_driver_error_not_enough_data">Comunicarea a eşuat: nu s-au primit suficiente date de la Pod.</string>
-    <string name="omnipod_driver_error_pod_fault">A fost detectată o eroare a Pod-ului (%1$03d %2$s). Vă rugăm să îl dezactivați pe acesta și să porniți unul nou.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Comunicarea a eșuat: Pod-ul a returnat un răspuns de eroare.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Gestionare Pod</string>
-    <string name="omnipod_cmd_init_pod">Inițializare Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Dezactivare Pod</string>
-    <string name="omnipod_cmd_reset_pod">Resetare Pod</string>
-    <string name="omnipod_cmd_pod_history">Istoric Pod</string>
-    <string name="omnipod_cmd_set_bolus">Setează bolusul</string>
-    <string name="omnipod_cmd_cancel_bolus">Anulați Bolus</string>
-    <string name="omnipod_cmd_set_tbr">Setează bazala temporară</string>
-    <string name="omnipod_cmd_cancel_tbr">Anulați bazală temporară (la nivel intern de către driver)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Anulați bazală temporară (impus de către utilizator)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Programați ratele bazale</string>
-    <string name="omnipod_cmd_get_pod_status">Obțineți Status Pod</string>
-    <string name="omnipod_cmd_get_pod_info">Obțineți Informații Pod</string>
-    <string name="omnipod_cmd_set_time">Setare timp</string>
-    <string name="omnipod_cmd_configure_alerts">Configurare alerte</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Confirmare alerte</string>
-    <string name="omnipod_cmd_suspend_delivery">Suspendați Livrarea</string>
-    <string name="omnipod_cmd_resume_delivery">Reluați livrarea</string>
-    <string name="omnipod_cmd_unknown_entry">Intrare necunoscută</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Rata: %1$.1f U, Durata: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Dacă apăsați <b>OK</b>, statusul Pod-ului va fi resetat forțat şi nu veți mai putea comunica cu Pod-ul. Faceți acest lucru numai dacă nu mai puteți comunica deloc cu Pod-ul. Daca mai puteți comunica cu Pod-ul, va rugam sa folosiți opțiunea <b>Dezactivare Pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">Istoricul Pod-ului nu este disponibil momentan.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Umpleţi Pod-ul</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nUmpleți noul Pod cu suficientă insulină pentru 3 zile.\n\nAr trebui sa auziți două bipuri de la Pod în timpul procesului de umplere. Acestea indică faptul că, cantitatea minimă de 85U a fost introdusă. Asigurați-vă ca ați golit complet seringa de umplere, chiar și după ce ați auzit două bipuri.\n\nDupă umplerea Pod-ului, vă rugăm să apăsați <b>Următorul</b>.\n\n<b>Notă:</b> Nu scoateți capacul transparent al acului in acest moment.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Amorsare</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Încercare de împerechere cu noul Pod și amorsare.\n\nAtunci când toate etapele sunt gata, puteți apăsa <b>Următorul</b>.\n\n<b>Notă:</b> vă rugăm să țineți Pod-ul foarte aproape de RileyLink în timpul procesului.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Atașați Pod-ul</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPregătiți setul de infuzie. Scoateți capacul acului și suport adeziv și atașați Pod-ul la locul de infuzie.\n\nDacă, canula pare in neregulă, apăsați <b>Anulare</b> și aruncați Pod-ul.\n\nApăsați <b>Următorul</b> pentru a introduce canula și a începe livrarea bazalei.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Inserare canulă</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Încercare de programare inițială a ratelor bazale si de insertie a canulei.\n\nCând toate elementele sunt gata, puteți apăsa <b>Următorul</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Informații Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod-ul este acum activ.\n\nRatele bazale au fost programate și canula a fost introdusă.\n\nVă rugăm să verificați că acul a fost introdus corect. Dacă considerați ca nu, înlocuiți Pod-ul.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Dezactivare Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nApăsați <b>Următorul</b> pentru a dezactiva Pod-ul.\n\n<b>Notă:</b> Acest lucru va suspenda orice livrare de insulină și va dezactiva Pod-ul.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Dezactivare Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Dezactivare Pod.\n\nAtunci când toate elementele sunt gata, puteți apăsa <b>Următorul</b>.\n\n<b>Notă:</b> Dacă dezactivarea eșuează continuu, vă rugăm să apăsați <b>Anulează</b> și folosiți opțiunea <b>Resetare Pod</b> pentru a forța resetarea Pod-ului.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod dezactivat.\n\nScoateți Pod-ul și aruncați-l.</string>
-    <string name="omnipod_init_pod_pair_pod">Împerechere Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Amorsare Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Umplere Canulă</string>
-    <string name="omnipod_init_pod_set_basal_profile">Setează profilul bazalelor</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Anulare livrare</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Dezactivare Pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Integrare cu pompa pentru Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Finalizare memento împerechere</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Finalizare memento setare</string>
-    <string name="omnipod_alert_expiration">Pod-ul va expira în curând</string>
-    <string name="omnipod_alert_expiration_advisory">Pod-ul va expira în curând</string>
-    <string name="omnipod_alert_shutdown_imminent">Oprirea este iminentă</string>
-    <string name="omnipod_alert_low_reservoir">Nivel rezervor scăzut</string>
-    <string name="omnipod_alert_unknown_alert">Alertă necunoscută</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Setarea ratelor bazale s-ar putea să fi eșuat. Livrarea ar putea fi suspendată! Vă rugăm să reactualizați starea Pod-ului.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Setarea ratelor bazale temporare s-ar putea să fi eșuat. Dacă a existat o bazală temporară în livrare, aceasta ar putea fi fost anulată! Vă rugăm să reactualizați starea Pod-ului.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Setarea datei și orei s-ar putea să fi eșuat. Livrarea ar putea fi suspendată! Vă rugăm să reactualizați starea Pod-ului.</string>
-    <string name="omnipod_bolus_failed_uncertain">Nu se poate verifica dacă bolusul a reușit. Verificați dacă Pod livrează ceva sau anulați bolusul.</string>
-    <string name="omnipod_rl_stats">Statistici RL</string>
-    <string name="omnipod_read_pulse_log_short">Jurnal Puls</string>
     <string name="comapareprofile">Compară profilurile</string>
     <string name="nav_profilehelper">Ajutor profil</string>
     <string name="motoldefaultprofile">Profil implicit</string>

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

@@ -1084,7 +1084,6 @@ Context | Edit Context</string>
     <string name="objectives_button_unfinish">Очистить завершенные</string>
     <string name="objectives_button_unstart">Очистить начатые</string>
     <string name="doyouwantresetstart">Хотите сбросить начатую цель? Можете потерять уже достигнутое.</string>
-    <string name="time_or_timezone_change">Изменение времени и/или часового пояса на помпе</string>
     <string name="nopumpselected">Помпа не выбрана</string>
     <string name="setupwizard_units_prompt">Выберите единицы, в которых вы хотите отображать значения</string>
     <string name="ns_ploadlocalprofile">Перенести изменения локального профиля в NS</string>
@@ -1161,7 +1160,6 @@ Context | Edit Context</string>
     <string name="authorizationfailed">Ошибка авторизации</string>
     <string name="overview_show_absinsulin">Абсолютный инсулин</string>
     <string name="master_password_summary">Главный пароль используется для шифрования резервных копий и для переопределения защиты в приложении. Запомните его или храните в безопасном месте.</string>
-    <string name="passwords_dont_match">Пароли не совпадают</string>
     <string name="current_master_password">Текущий главный пароль</string>
     <string name="statuslights">Индикаторы состояния</string>
     <string name="statuslights_copy_ns">Копировать параметры из NS</string>
@@ -1170,123 +1168,6 @@ Context | Edit Context</string>
     <string name="buttonson_description">Кнопки всегда отображаются в нижней части экрана</string>
     <string name="largedisplay_description">Большой дисплей</string>
     <string name="skin">Тема оформления</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Никогда не подключалось</string>
-    <string name="medtronic_pump_status_waking_up">Пробуждение</string>
-    <string name="medtronic_pump_status_error_comm">Ошибка связи</string>
-    <string name="medtronic_pump_status_timeout_comm">Таймаут связи</string>
-    <string name="medtronic_pump_status_pump_unreachable">Помпа недоступна</string>
-    <string name="medtronic_pump_status_invalid_config">Недопустимая конфигурация</string>
-    <string name="medtronic_pump_status_active">Активно</string>
-    <string name="medtronic_pump_status_sleeping">Сон</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Для интеграции с помпой Omnipod требуется устройство RileyLink (с прошивкой 2.0 и выше).</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Звуковой сигнал болюса включен</string>
-    <string name="omnipod_config_beep_basal_enabled">Звуковой сигнал базала включен</string>
-    <string name="omnipod_config_beep_smb_enabled">Звуковой сигнал микроболюса SMB включен</string>
-    <string name="omnipod_config_beep_tbr_enabled">Звуковой сигнал временного базала TBR включен</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Опции Отладки Пода Включены</string>
-    <string name="omnipod_config_timechange_enabled">Включено обнаружение часового пояса</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Управление помпой</string>
-    <string name="omnipod_pod_status">Статус помпы</string>
-    <string name="omnipod_reservoir_left">%1$.2f ед. осталось</string>
-    <string name="omnipod_reservoir_over50">Более 50 ед.</string>
-    <string name="omnipod_pod_address">Адрес Пода</string>
-    <string name="omnipod_pod_expiry">Срок действия Пода истекает</string>
-    <string name="omnipod_pod_name_no_info">Нет информации.</string>
-    <string name="omnipod_pod_no_pod_connected">Нет подключения к помпе</string>
-    <string name="omnipod_pod_not_initalized">Нет инициализации</string>
-    <string name="omnipod_pod_active_alerts">Активные оповещения помпы</string>
-    <string name="omnipod_ack_short">Оповещения помпы</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 МГц)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">Операция невозможна.\n\n Сначала нужно настроить помпу Omnipod.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Операция невозможна.\n\n Подождите несколько минут, пока AAPS пытается задать профиль.</string>
-    <string name="omnipod_error_illegal_init_action_type">Недопустимый тип инициализации: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Активная помпа не выбрана.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Командная верификация не состоялась.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Произошла непредвиденная ошибка. Пожалуйста, сообщите об ошибке! (сообщить:: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Ошибка связи: недопустимые входные параметры.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Ошибка связи: время ожидания истекло.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Ошибка связи: возникла непредвиденная ошибка. Пожалуйста, сообщите!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Ошибка связи: проверка целостности сообщения завершилась неудачно.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Ошибка связи: недопустимые входные параметры.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Ошибка связи: Pod находится в неверном состоянии.</string>
-    <string name="omnipod_driver_error_invalid_response">Ошибка связи: недопустимый ответ от помпы.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Ошибка связи: получено сообщение с недопустимым порядковым номером от Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Ошибка связи: получено сообщение с некорректным адресом от Pod.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Ошибка связи: не удалось декодировать сообщение от Pod.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Ошибка соединения: не удалось выполнить синхронизацию nonce resync.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Ошибка соединения: вне синхронизации.</string>
-    <string name="omnipod_driver_error_not_enough_data">Ошибка связи: недостаточно данных от Pod.</string>
-    <string name="omnipod_driver_error_pod_fault">Обнаружена ошибка Pod (%1$03d %2$s). Деактивируйте Pod и запустите новый.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Ошибка связи: Pod ответил ошибкой.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Управление помпой Omnipod </string>
-    <string name="omnipod_cmd_init_pod">Инициализировать Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Деактивировать Pod</string>
-    <string name="omnipod_cmd_reset_pod">Сброс помпы</string>
-    <string name="omnipod_cmd_pod_history">Журнал помпы</string>
-    <string name="omnipod_cmd_set_bolus">Настроить болюс</string>
-    <string name="omnipod_cmd_cancel_bolus">Отменить болюс</string>
-    <string name="omnipod_cmd_set_tbr">Установить временный базал</string>
-    <string name="omnipod_cmd_cancel_tbr">Отменить временный базал (внутренний драйвер)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Отменить временный базал (принудительно пользователем)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Задать расписание базала</string>
-    <string name="omnipod_cmd_get_pod_status">Получить состояние Pod</string>
-    <string name="omnipod_cmd_get_pod_info">Получить информацию о Pod</string>
-    <string name="omnipod_cmd_set_time">Установить Время</string>
-    <string name="omnipod_cmd_configure_alerts">Сконфигурировать оповещения</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Подтвердить оповещения</string>
-    <string name="omnipod_cmd_suspend_delivery">Приостановить подачу</string>
-    <string name="omnipod_cmd_resume_delivery">Возобновить подачу</string>
-    <string name="omnipod_cmd_unknown_entry">Неизвестная запись</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f ед</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f ед, CH=%2$.1f г</string>
-    <string name="omnipod_cmd_tbr_value">Скорость: %1$.1f ед, Продолжительность: %2$d мин</string>
-    <string name="omnipod_cmd_reset_pod_desc">Если нажать <b>OK</b>, состояние Pod будет принудительно сброшено, и вы больше не сможете общаться с Pod. Сделайте это только в том случае, если вы не можете обмениваться с Pod. Если еще можно связаться с Pod, воспользуйтесь опцией <b>Деактивировать Pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">В настоящее время история помпы недоступна.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Заполнить Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nЗаполните новый Pod запасом инсулина на 3 дня.\n\nПоступят два звуковых сигнала от помпы во время заправки. Это означает, что минимальное количество 85U заправлено. Не забудьте опустошить заправочный шприц даже после того, как услышите два звуковых сигнала.\n\nПосле заполнения Pod нажмите <b>Next</b>.\n\n<b>Примечание:</b> Пока не снимайте с помпы колпачок с иглой.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Первичное заполнение инфузионной секции пода</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Попытка сопряжения с новым Podом и первичного заполнения инфузионного отсека..\n\n После проверки всех пунктов можно нажать <b>Далее</b>.\n\n<b>Примечание:</b> В это время Под должен находиться рядом с RileyLink.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Подключить Под</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nПодготовьте место инфузии. Удалите колпачок с иглы и защиту липкого слоя, Установите Pod на тело.\n\nесли канюля выступает, нажмите <b>отменить</b> и утилизируйте Pod.\n\Нажмите <b>Далее</b> чтобы вставить канюлю и начать подачу базала.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Установка канюли (катетера) </string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Определение графика подачи базала и установка канюли. \n\n Когда проверены все шаги, нажмите <b>Далее</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Информация о Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nПомпа сейчас активна.\n\nБазальный график запрограммирован и катетер установлен.\n\nУбедитесь в том, что канюля установлена правильно и замените Pod, если такой уверенности нет.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Деактивировать Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nНажмите <b>Далее</b> для деактивации Пода\n\n<b>Примечание:</b> Это Приостановит всякую подачу инсулина и деактивирует помпу.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Деактивация помпы</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Деактивация помпы.\n\n, Когда проверены все элементы, нажмите <b>Далее</b>.\n\n<b>Примечание:</b> Если деактивация постоянно завершается ошибкой, нажмите <b>Отменить</b> и примените <b>Сброс помпы</b> чтобы принудительно сбросить состояние Pod\'a.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod деактивирован.\n\nУдалите и утилизируйте Pod.</string>
-    <string name="omnipod_init_pod_pair_pod">Сопряжение Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Заполнение инфузионной секции Pod\'a</string>
-    <string name="omnipod_init_pod_fill_cannula">Заполнение катетера</string>
-    <string name="omnipod_init_pod_set_basal_profile">Задан профиль базала</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Отмена подачи инсулина</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Деактивировать Pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Интеграция с помпой Omnompod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Напоминание о завершении сопряжения</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Напоминание о завершении настройки</string>
-    <string name="omnipod_alert_expiration">Срок работы Pod\'a истекает</string>
-    <string name="omnipod_alert_expiration_advisory">Срок Pod\'a истекает в ближайшее время</string>
-    <string name="omnipod_alert_shutdown_imminent">Остановка неизбежна</string>
-    <string name="omnipod_alert_low_reservoir">В резервуаре мало инсулина</string>
-    <string name="omnipod_alert_unknown_alert">Неизвестное оповещение</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Возможно, не удалось задать базовый профиль. Подача инсулина может быть приостановлена! Обновите состояние Pod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Возможно, установка временного базала не удалась. Если временный базал уже работал, возможна его отмена! Обновите статус Pod\'a.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Возможно, не удалось задать время. Подача инсулина может быть приостановлена! Обновите состояние Pod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Не удалось проверить правильность подачи болюса. Убедитесь, что Pod подает болюс или отмените его.</string>
-    <string name="omnipod_rl_stats">Статистика RL</string>
-    <string name="omnipod_read_pulse_log_short">Журнал Pulse </string>
     <string name="comapareprofile">Сравнить профили</string>
     <string name="nav_profilehelper">Помощник профиля</string>
     <string name="motoldefaultprofile">Профиль по умолчанию</string>

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

@@ -559,6 +559,7 @@
     <string name="pump_unreachable">Pumpa nedostupná</string>
     <string name="missed_bg_readings">Chýbajúce hodnoty glykémie</string>
     <string name="raise_notifications_as_android_notifications">Používať systémové notifikácie pre výstrahy a oznámenia</string>
+    <string name="gradually_increase_notification_volume">Postupne zvyšovať hlasitosť upozornení a oznámení</string>
     <string name="localalertsettings_title">Lokálne výstrahy</string>
     <string name="enable_missed_bg_readings_alert">Výstraha pri nedostupných hodnotách glykémie</string>
     <string name="enable_pump_unreachable_alert">Výstraha pri nedostupnej pumpe</string>
@@ -1082,7 +1083,6 @@
     <string name="objectives_button_unfinish">Vymazanie dokončené</string>
     <string name="objectives_button_unstart">Vymazanie začaté</string>
     <string name="doyouwantresetstart">Chcete resetovať začiatok cieľa? Môžete prísť o svoj pokrok.</string>
-    <string name="time_or_timezone_change">Zmena času a/alebo časovej zóny na pumpe</string>
     <string name="nopumpselected">Nie je vybraná žiadna pumpa</string>
     <string name="setupwizard_units_prompt">Vyberte jednotky, v ktorých chcete zobraziť hodnoty</string>
     <string name="ns_ploadlocalprofile">Odoslať zmeny lokálneho profilu do NS</string>
@@ -1159,7 +1159,6 @@
     <string name="authorizationfailed">Autorizácia zlyhala</string>
     <string name="overview_show_absinsulin">Celkový inzulín</string>
     <string name="master_password_summary">Hlavné heslo sa používa na šifrovanie zálohy a na \"prebitie\" zabezpečenia v aplikácii. Dobre si ho zapamätajte, alebo uložte na bezpečnom mieste.</string>
-    <string name="passwords_dont_match">Heslá sa nezhodujú</string>
     <string name="current_master_password">Aktuálne hlavné heslo</string>
     <string name="statuslights">Indikátory stavu</string>
     <string name="statuslights_copy_ns">Kopírovať nastavenia z NS</string>
@@ -1168,123 +1167,6 @@
     <string name="buttonson_description">Tlačidlá sú vždy zobrazené v spodnej časti obrazovky</string>
     <string name="largedisplay_description">Veľký displej</string>
     <string name="skin">Vzhľad</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Nikdy nepripojené</string>
-    <string name="medtronic_pump_status_waking_up">Prebúdzanie</string>
-    <string name="medtronic_pump_status_error_comm">Chyba komunikácie</string>
-    <string name="medtronic_pump_status_timeout_comm">Uplynul časový limit komunikácie</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pumpa nedostupná</string>
-    <string name="medtronic_pump_status_invalid_config">Neplatná konfigurácia</string>
-    <string name="medtronic_pump_status_active">Aktívna</string>
-    <string name="medtronic_pump_status_sleeping">Spiaca</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integrácia pumpy pre Omnipod, vyžaduje zariadenie RileyLink (s firmwarom aspoň 2.0).</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Pípnutie pri boluse povolené</string>
-    <string name="omnipod_config_beep_basal_enabled">Pípnutie pri bazále povolené</string>
-    <string name="omnipod_config_beep_smb_enabled">Pípnutie pri SMB povolené</string>
-    <string name="omnipod_config_beep_tbr_enabled">Pípnutie pri TBR povolené</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Možnosti ladenia Podu povolené</string>
-    <string name="omnipod_config_timechange_enabled">Letný čas / Detekcia časového pásma povolená</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Správa Podu</string>
-    <string name="omnipod_pod_status">Stav Podu</string>
-    <string name="omnipod_reservoir_left">Zostáva %1$.2f JI</string>
-    <string name="omnipod_reservoir_over50">Viac ako 50 JI</string>
-    <string name="omnipod_pod_address">Adresa Podu</string>
-    <string name="omnipod_pod_expiry">Expirácia Podu</string>
-    <string name="omnipod_pod_name_no_info">Žiadne info</string>
-    <string name="omnipod_pod_no_pod_connected">Žiadny Pod nie je pripojený</string>
-    <string name="omnipod_pod_not_initalized">Nie je inicializovaný</string>
-    <string name="omnipod_pod_active_alerts">Výstrahy aktívneho Podu</string>
-    <string name="omnipod_ack_short">Potvrdiť výstrahu</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_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_error_operation_not_possible_no_profile">Operácia nie je možná.\n\n Je potrebné niekoľko minút počkať, pokiaľ sa AAPS nepokúsi prvý krát nastaviť profil.</string>
-    <string name="omnipod_error_illegal_init_action_type">Neplatný atribút PodInitActionType: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Žiadny aktívny Pod.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Overenie príkazu zlyhalo.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Došlo k neočakávanej chybe. Nahláste ju! (typ: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Komunikácia zlyhala: boli prijaté neplatné vstupné parametre.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Komunikácia zlyhala: časový limit vypršal.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Komunikácia zlyhala: vyskytla sa neočakávaná chyba. Prosím, nahláste to!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Komunikácia zlyhala: overenie integrity správy zlyhalo.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Komunikácia zlyhala: boli prijaté neplatné pakety z Podu.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Komunikácia zlyhala: Pod je v chybnom stave.</string>
-    <string name="omnipod_driver_error_invalid_response">Komunikácia zlyhala: bola prijatá neplatná odozva z Podu.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Komunikácia zlyhala: bola prijatá správa s neplatným poradovým číslom z Podu.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Komunikácia zlyhala: bola prijatá správa s neplatnou adresou z Podu.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Komunikácia zlyhala: nepodarilo se dekódovať správu z Podu.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Komunikácia zlyhala: opakovaná synchronizácia Nonce hodnoty zlyhala.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Komunikácia zlyhala: hodnota Nonce nebola synchronizovaná.</string>
-    <string name="omnipod_driver_error_not_enough_data">Komunikácia zlyhala: nedostatok dát prijatých z Podu.</string>
-    <string name="omnipod_driver_error_pod_fault">Bola zistená chyba Podu (%1$03d %2$s). Deaktivujte Pod a spustite nový.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Komunikácia zlyhala: Pod vrátil chybovú odozvu.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Správa Podu</string>
-    <string name="omnipod_cmd_init_pod">Inicializovať Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Deaktivovať Pod</string>
-    <string name="omnipod_cmd_reset_pod">Resetovať Pod</string>
-    <string name="omnipod_cmd_pod_history">História Podu</string>
-    <string name="omnipod_cmd_set_bolus">Nastaviť bolus</string>
-    <string name="omnipod_cmd_cancel_bolus">Zrušiť bolus</string>
-    <string name="omnipod_cmd_set_tbr">Nastaviť dočasný bazál</string>
-    <string name="omnipod_cmd_cancel_tbr">Zrušiť dočasný bazál (interne ovládačom)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Zrušiť dočasný bazál (nútene užívateľom)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Nastaviť plán bazálu</string>
-    <string name="omnipod_cmd_get_pod_status">Zistiť stav Podu</string>
-    <string name="omnipod_cmd_get_pod_info">Zistiť informácie o Pode</string>
-    <string name="omnipod_cmd_set_time">Nastaviť čas</string>
-    <string name="omnipod_cmd_configure_alerts">Nastaviť výstrahy</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Potvrdiť výstrahy</string>
-    <string name="omnipod_cmd_suspend_delivery">Pozastaviť dodávanie inzulínu</string>
-    <string name="omnipod_cmd_resume_delivery">Pokračovať v dodávaní inzulínu</string>
-    <string name="omnipod_cmd_unknown_entry">Neznáma položka</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f JI</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f JI, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Rýchlosť: %1$.1f JI, Doba trvania: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Keď stlačíš <b>OK</b>, bude pripojenie na Pod nútene prerušené a nebudete sa môcť k nemu už viac pripojiť. Urob tak iba vtedy, ak AAPS nemôže viac komunikovať s Podom. Ak stále môžete komunikovať s Podom, prosím použite možnosť <b>Deaktivovať Pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">História Podu momentálne nie je dostupná.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Naplňte Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nNaplňte Pod dostatočným množstvom inzulínu na 3 dni.\n\nPočúvaj aj dve pípnutia počas plnenia. Tieto poukazujú na to, že Pod bol naplnený minimálnym množstvom 85 JI. Úplne vyprázdni striekačku, aj keď si počul dve pípnutia.\n\nKlikni &lt;bĎalej&lt;/b&gt; po tom, čo si naplnil Pod.\n\n&lt;b&gt;Poznámka:&lt;/b&gt; Neodstraňuj ešte ochranu ihly na Pode.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Plnenie</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Pokús sa spárovať s novým Podom a naplň ho.\n\nKeď sú všetky položky zaškrtnuté, môžete stlačiť <b>Ďalej</b>.\n\n<b>Poznámka:</b> prosím držte teraz Pod veľmi blízko RileyLinku.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Pripevni Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPripravte infúzny set. Odstráňte krytku ihly na Pode a ochranu samolepky a pripojte Pod k infúznemu setu. \n\nAk sa kanyla odlepí, prosím stlačte <b>Zrušiť</b> a zahoďte Váš Pod.\n\nStlačte <b>Ďalšia</b> na zavedenie kanyly a začiatok podávania bazálu.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Zavedenie kanyly</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Pokúšam sa nastaviť počiatočnú bazálnu dávku a zaviesť kanylu.\n\nAk sú všetky položky označené, môžete stlačiť <b>Ďalší</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Informácie o Pode</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod je teraz aktívny.\n\nVaša bazálna dávka je nastavená a kanyla bola zavedená.\n\nProsím skontrolujte, či bola kanyla zavedená správne a ak máte pocit, že nie, tak vymeňte Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Deaktivovať Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nStlačte <b>Ďalej</b> pre deaktiváciu Podu.\n\n<b>Poznámka:</b> Toto preruší celkovo podávanie inzulínu a deaktivuje Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Deaktivácia Podu</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Deaktivujem Pod.\n\nKeď sú všetky položky zaškrtnuté, môžete stlačiť <b>Ďalej</b>.\n\n<b>Poznámka:</b> Ak deaktivácia neustále zlyháva, stlačte prosím <b>Zrušiť</b> a použite možnosť <b>Resetovať Pod</b>, na nútené obnovenie stavu Podu.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deaktivovaný.\n\nProsím odstráňte Pod z Vášho tela a zlikvidujte ho.</string>
-    <string name="omnipod_init_pod_pair_pod">Spárujte Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Naplňte Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Naplňte kanylu</string>
-    <string name="omnipod_init_pod_set_basal_profile">Nastavte bazálny profil</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Zrušte podávanie</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Deaktivujte Pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Integrácia pumpy pre Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Pripomienka ukončenia párovania</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Pripomienka ukončenia nastavenia</string>
-    <string name="omnipod_alert_expiration">Pod čoskoro expiruje</string>
-    <string name="omnipod_alert_expiration_advisory">Pod čoskoro expiruje</string>
-    <string name="omnipod_alert_shutdown_imminent">Vypnutie je bezprostredné</string>
-    <string name="omnipod_alert_low_reservoir">Nízka hladina zásobníka</string>
-    <string name="omnipod_alert_unknown_alert">Neznáma výstraha</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Nastavenie bazálu mohlo zlyhať. Podávanie môže byť pozastavené! Prosím, obnovte stav Podu.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Nastavenie dočasného bazálu mohlo zlyhať. Ak už bol spustený dočasný bazál, mohol byť zrušený! Prosím, obnovte stav Podu.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Nastavenie času mohlo zlyhať. Podávanie môže byť pozastavené! Prosím, obnovte stav Podu.</string>
-    <string name="omnipod_bolus_failed_uncertain">Nie je možné overiť, či bolo podávanie bolusu úspešné. Prosím overte, že váš Pod podáva bolus, alebo zrušte bolus.</string>
-    <string name="omnipod_rl_stats">Štatistiky RL</string>
-    <string name="omnipod_read_pulse_log_short">Pulse Log</string>
     <string name="comapareprofile">Porovnať profily</string>
     <string name="nav_profilehelper">Pomocník s profilom</string>
     <string name="motoldefaultprofile">Predvolený profil</string>

app/src/main/res/values-sl-rSI/strings.xml

@@ -5,14 +5,4 @@
     <!--    <string name="ga_lang" translatable="false">Irish</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
-    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
 </resources>

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

@@ -61,7 +61,7 @@ Eversense-appen.</string>
     <string name="tempbasals_iobtotal_label_string">IOB fr basal:</string>
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
-    <string name="treatments_wizard_carbs_label">KH</string>
+    <string name="treatments_wizard_carbs_label">Kolhydrater</string>
     <string name="treatments_wizard_correction_label">Korrektion</string>
     <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
     <string name="openapsma_run">Utför nu</string>
@@ -149,7 +149,7 @@ Eversense-appen.</string>
     <string name="careportal_newnstreatment_percent_label">Procent</string>
     <string name="careportal_newnstreatment_absolute_label">Absolut</string>
     <string name="careportal_newnstreatment_notes_label">Anteckning</string>
-    <string name="event_time_label">Tid för händelse</string>
+    <string name="event_time_label">När</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Loggat av</string>
     <string name="careportal_newnstreatment_glucosetype">Glukostyp</string>
@@ -157,6 +157,7 @@ Eversense-appen.</string>
     <string name="overview_tempbasal_button">Temp basal</string>
     <string name="overview_extendedbolus_button">Förlängd bolus</string>
     <string name="configbuilder_nightscoutversion_label">Nightscoutversion:</string>
+    <string name="missing_carbs">Saknar %1$dg</string>
     <string name="exported">Inställningar exporterade</string>
     <string name="export_to">Exportera inställningar till</string>
     <string name="import_from">Importera inställningar från</string>
@@ -235,6 +236,10 @@ Eversense-appen.</string>
     <string name="smscommunicator_remotebolusmindistance_summary">Minsta antal minuter som måste förflyta mellan en fjärrbolus och nästa</string>
     <string name="smscommunicator_remotebolusmindistance">Minsta antal minuter mellan fjärrbolus</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">För att redigera den här inställningen måste du, för din säkerhet, lägga till minst 2 telefonnummer.</string>
+    <string name="bolusdelivered">Bolus %1$.2f enheter levererat</string>
+    <string name="bolusrequested">Kommer att leverera %1$.2f enheter</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %1$.2f enheter levererat</string>
+    <string name="smscommunicator_mealbolusdelivered">Bolus på %1$.2f enheter levererat</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Temporärt mål på %1$s är satt i %2$d minuter</string>
     <string name="smscommunicator_tt_set">Temporärt mål på %1$s är satt i %2$d minuter</string>
     <string name="smscommunicator_tt_canceled">Temporärt mål avbrutet</string>
@@ -258,7 +263,9 @@ Eversense-appen.</string>
     <string name="smscommunicator_reconnect">Pump återansluten</string>
     <string name="smscommunicator_remotecommandnotallowed">Otillåtet fjärrkommando</string>
     <string name="smscommunicator_remotebolusnotallowed">Fjärrbolus inte tillgängligt. Försök igen senare.</string>
+    <string name="smscommunicator_basalreplywithcode">För att starta temp basal %1$.2f enheter/tim i %2$d min, svara med kod %3$s</string>
     <string name="smscommunicator_profilereplywithcode">För att byta till profil %1$s %2$d%% svara med kod %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">För att starta förlängd bolus med %1$.2f enheter över %2$d min, svara med kod %3$s</string>
     <string name="smscommunicator_carbsreplywithcode">Om du vill ange %1$dg kl. %2$s, svara med kod %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">För att starta temp basal %1$d%% i %2$d min, svara med kod %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">För att pausa loop i %1$d minuter, svara med kod %2$s</string>
@@ -267,6 +274,7 @@ Eversense-appen.</string>
     <string name="smscommunicator_loopdisablereplywithcode">För att inaktivera loopen, svara med kod %1$s</string>
     <string name="smscommunicator_tempbasalset">Temp basal %1$.2f enheter/tim i %2$d min startad</string>
     <string name="smscommunicator_extendedset">Förlängd bolus %1$.2f enheter över %2$d min har startats</string>
+    <string name="smscommunicator_carbsset">%1$dg kolhydrater registrerat</string>
     <string name="smscommunicator_carbsfailed">Misslyckades med att registrera %1$dg kolhydrater</string>
     <string name="smscommunicator_tempbasalset_percent">Temp basal %1$d%% enheter/tim i %2$d min startad</string>
     <string name="smscommunicator_tempbasalfailed">Fel vid start av temp basal</string>
@@ -835,7 +843,7 @@ Eversense-appen.</string>
     <string name="nsmalfunction">Fel på NSClient. Överväg att starta om NSClient och Nightscout-webbplatsen.</string>
     <string name="as">AS</string>
     <string name="versionavailable">Version %1$s tillgänglig</string>
-    <string name="time_offset">Tidsförskjutning</string>
+    <string name="time_offset">KH-tid</string>
     <string name="setupwizard_preferred_aps_mode">Föredraget APS-läge</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Kalkyl</string>
@@ -847,6 +855,7 @@ Eversense-appen.</string>
     <string name="code_compare">Stämmer koderna överens mellan denna enhet och din pump?</string>
     <string name="insight_pairing">Parkoppling av Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
+    <string name="insight_delivered">%1$.2fU / %2$.2fU levererat</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Slang bytt</string>
     <string name="pump_time_updated">Tiden uppdaterad i pumpen</string>
@@ -904,6 +913,7 @@ Eversense-appen.</string>
     <string name="short_status_extended">Förl: %1$.2f / %2$.2f U i %3$d min</string>
     <string name="short_status_multiwave">Kombi: %1$.2f / %2$.2f U i %3$d min</string>
     <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">Res: %1$.2fU</string>
     <string name="short_status_battery">Batt.: %1$d%%</string>
     <string name="max_recovery_duration">Max paus mellan återanslutningsförsök [s]</string>
     <string name="min_recovery_duration">Min paus mellan återanslutningsförsök [s]</string>
@@ -1046,6 +1056,8 @@ Eversense-appen.</string>
     <string name="sendsmsactionlabel">Skicka SMS: %1$s</string>
     <string name="sendsmsactiondescription">Skicka SMS till alla nummer</string>
     <string name="sendsmsactiontext">Skicka SMS med text</string>
+    <string name="cobvsiob">COB kontra IOB</string>
+    <string name="bolusconstraintappliedwarn">Bolusbegränsning tillämpad: %1$.2f U till %2$.2f U</string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>Varning! Långsam KH-absorption upptäckt %2$d%% av tiden. Dubbelkolla din beräkning. COB kan vara väldigt missvisande och du riskerar få för mycket insulin!</font>]]></string>
     <string name="partialboluswizard">Direkt bolus [%]</string>
     <string name="deliverpartofboluswizard">Bolusguiden utför beräkningar, men endast denna del av beräknat insulin levereras. Användbar med SMB-algoritm.</string>
@@ -1071,7 +1083,6 @@ Eversense-appen.</string>
     <string name="objectives_button_unfinish">Rensa avslutade</string>
     <string name="objectives_button_unstart">Rensa påbörjade</string>
     <string name="doyouwantresetstart">Vill du starta om målet? Du kan förlora de steg du gjort hittills.</string>
-    <string name="time_or_timezone_change">Tid och/eller tidszonsändring på pump</string>
     <string name="nopumpselected">Ingen pump har valts</string>
     <string name="setupwizard_units_prompt">Välj enheter du vill visa värden i</string>
     <string name="ns_ploadlocalprofile">Överför lokala profiländringar till NS</string>
@@ -1148,7 +1159,6 @@ Eversense-appen.</string>
     <string name="authorizationfailed">Behörighetskontroll misslyckades</string>
     <string name="overview_show_absinsulin">Absolut insulinmängd</string>
     <string name="master_password_summary">Huvudlösenordet används för att kryptera backuper och för att åsidosätta vissa säkerhetsfunktioner i applikationen. Kom ihåg det eller förvara det på ett säkert ställe.</string>
-    <string name="passwords_dont_match">Lösenorden stämmer inte överens</string>
     <string name="current_master_password">Nuvarande huvudlösenord</string>
     <string name="statuslights">Statuslampor</string>
     <string name="statuslights_copy_ns">Kopiera inställningar från NS</string>
@@ -1157,123 +1167,6 @@ Eversense-appen.</string>
     <string name="buttonson_description">Knappar visas alltid längst ned på skärmen</string>
     <string name="largedisplay_description">Stor skärm</string>
     <string name="skin">Tema</string>
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Aldrig ansluten</string>
-    <string name="medtronic_pump_status_waking_up">Väcker</string>
-    <string name="medtronic_pump_status_error_comm">Kommunikationsfel</string>
-    <string name="medtronic_pump_status_timeout_comm">Kommunikationstimeout</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pumpen kan inte nås</string>
-    <string name="medtronic_pump_status_invalid_config">Felaktig konfigureration</string>
-    <string name="medtronic_pump_status_active">Aktiv</string>
-    <string name="medtronic_pump_status_sleeping">Sover</string>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Pumpintegrering för Omnipod. Kräver Riley Link med minst v2-firmware.</string>
-    <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Boluspip aktiverade</string>
-    <string name="omnipod_config_beep_basal_enabled">Basalpip aktiverade</string>
-    <string name="omnipod_config_beep_smb_enabled">SMB-pip aktiverade</string>
-    <string name="omnipod_config_beep_tbr_enabled">Tempbasal-pip aktiverade</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Debug-alternativ aktiverade för pod</string>
-    <string name="omnipod_config_timechange_enabled">Automatisk avkänning av tidszon aktiverad</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Omnipod</string>
-    <string name="omnipod_pod_status">Pod-status</string>
-    <string name="omnipod_reservoir_left">%1$.2f U återstår</string>
-    <string name="omnipod_reservoir_over50">Över 50 U</string>
-    <string name="omnipod_pod_address">Podadress</string>
-    <string name="omnipod_pod_expiry">Pod går ut</string>
-    <string name="omnipod_pod_name_no_info">Ingen info</string>
-    <string name="omnipod_pod_no_pod_connected">Ingen pod ansluten</string>
-    <string name="omnipod_pod_not_initalized">Inte initierad</string>
-    <string name="omnipod_pod_active_alerts">Aktiva pod-varningar</string>
-    <string name="omnipod_ack_short">Ack-varningar</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_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_error_operation_not_possible_no_profile">Operationen är inte möjlig.\n\n Du måste vänta några minuter, tills AAPS försöker ställa in profilen för första gången.</string>
-    <string name="omnipod_error_illegal_init_action_type">Ogiltig PodInitActionType: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Ingen aktiv pod.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Kommandoverifikation misslyckades.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Ett oväntat fel uppstod. Vänligen rapportera! (typ: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Kommunikationsfel: Emottog ogiltiga indataparametrar.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Kommunikationsfel: Timeout.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Kommunikationsfel: Ett oväntat fel inträffade. Rapportera!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Kommunikationsfel: Lyckades inte verifiera meddelandet.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Kommunikationsfel: Mottog ett ogiltigt datapaket från pod.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Kommunikationsfel: Pod är i fel tillstånd.</string>
-    <string name="omnipod_driver_error_invalid_response">Kommunikationsfel: Mottog ett felaktig svar från pod.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Kommunikationsfel: Tog emot ett meddelande med ett ogiltigt sekvensnummer från podden.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Kommunikationsfel: Tog emot ett meddelande med en ogiltig adress från podden.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Kommunikationsfel: Misslyckades avkoda meddelandet från pod.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Kommunikationsfel: \"nonce resync\" misslyckades.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Kommunikationsfel: \"nonce\" är inte i synk.</string>
-    <string name="omnipod_driver_error_not_enough_data">Kommunikationsfel: Mottog inte tillräckligt mycket data från pod.</string>
-    <string name="omnipod_driver_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_driver_error_pod_returned_error_response">Kommunikationsfel: Pod returnerade ett fel.</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Podhantering</string>
-    <string name="omnipod_cmd_init_pod">Initiera pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Inaktivera pod</string>
-    <string name="omnipod_cmd_reset_pod">Återställ pod</string>
-    <string name="omnipod_cmd_pod_history">Pod-historik</string>
-    <string name="omnipod_cmd_set_bolus">Leverera bolus</string>
-    <string name="omnipod_cmd_cancel_bolus">Avbryt Bolus</string>
-    <string name="omnipod_cmd_set_tbr">Sätt temp basal</string>
-    <string name="omnipod_cmd_cancel_tbr">Avbryt temp basal (internt av drivrutinen)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Avbryt temp basal (tvingat av användaren)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Ange basaldoser</string>
-    <string name="omnipod_cmd_get_pod_status">Uppdatera pod-status</string>
-    <string name="omnipod_cmd_get_pod_info">Hämta Pod-information</string>
-    <string name="omnipod_cmd_set_time">Ställ in tid</string>
-    <string name="omnipod_cmd_configure_alerts">Konfigurera varningar</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Bekräfta varningar</string>
-    <string name="omnipod_cmd_suspend_delivery">Pausa insulintillförsel</string>
-    <string name="omnipod_cmd_resume_delivery">Återuppta insulintillförsel</string>
-    <string name="omnipod_cmd_unknown_entry">Okänd post</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, KH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Dos: %1$.1f U, Duration: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Om du trycker på <b>OK</b>, kommer poddstatus att tvångsåterställas och du kommer inte att kunna kommunicera med podden längre. Gör det här bara om du inte kan kommunicera med podden. Om du fortfarande kan kommunicera med den, använd alternativet <b>Inaktivera pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">Pod-historik är inte tillgänglig för tillfället.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Fyll pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nFyll den nya podden med tillräckligt med insulin för 3 dagar.\n\nLyssna efter två pip under påfyllningsprocessen. Dessa anger att minimimängden 85U har nåtts. Var noga med att helt tömma påfyllningssprutan, även efter att ha hört de två pipen.\n\nNär påfyllningen är klar, tryck <b>Nästa</b>.\n\n<b>Notera:</b> Ta inte bort nålskyddet ännu.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Förfyllning</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Försöker parkoppla den nya podden och förfylla den.\n\nNär alla steg är sluförda, kan du trycka på <b>Nästa</b>.\n\n<b>Notera:</b> Håll din riley link väldigt nära podden.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Fäst podden</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nFörbered infusionsplatsen. Ta bort poddens nålskydd och fäst podden på infusionsplatsen.\n\nOm kanylen sticker ut, tryck på <b>Avbryt</b> och kasta din pod.\n\nTryck <b>Nästa</b> för att skjuta in kanylen och påbörja basaldoseringen.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Skjuter in kanylen</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Försöker att ställa in basaldoser och skjuta in kanylen.\n\nNär alla steg är slutförda, kan du trycka på <b>Nästa</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Pod-info</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPodden är nu aktiverad.\n\nDina basaldoser har programmerats och kanylen har skjutits in in.\n\nKontrollera att kanylen sitter på rätt sätt och byt pod om den inte gjort det.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Inaktivera pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nTryck 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_remove_pod_wizard_step2_title">Inaktiverar pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Inaktivering av pod\n\nNär alla steg är slutförda, kan du trycka på <b>Nästa</b>.\n\n<b>Notera:</b> Om inaktivering misslyckas ofta, tryck på <b>Avbryt</b> och använd alternativet <b>Återställ pod</b> för att tvångsåterställa podden.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod inaktiverad.\n\nTa bort podden och kasta den.</string>
-    <string name="omnipod_init_pod_pair_pod">Parkoppla pod</string>
-    <string name="omnipod_init_pod_prime_pod">Förfyll pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Fyll kanyl</string>
-    <string name="omnipod_init_pod_set_basal_profile">Sätt basalprofil</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Avbryt leverans</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Inaktivera pod</string>
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Pumpintegration för Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Påminnelse att slutföra parkoppling</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Påminnelse att slutföra installation</string>
-    <string name="omnipod_alert_expiration">Pod löper snart ut</string>
-    <string name="omnipod_alert_expiration_advisory">Pod kommer att gå ut inom kort</string>
-    <string name="omnipod_alert_shutdown_imminent">Pod kommer snart att stängas av</string>
-    <string name="omnipod_alert_low_reservoir">Låg reservoar</string>
-    <string name="omnipod_alert_unknown_alert">Okänd varning</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Inställning av basalprofil kan ha misslyckats. Leverans kan avbrytas! Vänligen uppdatera pod-status.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Inställning av temp basal kan ha misslyckats. Om det redan var en temp basal igång, kan den ha avbrutits! Vänligen uppdatera pod-status.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Tidsuppdateringen kan ha misslyckats. Leverans kan avbrytas! Vänligen uppdatera pod-status.</string>
-    <string name="omnipod_bolus_failed_uncertain">Det går inte att verifiera om bolusen är slutförd. Verifiera att din pod leverarar bolus eller avsluta bolus.</string>
-    <string name="omnipod_rl_stats">RL-statistik</string>
-    <string name="omnipod_read_pulse_log_short">Pulslogg</string>
     <string name="comapareprofile">Jämför profiler</string>
     <string name="nav_profilehelper">Profilguide</string>
     <string name="motoldefaultprofile">Standardprofil</string>

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

@@ -682,14 +682,4 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <!-- SMS Communicator & OTP Authenticator -->
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
-    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
 </resources>

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

@@ -800,14 +800,4 @@
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">从补丁版的德康APP收到血糖值</string>
     <!-- SMS Communicator & OTP Authenticator -->
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
-    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod Dash -->
-    <!-- Omnipod - Base -->
 </resources>

app/src/main/res/values/strings.xml

@@ -657,6 +657,7 @@
     <string name="missed_bg_readings">Missed BG readings</string>
     <string name="key_raise_notifications_as_android_notifications" translatable="false">raise_urgent_alarms_as_android_notification</string>
     <string name="raise_notifications_as_android_notifications">Use system notifications for alerts and notifications</string>
+    <string name="gradually_increase_notification_volume">Gradually increase the volume for alerts and notifications</string>
     <string name="key_enable_pump_unreachable_alert" translatable="false">enable_pump_unreachable_alert</string>
     <string name="key_enable_missed_bg_readings_alert" translatable="false">enable_missed_bg_readings</string>
     <string name="key_enable_carbs_required_alert_local" translatable="false">enable_carbs_required_alert_local</string>

app/src/main/res/xml/pref_alerts.xml

@@ -47,6 +47,11 @@
             android:key="@string/key_raise_notifications_as_android_notifications"
             android:title="@string/raise_notifications_as_android_notifications" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_gradually_increase_notification_volume"
+            android:title="@string/gradually_increase_notification_volume" />
+
     </PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>

core/src/main/java/info/nightscout/androidaps/data/Profile.java

@@ -544,6 +544,10 @@ public class Profile {
         return getValueToTime(targetLow_v, timeAsSeconds);
     }
 
+    public double getTargetLowMgdlTimeFromMidnight(int timeAsSeconds) {
+        return toMgdl(getTargetLowTimeFromMidnight(timeAsSeconds), units);
+    }
+
     public double getTargetHighMgdl() {
         return toMgdl(getTargetHighTimeFromMidnight(secondsFromMidnight()), units);
     }
@@ -558,6 +562,10 @@ public class Profile {
         return getValueToTime(targetHigh_v, timeAsSeconds);
     }
 
+    public double getTargetHighMgdlTimeFromMidnight(int timeAsSeconds) {
+        return toMgdl(getTargetHighTimeFromMidnight(timeAsSeconds), units);
+    }
+
     public class TargetValue {
         TargetValue(int timeAsSeconds, double low, double high) {
             this.timeAsSeconds = timeAsSeconds;

core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java

@@ -78,6 +78,18 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
 
     public static final String MBG = "Mbg"; // comming from entries
 
+    // found in CareDialog.kt file
+    public static final String FINGER = "Finger";
+    public static final String SENSOR = "Sensor";
+    public static final String MANUAL = "Manual";
+
+    // found in Translator.kt
+    public static final String SNACKBOLUS = "Snack Bolus";
+    public static final String SENSORSTART = "Sensor Start";
+    public static final String TEMPBASALSTART = "Temp Basal Start";
+    public static final String TEMPBASALEND = "Temp Basal End";
+    public static final String TEMPBASALCANCEL = "Temporary Target Cancel";
+
     @Deprecated
     public CareportalEvent() {
         StaticInjector.Companion.getInstance().androidInjector().inject(this);

core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java

@@ -262,7 +262,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
             double dia = profile.getDia();
             double dia_ago = time - dia * 60 * 60 * 1000;
             int aboutFiveMinIntervals = (int) Math.ceil(realDuration / 5d);
-            double tempBolusSpacing = realDuration / aboutFiveMinIntervals;
+            double tempBolusSpacing = (double) (realDuration / aboutFiveMinIntervals);
 
             for (long j = 0L; j < aboutFiveMinIntervals; j++) {
                 // find middle of the interval

core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt

@@ -14,7 +14,9 @@ import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.close.*
@@ -28,6 +30,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var databaseHelper: DatabaseHelperInterface
 
     private var time: Long = 0
@@ -85,7 +88,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
                 profileview_datelayout.visibility = View.VISIBLE
             }
 
-            Mode.CUSTOM_PROFILE  -> {
+            Mode.CUSTOM_PROFILE -> {
                 profile = Profile(injector, JSONObject(customProfileJson), customProfileUnits)
                 profile2 = null
                 profileName = customProfileName
@@ -102,7 +105,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
                 profileview_datelayout.visibility = View.GONE
             }
 
-            Mode.DB_PROFILE      -> {
+            Mode.DB_PROFILE -> {
                 val profileList = databaseHelper.getProfileSwitchData(time, true)
                 profile = if (profileList.isNotEmpty()) profileList[0].profileObject else null
                 profile2 = null
@@ -116,7 +119,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
         if (mode == Mode.PROFILE_COMPARE)
             profile?.let { profile1 ->
                 profile2?.let { profile2 ->
-                    profileview_units.text = profile1.units
+                    profileview_units.text = profileFunction.getUnits()
                     profileview_dia.text = HtmlHelper.fromHtml(formatColors("", profile1.dia, profile1.dia, DecimalFormat("0.00"), resourceHelper.gs(R.string.shorthour)))
                     val profileNames =profileName!!.split("\n").toTypedArray()
                     profileview_activeprofile.text = HtmlHelper.fromHtml(formatColors(profileNames[0], profileNames[1]))
@@ -124,7 +127,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
                     profileview_ic.text = ics(profile1, profile2)
                     profileview_isf.text = isfs(profile1, profile2)
                     profileview_basal.text = basals(profile1, profile2)
-                    profileview_target.text = HtmlHelper.fromHtml(formatColors("", profile1.targetList.replace("\n","<br>") + "<br>", profile2.targetList.replace("\n","<br>"), ""))
+                    profileview_target.text = targets(profile1, profile2)
                     basal_graph.show(profile1, profile2)
                 }
 
@@ -223,23 +226,50 @@ class ProfileViewerDialog : DaggerDialogFragment() {
             prev1 = val1
             prev2 = val2
         }
-        return HtmlHelper.fromHtml(s.toString())
+        return HtmlHelper.fromHtml(s.delete(s.length-4, s.length).toString())
     }
 
     private fun isfs(profile1: Profile, profile2: Profile): Spanned {
         var prev1 = 0.0
         var prev2 = 0.0
+        val units = profileFunction.getUnits()
         val s = StringBuilder()
         for (hour in 0..23) {
-            val val1 = Profile.fromMgdlToUnits(profile1.getIsfMgdlTimeFromMidnight(hour * 60 * 60), profile1.units)
-            val val2 = Profile.fromMgdlToUnits(profile2.getIsfMgdlTimeFromMidnight(hour * 60 * 60), profile1.units)
+            val val1 = Profile.fromMgdlToUnits(profile1.getIsfMgdlTimeFromMidnight(hour * 60 * 60), units)
+            val val2 = Profile.fromMgdlToUnits(profile2.getIsfMgdlTimeFromMidnight(hour * 60 * 60), units)
             if (val1 != prev1 || val2 != prev2) {
-                s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), profile1.units + " " + resourceHelper.gs(R.string.profile_per_unit)))
+                s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), units + " " + resourceHelper.gs(R.string.profile_per_unit)))
                 s.append("<br>")
             }
             prev1 = val1
             prev2 = val2
         }
-        return HtmlHelper.fromHtml(s.toString())
+        return HtmlHelper.fromHtml(s.delete(s.length-4, s.length).toString())
+    }
+
+    private fun targets(profile1: Profile, profile2: Profile):Spanned {
+        var prev1l = 0.0
+        var prev1h = 0.0
+        var prev2l = 0.0
+        var prev2h = 0.0
+        val units = profileFunction.getUnits()
+        val s = StringBuilder()
+        for (hour in 0..23) {
+            val val1l = profile1.getTargetLowMgdlTimeFromMidnight(hour * 60 * 60)
+            val val1h = profile1.getTargetHighMgdlTimeFromMidnight(hour * 60 * 60)
+            val val2l = profile2.getTargetLowMgdlTimeFromMidnight(hour * 60 * 60)
+            val val2h = profile2.getTargetHighMgdlTimeFromMidnight(hour * 60 * 60)
+            val txt1 = Profile.format_HH_MM(hour * 60 * 60) + " " + Profile.toUnitsString(val1l, val1l * Constants.MGDL_TO_MMOLL, units) + " - " + Profile.toUnitsString(val1h, val1h * Constants.MGDL_TO_MMOLL, units) + " " + units
+            val txt2 = Profile.format_HH_MM(hour * 60 * 60) + " " + Profile.toUnitsString(val2l, val2l * Constants.MGDL_TO_MMOLL, units) + " - " + Profile.toUnitsString(val2h, val2h * Constants.MGDL_TO_MMOLL, units) + " " + units
+            if (val1l != prev1l || val1h != prev1h || val2l != prev2l || val2h != prev2h ) {
+                s.append(formatColors(txt1, txt2))
+                s.append("<br>")
+            }
+            prev1l = val1l
+            prev1h = val1h
+            prev2l = val2l
+            prev2h = val2h
+        }
+        return HtmlHelper.fromHtml(s.delete(s.length-4, s.length).toString())
     }
 }

core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java

@@ -264,7 +264,7 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
                         Rect bounds = new Rect();
                         mPaint.getTextBounds(value.getLabel(), 0, value.getLabel().length(), bounds);
                         mPaint.setStyle(Paint.Style.STROKE);
-                        float px = endX + bounds.height() / 2;
+                        float px = endX + bounds.height() / 2.0f;
                         float py = (float) (graphHeight * ratY + bounds.width() + 10);
                         canvas.save();
                         canvas.rotate(-90, px, py);

core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.media.AudioManager
 import android.media.MediaPlayer
+import android.os.Handler
 import android.os.IBinder
 import dagger.android.DaggerService
 import info.nightscout.androidaps.core.R
@@ -11,16 +12,38 @@ import info.nightscout.androidaps.interfaces.NotificationHolderInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
+import kotlin.math.ln
+import kotlin.math.pow
 
 class AlarmSoundService : DaggerService() {
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var notificationHolder: NotificationHolderInterface
+    @Inject lateinit var sp: SP
 
     private var player: MediaPlayer? = null
     private var resourceId = R.raw.error
 
+    companion object {
+        private const val VOLUME_INCREASE_STEPS = 40 // Total number of steps to increase volume with
+        private const val VOLUME_INCREASE_INITIAL_SILENT_TIME_MILLIS = 3_000L // Number of milliseconds that the notification should initially be silent
+        private const val VOLUME_INCREASE_BASE_DELAY_MILLIS = 15_000 // Base delay between volume increments
+        private const val VOLUME_INCREASE_MIN_DELAY_MILLIS = 2_000L // Minimum delay between volume increments
+
+        /*
+         * Delay until the next volumen increment will be the lowest value of VOLUME_INCREASE_MIN_DELAY_MILLIS and
+         * VOLUME_INCREASE_BASE_DELAY_MILLIS - (currentVolumeLevel - 1) ^ VOLUME_INCREASE_DELAY_DECREMENT_EXPONENT * 1000
+         *
+         */
+        private const val VOLUME_INCREASE_DELAY_DECREMENT_EXPONENT = 2.0
+
+    }
+
+    private val increaseVolumeHandler = Handler()
+    private var currentVolumeLevel = 0
+
     override fun onBind(intent: Intent): IBinder? = null
 
     override fun onCreate() {
@@ -41,10 +64,16 @@ class AlarmSoundService : DaggerService() {
             val afd = resourceHelper.openRawResourceFd(resourceId) ?: return START_STICKY
             player?.setDataSource(afd.fileDescriptor, afd.startOffset, afd.length)
             afd.close()
-            player?.isLooping = true // Set looping
-            val manager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
-            if (!manager.isMusicActive) {
-                player?.setVolume(100f, 100f)
+            player?.isLooping = true
+            val audioManager = getAudioManager()
+            if (!audioManager.isMusicActive) {
+                if (sp.getBoolean(R.string.key_gradually_increase_notification_volume, false)) {
+                    currentVolumeLevel = 0
+                    player?.setVolume(0f, 0f)
+                    increaseVolumeHandler.postDelayed(volumeUpdater, VOLUME_INCREASE_INITIAL_SILENT_TIME_MILLIS)
+                } else {
+                    player?.setVolume(1f, 1f)
+                }
             }
             player?.prepare()
             player?.start()
@@ -55,8 +84,35 @@ class AlarmSoundService : DaggerService() {
     }
 
     override fun onDestroy() {
+        increaseVolumeHandler.removeCallbacks(volumeUpdater)
         player?.stop()
         player?.release()
         aapsLogger.debug(LTag.CORE, "onDestroy")
     }
-}
+
+    private fun getAudioManager(): AudioManager {
+        return getSystemService(Context.AUDIO_SERVICE) as AudioManager
+    }
+
+    // TODO replace with VolumeShaper when min API level >= 26
+    private val volumeUpdater = object : Runnable {
+        override fun run() {
+            currentVolumeLevel++;
+
+            val volumePercentage = 100.0.coerceAtMost(currentVolumeLevel / VOLUME_INCREASE_STEPS.toDouble() * 100)
+            val volume = (1 - (ln(1.0.coerceAtLeast(100.0 - volumePercentage)) / ln(100.0))).toFloat()
+
+            aapsLogger.debug(LTag.CORE, "Setting notification volume to {} ({} %)", volume, volumePercentage)
+
+            player?.setVolume(volume, volume)
+
+            if (currentVolumeLevel < VOLUME_INCREASE_STEPS) {
+                // Increase volume faster as time goes by
+                val delay = VOLUME_INCREASE_MIN_DELAY_MILLIS.coerceAtLeast(VOLUME_INCREASE_BASE_DELAY_MILLIS -
+                    ((currentVolumeLevel - 1).toDouble().pow(VOLUME_INCREASE_DELAY_DECREMENT_EXPONENT) * 1000).toLong())
+                aapsLogger.debug(LTag.CORE, "Next notification volume increment in {}ms", delay)
+                increaseVolumeHandler.postDelayed(this, delay)
+            }
+        }
+    }
+}

core/src/main/java/info/nightscout/androidaps/utils/Translator.kt

@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.utils
 
 import info.nightscout.androidaps.core.R
+import info.nightscout.androidaps.db.CareportalEvent
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -15,30 +16,31 @@ class Translator @Inject internal constructor(
 
     fun translate(text: String): String =
         when (text) {
-            "BG Check"                -> resourceHelper.gs(R.string.careportal_bgcheck)
-            "Snack Bolus"             -> resourceHelper.gs(R.string.careportal_snackbolus)
-            "Meal Bolus"              -> resourceHelper.gs(R.string.careportal_mealbolus)
-            "Correction Bolus"        -> resourceHelper.gs(R.string.careportal_correctionbolus)
-            "Carb Correction"         -> resourceHelper.gs(R.string.careportal_carbscorrection)
-            "Combo Bolus"             -> resourceHelper.gs(R.string.careportal_combobolus)
-            "Announcement"            -> resourceHelper.gs(R.string.careportal_announcement)
-            "Note"                    -> resourceHelper.gs(R.string.careportal_note)
-            "Question"                -> resourceHelper.gs(R.string.careportal_question)
-            "Exercise"                -> resourceHelper.gs(R.string.careportal_exercise)
-            "Site Change"             -> resourceHelper.gs(R.string.careportal_pumpsitechange)
-            "Pump Battery Change"     -> resourceHelper.gs(R.string.careportal_pumpbatterychange)
-            "Sensor Start"            -> resourceHelper.gs(R.string.careportal_cgmsensorstart)
-            "Sensor Change"           -> resourceHelper.gs(R.string.careportal_cgmsensorinsert)
-            "Insulin Change"          -> resourceHelper.gs(R.string.careportal_insulincartridgechange)
-            "Temp Basal Start"        -> resourceHelper.gs(R.string.careportal_tempbasalstart)
-            "Temp Basal End"          -> resourceHelper.gs(R.string.careportal_tempbasalend)
-            "Profile Switch"          -> resourceHelper.gs(R.string.careportal_profileswitch)
-            "Temporary Target"        -> resourceHelper.gs(R.string.careportal_temporarytarget)
-            "Temporary Target Cancel" -> resourceHelper.gs(R.string.careportal_temporarytargetcancel)
-            "OpenAPS Offline"         -> resourceHelper.gs(R.string.careportal_openapsoffline)
-            "Finger"                  -> resourceHelper.gs(R.string.glucosetype_finger)
-            "Sensor"                  -> resourceHelper.gs(R.string.glucosetype_sensor)
-            "Manual"                  -> resourceHelper.gs(R.string.manual)
-            else                      -> resourceHelper.gs(R.string.unknown)
+            CareportalEvent.BGCHECK             -> resourceHelper.gs(R.string.careportal_bgcheck)
+            CareportalEvent.SNACKBOLUS          -> resourceHelper.gs(R.string.careportal_snackbolus)
+            CareportalEvent.MEALBOLUS           -> resourceHelper.gs(R.string.careportal_mealbolus)
+            CareportalEvent.CORRECTIONBOLUS     -> resourceHelper.gs(R.string.careportal_correctionbolus)
+            CareportalEvent.CARBCORRECTION      -> resourceHelper.gs(R.string.careportal_carbscorrection)
+            CareportalEvent.COMBOBOLUS          -> resourceHelper.gs(R.string.careportal_combobolus)
+            CareportalEvent.ANNOUNCEMENT        -> resourceHelper.gs(R.string.careportal_announcement)
+            CareportalEvent.NOTE                -> resourceHelper.gs(R.string.careportal_note)
+            CareportalEvent.QUESTION            -> resourceHelper.gs(R.string.careportal_question)
+            CareportalEvent.EXERCISE            -> resourceHelper.gs(R.string.careportal_exercise)
+            CareportalEvent.SITECHANGE          -> resourceHelper.gs(R.string.careportal_pumpsitechange)
+            CareportalEvent.PUMPBATTERYCHANGE   -> resourceHelper.gs(R.string.careportal_pumpbatterychange)
+            CareportalEvent.SENSORSTART         -> resourceHelper.gs(R.string.careportal_cgmsensorstart)
+            CareportalEvent.SENSORCHANGE        -> resourceHelper.gs(R.string.careportal_cgmsensorinsert)
+            CareportalEvent.INSULINCHANGE       -> resourceHelper.gs(R.string.careportal_insulincartridgechange)
+            CareportalEvent.TEMPBASALSTART      -> resourceHelper.gs(R.string.careportal_tempbasalstart)
+            CareportalEvent.TEMPBASALEND        -> resourceHelper.gs(R.string.careportal_tempbasalend)
+            CareportalEvent.PROFILESWITCH       -> resourceHelper.gs(R.string.careportal_profileswitch)
+            CareportalEvent.TEMPORARYTARGET     -> resourceHelper.gs(R.string.careportal_temporarytarget)
+            CareportalEvent.TEMPBASALCANCEL     -> resourceHelper.gs(R.string.careportal_temporarytargetcancel)
+            CareportalEvent.OPENAPSOFFLINE      -> resourceHelper.gs(R.string.careportal_openapsoffline)
+            CareportalEvent.MBG                 -> resourceHelper.gs(R.string.careportal_mbg)
+            CareportalEvent.FINGER              -> resourceHelper.gs(R.string.glucosetype_finger)
+            CareportalEvent.SENSOR              -> resourceHelper.gs(R.string.glucosetype_sensor)
+            CareportalEvent.MANUAL              -> resourceHelper.gs(R.string.manual)
+            else                                -> resourceHelper.gs(R.string.unknown)
         }
 }

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

@@ -5,6 +5,7 @@
     <!--    Dialogs-->
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
     <!--    PumpType-->

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

@@ -101,6 +101,9 @@
     <string name="unit_weeks">седмици</string>
     <string name="shortminute">мин.</string>
     <string name="shortday">д</string>
+    <!--    Protection-->
+    <string name="wrongpassword">Грешна парола</string>
+    <string name="passwords_dont_match">Паролите не съвпадат</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Базалните стойности не са за кръгли часове: %1$s</string>
     <string name="minimalbasalvaluereplaced">Базалната стойност е заместена от минимално поддържаната стойност %1$s</string>

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

@@ -101,6 +101,9 @@
     <string name="unit_weeks">týdnů</string>
     <string name="shortminute">m</string>
     <string name="shortday">d</string>
+    <!--    Protection-->
+    <string name="wrongpassword">Chybné heslo</string>
+    <string name="passwords_dont_match">Hesla se neshodují</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Hodnoty bazálů nejsou zarovnané na celé hodiny: %1$s</string>
     <string name="minimalbasalvaluereplaced">Hodnota bazálu nahrazena minimální možnou: %1$s</string>
@@ -128,6 +131,7 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f U</b> Bol: <b>%3$.2f U</b> Baz: <b>%4$.2f U(%5$.0f%%)</b> Sach.: <b>%6$.0f g</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Kontrola glykémie</string>
+    <string name="careportal_mbg">Ruční glykémie nebo kalibrace</string>
     <string name="careportal_announcement">Oznámení</string>
     <string name="careportal_note">Poznámka</string>
     <string name="careportal_question">Otázka</string>

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

@@ -101,6 +101,9 @@
     <string name="unit_weeks">Wochen</string>
     <string name="shortminute">min</string>
     <string name="shortday">d</string>
+    <!--    Protection-->
+    <string name="wrongpassword">Falsches Passwort</string>
+    <string name="passwords_dont_match">Die Passwörter stimmen nicht überein.</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basalraten beginnen nicht zur vollen Stunde: %1$s</string>
     <string name="minimalbasalvaluereplaced">Basal-Wert wurde durch den kleinst möglichen Wert ersetzt: %1$s</string>
@@ -128,6 +131,7 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f IE</b> Bol: <b>%3$.2f U</b> Bas: <b>%4$.2f IE(%5$.0f%%)</b> KH: <b>%6$.0f g</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">BZ-Test</string>
+    <string name="careportal_mbg">Manuelle BZ oder Kalibrierung</string>
     <string name="careportal_announcement">Ankündigung</string>
     <string name="careportal_note">Notiz</string>
     <string name="careportal_question">Frage</string>

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

@@ -5,6 +5,7 @@
     <!--    Dialogs-->
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
     <!--    PumpType-->

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

@@ -8,15 +8,22 @@
     <string name="profile_set_ok">Perfil basal actualizado en bomba</string>
     <string name="invalidinput">Datos inválidos</string>
     <string name="tempbasaldeliveryerror">Basal Temporal no emitida</string>
+    <string name="goingtodeliver">Entregando %1$.2f U</string>
     <string name="waitingforpump">Esperando bomba</string>
     <string name="connectingfor">Conexión por %1$d s</string>
+    <string name="bolusdelivering">Entregando %1$.2f U</string>
     <string name="handshaking">Estableciendo comunicacion</string>
     <string name="connecting">Conectando</string>
     <string name="connected">Conectado</string>
     <string name="disconnected">Desconectado</string>
     <string name="disconnecting">Desconectando</string>
     <string name="androidaps_start">AndroidAPS iniciado</string>
+    <string name="formatinsulinunits1">%1$.1f U</string>
+    <string name="formatinsulinunits">%1$.2f U</string>
+    <string name="formatsignedinsulinunits">%1$+.2f U</string>
+    <string name="format_carbs">%1$d g</string>
     <string name="reservoirvalue">%1$.0f/%2$dU</string>
+    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="format_hours">%1$.2f h</string>
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Bomba ocupada</string>
@@ -77,6 +84,8 @@
     <string name="location_not_found_title">Ubicación no habilitada</string>
     <string name="location_not_found_message">Para activar la visibilidad Bluetooth en nuevos dispositivos, la ubicación debe estar habilitada. AAPS no hace un seguimiento de su ubicación y se puede desactivar después de realizar la vinculación.</string>
     <!--    DateUtil-->
+    <string name="minago">hace %1$d m</string>
+    <string name="hoursago">hace %1$.1f h</string>
     <string name="shorthour">h</string>
     <string name="days">días</string>
     <string name="hours">horas</string>
@@ -92,6 +101,9 @@
     <string name="unit_weeks">semanas</string>
     <string name="shortminute">m</string>
     <string name="shortday">d</string>
+    <!--    Protection-->
+    <string name="wrongpassword">Contraseña incorrecta</string>
+    <string name="passwords_dont_match">Contraseñas no coinciden</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valores basales no alineados a las horas: %1$s</string>
     <string name="minimalbasalvaluereplaced">Valor basal reemplazado por el valor mínimo soportado: %1$s</string>
@@ -113,9 +125,13 @@
     <!--    ProfileSwitch-->
     <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$d min</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b> Carbs: <b>%6$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Medir glucosa</string>
+    <string name="careportal_mbg">Calibración o BG Manual</string>
     <string name="careportal_announcement">Aviso</string>
     <string name="careportal_note">Nota</string>
     <string name="careportal_question">Pregunta</string>
@@ -153,6 +169,7 @@
     <string name="waitingforpumpresult">Esperando resultado</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%dg Carbohidratos adicionales necesarios dentro De %d minutos</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Estadísticas</string>
     <string name="cumulative_tdd">TDD acumulativa</string>
@@ -169,10 +186,31 @@
     <string name="tbb2">Basal diaria *2</string>
     <!--    Ntp-->
     <string name="timedetection">Detección de tiempo</string>
+    <string name="format_hour_minute">%1$dhoras %2$dmin</string>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operación no soportada por bomba y/o controlador.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Operación no soportada todavía por la bomba.</string>
+    <string name="common_resultok">Ok</string>
     <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Nunca conectados</string>
+    <string name="pump_status_waking_up">En fase de inicio</string>
+    <string name="pump_status_error_comm">Error con la comunicación</string>
+    <string name="pump_status_timeout_comm">Tiempo de espera en la comunicación</string>
+    <string name="pump_status_pump_unreachable">Bomba no alcanzable</string>
+    <string name="pump_status_invalid_config">Configuración no válida</string>
+    <string name="pump_status_active">Activo</string>
+    <string name="pump_status_sleeping">Suspendida</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basales</string>
+    <string name="history_group_configuration">Ajustes</string>
+    <string name="history_group_notification">Notificaciones</string>
+    <string name="history_group_statistic">Estadísticas</string>
+    <string name="history_group_unknown">Desconocido/a</string>
+    <string name="history_group_all">Todos</string>
+    <string name="history_group_bolus">Bolos</string>
+    <string name="history_group_prime">Cebado</string>
+    <string name="history_group_alarm">Alarmas</string>
+    <string name="history_group_glucose">Glucosa</string>
     <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
     <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
     <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->

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

@@ -101,6 +101,9 @@
     <string name="unit_weeks">semaines</string>
     <string name="shortminute">m</string>
     <string name="shortday">j</string>
+    <!--    Protection-->
+    <string name="wrongpassword">Mot de passe incorrect</string>
+    <string name="passwords_dont_match">Mots de passe différents</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valeurs des débits de basal non alignées sur des heures: %1$s</string>
     <string name="minimalbasalvaluereplaced">Valeur de basal remplacée par la valeur minimale autorisée : %1$s</string>
@@ -128,6 +131,7 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑ : <b>%2$.2f U</b> Bol : <b>%3$.2f U</b> Bas : <b>%4$.2f U (%5$.0f%%)</b> Gluc : <b>%6$.0f g</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Contrôle Glycémie</string>
+    <string name="careportal_mbg">Gly manuelle/Calib.</string>
     <string name="careportal_announcement">Notification</string>
     <string name="careportal_note">Remarque</string>
     <string name="careportal_question">Question</string>

core/src/main/res/values-ga-rIE/strings.xml

@@ -5,6 +5,7 @@
     <!--    Dialogs-->
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
     <!--    PumpType-->

core/src/main/res/values-hr-rHR/strings.xml

@@ -5,6 +5,7 @@
     <!--    Dialogs-->
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
     <!--    PumpType-->

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

@@ -101,6 +101,9 @@
     <string name="unit_weeks">settimane</string>
     <string name="shortminute">m</string>
     <string name="shortday">d</string>
+    <!--    Protection-->
+    <string name="wrongpassword">Password errata</string>
+    <string name="passwords_dont_match">Le password non coincidono</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valori basali non allineati alle ore: %1$s</string>
     <string name="minimalbasalvaluereplaced">Valore basale sostituito dal minimo valore supportato: %1$s</string>
@@ -128,6 +131,7 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f U</b> Bol: <b>%3$.2f U</b> Bas: <b>%4$.2f U(%5$.0f%%)</b> CHO: <b>%6$.0f g</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Controllo BG</string>
+    <string name="careportal_mbg">BG manuale o Calibrazione</string>
     <string name="careportal_announcement">Avviso</string>
     <string name="careportal_note">Nota</string>
     <string name="careportal_question">Domanda</string>

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

@@ -5,6 +5,7 @@
     <!--    Dialogs-->
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
     <!--    PumpType-->

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

@@ -5,6 +5,7 @@
     <!--    Dialogs-->
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
     <!--    PumpType-->

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

@@ -8,15 +8,22 @@
     <string name="profile_set_ok">Bazės profilis pompoje atnaujintas</string>
     <string name="invalidinput">Neteisingai įvesti duomenys</string>
     <string name="tempbasaldeliveryerror">Laikinos bazės suleidimo klaida</string>
+    <string name="goingtodeliver">Bus suleista %1$.2f vv</string>
     <string name="waitingforpump">Laukiama ryšio su pompa</string>
     <string name="connectingfor">Jungiamasi %1$d s</string>
+    <string name="bolusdelivering">Leidžiama %1$.2f vv</string>
     <string name="handshaking">Ryšio užmezgimas</string>
     <string name="connecting">Jungiamasi</string>
     <string name="connected">Prisijungta</string>
     <string name="disconnected">Atsijungta</string>
     <string name="disconnecting">Atsijungiama</string>
     <string name="androidaps_start">AndroidAPS paleista</string>
+    <string name="formatinsulinunits1">%1$.1f vv</string>
+    <string name="formatinsulinunits">%1$.2f vv</string>
+    <string name="formatsignedinsulinunits">%1$+.2f vv</string>
+    <string name="format_carbs">%1$dg</string>
     <string name="reservoirvalue">%1$.0f / %2$d vv</string>
+    <string name="pump_basebasalrate">%1$.2f vv/val</string>
     <string name="format_hours">%1$.2f val.</string>
     <string name="format_mins">%1$d min.</string>
     <string name="pumpbusy">Pompa šiuo metu veikia</string>
@@ -77,6 +84,8 @@
     <string name="location_not_found_title">Vietovės nustatymas neįjungtas</string>
     <string name="location_not_found_message">Vietos nustatymo paslauga turi būti įjungta, kad Bluetooth aptikimas veiktų naujesniuose įrenginiuose. AAPS neseka Jūsų lokacijos, o vietos nustatymo paslauga gali būti išjungta po sėkmingo įrenginių suporavimo.</string>
     <!--    DateUtil-->
+    <string name="minago">prieš %1$d min</string>
+    <string name="hoursago">Prieš %1$.1f val.</string>
     <string name="shorthour">val</string>
     <string name="days">d.</string>
     <string name="hours">val.</string>
@@ -92,6 +101,9 @@
     <string name="unit_weeks">savaičių</string>
     <string name="shortminute">min.</string>
     <string name="shortday">d</string>
+    <!--    Protection-->
+    <string name="wrongpassword">Neteisingas slaptažodis</string>
+    <string name="passwords_dont_match">Slaptažodžiai nesutampa</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Bazės reikšmės nesuderintos su valandomis: %1$s</string>
     <string name="minimalbasalvaluereplaced">Valandinė bazė pakeista mažiausia palaikoma verte: %1$s</string>
@@ -113,9 +125,13 @@
     <!--    ProfileSwitch-->
     <string name="zerovalueinprofile">Netinkamas profilis: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$d min.</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f vv</b> Boluso: <b>%3$.2f vv</b> Bazės: <b>%4$.2f vv(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f vv</b> Boluso: <b>%3$.2f vv</b> Bazės: <b>%4$.2f vv(%5$.0f%%)</b> AV: <b>%6$.0f g</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">KG testas</string>
+    <string name="careportal_mbg">KG iš kraujo arba kalibracija</string>
     <string name="careportal_announcement">Pranešimas</string>
     <string name="careportal_note">Pastaba</string>
     <string name="careportal_question">Klausimas</string>
@@ -153,6 +169,7 @@
     <string name="waitingforpumpresult">Laukiama rezultato</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">Būtina suvartoti %d g papildomų AV per %d min</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistika</string>
     <string name="cumulative_tdd">BPD viso</string>

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

@@ -92,6 +92,7 @@
     <string name="unit_weeks">weken</string>
     <string name="shortminute">m</string>
     <string name="shortday">d</string>
+    <!--    Protection-->
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basaalstanden niet ingesteld in hele uren: %1$s</string>
     <string name="minimalbasalvaluereplaced">Basale waarde vervangen door minimaal ondersteunde waarde; %1$s</string>

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

@@ -92,6 +92,7 @@
     <string name="unit_weeks">tygodni</string>
     <string name="shortminute">m</string>
     <string name="shortday">d</string>
+    <!--    Protection-->
     <!--    Profile-->
     <string name="basalprofilenotaligned">Wartości bazy nie są ustawione w pełnych godzinach: %1$s</string>
     <string name="minimalbasalvaluereplaced">Wartość bazy zastąpiona minimalną obsługiwaną wartością: %1$s</string>

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

@@ -90,6 +90,7 @@
     <string name="unit_days">dias</string>
     <string name="unit_weeks">semanas</string>
     <string name="shortminute">m</string>
+    <!--    Protection-->
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
     <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>

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

@@ -8,15 +8,22 @@
     <string name="profile_set_ok">Perfil Basal actualizado na bomba</string>
     <string name="invalidinput">Entrada Inválida</string>
     <string name="tempbasaldeliveryerror">Erro na administração da Basal Temp</string>
+    <string name="goingtodeliver">A ser administrado %1$.2f U</string>
     <string name="waitingforpump">À espera da bomba</string>
     <string name="connectingfor">A ligar durante %1$d s</string>
+    <string name="bolusdelivering">A administrar %1$.2f U</string>
     <string name="handshaking">Cumprimento</string>
     <string name="connecting">A ligar</string>
     <string name="connected">Ligado</string>
     <string name="disconnected">Desligado</string>
     <string name="disconnecting">A desligar</string>
     <string name="androidaps_start">AndroidAPS iniciado</string>
+    <string name="formatinsulinunits1">%1$.1f U</string>
+    <string name="formatinsulinunits">%1$.2f U</string>
+    <string name="formatsignedinsulinunits">%1$+.2f U</string>
+    <string name="format_carbs">%1$d g</string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="format_hours">%1$.2f h</string>
     <string name="format_mins">%1$d mins</string>
     <string name="pumpbusy">A bomba está ocupada</string>
@@ -77,6 +84,8 @@
     <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>
     <!--    DateUtil-->
+    <string name="minago">%1$d m atrás</string>
+    <string name="hoursago">%1$.1f h atrás</string>
     <string name="shorthour">h</string>
     <string name="days">dias</string>
     <string name="hours">horas</string>
@@ -92,6 +101,9 @@
     <string name="unit_weeks">semanas</string>
     <string name="shortminute">m</string>
     <string name="shortday">d</string>
+    <!--    Protection-->
+    <string name="wrongpassword">Palavra-passe incorreta</string>
+    <string name="passwords_dont_match">Palavras-passe não correspondem</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
     <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>
@@ -113,9 +125,13 @@
     <!--    ProfileSwitch-->
     <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$d min</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f U</b> Ból: <b>%3$.2f U</b> Bas: <b>%4$.2f U(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f U</b> Ból: <b>%3$.2f U</b> Bas: <b>%4$.2f U(%5$.0f%%)</b> Hidratos: <b>%6$.0f g</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Verificar Glic</string>
+    <string name="careportal_mbg">Glicemia Manual or Calibração</string>
     <string name="careportal_announcement">Anúncio</string>
     <string name="careportal_note">Nota</string>
     <string name="careportal_question">Questão</string>
@@ -153,6 +169,7 @@
     <string name="waitingforpumpresult">À espera de resultado</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%d g Hidratos Adicionais Necessários Dentro de %d Minutos</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Estatísticas</string>
     <string name="cumulative_tdd">Dose diária acumulativa</string>

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

@@ -92,6 +92,7 @@
     <string name="unit_weeks">săptămâni</string>
     <string name="shortminute">min</string>
     <string name="shortday">z</string>
+    <!--    Protection-->
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valori bazale nesincronizate cu ora: %1$s</string>
     <string name="minimalbasalvaluereplaced">Valoarea bazalei a fost înlocuită cu valoarea minimă posibilă: %1$s</string>

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

@@ -101,6 +101,9 @@
     <string name="unit_weeks">нед</string>
     <string name="shortminute">мин</string>
     <string name="shortday">дн</string>
+    <!--    Protection-->
+    <string name="wrongpassword">Неверный пароль</string>
+    <string name="passwords_dont_match">Пароли не совпадают</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Базальные значения не выровнены по часам: %1$s</string>
     <string name="minimalbasalvaluereplaced">Значение базала заменено минимальной поддерживаемой величиной: %1$s</string>
@@ -128,6 +131,7 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s</b>∑: <b>%2$.2fед</b> Бол: <b>%3$.2fед</b> Баз: <b>%4$.2fед(%5$.0f%%)</b> Угл: <b>%6$.0fг</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Проверка ГК</string>
+    <string name="careportal_mbg">Ввести значение ГК или калибровку</string>
     <string name="careportal_announcement">Оовещение</string>
     <string name="careportal_note">Примечание</string>
     <string name="careportal_question">Вопрос</string>

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

@@ -101,6 +101,9 @@
     <string name="unit_weeks">týždňov</string>
     <string name="shortminute">m</string>
     <string name="shortday">d</string>
+    <!--    Protection-->
+    <string name="wrongpassword">Nesprávne heslo</string>
+    <string name="passwords_dont_match">Heslá sa nezhodujú</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Bazálne hodnoty nie sú zarovnané na celé hodiny: %1$s</string>
     <string name="minimalbasalvaluereplaced">Hodnota bazálu nahradená minimálnou možnou: %1$s</string>
@@ -128,6 +131,7 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f JI</b> Bol: <b>%3$.2f JI</b> Baz: <b>%4$.2f JI(%5$.0f%%)</b> Sach.: <b>%6$.0f g</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Kontrola glykémie</string>
+    <string name="careportal_mbg">Ručné meranie, alebo kalibrácia</string>
     <string name="careportal_announcement">Oznámenie</string>
     <string name="careportal_note">Poznámka</string>
     <string name="careportal_question">Otázka</string>

core/src/main/res/values-sl-rSI/strings.xml

@@ -5,6 +5,7 @@
     <!--    Dialogs-->
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
     <!--    PumpType-->

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

@@ -8,15 +8,22 @@
     <string name="profile_set_ok">Basalprofilen uppdaterad i pumpen</string>
     <string name="invalidinput">Fel på inmatning</string>
     <string name="tempbasaldeliveryerror">Fel vid justering av temp basal</string>
+    <string name="goingtodeliver">Kommer att leverera %1$.2f enheter</string>
     <string name="waitingforpump">Väntar på pump</string>
     <string name="connectingfor">Ansluter (%1$d s)</string>
+    <string name="bolusdelivering">Levererar %1$.2f enheter</string>
     <string name="handshaking">Anslutningen verifieras</string>
     <string name="connecting">Ansluter</string>
     <string name="connected">Ansluten</string>
     <string name="disconnected">Frånkopplad</string>
     <string name="disconnecting">Kopplar från</string>
     <string name="androidaps_start">AndroidAPS startad</string>
+    <string name="formatinsulinunits1">%1$.1f U</string>
+    <string name="formatinsulinunits">%1$.2f U</string>
+    <string name="formatsignedinsulinunits">%1$+.2f U</string>
+    <string name="format_carbs">%1$dg</string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="format_hours">%1$.2f h</string>
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pump upptagen</string>
@@ -77,6 +84,8 @@
     <string name="location_not_found_title">Platsdata är inte aktiverat</string>
     <string name="location_not_found_message">För att Bluetooth ska fungera med nyare enheter, måste platsdata vara aktiverat. AAPS sparar inte din plats och det kan stängas av efter att enheten har parkopplats.</string>
     <!--    DateUtil-->
+    <string name="minago">%1$dm sedan</string>
+    <string name="hoursago">%1$.1f tim sedan</string>
     <string name="shorthour">h</string>
     <string name="days">dagar</string>
     <string name="hours">timmar</string>
@@ -92,6 +101,9 @@
     <string name="unit_weeks">veckor</string>
     <string name="shortminute">m</string>
     <string name="shortday">d</string>
+    <!--    Protection-->
+    <string name="wrongpassword">Fel lösenord</string>
+    <string name="passwords_dont_match">Lösenorden stämmer inte överens</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Profilens basaler är inte satta på hel timme: %1$s</string>
     <string name="minimalbasalvaluereplaced">Basalvärdet ersatt med det lägsta tillåtna: %1$s</string>
@@ -113,9 +125,13 @@
     <!--    ProfileSwitch-->
     <string name="zerovalueinprofile">Ogiltig profil: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$d min</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b> KH: <b>%6$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">BG-kontroll</string>
+    <string name="careportal_mbg">Manuellt BG eller kalibrering</string>
     <string name="careportal_announcement">Meddelande</string>
     <string name="careportal_note">Anteckning</string>
     <string name="careportal_question">Fråga</string>
@@ -153,6 +169,7 @@
     <string name="waitingforpumpresult">Väntar på resultat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%dg KH behövs inom %d minuter</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Kumulativ TDD</string>

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

@@ -5,6 +5,7 @@
     <!--    Dialogs-->
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
     <!--    PumpType-->

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

@@ -5,6 +5,7 @@
     <!--    Dialogs-->
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
     <!--    PumpType-->

core/src/main/res/values/strings.xml

@@ -25,6 +25,8 @@
     <string name="key_btwatchdog_lastbark" translatable="false">bt_watchdog_last</string>
     <string name="key_pump_unreachable_threshold_minutes" translatable="false">pump_unreachable_threshold</string>
     <string name="key_missed_bg_readings_threshold_minutes" translatable="false">missed_bg_readings_threshold</string>
+    <string name="key_gradually_increase_notification_volume" translatable="false">gradually_increase_notification_volume</string>
+    <string name="pairing">Pairing</string>
 
     <!--    General-->
     <string name="error">Error</string>
@@ -170,6 +172,7 @@
 
     <!--    Translator-->
     <string name="careportal_bgcheck">BG Check</string>
+    <string name="careportal_mbg">Manual BG or Calibration</string>
     <string name="careportal_announcement">Announcement</string>
     <string name="careportal_note">Note</string>
     <string name="careportal_question">Question</string>
@@ -283,5 +286,4 @@
     <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 
 
-
 </resources>

dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt

@@ -27,6 +27,7 @@ import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.WarnColors
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.extensions.toVisibility
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -35,6 +36,7 @@ import kotlinx.android.synthetic.main.danar_fragment.*
 import javax.inject.Inject
 
 class DanaFragment : DaggerFragment() {
+
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var fabricPrivacy: FabricPrivacy
@@ -95,6 +97,7 @@ class DanaFragment : DaggerFragment() {
             danar_btconnection.setOnLongClickListener {
                 activity?.let {
                     OKDialog.showConfirmation(it, resourceHelper.gs(R.string.resetpairing), Runnable {
+                        aapsLogger.error("USER ENTRY: Clearing pairing keys !!!")
                         (activePlugin.activePump as DanaPumpInterface).clearPairing()
                     })
                 }
@@ -212,9 +215,6 @@ class DanaFragment : DaggerFragment() {
         }
         //hide user options button if not an RS pump or old firmware
         // also excludes pump with model 03 because of untested error
-        val isKorean = activePlugin.activePump.pumpDescription.pumpType == PumpType.DanaRKorean
-        if (isKorean || pump.hwModel == 0 || pump.hwModel == 3) {
-            danar_user_options?.visibility = View.GONE
-        }
+        danar_user_options?.visibility = (pump.hwModel != 1 && pump.protocol != 0x00).toVisibility()
     }
 }

dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt

@@ -159,8 +159,8 @@ class DanaPump @Inject constructor(
     var v3RSPump = false;
 
     // User settings
-    var timeDisplayType = 0
-    var buttonScrollOnOff = 0
+    var timeDisplayType24 = false
+    var buttonScrollOnOff = false
     var beepAndAlarm = 0
     var lcdOnTimeSec = 0
     var backlightOnTimeSec = 0

dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt

@@ -28,6 +28,7 @@ import kotlin.math.max
 import kotlin.math.min
 
 class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
+
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
@@ -71,9 +72,9 @@ class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
 
         aapsLogger.debug(LTag.PUMP,
             "UserOptionsLoaded:" + (System.currentTimeMillis() - danaPump.lastConnection) / 1000 + " s ago"
-                + "\ntimeDisplayType:" + danaPump.timeDisplayType
+                + "\ntimeDisplayType24:" + danaPump.timeDisplayType24
                 + "\nbuttonScroll:" + danaPump.buttonScrollOnOff
-                + "\ntimeDisplayType:" + danaPump.timeDisplayType
+                + "\nbeepAndAlarm:" + danaPump.beepAndAlarm
                 + "\nlcdOnTimeSec:" + danaPump.lcdOnTimeSec
                 + "\nbackLight:" + danaPump.backlightOnTimeSec
                 + "\npumpUnits:" + danaPump.units
@@ -84,33 +85,35 @@ class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
         danar_shutdown.setParams(danaPump.shutdownHour.toDouble(), 0.0, 24.0, 1.0, DecimalFormat("1"), true, save_user_options)
         danar_lowreservoir.setParams(danaPump.lowReservoirRate.toDouble(), 10.0, 50.0, 10.0, DecimalFormat("10"), false, save_user_options)
         when (danaPump.beepAndAlarm) {
-            0x01  -> danar_pumpalarm_sound.isChecked = true
-            0x02  -> danar_pumpalarm_vibrate.isChecked = true
-            0x11  -> danar_pumpalarm_both.isChecked = true
+            0b01 -> danar_pumpalarm_sound.isChecked = true
+            0b10 -> danar_pumpalarm_vibrate.isChecked = true
+            0b11 -> danar_pumpalarm_both.isChecked = true
 
-            0x101 -> {
+            0b101 -> {
                 danar_pumpalarm_sound.isChecked = true
                 danar_beep.isChecked = true
             }
 
-            0x110 -> {
+            0b110 -> {
                 danar_pumpalarm_vibrate.isChecked = true
                 danar_beep.isChecked = true
             }
 
-            0x111 -> {
+            0b111 -> {
                 danar_pumpalarm_both.isChecked = true
                 danar_beep.isChecked = true
             }
         }
-        if (danaPump.lastSettingsRead == 0L)
-            aapsLogger.error(LTag.PUMP, "No settings loaded from pump!") else setData()
+        if (danaPump.lastSettingsRead == 0L && danaPump.hwModel < 0x05) // RS+ doesn't use lastSettingsRead
+            aapsLogger.error(LTag.PUMP, "No settings loaded from pump!")
+        else
+            setData()
     }
 
     fun setData() {
         // in DanaRS timeDisplay values are reversed
-        danar_timeformat.isChecked = !isRS() && danaPump.timeDisplayType != 0 || isRS() && danaPump.timeDisplayType == 0
-        danar_buttonscroll.isChecked = danaPump.buttonScrollOnOff != 0
+        danar_timeformat.isChecked = danaPump.timeDisplayType24
+        danar_buttonscroll.isChecked = danaPump.buttonScrollOnOff
         danar_beep.isChecked = danaPump.beepAndAlarm > 4
         danar_screentimeout.value = danaPump.lcdOnTimeSec.toDouble()
         danar_backlight.value = danaPump.backlightOnTimeSec.toDouble()
@@ -123,12 +126,9 @@ class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
         //exit if pump is not DanaRS, DanaR, or DanaR with upgraded firmware
         if (!isRS() && !isDanaR() && !isDanaRv2()) return
 
-        if (isRS()) // displayTime on RS is reversed
-            danaPump.timeDisplayType = if (danar_timeformat.isChecked) 0 else 1
-        else
-            danaPump.timeDisplayType = if (danar_timeformat.isChecked) 1 else 0
+        danaPump.timeDisplayType24 = danar_timeformat.isChecked
 
-        danaPump.buttonScrollOnOff = if (danar_buttonscroll.isChecked) 1 else 0
+        danaPump.buttonScrollOnOff = danar_buttonscroll.isChecked
         danaPump.beepAndAlarm = when {
             danar_pumpalarm_sound.isChecked   -> 1
             danar_pumpalarm_vibrate.isChecked -> 2

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Обновява базални стойности</string>
     <string name="settingtempbasal">Настройва временен базал</string>
     <string name="waitingfortimesynchronization">Изчаква синхронизация на времето (%1$d сек)</string>
-    <string name="wrongpassword">Грешна парола</string>
     <string name="wrongpumppassword">Грешна парола за помпата!</string>
     <string name="danar_history_alarm">Аларми</string>
     <string name="danar_history_basalhours">Базален по часове</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Aktualizuji bazály</string>
     <string name="settingtempbasal">Nastavuji dočasný bazál</string>
     <string name="waitingfortimesynchronization">Čekání na synchronizaci času (%1$d s)</string>
-    <string name="wrongpassword">Chybné heslo</string>
     <string name="wrongpumppassword">Špatné heslo k pumpě!</string>
     <string name="danar_history_alarm">Alarmy</string>
     <string name="danar_history_basalhours">Hodinové bazály</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Basal-Profil wird aktualisiert</string>
     <string name="settingtempbasal">TBR wird gesetzt</string>
     <string name="waitingfortimesynchronization">Warte auf Zeitsynchronisierung (%1$d Sek.)</string>
-    <string name="wrongpassword">Falsches Passwort</string>
     <string name="wrongpumppassword">Falsches Pumpen-Passwort!</string>
     <string name="danar_history_alarm">Alarme</string>
     <string name="danar_history_basalhours">Basal-Stunden</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Actualizando dosis basales</string>
     <string name="settingtempbasal">Ajustando basal temporal</string>
     <string name="waitingfortimesynchronization">Esperando para sincronización (%1$d sec)</string>
-    <string name="wrongpassword">Contraseña incorrecta</string>
     <string name="wrongpumppassword">¡Contraseña de la bomba incorrecta!</string>
     <string name="danar_history_alarm">Alarmas</string>
     <string name="danar_history_basalhours">Basal Horas</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Mise à jour des débits basal</string>
     <string name="settingtempbasal">Définir basal temp</string>
     <string name="waitingfortimesynchronization">Attente de synchronisation de l\'heure (%1$d sec)</string>
-    <string name="wrongpassword">Mot de passe incorrect</string>
     <string name="wrongpumppassword">Mot de passe pompe incorrect !</string>
     <string name="danar_history_alarm">Alarmes</string>
     <string name="danar_history_basalhours">Heures Basal</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Aggiornamento velocità basali</string>
     <string name="settingtempbasal">Impostazione basale temporanea</string>
     <string name="waitingfortimesynchronization">In attesa della sincronizzazione dell\'ora (%1$d sec)</string>
-    <string name="wrongpassword">Password errata</string>
     <string name="wrongpumppassword">Password micro errata!</string>
     <string name="danar_history_alarm">Allarmi</string>
     <string name="danar_history_basalhours">Ore basali</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Bazė naujinama</string>
     <string name="settingtempbasal">Laikinos bazės nustatymas</string>
     <string name="waitingfortimesynchronization">Laukiama laiko sinchronizavimo (%1$d sek.)</string>
-    <string name="wrongpassword">Neteisingas slaptažodis</string>
     <string name="wrongpumppassword">Neteisingas pompos slaptažodis!</string>
     <string name="danar_history_alarm">Aliarmai</string>
     <string name="danar_history_basalhours">Valandinė bazė</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Bijwerken basaal profiel</string>
     <string name="settingtempbasal">Instellen tijdelijk basaal</string>
     <string name="waitingfortimesynchronization">Wachten op tijdsynchronisatie (%1$d sec)</string>
-    <string name="wrongpassword">Verkeerd wachtwoord</string>
     <string name="wrongpumppassword">Verkeerd pomp wachtwoord!</string>
     <string name="danar_history_alarm">Alarmen</string>
     <string name="danar_history_basalhours">Basale uren</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Uaktualnianie dawek bazowych</string>
     <string name="settingtempbasal">Ustawianie bazy tymczasowej</string>
     <string name="waitingfortimesynchronization">Oczekiwanie na synchronizację czasu (%1$d sec)</string>
-    <string name="wrongpassword">Złe hasło</string>
     <string name="wrongpumppassword">Błędne hasło pompy!</string>
     <string name="danar_history_alarm">Alarmy</string>
     <string name="danar_history_basalhours">Godziny Bazy</string>

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

@@ -46,7 +46,6 @@
     <string name="updatingbasalrates">Atualizar valores das basais</string>
     <string name="settingtempbasal">Definindo basal temp</string>
     <string name="waitingfortimesynchronization">À espera da sincronização da hora (%1$d sec)</string>
-    <string name="wrongpassword">Senha incorrecta</string>
     <string name="wrongpumppassword">Senha da bomba incorrecta!</string>
     <string name="danar_history_alarm">Alarmes</string>
     <string name="danar_history_basalhours">Horas de Basal</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">A actualizar taxas das basais</string>
     <string name="settingtempbasal">Definindo basal temp</string>
     <string name="waitingfortimesynchronization">À espera da sincronização da hora (%1$d sec)</string>
-    <string name="wrongpassword">Senha incorrecta</string>
     <string name="wrongpumppassword">Senha da bomba incorrecta!</string>
     <string name="danar_history_alarm">Alarmes</string>
     <string name="danar_history_basalhours">Horas de Basal</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Se actualizează ratele bazale</string>
     <string name="settingtempbasal">Se setează bazala temporară</string>
     <string name="waitingfortimesynchronization">Se așteaptă o sincronizare a timpului (%1$d s)</string>
-    <string name="wrongpassword">Parolă greșită</string>
     <string name="wrongpumppassword">Parola pompei greșită!</string>
     <string name="danar_history_alarm">Alarme</string>
     <string name="danar_history_basalhours">Ore bazale</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">обновление значений базала</string>
     <string name="settingtempbasal">установка врем базала</string>
     <string name="waitingfortimesynchronization">Ожидание синхронизации времени (%1$d сек)</string>
-    <string name="wrongpassword">неверный пароль</string>
     <string name="wrongpumppassword">неверный пароль помпы</string>
     <string name="danar_history_alarm">оповещения об опасности</string>
     <string name="danar_history_basalhours">почасовые базалы</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Aktualizujem bazály</string>
     <string name="settingtempbasal">Nastavujem dočasný bazál</string>
     <string name="waitingfortimesynchronization">Čakanie na synchronizáciu času (%1$d s)</string>
-    <string name="wrongpassword">Nesprávne heslo</string>
     <string name="wrongpumppassword">Nesprávne heslo do pumpy!</string>
     <string name="danar_history_alarm">Alarmy</string>
     <string name="danar_history_basalhours">Hodinové bazály</string>

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

@@ -54,7 +54,6 @@
     <string name="updatingbasalrates">Uppdaterar basaldoser</string>
     <string name="settingtempbasal">Ställer in temp basal</string>
     <string name="waitingfortimesynchronization">Väntar på tidssynkronisering (%1$d sek)</string>
-    <string name="wrongpassword">Fel lösenord</string>
     <string name="wrongpumppassword">Fel lösenord för pump</string>
     <string name="danar_history_alarm">Larm</string>
     <string name="danar_history_basalhours">Basaltimmar</string>

danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt

@@ -13,8 +13,8 @@ class MsgSetUserOptions(
             // No options set -> Exiting
             aapsLogger.debug(LTag.PUMPCOMM, "NO USER OPTIONS LOADED EXITING!")
         } else {
-            danaPump.userOptionsFrompump!![0] = (if (danaPump.timeDisplayType == 1) 0 else 1).toByte()
-            danaPump.userOptionsFrompump!![1] = danaPump.buttonScrollOnOff.toByte()
+            danaPump.userOptionsFrompump!![0] = if( danaPump.timeDisplayType24) 0.toByte() else 1.toByte()
+            danaPump.userOptionsFrompump!![1] = if (danaPump.buttonScrollOnOff) 1.toByte() else 0.toByte()
             danaPump.userOptionsFrompump!![2] = danaPump.beepAndAlarm.toByte()
             danaPump.userOptionsFrompump!![3] = danaPump.lcdOnTimeSec.toByte()
             danaPump.userOptionsFrompump!![4] = danaPump.backlightOnTimeSec.toByte()

danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt

@@ -20,22 +20,22 @@ class MsgSettingUserOptions(
         for (pos in bytes.indices) {
             aapsLogger.debug(LTag.PUMPCOMM, "[" + pos + "]" + bytes[pos])
         }
-        danaPump.timeDisplayType = if (bytes[0] == 1.toByte()) 0 else 1 // 1 -> 24h 0 -> 12h
-        danaPump.buttonScrollOnOff = if (bytes[1] == 1.toByte()) 1 else 0 // 1 -> ON, 0-> OFF
+        danaPump.timeDisplayType24 = bytes[0].toInt() == 0 // 0 -> 24h 1 -> 12h
+        danaPump.buttonScrollOnOff = bytes[1] == 1.toByte() // 1 -> ON, 0-> OFF
         danaPump.beepAndAlarm = bytes[2].toInt() // 1 -> Sound on alarm 2-> Vibrate on alarm 3-> Both on alarm 5-> Sound + beep 6-> vibrate + beep 7-> both + beep Beep adds 4
-        danaPump.lcdOnTimeSec = bytes[3].toInt() and 255
-        danaPump.backlightOnTimeSec = bytes[4].toInt() and 255
+        danaPump.lcdOnTimeSec = bytes[3].toInt()
+        danaPump.backlightOnTimeSec = bytes[4].toInt()
         danaPump.selectedLanguage = bytes[5].toInt() // on DanaRv2 is that needed ?
         danaPump.units = bytes[8].toInt()
         danaPump.shutdownHour = bytes[9].toInt()
-        danaPump.lowReservoirRate = bytes[32].toInt() and 255
+        danaPump.lowReservoirRate = bytes[32].toInt()
         /* int selectableLanguage1 = bytes[10];
         int selectableLanguage2 = bytes[11];
         int selectableLanguage3 = bytes[12];
         int selectableLanguage4 = bytes[13];
         int selectableLanguage5 = bytes[14];
         */
-        aapsLogger.debug(LTag.PUMPCOMM, "timeDisplayType: " + danaPump.timeDisplayType)
+        aapsLogger.debug(LTag.PUMPCOMM, "timeDisplayType24: " + danaPump.timeDisplayType24)
         aapsLogger.debug(LTag.PUMPCOMM, "Button scroll: " + danaPump.buttonScrollOnOff)
         aapsLogger.debug(LTag.PUMPCOMM, "BeepAndAlarm: " + danaPump.beepAndAlarm)
         aapsLogger.debug(LTag.PUMPCOMM, "screen timeout: " + danaPump.lcdOnTimeSec)

danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt

@@ -20,10 +20,10 @@ class DanaRS_Packet_Option_Get_User_Option(
     override fun handleMessage(data: ByteArray) {
         var dataIndex = DATA_START
         var dataSize = 1
-        danaPump.timeDisplayType = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.timeDisplayType24 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0
         dataIndex += dataSize
         dataSize = 1
-        danaPump.buttonScrollOnOff = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.buttonScrollOnOff = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 1
         dataIndex += dataSize
         dataSize = 1
         danaPump.beepAndAlarm = byteArrayToInt(getBytes(data, dataIndex, dataSize))
@@ -68,7 +68,7 @@ class DanaRS_Packet_Option_Get_User_Option(
         val selectableLanguage5 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         // Pump's screen on time can't be less than 5
         failed = if (danaPump.lcdOnTimeSec < 5) true else false
-        aapsLogger.debug(LTag.PUMPCOMM, "timeDisplayType: " + danaPump.timeDisplayType)
+        aapsLogger.debug(LTag.PUMPCOMM, "timeDisplayType24: " + danaPump.timeDisplayType24)
         aapsLogger.debug(LTag.PUMPCOMM, "buttonScrollOnOff: " + danaPump.buttonScrollOnOff)
         aapsLogger.debug(LTag.PUMPCOMM, "beepAndAlarm: " + danaPump.beepAndAlarm)
         aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec: " + danaPump.lcdOnTimeSec)

danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt

@@ -20,16 +20,16 @@ class DanaRS_Packet_Option_Set_User_Option(
     override fun getRequestParams(): ByteArray {
         aapsLogger.debug(LTag.PUMPCOMM,
             "UserOptions:" + (System.currentTimeMillis() - danaPump.lastConnection) / 1000 + " s ago"
-                + "\ntimeDisplayType:" + danaPump.timeDisplayType
+                + "\ntimeDisplayType24:" + danaPump.timeDisplayType24
                 + "\nbuttonScroll:" + danaPump.buttonScrollOnOff
-                + "\ntimeDisplayType:" + danaPump.timeDisplayType
+                + "\nbeepAndAlarm:" + danaPump.beepAndAlarm
                 + "\nlcdOnTimeSec:" + danaPump.lcdOnTimeSec
                 + "\nbacklight:" + danaPump.backlightOnTimeSec
                 + "\ndanaRPumpUnits:" + danaPump.units
                 + "\nlowReservoir:" + danaPump.lowReservoirRate)
         val request = ByteArray(13)
-        request[0] = (danaPump.timeDisplayType and 0xff).toByte()
-        request[1] = (danaPump.buttonScrollOnOff and 0xff).toByte()
+        request[0] = if (danaPump.timeDisplayType24) 0.toByte() else 1.toByte()
+        request[1] = if (danaPump.buttonScrollOnOff) 1.toByte() else 0.toByte()
         request[2] = (danaPump.beepAndAlarm and 0xff).toByte()
         request[3] = (danaPump.lcdOnTimeSec and 0xff).toByte()
         request[4] = (danaPump.backlightOnTimeSec and 0xff).toByte()

danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt

@@ -51,6 +51,7 @@ class BLEComm @Inject internal constructor(
 ) {
 
     companion object {
+
         private const val WRITE_DELAY_MILLIS: Long = 50
         private const val UART_READ_UUID = "0000fff1-0000-1000-8000-00805f9b34fb"
         private const val UART_WRITE_UUID = "0000fff2-0000-1000-8000-00805f9b34fb"
@@ -375,22 +376,22 @@ class BLEComm @Inject internal constructor(
                     if (decryptedBuffer[0] == BleEncryption.DANAR_PACKET__TYPE_ENCRYPTION_RESPONSE.toByte()) {
                         when (decryptedBuffer[1]) {
                             // 1st packet exchange
-                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK.toByte()         ->
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK.toByte() ->
                                 processConnectResponse(decryptedBuffer)
 
-                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION.toByte()   ->
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION.toByte() ->
                                 processEncryptionResponse(decryptedBuffer)
 
-                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY.toByte()      ->
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY.toByte() ->
                                 processPasskeyCheck(decryptedBuffer)
 
-                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST.toByte()    ->
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST.toByte() ->
                                 processPairingRequest(decryptedBuffer)
 
-                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_RETURN.toByte()     ->
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_RETURN.toByte() ->
                                 processPairingRequest2(decryptedBuffer)
 
-                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_PUMP_CHECK.toByte()     -> {
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_PUMP_CHECK.toByte() -> {
                                 // not easy mode, request time info
                                 if (decryptedBuffer[2] == 0x05.toByte()) sendTimeInfo()
                                 // easy mode
@@ -453,32 +454,19 @@ class BLEComm @Inject internal constructor(
             // v3 2nd layer encryption
             v3Encryption = true
             danaPump.v3RSPump = true
-            val model = decryptedBuffer[5]
-            // val protocol = decryptedBuffer[7]
-            if (model == 0x05.toByte()) {
+            danaPump.hwModel = decryptedBuffer[5].toInt()
+            danaPump.protocol = decryptedBuffer[7].toInt()
+            // grab randomSyncKey
+            sp.putString(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName, String.format("%02x", decryptedBuffer[decryptedBuffer.size - 1]))
+
+            if (danaPump.hwModel == 0x05) {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
                 // Dana RS Pump
-                val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
-                val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
-                if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
-                    val randomSyncKey = String.format("%02x", decryptedBuffer[decryptedBuffer.size - 1])
-                    sp.putString(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName, randomSyncKey)
-                    val tPairingKey = Base64.decode(pairingKey, Base64.DEFAULT)
-                    val tRandomPairingKey = Base64.decode(randomPairingKey, Base64.DEFAULT)
-                    var tRandomSyncKey: Byte = 0
-                    if (randomSyncKey.isNotEmpty()) {
-                        tRandomSyncKey = randomSyncKey.toInt(16).toByte()
-                    }
-                    bleEncryption.setPairingKeys(tPairingKey, tRandomPairingKey, tRandomSyncKey)
-                    sendV3PairingInformation(0)
-                } else {
-                    sendV3PairingInformation(1)
-                }
-            } else if (model == 0x06.toByte()) {
+                sendV3PairingInformation()
+            } else if (danaPump.hwModel == 0x06) {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 EASY (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
                 // Dana RS Easy
-                val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK, null, null)
-                writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+                sendEasyMenuCheck()
             }
             // response PUMP : error status
         } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'P'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'M'.toByte() && decryptedBuffer[5] == 'P'.toByte()) {
@@ -523,6 +511,24 @@ class BLEComm @Inject internal constructor(
 
     // 2nd packet v3
     // 0x00 Start encryption, 0x01 Request pairing
+    private fun sendV3PairingInformation() {
+        val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
+        val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
+        if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
+            val tPairingKey = Base64.decode(pairingKey, Base64.DEFAULT)
+            val tRandomPairingKey = Base64.decode(randomPairingKey, Base64.DEFAULT)
+            var tRandomSyncKey: Byte = 0
+            val randomSyncKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName, "")
+            if (randomSyncKey.isNotEmpty()) {
+                tRandomSyncKey = randomSyncKey.toInt(16).toByte()
+            }
+            bleEncryption.setPairingKeys(tPairingKey, tRandomPairingKey, tRandomSyncKey)
+            sendV3PairingInformation(0)
+        } else {
+            sendV3PairingInformation(1)
+        }
+    }
+
     private fun sendV3PairingInformation(requestNewPairing: Int) {
         val params = byteArrayOf(requestNewPairing.toByte())
         val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, params, null)
@@ -635,7 +641,7 @@ class BLEComm @Inject internal constructor(
         isUnitUD = decryptedBuffer[3] == 0x01.toByte()
 
         // request time information
-        if (v3Encryption) sendV3PairingInformation(1)
+        if (v3Encryption) sendV3PairingInformation()
         else sendTimeInfo()
     }