diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5eb4ec2ce1..5cea17beda 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ version: 2.1
 
 # Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
 orbs:
-  android: circleci/android@1.0.3
+  android: circleci/android@2.3.0
   codecov: codecov/codecov@3.2.4
 
 jobs:
@@ -13,11 +13,14 @@ jobs:
     # These next lines define the Android machine image executor: https://circleci.com/docs/2.0/executor-types/
     executor:
       name: android/android-machine
+      resource-class: large
+      tag: 2023.07.1
 
     steps:
       # Checkout the code as the first step.
       - checkout
-
+      - android/change-java-version:
+          java-version: 17
       # The next step will run the unit tests
       - android/run-tests:
           test-command: ./gradlew testFullDebugUnitTest
diff --git a/app-wear-shared/shared-impl/build.gradle b/app-wear-shared/shared-impl/build.gradle
index 38c49c32a2..871817f1a4 100644
--- a/app-wear-shared/shared-impl/build.gradle
+++ b/app-wear-shared/shared-impl/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
     id 'kotlinx-serialization'
 }
 
diff --git a/app-wear-shared/shared/build.gradle b/app-wear-shared/shared/build.gradle
index e277f8b1c4..5e24d768e0 100644
--- a/app-wear-shared/shared/build.gradle
+++ b/app-wear-shared/shared/build.gradle
@@ -4,7 +4,6 @@ plugins {
     id 'kotlin-kapt'
     id 'kotlinx-serialization'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/app/build.gradle b/app/build.gradle
index ffeaedfd37..1475b5e654 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
     id 'kotlinx-serialization'
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
index 83b3813f61..4bf1faae41 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
@@ -363,7 +363,8 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
                     menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
                     menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal] ||
                     menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
-                    menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
+                    menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] ||
+                    menuChartSettings[g + 1][OverviewMenus.CharType.HR.ordinal]
                 ).toVisibility()
             secondaryGraphsData[g].performUpdate()
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt
index 29e9207399..39e461b388 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt
@@ -191,7 +191,10 @@ class KeepAliveWorker(
         }
         if (loop.isDisconnected) {
             // do nothing if pump is disconnected
-        } else if (runningProfile == null || ((!pump.isThisProfileSet(requestedProfile) || !requestedProfile.isEqual(runningProfile) || (runningProfile is ProfileSealed.EPS && runningProfile.value.originalEnd < dateUtil.now())) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE))) {
+        } else if (runningProfile == null || ((!pump.isThisProfileSet(requestedProfile) || !requestedProfile.isEqual(runningProfile)
+                || (runningProfile is ProfileSealed.EPS && runningProfile.value.originalEnd < dateUtil.now() && runningProfile.value.originalDuration != 0L))
+                && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)))
+        {
             rxBus.send(EventProfileSwitchChanged())
         } else if (isStatusOutdated && !pump.isBusy()) {
             lastReadStatus = now
diff --git a/build.gradle b/build.gradle
index 68d70c3ac3..1806fa7253 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
         guava_version = '32.0.1-jre'
         jodatime_version = '2.10.14'
         work_version = '2.8.1'
-        tink_version = '1.9.0'
+        tink_version = '1.10.0'
         json_version = '20220320'
         joda_version = '2.12.5'
         swipe_version = '1.1.0'
@@ -55,10 +55,9 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7'
 
@@ -68,7 +67,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.hiya:jacoco-android:0.2'
+        classpath "org.jacoco:org.jacoco.core:0.8.10"
         classpath "com.vanniktech:gradle-dependency-graph-generator-plugin:0.8.0"
     }
 }
@@ -77,6 +76,7 @@ plugins {
     // Test Gradle build, keep disabled under normal circumstances
     // id "com.osacky.doctor" version "0.8.1"
     id "org.jlleitschuh.gradle.ktlint" version "11.5.0"
+    // Aggregates and/or logs Jacoco test coverage to the Gradle build log
     id 'org.barfuin.gradle.jacocolog' version '3.1.0'
     id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
 }
@@ -104,8 +104,10 @@ allprojects {
     }
 
     apply plugin: 'org.jlleitschuh.gradle.ktlint'
+    apply plugin: 'jacoco'
 }
 
+// Setup all al reports aggregation
 apply from: 'jacoco_project.gradle'
 
 task clean(type: Delete) {
diff --git a/core/graph/build.gradle b/core/graph/build.gradle
index 2f273be767..52672807b8 100644
--- a/core/graph/build.gradle
+++ b/core/graph/build.gradle
@@ -4,7 +4,6 @@ plugins {
     id 'kotlin-kapt'
     id 'kotlin-parcelize'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/core/interfaces/build.gradle b/core/interfaces/build.gradle
index 129ae7e8d6..ba4be205c3 100644
--- a/core/interfaces/build.gradle
+++ b/core/interfaces/build.gradle
@@ -5,7 +5,6 @@ plugins {
     id 'kotlin-allopen'
     id 'kotlin-parcelize'
     id 'kotlinx-serialization'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/core/main/android_dependencies.gradle b/core/main/android_dependencies.gradle
index 1153c40bfd..4250b6d567 100644
--- a/core/main/android_dependencies.gradle
+++ b/core/main/android_dependencies.gradle
@@ -16,9 +16,6 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-        debug {
-            testCoverageEnabled(project.hasProperty('coverage'))
-        }
     }
 
     sourceSets {
diff --git a/core/main/build.gradle b/core/main/build.gradle
index 5a53aeae96..b51d0f545d 100644
--- a/core/main/build.gradle
+++ b/core/main/build.gradle
@@ -4,7 +4,6 @@ plugins {
     id 'kotlin-kapt'
     id 'kotlin-parcelize'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/core/main/jacoco_global.gradle b/core/main/jacoco_global.gradle
index 991d9597b6..3863fd0102 100644
--- a/core/main/jacoco_global.gradle
+++ b/core/main/jacoco_global.gradle
@@ -1,8 +1,102 @@
-jacoco {
-    toolVersion = "0.8.7"
+project.afterEvaluate { project ->
+    setupAndroidReporting()
 }
 
-tasks.withType(Test) {
-    jacoco.includeNoLocationClasses = true
-    jacoco.excludes = ['jdk.internal.*']
+def setupAndroidReporting() {
+    tasks.withType(Test) {
+        // Whether or not classes without source location should be instrumented
+        jacoco.includeNoLocationClasses = true
+        jacoco.excludes = ['jdk.internal.*']
+    }
+
+    def buildTypes = ["debug", "fullDebug"]
+
+    def productFlavors = android.productFlavors.collect { flavor ->
+        flavor.name
+    }
+    // When no product flavors defined, use empty
+    if (!productFlavors) productFlavors.add('')
+    productFlavors.each { productFlavorName ->
+        buildTypes.each { buildTypeName ->
+            def sourceName, sourcePath
+            if (!productFlavorName) {
+                sourceName = sourcePath = "${buildTypeName}"
+            } else {
+                sourceName = "${productFlavorName}${buildTypeName.capitalize()}"
+                sourcePath = "${productFlavorName}/${buildTypeName}"
+            }
+            def testTaskName = "test${sourceName.capitalize()}UnitTest"
+            // System.out.println("Task -> $testTaskName")
+
+            // Create coverage task of form 'testFlavorTypeCoverage' depending on 'testFlavorTypeUnitTest'
+            task "${testTaskName}Coverage"(type: JacocoReport, dependsOn: "$testTaskName") {
+                group = "Reporting"
+                description = "Generate Jacoco coverage reports on the ${sourceName.capitalize()} build."
+
+                def fileFilter = [
+                        // data binding
+                        'android/databinding/**/*.class',
+                        '**/android/databinding/*Binding.class',
+                        '**/android/databinding/*',
+                        '**/androidx/databinding/*',
+                        '**/BR.*',
+                        // android
+                        '**/R.class',
+                        '**/R$*.class',
+                        '**/BuildConfig.*',
+                        '**/Manifest*.*',
+                        '**/*Test*.*',
+                        'android/**/*.*',
+                        // kotlin
+                        '**/*MapperImpl*.*',
+                        '**/*$ViewInjector*.*',
+                        '**/*$ViewBinder*.*',
+                        '**/BuildConfig.*',
+                        '**/*Component*.*',
+                        '**/*BR*.*',
+                        '**/Manifest*.*',
+                        '**/*$Lambda$*.*',
+                        '**/*Companion*.*',
+                        '**/*Module*.*',
+                        '**/*Dagger*.*',
+                        '**/*Hilt*.*',
+                        '**/*MembersInjector*.*',
+                        '**/*_MembersInjector.class',
+                        '**/*_Factory*.*',
+                        '**/*_Provide*Factory*.*',
+                        '**/*Extensions*.*',
+                        // sealed and data classes
+                        '**/*$Result.*',
+                        '**/*$Result$*.*',
+                        // adapters generated by moshi
+                        '**/*JsonAdapter.*',
+                ]
+
+                def javaTree = fileTree(dir: "${project.buildDir}/intermediates/javac/$sourceName/classes", excludes: fileFilter)
+                def kotlinTree = fileTree(dir: "${project.buildDir}/tmp/kotlin-classes/$sourceName", excludes: fileFilter)
+                classDirectories.from = files([javaTree], [kotlinTree])
+                executionData.from = files("${project.buildDir}/jacoco/${testTaskName}.exec")
+                def coverageSourceDirs = ["src/main/java",
+                                          "src/$productFlavorName/java",
+                                          "src/$buildTypeName/java"]
+
+                sourceDirectories.setFrom(files(coverageSourceDirs))
+                additionalSourceDirs.setFrom(files(coverageSourceDirs))
+
+                reports {
+                    csv.required = false
+                    xml.required = true
+                    html.required = true
+                }
+            }
+        }
+    }
+}
+
+android {
+    buildTypes {
+        debug {
+            testCoverageEnabled true
+        }
+    }
 }
\ No newline at end of file
diff --git a/core/utils/build.gradle b/core/utils/build.gradle
index 74dfc1e8ee..27b1b6f4b3 100644
--- a/core/utils/build.gradle
+++ b/core/utils/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/core/validators/build.gradle b/core/validators/build.gradle
index 666b419ba0..a53ff874e0 100644
--- a/core/validators/build.gradle
+++ b/core/validators/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/database/entities/build.gradle b/database/entities/build.gradle
index 2e4ecc229d..4e4311ac82 100644
--- a/database/entities/build.gradle
+++ b/database/entities/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/database/impl/build.gradle b/database/impl/build.gradle
index 744f89944a..10514f8669 100644
--- a/database/impl/build.gradle
+++ b/database/impl/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/gradle.properties b/gradle.properties
index 3b47fa6324..743829c702 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,3 +32,5 @@ android.nonTransitiveRClass=true
 # null: KtCallExpression
 # https://youtrack.jetbrains.com/issue/KT-58027
 kapt.use.jvm.ir=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 46ed4ffcad..e2968a868f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Sep 18 18:21:09 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/implementation/build.gradle b/implementation/build.gradle
index a4c72a5c4d..91b6a412f5 100644
--- a/implementation/build.gradle
+++ b/implementation/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/insight/build.gradle b/insight/build.gradle
index 543420008a..10c064743f 100644
--- a/insight/build.gradle
+++ b/insight/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/jacoco_project.gradle b/jacoco_project.gradle
index b542c95258..40e79d2e4e 100644
--- a/jacoco_project.gradle
+++ b/jacoco_project.gradle
@@ -1,12 +1,7 @@
 apply plugin: 'jacoco'
 
 jacoco {
-    toolVersion '0.8.7'
-}
-
-tasks.withType(Test) {
-    jacoco.includeNoLocationClasses = true
-    jacoco.excludes = ['jdk.internal.*']
+    toolVersion '0.8.10'
 }
 
 project.afterEvaluate {
@@ -74,8 +69,8 @@ project.afterEvaluate {
 
         def executions = subprojects.collect { proj ->
             variants.collect { variant ->
-                def path = "${proj.buildDir}/jacoco/test${variant.capitalize()}UnitTest.exec"
-                //printf('Collecting execution data from: %s\n', path)
+                def path = "${proj.buildDir}/outputs/unit_test_code_coverage/${variant}UnitTest/test${variant.capitalize()}UnitTest.exec"
+                // printf('Collecting execution data from: %s\n', path)
                 if ((new File(path)).exists()) path else null
             }
         }.flatten()
diff --git a/plugins/aps/build.gradle b/plugins/aps/build.gradle
index e86d3d1ef2..8a39332026 100644
--- a/plugins/aps/build.gradle
+++ b/plugins/aps/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/plugins/automation/build.gradle b/plugins/automation/build.gradle
index c1b50cd96f..45baab2ef6 100644
--- a/plugins/automation/build.gradle
+++ b/plugins/automation/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/plugins/automation/src/main/res/values-cs-rCZ/strings.xml b/plugins/automation/src/main/res/values-cs-rCZ/strings.xml
index a0430201bf..b41821bc35 100644
--- a/plugins/automation/src/main/res/values-cs-rCZ/strings.xml
+++ b/plugins/automation/src/main/res/values-cs-rCZ/strings.xml
@@ -92,6 +92,8 @@
     <string name="lastboluscompared">Poslední bolus %1$s před %2$s min</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
+    <string name="triggerHeartRate">Tepová frekvence</string>
+    <string name="triggerHeartRateDesc">TF %1$s %2$.0f</string>
     <string name="iob_u">IOB [U]:</string>
     <string name="distance_short">Vzdálenost [m]:</string>
     <string name="recurringTime">Opakující se čas</string>
diff --git a/plugins/automation/src/main/res/values-es-rES/strings.xml b/plugins/automation/src/main/res/values-es-rES/strings.xml
index c5bfc38eba..e019368b0a 100644
--- a/plugins/automation/src/main/res/values-es-rES/strings.xml
+++ b/plugins/automation/src/main/res/values-es-rES/strings.xml
@@ -92,6 +92,8 @@
     <string name="lastboluscompared">Hora del último bolo: hace %1$s %2$s min</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
+    <string name="triggerHeartRate">Ritmo cardíaco</string>
+    <string name="triggerHeartRateDesc">RC %1$s %2$.0f</string>
     <string name="iob_u">IOB (Insulina a Bordo) [U]:</string>
     <string name="distance_short">Dist. [m]:</string>
     <string name="recurringTime">Hora de Repetición</string>
diff --git a/plugins/automation/src/main/res/values-fr-rFR/strings.xml b/plugins/automation/src/main/res/values-fr-rFR/strings.xml
index 70c5466d0a..79082b6634 100644
--- a/plugins/automation/src/main/res/values-fr-rFR/strings.xml
+++ b/plugins/automation/src/main/res/values-fr-rFR/strings.xml
@@ -92,6 +92,8 @@
     <string name="lastboluscompared">Heure du dernier bolus %1$s il y a %2$s min</string>
     <string name="triggercoblabel">GA</string>
     <string name="cobcompared">GA %1$s %2$.0f</string>
+    <string name="triggerHeartRate">Fréquence Cardiaque</string>
+    <string name="triggerHeartRateDesc">FC %1$s %2$.0f</string>
     <string name="iob_u">IA [U]:</string>
     <string name="distance_short">Dist [m]:</string>
     <string name="recurringTime">Période répétitive</string>
diff --git a/plugins/automation/src/main/res/values-iw-rIL/strings.xml b/plugins/automation/src/main/res/values-iw-rIL/strings.xml
index 58c5477995..2f4d687bf5 100644
--- a/plugins/automation/src/main/res/values-iw-rIL/strings.xml
+++ b/plugins/automation/src/main/res/values-iw-rIL/strings.xml
@@ -92,6 +92,8 @@
     <string name="lastboluscompared">הבולוס האחרון היה לפני %1$s %2$s דק\'</string>
     <string name="triggercoblabel">פחמ\' פעילות</string>
     <string name="cobcompared">פחמ\' פעילות %1$s %2$.0f</string>
+    <string name="triggerHeartRate">קצב לב</string>
+    <string name="triggerHeartRateDesc">קצב לב %1$s %2$.0f</string>
     <string name="iob_u">אינסולין פעיל [U]:</string>
     <string name="distance_short">מרחק [m]:</string>
     <string name="recurringTime">זמן חוזרני</string>
diff --git a/plugins/automation/src/main/res/values-sk-rSK/strings.xml b/plugins/automation/src/main/res/values-sk-rSK/strings.xml
index 6b1f62b829..4b8925ad92 100644
--- a/plugins/automation/src/main/res/values-sk-rSK/strings.xml
+++ b/plugins/automation/src/main/res/values-sk-rSK/strings.xml
@@ -92,6 +92,8 @@
     <string name="lastboluscompared">Čas posledného bolusu: pred %1$s %2$s min </string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
+    <string name="triggerHeartRate">Tepová frekvencia</string>
+    <string name="triggerHeartRateDesc">TF %1$s %2$.0f</string>
     <string name="iob_u">IOB [JI]:</string>
     <string name="distance_short">Vzdial. [m]:</string>
     <string name="recurringTime">Čas zotavovania</string>
diff --git a/plugins/configuration/build.gradle b/plugins/configuration/build.gradle
index 8fe2f01283..2858404898 100644
--- a/plugins/configuration/build.gradle
+++ b/plugins/configuration/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/plugins/constraints/build.gradle b/plugins/constraints/build.gradle
index 84ee406dd7..c668052c88 100644
--- a/plugins/constraints/build.gradle
+++ b/plugins/constraints/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/plugins/constraints/src/main/res/values-de-rDE/objectives.xml b/plugins/constraints/src/main/res/values-de-rDE/objectives.xml
index 179a3c3f37..9f0d1b2f2e 100644
--- a/plugins/constraints/src/main/res/values-de-rDE/objectives.xml
+++ b/plugins/constraints/src/main/res/values-de-rDE/objectives.xml
@@ -51,7 +51,7 @@
     <string name="objectives_exam_learned_isf">Du hast die Bedeutung des ISF-Wertes kennengelernt und wie er die Menge an Insulin, die für die Blutzucker-Korrektur verwendet wird, beeinflusst.</string>
     <string name="objectives_exam_learned_ic">Du hast die Bedeutung des IC-Wertes kennengelernt und wie er die Menge an Insulin, die für die Abdeckung der Kohlenhydrate verwendet wird, beeinflusst.</string>
     <string name="objectives_exam_learned_hypott">Hypo temporäres Ziel wird nur verwendet, um eine Überkorrektur nach Hypos zu verhindern, weil sich in dem Fall oft ein negatives IOB gesammelt hat. Zusätzliche Maßnahmen sollten evaluiert werden, um diese Situation in Zukunft zu verhindern.</string>
-    <string name="objectives_exam_learned_profileswitch">Die Verwendung eines Prozentsatzes betrifft nicht den Zielblutzucker, allerdings werden Basal, ISF und IC so angepasst, dass mehr Insulin (über 100%) oder weniger Insulin (unter 100%) gegeben wird.</string>
+    <string name="objectives_exam_learned_profileswitch">Die Verwendung eines Prozentsatzes betrifft nicht den Zielblutzucker, allerdings werden Basal, ISF und IC so angepasst, dass mehr Insulin (über 100%%) oder weniger Insulin (unter 100%%) gegeben wird.</string>
     <string name="objectives_exam_learned_profileswitchtime">Durch die Verwendung einer Zeitverschiebung beim Profilwechsel kannst du das zirkadiane Profil an Unregelmäßigkeiten – wie ein verspätetes Aufwachen, anpassen. Das Profil wird entsprechend zeitlich versetzt.</string>
     <string name="objectives_exam_learned_profileswitch4">Das Bearbeiten des Profils selbst reicht nicht aus, um eine Änderung vorzunehmen. Sie müssen noch einen Profilwechsel durchführen, um die Änderungen zu aktivieren.</string>
     <string name="objectives_exam_learned_exercise">Du solltest die Menge an Insulin im Körper mindestens 1 Stunde vor Beginn der Übung verringern, indem du ein Profil unter 100% wählst.</string>
diff --git a/plugins/constraints/src/main/res/values-iw-rIL/objectives.xml b/plugins/constraints/src/main/res/values-iw-rIL/objectives.xml
index c3f12c8b5b..0f59b80d2c 100644
--- a/plugins/constraints/src/main/res/values-iw-rIL/objectives.xml
+++ b/plugins/constraints/src/main/res/values-iw-rIL/objectives.xml
@@ -52,7 +52,7 @@
     <string name="objectives_exam_learned_isf">למדתם את משמעות הערך ISF וכיצד הוא משפיע על כמות האינסולין המשמשת לתיקון הסוכר בדם.</string>
     <string name="objectives_exam_learned_ic">למדתם את משמעות הערך IC וכיצד הוא משפיע על כמות האינסולין הדרושה לכיסוי פחמימות.</string>
     <string name="objectives_exam_learned_hypott">ערך מטרה זמני היפו משמש רק כדי למנוע תיקון ביתר לאחר היפו, כאשר בדרך כלל יש אינסולין פעיל שלילי שהצטבר. יש לשקול לבצע פעולות נוספות כדי למנוע מצב כזה בעתיד.</string>
-    <string name="objectives_exam_learned_profileswitch">השימוש באחוז אינו משפיע על ערכי המטרה של הסוכר, אבל כן משפיע על המינונים הבזאליים, על ה-ISF ועל ה-IC כך שיוזרק יותר אינסולין (מעל 100%) או פחות אינסולין (מתחת ל-100%).</string>
+    <string name="objectives_exam_learned_profileswitch">השימוש באחוז אינו משפיע על ערכי המטרה של הסוכר, אבל כן משפיע על המינונים הבזאליים, על ה-ISF ועל ה-IC כך שיוזרק יותר אינסולין (מעל 100%%) או פחות אינסולין (מתחת ל-100%%).</string>
     <string name="objectives_exam_learned_profileswitchtime">על ידי שימוש בהיסט זמן בהחלפת הפרופיל, אתם יכולים להתאים את הפרופיל הצירקדי לאי סדרים כמו השכמה מאוחרת.</string>
     <string name="objectives_exam_learned_profileswitch4">עריכת הפרופיל עצמו אינה מספיקה כדי לבצע שינוי. אתם עדיין צריכים לבצע החלפת פרופיל כדי להפעיל שינויים.</string>
     <string name="objectives_exam_learned_exercise">עליכם להפחית את כמות האינסולין בגוף לפחות שעה אחת לפני תחילת האימון על ידי בחירת פרופיל מתחת ל-100%.</string>
diff --git a/plugins/constraints/src/main/res/values-pt-rBR/objectives.xml b/plugins/constraints/src/main/res/values-pt-rBR/objectives.xml
index cda1ceecf7..d5910e8c72 100644
--- a/plugins/constraints/src/main/res/values-pt-rBR/objectives.xml
+++ b/plugins/constraints/src/main/res/values-pt-rBR/objectives.xml
@@ -51,7 +51,7 @@
     <string name="objectives_exam_learned_isf">Você aprendeu o significado do valor do FS e como ele afeta a quantidade de insulina usada para correção da glicemia.</string>
     <string name="objectives_exam_learned_ic">Você aprendeu o significado do valor IC e como ele afeta a quantidade de insulina necessária para cobrir carboidratos.</string>
     <string name="objectives_exam_learned_hypott">O alvo de glicemia temporária para hipoglicemia é usada apenas para prevenir uma super correção após a hipoglicemia, quando geralmente há um acúmulo de IA negativo. Ações adicionais devem ser avaliadas para prevenir essa situação novamente no futuro.</string>
-    <string name="objectives_exam_learned_profileswitch">Usar porcentagens não afeta as metas de glicemia, mas o basal, ISF e IC são ajustados para fornecer mais insulina (acima de 100%) ou menos insulina (abaixo de 100%).</string>
+    <string name="objectives_exam_learned_profileswitch">Usar porcentagens não afeta as metas de glicemia, mas o basal, ISF e IC são ajustados para fornecer mais insulina (acima de 100%%) ou menos insulina (abaixo de 100%%).</string>
     <string name="objectives_exam_learned_profileswitchtime">Usando mudança de horário (timeshift) no perfil, você pode adaptar o perfil circadiano às irregularidades, como acordar tarde.</string>
     <string name="objectives_exam_learned_profileswitch4">Editar o perfil em si não é suficiente para aplicar as mudança. Ainda é necessário fazer uma troca de perfil para ativar as alterações.</string>
     <string name="objectives_exam_learned_exercise">Você deve reduzir a quantidade de insulina no corpo pelo menos 1 hora antes de começar o exercício selecionando um perfil com menos de 100%.</string>
diff --git a/plugins/constraints/src/main/res/values-tr-rTR/objectives.xml b/plugins/constraints/src/main/res/values-tr-rTR/objectives.xml
index dec531b52c..3e99eed215 100644
--- a/plugins/constraints/src/main/res/values-tr-rTR/objectives.xml
+++ b/plugins/constraints/src/main/res/values-tr-rTR/objectives.xml
@@ -52,8 +52,7 @@
     <string name="objectives_exam_learned_isf">İDF değerinin anlamını ve kan şekeri düzeltmesi için ne kadar insülin kullanacağınızı öğrendiniz.</string>
     <string name="objectives_exam_learned_ic">Kİ oranının anlamını ve karbonhidratları karşılamak için gereken insülin miktarını nasıl hesaplayacağınızı öğrendiniz.</string>
     <string name="objectives_exam_learned_hypott">Hipo geçici hedefi yalnızca genellikle birikmiş negatif AİNS olduğunda, hipodan sonra aşırı düzeltmeyi önlemek için kullanılır. Gelecekte bu durumu tekrar önlemek için ek eylemler değerlendirilmelidir.</string>
-    <string name="objectives_exam_learned_profileswitch">Yüzde kullanmak, hedef KŞ\'leri etkilemez ancak bazal, İDF ve Kİ daha fazla insülin (%100\'ün üzerinde) veya daha az insülin (%100\'ün altında) verecek şekilde ayarlanır.</string>
-    <string name="objectives_exam_learned_profileswitchtime">Profil değiştirmede zaman kaymasını kullanarak sirkadiyen profili geç uyanma gibi düzensizliklere göre ayarlayabilirsiniz.</string>
+    <string name="objectives_exam_learned_profileswitch">Yüzde kullanmak, hedef KŞ\'leri etkilemez ancak bazal, İDF ve Kİ daha fazla insülin (%%100\'ün üzerinde) veya daha az insülin (%%100\'ün altında) verecek şekilde ayarlanır.</string>
     <string name="objectives_exam_learned_profileswitch4">Değişiklik yapmak için profili düzenlemek yeterli değildir. Değişiklikleri etkinleştirmek için yine de bir profil değiştirme yapmanız gerekir.</string>
     <string name="objectives_exam_learned_exercise">%100\'ün altında bir profil seçerek egzersize başlamadan en az 1 saat önce vücuttaki insülin miktarını azaltmalısınız.</string>
     <string name="objectives_exam_learned_exercise2">Egzersizden en az 1 saat önce daha yüksek geçici hedef belirlemek, vücuttaki insülin miktarının azalmasına da yardımcı olur.</string>
diff --git a/plugins/insulin/build.gradle b/plugins/insulin/build.gradle
index 4ebac085b2..79591ec2dc 100644
--- a/plugins/insulin/build.gradle
+++ b/plugins/insulin/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/plugins/main/build.gradle b/plugins/main/build.gradle
index 9d87109946..fc8e25f88d 100644
--- a/plugins/main/build.gradle
+++ b/plugins/main/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/plugins/main/src/main/res/values-fr-rFR/strings.xml b/plugins/main/src/main/res/values-fr-rFR/strings.xml
index 9c78930951..ab4b81dc68 100644
--- a/plugins/main/src/main/res/values-fr-rFR/strings.xml
+++ b/plugins/main/src/main/res/values-fr-rFR/strings.xml
@@ -271,7 +271,7 @@
     <string name="abs_insulin_shortname">ABS</string>
     <string name="devslope_shortname">PENTEDEV</string>
     <string name="treatments_shortname">TRAIT</string>
-    <string name="heartRate_shortname">BPM</string>
+    <string name="heartRate_shortname">FC</string>
     <string name="sensitivity_shortname">SENS</string>
     <string name="graph_scale">Échelle du graph.</string>
     <string name="graph_menu_divider_header">Graph</string>
@@ -325,6 +325,7 @@
     <string name="grams_short">g</string>
     <string name="hour_short">h</string>
     <string name="no_active_profile">Aucun profil actif!</string>
+    <string name="profile_message">Profil :\n\nDécalage: %1$d\nPourcentage: %2$d%%\"</string>
     <string name="tdd_line">%1$.2fU %1$.0f%%</string>
     <string name="no_profile">Aucun profil séléctionné</string>
     <string name="aps_only">S\'applique uniquement en mode APS!</string>
diff --git a/plugins/main/src/main/res/values-iw-rIL/strings.xml b/plugins/main/src/main/res/values-iw-rIL/strings.xml
index 8fb34ab17d..7860b05d6e 100644
--- a/plugins/main/src/main/res/values-iw-rIL/strings.xml
+++ b/plugins/main/src/main/res/values-iw-rIL/strings.xml
@@ -344,5 +344,4 @@
     <string name="until">עד</string>
     <string name="default_range">טווח ברירת מחדל</string>
     <string name="target">מטרה</string>
-    <string name="rate_duration">מינון: %1$.2fיח\'\\ש\' (%2$.2f%) \nל-%3$d דק\'</string>
 </resources>
diff --git a/plugins/sensitivity/build.gradle b/plugins/sensitivity/build.gradle
index 5a30677c60..48544e8cd5 100644
--- a/plugins/sensitivity/build.gradle
+++ b/plugins/sensitivity/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/plugins/smoothing/build.gradle b/plugins/smoothing/build.gradle
index 6dc158f091..6d05fc53c8 100644
--- a/plugins/smoothing/build.gradle
+++ b/plugins/smoothing/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/plugins/source/build.gradle b/plugins/source/build.gradle
index 5cbae0f81f..7c71947afa 100644
--- a/plugins/source/build.gradle
+++ b/plugins/source/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/plugins/sync/build.gradle b/plugins/sync/build.gradle
index 961797ec39..57ff4fa62b 100644
--- a/plugins/sync/build.gradle
+++ b/plugins/sync/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/combo/build.gradle b/pump/combo/build.gradle
index ba1ec7d6b8..31d5153c42 100644
--- a/pump/combo/build.gradle
+++ b/pump/combo/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
@@ -12,6 +11,10 @@ apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
 apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
 android {
+
+    buildFeatures {
+        aidl true
+    }
     namespace 'info.nightscout.pump.combo'
 }
 
diff --git a/pump/combov2/build.gradle b/pump/combov2/build.gradle
index b98303f68b..8069b16e0b 100644
--- a/pump/combov2/build.gradle
+++ b/pump/combov2/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-allopen'
-apply plugin: 'com.hiya.jacoco-android'
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
diff --git a/pump/combov2/comboctl/build.gradle b/pump/combov2/comboctl/build.gradle
index 645f764f7c..e999327421 100644
--- a/pump/combov2/comboctl/build.gradle
+++ b/pump/combov2/comboctl/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'kotlin-kapt'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/combov2/src/main/res/values-bg-rBG/strings.xml b/pump/combov2/src/main/res/values-bg-rBG/strings.xml
index 88c8c03a79..16e4d9a6e2 100644
--- a/pump/combov2/src/main/res/values-bg-rBG/strings.xml
+++ b/pump/combov2/src/main/res/values-bg-rBG/strings.xml
@@ -97,7 +97,6 @@
     <string name="combov2_set_emulated_100_tbr">Задайте емулиран 100% Временен базал</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Оставяне на текущия емулиран 100% Временен базал Завършено</string>
     <string name="combov2_ignoring_redundant_100_tbr">Игнориране на излишна заявка за 100% Временен базал</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Възникна неочакван лимит при коригиране на Временния базал: целевият процент беше %1$d%%, достигна лимит от %1$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Не може да се зададе абсолютен Временен базал, ако той е нула</string>
     <string name="combov2_pair_with_pump_summary">Сдвоете AndroidAPS и Android с несвързана в момента помпа Accu-Chek Combo</string>
     <string name="combov2_unpair_pump_summary">Раздвоете AndroidAPS и Android със свързаната в момента помпа Accu-Chek Combo</string>
diff --git a/pump/combov2/src/main/res/values-cs-rCZ/strings.xml b/pump/combov2/src/main/res/values-cs-rCZ/strings.xml
index 826edfc0d8..83e3e6a5d3 100644
--- a/pump/combov2/src/main/res/values-cs-rCZ/strings.xml
+++ b/pump/combov2/src/main/res/values-cs-rCZ/strings.xml
@@ -97,7 +97,7 @@ Pokud po více než ~5 minutách není navázáno žádné spojení:\n\n
     <string name="combov2_set_emulated_100_tbr">Nastavit emulovaný 100% dočasný bazál</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Nechávám emulovaný 100% dočasný bazál dokončit</string>
     <string name="combov2_ignoring_redundant_100_tbr">Ignorování požadavku 100% dočasného bazálu</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Při úpravě dočasného bazálu došlo k neočekávanému limitu: vyžadováno %1$d%%, dosažen limit %1$d%%</string>
+    <string name="combov2_hit_unexpected_tbr_limit">Při úpravě dočasného bazálu došlo k neočekávanému limitu: vyžadováno %1$d%%, dosažen limit %2$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Nelze nastavit absolutní dočasný bazál, pokud je bazální dávka nulová</string>
     <string name="combov2_pair_with_pump_summary">Párovat AndroidAPS a Android s momentálně nespárovanou pumpou Accu-Chek Combo</string>
     <string name="combov2_unpair_pump_summary">Zrušit párování AndroidAPS a Androidu v současné době spárované Accu-Chek Combo</string>
diff --git a/pump/combov2/src/main/res/values-de-rDE/strings.xml b/pump/combov2/src/main/res/values-de-rDE/strings.xml
index 65b773954c..6a4ad835de 100644
--- a/pump/combov2/src/main/res/values-de-rDE/strings.xml
+++ b/pump/combov2/src/main/res/values-de-rDE/strings.xml
@@ -98,7 +98,6 @@ Schaltflächen gleichzeitig, um das Paar abzubrechen)\n
     <string name="combov2_set_emulated_100_tbr">Emulierte 100% TBR festlegen</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Lass die laufende Emulation der 100% TBR abschließen</string>
     <string name="combov2_ignoring_redundant_100_tbr">Ignoriere redundante 100% TBR-Anfrage</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Unerwartetes Limit beim Anpassen des TBR gefunden: Ziel Prozentsatz war %1$d%%, Limit bei %1$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Absolute TBR kann nicht gesetzt werden, wenn die Basisbasalrate 0 ist</string>
     <string name="combov2_pair_with_pump_summary">Verbinde AndroidAPS und Android mit einer derzeit nicht verbundenen Accu-Chek Combo Pumpe</string>
     <string name="combov2_unpair_pump_summary">Trenne AndroidAPS und Android von der aktuell verbundenen Accu-Chek Combo Pumpe</string>
diff --git a/pump/combov2/src/main/res/values-es-rES/strings.xml b/pump/combov2/src/main/res/values-es-rES/strings.xml
index 086961719a..e3355b9989 100644
--- a/pump/combov2/src/main/res/values-es-rES/strings.xml
+++ b/pump/combov2/src/main/res/values-es-rES/strings.xml
@@ -97,7 +97,7 @@ Si no puedes establecer ninguna conexión después de unos ~5 minutos:\n\n
     <string name="combov2_set_emulated_100_tbr">Establecer la emulación del TBR al 100%</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Permitir finalizar la emulación del 100% del TBR en curso</string>
     <string name="combov2_ignoring_redundant_100_tbr">Ignorar la solicitud del 100% del TBR redundate</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Límite inesperado encontrado al ajustar TBR: el porcentaje objetivo fue de %1$d%%, alcanzó un límite de %1$d%%</string>
+    <string name="combov2_hit_unexpected_tbr_limit">Se ha encontrado un límite inesperado al ajustar el TBR: El porcentaje objetivo era %1$d%%, se ha encontrado un límite en %2$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">No se puede establecer el TBR absoluto si la tasa basal base es cero</string>
     <string name="combov2_pair_with_pump_summary">Emparejar AndroidAPS y Android con una bomba Accu-Chek Combo actualmente no emparejada</string>
     <string name="combov2_unpair_pump_summary">Desemparejar AndroidAPS y Android desde la bomba Accu-Chek Combo actualmente emparejada</string>
diff --git a/pump/combov2/src/main/res/values-fr-rFR/strings.xml b/pump/combov2/src/main/res/values-fr-rFR/strings.xml
index 593f2e451e..342c80e2ef 100644
--- a/pump/combov2/src/main/res/values-fr-rFR/strings.xml
+++ b/pump/combov2/src/main/res/values-fr-rFR/strings.xml
@@ -88,7 +88,7 @@
     <string name="combov2_set_emulated_100_tbr">Définir l\'émulation 100% TBR</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Laisser se terminer l\'émulation 100% TBR en cours</string>
     <string name="combov2_ignoring_redundant_100_tbr">Requête 100% DBT redondante ignorée</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Limite inattendue lors de l’ajustement du DBT: le pourcentage cible de %1$d%%, a dépassé la limite de %1$d%%</string>
+    <string name="combov2_hit_unexpected_tbr_limit">Limite inattendue lors de l’ajustement du DBT: le pourcentage cible de %1$d%%, a dépassé la limite de %2$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Impossible de définir le DBT absolu si le débit de basal est zéro</string>
     <string name="combov2_pair_with_pump_summary">Appairer AndroidAPS et Android avec une pompe Accu-Chek Combo non appariée</string>
     <string name="combov2_unpair_pump_summary">Dissocier AndroidAPS et Android de la pompe Accu-Chek Combo actuelle</string>
diff --git a/pump/combov2/src/main/res/values-it-rIT/strings.xml b/pump/combov2/src/main/res/values-it-rIT/strings.xml
index 55df3c4531..bf840709d1 100644
--- a/pump/combov2/src/main/res/values-it-rIT/strings.xml
+++ b/pump/combov2/src/main/res/values-it-rIT/strings.xml
@@ -97,7 +97,6 @@ Se non viene stabilita alcuna connessione dopo più di ~5 minuti:\n\n
     <string name="combov2_set_emulated_100_tbr">Imposta TBR 100% (emulato)</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Lasciando finire il TBR 100% (emulato) in esecuzione</string>
     <string name="combov2_ignoring_redundant_100_tbr">TBR 100%: ignorando la richiesta ridondante</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Limite inatteso riscontrato durante la regolazione di TBR: la percentuale target era %1$d%%, raggiunto un limite a %1$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Impossibile impostare un TBR assoluto se la velocità basale di base è zero</string>
     <string name="combov2_pair_with_pump_summary">Associa AndroidAPS e Android con un micro Accu-Chek Combo attualmente non associato</string>
     <string name="combov2_unpair_pump_summary">Disassocia AndroidAPS e Android dal micro Accu-Chek Combo attualmente associato</string>
diff --git a/pump/combov2/src/main/res/values-iw-rIL/strings.xml b/pump/combov2/src/main/res/values-iw-rIL/strings.xml
index 52187f91a7..bc65ee458c 100644
--- a/pump/combov2/src/main/res/values-iw-rIL/strings.xml
+++ b/pump/combov2/src/main/res/values-iw-rIL/strings.xml
@@ -90,11 +90,9 @@
     <string name="combov2_set_emulated_100_tbr">הגדר בזאלי זמני 100% מדומה</string>
     <string name="combov2_letting_emulated_100_tbr_finish">מאפשר לבזאלי הזמני 100% המדומה לסיים</string>
     <string name="combov2_ignoring_redundant_100_tbr">מתעלם מבקשה מיותרת של בזאלי זמני 100%</string>
-    <string name="combov2_hit_unexpected_tbr_limit">נמצאה מגבלה בלתי צפוי בעת הגדרת בזאלי זמני: אחוז המטרה היה %1$d% והגיע למגבלה ב-%1$d%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">לא ניתן להגדיר בזאלי זמני אם המינון הבזאלי הבסיסי הוא 0</string>
     <string name="combov2_pair_with_pump_summary">צימוד AndroidAPS ואנדרואיד עם משאבת Accu-Chek combo שאינה מצומדת</string>
     <string name="combov2_unpair_pump_summary">ביטול צימוד AndroidAPS ואנדרואיד ממשאבת Accu-Chek combo המצומדת</string>
-    <string name="combov2_unknown_tbr_detected">נמצא בזאלי זמני בלתי ידוע והוא נעצר; אחוזים: %1$d%; זמן שנשאר: %2$s</string>
     <string name="combov2_connection_error">שגיאת חיבור: %1$s</string>
     <string name="combov2_short_status_last_connection">חיבור אחרון: לפני %1$d דקות</string>
     <string name="combov2_short_status_alert">התראה: %s</string>
diff --git a/pump/combov2/src/main/res/values-lt-rLT/strings.xml b/pump/combov2/src/main/res/values-lt-rLT/strings.xml
index 82301b1d9b..d2762015dc 100644
--- a/pump/combov2/src/main/res/values-lt-rLT/strings.xml
+++ b/pump/combov2/src/main/res/values-lt-rLT/strings.xml
@@ -97,7 +97,6 @@ Jei po daugiau nei ~5 minučių ryšys neužmegztas:\n\n
     <string name="combov2_set_emulated_100_tbr">Nustatyti imitacinę 100% bazę</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Leisti užbaigti imitacinę 100% bazę</string>
     <string name="combov2_ignoring_redundant_100_tbr">Ignoruoti perteklines 100% bazės užklausas</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Nustatant laikiną bazę pasiektas nenumatytas limitas: LB tikslas %1$d%%, limitas %1$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Negalima nustatyti absoliučios laikinos bazės, jei pagrindinė bazė yra nulinė</string>
     <string name="combov2_pair_with_pump_summary">Susieti AndroidAPS su dar nesusieta Accu-Chek Combo pompa</string>
     <string name="combov2_unpair_pump_summary">Atsieti AndroidAPS ir Android nuo dabartinės susietos Accu-Chek Combo pompos</string>
diff --git a/pump/combov2/src/main/res/values-nl-rNL/strings.xml b/pump/combov2/src/main/res/values-nl-rNL/strings.xml
index 9997828b91..b09dfc0f23 100644
--- a/pump/combov2/src/main/res/values-nl-rNL/strings.xml
+++ b/pump/combov2/src/main/res/values-nl-rNL/strings.xml
@@ -98,7 +98,6 @@ Probeer opnieuw te koppelen</string>
     <string name="combov2_set_emulated_100_tbr">Stel geëmuleerde 100% TBR in</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Wachten tot geëmuleerde 100% TBR is beëindigd</string>
     <string name="combov2_ignoring_redundant_100_tbr">Overbodig 100% TBR verzoek wordt genegeerd</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Onverwachte limiet opgetreden tijdens het aanpassen van TBR: doel percentage was %1$d%%, raak een limiet op %1$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Kan absolute TBR niet instellen als basaalstand nul is</string>
     <string name="combov2_pair_with_pump_summary">Koppel AndroidAPS en Android met een Accu-Chek Combo pomp die momenteel niet is gekoppeld</string>
     <string name="combov2_unpair_pump_summary">Ontkoppel AndroidAPS en Android van de huidige Accu-Chek Combo pomp</string>
diff --git a/pump/combov2/src/main/res/values-no-rNO/strings.xml b/pump/combov2/src/main/res/values-no-rNO/strings.xml
index 5dd956153a..c6a2d22361 100644
--- a/pump/combov2/src/main/res/values-no-rNO/strings.xml
+++ b/pump/combov2/src/main/res/values-no-rNO/strings.xml
@@ -98,7 +98,6 @@ knappene samtidig for å avbryte parringen)\n
     <string name="combov2_set_emulated_100_tbr">Angi emulert 100% TBR</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Lar aktive emulert 100% TBR få avslutte</string>
     <string name="combov2_ignoring_redundant_100_tbr">Ignorerer redundant 100% TBR forespørsel</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Uventet begrensning oppsto ved justering av TBR: målprosenten var %1$d%%, nådde grense på %1$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Kan ikke sette absolutt TBR hvis basalraten er null</string>
     <string name="combov2_pair_with_pump_summary">Sammenkoble AndroidAPS og Android med en ikke-tilkoblet Accu-Chek Combo pumpe</string>
     <string name="combov2_unpair_pump_summary">Koble fra AndroidAPS og Android fra den ilkoblede Accu-Chek Combo pumpen</string>
diff --git a/pump/combov2/src/main/res/values-pl-rPL/strings.xml b/pump/combov2/src/main/res/values-pl-rPL/strings.xml
index acbe1ff936..56ff19507f 100644
--- a/pump/combov2/src/main/res/values-pl-rPL/strings.xml
+++ b/pump/combov2/src/main/res/values-pl-rPL/strings.xml
@@ -97,7 +97,6 @@ Jeśli po więcej niż ~5 minutach połączenie nie zostanie ustanowione:\n\n
     <string name="combov2_set_emulated_100_tbr">Ustaw emulowane 100% TBR</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Oczekiwanie na zakończenie emulowanego 100% TBR w toku</string>
     <string name="combov2_ignoring_redundant_100_tbr">Ignorowanie zbędnego żądania o 100% TBR</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Napotkano nieoczekiwany limit podczas dostosowywania TBR: oczekiwany docelowy procent %1$d%%, osiągnął limit przy %2$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Nie można ustawić bezwzględnego TBR, jeśli wyjściowa dawka bazowa jest zerowa</string>
     <string name="combov2_pair_with_pump_summary">Sparuj AAPS i Androida z aktualnie niesparowaną pompą Accu-Chek Combo</string>
     <string name="combov2_unpair_pump_summary">Usuń parowanie AAPS i Androida z aktualnie sparowanej pompy Accu-Chek Combo</string>
diff --git a/pump/combov2/src/main/res/values-pt-rBR/strings.xml b/pump/combov2/src/main/res/values-pt-rBR/strings.xml
index 23a8b41b82..93244b1a94 100644
--- a/pump/combov2/src/main/res/values-pt-rBR/strings.xml
+++ b/pump/combov2/src/main/res/values-pt-rBR/strings.xml
@@ -98,7 +98,6 @@ botão ao mesmo tempo para cancelar o emparelhamento)\n
     <string name="combov2_set_emulated_100_tbr">Definir emulação 100% de TBT</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Deixando a taxa basal temporária emulada de 100% continuar até o final</string>
     <string name="combov2_ignoring_redundant_100_tbr">Ignorando uma solicitação redundante de taxa basal temporária emulada de 100%</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Limite inesperado encontrado ao ajustar a TBT: porcentagem alvo foi %1$d%%, atingiu um limite em %1$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Não é possível definir TBT absoluto se a taxa basal de base é zero</string>
     <string name="combov2_pair_with_pump_summary">Desemparelhar o AndroidAPS e o Android da bomba Accu-Chek Combo pareada</string>
     <string name="combov2_unpair_pump_summary">Desemparelhar o AndroidAPS e o Android da bomba Accu-Chek Combo atualmente pareada</string>
diff --git a/pump/combov2/src/main/res/values-ru-rRU/strings.xml b/pump/combov2/src/main/res/values-ru-rRU/strings.xml
index 71b8b93602..49f1fb8bcf 100644
--- a/pump/combov2/src/main/res/values-ru-rRU/strings.xml
+++ b/pump/combov2/src/main/res/values-ru-rRU/strings.xml
@@ -98,7 +98,6 @@
     <string name="combov2_set_emulated_100_tbr">Установить эмуляцию. временного базала TBR 100%</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Позволить завершиться текущей эмуляции временного базала 100% TBR</string>
     <string name="combov2_ignoring_redundant_100_tbr">Игнорирование избыточного запроса на 100% TBR</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Непредвиденный предел, встретившийся при настройке TBR: целевой процент составил %1$d%%, а достиг предела %1$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Невозможно установить абсолютный TBR, если базовая скорость равна нулю</string>
     <string name="combov2_pair_with_pump_summary">Выполнить сопряжение AndroidAPS и Android с помпой Accu-Chek Combo</string>
     <string name="combov2_unpair_pump_summary">Отключить AndroidAPS и AndroidAPS от помпы Accu-Chek Combo</string>
diff --git a/pump/combov2/src/main/res/values-sk-rSK/strings.xml b/pump/combov2/src/main/res/values-sk-rSK/strings.xml
index 06bbf48d0d..c64438fa7f 100644
--- a/pump/combov2/src/main/res/values-sk-rSK/strings.xml
+++ b/pump/combov2/src/main/res/values-sk-rSK/strings.xml
@@ -97,7 +97,7 @@ Pokiaľ po viac ako ~5 minútach nie je nadviazané žiadne spojenie:\n\n
     <string name="combov2_set_emulated_100_tbr">Nastaviť emulovaný 100% dočasný bazál</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Nechávam emulovaný 100% dočasný bazál dokončiť</string>
     <string name="combov2_ignoring_redundant_100_tbr">Ignorovanie požiadavky 100% dočasného bazálu</string>
-    <string name="combov2_hit_unexpected_tbr_limit">Pri úprave dočasného bazálu došlo k neočekávanému limitu: vyžadované %1$d%%, dosiahnutý limit %1$d%%</string>
+    <string name="combov2_hit_unexpected_tbr_limit">Pri úprave dočasného bazálu došlo k neočekávanému limitu: vyžadované %1$d%%, dosiahnutý limit %2$d%%</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Nie je možné nastaviť absolútny dočasný bazál, pokiaľ je bazálna dávka nulová</string>
     <string name="combov2_pair_with_pump_summary">Párovať AndroidAPS a Android s momentálně nespárovanou pumpou Accu-Chek Combo</string>
     <string name="combov2_unpair_pump_summary">Zrušiť párovanie AndroidAPS a Androidu v súčasnej dobe spárovanej Accu-Chek Combo</string>
diff --git a/pump/combov2/src/main/res/values-tr-rTR/strings.xml b/pump/combov2/src/main/res/values-tr-rTR/strings.xml
index 73b055581f..036eb7add9 100644
--- a/pump/combov2/src/main/res/values-tr-rTR/strings.xml
+++ b/pump/combov2/src/main/res/values-tr-rTR/strings.xml
@@ -98,7 +98,6 @@ Eşleştirme başarıyla tamamlandığında pompanızda tamamlanan eşleştirmey
     <string name="combov2_set_emulated_100_tbr">Emülasyonlu %100 GBO\'ına ayarla</string>
     <string name="combov2_letting_emulated_100_tbr_finish">Devam eden emülasyonlu %100 GBO\'nın bitmesine izin ver</string>
     <string name="combov2_ignoring_redundant_100_tbr">Gereksiz %100 GBO isteği yoksayılıyor</string>
-    <string name="combov2_hit_unexpected_tbr_limit">GBO ayarlanırken beklenmeyen bir sınırla karşılaşıldı: hedef yüzde %1$d%% idi, fakat %1$d%%\'de bir sınıra ulaştı</string>
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">Temel bazal oran sıfırsa mutlak GBO ayarlanamaz</string>
     <string name="combov2_pair_with_pump_summary">AndroidAPS ile şu anda eşleştirilmemiş bir Accu-Chek Combo pompasını eşleştirin</string>
     <string name="combov2_unpair_pump_summary">Şu anda eşleştirilmiş olan Accu-Chek Combo pompasından AndroidAPS ve Android\'in eşlemesini kaldırın</string>
diff --git a/pump/dana/build.gradle b/pump/dana/build.gradle
index 0e5413b520..5d061f18ce 100644
--- a/pump/dana/build.gradle
+++ b/pump/dana/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/danar/build.gradle b/pump/danar/build.gradle
index aef5374f70..2300a81cb6 100644
--- a/pump/danar/build.gradle
+++ b/pump/danar/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/danars/build.gradle b/pump/danars/build.gradle
index d5b3fe78fc..b11ff6e526 100644
--- a/pump/danars/build.gradle
+++ b/pump/danars/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/diaconn/build.gradle b/pump/diaconn/build.gradle
index 2915d20e41..81af70ba94 100644
--- a/pump/diaconn/build.gradle
+++ b/pump/diaconn/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/eopatch/build.gradle b/pump/eopatch/build.gradle
index 103398f843..1a22f95ef7 100644
--- a/pump/eopatch/build.gradle
+++ b/pump/eopatch/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/eopatch/src/main/res/values-es-rES/strings.xml b/pump/eopatch/src/main/res/values-es-rES/strings.xml
index 53d7003bea..af1ff41201 100644
--- a/pump/eopatch/src/main/res/values-es-rES/strings.xml
+++ b/pump/eopatch/src/main/res/values-es-rES/strings.xml
@@ -6,19 +6,19 @@
     <string name="category_alerts">Alertas</string>
     <string name="low_reservoir">Alertas de reservorio bajo</string>
     <string name="patch_expiration_reminders">Recordatorio de expiración del parche</string>
-    <string name="patch_buzzer_reminders">Recordatorios de pitidos del parche</string>
+    <string name="patch_buzzer_reminders">Recordatorios de sonidos del parche</string>
     <string name="time_format_a_h_mm">h:mm a</string>
     <string name="eopatch_ble_status">Estado del Bluetooth</string>
-    <string name="eopatch_serial_number">Número de serie</string>
-    <string name="eopatch_lot_number">Número de lote</string>
+    <string name="eopatch_serial_number">Número de Serie</string>
+    <string name="eopatch_lot_number">Número de Lote</string>
     <string name="eopatch_wakeup_time">Fecha de activación</string>
-    <string name="eopatch_expiration_time">Fecha de expiración</string>
+    <string name="eopatch_expiration_time">Fecha y Hora de expiración</string>
     <string name="eopatch_status">Estado</string>
-    <string name="eopatch_base_basal_rate">Tasa basal base</string>
+    <string name="eopatch_base_basal_rate">Tasa basal predeterminada</string>
     <string name="eopatch_temp_basal_rate">Tasa basal temporal</string>
     <string name="eopatch_total_delivered">Total entregado</string>
-    <string name="invalid_basal_rate">La tasa basal del perfil es inferior a 0.05 U/h. EOPatch tiene una unidad de inyección mínima de 0.05U. Por favor, inténtelo de nuevo, después de ajustar el perfil usando la unidad de inyección mínima</string>
-    <string name="no_profile_selected">No se ha seleccionado ningún perfil. Por favor, seleccione un perfil e inténtelo de nuevo</string>
+    <string name="invalid_basal_rate">El perfil basal es inferior a 0.05 U/h EOPatch tiene una unidad de inyección mínima de 0.05 U. Por favor, inténtelo de nuevo después de ajustar el perfil usando la unidad miníma de inyección.</string>
+    <string name="no_profile_selected">No se ha seleccionado ningún perfil. Por favor, seleccione un perfil e inténtelo de nuevo.</string>
     <string name="symbol_day">día</string>
     <string name="symbol_plus">+</string>
     <string name="symbol_minus">-</string>
@@ -27,68 +27,68 @@
     <string name="time_1hr_30min">1 hr 30 min</string>
     <string name="time_2hr">2 horas</string>
     <string name="all_blank">\u0020</string>
-    <string name="patch_safe_deactivation_desc">Para cambiar a un nuevo parche, el parche actual debe ser desechado. Se cancelarán todos los suministros de insulina del parche</string>
-    <string name="patch_discard_complete_title">El parche se ha desactivado por completo</string>
-    <string name="patch_discard_complete_desc">El parche ha sido desactivado.\nDesecha el parche.\nRetira el parche pegado a tu cuerpo</string>
-    <string name="patch_change_confirm_bolus_is_active_desc">Se ha administrado un bolo en este momento. ¿Realmente quieres cancelar la administración de insulina y descartar el parche?</string>
-    <string name="patch_change_confirm_temp_basal_is_active_desc">En este momento se está administrando una basal temporal. ¿Realmente quieres cancelar la administración de insulina y desechar el parche?</string>
-    <string name="patch_change_confirm_bolus_and_temp_basal_are_active_desc">Un bolo y una basal temporal han sido administrados en este momento. ¿Realmente quieres cancelar la administración de insulina y descartar el parche?</string>
-    <string name="patch_change_confirm_desc">¿Estás seguro de descartar el parche?</string>
+    <string name="patch_safe_deactivation_desc">Para cambiar al nuevo parche, el parche actual debe ser descartado. Todo suministro de insulina por parte del parche será cancelado.</string>
+    <string name="patch_discard_complete_title">El parche se ha desactivado por completo.</string>
+    <string name="patch_discard_complete_desc">El parche ha sido desactivado.\nDescarte el parche.\nElimine el parche pegado a tu cuerpo.</string>
+    <string name="patch_change_confirm_bolus_is_active_desc">Un bolo ha sido suministrado. ¿Realmente quieres cancelar el suministro de insulina y remover el parche?</string>
+    <string name="patch_change_confirm_temp_basal_is_active_desc">Un basal temporal ha sido suministrado en este momento. ¿Realmente desea cancelar el suministro insulina y remover el parche?</string>
+    <string name="patch_change_confirm_bolus_and_temp_basal_are_active_desc">Un bolo y un basal temporal han sido suministrados en este momento. ¿Realmente desea cancelar el suministro insulina y remover el parche?</string>
+    <string name="patch_change_confirm_desc">¿Seguro que quiere remover el parche?</string>
     <string name="patch_remaining_insulin">Insulina restante</string>
     <string name="patch_remaining_usage_period">Tiempo restante</string>
     <string name="patch_finish">Finalizar</string>
-    <string name="patch_forced_discard">Descartar</string>
-    <string name="patch_comm_error_during_discard_status">Descartar el parche debido a un error de comunicación </string>
+    <string name="patch_forced_discard">Remover</string>
+    <string name="patch_comm_error_during_discard_status">Remueva el parche debido a un error de comunicación </string>
     <string name="patch_comm_error_during_discard_desc">Para la desactivación normal, pulse \'Reintentar\'.\nPara desactivar unilateralmente, pulse \'Descartar\'.</string>
-    <string name="patch_comm_error_during_discard_desc_1">Para la desactivación normal, pulse \'Reintentar\'</string>
+    <string name="patch_comm_error_during_discard_desc_1">Para la desactivación normal, pulse \'Reintentar\'.</string>
     <string name="patch_comm_error_during_discard_desc_2">Para desactivar unilateralmente, pulse \"Remover\".</string>
     <string name="patch_manually_turning_off_alarm_title">Apagar manualmente la alarma del parche</string>
-    <string name="patch_manually_turning_off_alarm_desc_1">Si se desactiva unilateralmente durante un error de comunicación, es posible que el pitido de alarma del parche no deje de sonar</string>
-    <string name="patch_manually_turning_off_alarm_desc_2">En este caso, puede detenerlo completamente pinchando el puerto de liberación manual de la alarma en el parche, como se indica a continuación:</string>
-    <string name="patch_manually_turning_off_alarm_step_1">1. Retire el parche de su cuerpo y despegue la cinta adhesiva</string>
-    <string name="patch_manually_turning_off_alarm_step_2">2. Con un clip, perfore con fuerza el orificio situado junto al puerto de llenado de insulina</string>
+    <string name="patch_manually_turning_off_alarm_desc_1">Si se desactiva unilateralmente durante un error de comunicación, es posible que el sonido de alarma del parche no deje de sonar.</string>
+    <string name="patch_manually_turning_off_alarm_desc_2">En este caso, puede detenerlo completamente pulsando el botón de Alarma manual que libera el puerto del parche como se muestra a continuación:</string>
+    <string name="patch_manually_turning_off_alarm_step_1">1. Retire el parche de su cuerpo y despegue la cinta adhesiva.</string>
+    <string name="patch_manually_turning_off_alarm_step_2">2. Use un clip, para presionar fuertemente el agujero al lado de a la entrada de insulina.</string>
     <string name="patch_wake_up">Llenado de insulina</string>
     <string name="patch_wake_up_step">1/6</string>
     <string name="patch_step_desc_1">1.</string>
     <string name="patch_wake_up_desc_1">Llene un nuevo parche con insulina a temperatura ambiente. Compruebe el ángulo de la jeringa</string>
     <string name="patch_step_desc_2">2.</string>
-    <string name="patch_wake_up_desc_2">Comprueba que suena 1 pitido</string>
-    <string name="patch_start_pairing">Iniciar emparejamiento</string>
+    <string name="patch_wake_up_desc_2">Comprueba que sonó 1 pitido.</string>
+    <string name="patch_start_pairing">Iniciar el emparejamiento</string>
     <string name="patch_connect_new">Emparejamiento del parche</string>
     <string name="patch_connect_new_step">2/6</string>
-    <string name="patch_connect_new_desc">El nuevo parche está siendo emparejado.\nMantén la distancia entre el parche y el dispositivo inteligente lo más cerca posible</string>
-    <string name="patch_remove_needle_cap">Prepárate para la colocación del parche</string>
+    <string name="patch_connect_new_desc">El nuevo parche está siendo emparejado.\nMantenga la distancia entre el parche y el dispositivo inteligente lo más cerca posible</string>
+    <string name="patch_remove_needle_cap">Prepárate para colocar el parche</string>
     <string name="patch_remove_needle_cap_step">3/6</string>
-    <string name="patch_remove_needle_cap_desc_1">Retire la cinta adhesiva y pulse \'Siguiente\'</string>
-    <string name="patch_remove_needle_cap_desc_2">[Caution1] Si sobresale la aguja, pulsa en \'Descartar\'</string>
-    <string name="patch_remove_needle_cap_desc_3">[Caution2] Si el parche está húmedo o sucio, o su cinta adhesiva está doblada, pulsa en \'Desechar\'</string>
-    <string name="patch_remove_protection_tape">Colocación del parche</string>
+    <string name="patch_remove_needle_cap_desc_1">Retire la cinta adhesiva y luego pulse \'Siguiente\'.</string>
+    <string name="patch_remove_needle_cap_desc_2">[Caution1] Si la aguja es visible, pulse \'Descartar\'.</string>
+    <string name="patch_remove_needle_cap_desc_3">[Caution2] Si el parche está húmedo, sucio, o su cinta adhesiva está doblada, pulse \'Descartar\'.</string>
+    <string name="patch_remove_protection_tape">Coloque el parche en su cuerpo</string>
     <string name="patch_remove_protection_tape_step">4/6</string>
-    <string name="patch_remove_protection_tape_desc_1">Limpia y sequa la zona de aplicación y, a continuación, adhiere el parche a la piel</string>
-    <string name="patch_remove_protection_tape_desc_2">Comprueba el lugar de infusión y, a continuación, pulsa en \"Iniciar comprobación de seguridad\"</string>
-    <string name="patch_start_safety_check">Inicio de la comprobación de seguridad</string>
-    <string name="patch_safety_check">Comprobación de seguridad...</string>
+    <string name="patch_remove_protection_tape_desc_1">Limpie y seque el sitio de la aplicación, luego de colocar el parche en la piel.</string>
+    <string name="patch_remove_protection_tape_desc_2">Revise el sitio de infusión y luego pulse \"Comenzar verificación de seguridad\".</string>
+    <string name="patch_start_safety_check">Empezar la revisión de seguridad</string>
+    <string name="patch_safety_check">Comprobaciones de seguridad…</string>
     <string name="patch_safety_check_step">5/6</string>
     <string name="patch_safety_check_desc_1">Tardará unos 30 segundos</string>
-    <string name="patch_safety_check_desc_2">[Caution] Para un uso seguro, no retire la palanca de accionamiento de la aguja hasta que haya finalizado la comprobación de seguridad</string>
+    <string name="patch_safety_check_desc_2">[Caution] Para un uso seguro, no retire la palanca que ejecuta la aguja hasta que se complete la verificación de seguridad!</string>
     <string name="patch_rotate_knob">Inserción de la aguja</string>
     <string name="patch_rotate_knob_step">6/6</string>
     <string name="patch_rotate_knob_desc_1">Gira la palanca de accionamiento de la aguja más de 100° para insertar la aguja y, a continuación, gírala completamente para extraerla</string>
-    <string name="patch_rotate_knob_desc_2">Comprueba si suena 1 pitido y, a continuación, pulsa en \"Siguiente\"</string>
-    <string name="patch_rotate_knob_desc_2_needle_insertion_error">Comprueba si suena 1 pitido y pulsa en \"Reintentar\"</string>
+    <string name="patch_rotate_knob_desc_2">Comprueba si suena 1 pitido y luego pulsa en \"Siguiente\".</string>
+    <string name="patch_rotate_knob_desc_2_needle_insertion_error">Comprueba si suena 1 pitido y luego pulsa en \"Reintentar\".</string>
     <string name="patch_basal_schedule">¡Activación del parche completada!</string>
-    <string name="patch_basal_schedule_desc_1">El programa \'%1$s\' ha sido habilitado</string>
+    <string name="patch_basal_schedule_desc_1">El programa \'%1$s\' ha sido habilitado.</string>
     <string name="patch_basal_schedule_desc_2">Te avisa cuando el parche está a punto de caducar.\nCambia la hora del recordatorio si es necesario</string>
-    <string name="patch_expiration_reminder_setting_title">Recordatorio de caducidad de los parches</string>
+    <string name="patch_expiration_reminder_setting_title">Recordatorio de expiración del parche</string>
     <string name="patch_activate_reminder_title">Recordatorio de activación del parche</string>
-    <string name="patch_activate_reminder_desc">No se ha completado la activación del parche.\n Continúa</string>
-    <string name="patch_communication_check">Comprobación de la comunicación del parche</string>
-    <string name="patch_communication_check_status_1">Comprobando la comunicación con el parche…</string>
-    <string name="patch_communication_check_helper_1">Acerca tu dispositivo inteligente al parche</string>
-    <string name="patch_communication_check_helper_2">Por favor, desplázate a otra ubicación e inténtalo de nuevo</string>
+    <string name="patch_activate_reminder_desc">La activación del parche no se ha completado.\n Continuar.</string>
+    <string name="patch_communication_check">Revisión de la comunicación del parche</string>
+    <string name="patch_communication_check_status_1">Comprobando comunicación con el parche…</string>
+    <string name="patch_communication_check_helper_1">Acerca tu dispositivo inteligente al parche.</string>
+    <string name="patch_communication_check_helper_2">Por favor, muévete a otra ubicación e inténtalo de nuevo.</string>
     <string name="patch_communication_failed">Error de comunicación</string>
-    <string name="patch_communication_succeed">Éxito en la comunicación</string>
-    <string name="patch_communication_succeed_message">Conectado con el parche</string>
+    <string name="patch_communication_succeed">Comunicación exitosa</string>
+    <string name="patch_communication_succeed_message">Conectado con el parche.</string>
     <string name="patch_cancel_pairing">Cancelar emparejamiento</string>
     <string name="symbol_days">días</string>
     <string name="all_dose_unit">&#160;U</string>
@@ -126,7 +126,7 @@
     <string name="finish">Finalizar</string>
     <string name="string_temp_basal_remained_hhmm">tiempo restante: %1$s:%2$s</string>
     <string name="next">Siguiente</string>
-    <string name="patch_connection_fail">Reintentar después de la comprobación de comunicación con el parche</string>
+    <string name="patch_connection_fail">Reintentar después de la verificación de comunicación con el parche.</string>
     <string name="string_pause_failed">Suspención fallida</string>
     <string name="string_resume_failed">Reanudación fallida</string>
     <string name="date_format_yyyy_m_d_e_a_hh_mm_comma">EEE, d MMM, aaaa hh:mm a</string>
diff --git a/pump/medtronic/build.gradle b/pump/medtronic/build.gradle
index cbbabd9427..792c712b90 100644
--- a/pump/medtronic/build.gradle
+++ b/pump/medtronic/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/omnipod-common/build.gradle b/pump/omnipod-common/build.gradle
index dd5fe3be71..51397ea938 100644
--- a/pump/omnipod-common/build.gradle
+++ b/pump/omnipod-common/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/omnipod-common/src/main/res/values-es-rES/strings.xml b/pump/omnipod-common/src/main/res/values-es-rES/strings.xml
index 46f6395d30..5707aad031 100644
--- a/pump/omnipod-common/src/main/res/values-es-rES/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-es-rES/strings.xml
@@ -9,8 +9,8 @@
     <string name="omnipod_common_pod_management_button_deactivate_pod">Desactivar Pod</string>
     <string name="omnipod_common_pod_management_button_discard_pod">Descartar Pod</string>
     <string name="omnipod_common_pod_management_discard_pod_confirmation">Si descartas el Pod, ya no podrás comunicarte con él. Sólo deberías hacer esto cuando toda la comunicación con el Pod falla continuamente. Si todavía puede comunicarse con el Pod, utilice la opción <b>Desactivar Pod</b>.\n\nSi desea continuar, por favor asegúrese de quitar el Pod de su cuerpo!</string>
-    <string name="omnipod_common_pod_management_button_play_test_beep">Reproducir pitido de prueba</string>
-    <string name="omnipod_common_pod_management_button_playing_test_beep">Reproduciendo pitido de prueba…</string>
+    <string name="omnipod_common_pod_management_button_play_test_beep">Reproducir sonido de prueba</string>
+    <string name="omnipod_common_pod_management_button_playing_test_beep">Reproduciendo sonido de prueba!</string>
     <string name="omnipod_common_pod_management_button_pod_history">Historial de Pod</string>
     <!-- Omnipod - Error -->
     <string name="omnipod_common_error_pod_not_attached">Ningún pod activo</string>
@@ -30,7 +30,7 @@
     <string name="omnipod_common_error_pod_fault_activation_time_exceeded">Se ha excedido el tiempo de activación del Pod. Este Pod ya no se puede activar.</string>
     <string name="omnipod_common_error_failed_to_verify_activation_progress">Error al verificar el progreso de activación. Vuelva a intentarlo.</string>
     <string name="omnipod_common_error_pod_suspended">Pod suspendido</string>
-    <string name="omnipod_common_error_failed_to_play_test_beep">Error al reproducir el pitido de prueba</string>
+    <string name="omnipod_common_error_failed_to_play_test_beep">Error al reproducir el sonido de prueba</string>
     <string name="omnipod_common_error_time_out_of_sync">La hora en el Pod está desincronizada. Actualice la hora en la pestaña Omnipod.</string>
     <string name="omnipod_common_error_unexpected_exception">Error inesperado. Por favor, informe! (tipo: %1$s:%2$s).</string>
     <!-- Omnipod - Confirmation -->
@@ -97,10 +97,10 @@
     <string name="omnipod_common_pod_deactivation_wizard_discard_pod_confirmation">Si descartas el Pod, ya no podrás comunicarte con él. Sólo deberías hacer esto cuando toda la comunicación con el Pod falla de forma persistente. ¿Estás seguro de que quieres descartar el Pod?</string>
     <string name="omnipod_common_pod_deactivation_wizard_discard_pod">Descartar Pod</string>
     <!-- Omnipod - Preferences -->
-    <string name="omnipod_common_preferences_bolus_beeps_enabled">Pitidos de bolo habilitados</string>
-    <string name="omnipod_common_preferences_basal_beeps_enabled">Pitidos de basales habilitados</string>
-    <string name="omnipod_common_preferences_smb_beeps_enabled">Pitidos SMB habilitados</string>
-    <string name="omnipod_common_preferences_tbr_beeps_enabled">Pitidos de TBR activados</string>
+    <string name="omnipod_common_preferences_bolus_beeps_enabled">Sonidos de bolo habilitados</string>
+    <string name="omnipod_common_preferences_basal_beeps_enabled">Sonidos de basales habilitados</string>
+    <string name="omnipod_common_preferences_smb_beeps_enabled">Sonidos de SMB habilitados</string>
+    <string name="omnipod_common_preferences_tbr_beeps_enabled">Sonidos de TBR activados</string>
     <string name="omnipod_common_preferences_suspend_delivery_button_enabled">Mostrar el botón Suspender Entrega en la pestaña Omnipod</string>
     <string name="omnipod_common_preferences_time_change_enabled">Detección de zona horaria activada</string>
     <string name="omnipod_common_preferences_expiration_reminder_enabled">Recordatorio de expiración activado</string>
@@ -110,7 +110,7 @@
     <string name="omnipod_common_preferences_automatically_silence_alerts">Silenciar automáticamente las alertas de POD</string>
     <string name="omnipod_common_preferences_category_other">Otros</string>
     <string name="omnipod_common_preferences_category_alerts">Alertas</string>
-    <string name="omnipod_common_preferences_category_confirmation_beeps">Pitidos de Confirmación</string>
+    <string name="omnipod_common_preferences_category_confirmation_beeps">Sonido de Confirmación</string>
     <string name="omnipod_common_preferences_category_notifications">Notificaciones</string>
     <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Sonido para notificaciones TBR inciertas habilitadas</string>
     <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Sonido para
@@ -149,8 +149,8 @@
     <string name="omnipod_common_cmd_set_fake_suspended_tbr">Establece una base temporal falsa porque el Pod está suspendido</string>
     <string name="omnipod_common_cmd_cancel_fake_suspended_tbr">Cancelar la basal temporal falsa que se ha creado porque el Pod se ha suspendido</string>
     <string name="omnipod_common_cmd_split_tbr">Dividir basal temporal debido a un fallo incierto en la cancelación</string>
-    <string name="omnipod_common_cmd_beep_config">Configuración de Pitidos</string>
-    <string name="omnipod_common_cmd_play_test_beep">Reproducir Pitido de Prueba</string>
+    <string name="omnipod_common_cmd_beep_config">Configuración de Sonidos</string>
+    <string name="omnipod_common_cmd_play_test_beep">Reproducir Sonido de Prueba</string>
     <!-- Omnipod - Alerts -->
     <string name="omnipod_common_alert_finish_pairing_reminder">Finalizar recordatorio de emparejamiento</string>
     <string name="omnipod_common_alert_finish_setup_reminder_reminder">Recordatorio de configuración finalizado</string>
diff --git a/pump/omnipod-dash/build.gradle b/pump/omnipod-dash/build.gradle
index d578467cba..85e7e848c7 100644
--- a/pump/omnipod-dash/build.gradle
+++ b/pump/omnipod-dash/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/omnipod-eros/build.gradle b/pump/omnipod-eros/build.gradle
index 41cdc705dc..e5c8689434 100644
--- a/pump/omnipod-eros/build.gradle
+++ b/pump/omnipod-eros/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/pump-common/build.gradle b/pump/pump-common/build.gradle
index 0b37f32136..ba01b3436f 100644
--- a/pump/pump-common/build.gradle
+++ b/pump/pump-common/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/pump-core/build.gradle b/pump/pump-core/build.gradle
index 911a289c07..459c464237 100644
--- a/pump/pump-core/build.gradle
+++ b/pump/pump-core/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/rileylink/build.gradle b/pump/rileylink/build.gradle
index 9fb2462907..83b6297405 100644
--- a/pump/rileylink/build.gradle
+++ b/pump/rileylink/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/pump/virtual/build.gradle b/pump/virtual/build.gradle
index 3f2bc9b9ac..e8b35a41dd 100644
--- a/pump/virtual/build.gradle
+++ b/pump/virtual/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/ui/build.gradle b/ui/build.gradle
index 65ab57b1b0..9f9322530e 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
diff --git a/wear/build.gradle b/wear/build.gradle
index f501c7174b..8b1b954bb0 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -2,12 +2,10 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
 
     dependencies {
-        //classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
-        classpath 'com.hiya:jacoco-android:0.2'
+        classpath "org.jacoco:org.jacoco.core:0.8.10"
     }
 }
 
@@ -16,7 +14,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
@@ -91,6 +88,7 @@ allprojects {
         google()
         mavenCentral()
     }
+    apply plugin: 'jacoco'
 }
 
 
diff --git a/wear/src/main/java/info/nightscout/androidaps/tile/TileBase.kt b/wear/src/main/java/info/nightscout/androidaps/tile/TileBase.kt
index f51ee13431..2e0b67e835 100644
--- a/wear/src/main/java/info/nightscout/androidaps/tile/TileBase.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/tile/TileBase.kt
@@ -42,7 +42,7 @@ import kotlin.math.sqrt
 
 private const val SPACING_ACTIONS = 3f
 private const val ICON_SIZE_FRACTION = 0.4f // Percentage of button diameter
-private const val BUTTON_COLOR = R.color.gray_850
+private val BUTTON_COLOR = R.color.gray_850
 private const val LARGE_SCREEN_WIDTH_DP = 210
 
 interface TileSource {
diff --git a/workflow/build.gradle b/workflow/build.gradle
index 2613883ba4..220cf075f1 100644
--- a/workflow/build.gradle
+++ b/workflow/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
 }
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"