Merge remote-tracking branch 'Nightscout/dev' into Autotune/AutotuneClean

2022-05-06 00:27:30 +02:00 · 2022-05-06 00:27:30 +02:00 · a12e1079b1
parent 344a896d51 1b43c9e0e9
commit a12e1079b1
98 changed files with 580 additions and 850 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -109,7 +109,7 @@ android {
    defaultConfig {
        multiDexEnabled true
        versionCode 1500
-        version "3.0.0.2-dev-i"
+        version "3.0.0.2-dev-j"
        buildConfigField "String", "VERSION", '"' + version + '"'
        buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
        buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
@ -65,9 +65,11 @@ class LoopFragment : DaggerFragment() {

    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
        super.onCreateOptionsMenu(menu, inflater)
-        menu.removeItem(ID_MENU_RUN)
-        menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.openapsma_run)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-        menu.setGroupDividerEnabled(true)
+        if (isResumed) {
+            menu.removeItem(ID_MENU_RUN)
+            menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.openapsma_run)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+            menu.setGroupDividerEnabled(true)
+        }
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean =
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt
@ -28,7 +28,6 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.*
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.wizard.BolusWizard
 import info.nightscout.androidaps.utils.wizard.QuickWizard
@ -46,7 +45,6 @@ import java.util.concurrent.TimeUnit
 import java.util.stream.Collectors
 import javax.inject.Inject
 import javax.inject.Singleton
-import kotlin.collections.ArrayList
 import kotlin.math.abs
 import kotlin.math.min

@ -89,6 +87,7 @@ class DataHandlerMobile @Inject constructor(
            .observeOn(aapsSchedulers.io)
            .subscribe({
                           aapsLogger.debug(LTag.WEAR, "Pong received from ${it.sourceNodeId}")
+                           fabricPrivacy.logCustom("WearOS_${it.apiLevel}")
                       }, fabricPrivacy::logException)
        disposable += rxBus
            .toObservable(EventData.CancelBolus::class.java)
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
@ -20,6 +20,7 @@ import info.nightscout.androidaps.plugins.general.wear.events.EventWearUpdateGui
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.interfaces.ResourceHelper
+import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.wizard.QuickWizard
 import info.nightscout.shared.logging.AAPSLogger
@ -35,6 +36,7 @@ import javax.inject.Inject
 class DataLayerListenerServiceMobile : WearableListenerService() {

    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
    @Inject lateinit var profileFunction: ProfileFunction
    @Inject lateinit var iobCobCalculator: IobCobCalculator
    @Inject lateinit var rh: ResourceHelper
@ -125,17 +127,21 @@ class DataLayerListenerServiceMobile : WearableListenerService() {
    private var transcriptionNodeId: String? = null

    private fun updateTranscriptionCapability() {
-        val capabilityInfo: CapabilityInfo = Tasks.await(
-            capabilityClient.getCapability(WEAR_CAPABILITY, CapabilityClient.FILTER_REACHABLE)
-        )
-        aapsLogger.debug(LTag.WEAR, "Nodes: ${capabilityInfo.nodes.joinToString(", ") { it.displayName + "(" + it.id + ")" }}")
-        val bestNode = pickBestNodeId(capabilityInfo.nodes)
-        transcriptionNodeId = bestNode?.id
-        wearPlugin.connectedDevice = bestNode?.displayName ?: "---"
-        rxBus.send(EventWearUpdateGui())
-        aapsLogger.debug(LTag.WEAR, "Selected node: ${bestNode?.displayName} $transcriptionNodeId")
-        rxBus.send(EventMobileToWear(EventData.ActionPing(System.currentTimeMillis())))
-        rxBus.send(EventData.ActionResendData("WatchUpdaterService"))
+        try {
+            val capabilityInfo: CapabilityInfo = Tasks.await(
+                capabilityClient.getCapability(WEAR_CAPABILITY, CapabilityClient.FILTER_REACHABLE)
+            )
+            aapsLogger.debug(LTag.WEAR, "Nodes: ${capabilityInfo.nodes.joinToString(", ") { it.displayName + "(" + it.id + ")" }}")
+            val bestNode = pickBestNodeId(capabilityInfo.nodes)
+            transcriptionNodeId = bestNode?.id
+            wearPlugin.connectedDevice = bestNode?.displayName ?: "---"
+            rxBus.send(EventWearUpdateGui())
+            aapsLogger.debug(LTag.WEAR, "Selected node: ${bestNode?.displayName} $transcriptionNodeId")
+            rxBus.send(EventMobileToWear(EventData.ActionPing(System.currentTimeMillis())))
+            rxBus.send(EventData.ActionResendData("WatchUpdaterService"))
+        } catch (e: Exception) {
+            fabricPrivacy.logCustom("WearOS_unsupported")
+        }
    }

    // Find a nearby node or pick one arbitrarily
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@ -342,7 +342,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Pr</string>
    <string name="shortfat">Vet</string>
-    <string name="active"><![CDATA[<Active>]]></string>
    <string name="executingrightnow">Opdrag word nou uitgevoer</string>
    <string name="missed_bg_readings">Gemiste BG lesings</string>
    <string name="raise_notifications_as_android_notifications">Gebruik stelsel kennisgewings vir waarskuwings en kennisgewings</string>
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@ -459,7 +459,6 @@
    <string name="shortenergy">Ен</string>
    <string name="shortprotein">Бел.</string>
    <string name="shortfat">Маз.</string>
-    <string name="active"><![CDATA[<Активно>]]></string>
    <string name="executingrightnow">Командата се изпълнява в момента</string>
    <string name="missed_bg_readings">Липсват данни за КЗ</string>
    <string name="raise_notifications_as_android_notifications">Използвай системни известия за аларми и съобщения</string>
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -468,7 +468,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Pr</string>
    <string name="shortfat">Tuk</string>
-    <string name="active"><![CDATA[<Aktivní>]]></string>
    <string name="executingrightnow">Příkaz je právě prováděn</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>
@ -1009,5 +1008,18 @@
    <string name="show_hide_records">Skrýt záznamy smyčky</string>
    <string name="widget_description">AndroidAPS widget</string>
    <string name="configure">Konfigurovat průhlednost</string>
+    <string name="loop_status">Stav smyčky</string>
+    <string name="a11y_otp_qr_code">QR kód pro nastavení jednorázového hesla</string>
+    <string name="a11y_open_settings">otevřít nastavení</string>
+    <string name="a11y_set_carb_timer">nastavit upozornění na sacharidy</string>
+    <string name="device_all">Vše</string>
+    <string name="device_phone">Telefon</string>
+    <string name="device_watch">Hodinky</string>
+    <string name="a11y_only_on_watch">pouze na hodinkách</string>
+    <string name="a11y_only_on_phone">pouze na telefonu</string>
+    <string name="a11y_drag_and_drop_handle">úchyt pro přetažení</string>
    <!-- Aidex Cgms -->
+    <string name="aidex">GlucoRx Aidex</string>
+    <string name="aidex_short">Aidex</string>
+    <string name="description_source_aidex">Přijímat hodnoty glykémie ze senzoru GlucoRx Aidex.</string>
 </resources>
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@ -461,7 +461,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Pr</string>
    <string name="shortfat">Fedt</string>
-    <string name="active"><![CDATA[<Active>]]></string>
    <string name="executingrightnow">Kommando udføres lige nu</string>
    <string name="missed_bg_readings">Manglende BS målinger </string>
    <string name="raise_notifications_as_android_notifications">Brug systemnotifikationer til advarsler og notifikationer</string>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -463,7 +463,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Prot</string>
    <string name="shortfat">Ft</string>
-    <string name="active"><![CDATA[<Aktiv>]]></string>
    <string name="executingrightnow">Befehl wird zurzeit ausgeführt</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>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@ -344,7 +344,6 @@
    <string name="shortenergy">Ενέργεια</string>
    <string name="shortprotein">Πρωτεΐνες</string>
    <string name="shortfat">Λίπος</string>
-    <string name="active"><![CDATA[<Ενεργή>]]></string>
    <string name="executingrightnow">Η εντολή εκτελείται τώρα</string>
    <string name="missed_bg_readings">Χαμένες μετρήσεις BG</string>
    <string name="raise_notifications_as_android_notifications">Χρησιμοποιήστε ειδοποιήσεις συστήματος για ειδοποιήσεις και συναγερμούς</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -92,7 +92,7 @@
    <string name="configbuilder_loop_description">Utiliza esta opción para activar la integración del lazo en AndroidAPS</string>
    <string name="loop_aps_label">APS</string>
    <string name="loop_constraintsprocessed_label">Tras procesar las restricciones</string>
-    <string name="loop_tbrsetbypump_label">Basal temporal en la bomba</string>
+    <string name="loop_tbrsetbypump_label">Basal temporal establecida por la bomba</string>
    <string name="noapsselected">NO APS Seleccionado o resultado entregado</string>
    <string name="safety">Seguridad</string>
    <string name="openapsma_disabled">El complemento está deshabilitado</string>
@ -238,7 +238,7 @@
    <string name="button3">Botón 3</string>
    <string name="units_colon">Unidades:</string>
    <string name="units">Unidades</string>
-    <string name="dia">Duración de la insulina activa</string>
+    <string name="dia">DIA</string>
    <string name="prefs_range_title">Rango de visualización</string>
    <string name="prefs_range_summary">Establece los rangos de glucosa objetivos (hiper e hipo) en la pantalla inicio de AAPS y en la esfera del reloj</string>
    <string name="low_mark">Valor de hipoglucemia</string>
@ -468,7 +468,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Pr</string>
    <string name="shortfat">Grasa</string>
-    <string name="active"><![CDATA[<Activo>]]></string>
    <string name="executingrightnow">Orden se esta efectuando en este momento</string>
    <string name="missed_bg_readings">Faltan lecturas de glucosa</string>
    <string name="raise_notifications_as_android_notifications">Usa las notificaciones del sistema para las alarmas y las notificaciones</string>
@ -734,7 +733,7 @@
    <string name="description_source_dexcom">Recibir los valores de glucosa de la aplicación Dexcom \'Build Your Own Device\'</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 carbohidratos: %2$d%% de tiempo. Compruebe de nuevo su cálculo. Los COB se pueden sobrestimar, por lo que se podría administrar más insulina de la cuenta</font>]]></string>
+    <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>¡Se ha detectado una absorción lenta de carbohidratos: %2$d%% de tiempo. Comprueba de nuevo el cálculo. 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>
    <string name="snooze">Silenciar</string>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -469,7 +469,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="shortenergy">En</string>
    <string name="shortprotein">Protéines</string>
    <string name="shortfat">Gras (Lipides)</string>
-    <string name="active"><![CDATA[<Actif>]]></string>
    <string name="executingrightnow">Commande exécutée à l\'instant</string>
    <string name="missed_bg_readings">Valeurs de glycémie manquantes</string>
    <string name="raise_notifications_as_android_notifications">Utiliser les notifications système pour les alertes et notifications</string>
@ -1009,6 +1008,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="show_hide_records">Masquer les entrées de la boucle</string>
    <string name="widget_description">Widget AndroidAPS</string>
    <string name="configure">Configurer l’opacité</string>
+    <string name="loop_status">État de la boucle</string>
    <string name="a11y_otp_qr_code">Code QR pour configurer un mot de passe à usage unique</string>
    <string name="a11y_open_settings">ouvrir les paramètres</string>
    <string name="a11y_set_carb_timer">définir l\'alarme du minuteur de glucides</string>
--- a/app/src/main/res/values-it-rIT/exam.xml
+++ b/app/src/main/res/values-it-rIT/exam.xml
@ -104,9 +104,11 @@
    <string name="troubleshooting_wheretoask">Dove puoi cercare aiuto con AndroidAPS?</string>
    <string name="troubleshooting_fb">Puoi chiedere consiglio nel gruppo Facebook degli utenti AndroidAPS.</string>
    <string name="troubleshooting_wiki">Dovresti leggere (e rileggere) la documentazione di AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Puoi chiedere consigli e segnalare problemi tecnici nel Discord di AndroidAPS.</string>
    <string name="troubleshooting_yourendo">Dovresti chiedere al tuo endocrinologo/centro diabetologico.</string>
    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
    <string name="troubleshooting_hint2">https://www.facebook.com/groups/aapsitalia/</string>
+    <string name="troubleshooting_hint3">https://discord.gg/4fQUWHZ4Mw</string>
    <string name="insulin_label">Plugin insulina</string>
    <string name="insulin_ultrarapid">Quale insulina dovresti usare con il plugin Ultra-Rapid Oref?</string>
    <string name="insulin_fiasp">Fiasp®</string>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -161,6 +161,7 @@
    <string name="end_user_license_agreement">Contratto di licenza per l\'utente</string>
    <string name="end_user_license_agreement_text">NON DEVE ESSERE USATO PER PRENDERE DECISIONI MEDICHE. NON ESISTE ALCUNA GARANZIA PER IL PROGRAMMA, NELLA MISURA CONSENTITA DALLA LEGGE APPLICABILE. TRANNE QUANDO DIVERSAMENTE INDICATO PER ISCRITTO, I DETENTORI DEL COPYRIGHT E/O ALTRE PARTI FORNISCONO IL PROGRAMMA \"COSÌ COM\'È\" SENZA GARANZIA DI ALCUN TIPO, ESPLICITA O IMPLICITA, INCLUSE, MA NON LIMITATAMENTE A, GARANZIE IMPLICITE DI COMMERCIABILITÀ E IDONEITÀ PER UN SCOPO PARTICOLARE. L\'INTERO RISCHIO RIGUARDO LA QUALITÀ E LE PRESTAZIONI DEL PROGRAMMA È TUO. SE IL PROGRAMMA DOVESSE RISULTARE DIFETTOSO, TI ASSUMI IL COSTO DI TUTTE LE NECESSARIE MANUTENZIONI, RIPARAZIONI O CORREZIONI.</string>
    <string name="end_user_license_agreement_i_understand">COMPRENDO E ACCETTO</string>
+    <string name="save">Salva</string>
    <string name="reloadprofile">Ricarica profilo</string>
    <string name="smscommunicator">Comunicazioni SMS</string>
    <string name="smscommunicator_allowednumbers">Numeri di telefono consentiti</string>
@ -266,6 +267,7 @@
    <string name="configbuilder_shortname">CONF</string>
    <string name="loop_shortname">LOOP</string>
    <string name="oaps_shortname">OAPS</string>
+    <string name="dynisf_shortname">ISFDIN</string>
    <string name="localprofile_shortname">PL</string>
    <string name="overview_shortname">HOME</string>
    <string name="virtualpump_shortname">MICROV</string>
@ -432,6 +434,8 @@
    <string name="ns_localbroadcasts_title">Abilita trasmissioni locali</string>
    <string name="openapssmb">OpenAPS SMB</string>
    <string name="openaps_smb_dynamic_isf">ISF Dinamico</string>
+    <string name="DynISFAdjust_title">%% fattore di regolazione ISF dinamico</string>
+    <string name="DynISFAdjust_summary">Fattore di regolazione per ISF dinamico. Imposta più del 100%% per correzioni più aggressive, meno del 100%% per correzioni meno aggressive.</string>
    <string name="enableuam">Abilita UAM</string>
    <string name="enablesmb">Abilita SMB</string>
    <string name="enablesmb_summary">Usa super-micro-boli al posto della basale temporanea per un\'azione più veloce</string>
@ -464,7 +468,6 @@
    <string name="shortenergy">Enr</string>
    <string name="shortprotein">Prt</string>
    <string name="shortfat">Grs</string>
-    <string name="active"><![CDATA[<Active>]]></string>
    <string name="executingrightnow">Il comando sarà eseguito ora</string>
    <string name="missed_bg_readings">Letture BG mancanti</string>
    <string name="raise_notifications_as_android_notifications">Usa le notifiche di sistema per gli avvisi</string>
@ -500,6 +503,7 @@
    <string name="negativeonly">Solo negativo</string>
    <string name="overview_editquickwizard_usecob">Calcolo COB</string>
    <string name="overview_editquickwizard_usetemptarget">Calcolo target temporaneo</string>
+    <string name="overview_editquickwizard_usepercentage">Calcolo percentuale</string>
    <string name="loopenabled">Loop abilitato</string>
    <string name="apsselected">APS selezionato</string>
    <string name="nsclienthaswritepermission">NSClient ha l\'autorizzazione di scrittura</string>
@ -662,6 +666,8 @@
    <string name="careportal_removestartedevents">Rimuovi gli eventi \"AndroidAPS avviato\"</string>
    <string name="show_invalidated">Mostra invalidato</string>
    <string name="hide_invalidated">Nascondi invalidato</string>
+    <string name="remove_items">Rimuovi elementi</string>
+    <string name="sort_items">Ordina elementi</string>
    <string name="storedsettingsfound">Trovate impostazioni memorizzate</string>
    <string name="allow_hardware_pump_text">Attenzione: se attivi e connetti un micro, AndroidAPS copierà le impostazioni della basale dal profilo al micro, sovrascrivendo la velocità basale esistente memorizzata sul micro. Assicurati di avere la giusta impostazione della basale in AndroidAPS. Se non sei sicuro o non vuoi sovrascrivere le impostazioni della basale sul micro, premi annulla e ripeti il processo in un altro momento.</string>
    <string name="error_adding_treatment_title">Dati trattamento incompleti</string>
@ -808,6 +814,7 @@
    <string name="smscommunicator_otp_install_info">Su ogni telefono follower installa una app autenticatore che supporta i token RFC 6238 TOTP. App gratuite popolari sono:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
    <string name="smscommunicator_otp_reset_warning">Resettando l\'autenticatore rendi non validi tutti gli autenticatori già forniti. Dovrai configurarli di nuovo!</string>
    <string name="overview_show_predictions">Predizioni</string>
+    <string name="overview_show_treatments">Trattamenti</string>
    <string name="overview_show_deviationslope">Pendenza deviazione</string>
    <string name="authorizationfailed">Autorizzazione fallita</string>
    <string name="overview_show_absinsulin">Insulina assoluta</string>
@ -877,6 +884,8 @@
    <string name="ns_receive_profile_switch_summary">Accetta cambi profilo inseriti tramite NS o NSClient</string>
    <string name="ns_receive_offline_event">Ricevi eventi APS offline</string>
    <string name="ns_receive_offline_event_summary">Accetta eventi APS offline inseriti tramite NS o NSClient</string>
+    <string name="ns_receive_tbr_eb">Ricevi TBR e EB</string>
+    <string name="ns_receive_tbr_eb_summary">Accetta TBR e EB inseriti attraverso altra istanza</string>
    <string name="ns_receive_insulin">Ricevi insulina</string>
    <string name="ns_receive_insulin_summary">Accetta insulina inserita tramite NS o NSClient (non viene erogata, solo calcolata per IOB)</string>
    <string name="ns_receive_carbs">Ricevi CHO</string>
@ -899,40 +908,117 @@
    <string name="errors">Errori</string>
    <string name="ns_sync_slow">Rallenta caricamenti</string>
    <string name="data_status">Stato dati BG</string>
+    <string name="remove_bg_readings">Rimuovi letture BG</string>
+    <string name="statuslights_cannula_age">Età cannula</string>
+    <string name="statuslights_patch_pump_age">età micro a patch</string>
+    <string name="patch_pump">Micro a patch</string>
    <string name="recalculated_data_used">Dati ricalcolati usati</string>
    <string name="bg_too_close">BG troppo vicino:\n%1$s\n%2$s</string>
    <string name="identification">Identificazione (email, nick Discord o FB, etc)</string>
    <string name="identification_not_set">Identificazione non impostata in modalità dev</string>
    <string name="a11y_dialog">dialogo</string>
    <string name="a11y_current_bg">glicemia corrente</string>
+    <string name="a11_correction_percentage">risultato corretto con %</string>
+    <string name="a11_correction_units">risultato corretto con unità</string>
    <string name="not_available_full">Non disponibile</string>
    <string name="a11y_high">alto</string>
    <string name="a11y_inrange">in range</string>
    <string name="a11y_low">basso</string>
+    <string name="a11y_arrow_double_down">discesa rapida</string>
+    <string name="a11y_arrow_single_down">discesa</string>
+    <string name="a11y_arrow_forty_five_down">discesa lenta</string>
    <string name="a11y_arrow_flat">stabile</string>
+    <string name="a11y_arrow_forty_five_up">salita lenta</string>
+    <string name="a11y_arrow_single_up">salita</string>
+    <string name="a11y_arrow_double_up">salita rapida</string>
+    <string name="a11y_arrow_none">nessuno</string>
    <string name="a11y_arrow_unknown">sconosciuto</string>
    <string name="a11y_graph">grafico</string>
    <string name="a11y_bg_quality">qualità glicemia</string>
    <string name="a11y_bg_quality_recalculated">ricalcolato</string>
+    <string name="a11y_bg_quality_doubles">doppi caricamenti</string>
    <string name="a11y_insulin_label">insulina</string>
    <string name="a11y_blood_glucose">glicemia</string>
+    <string name="a11y_bg_outdated">obsoleto</string>
+    <string name="a11y_carb_reminder">imposta promemoria</string>
+    <string name="a11y_add_new_profile">aggiungi nuovo profilo</string>
+    <string name="a11y_clone_profile">clona profilo corrente</string>
+    <string name="a11y_delete_current_profile">elimina profilo corrente</string>
+    <string name="a11y_add_new_to_list">aggiungi nuovo alla lista</string>
    <!-- Theme switcher dark and light mode-->
+    <string name="theme_switcher_summary">Scegli tema scuro, chiaro o segui quello del sistema</string>
+    <string name="app_color_scheme">Schema colori app</string>
+    <string name="dark_theme">Tema scuro</string>
+    <string name="light_theme">Tema chiaro</string>
+    <string name="follow_system_theme">Usa tema dispositivo</string>
    <!-- WEAR OS-->
+    <string name="wear_action_tempt_preset_error">Preset sconosciuto target temporaneo: %1$s</string>
+    <string name="wear_action_tempt_cancel_message">Cancellare i target temporanei in esecuzione?</string>
+    <string name="wear_action_tempt_unit_error">Differenti unità usate su smartwatch e telefono!</string>
+    <string name="wear_action_tempt_zero_message">Nessuno target temporaneo - cancellare i target temporanei in esecuzione?</string>
+    <string name="wear_action_tempt_min_bg_error">Min-BG fuori range!</string>
+    <string name="wear_action_tempt_max_bg_error">Max-BG fuori range!</string>
+    <string name="wear_action_tempt_manual_range_message">Temptarget:\nMin: %1$s\nMax: %2$s\nDurata: %3$s</string>
+    <string name="wear_action_tempt_manual_message">Temptarget:\nTarget: %1$s\nDurata: %2$s</string>
+    <string name="wear_action_tempt_preset_message">Temptarget:\Motivo: %1$s\nTarget: %2$s\nDurata: %3$s</string>
+    <string name="quick_wizard_message">QuickWizard: %1$s\nInsulina: %2$.2fU\nCHO: %3$dg</string>
+    <string name="wizard_result">Calc. Wizard:\nInsulina: %1$.2fU\nCHO: %2$dg</string>
+    <string name="overview_editquickwizard_show_on_device">Mostra voce sul dispositivo:</string>
+    <string name="quick_wizard_not_available">Il calcolo rapido selezionato non è più disponibile, aggiorna il riquadro</string>
+    <string name="wizard_no_actual_bg">Nessun recente valore BG su cui basare il calcolo!</string>
+    <string name="wizard_no_active_profile">Nessun profilo attivo!</string>
+    <string name="wizard_no_cob">Valore COB sconosciuto! Lettura BG mancante o recente riavvio dell\'app?</string>
+    <string name="wizard_carbs_constraint">Violazione vincolo CHO!</string>
+    <string name="wizard_explain_calc">Calc (IC: %2$.1f, ISF: %2$.1f) da:\"</string>
    <string name="wizard_explain_carbs">CHO: %1$.2fU</string>
    <string name="wizard_explain_cob">COB: %1$.0fg %2$.2fU</string>
    <string name="wizard_explain_bg">BG: %1$.2fU</string>
    <string name="wizard_explain_basal_iob">IOB da basale: %1$.2fU</string>
    <string name="wizard_explain_bolus_iob">IOB da bolo: %1$.2fU</string>
    <string name="wizard_explain_superbolus">Superbolo: %1$.2fU</string>
+    <string name="wizard_explain_trend">Trend di 15\': %1$.2fU</string>
    <string name="wizard_explain_percent">Percentuale: %1$.2fU x %2$d%% ≈ %3$.2fU</string>
+    <string name="wizard_constraint_bolus_size">Violazione vincolo insulina!\nImpossibile erogare %1$.2fU</string>
    <string name="wizard_explain_tt">TempT: %1$s</string>
    <string name="wizard_explain_tt_to">%1$s a %2$s</string>
    <string name="wizard_pump_not_available">Nessun micro disponibile!</string>
+    <string name="wear_unknown_action_string">Comando sconosciuto:</string>
    <string name="overview_editquickwizard_percentage">Percentuale</string>
+    <string name="app_default">Predefinito applicazione</string>
+    <string name="show_invalidated_records">Mostra record non validi/rimossi</string>
+    <string name="hide_invalidated_records">Nascondi record non validi/rimossi</string>
+    <string name="select_profile">Seleziona profilo da modificare</string>
+    <string name="refresh_from_nightscout">Aggiorna da Nightscout</string>
    <string name="remove_selected_items">Rimuovi elementi selezionati</string>
    <string name="select_for_removal">Seleziona per la rimozione</string>
    <string name="profile_changes">Modifiche al profilo</string>
+    <string name="tempt_targets">Target Temporanei</string>
+    <string name="carbs_and_bolus">CHO e boli</string>
+    <string name="confirm_remove_multiple_items">Sicuro di voler rimuovere %1$d elementi</string>
+    <string name="no_records_available">Nessun record disponibile</string>
    <string name="hide_loop">Nascondi loop</string>
    <string name="show_loop">Mostra loop</string>
+    <string name="count_selected">%1$d selezionati</string>
+    <string name="sort_label">Ordina</string>
+    <string name="dialog_canceled">Finestra di dialogo cancellata</string>
+    <string name="below" comment="below &quot;in range&quot;">Sotto</string>
+    <string name="in_range">In range</string>
+    <string name="above" comment="above &quot;in range&quot;">Sopra</string>
+    <string name="show_loop_records">Mostra record di loop</string>
+    <string name="show_hide_records">Nascondi record di loop</string>
+    <string name="widget_description">Widget di AndroidAPS</string>
+    <string name="configure">Configura opacità</string>
+    <string name="a11y_otp_qr_code">Codice QR per configurare OTP</string>
+    <string name="a11y_open_settings">apri impostazioni</string>
+    <string name="a11y_set_carb_timer">imposta allarme timer CHO</string>
+    <string name="device_all">Tutto</string>
+    <string name="device_phone">Telefono</string>
+    <string name="device_watch">Smartwatch</string>
+    <string name="a11y_only_on_watch">solo su smartwatch</string>
+    <string name="a11y_only_on_phone">solo su telefono</string>
+    <string name="a11y_drag_and_drop_handle">trascina e rilascia</string>
    <!-- Aidex Cgms -->
+    <string name="aidex">GlucoRx Aidex</string>
+    <string name="aidex_short">GlucoRx Aidex</string>
+    <string name="description_source_aidex">Ricevi valori glicemia da CGM GlucoRx Aidex.</string>
 </resources>
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@ -468,7 +468,6 @@
    <string name="shortenergy">אנרגיה</string>
    <string name="shortprotein">חלבון</string>
    <string name="shortfat">שומן</string>
-    <string name="active"><![CDATA[<Active>]]></string>
    <string name="executingrightnow">הפקודה מבוצעת כעת</string>
    <string name="missed_bg_readings">לא התקבלו קריאות סוכר</string>
    <string name="raise_notifications_as_android_notifications">שימוש בהודעות מערכת עבור התראות ודיווחים</string>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@ -455,7 +455,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">단백질</string>
    <string name="shortfat">지방</string>
-    <string name="active"><![CDATA[<Active>]]></string>
    <string name="executingrightnow">명령을 지금 실행합니다.</string>
    <string name="missed_bg_readings">혈당 읽기가 누락되었습니다.</string>
    <string name="raise_notifications_as_android_notifications">경고와 알림시 시스템 알림 사용하기</string>
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@ -461,7 +461,6 @@
    <string name="shortenergy">Energ. vertė</string>
    <string name="shortprotein">Balt.</string>
    <string name="shortfat">Rieb</string>
-    <string name="active"><![CDATA[<Active>]]></string>
    <string name="executingrightnow">Komanda vykdoma</string>
    <string name="missed_bg_readings">Negauti KG duomenys</string>
    <string name="raise_notifications_as_android_notifications">Naudoti sistemos perspėjimus aliarmams ir įspėjimams</string>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -468,7 +468,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Prot</string>
    <string name="shortfat">Vet</string>
-    <string name="active"><![CDATA[<Huidig>]]></string>
    <string name="executingrightnow">Opdracht is nu uitgevoerd</string>
    <string name="missed_bg_readings">Geen BG metingen</string>
    <string name="raise_notifications_as_android_notifications">Gebruik systeem notificaties voor waarschuwingen en notificaties</string>
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@ -468,7 +468,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Pr</string>
    <string name="shortfat">Fett</string>
-    <string name="active"><![CDATA[<Active>]]></string>
    <string name="executingrightnow">Kommandoen utføres akkurat nå</string>
    <string name="missed_bg_readings">Mangler BS målinger</string>
    <string name="raise_notifications_as_android_notifications">Bruk systemvarslinger for alarmer og varslinger</string>
@ -815,6 +814,7 @@
    <string name="smscommunicator_otp_install_info">I hver følger telefon installerer du en Authenticator-app som støtter RFC 6238 TOTP token. Populære gratis apper er:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
    <string name="smscommunicator_otp_reset_warning">Ved å tilbakestille authenticator vil du gjøre alle lagrede autentiseringer ugyldige. Du må sette alle opp på nytt igjen!</string>
    <string name="overview_show_predictions">Prognoser</string>
+    <string name="overview_show_treatments">Behandlinger</string>
    <string name="overview_show_deviationslope">Avvikskurve</string>
    <string name="authorizationfailed">Autentisering feilet</string>
    <string name="overview_show_absinsulin">Absolutt insulinmengde</string>
@ -995,6 +995,7 @@
    <string name="tempt_targets">Temp Target</string>
    <string name="carbs_and_bolus">Karbohydrater og bolus</string>
    <string name="confirm_remove_multiple_items">Er du sikker på at du vil fjerne %1$d elementer</string>
+    <string name="no_records_available">Ingen registreringer tilgjengelig</string>
    <string name="hide_loop">Skjul loop</string>
    <string name="show_loop">Vis loop</string>
    <string name="count_selected">%1$d valgt</string>
@ -1007,5 +1008,17 @@
    <string name="show_hide_records">Skjul loop registreringer</string>
    <string name="widget_description">AndroidAPS widget</string>
    <string name="configure">Konfigurer gjennomsiktighet</string>
+    <string name="a11y_otp_qr_code">QR-kode for oppsett av engangspassord</string>
+    <string name="a11y_open_settings">åpne innstillinger</string>
+    <string name="a11y_set_carb_timer">angi karbo nedtellings alarm</string>
+    <string name="device_all">Alle</string>
+    <string name="device_phone">Telefon</string>
+    <string name="device_watch">Klokke</string>
+    <string name="a11y_only_on_watch">kun på klokke</string>
+    <string name="a11y_only_on_phone">kun på telefon</string>
+    <string name="a11y_drag_and_drop_handle">dra og slipp håndtering</string>
    <!-- Aidex Cgms -->
+    <string name="aidex">GlucoRx Aidex</string>
+    <string name="aidex_short">Aidex</string>
+    <string name="description_source_aidex">Motta BS verdier fra GlucoRx Aidex CGM.</string>
 </resources>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -461,7 +461,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Bi</string>
    <string name="shortfat">Tł</string>
-    <string name="active"><![CDATA[<Aktywny>]]></string>
    <string name="executingrightnow">Polecenie jest teraz wykonywane</string>
    <string name="missed_bg_readings">Pominięte odczyty BG</string>
    <string name="raise_notifications_as_android_notifications">Użyj powiadomień systemowych dla alertów i powiadomień</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -443,7 +443,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Pr</string>
    <string name="shortfat">Gor</string>
-    <string name="active"><![CDATA[<Ativo>]]></string>
    <string name="executingrightnow">Comando será executado agora</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>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -461,7 +461,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Pr</string>
    <string name="shortfat">Gor</string>
-    <string name="active"><![CDATA[<Activo>]]></string>
    <string name="executingrightnow">Comando será executado agora</string>
    <string name="missed_bg_readings">Leituras Glicose perdidas</string>
    <string name="raise_notifications_as_android_notifications">Utilizar as notificações do sistema para alertas e notificações</string>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -461,7 +461,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Pr</string>
    <string name="shortfat">Grăsime</string>
-    <string name="active"><![CDATA[<Activ>]]></string>
    <string name="executingrightnow">Se execută comanda chiar acum</string>
    <string name="missed_bg_readings">Lipsesc date glicemie</string>
    <string name="raise_notifications_as_android_notifications">Se folosesc notificările sistemului pentru alerte și notificări</string>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -468,7 +468,6 @@
    <string name="shortenergy">Энергия</string>
    <string name="shortprotein">Белки</string>
    <string name="shortfat">Жиры</string>
-    <string name="active"><![CDATA[<Active>]]></string>
    <string name="executingrightnow">Команда выполняется</string>
    <string name="missed_bg_readings">Пропущенные данные СК</string>
    <string name="raise_notifications_as_android_notifications">Использовать системные уведомления для предупреждений и уведомлений</string>
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@ -468,7 +468,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">Pr</string>
    <string name="shortfat">Tuk</string>
-    <string name="active"><![CDATA[<Aktívny>]]></string>
    <string name="executingrightnow">Príkaz sa práve vykonáva</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>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -465,7 +465,6 @@ Eversense-appen.</string>
    <string name="shortenergy">En</string>
    <string name="shortprotein">Pr</string>
    <string name="shortfat">Fett</string>
-    <string name="active"><![CDATA[<Aktiv>]]></string>
    <string name="executingrightnow">Kommando körs just nu</string>
    <string name="missed_bg_readings">BG-värden saknas</string>
    <string name="raise_notifications_as_android_notifications">Systemaviseringar för larm &amp; info</string>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -469,7 +469,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
    <string name="shortenergy">En</string>
    <string name="shortprotein">Pr</string>
    <string name="shortfat">Yağ</string>
-    <string name="active"><![CDATA[<Aktif>]]></string>
    <string name="executingrightnow">Komut şu anda çalıştırıldı</string>
    <string name="missed_bg_readings">Kaçırılan KŞ Okumaları</string>
    <string name="raise_notifications_as_android_notifications">Uyarılar ve bildirimler için sistem bildirimlerini kullan</string>
@ -1010,5 +1009,18 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
    <string name="show_hide_records">Döngü kayıtlarını gizle</string>
    <string name="widget_description">AndroidAPS widget</string>
    <string name="configure">Şeffaflığı yapılandır</string>
+    <string name="loop_status">Döngü durumu</string>
+    <string name="a11y_otp_qr_code">Tek kullanımlık şifre kurulumu için QR Kodu</string>
+    <string name="a11y_open_settings">ayarları aç</string>
+    <string name="a11y_set_carb_timer">karbonhidrat zamanlayıcı alarmı kur</string>
+    <string name="device_all">Tümü</string>
+    <string name="device_phone">Telefon</string>
+    <string name="device_watch">Saat</string>
+    <string name="a11y_only_on_watch">sadece saatte</string>
+    <string name="a11y_only_on_phone">sadece telefonda</string>
+    <string name="a11y_drag_and_drop_handle">sürükle ve bırak kolu</string>
    <!-- Aidex Cgms -->
+    <string name="aidex">GlucoRx Aidex</string>
+    <string name="aidex_short">Aidex</string>
+    <string name="description_source_aidex">GlucoRx Aidex CGMS\'den KŞ değerleri alır.</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -468,7 +468,6 @@
    <string name="shortenergy">En</string>
    <string name="shortprotein">蛋白质</string>
    <string name="shortfat">脂肪</string>
-    <string name="active"><![CDATA[<Active>]]></string>
    <string name="executingrightnow">现在命令被执行了</string>
    <string name="missed_bg_readings">血糖读数丢失</string>
    <string name="raise_notifications_as_android_notifications">对警报和通知使用系统通知音</string>
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
@ -21,6 +21,7 @@ import info.nightscout.androidaps.automation.databinding.AutomationFragmentBindi
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog
@ -34,7 +35,6 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.dragHelpers.ItemTouchHelperAdapter
 import info.nightscout.androidaps.utils.dragHelpers.OnStartDragListener
 import info.nightscout.androidaps.utils.dragHelpers.SimpleItemTouchHelperCallback
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
@ -50,6 +50,13 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
    @Inject lateinit var injector: HasAndroidInjector
    @Inject lateinit var uel: UserEntryLogger

+    companion object {
+
+        const val ID_MENU_ADD = 3
+        const val ID_MENU_RUN = 4
+        const val ID_MENU_EDIT_MOVE = 5
+    }
+
    private var disposable: CompositeDisposable = CompositeDisposable()
    private lateinit var eventListAdapter: EventListAdapter
    private lateinit var actionHelper: ActionModeHelper<AutomationEvent>
@ -59,13 +66,14 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
    // This property is only valid between onCreateView and onDestroyView.
    private val binding get() = _binding!!

+    @SuppressLint("NotifyDataSetChanged")
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
        _binding = AutomationFragmentBinding.inflate(inflater, container, false)
        actionHelper = ActionModeHelper(rh, activity)
        actionHelper.setUpdateListHandler { binding.eventListView.adapter?.notifyDataSetChanged() }
        actionHelper.setOnRemoveHandler { removeSelected(it) }
        actionHelper.enableSort = true
-        setHasOptionsMenu(actionHelper.inMenu)
+        setHasOptionsMenu(true)
        return binding.root
    }

@ -75,19 +83,45 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
        binding.eventListView.layoutManager = LinearLayoutManager(context)
        binding.eventListView.adapter = eventListAdapter
        binding.logView.movementMethod = ScrollingMovementMethod()
-        binding.fabAddEvent.setOnClickListener {
-            actionHelper.finish()
-            val dialog = EditEventDialog()
-            val args = Bundle()
-            args.putString("event", AutomationEvent(injector).toJSON())
-            args.putInt("position", -1) // New event
-            dialog.arguments = args
-            dialog.show(childFragmentManager, "EditEventDialog")
-        }

        itemTouchHelper.attachToRecyclerView(binding.eventListView)
    }

+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        if (isResumed) {
+            actionHelper.onCreateOptionsMenu(menu, inflater)
+            menu.removeItem(ID_MENU_ADD)
+            menu.removeItem(ID_MENU_RUN)
+            menu.add(Menu.FIRST, ID_MENU_ADD, 0, rh.gs(R.string.add_automation)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+            menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.run_automations)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+            menu.add(Menu.FIRST, ID_MENU_EDIT_MOVE, 0, rh.gs(R.string.remove_sort)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+            menu.setGroupDividerEnabled(true)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+        if (actionHelper.onOptionsItemSelected(item)) true
+        else
+            when (item.itemId) {
+                ID_MENU_RUN -> {
+                    Thread { automationPlugin.processActions() }.start()
+                    true
+                }
+
+                ID_MENU_ADD -> {
+                    add()
+                    true
+                }
+
+               ID_MENU_EDIT_MOVE -> {
+                    actionHelper.startAction()
+                    true
+                }
+
+                else        -> false
+            }
+
    @SuppressLint("NotifyDataSetChanged")
    @Synchronized
    override fun onResume() {
@ -120,14 +154,7 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
        _binding = null
    }

-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        actionHelper.onCreateOptionsMenu(menu, inflater)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
-        actionHelper.onOptionsItemSelected(item)
-
+    @SuppressLint("NotifyDataSetChanged")
    @Synchronized
    private fun updateGui() {
        if (_binding == null) return
@ -173,10 +200,13 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
            val automation = automationPlugin.at(position)
            holder.binding.rootLayout.setBackgroundColor(
-                rh.gac( context,
-                    if (automation.userAction) R.attr.userAction
-                    else if (automation.areActionsValid()) R.attr.validActions
-                    else R.attr.actionsError
+                rh.gac(
+                    context,
+                    when {
+                        automation.userAction        -> R.attr.userAction
+                        automation.areActionsValid() -> R.attr.validActions
+                        else                         -> R.attr.actionsError
+                    }
                )
            )
            holder.binding.eventTitle.text = automation.title
@ -280,4 +310,13 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
        }
    }

+    private fun add() {
+        actionHelper.finish()
+        EditEventDialog().also {
+            it.arguments = Bundle().apply {
+                putString("event", AutomationEvent(injector).toJSON())
+                putInt("position", -1) // New event
+            }
+        }.show(childFragmentManager, "EditEventDialog")
+    }
 }
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
@ -24,7 +24,6 @@ import info.nightscout.androidaps.services.LocationServiceHelper
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
@ -180,8 +179,7 @@ class AutomationPlugin @Inject constructor(
            automationEvents.add(AutomationEvent(injector).fromJSON(event, 0))
    }

-    @Synchronized
-    private fun processActions() {
+    @Synchronized internal fun processActions() {
        var commonEventsEnabled = true
        if (loop.isSuspended || !(loop as PluginBase).isEnabled()) {
            aapsLogger.debug(LTag.AUTOMATION, "Loop deactivated")
--- a/automation/src/main/res/layout/automation_fragment.xml
+++ b/automation/src/main/res/layout/automation_fragment.xml
@ -21,18 +21,4 @@
        android:scrollbars = "vertical"
        android:layout_alignParentBottom="true" />

-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fabAddEvent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/ic_add_black_24dp"
-        tools:ignore="RelativeOverlap"
-        android:contentDescription="@string/addnew" />
-
 </RelativeLayout>
--- a/automation/src/main/res/values-it-rIT/strings.xml
+++ b/automation/src/main/res/values-it-rIT/strings.xml
@ -81,6 +81,7 @@
    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
    <string name="autosenslabel">Autosens %</string>
+    <string name="a11y_autosenslabel">Asuto sens</string>
    <string name="deltacompared">%3$s %1$s %2$s</string>
    <string name="deltalabel">Differenza BG</string>
    <string name="deltalabel_u">Differenza BG [%1$s]</string>
@ -112,4 +113,11 @@
    <string name="automation_event">Evento di automazione</string>
    <string name="reorder_label">Riordina</string>
    <string name="user_action">Azione utente</string>
+    <string name="remove_automation">Rimuovi automazione</string>
+    <string name="sort_automation">Ordina automazione</string>
+    <string name="remove_selected_items">Rimuovi elementi selezionati</string>
+    <string name="count_selected">%1$d selezionato</string>
+    <string name="confirm_remove_multiple_items">Sicuro di voler eliminare %1$d elementi</string>
+    <string name="sort_label">Ordina</string>
+    <string name="system_automation">Automazione sistema</string>
 </resources>
--- a/automation/src/main/res/values/strings.xml
+++ b/automation/src/main/res/values/strings.xml
@ -123,5 +123,8 @@
    <string name="confirm_remove_multiple_items">Are you sure you want to remove %1$d items</string>
    <string name="sort_label">Sort</string>
    <string name="system_automation">System automation</string>
+    <string name="run_automations">Run automations</string>
+    <string name="add_automation">Add rule</string>
+    <string name="remove_sort">Remove/sort</string>

 </resources>
--- a/combo/src/main/res/values-it-rIT/strings.xml
+++ b/combo/src/main/res/values-it-rIT/strings.xml
@ -51,6 +51,10 @@
    <string name="combo_tbr_count">Conteggio TBR</string>
    <string name="bolusstopped">Bolo stoppato</string>
    <string name="bolusstopping">Stop del bolo in corso</string>
+    <string name="pump_commerror_label">Conta degli errori comunicazione</string>
+    <string name="show_comm_error_count_title">Mostra conta degli errori di comunicazione</string>
+    <string name="show_comm_error_count_summary">Mostra la conta degli errori quando si comunica con Ruffy. Nella maggior parte dei casi, un numero più alto di 0 denota problemi di comunicazione con Ruffy (potrebbe essere necessario riavviare).</string>
    <string name="combo_error_display_never">Mai</string>
+    <string name="combo_error_display_error">In caso di errore</string>
    <string name="combo_error_display_always">Sempre</string>
 </resources>
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
@ -271,7 +271,7 @@ class PumpSyncImplementation @Inject constructor(
            .blockingGet()
            .also { result ->
                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted TemporaryBasal $it") }
-                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated ${it.first} TemporaryBasal ${it.second}") }
+                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated TemporaryBasal \n${it.first}\n${it.second}") }
                return result.inserted.size > 0
            }
    }
--- a/core/src/main/res/values-af-rZA/strings.xml
+++ b/core/src/main/res/values-af-rZA/strings.xml
@ -29,7 +29,6 @@
    <!--    Constraints-->
    <!--    Dialogs-->
    <!--    BlePreCheck-->
-    <!--    DateUtil-->
    <!--    Protection-->
    <!--    Profile-->
    <!--    ProfileFunction-->
@ -61,4 +60,5 @@
    <!-- HardLimits -->
    <string name="valuelimitedto">%1$.2f beperk tot %2$.2f</string>
    <!-- Command Queue + readStatus reasons -->
+    <!-- Autotune -->
 </resources>
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@ -125,24 +125,6 @@
    <string name="ble_not_enabled">Bluetooth не е включен.</string>
    <string name="location_not_found_title">Локацията не е включена</string>
    <string name="location_not_found_message">За да работи откриването на нови устройсва чрез Bluetooth, трябва да включите локацията. AAPS не проследява вашето местоположение и ще можете да я изключите след успешното свързване.</string>
-    <!--    DateUtil-->
-    <string name="minago">преди %1$d мин</string>
-    <string name="hoursago">преди %1$.1fч</string>
-    <string name="shorthour">ч.</string>
-    <string name="days">дни</string>
-    <string name="hours">часа</string>
-    <string name="unit_second">секунда</string>
-    <string name="unit_minute">минута</string>
-    <string name="unit_hour">час</string>
-    <string name="unit_day">ден</string>
-    <string name="unit_week">седмица</string>
-    <string name="unit_seconds">секунди</string>
-    <string name="unit_minutes">минути</string>
-    <string name="unit_hours">часове</string>
-    <string name="unit_days">дни</string>
-    <string name="unit_weeks">седмици</string>
-    <string name="shortminute">мин.</string>
-    <string name="shortday">д</string>
    <!--    Protection-->
    <string name="wrongpassword">Грешна парола</string>
    <string name="passwords_dont_match">Паролите не съвпадат</string>
@ -303,6 +285,7 @@
    <string name="valuelimitedto">%1$.2f ограничен до %2$.2f</string>
    <!-- Command Queue + readStatus reasons -->
    <string name="sms" comment="26 characters max for translation">SMS</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d дeн</item>
        <item quantity="other">%1$d дни</item>
--- a/core/src/main/res/values-ca-rES/strings.xml
+++ b/core/src/main/res/values-ca-rES/strings.xml
@ -5,7 +5,6 @@
    <!--    Constraints-->
    <!--    Dialogs-->
    <!--    BlePreCheck-->
-    <!--    DateUtil-->
    <!--    Protection-->
    <!--    Profile-->
    <!--    ProfileFunction-->
@ -67,4 +66,5 @@
    <string name="valuelimitedto">%1$.2f limitat a %2$.2f</string>
    <string name="valueoutofrange">»%1$s« supera els límits</string>
    <!-- Command Queue + readStatus reasons -->
+    <!-- Autotune -->
 </resources>
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@ -42,6 +42,7 @@
    <string name="carbs">Sacharidy</string>
    <string name="invalidprofile">Chybný profil !!!</string>
    <string name="noprofileset">ŽÁDNÝ PROFIL NENASTAVEN</string>
+    <string name="active"><![CDATA[<Aktivní>]]></string>
    <string name="date">Datum</string>
    <string name="units_label">Jednotky</string>
    <string name="dia_label">Doba působnosti inzulínu</string>
@ -132,33 +133,6 @@
    <string name="ble_not_enabled">Bluetooth není povoleno.</string>
    <string name="location_not_found_title">Zjišťování polohy není povoleno</string>
    <string name="location_not_found_message">Pro vyhledání Bluetooth zařízení na novějších telefonech musí být povoleno zjišťování polohy. AAPS vás nesleduje a po provedení párování můžete tuto volbu opět zakázat.</string>
-    <!--    DateUtil-->
-    <string name="minago">před %1$d min</string>
-    <string name="minago_long">před %1$d minutamí</string>
-    <string name="hoursago">před %1$.1f h</string>
-    <string name="days_ago">Před %1$.1f dny</string>
-    <string name="days_ago_round">Před %1$.0f dny</string>
-    <string name="in_days">za %1$.0f dní</string>
-    <string name="in_days_round">za %1$.0f dní</string>
-    <string name="shorthour">h</string>
-    <string name="days">dnů</string>
-    <string name="hours">hodin</string>
-    <string name="unit_second">sekunda</string>
-    <string name="unit_minute">minuta</string>
-    <string name="unit_hour">hodina</string>
-    <string name="unit_day">den</string>
-    <string name="unit_week">týden</string>
-    <string name="unit_seconds">sekund</string>
-    <string name="unit_minutes">minut</string>
-    <string name="unit_hours">hodin</string>
-    <string name="unit_days">dní</string>
-    <string name="unit_weeks">týdnů</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Později během dneška</string>
-    <string name="tomorrow">Zítra</string>
-    <string name="today">Dnes</string>
-    <string name="yesterday">Včera</string>
    <!--    Protection-->
    <string name="wrongpassword">Chybné heslo</string>
    <string name="wrongpin">Nesprávný PIN</string>
@ -465,6 +439,53 @@
    <string name="remove_items">Odebrat položky</string>
    <string name="sort_items">Seřadit položky</string>
    <string name="remove_selected_items">Odebrat vybrané položky</string>
+    <string name="a11y_file">soubor</string>
+    <string name="a11y_user">uživatel</string>
+    <!-- Autotune -->
+    <string name="autotune">Autotune</string>
+    <string name="autotune_description">Pomoc s možnými úpravami profilu (citlivost, sacharidový poměr a bazální dávky)</string>
+    <string name="autotune_shortname">AT</string>
+    <string name="autotune_settings">Nastavení Autotune</string>
+    <string name="autotune_auto_title">Přepnutí profilu z Automatizace</string>
+    <string name="autotune_auto_summary">Pokud je tato volba povolena, Autotune po výpočtu automaticky aktualizuje a přepne na vstupní profil zadaný v pravidlu automatizace.</string>
+    <string name="autotune_categorize_uam_as_basal_title">Započítávat UAM jako bazál</string>
+    <string name="autotune_categorize_uam_as_basal_summary">Povolte pouze v případě, že jste důsledně zadávali všechny přijaté sacharidy. S touto možností bude náhlý vzestup detekovaný funkcí Autotune použit pro doporučení změn bazálu.</string>
+    <string name="autotune_default_tune_days_title">Počet dní s daty</string>
+    <string name="autotune_circadian_ic_isf_title">Použít průměrný výsledek v cirkadiánním IC/ISF</string>
+    <string name="autotune_circadian_ic_isf_summary">Autotune nebude ladit cirkadiánní rozložení, tato možnost použije pouze průměrné hodnoty IC a ISF na váš cirkadiánní vstupní profil</string>
+    <string name="autotune_additional_log_title">Zahrnout další informace o protokolu pro ladění</string>
+    <string name="autotune_additional_log_summary">Zapněte, pouze pokud je to požadováno vývojářem, aby bylo možné odeslat další logy pro ladění pluginu Autotune</string>
+    <string name="autotune_default_tune_days_summary">Výchozí počet dní, ze kterých mají být data zpracována Autotune (až xx)</string>
+    <string name="autotune_tunedprofile_name">Vyladěno</string>
+    <string name="autotune_profile">Profil :</string>
+    <string name="autotune_tune_days">Ladit dní:</string>
+    <string name="autotune_last_run">Poslední spuštění :</string>
+    <string name="autotune_warning">Varování :</string>
+    <string name="autotune_select_profile">Vyberte profil pro ladění</string>
+    <string name="autotune_ic_warning">Autotune funguje pouze s jedinou hodnotou IC, váš profil má %1$d hodnot. Průměrná hodnota je %2$.2fg/U</string>
+    <string name="autotune_isf_warning">Autotune funguje pouze s jedinou hodnotou ISF, váš profil má %1$d hodnot. Průměrná hodnota je %2$.1f%3$s/U</string>
+    <string name="autotune_error">Chyba vstupních dat, zkuste snížit počet dní</string>
+    <string name="autotune_warning_during_run">Autotune spuštěno, prosím buďte trpěliví</string>
+    <string name="autotune_warning_after_run">Před použitím výsledky pečlivě zkontrolujte!</string>
+    <string name="autotune_partial_result">Částečný výsledek - vyladěn den %1$d / %2$d</string>
+    <string name="autotune_result">Výsledek: %1$s</string>
+    <string name="autotune_param">Parametr</string>
+    <string name="autotune_percent">%</string>
+    <string name="autotune_missing">Chybí</string>
+    <string name="autotune_profile_name">Profil Autotune %1$s</string>
+    <string name="autotune_run">Spustit Autotune</string>
+    <string name="autotune_check_input_profile_button">Zkontrolovat vstupní profil</string>
+    <string name="autotune_compare_profile">Porovnat profily</string>
+    <string name="autotune_copy_localprofile_button">Kopírovat do místního profilu</string>
+    <string name="autotune_update_input_profile_button">Aktualizovat vstupní profil</string>
+    <string name="autotune_revert_input_profile_button">Vrátit vstupní profil</string>
+    <string name="autotune_copy_local_profile_message">Vytvořit z tohoto Autotune profilu nový místní profi?</string>
+    <string name="autotune_update_local_profile_message">Aktualizovat profil %1$s pomocí profilu Autotune?</string>
+    <string name="autotune_revert_local_profile_message">Vrátit profil %1$s na vstupní profil?</string>
+    <string name="autotune_profile_invalid">Neplatný profil</string>
+    <string name="autotune_run_without_autoswitch">Autotune spuštěno bez přepnutí profilu</string>
+    <string name="autotune_run_with_autoswitch">Autotune spuštěno, a profil automaticky přepnut</string>
+    <string name="autotune_run_with_error">Chyba při posledním spuštění Autotune</string>
    <plurals name="days">
        <item quantity="one">%1$d den</item>
        <item quantity="few">%1$d dnů</item>
--- a/core/src/main/res/values-da-rDK/strings.xml
+++ b/core/src/main/res/values-da-rDK/strings.xml
@ -130,24 +130,6 @@
    <string name="ble_not_enabled">Bluetooth er deaktiveret.</string>
    <string name="location_not_found_title">Lokation er deaktiveret</string>
    <string name="location_not_found_message">Placeringen skal være aktiveret, hvis Bluetooth-opdagelsen skal fungere på nyere enheder. AAPS sporer ikke din placering, og det kan deaktiveres efter parring er lykkedes.</string>
-    <!--    DateUtil-->
-    <string name="minago">%1$d min. siden</string>
-    <string name="hoursago">%1$.1f t siden</string>
-    <string name="shorthour">t</string>
-    <string name="days">dage</string>
-    <string name="hours">timer</string>
-    <string name="unit_second">sekund</string>
-    <string name="unit_minute">minut</string>
-    <string name="unit_hour">time</string>
-    <string name="unit_day">dag</string>
-    <string name="unit_week">uge</string>
-    <string name="unit_seconds">sekunder</string>
-    <string name="unit_minutes">minutter</string>
-    <string name="unit_hours">timer</string>
-    <string name="unit_days">dage</string>
-    <string name="unit_weeks">uger</string>
-    <string name="shortminute">min</string>
-    <string name="shortday">d</string>
    <!--    Protection-->
    <string name="wrongpassword">Forkert kodeord</string>
    <string name="passwords_dont_match">Kodeordene stemmer ikke overens</string>
@ -441,6 +423,7 @@
    <string name="bolus_ok" comment="26 characters max for translation">Bolus OK</string>
    <string name="pump_paired" comment="26 characters max for translation">Pumpe parret</string>
    <string name="insight_refresh_button" comment="26 characters max for translation">Insight Opdater-knap</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d dag</item>
        <item quantity="other">%1$d dage</item>
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@ -132,25 +132,6 @@
    <string name="ble_not_enabled">Bluetooth nicht aktiviert.</string>
    <string name="location_not_found_title">Standortdienst ist nicht aktiviert</string>
    <string name="location_not_found_message">Auf neueren Geräten muss für die Bluetooth-Erkennung der Standortdienst aktiviert sein. AAPS speichert keine Standortdaten und der Dienst kann nach erfolgreichem Pairing wieder deaktiviert werden.</string>
-    <!--    DateUtil-->
-    <string name="minago">vor %1$d Min.</string>
-    <string name="minago_long">vor %1$d Minuten</string>
-    <string name="hoursago">vor %1$.1f Stunde</string>
-    <string name="shorthour">h</string>
-    <string name="days">Tage</string>
-    <string name="hours">Stunden</string>
-    <string name="unit_second">Sekunde</string>
-    <string name="unit_minute">Minute</string>
-    <string name="unit_hour">Stunde</string>
-    <string name="unit_day">Tag</string>
-    <string name="unit_week">Woche</string>
-    <string name="unit_seconds">Sekunden</string>
-    <string name="unit_minutes">Minuten</string>
-    <string name="unit_hours">Stunden</string>
-    <string name="unit_days">Tage</string>
-    <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>
@ -447,6 +428,7 @@
    <string name="insight_refresh_button" comment="26 characters max for translation">Insight Refresh Button</string>
    <string name="a11y_min_button_description">abnehmend %1$s mit %2$s</string>
    <string name="a11y_plus_button_description">zunehmend %1$s mit %2$s</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d Tag</item>
        <item quantity="other">%1$d Tage</item>
--- a/core/src/main/res/values-el-rGR/strings.xml
+++ b/core/src/main/res/values-el-rGR/strings.xml
@ -28,7 +28,6 @@
    <!--    Constraints-->
    <!--    Dialogs-->
    <!--    BlePreCheck-->
-    <!--    DateUtil-->
    <!--    Protection-->
    <!--    Profile-->
    <!--    ProfileFunction-->
@ -61,4 +60,5 @@
    <!-- HardLimits -->
    <string name="valuelimitedto">Το %1$.2f περιορίζεται σε %2$.2f</string>
    <!-- Command Queue + readStatus reasons -->
+    <!-- Autotune -->
 </resources>
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@ -42,6 +42,7 @@
    <string name="carbs">Carbohidratos [g]</string>
    <string name="invalidprofile">Perfil inválido !!!</string>
    <string name="noprofileset">NINGÚN PERFIL ACTIVO</string>
+    <string name="active"><![CDATA[<Activo>]]></string>
    <string name="date">Fecha</string>
    <string name="units_label">Unidades</string>
    <string name="dia_label">DIA (Duración Insulina Activa)</string>
@ -49,7 +50,7 @@
    <string name="isf_label">ISF (Factor Sensibilidad Insulina)</string>
    <string name="basal_label">Dosis Basal</string>
    <string name="target_label">Objetivo</string>
-    <string name="dia_long_label">Duración de la acción de la insulina</string>
+    <string name="dia_long_label">Duración de la insulina activa</string>
    <string name="ic_long_label">Ratio de insulina/carbohidratos</string>
    <string name="isf_long_label">Factor de sensibilidad a la insulina</string>
    <string name="basal_long_label">Tasa Basal</string>
@ -132,33 +133,6 @@
    <string name="ble_not_enabled">Bluetooth no activado.</string>
    <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="minago_long">Hace %1$d minutos</string>
-    <string name="hoursago">hace %1$.1f h</string>
-    <string name="days_ago">Hace %1$.1f día</string>
-    <string name="days_ago_round">Hace %1$.0f días</string>
-    <string name="in_days">en %1$.0f días</string>
-    <string name="in_days_round">en %1$.0f días</string>
-    <string name="shorthour">h</string>
-    <string name="days">días</string>
-    <string name="hours">horas</string>
-    <string name="unit_second">segundo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">hora</string>
-    <string name="unit_day">día</string>
-    <string name="unit_week">semana</string>
-    <string name="unit_seconds">segundos</string>
-    <string name="unit_minutes">minutos</string>
-    <string name="unit_hours">horas</string>
-    <string name="unit_days">días</string>
-    <string name="unit_weeks">semanas</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Más tarde hoy</string>
-    <string name="tomorrow">Mañana</string>
-    <string name="today">Hoy</string>
-    <string name="yesterday">Ayer</string>
    <!--    Protection-->
    <string name="wrongpassword">Contraseña incorrecta</string>
    <string name="wrongpin">Pin erróneo</string>
@ -467,6 +441,33 @@
    <string name="remove_selected_items">Eliminar los elementos seleccionados</string>
    <string name="a11y_file">Archivo</string>
    <string name="a11y_user">Usuario</string>
+    <!-- Autotune -->
+    <string name="autotune">Autotune</string>
+    <string name="autotune_description">Ayuda a realizar ajustes en el perfil (ISF, ratio de carbohidratos y tasas basales)</string>
+    <string name="autotune_shortname">AT</string>
+    <string name="autotune_settings">Ajustes de Autotune</string>
+    <string name="autotune_auto_title">Automatización de cambio de perfil</string>
+    <string name="autotune_categorize_uam_as_basal_title">Categorizar UAM como basal</string>
+    <string name="autotune_default_tune_days_title">Número de días de datos</string>
+    <string name="autotune_additional_log_title">Incluir más información de registro para depuración</string>
+    <string name="autotune_additional_log_summary">Activar sólo si es solicitado por los desarrolladores, para enviar más registros y así ayudar a depurar el plugin Autotune</string>
+    <string name="autotune_default_tune_days_summary">Número predeterminado de días de datos a procesar por Autotune (hasta xx)</string>
+    <string name="autotune_tunedprofile_name">Ajustado</string>
+    <string name="autotune_profile">Perfil :</string>
+    <string name="autotune_tune_days">Días de ajuste:</string>
+    <string name="autotune_last_run">Última ejecución :</string>
+    <string name="autotune_warning">Advertencia :</string>
+    <string name="autotune_select_profile">Selecciona el perfil para a ajustar</string>
+    <string name="autotune_param">Parámetro</string>
+    <string name="autotune_percent">%</string>
+    <string name="autotune_profile_name">Perfil de Autotune %1$s</string>
+    <string name="autotune_run">Ejecutar Autotune</string>
+    <string name="autotune_check_input_profile_button">Comprobar el perfil de entrada</string>
+    <string name="autotune_compare_profile">Comparar perfiles</string>
+    <string name="autotune_copy_localprofile_button">Copiar al perfil local</string>
+    <string name="autotune_update_input_profile_button">Actualizar perfil de entrada</string>
+    <string name="autotune_revert_input_profile_button">Revertir perfil de entrada</string>
+    <string name="autotune_profile_invalid">Perfil inválido</string>
    <plurals name="days">
        <item quantity="one">%1$d día</item>
        <item quantity="other">%1$d días</item>
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@ -42,6 +42,7 @@
    <string name="carbs">Glucides</string>
    <string name="invalidprofile">Profil incorrect !!!</string>
    <string name="noprofileset">PAS DE PROFIL SELECTIONNÉ</string>
+    <string name="active"><![CDATA[<Actif>]]></string>
    <string name="date"> Date</string>
    <string name="units_label">Unités</string>
    <string name="dia_label">DAI</string>
@ -132,33 +133,6 @@
    <string name="ble_not_enabled">Bluetooth désactivé.</string>
    <string name="location_not_found_title">Localisation désactivée</string>
    <string name="location_not_found_message">La localisation doit être activée sur les nouveaux appareils pour que la recherche Bluetooth fonctionne. AAPS n\'enregistre pas votre localisation et la localisation peut être désactivée après l\'appairage.</string>
-    <!--    DateUtil-->
-    <string name="minago">il y a %1$d m</string>
-    <string name="minago_long">Il y a %1$d minutes</string>
-    <string name="hoursago">il y a %1$.1f h</string>
-    <string name="days_ago">Il y a %1$.1f jours</string>
-    <string name="days_ago_round">Il y a %1$.0f jours</string>
-    <string name="in_days">en %1$.0f jours</string>
-    <string name="in_days_round">en %1$.0f jours</string>
-    <string name="shorthour">h</string>
-    <string name="days">jours</string>
-    <string name="hours">heures</string>
-    <string name="unit_second">seconde</string>
-    <string name="unit_minute">minute</string>
-    <string name="unit_hour">heure</string>
-    <string name="unit_day">jour</string>
-    <string name="unit_week">semaine</string>
-    <string name="unit_seconds">secondes</string>
-    <string name="unit_minutes">minutes</string>
-    <string name="unit_hours">heures</string>
-    <string name="unit_days">jours</string>
-    <string name="unit_weeks">semaines</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">j</string>
-    <string name="later_today">Plus tard aujourd\'hui</string>
-    <string name="tomorrow">Demain</string>
-    <string name="today">Aujourd’hui</string>
-    <string name="yesterday">Hier</string>
    <!--    Protection-->
    <string name="wrongpassword">Mot de passe incorrect</string>
    <string name="wrongpin">Code PIN incorrect</string>
@ -467,6 +441,51 @@
    <string name="remove_selected_items">Supprimer les éléments sélectionnés</string>
    <string name="a11y_file">fichier</string>
    <string name="a11y_user">utilisateur</string>
+    <!-- Autotune -->
+    <string name="autotune">Autotune</string>
+    <string name="autotune_description">Aide pour ajuster le profil (SI, rapport G/I et débits de basal)</string>
+    <string name="autotune_shortname">AT</string>
+    <string name="autotune_settings">Paramètres Autotune</string>
+    <string name="autotune_auto_title">Changement de profil avec l\'Automatisation</string>
+    <string name="autotune_auto_summary">Si activé, Autotune mettra à jour automatiquement à jour le profil sélectionné et activera le profil calculé effectué à partir d\'une règle d\'automatisation.</string>
+    <string name="autotune_categorize_uam_as_basal_title">Catégoriser UAM en tant que Basal</string>
+    <string name="autotune_categorize_uam_as_basal_summary">Activer uniquement si vous avez correctement saisi tous les glucides consommés, avec cette option, des hausses soudaines vues par Autotune seront utilisées pour modifier les débits de basal.</string>
+    <string name="autotune_default_tune_days_title">Nombre de jours de données</string>
+    <string name="autotune_circadian_ic_isf_title">Appliquer le résultat G/I et SI moyen sur le profil circadien</string>
+    <string name="autotune_circadian_ic_isf_summary">Autotune ne réglera pas les variations circadiennes, cette option ne fait que appliquer le réglage moyen du G/I et de la SI à votre profil d\'entrée circadien</string>
+    <string name="autotune_additional_log_title">Inclure plus d\'informations de log pour le débogage</string>
+    <string name="autotune_additional_log_summary">A n\'activer que sur demande du développeur pour envoyer plus d\'informations dans les fichiers log pour aider à déboguer le plugin Autotune</string>
+    <string name="autotune_default_tune_days_summary">Nombre de jours de données par défaut à traiter par Autotune (jusqu\'à 30)</string>
+    <string name="autotune_tunedprofile_name">Tuned</string>
+    <string name="autotune_profile">Profil :</string>
+    <string name="autotune_tune_days">Nb jours :</string>
+    <string name="autotune_last_run">Dernière exécution :</string>
+    <string name="autotune_warning">Avertissement :</string>
+    <string name="autotune_select_profile">Sélectionnez le profil à optimiser</string>
+    <string name="autotune_ic_warning">Autotune ne fonctionne qu\'avec une seule valeur G/I, votre profil a %1$d valeurs. La valeur moyenne est de %2$.2f g/U</string>
+    <string name="autotune_isf_warning">Autotune ne calcule qu\'une seule valeur de SI, votre profil a %1$d valeurs. La valeur moyenne est de %2$.1f %3$s/U</string>
+    <string name="autotune_error">Erreur dans les données d\'entrée, essayez de relancer le calcul ou réduire le nombre de jours</string>
+    <string name="autotune_warning_during_run">Le calcul Autotune a commencé, veuillez patienter</string>
+    <string name="autotune_warning_after_run">Vérifiez attentivement les résultats avant de les utiliser!</string>
+    <string name="autotune_partial_result">Résultat partiel jour %1$d / %2$d calculé</string>
+    <string name="autotune_result">Résultat: %1$s</string>
+    <string name="autotune_param">Param</string>
+    <string name="autotune_percent">%</string>
+    <string name="autotune_missing">Manquant</string>
+    <string name="autotune_profile_name">Profil Autotune %1$s</string>
+    <string name="autotune_run">Lancer Autotune</string>
+    <string name="autotune_check_input_profile_button">Vérifier profil d\'entrée</string>
+    <string name="autotune_compare_profile">Comparer les profils</string>
+    <string name="autotune_copy_localprofile_button">Copier vers Profil Local</string>
+    <string name="autotune_update_input_profile_button">Mettre à jour profil d\'entrée</string>
+    <string name="autotune_revert_input_profile_button">Réinitialisé profil d\'entrée</string>
+    <string name="autotune_copy_local_profile_message">Créer un nouveau profil local à partir de ce profil Autotune ?</string>
+    <string name="autotune_update_local_profile_message">Mettre à jour le profil %1$s avec le profil Autotune ?</string>
+    <string name="autotune_revert_local_profile_message">Annuler la mise à jour du profil %1$s et remettre le profil d\'entrée ?</string>
+    <string name="autotune_profile_invalid">Profil invalide</string>
+    <string name="autotune_run_without_autoswitch">Autotune exécuté sans changement de profil</string>
+    <string name="autotune_run_with_autoswitch">Autotune exécuté et le profil automatiquement activé</string>
+    <string name="autotune_run_with_error">Erreur lors de la dernière exécution d\'Autotune</string>
    <plurals name="days">
        <item quantity="one">%1$d jour</item>
        <item quantity="other">%1$d jours</item>
--- a/core/src/main/res/values-ga-rIE/strings.xml
+++ b/core/src/main/res/values-ga-rIE/strings.xml
@ -63,24 +63,6 @@
    <string name="ok">Ceart go leor</string>
    <string name="cancel">Cuir ar ceal</string>
    <!--    BlePreCheck-->
-    <!--    DateUtil-->
-    <string name="minago">%1$d nóim ó shin</string>
-    <string name="hoursago">%1$.1f u ó shin</string>
-    <string name="shorthour">u</string>
-    <string name="days">lá</string>
-    <string name="hours">uair</string>
-    <string name="unit_second">soicind</string>
-    <string name="unit_minute">nóiméad</string>
-    <string name="unit_hour">uair</string>
-    <string name="unit_day">lá</string>
-    <string name="unit_week">seachtain</string>
-    <string name="unit_seconds">soicind</string>
-    <string name="unit_minutes">nóiméad</string>
-    <string name="unit_hours">uair</string>
-    <string name="unit_days">lá</string>
-    <string name="unit_weeks">seachtaine</string>
-    <string name="shortminute">n</string>
-    <string name="shortday">lá</string>
    <!--    Protection-->
    <!--    Profile-->
    <string name="profile_per_unit">/A</string>
@ -132,4 +114,5 @@
    <!-- User Entry -->
    <!-- HardLimits -->
    <!-- Command Queue + readStatus reasons -->
+    <!-- Autotune -->
 </resources>
--- a/core/src/main/res/values-hr-rHR/strings.xml
+++ b/core/src/main/res/values-hr-rHR/strings.xml
@ -5,7 +5,6 @@
    <!--    Constraints-->
    <!--    Dialogs-->
    <!--    BlePreCheck-->
-    <!--    DateUtil-->
    <!--    Protection-->
    <!--    Profile-->
    <!--    ProfileFunction-->
@ -26,4 +25,5 @@
    <!-- User Entry -->
    <!-- HardLimits -->
    <!-- Command Queue + readStatus reasons -->
+    <!-- Autotune -->
 </resources>
--- a/core/src/main/res/values-hu-rHU/strings.xml
+++ b/core/src/main/res/values-hu-rHU/strings.xml
@ -6,7 +6,6 @@
    <!--    Constraints-->
    <!--    Dialogs-->
    <!--    BlePreCheck-->
-    <!--    DateUtil-->
    <!--    Protection-->
    <!--    Profile-->
    <!--    ProfileFunction-->
@ -27,4 +26,5 @@
    <!-- User Entry -->
    <!-- HardLimits -->
    <!-- Command Queue + readStatus reasons -->
+    <!-- Autotune -->
 </resources>
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@ -49,7 +49,11 @@
    <string name="isf_label">ISF</string>
    <string name="basal_label">Basale</string>
    <string name="target_label">Target</string>
+    <string name="dia_long_label">Durata dell’azione dell’insulina</string>
+    <string name="ic_long_label">Rapporto Insulina-Carboidrati (I:C)</string>
+    <string name="isf_long_label">Fattore di sensibilità insulinica (ISF)</string>
    <string name="basal_long_label">Velocità basale</string>
+    <string name="target_long_label">Target glicemia</string>
    <string name="initializing">Inizializzazione...</string>
    <string name="serialnumber">Numero seriale</string>
    <string name="battery_label">Batteria</string>
@ -107,6 +111,7 @@
    <string name="notes_label">Note</string>
    <string name="remove_button">Rimuovi</string>
    <string name="addnew">Aggiungi nuovo</string>
+    <string name="addnew_above">Aggiungi nuovo sopra</string>
    <string name="wrong_pump_data">I dati arrivano da un micro differente. Cambia il driver del micro per resettarne lo stato.</string>
    <!--    Constraints-->
    <string name="limitingbasalratio">Limitazione max velocità basale a %1$.2f U/h a causa di: %2$s</string>
@ -127,27 +132,11 @@
    <string name="ble_not_enabled">Bluetooth non abilitato.</string>
    <string name="location_not_found_title">La localizzazione non è abilitata</string>
    <string name="location_not_found_message">Affinché la ricerca bluetooth funzioni sui dispositivi più recenti, la localizzazione deve essere abilitata, ma può essere disabilitata dopo l\'associazione. AAPS non tiene traccia della tua posizione.</string>
-    <!--    DateUtil-->
-    <string name="minago">%1$d m fa</string>
-    <string name="hoursago">%1$.1f h fa</string>
-    <string name="shorthour">h</string>
-    <string name="days">giorni</string>
-    <string name="hours">ore</string>
-    <string name="unit_second">secondo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">ora</string>
-    <string name="unit_day">giorno</string>
-    <string name="unit_week">settimana</string>
-    <string name="unit_seconds">secondi</string>
-    <string name="unit_minutes">minuti</string>
-    <string name="unit_hours">ore</string>
-    <string name="unit_days">giorni</string>
-    <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="wrongpin">PIN errato</string>
    <string name="passwords_dont_match">Le password non coincidono</string>
+    <string name="pin_dont_match">I PIN 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>
@ -367,6 +356,7 @@
    <string name="uel_stat_reset">RESET STAT</string>
    <string name="uel_delete_logs">ELIMINA LOG</string>
    <string name="uel_delete_future_treatments">ELIMINA TRATTAMENTI FUTURI</string>
+    <string name="delete_future_treatments">Elimina trattamenti futuri</string>
    <string name="uel_export_settings">ESPORTA IMPOSTAZIONI</string>
    <string name="uel_import_settings">IMPORTA IMPOSTAZIONI</string>
    <string name="uel_reset_databases">RESETTA DATABASE</string>
@ -438,6 +428,19 @@
    <string name="bolus_ok" comment="26 characters max for translation">Bolo OK</string>
    <string name="pump_paired" comment="26 characters max for translation">Micro associato</string>
    <string name="insight_refresh_button" comment="26 characters max for translation">Tasto aggiornamento Insight</string>
+    <string name="a11y_min_button_description">decremento %1$s di %2$s</string>
+    <string name="a11y_plus_button_description">incremento %1$s di %2$s</string>
+    <string name="formatPercent">%1$.0f%%</string>
+    <string name="basal">Basale</string>
+    <string name="basalpct">% basale</string>
+    <string name="count_selected">%1$d selezionato</string>
+    <string name="sort_label">Ordina</string>
+    <string name="remove_items">Rimuovi elementi</string>
+    <string name="sort_items">Ordina elementi</string>
+    <string name="remove_selected_items">Rimuovi elementi selezionati</string>
+    <string name="a11y_file">file</string>
+    <string name="a11y_user">utente</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d giorno</item>
        <item quantity="other">%1$d giorni</item>
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@ -132,33 +132,6 @@
    <string name="ble_not_enabled">בלוטות\' כבוי.</string>
    <string name="location_not_found_title">המיקום אינו מופעל</string>
    <string name="location_not_found_message">בכדי שסריקת בלוטות\' תעבוד יש לאפשר את שירות המיקום. AAPS לא עוקב אחר המיקום שלכם וניתן להפסיק את השירות לאחר סיום הצימוד.</string>
-    <!--    DateUtil-->
-    <string name="minago">לפני %1$d דקות</string>
-    <string name="minago_long">לפני %1$d דקות</string>
-    <string name="hoursago">לפני %1$.1f שעות</string>
-    <string name="days_ago">לפני %1$.1f ימים</string>
-    <string name="days_ago_round">לפני %1$.0f ימים</string>
-    <string name="in_days">בעוד %1$.0f ימים</string>
-    <string name="in_days_round">בעוד %1$.0f ימים</string>
-    <string name="shorthour">ש\'</string>
-    <string name="days">ימים</string>
-    <string name="hours">שעות</string>
-    <string name="unit_second">שניה</string>
-    <string name="unit_minute">דקה</string>
-    <string name="unit_hour">שעה</string>
-    <string name="unit_day">יום</string>
-    <string name="unit_week">שבוע</string>
-    <string name="unit_seconds">שניות</string>
-    <string name="unit_minutes">דקות</string>
-    <string name="unit_hours">שעות</string>
-    <string name="unit_days">ימים</string>
-    <string name="unit_weeks">שבועות</string>
-    <string name="shortminute">דק\'</string>
-    <string name="shortday">י\' </string>
-    <string name="later_today">מאוחר יותר היום</string>
-    <string name="tomorrow">מחר</string>
-    <string name="today">היום</string>
-    <string name="yesterday">אתמול</string>
    <!--    Protection-->
    <string name="wrongpassword">סיסמה שגויה</string>
    <string name="wrongpin">קוד PIN שגוי</string>
@ -463,6 +436,7 @@
    <string name="remove_items">פריטים שהוסרו</string>
    <string name="sort_items">מיין פריטים</string>
    <string name="remove_selected_items">הסר פריטים נבחרים</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d יום</item>
        <item quantity="two">%1$d ימים</item>
--- a/core/src/main/res/values-ko-rKR/strings.xml
+++ b/core/src/main/res/values-ko-rKR/strings.xml
@ -124,24 +124,6 @@
    <string name="ble_not_enabled">블루투스가 활성화되지 않았습니다.</string>
    <string name="location_not_found_title">위치가 활성화되지 않았습니다.</string>
    <string name="location_not_found_message">최신 스마트폰에서 블루투스 검색이 작동하려면 위치가 활성화되어 있어야합니다. AAPS는 당신의 위치를 추적하지 않으며 페어링에 성공한 후 비활성화 할 수 있습니다.</string>
-    <!--    DateUtil-->
-    <string name="minago">%1$d 분 전</string>
-    <string name="hoursago">%1$.1f 시간 전</string>
-    <string name="shorthour">시간</string>
-    <string name="days">일</string>
-    <string name="hours">시간</string>
-    <string name="unit_second">초</string>
-    <string name="unit_minute">분</string>
-    <string name="unit_hour">시</string>
-    <string name="unit_day">일</string>
-    <string name="unit_week">주</string>
-    <string name="unit_seconds">초</string>
-    <string name="unit_minutes">분</string>
-    <string name="unit_hours">시</string>
-    <string name="unit_days">일</string>
-    <string name="unit_weeks">주</string>
-    <string name="shortminute">분</string>
-    <string name="shortday">일</string>
    <!--    Protection-->
    <string name="wrongpassword">잘못된 비밀번호</string>
    <string name="passwords_dont_match">비밀번호가 일치하지 않습니다.</string>
@ -394,6 +376,7 @@
    <string name="value_out_of_hard_limits">»%1$s« %2$.2f이 \'고정된 한계값\'을 벗어났습니다.</string>
    <string name="basal_value">Basal 값</string>
    <!-- Command Queue + readStatus reasons -->
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="other">%1$d 일</item>
    </plurals>
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@ -125,24 +125,6 @@
    <string name="ble_not_enabled">Bluetooth neįjungta.</string>
    <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>
-    <string name="unit_second">sek.</string>
-    <string name="unit_minute">min.</string>
-    <string name="unit_hour">val.</string>
-    <string name="unit_day">d.</string>
-    <string name="unit_week">savaitė</string>
-    <string name="unit_seconds">sekundės</string>
-    <string name="unit_minutes"> min.</string>
-    <string name="unit_hours">val.</string>
-    <string name="unit_days">d.</string>
-    <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>
@ -436,6 +418,7 @@
    <string name="bolus_ok" comment="26 characters max for translation">Bolusas OK</string>
    <string name="pump_paired" comment="26 characters max for translation">Pompa suporuota</string>
    <string name="insight_refresh_button" comment="26 characters max for translation">Insight Mygtukas Naujinti</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d d.</item>
        <item quantity="few">%1$d d.</item>
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@ -132,33 +132,6 @@
    <string name="ble_not_enabled">Bluetooth niet ingeschakeld.</string>
    <string name="location_not_found_title">Locatie is niet ingeschakeld</string>
    <string name="location_not_found_message">Om Bluetooth discovery met nieuwere apparaten te laten werken moet locatie worden ingeschakeld. AAPS volgt je locatie niet en locatie kan ook weer worden uitgeschakeld nadat het koppelen is gelukt.</string>
-    <!--    DateUtil-->
-    <string name="minago">%1$d m geleden</string>
-    <string name="minago_long">%1$d minuten geleden</string>
-    <string name="hoursago">%1$.1f u geleden</string>
-    <string name="days_ago">%1$.1f dagen geleden</string>
-    <string name="days_ago_round">%1$.0f dagen geleden</string>
-    <string name="in_days">over %1$.0f dagen</string>
-    <string name="in_days_round">over %1$.0f dagen</string>
-    <string name="shorthour">u</string>
-    <string name="days">dagen</string>
-    <string name="hours">uren</string>
-    <string name="unit_second">seconde</string>
-    <string name="unit_minute">minuut</string>
-    <string name="unit_hour">uur</string>
-    <string name="unit_day">dag</string>
-    <string name="unit_week">week</string>
-    <string name="unit_seconds">seconden</string>
-    <string name="unit_minutes">minuten</string>
-    <string name="unit_hours">uren</string>
-    <string name="unit_days">dagen</string>
-    <string name="unit_weeks">weken</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Later Vandaag</string>
-    <string name="tomorrow">Morgen</string>
-    <string name="today">Vandaag</string>
-    <string name="yesterday">Gisteren</string>
    <!--    Protection-->
    <string name="wrongpassword">Verkeerd wachtwoord</string>
    <string name="wrongpin">Onjuiste PIN-code</string>
@ -465,6 +438,7 @@
    <string name="remove_items">Items verwijderen</string>
    <string name="sort_items">Sorteer items</string>
    <string name="remove_selected_items">Verwijder geselecteerde items</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d dag</item>
        <item quantity="other">%1$d dagen</item>
--- a/core/src/main/res/values-no-rNO/strings.xml
+++ b/core/src/main/res/values-no-rNO/strings.xml
@ -132,33 +132,6 @@
    <string name="ble_not_enabled">Bluetooth er ikke aktivert.</string>
    <string name="location_not_found_title">Stedstjeneste er ikke aktivert</string>
    <string name="location_not_found_message">Bluetooth søk på nye mobiler virker bare når posisjonstjeneste er aktivert. AAPS lagrer ikke dine posisjonsdata og den kan derfor slås av etter vellykket sammenkobling.</string>
-    <!--    DateUtil-->
-    <string name="minago">%1$d min siden</string>
-    <string name="minago_long">%1$d minutter siden</string>
-    <string name="hoursago">%1$.1f timer siden</string>
-    <string name="days_ago">%1$.1f dager siden</string>
-    <string name="days_ago_round">%1$.0f dager siden</string>
-    <string name="in_days">om %1$.0f dager</string>
-    <string name="in_days_round">om %1$.0f dager</string>
-    <string name="shorthour">t</string>
-    <string name="days">dager</string>
-    <string name="hours">timer</string>
-    <string name="unit_second">sekund</string>
-    <string name="unit_minute">minutt</string>
-    <string name="unit_hour">time</string>
-    <string name="unit_day">dag</string>
-    <string name="unit_week">uke</string>
-    <string name="unit_seconds">sekunder</string>
-    <string name="unit_minutes">minutter</string>
-    <string name="unit_hours">timer</string>
-    <string name="unit_days">dager</string>
-    <string name="unit_weeks">uker</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Senere i dag</string>
-    <string name="tomorrow">I morgen</string>
-    <string name="today">Idag</string>
-    <string name="yesterday">I går</string>
    <!--    Protection-->
    <string name="wrongpassword">Feil passord</string>
    <string name="wrongpin">Feil PIN-kode</string>
@ -465,6 +438,9 @@
    <string name="remove_items">Slett elementer</string>
    <string name="sort_items">Sorter elementer</string>
    <string name="remove_selected_items">Slett valgte elementer</string>
+    <string name="a11y_file">fil</string>
+    <string name="a11y_user">bruker</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d dag</item>
        <item quantity="other">%1$d dager</item>
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@ -125,24 +125,6 @@
    <string name="ble_not_enabled">Bluetooth nie jest włączony.</string>
    <string name="location_not_found_title">Lokalizacja nie jest włączona</string>
    <string name="location_not_found_message">Aby uruchomić odnajdywanie Bluetooth na nowszych urządzeniach, lokalizacja musi być uruchomiona. AAPS nie śledzi twojej lokalizacji więc po udanym parowaniu urządzenia Bluetooth można wyłączyć lokalizację.</string>
-    <!--    DateUtil-->
-    <string name="minago">%1$d min temu</string>
-    <string name="hoursago">%1$.1f godz. temu</string>
-    <string name="shorthour">h</string>
-    <string name="days">dni</string>
-    <string name="hours">godzin</string>
-    <string name="unit_second">sekunda</string>
-    <string name="unit_minute">minuta</string>
-    <string name="unit_hour">godzina</string>
-    <string name="unit_day">dzień</string>
-    <string name="unit_week">tydzień</string>
-    <string name="unit_seconds">sekund</string>
-    <string name="unit_minutes">minut</string>
-    <string name="unit_hours">godzin</string>
-    <string name="unit_days">dni</string>
-    <string name="unit_weeks">tygodni</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
    <!--    Protection-->
    <string name="wrongpassword">Złe hasło</string>
    <string name="passwords_dont_match">Hasła się nie zgadzają</string>
@ -436,6 +418,7 @@
    <string name="bolus_ok" comment="26 characters max for translation">Bolus OK</string>
    <string name="pump_paired" comment="26 characters max for translation">Pompa sparowana</string>
    <string name="insight_refresh_button" comment="26 characters max for translation">Przycisk Odświeżania Insight</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d dzień</item>
        <item quantity="few">%1$d dni</item>
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@ -102,21 +102,6 @@
    <string name="ble_not_enabled">Bluetooth não está ativado.</string>
    <string name="location_not_found_title">Localização Não Está Ativada</string>
    <string name="location_not_found_message">Para que a procura de Bluetooth funcione em aparelhos mais recentes, a localização tem que ser activada. A app não rastreia a sua localização e pode ser desativada depois de um emparelhamento bem sucedido.</string>
-    <!--    DateUtil-->
-    <string name="shorthour">h</string>
-    <string name="days">dias</string>
-    <string name="hours">horas</string>
-    <string name="unit_second">segundo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">hora</string>
-    <string name="unit_day">dia</string>
-    <string name="unit_week">semana</string>
-    <string name="unit_seconds">segundos</string>
-    <string name="unit_minutes">minutos</string>
-    <string name="unit_hours">horas</string>
-    <string name="unit_days">dias</string>
-    <string name="unit_weeks">semanas</string>
-    <string name="shortminute">m</string>
    <!--    Protection-->
    <string name="passwords_dont_match">As passwords não coincidem</string>
    <!--    Profile-->
@ -239,6 +224,7 @@
    <!-- HardLimits -->
    <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
    <!-- Command Queue + readStatus reasons -->
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d dia</item>
        <item quantity="other">%1$d dias</item>
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@ -123,24 +123,6 @@
    <string name="ble_not_enabled">Bluetooth não está activado.</string>
    <string name="location_not_found_title">Localização Não Está Activa</string>
    <string name="location_not_found_message">Para a Pesquisa Bluetooth funcionar em dispositivos mais recentes, a localização deve ser activada. AAPS não acompanha a sua localização e pode ser desactivada após o emparelhamento bem-sucedido.</string>
-    <!--    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>
-    <string name="unit_second">segundo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">hora</string>
-    <string name="unit_day">dia</string>
-    <string name="unit_week">semana</string>
-    <string name="unit_seconds">segundos</string>
-    <string name="unit_minutes">minutos</string>
-    <string name="unit_hours">horas</string>
-    <string name="unit_days">dias</string>
-    <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>
@ -355,6 +337,7 @@
    <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
    <string name="valueoutofrange">»%1$s« está fora dos limites máximos</string>
    <!-- Command Queue + readStatus reasons -->
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d dia</item>
        <item quantity="other">%1$d dias</item>
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@ -125,24 +125,6 @@
    <string name="ble_not_enabled">Bluetooth-ul este dezactivat.</string>
    <string name="location_not_found_title">Localizarea este dezactivată</string>
    <string name="location_not_found_message">Pentru a putea căuta dispozitive Bluetooth noi, trebuie să activați localizarea. AAPS nu folosește datele dumneavoastră de localizare și acestea pot fi dezactivate după stabilirea conexiunii cu pompa.</string>
-    <!--    DateUtil-->
-    <string name="minago">%1$d min în urmă</string>
-    <string name="hoursago">%1$.1f ore în urmă</string>
-    <string name="shorthour">h</string>
-    <string name="days">zile</string>
-    <string name="hours">ore</string>
-    <string name="unit_second">secundă</string>
-    <string name="unit_minute">minut</string>
-    <string name="unit_hour">oră</string>
-    <string name="unit_day">zi</string>
-    <string name="unit_week">săptămână</string>
-    <string name="unit_seconds">secunde</string>
-    <string name="unit_minutes">minute</string>
-    <string name="unit_hours">ore</string>
-    <string name="unit_days">zile</string>
-    <string name="unit_weeks">săptămâni</string>
-    <string name="shortminute">min</string>
-    <string name="shortday">z</string>
    <!--    Protection-->
    <string name="wrongpassword">Parola greșită</string>
    <string name="passwords_dont_match">Parolele nu corespund</string>
@ -437,6 +419,7 @@
    <string name="bolus_ok" comment="26 characters max for translation">Bolus OK</string>
    <string name="pump_paired" comment="26 characters max for translation">Pompă împerecheată</string>
    <string name="insight_refresh_button" comment="26 characters max for translation">Buton Reîmprospătare Insight</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d zi</item>
        <item quantity="few">%1$d zile</item>
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@ -132,33 +132,6 @@
    <string name="ble_not_enabled">Bluetooth не включен.</string>
    <string name="location_not_found_title">Геолокация не включена</string>
    <string name="location_not_found_message">Для обнаружения Bluetooth на новых устройствах необходимо включить геолокацию. AAPS не отслеживает ваше местоположение и может быть отключен после успешного сопряжения.</string>
-    <!--    DateUtil-->
-    <string name="minago">%1$d мин. назад</string>
-    <string name="minago_long">%1$d минут назад</string>
-    <string name="hoursago">%1$.1fч. назад</string>
-    <string name="days_ago">%1$s дн назад</string>
-    <string name="days_ago_round">%1$s дн назад</string>
-    <string name="in_days">через %1$.0f дн</string>
-    <string name="in_days_round">через %1$.0f дн</string>
-    <string name="shorthour">ч</string>
-    <string name="days">дн</string>
-    <string name="hours">час</string>
-    <string name="unit_second">сек</string>
-    <string name="unit_minute">мин</string>
-    <string name="unit_hour">час</string>
-    <string name="unit_day">дн</string>
-    <string name="unit_week">нед</string>
-    <string name="unit_seconds">сек</string>
-    <string name="unit_minutes">мин</string>
-    <string name="unit_hours">час</string>
-    <string name="unit_days">дн</string>
-    <string name="unit_weeks">нед</string>
-    <string name="shortminute">мин</string>
-    <string name="shortday">дн</string>
-    <string name="later_today">Позднее сегодня</string>
-    <string name="tomorrow">Завтра</string>
-    <string name="today">Cегодня</string>
-    <string name="yesterday">Вчера</string>
    <!--    Protection-->
    <string name="wrongpassword">Неверный пароль</string>
    <string name="wrongpin">Неверный PIN-код</string>
@ -465,6 +438,7 @@
    <string name="remove_items">Удалить элементы</string>
    <string name="sort_items">Сортировать элементы</string>
    <string name="remove_selected_items">Удалить выбранные элементы</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d день</item>
        <item quantity="few">%1$d дня</item>
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@ -132,33 +132,6 @@
    <string name="ble_not_enabled">Bluetooth nie je aktivovaný.</string>
    <string name="location_not_found_title">Poloha nie je aktivovaná</string>
    <string name="location_not_found_message">Pre vyhľadanie Bluetooth zariadení na novších telefónoch musí byť povolené zisťovanie polohy. AAPS vás nesleduje a po úspešnom spárovaní môžete túto voľbu opäť zakázať.</string>
-    <!--    DateUtil-->
-    <string name="minago">pred %1$d min</string>
-    <string name="minago_long">pred %1$d minútami</string>
-    <string name="hoursago">pred %1$.1f h</string>
-    <string name="days_ago">Pred %1$.1f dňami</string>
-    <string name="days_ago_round">Pred %1$.0f dňami</string>
-    <string name="in_days">za %1$.0f dní</string>
-    <string name="in_days_round">za %1$.0f dní</string>
-    <string name="shorthour">h</string>
-    <string name="days">dní</string>
-    <string name="hours">hodín</string>
-    <string name="unit_second">sekunda</string>
-    <string name="unit_minute">minúta</string>
-    <string name="unit_hour">hodina</string>
-    <string name="unit_day">deň</string>
-    <string name="unit_week">týždeň</string>
-    <string name="unit_seconds">sekúnd</string>
-    <string name="unit_minutes">minút</string>
-    <string name="unit_hours">hodín</string>
-    <string name="unit_days">dní</string>
-    <string name="unit_weeks">týždňov</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Neskôr počas dňa</string>
-    <string name="tomorrow">Zajtra</string>
-    <string name="today">Dnes</string>
-    <string name="yesterday">včera</string>
    <!--    Protection-->
    <string name="wrongpassword">Nesprávne heslo</string>
    <string name="wrongpin">Nesprávny PIN</string>
@ -467,6 +440,7 @@
    <string name="remove_selected_items">Odstrániť vybrané položky</string>
    <string name="a11y_file">súbor</string>
    <string name="a11y_user">používateľ</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d deň</item>
        <item quantity="few">%1$d dní</item>
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@ -131,25 +131,6 @@
    <string name="ble_not_enabled">Bluetooth är avstängt.</string>
    <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="minago_long">%1$d minuter 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>
-    <string name="unit_second">sekund</string>
-    <string name="unit_minute">minut</string>
-    <string name="unit_hour">timme</string>
-    <string name="unit_day">dag</string>
-    <string name="unit_week">vecka</string>
-    <string name="unit_seconds">sekunder</string>
-    <string name="unit_minutes">minuter</string>
-    <string name="unit_hours">timmar</string>
-    <string name="unit_days">dagar</string>
-    <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>
@ -445,6 +426,7 @@
    <string name="insight_refresh_button" comment="26 characters max for translation">Uppdat. knapp för Insight</string>
    <string name="a11y_min_button_description">minska %1$s med %2$s</string>
    <string name="a11y_plus_button_description">öka %1$s med %2$s</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="one">%1$d dag</item>
        <item quantity="other">%1$d dagar</item>
--- a/core/src/main/res/values-tr-rTR/strings.xml
+++ b/core/src/main/res/values-tr-rTR/strings.xml
@ -42,6 +42,7 @@
    <string name="carbs">Karbonhidrat</string>
    <string name="invalidprofile">Geçersiz profil!!!</string>
    <string name="noprofileset">PROFİL AYARLANMADI</string>
+    <string name="active"><![CDATA[<Aktif>]]></string>
    <string name="date">Tarih</string>
    <string name="units_label">Birim</string>
    <string name="dia_label">İES</string>
@ -132,33 +133,6 @@
    <string name="ble_not_enabled">Bluetooth etkin değil.</string>
    <string name="location_not_found_title">Konum Etkin Değil</string>
    <string name="location_not_found_message">Bluetooth cihaz bulmanın daha yeni cihazlarda çalışması için konum etkinleştirilmelidir. AAPS konumunuzu izlemez ve eşleştirme başarılı olduktan sonra devre dışı bırakılabilir.</string>
-    <!--    DateUtil-->
-    <string name="minago">%1$d dak önce</string>
-    <string name="minago_long">%1$d dakika önce</string>
-    <string name="hoursago">%1$.1f s önce</string>
-    <string name="days_ago">%1$.1f gün önce</string>
-    <string name="days_ago_round">%1$.0f gün önce</string>
-    <string name="in_days">%1$.0f gün içinde</string>
-    <string name="in_days_round">%1$.0f gün içinde</string>
-    <string name="shorthour">s</string>
-    <string name="days">gün</string>
-    <string name="hours">saat</string>
-    <string name="unit_second">saniye</string>
-    <string name="unit_minute">dakika</string>
-    <string name="unit_hour">saat</string>
-    <string name="unit_day">gün</string>
-    <string name="unit_week">hafta</string>
-    <string name="unit_seconds">saniye</string>
-    <string name="unit_minutes">dakika</string>
-    <string name="unit_hours">saat</string>
-    <string name="unit_days">gün</string>
-    <string name="unit_weeks">hafta</string>
-    <string name="shortminute">dk</string>
-    <string name="shortday">g</string>
-    <string name="later_today">Bugünden sonra</string>
-    <string name="tomorrow">Yarın</string>
-    <string name="today">Bugün</string>
-    <string name="yesterday">Dün</string>
    <!--    Protection-->
    <string name="wrongpassword">Hatalı parola</string>
    <string name="wrongpin">Yanlış PIN</string>
@ -465,6 +439,50 @@
    <string name="remove_items">Öğeleri kaldır</string>
    <string name="sort_items">Öğeleri Sırala</string>
    <string name="remove_selected_items">Seçilen öğeleri kaldır</string>
+    <string name="a11y_file">dosya</string>
+    <string name="a11y_user">kullanıcı</string>
+    <!-- Autotune -->
+    <string name="autotune">Otoayar</string>
+    <string name="autotune_description">Potansiyel profil ayarlamaları için yardım (İDF, karbonhidrat ve bazal oranları)</string>
+    <string name="autotune_shortname">AT</string>
+    <string name="autotune_settings">OtoAyar ayarları</string>
+    <string name="autotune_auto_title">Otomasyon Profil değişimi</string>
+    <string name="autotune_categorize_uam_as_basal_title">UAM\'yi bazal olarak sınıflandır</string>
+    <string name="autotune_categorize_uam_as_basal_summary">Yalnızca yenen tüm karbonhidratları güvenilir bir şekilde girdiyseniz etkinleştirin, bu seçenekle OtoAyar tarafından görülen ani artışlar bazal oranda değişiklik önermek için kullanılacaktır.</string>
+    <string name="autotune_default_tune_days_title">Veri gün sayısı</string>
+    <string name="autotune_circadian_ic_isf_title">Sirkadiyen IC/İDF ortalama sonucunu uygula</string>
+    <string name="autotune_circadian_ic_isf_summary">OtoAyar sirkadiyen varyasyonları ayarlamaz, bu seçenek sirkadiyen giriş profilinize yalnızca IC ve İDF\'nün ortalama ayarını uygular</string>
+    <string name="autotune_additional_log_title">Hata ayıklama için daha fazla günlük bilgisi ekleyin</string>
+    <string name="autotune_additional_log_summary">OtoAyar eklentisinde hata ayıklamaya yardımcı olmak için yalnızca geliştirici tarafından daha fazla günlük bilgisi göndermesi istenirse açın</string>
+    <string name="autotune_default_tune_days_summary">OtoAyar tarafından işlenecek varsayılan veri gün sayısı (en fazla xx)</string>
+    <string name="autotune_tunedprofile_name">Ayarlandı</string>
+    <string name="autotune_profile">Profil :</string>
+    <string name="autotune_tune_days">Ayar günleri:</string>
+    <string name="autotune_last_run">Son Çalıştırma :</string>
+    <string name="autotune_warning">Uyarı :</string>
+    <string name="autotune_select_profile">Ayarlanacak profili seçin</string>
+    <string name="autotune_error">Giriş verilerinde hata, gün sayısını azaltmaya çalışın</string>
+    <string name="autotune_warning_during_run">OtoAyar hesaplaması başladı, lütfen sabırlı olun</string>
+    <string name="autotune_warning_after_run">Kullanmadan önce sonuçları dikkatlice kontrol edin!</string>
+    <string name="autotune_partial_result">Kısmi sonuç günü %1$d / %2$d ayarlandı</string>
+    <string name="autotune_result">Sonuç: %1$s</string>
+    <string name="autotune_param">Parametre</string>
+    <string name="autotune_percent">%</string>
+    <string name="autotune_missing">Eksik</string>
+    <string name="autotune_profile_name">OtoAyar profili %1$s</string>
+    <string name="autotune_run">Otoayar\'ı Çalıştır</string>
+    <string name="autotune_check_input_profile_button">Giriş profilini kontrol edin</string>
+    <string name="autotune_compare_profile">Profilleri karşılaştırın</string>
+    <string name="autotune_copy_localprofile_button">Yerel profile kopyala</string>
+    <string name="autotune_update_input_profile_button">Giriş profilini güncelle</string>
+    <string name="autotune_revert_input_profile_button">Giriş profilini geri al</string>
+    <string name="autotune_copy_local_profile_message">Bu OtoAyar Profilinden yeni bir yerel profil oluşturulsun mu?</string>
+    <string name="autotune_update_local_profile_message">OtoAyar Profili ile %1$s profili güncellensin mi?</string>
+    <string name="autotune_revert_local_profile_message">Giriş Profili ile %1$s profili geri alınsın mı?</string>
+    <string name="autotune_profile_invalid">Profil geçersiz</string>
+    <string name="autotune_run_without_autoswitch">OtoAyar profil değiştirme olmadan çalıştırıldı</string>
+    <string name="autotune_run_with_autoswitch">OtoAyar çalıştırıldı ve profil otomatik olarak değiştirildi</string>
+    <string name="autotune_run_with_error">Son OtoAyar çalışması sırasında hata oluştu</string>
    <plurals name="days">
        <item quantity="one">%1$d gün</item>
        <item quantity="other">%1$d gün</item>
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@ -132,33 +132,6 @@
    <string name="ble_not_enabled">蓝牙未启用</string>
    <string name="location_not_found_title">未启用位置</string>
    <string name="location_not_found_message">为了蓝牙能发现新的设备，手机定位功能必须启用， AAPS 不会追踪你的位置，你可以在配对成功后禁用定位。</string>
-    <!--    DateUtil-->
-    <string name="minago">%1$d 分钟前</string>
-    <string name="minago_long">%1$d 分钟前</string>
-    <string name="hoursago">%1$.1f 小时前</string>
-    <string name="days_ago">%1$.1f 天前</string>
-    <string name="days_ago_round">%1$.0f 天前</string>
-    <string name="in_days">在 %1$.0f 天内</string>
-    <string name="in_days_round">在 %1$.0f 天内</string>
-    <string name="shorthour">h</string>
-    <string name="days">天</string>
-    <string name="hours">小时</string>
-    <string name="unit_second">秒</string>
-    <string name="unit_minute">分钟</string>
-    <string name="unit_hour">小时</string>
-    <string name="unit_day">天</string>
-    <string name="unit_week">周</string>
-    <string name="unit_seconds">秒</string>
-    <string name="unit_minutes">分钟</string>
-    <string name="unit_hours">小时</string>
-    <string name="unit_days">天</string>
-    <string name="unit_weeks">周</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">今天稍后</string>
-    <string name="tomorrow">明天</string>
-    <string name="today">今天</string>
-    <string name="yesterday">昨天</string>
    <!--    Protection-->
    <string name="wrongpassword">密码错误</string>
    <string name="wrongpin">PIN 码错误</string>
@ -467,6 +440,7 @@
    <string name="remove_selected_items">删除选中项</string>
    <string name="a11y_file">文件</string>
    <string name="a11y_user">用户</string>
+    <!-- Autotune -->
    <plurals name="days">
        <item quantity="other">%1$d　天</item>
    </plurals>
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpTemporaryBasalTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpTemporaryBasalTransaction.kt
@ -24,20 +24,22 @@ class SyncPumpTemporaryBasalTransaction(
                existing.duration != temporaryBasal.duration  && existing.interfaceIDs.endId == null ||
                existing.type != type ?: existing.type
            ) {
+                val old = existing.copy()
                existing.timestamp = temporaryBasal.timestamp
                existing.rate = temporaryBasal.rate
                existing.duration = temporaryBasal.duration
                existing.type = type ?: existing.type
                database.temporaryBasalDao.updateExistingEntry(existing)
-                result.updated.add(Pair(Reason.EXISTING_ID, existing))
+                result.updated.add(Pair(old, existing))
            }
        } else {
            val running = database.temporaryBasalDao.getTemporaryBasalActiveAt(temporaryBasal.timestamp).blockingGet()
            if (running != null) {
+                val old = running.copy()
                running.end = temporaryBasal.timestamp
                running.interfaceIDs.endId = temporaryBasal.interfaceIDs.pumpId
                database.temporaryBasalDao.updateExistingEntry(running)
-                result.updated.add(Pair(Reason.ACTIVE, running))
+                result.updated.add(Pair(old, running))
            }
            database.temporaryBasalDao.insertNewEntry(temporaryBasal)
            result.inserted.add(temporaryBasal)
@ -45,12 +47,9 @@ class SyncPumpTemporaryBasalTransaction(
        return result
    }

-    enum class Reason {
-        EXISTING_ID, ACTIVE
-    }
    class TransactionResult {

        val inserted = mutableListOf<TemporaryBasal>()
-        val updated = mutableListOf<Pair<Reason,TemporaryBasal>>()
+        val updated = mutableListOf<Pair<TemporaryBasal,TemporaryBasal>>()
    }
 }
--- a/diaconn/src/main/res/values-cs-rCZ/strings.xml
+++ b/diaconn/src/main/res/values-cs-rCZ/strings.xml
@ -152,4 +152,6 @@
    <string name="diaconn_g8_errorcode_34">LGS status je vypnutý, OFF příkaz je odmítnut.</string>
    <string name="diaconn_g8_errorcode_35">Spuštění dočasného bazálu je odmítnuto, pokud je již spuštěn jiný</string>
    <string name="diaconn_g8_errorcode_36">Zastavení dočasného bazálu je odmítnuto, pokud žádný není spuštěn</string>
+    <string name="diaconn_g8_cloudsend_summary">Odeslat protokoly pumpy do Diaconn Cloudu.</string>
+    <string name="diaconn_g8_cloudsend_title">Synchronizace do Diaconn cloudu</string>
 </resources>
--- a/diaconn/src/main/res/values-es-rES/strings.xml
+++ b/diaconn/src/main/res/values-es-rES/strings.xml
@ -152,4 +152,6 @@
    <string name="diaconn_g8_errorcode_34">El estado de suspensión por glucosa baja está desactivado (LGS). Se rechaza el comando de desactivación.</string>
    <string name="diaconn_g8_errorcode_35">El inicio de una basal temporal es rechazado cuando se está ejecutando una basal temporal</string>
    <string name="diaconn_g8_errorcode_36">La parada de una basal tempora es rechazada cuando una basal temporal no está ejecutándose</string>
+    <string name="diaconn_g8_cloudsend_summary">Enviar los registros de la bomba a la nube de Diaconn.</string>
+    <string name="diaconn_g8_cloudsend_title">Sincronización con la nube de Diaconn</string>
 </resources>
--- a/diaconn/src/main/res/values-fr-rFR/strings.xml
+++ b/diaconn/src/main/res/values-fr-rFR/strings.xml
@ -152,4 +152,6 @@
    <string name="diaconn_g8_errorcode_34">Mode AGB désactivé, la commande d\'arrêt est refusée.</string>
    <string name="diaconn_g8_errorcode_35">Début de basal temp. rejeté quand une basal temp. est en cours d\'exécution</string>
    <string name="diaconn_g8_errorcode_36">Arrêt de basal temp. rejeté quand une basal temp. n\'est pas en cours d\'exécution</string>
+    <string name="diaconn_g8_cloudsend_summary">Envoyer les logs sur le Cloud Diaconn.</string>
+    <string name="diaconn_g8_cloudsend_title">Synchro Diaconn Cloud</string>
 </resources>
--- a/diaconn/src/main/res/values-ko-rKR/strings.xml
+++ b/diaconn/src/main/res/values-ko-rKR/strings.xml
@ -89,8 +89,6 @@
    <string name="diaconn_g8_logcanulachange_title">바늘 교체</string>
    <string name="diaconn_g8_logcanulachange_summary">로그 동기화 시 케어포털 \"위치 교체\" 정보 자동 업로드</string>
    <string name="diaconn_g8_logbatterychange_summary">로그 동기화 시 케어포털 \"베터리 교체\" 정보 자동 업로드</string>
-    <string name="diaconn_g8_cloudsend_summary">펌프 로그정보를 \"디아콘 클라우드\"로 자동 업로드</string>
-    <string name="diaconn_g8_cloudsend_title">디아콘 클라우드 전송</string>
    <string name="diaconn_g8_logbatterychange_title">베터리 교체</string>
    <string name="diaconn_g8_logsyncinprogress">로그 동기화 진행 중</string>
    <string name="diaconn_g8_loginsulinshorage">인슐린 부족 경고</string>
--- a/diaconn/src/main/res/values-tr-rTR/strings.xml
+++ b/diaconn/src/main/res/values-tr-rTR/strings.xml
@ -152,4 +152,6 @@
    <string name="diaconn_g8_errorcode_34">LGS durumu KAPALI, KAPAT komutu reddedildi.</string>
    <string name="diaconn_g8_errorcode_35">Geçici bazal çalışırken Geçici bazal başlatma reddedilir</string>
    <string name="diaconn_g8_errorcode_36">Geçici bazal çalışmıyorken Geçici bazal durdurma reddedilir</string>
+    <string name="diaconn_g8_cloudsend_summary">Pompa günlüklerini Diaconn Bulut Deposuna gönderin.</string>
+    <string name="diaconn_g8_cloudsend_title">Diaconn Bulut Senkronizasyonu</string>
 </resources>
--- a/medtronic/src/main/res/values-cs-rCZ/strings.xml
+++ b/medtronic/src/main/res/values-cs-rCZ/strings.xml
@ -91,4 +91,6 @@
    <string name="set_neutral_temps_summary">Je-li povoleno, zastaví dočasný bazál před koncem každé hodiny. To může u některých pump pomoci zastavit pípání/vibrace v celou hodinu.</string>
    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min zbývá)</string>
    <string name="invalid_history_data">Byla zjištěna neplatná data historie pumpy. Otevřete nový problém a poskytněte logy.</string>
+    <string name="riley_statistics">Statistiky RL</string>
+    <string name="medtronic_history_type">Typ:</string>
 </resources>
--- a/medtronic/src/main/res/values-it-rIT/strings.xml
+++ b/medtronic/src/main/res/values-it-rIT/strings.xml
@ -91,4 +91,6 @@
    <string name="set_neutral_temps_summary">Se abilitato, cancellerà una basale temporanea prima della fine di ogni ora. Questo metodo può aiutare a fermare alcuni micro dall\'emettere un suono/vibrare allo scoccare dell\'ora.</string>
    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min rimanenti/e)</string>
    <string name="invalid_history_data">Rilevati dati non validi dallo storico del micro. Apri una segnalazione e fornisci i log.</string>
+    <string name="riley_statistics">Statistiche RL</string>
+    <string name="medtronic_history_type">Tipo:</string>
 </resources>
--- a/medtronic/src/main/res/values-no-rNO/strings.xml
+++ b/medtronic/src/main/res/values-no-rNO/strings.xml
@ -91,4 +91,6 @@
    <string name="set_neutral_temps_summary">Hvis aktivert så vil den stoppe en temp basal rett før hver hele time for å stoppe noen pumpers varsler/vibreringer på hver hele time.</string>
    <string name="mdt_tbr_remaining">%1$.1f E/t (%2$d min gjenstår)</string>
    <string name="invalid_history_data">Ugyldige data for pumpehistorikken er oppdaget. Rapporter hendelsen til APPS og legg ved logg.</string>
+    <string name="riley_statistics">RL statistikk</string>
+    <string name="medtronic_history_type">Type:</string>
 </resources>
--- a/medtronic/src/main/res/values-tr-rTR/strings.xml
+++ b/medtronic/src/main/res/values-tr-rTR/strings.xml
@ -91,4 +91,6 @@
    <string name="set_neutral_temps_summary">Etkinleştirilirse, her saatin sonunda geçici bazali iptal eder. Bu yöntem, bazı pompaların saatte bip sesini/titremesini durdurmaya yardımcı olabilir.</string>
    <string name="mdt_tbr_remaining">%1$.1f Ü/sa (%2$d dk. kaldı)</string>
    <string name="invalid_history_data">Geçersiz pompa geçmişi verisi tespit edildi. Yeni hata bildirim konusu açın ve günlükleri gönderin.</string>
+    <string name="riley_statistics">RL İstatistikleri</string>
+    <string name="medtronic_history_type">Tip:</string>
 </resources>
--- a/omnipod-common/src/main/res/values-iw-rIL/strings.xml
+++ b/omnipod-common/src/main/res/values-iw-rIL/strings.xml
@ -112,9 +112,9 @@
    <string name="omnipod_common_preferences_category_alerts">התראות</string>
    <string name="omnipod_common_preferences_category_confirmation_beeps">צפצופי אימות</string>
    <string name="omnipod_common_preferences_category_notifications">התראות</string>
-    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">התראת צליל של בזאלי זמני לא ברור מאופשרת</string>
-    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">התראת צליל של SMB לא ברור מאופשרת</string>
-    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">התראת צליל של בולוס לא ברור מאופשרת</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">התראת צליל של בזאלי זמני לא ודאי מאופשרת</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">התראת צליל של SMB לא ודאי מאופשרת</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">התראת צליל של בולוס לא ודאי מאופשרת</string>
    <!-- Omnipod - Pod Status -->
    <string name="omnipod_common_pod_status_no_active_pod">אין פוד פעיל</string>
    <string name="omnipod_common_pod_status_waiting_for_activation">התקנה בביצוע (ממתין להפעלת הפוד)</string>
@ -147,7 +147,7 @@
    <string name="omnipod_common_cmd_read_pulse_log">קרא יומן פעימות</string>
    <string name="omnipod_common_cmd_set_fake_suspended_tbr">הגדר בזאלי זמני מזויף כי הפוד מושהה</string>
    <string name="omnipod_common_cmd_cancel_fake_suspended_tbr">בטל בזאלי זמני מזויף שנוצר מפני שהפוד הושהה</string>
-    <string name="omnipod_common_cmd_split_tbr">פיצול הבזאלי הזמני עקב כשל לא ברור בביטול</string>
+    <string name="omnipod_common_cmd_split_tbr">פיצול הבזאלי הזמני עקב כשל לא ודאי בביטול</string>
    <string name="omnipod_common_cmd_beep_config">הגדרות צפצוף</string>
    <string name="omnipod_common_cmd_play_test_beep">השמע צפצוף ניסיון</string>
    <!-- Omnipod - Alerts -->
--- a/omnipod-eros/src/main/res/values-iw-rIL/strings.xml
+++ b/omnipod-eros/src/main/res/values-iw-rIL/strings.xml
@ -12,7 +12,7 @@
    <string name="omnipod_eros_preferences_category_riley_link">ריילילינק</string>
    <string name="omnipod_eros_preferences_notification_uncertain_tbr_sound_enabled">התראת צליל של בזאלי זמני לא ברור מאופשרת</string>
    <string name="omnipod_eros_preferences_notification_uncertain_smb_sound_enabled">התראת צליל של SMB לא ברור מאופשרת</string>
-    <string name="omnipod_eros_preferences_notification_uncertain_bolus_sound_enabled">התראת צליל של בולוס לא ברור מאופשרת</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_bolus_sound_enabled">התראת צליל של בולוס לא ודאי מאופשרת</string>
    <!-- Omnipod Eros - History -->
    <string name="omnipod_eros_history_title">היסטוריית הפוד</string>
    <string name="omnipod_eros_history_item_description">תיאור</string>
@ -68,5 +68,5 @@
    <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">מלאו פוד חדש עם מספיק אינסולין לשלושה ימים.\n\nהקשיבו לשני צפצופים מהפוד במהלך המילוי. הם מציינים שהכמות המינימלית של 80 יחידות הוכנסה. הקפידו לרוקן לחלוטין את מזרק המילוי, גם לאחר שמיעת שני הצפצופים.\n\nלאחר מילוי הפוד, יש ללחוץ <b>הבא</b>.\n\n<b>הערה:</b> נא לא להסיר עדיין את מכסה המחט.\n<b> הערה:</b> נא להניח את הריילילינק במצב עומד ובמרחק סנטימטרים בודדים מהפוד.</string>
    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">מנסה לצמד את הפוד החדש ולאתחלו.\n\nכאשר תהליך האתחול יושלם, ניתן ללחוץ על <b>הבא</b>.\n\n<b>שימו לב:</b> נא למקם את הריילילינק במצב אנכי ולמקם את הפוד מספר סנטימטרים ממנו.</string>
    <!-- Omnipod Eros - Other -->
-    <string name="omnipod_eros_uncertain">לא בטוח</string>
+    <string name="omnipod_eros_uncertain">לא וודאי</string>
 </resources>
--- a/shared/src/main/java/info/nightscout/shared/weardata/EventData.kt
+++ b/shared/src/main/java/info/nightscout/shared/weardata/EventData.kt
@ -19,7 +19,7 @@ sealed class EventData : Event() {

    // Mobile <- Wear
    @Serializable
-    data class ActionPong(val timeStamp: Long) : EventData()
+    data class ActionPong(val timeStamp: Long, val apiLevel: Int) : EventData()

    @Serializable
    data class Error(val timeStamp: Long) : EventData() // ignored
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@ -29,9 +29,9 @@
        <service
            android:name=".watchfaces.BigChartWatchface"
            android:allowEmbedded="true"
+            android:exported="false"
            android:label="@string/label_watchface_big_chart"
-            android:permission="android.permission.BIND_WALLPAPER"
-            android:exported="false">
+            android:permission="android.permission.BIND_WALLPAPER">
            <meta-data
                android:name="android.service.wallpaper"
                android:resource="@xml/watch_face" />
@ -51,9 +51,9 @@
        <service
            android:name=".watchfaces.NoChartWatchface"
            android:allowEmbedded="true"
+            android:exported="false"
            android:label="@string/label_watchface_no_chart"
-            android:permission="android.permission.BIND_WALLPAPER"
-            android:exported="false">
+            android:permission="android.permission.BIND_WALLPAPER">
            <meta-data
                android:name="android.service.wallpaper"
                android:resource="@xml/watch_face" />
@ -73,9 +73,9 @@
        <service
            android:name=".watchfaces.AapsWatchface"
            android:allowEmbedded="true"
+            android:exported="false"
            android:label="@string/label_watchface"
-            android:permission="android.permission.BIND_WALLPAPER"
-            android:exported="false">
+            android:permission="android.permission.BIND_WALLPAPER">
            <meta-data
                android:name="android.service.wallpaper"
                android:resource="@xml/watch_face" />
@ -98,9 +98,9 @@
        <service
            android:name=".watchfaces.AapsV2Watchface"
            android:allowEmbedded="true"
+            android:exported="false"
            android:label="@string/label_watchface_v2"
-            android:permission="android.permission.BIND_WALLPAPER"
-            android:exported="false">
+            android:permission="android.permission.BIND_WALLPAPER">
            <meta-data
                android:name="android.service.wallpaper"
                android:resource="@xml/watch_face" />
@ -123,9 +123,9 @@
        <service
            android:name=".watchfaces.CockpitWatchface"
            android:allowEmbedded="true"
+            android:exported="false"
            android:label="@string/label_watchface_cockpit"
-            android:permission="android.permission.BIND_WALLPAPER"
-            android:exported="false">
+            android:permission="android.permission.BIND_WALLPAPER">
            <meta-data
                android:name="android.service.wallpaper"
                android:resource="@xml/watch_face" />
@ -148,9 +148,9 @@
        <service
            android:name=".watchfaces.SteampunkWatchface"
            android:allowEmbedded="true"
+            android:exported="false"
            android:label="@string/label_watchface_steampunk"
-            android:permission="android.permission.BIND_WALLPAPER"
-            android:exported="false">
+            android:permission="android.permission.BIND_WALLPAPER">
            <meta-data
                android:name="android.service.wallpaper"
                android:resource="@xml/watch_face" />
@ -173,9 +173,9 @@
        <service
            android:name=".watchfaces.AapsLargeWatchface"
            android:allowEmbedded="true"
+            android:exported="false"
            android:label="@string/label_watchface_large"
-            android:permission="android.permission.BIND_WALLPAPER"
-            android:exported="false">
+            android:permission="android.permission.BIND_WALLPAPER">
            <meta-data
                android:name="android.service.wallpaper"
                android:resource="@xml/watch_face" />
@ -197,9 +197,9 @@
        <service
            android:name=".watchfaces.CircleWatchface"
            android:allowEmbedded="true"
+            android:exported="false"
            android:label="@string/label_watchface_circle"
-            android:permission="android.permission.BIND_WALLPAPER"
-            android:exported="false">
+            android:permission="android.permission.BIND_WALLPAPER">
            <meta-data
                android:name="android.service.wallpaper"
                android:resource="@xml/watch_face" />
@ -219,9 +219,9 @@
        <service
            android:name=".watchfaces.DigitalStyleWatchface"
            android:allowEmbedded="true"
+            android:exported="false"
            android:label="@string/label_watchface_digital_style"
-            android:permission="android.permission.BIND_WALLPAPER"
-            android:exported="false">
+            android:permission="android.permission.BIND_WALLPAPER">
            <meta-data
                android:name="android.service.wallpaper"
                android:resource="@xml/watch_face" />
@ -241,7 +241,8 @@
            </intent-filter>
        </service>

-        <service android:name=".comm.DataLayerListenerServiceWear"
+        <service
+            android:name=".comm.DataLayerListenerServiceWear"
            android:exported="true">
            <intent-filter>
                <action android:name="com.google.android.gms.wearable.CAPABILITY_CHANGED" />
@ -549,45 +550,55 @@
        </activity>
        <activity
            android:name=".interaction.WatchfaceConfigurationActivity"
+            android:exported="true"
            android:label="@string/menu_settings" />
        <activity
            android:name=".interaction.actions.WizardActivity"
+            android:exported="true"
            android:label="@string/menu_wizard" />
        <activity
            android:name=".interaction.menus.FillMenuActivity"
+            android:exported="true"
            android:label="@string/menu_prime_fill" />
        <activity
            android:name=".interaction.menus.StatusMenuActivity"
+            android:exported="true"
            android:label="@string/menu_status" />
        <activity
            android:name=".interaction.actions.TreatmentActivity"
+            android:exported="true"
            android:label="@string/menu_treatment" />
        <activity
            android:name=".interaction.actions.BolusActivity"
+            android:exported="true"
            android:label="@string/action_insulin" />
        <activity
            android:name=".interaction.actions.ProfileSwitchActivity"
+            android:exported="true"
            android:label="@string/status_profile_switch" />
        <activity
            android:name=".interaction.actions.AcceptActivity"
+            android:exported="true"
            android:label="@string/action_confirm"
            android:launchMode="singleInstance" />
        <activity
            android:name=".interaction.actions.FillActivity"
+            android:exported="true"
            android:label="@string/menu_prime_fill" />
        <activity
            android:name=".interaction.actions.ECarbActivity"
+            android:exported="true"
            android:label="@string/action_ecarbs" />
        <activity
            android:name=".interaction.actions.CarbActivity"
+            android:exported="true"
            android:label="@string/action_carbs" />
        <activity
            android:name=".interaction.actions.TempTargetActivity"
+            android:exported="true"
            android:label="@string/menu_tempt" />

-        <activity
-            android:name=".interaction.actions.BackgroundActionActivity"
-            android:exported="true" />
+        <activity android:name=".interaction.actions.BackgroundActionActivity" />

        <activity android:name=".interaction.ConfigurationActivity">
            <intent-filter>
--- a/wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt
@ -57,7 +57,7 @@ class DataHandlerWear @Inject constructor(
            .observeOn(aapsSchedulers.io)
            .subscribe {
                aapsLogger.debug(LTag.WEAR, "Ping received from ${it.sourceNodeId}")
-                rxBus.send(EventWearToMobile(EventData.ActionPong(System.currentTimeMillis())))
+                rxBus.send(EventWearToMobile(EventData.ActionPong(System.currentTimeMillis(), Build.VERSION.SDK_INT)))
            }
        disposable += rxBus
            .toObservable(EventData.ConfirmAction::class.java)
@ -115,7 +115,6 @@ class DataHandlerWear @Inject constructor(
            .subscribe {
                aapsLogger.debug(LTag.WEAR, "Bolus progress received from ${it.sourceNodeId}")
                handleBolusProgress(it)
-                rxBus.send(EventWearToMobile(EventData.ActionPong(System.currentTimeMillis())))
            }
        disposable += rxBus
            .toObservable(EventData.Status::class.java)
--- a/wear/src/main/res/values-bg-rBG/strings.xml
+++ b/wear/src/main/res/values-bg-rBG/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(голям)</string>
-    <string name="label_xdrip_big_chart">AAPS(Графика)</string>
-    <string name="label_xdrip_no_chart">AAPS(без рафика)</string>
-    <string name="label_xdrip_circle">AAPS(Кръгъл)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Самолет)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_digitalstyle">AAPS (DigitalStyle)</string>
    <string name="label_warning_sync">Няма данни!</string>
    <string name="label_warning_old">Стари данни!</string>
    <string name="label_warning_since">От %1$s</string>
@ -59,7 +50,6 @@
    <string name="pref_complication_tap_action">Допълнителни действия при почукване</string>
    <string name="pref_unicode_in_complications">Unicode кодиране</string>
    <string name="pref_version">Версия:</string>
-    <string name="pref_moreWatchfaceSettings">Настройки на Watchface</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Погледнете в конфигурацията, моля.</string>
    <string name="menu_tempt">Врем цел</string>
    <string name="menu_bolus">Болус</string>
@ -81,7 +71,6 @@
    <string name="cancel_bolus">СПРИ БОЛУС</string>
    <string name="status_pump">Помпа</string>
    <string name="status_loop">Режим на APS - Loop</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">ВХ</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-cs-rCZ/strings.xml
+++ b/wear/src/main/res/values-cs-rCZ/strings.xml
@ -2,15 +2,15 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(velké)</string>
-    <string name="label_xdrip_big_chart">AAPS(VelkýGraf)</string>
-    <string name="label_xdrip_no_chart">AAPS(BezGrafu)</string>
-    <string name="label_xdrip_circle">APS(Kruh)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS (Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS (Steampunk)</string>
-    <string name="label_digitalstyle">AAPS (DigitalStyle)</string>
+    <string name="label_watchface">AAPS</string>
+    <string name="label_watchface_large">AAPS(velký)</string>
+    <string name="label_watchface_big_chart">AAPS(VelkýGraf)</string>
+    <string name="label_watchface_no_chart">AAPS(BezGrafu)</string>
+    <string name="label_watchface_circle">AAPS(Kruhový)</string>
+    <string name="label_watchface_v2">AAPS(v2)</string>
+    <string name="label_watchface_cockpit">AAPS(Kokpit)</string>
+    <string name="label_watchface_steampunk">AAPS (Steampunk)</string>
+    <string name="label_watchface_digital_style">AAPS (DigitalStyle)</string>
    <string name="label_actions_tile">AAPS(Akce)</string>
    <string name="label_temp_target_tile">AAPS(Doč. cíl)</string>
    <string name="label_quick_wizard_tile">AAPS(Rychlý bolus)</string>
@ -64,7 +64,7 @@
    <string name="pref_complication_tap_action">Akce po klepnutí na komplikaci</string>
    <string name="pref_unicode_in_complications">Znaky Unicode v komplikacích</string>
    <string name="pref_version">Verze:</string>
-    <string name="pref_moreWatchfaceSettings">další nastavení Watchface</string>
+    <string name="pref_moreWatchfaceSettings">Další nastavení ciferníku</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Podívejte se na konfiguraci hodinek prosím.</string>
    <string name="menu_tempt">Dočasný cíl</string>
    <string name="menu_wizard">Kalkulačka</string>
@ -90,7 +90,7 @@
    <string name="action_wizard_confirmation">Požadován kalkulátor</string>
    <string name="action_fill_confirmation">Požadováno plnění</string>
    <string name="action_ecarb_confirmation">Požadovány sacharidy</string>
-    <string name="action_cpp_confirmation">Požadován profil</string>
+    <string name="action_profile_switch_confirmation">Požadováno přepnutí profilu</string>
    <string name="action_target" comment="In temp target menu, single target value">Cíl</string>
    <string name="action_low" comment="In temp target menu, lower value from range">Nízký</string>
    <string name="action_high" comment="In temp target menu, higher value from range">Vysoký</string>
@ -112,7 +112,7 @@
    <string name="cancel_bolus">ZRUŠIT BOLUS</string>
    <string name="status_pump">Pumpa</string>
    <string name="status_loop">Smyčka</string>
-    <string name="status_cpp">CPP</string>
+    <string name="status_profile_switch">Přepnutí profilu</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">Sacharidy</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-da-rDK/strings.xml
+++ b/wear/src/main/res/values-da-rDK/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS (Stor)</string>
-    <string name="label_xdrip_big_chart">AAPS(StorGraf)</string>
-    <string name="label_xdrip_no_chart">AAPS(IngenGraf)</string>
-    <string name="label_xdrip_circle">AAPS(Cirkel)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_digitalstyle">AAPS (Digitalstil)</string>
    <string name="label_warning_sync">Ingen data!</string>
    <string name="label_warning_old">Gammel data!</string>
    <string name="label_warning_since">Siden %1$s</string>
@ -59,7 +50,6 @@
    <string name="pref_complication_tap_action">Complication handling ved tryk</string>
    <string name="pref_unicode_in_complications">Unicode i komplikationer</string>
    <string name="pref_version">Version:</string>
-    <string name="pref_moreWatchfaceSettings">flere Watchface indstillinger</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Se venligst på Watchface-konfigurationen.</string>
    <string name="menu_tempt">MidlertidigMål</string>
    <string name="menu_bolus">Bolus</string>
@ -81,7 +71,6 @@
    <string name="cancel_bolus">ANNULLER BOLUS</string>
    <string name="status_pump">Pumpe</string>
    <string name="status_loop">Loop</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">Kulhydrat</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-de-rDE/strings.xml
+++ b/wear/src/main/res/values-de-rDE/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(groß)</string>
-    <string name="label_xdrip_big_chart">AAPS(GroßerGraph)</string>
-    <string name="label_xdrip_no_chart">AAPS(KeinGraph)</string>
-    <string name="label_xdrip_circle">AAPS(Kreis)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_digitalstyle">AAPS(DigitalStyle)</string>
    <string name="label_warning_sync">Keine Daten!</string>
    <string name="label_warning_old">Veraltete Daten!</string>
    <string name="label_warning_since">Seit %1$s</string>
@ -59,7 +50,6 @@
    <string name="pref_complication_tap_action">Tipp Komplikation</string>
    <string name="pref_unicode_in_complications">Unicode in Komplikationen</string>
    <string name="pref_version">Version:</string>
-    <string name="pref_moreWatchfaceSettings">weitere Watchface Einstellungen</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Schaue Dir bitte die Watchface-Konfiguration an.</string>
    <string name="menu_tempt">Temp. Ziel</string>
    <string name="menu_bolus">Bolus</string>
@ -81,7 +71,6 @@
    <string name="cancel_bolus">Bolus löschen </string>
    <string name="status_pump">Pumpe</string>
    <string name="status_loop">Loop</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">KH</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-es-rES/strings.xml
+++ b/wear/src/main/res/values-es-rES/strings.xml
@ -2,15 +2,15 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS (Grande)</string>
-    <string name="label_xdrip_big_chart">AAPS (Aumentado)</string>
-    <string name="label_xdrip_no_chart">AAPS (SinGráfico)</string>
-    <string name="label_xdrip_circle">AAPS (Círculo)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS (Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS (Steampunk)</string>
-    <string name="label_digitalstyle">AAPS (Digital)</string>
+    <string name="label_watchface">AAPS</string>
+    <string name="label_watchface_large">AAPS (Grande)</string>
+    <string name="label_watchface_big_chart">AAPS (Aumentado)</string>
+    <string name="label_watchface_no_chart">AAPS (SinGráfico)</string>
+    <string name="label_watchface_circle">AAPS (Círculo)</string>
+    <string name="label_watchface_v2">AAPS(v2)</string>
+    <string name="label_watchface_cockpit">AAPS(Cockpit)</string>
+    <string name="label_watchface_steampunk">AAPS(Steampunk)</string>
+    <string name="label_watchface_digital_style">AAPS (Digital)</string>
    <string name="label_actions_tile">AAPS(Acciones)</string>
    <string name="label_temp_target_tile">AAPS(Objetivo Temporal)</string>
    <string name="label_quick_wizard_tile">AAPS(Asistente Rápido)</string>
@ -90,7 +90,7 @@
    <string name="action_wizard_confirmation">Calculadora Solicitada</string>
    <string name="action_fill_confirmation">Llenado Solicitado</string>
    <string name="action_ecarb_confirmation">Carbohidratos Solicitados</string>
-    <string name="action_cpp_confirmation">CPP Solicitado</string>
+    <string name="action_profile_switch_confirmation">Solicitado cambio de perfil</string>
    <string name="action_target" comment="In temp target menu, single target value">Objetivo</string>
    <string name="action_low" comment="In temp target menu, lower value from range">Bajo</string>
    <string name="action_high" comment="In temp target menu, higher value from range">Alto</string>
@ -112,7 +112,7 @@
    <string name="cancel_bolus">CANCELAR BOLO</string>
    <string name="status_pump">Bomba</string>
    <string name="status_loop">Lazo</string>
-    <string name="status_cpp">CPP</string>
+    <string name="status_profile_switch">Cambio de perfil</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">Carbohidratos</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-fr-rFR/strings.xml
+++ b/wear/src/main/res/values-fr-rFR/strings.xml
@ -2,15 +2,15 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS (Large)</string>
-    <string name="label_xdrip_big_chart">AAPS (GrandGraph)</string>
-    <string name="label_xdrip_no_chart">AAPS (SansGraph)</string>
-    <string name="label_xdrip_circle">AAPS (Cercle)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS (Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS (Steampunk)</string>
-    <string name="label_digitalstyle">AAPS (Digital)</string>
+    <string name="label_watchface">AAPS</string>
+    <string name="label_watchface_large">AAPS (Large)</string>
+    <string name="label_watchface_big_chart">AAPS (GrandGraph)</string>
+    <string name="label_watchface_no_chart">AAPS (SansGraph)</string>
+    <string name="label_watchface_circle">AAPS (Cercle)</string>
+    <string name="label_watchface_v2">AAPS (v2)</string>
+    <string name="label_watchface_cockpit">AAPS (Cockpit)</string>
+    <string name="label_watchface_steampunk">AAPS (Steampunk)</string>
+    <string name="label_watchface_digital_style">AAPS (Digital)</string>
    <string name="label_actions_tile">AAPS (Actions)</string>
    <string name="label_temp_target_tile">AAPS(Cible Temp)</string>
    <string name="label_quick_wizard_tile">AAPS(Assistant rapide)</string>
@ -90,7 +90,7 @@
    <string name="action_wizard_confirmation">Calcul demandé</string>
    <string name="action_fill_confirmation">Remplissage demandé</string>
    <string name="action_ecarb_confirmation">Glucides requis</string>
-    <string name="action_cpp_confirmation">Profil demandé</string>
+    <string name="action_profile_switch_confirmation">Changement de profil demandé</string>
    <string name="action_target" comment="In temp target menu, single target value">Cible</string>
    <string name="action_low" comment="In temp target menu, lower value from range">Bas</string>
    <string name="action_high" comment="In temp target menu, higher value from range">Élevé</string>
@ -112,7 +112,7 @@
    <string name="cancel_bolus">ANNULER BOLUS</string>
    <string name="status_pump">Pompe</string>
    <string name="status_loop">Boucle</string>
-    <string name="status_cpp">Profil</string>
+    <string name="status_profile_switch">Changement de profil</string>
    <string name="status_tdd">DTI</string>
    <string name="activity_carb">GA</string>
    <string name="activity_IOB">IA</string>
--- a/wear/src/main/res/values-it-rIT/strings.xml
+++ b/wear/src/main/res/values-it-rIT/strings.xml
@ -2,15 +2,9 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(Large)</string>
-    <string name="label_xdrip_big_chart">AAPS(BigChart)</string>
-    <string name="label_xdrip_no_chart">AAPS(NoChart)</string>
-    <string name="label_xdrip_circle">AAPS(Circle)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_digitalstyle">AAPS(DigitalStyle)</string>
+    <string name="label_actions_tile">AAPS(azioni)</string>
+    <string name="label_temp_target_tile">AAPS(Temp Target)</string>
+    <string name="label_quick_wizard_tile">AAPS(Quick Wizard)</string>
    <string name="label_warning_sync">No dati!</string>
    <string name="label_warning_old">Dati vecchi!</string>
    <string name="label_warning_since">Da %1$s</string>
@ -54,17 +48,22 @@
    <string name="pref_ring_history">Ring History</string>
    <string name="pref_light_ring_history">Light Ring History</string>
    <string name="pref_animations">Animazioni</string>
+    <string name="pref_wizard_in_menu">Calcolatrice in menu</string>
    <string name="pref_prime_in_menu">Carica in Menu</string>
    <string name="pref_single_target">Target singolo</string>
+    <string name="pref_wizard_percentage">Calcolatore percentuale</string>
    <string name="pref_complication_tap_action">Complication Tap Action</string>
    <string name="pref_unicode_in_complications">Unicode in Complications</string>
    <string name="pref_version">Versione:</string>
-    <string name="pref_moreWatchfaceSettings">più impostazioni watchface</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Controlla configurazione watchface.</string>
    <string name="menu_tempt">TempT</string>
    <string name="menu_wizard">Calcolatore</string>
+    <string name="menu_wizard_short">Calc</string>
    <string name="menu_treatment">Trattamento</string>
+    <string name="menu_treatment_short">Tratt</string>
    <string name="menu_bolus">Bolo</string>
+    <string name="menu_carb">CHO</string>
+    <string name="menu_ecarb">CHO estesi</string>
    <string name="menu_settings">Impostazioni</string>
    <string name="menu_status">Stato</string>
    <string name="menu_resync">Re-Sincronizza</string>
@ -74,11 +73,18 @@
    <string name="menu_menu">Menu</string>
    <string name="quick_wizard_short">XL</string>
    <string name="action_duration">Durata</string>
+    <string name="action_tempt_confirmation">Target temporaneo richiesto</string>
+    <string name="action_quick_wizard_confirmation">Calcolatore rapido richiesto</string>
+    <string name="action_treatment_confirmation">Trattamento richiesto</string>
    <string name="action_bolus_confirmation">Bolo richiesto</string>
+    <string name="action_wizard_confirmation">Calcolo richiesto</string>
+    <string name="action_fill_confirmation">Riempimento richiesto</string>
+    <string name="action_ecarb_confirmation">CHO richiesti</string>
    <string name="action_target" comment="In temp target menu, single target value">Target</string>
    <string name="action_low" comment="In temp target menu, lower value from range">Basso</string>
    <string name="action_high" comment="In temp target menu, higher value from range">Alto</string>
    <string name="action_carbs">CHO</string>
+    <string name="action_ecarbs">CHO estesi</string>
    <string name="action_percentage">Percentuale</string>
    <string name="action_start_min">Avvio [min]</string>
    <string name="action_duration_h">Durata [h]</string>
@ -95,7 +101,6 @@
    <string name="cancel_bolus">CANCELLA BOLO</string>
    <string name="status_pump">Micro</string>
    <string name="status_loop">Loop</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">CHO</string>
    <string name="activity_IOB">IOB</string>
@ -142,5 +147,13 @@
    <string name="simple_ui_charging">Durante la ricarica</string>
    <string name="simple_ui_always_on">Modalità Always On</string>
    <string name="simple_ui_always_on_charging">Always On e Ricarica</string>
+    <string name="temp_target_eating_soon">Pasto</string>
+    <string name="temp_target_hypo">Ipoglicemia</string>
+    <string name="temp_target_activity">Attività fisica</string>
    <string name="temp_target_manual">Manuale</string>
+    <string name="temp_target_cancel">Annulla</string>
+    <string name="tile_none">Nessuno</string>
+    <string name="tile_no_config">Nessuna configurazione disponibile</string>
+    <string name="wear_control_not_enabled">Controlli smartwatch disabilitati</string>
+    <string name="wear_control_no_data">Nessun dato disponibile</string>
 </resources>
--- a/wear/src/main/res/values-iw-rIL/strings.xml
+++ b/wear/src/main/res/values-iw-rIL/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS (גדול)</string>
-    <string name="label_xdrip_big_chart">AAPS (תרשים גדול)</string>
-    <string name="label_xdrip_no_chart">AAPS (ללא תרשים)</string>
-    <string name="label_xdrip_circle">AAPS (עיגול)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS (קוקפיט)</string>
-    <string name="label_xdrip_steampunk">AAPS (סטימפאנק)</string>
-    <string name="label_digitalstyle">AAPS (דיגיטלי)</string>
    <string name="label_actions_tile">AAPS (פעולות)</string>
    <string name="label_temp_target_tile">AAPS (מטרה זמנית)</string>
    <string name="label_quick_wizard_tile">AAPS (אשף מהיר)</string>
@ -64,7 +55,6 @@
    <string name="pref_complication_tap_action">פעולת הקשה על סיבוך</string>
    <string name="pref_unicode_in_complications">יוניקוד בסיבוכים</string>
    <string name="pref_version">גירסה:</string>
-    <string name="pref_moreWatchfaceSettings">עוד הגדרות פני שעון</string>
    <string name="pref_lookInYourWatchfaceConfiguration">עיינו בהגדרות פני השעון בבקשה.</string>
    <string name="menu_tempt">מטרה זמנית</string>
    <string name="menu_wizard">מחשבון</string>
@ -111,7 +101,6 @@
    <string name="cancel_bolus">ביטול בולוס</string>
    <string name="status_pump">משאבה</string>
    <string name="status_loop">לולאה</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">סה\"כ מינון אינסולין יומי TDD</string>
    <string name="activity_carb">פחמימות</string>
    <string name="activity_IOB">כמות אינסולין פעילה</string>
--- a/wear/src/main/res/values-ko-rKR/strings.xml
+++ b/wear/src/main/res/values-ko-rKR/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(대)</string>
-    <string name="label_xdrip_big_chart">AAPS(큰차트)</string>
-    <string name="label_xdrip_no_chart">AAPS(차트없음)</string>
-    <string name="label_xdrip_circle">AAPS(원형)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(조종석)</string>
-    <string name="label_xdrip_steampunk">AAPS(스팀펑크)</string>
-    <string name="label_digitalstyle">AAPS(디지털방식)</string>
    <string name="label_warning_sync">데이터없음!</string>
    <string name="label_warning_old">오래된 데이터!</string>
    <string name="label_warning_since">%1$s 이후</string>
@ -59,7 +50,6 @@
    <string name="pref_complication_tap_action">컴플리케이션 탭 동작</string>
    <string name="pref_unicode_in_complications">컴플리케이션에서 유니코드 사용</string>
    <string name="pref_version">버전:</string>
-    <string name="pref_moreWatchfaceSettings">더 다양한 워치페이스 설정</string>
    <string name="pref_lookInYourWatchfaceConfiguration">워치페이스 설정을 확인하십시오.</string>
    <string name="menu_tempt">임시목표</string>
    <string name="menu_bolus">Bolus</string>
@ -81,7 +71,6 @@
    <string name="cancel_bolus">BOLUS 취소</string>
    <string name="status_pump">펌프</string>
    <string name="status_loop">Loop</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">Carb</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-lt-rLT/strings.xml
+++ b/wear/src/main/res/values-lt-rLT/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(Didelis)</string>
-    <string name="label_xdrip_big_chart">AAPS(DidelisGrafikas)</string>
-    <string name="label_xdrip_no_chart">AAPS(BeGrafiko)</string>
-    <string name="label_xdrip_circle">AAPS(Apvalus)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_digitalstyle">AAPS(DigitalStyle)</string>
    <string name="label_warning_sync">Nėra duomenų!</string>
    <string name="label_warning_old">Seni duomenys!</string>
    <string name="label_warning_since">Nuo %1$s</string>
@ -59,7 +50,6 @@
    <string name="pref_complication_tap_action">Elementų skirtuko veiksmai</string>
    <string name="pref_unicode_in_complications">Unikodas elementuose</string>
    <string name="pref_version">Versija:</string>
-    <string name="pref_moreWatchfaceSettings">Daugiau laikrodžio ekrano nustatymų</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Prašom žiūrėti Watchface konfigūraciją.</string>
    <string name="menu_tempt">LaikinasTikslas</string>
    <string name="menu_bolus">Bolusas</string>
@ -81,7 +71,6 @@
    <string name="cancel_bolus">ATŠAUKTI BOLUSĄ</string>
    <string name="status_pump">Pompa</string>
    <string name="status_loop">Ciklas</string>
-    <string name="status_cpp">CPP (Procentinis dienos profilis)</string>
    <string name="status_tdd">BPD</string>
    <string name="activity_carb">AV</string>
    <string name="activity_IOB">AIO</string>
--- a/wear/src/main/res/values-nl-rNL/strings.xml
+++ b/wear/src/main/res/values-nl-rNL/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(Groot)</string>
-    <string name="label_xdrip_big_chart">AAPS(GroteGrafiek)</string>
-    <string name="label_xdrip_no_chart">AAPS(GeenGrafiek)</string>
-    <string name="label_xdrip_circle">AAPS(Cirkel)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_digitalstyle">AAPS (DigitalStyle)</string>
    <string name="label_actions_tile">AAPS(Acties)</string>
    <string name="label_temp_target_tile">AAPS(Tijdelijk Streefdoel)</string>
    <string name="label_quick_wizard_tile">AAPS(Quick Wizard)</string>
@ -64,7 +55,6 @@
    <string name="pref_complication_tap_action">Complicatie tik voor actie</string>
    <string name="pref_unicode_in_complications">Unicode in complicaties</string>
    <string name="pref_version">Versie:</string>
-    <string name="pref_moreWatchfaceSettings">meer Watchface instellingen</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Kijk naar de Watchface configuratie, alsjeblieft.</string>
    <string name="menu_tempt">TijdStreefd</string>
    <string name="menu_wizard">Calculator</string>
@ -90,7 +80,6 @@
    <string name="action_wizard_confirmation">Berekening aangevraagd</string>
    <string name="action_fill_confirmation">Vullen aangevraagd</string>
    <string name="action_ecarb_confirmation">Koolhydraten aangevraagd</string>
-    <string name="action_cpp_confirmation">CPP aangevraagd</string>
    <string name="action_target" comment="In temp target menu, single target value">Doel</string>
    <string name="action_low" comment="In temp target menu, lower value from range">Laag</string>
    <string name="action_high" comment="In temp target menu, higher value from range">Hoog</string>
@ -112,7 +101,6 @@
    <string name="cancel_bolus">BOLUS ANNULEREN</string>
    <string name="status_pump">Pomp</string>
    <string name="status_loop">Loop</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">Khd</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-no-rNO/strings.xml
+++ b/wear/src/main/res/values-no-rNO/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS (Large)</string>
-    <string name="label_xdrip_big_chart">AAPS (BigChart)</string>
-    <string name="label_xdrip_no_chart">AAPS (NoChart)</string>
-    <string name="label_xdrip_circle">AAPS (Circle)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_digitalstyle">AAPS(DigitalStyle)</string>
    <string name="label_actions_tile">AAPS(Actions)</string>
    <string name="label_temp_target_tile">AAPS(Temp Target)</string>
    <string name="label_quick_wizard_tile">AAPS(Quick Wizard)</string>
@ -64,7 +55,6 @@
    <string name="pref_complication_tap_action">Komplikasjon trykk handling</string>
    <string name="pref_unicode_in_complications">Unicode ikomplikasjoner</string>
    <string name="pref_version">Versjon:</string>
-    <string name="pref_moreWatchfaceSettings">flere urskive innstillinger</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Vennligst sjekk urskive innstillinger.</string>
    <string name="menu_tempt">TempT</string>
    <string name="menu_wizard">Kalkulator</string>
@ -90,7 +80,6 @@
    <string name="action_wizard_confirmation">Beregning forespurt</string>
    <string name="action_fill_confirmation">Fylling forespurt</string>
    <string name="action_ecarb_confirmation">Karbo forespurt</string>
-    <string name="action_cpp_confirmation">CPP forespurt</string>
    <string name="action_target" comment="In temp target menu, single target value">Mål</string>
    <string name="action_low" comment="In temp target menu, lower value from range">Lav</string>
    <string name="action_high" comment="In temp target menu, higher value from range">Høy</string>
@ -112,7 +101,6 @@
    <string name="cancel_bolus">AVBRYT BOLUS</string>
    <string name="status_pump">Pumpe</string>
    <string name="status_loop">Loop</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">Karbo</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-pl-rPL/strings.xml
+++ b/wear/src/main/res/values-pl-rPL/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(Duży)</string>
-    <string name="label_xdrip_big_chart">AAPS(DużyWykres)</string>
-    <string name="label_xdrip_no_chart">AAPS(BezWykresu)</string>
-    <string name="label_xdrip_circle">AAPS(Koło)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Kokpit)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_digitalstyle">AAPS(StylCyfrowy)</string>
    <string name="label_warning_sync">Brak danych!</string>
    <string name="label_warning_old">Stare dane!</string>
    <string name="label_warning_since">Od %1$s</string>
@ -59,7 +50,6 @@
    <string name="pref_complication_tap_action">Akcja po kliknięciu komplikacji</string>
    <string name="pref_unicode_in_complications">Unicode w Komplikacjach</string>
    <string name="pref_version">Wersja:</string>
-    <string name="pref_moreWatchfaceSettings">więcej ustawień zegarka</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Proszę, zajrzyj do konfiguracji zegarka.</string>
    <string name="menu_tempt">CelTymcz.</string>
    <string name="menu_wizard">Kalkulator</string>
@ -92,7 +82,6 @@
    <string name="cancel_bolus">ANULUJ BOLUS</string>
    <string name="status_pump">Pompa</string>
    <string name="status_loop">Pętla</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">Węgl.</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-pt-rBR/strings.xml
+++ b/wear/src/main/res/values-pt-rBR/strings.xml
@ -2,14 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(Grande)</string>
-    <string name="label_xdrip_big_chart">AAPS(GrafGrande)</string>
-    <string name="label_xdrip_no_chart">AAPS(SemGraf)</string>
-    <string name="label_xdrip_circle">AAPS(Círculo)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
    <string name="label_warning_sync">Sem dados!</string>
    <string name="label_warning_old">Dados antigos!</string>
    <string name="label_warning_since">Desde %1$s</string>
@ -74,7 +66,6 @@
    <string name="action_timeshift">alteração turno</string>
    <string name="status_pump">Bomba</string>
    <string name="status_loop">Loop</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">Hidratos</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-pt-rPT/strings.xml
+++ b/wear/src/main/res/values-pt-rPT/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(Grande)</string>
-    <string name="label_xdrip_big_chart">AAPS(GrafGrande)</string>
-    <string name="label_xdrip_no_chart">AAPS(SemGraf)</string>
-    <string name="label_xdrip_circle">AAPS(Círculo)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_digitalstyle">AAPS(DigitalStyle)</string>
    <string name="label_warning_sync">Sem dados!</string>
    <string name="label_warning_old">Dados antigos!</string>
    <string name="label_warning_since">Desde %1$s</string>
@ -59,7 +50,6 @@
    <string name="pref_complication_tap_action">Complicação de Toque</string>
    <string name="pref_unicode_in_complications">Unicode em Complicações</string>
    <string name="pref_version">Versão:</string>
-    <string name="pref_moreWatchfaceSettings">mais definições do Mostrador</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Verifique a configuração do mostrador, por favor.</string>
    <string name="menu_tempt">AlvoT</string>
    <string name="menu_bolus">Bólus</string>
@ -81,7 +71,6 @@
    <string name="cancel_bolus">CANCELAR BÓLUS</string>
    <string name="status_pump">Bomba</string>
    <string name="status_loop">Loop</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDI</string>
    <string name="activity_carb">Hidratos</string>
    <string name="activity_IOB">IA </string>
--- a/wear/src/main/res/values-ro-rRO/strings.xml
+++ b/wear/src/main/res/values-ro-rRO/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(Mare)</string>
-    <string name="label_xdrip_big_chart">AAPS(GraficMare)</string>
-    <string name="label_xdrip_no_chart">AAPS(FărăGrafic)</string>
-    <string name="label_xdrip_circle">AAPS(Cerc)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Panou)</string>
-    <string name="label_xdrip_steampunk">AAPS (Steampunk)</string>
-    <string name="label_digitalstyle">AAPS (DigitalStyle)</string>
    <string name="label_warning_sync">Nu există date!</string>
    <string name="label_warning_old">Date vechi!</string>
    <string name="label_warning_since">De acum %1$s</string>
@ -59,7 +50,6 @@
    <string name="pref_complication_tap_action">Acţiuni pentru complicaţii</string>
    <string name="pref_unicode_in_complications">Unicode în complicații</string>
    <string name="pref_version">Versiune:</string>
-    <string name="pref_moreWatchfaceSettings">mai multe setări Watchface</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Uitaţi-vă în configurarea Watchface, vă rugăm.</string>
    <string name="menu_tempt">ŢintăTemporară</string>
    <string name="menu_bolus">Bolus</string>
@ -81,7 +71,6 @@
    <string name="cancel_bolus">ANULARE BOLUS</string>
    <string name="status_pump">Pompă</string>
    <string name="status_loop">Buclă</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">Carbohidrați</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-ru-rRU/strings.xml
+++ b/wear/src/main/res/values-ru-rRU/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS (Большой)</string>
-    <string name="label_xdrip_big_chart">AAPS (Крупный график)</string>
-    <string name="label_xdrip_no_chart">AAPS (Без графика)</string>
-    <string name="label_xdrip_circle">AAPS (круглый)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS (кабина пилота)</string>
-    <string name="label_xdrip_steampunk">AAPS (Стимпанк)</string>
-    <string name="label_digitalstyle">AAPS (DigitalStyle)</string>
    <string name="label_actions_tile">AAPS (Действия)</string>
    <string name="label_temp_target_tile">AAPS(ВремЦель)</string>
    <string name="label_quick_wizard_tile">AAPS(Мастер)</string>
@ -64,7 +55,6 @@
    <string name="pref_complication_tap_action">Действия при нажатии кнопки расширений</string>
    <string name="pref_unicode_in_complications">Юникод в репликации</string>
    <string name="pref_version">Версия:</string>
-    <string name="pref_moreWatchfaceSettings">еще настройки циферблатов</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Смотрите конфигурацию циферблата.</string>
    <string name="menu_tempt">ВремЦ</string>
    <string name="menu_wizard">Калькулятор</string>
@ -92,7 +82,6 @@
    <string name="cancel_bolus">ОТМЕНИТЬ БОЛЮС</string>
    <string name="status_pump">Помпа</string>
    <string name="status_loop">Замкнутый цикл</string>
-    <string name="status_cpp">Суточный профиль в процентах</string>
    <string name="status_tdd">TDD/общая суточная доза</string>
    <string name="activity_carb">Углеводы</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-sk-rSK/strings.xml
+++ b/wear/src/main/res/values-sk-rSK/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(Veľké)</string>
-    <string name="label_xdrip_big_chart">AAPS(VeľkýGraf)</string>
-    <string name="label_xdrip_no_chart">AAPS(ŽiadnyGraf)</string>
-    <string name="label_xdrip_circle">AAPS(Kruh)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS (Steampunk)</string>
-    <string name="label_digitalstyle">AAPS(DigitalStyle)</string>
    <string name="label_actions_tile">AAPS (Akcie)</string>
    <string name="label_temp_target_tile">AAPS(Dočasný cieľ)</string>
    <string name="label_quick_wizard_tile">AAPS(Rýchly bolus)</string>
@ -64,7 +55,6 @@
    <string name="pref_complication_tap_action">Zadaj komplikáciu</string>
    <string name="pref_unicode_in_complications">Unicode v komplikáciach</string>
    <string name="pref_version">Verzia:</string>
-    <string name="pref_moreWatchfaceSettings">ďalšie nastavenia Watchface</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Pozrite sa prosím do konfigurácie Watchface.</string>
    <string name="menu_tempt">TempT</string>
    <string name="menu_wizard">Kalkulačka</string>
@ -90,7 +80,6 @@
    <string name="action_wizard_confirmation">Požadovaná kalkulačka</string>
    <string name="action_fill_confirmation">Požadované plnenie</string>
    <string name="action_ecarb_confirmation">Požadované sacharidy</string>
-    <string name="action_cpp_confirmation">Požadovaný profil</string>
    <string name="action_target" comment="In temp target menu, single target value">Cieľ</string>
    <string name="action_low" comment="In temp target menu, lower value from range">Nízka</string>
    <string name="action_high" comment="In temp target menu, higher value from range">Vysoká</string>
@ -112,7 +101,6 @@
    <string name="cancel_bolus">ZRUŠIŤ BOLUS</string>
    <string name="status_pump">Pumpa</string>
    <string name="status_loop">Uzavretý okruh</string>
-    <string name="status_cpp">PROFIL</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">Sacharidy</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-sv-rSE/strings.xml
+++ b/wear/src/main/res/values-sv-rSE/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS (Large)</string>
-    <string name="label_xdrip_big_chart">AAPS (BigChart)</string>
-    <string name="label_xdrip_no_chart">AAPS (NoChart)</string>
-    <string name="label_xdrip_circle">AAPS (Circle)</string>
-    <string name="label_xdrip_v2">AAPS v2</string>
-    <string name="label_xdrip_cockpit">AAPS (Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS (Steampunk)</string>
-    <string name="label_digitalstyle">AAPS (DigitalStyle)</string>
    <string name="label_actions_tile">AAPS(Åtgärder)</string>
    <string name="label_temp_target_tile">AAPS(Temp-mål)</string>
    <string name="label_quick_wizard_tile">AAPS(Snabbsteg)</string>
@ -64,7 +55,6 @@
    <string name="pref_complication_tap_action">Åtgärd för komplikation \"tryck\"</string>
    <string name="pref_unicode_in_complications">Unicode i komplikationer</string>
    <string name="pref_version">Version:</string>
-    <string name="pref_moreWatchfaceSettings">fler watchface-inställningar</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Kontrollera watchface-konfigurationen, tack.</string>
    <string name="menu_tempt">Tempmål</string>
    <string name="menu_wizard">Kalkylator</string>
@ -88,7 +78,6 @@
    <string name="action_wizard_confirmation">Kalkylator begärd</string>
    <string name="action_fill_confirmation">Påfyllning begärd</string>
    <string name="action_ecarb_confirmation">Kolhydrater begärda</string>
-    <string name="action_cpp_confirmation">CPP begärd</string>
    <string name="action_target" comment="In temp target menu, single target value">Mål</string>
    <string name="action_low" comment="In temp target menu, lower value from range">Låg</string>
    <string name="action_high" comment="In temp target menu, higher value from range">Hög</string>
@ -109,7 +98,6 @@
    <string name="cancel_bolus">AVBRYT BOLUS</string>
    <string name="status_pump">Pump</string>
    <string name="status_loop">APS</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">TDD</string>
    <string name="activity_carb">KH</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-tr-rTR/strings.xml
+++ b/wear/src/main/res/values-tr-rTR/strings.xml
@ -2,15 +2,15 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(Büyük)</string>
-    <string name="label_xdrip_big_chart">AAPS(BüyükGrafik)</string>
-    <string name="label_xdrip_no_chart">AAPS(GrafikYok)</string>
-    <string name="label_xdrip_circle">AAPS(Daire)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_digitalstyle">AAPS(DijitalStil)</string>
+    <string name="label_watchface">AAPS</string>
+    <string name="label_watchface_large">AAPS(Büyük)</string>
+    <string name="label_watchface_big_chart">AAPS(BüyükGrafik)</string>
+    <string name="label_watchface_no_chart">AAPS(GrafikYok)</string>
+    <string name="label_watchface_circle">AAPS(Daire)</string>
+    <string name="label_watchface_v2">AAPS (v2)</string>
+    <string name="label_watchface_cockpit">AAPS(Cockpit)</string>
+    <string name="label_watchface_steampunk">AAPS (Steampunk)</string>
+    <string name="label_watchface_digital_style">AAPS(DijitalStil)</string>
    <string name="label_actions_tile">AAPS(Eylemler)</string>
    <string name="label_temp_target_tile">AAPS(Geçici Hedef)</string>
    <string name="label_quick_wizard_tile">AAPS(Hızlı Asistan)</string>
@ -64,7 +64,6 @@
    <string name="pref_complication_tap_action">Komplikasyon Dokunma Eylemi</string>
    <string name="pref_unicode_in_complications">Komplikasyonlarda Unicode</string>
    <string name="pref_version">Versiyon:</string>
-    <string name="pref_moreWatchfaceSettings">daha çok saatarayüz ayarı</string>
    <string name="pref_lookInYourWatchfaceConfiguration">Lütfen, Saatarayüzü yapılandırmasına bakın.</string>
    <string name="menu_tempt">GeçiciH</string>
    <string name="menu_wizard">Hesap makinesi</string>
@ -90,7 +89,7 @@
    <string name="action_wizard_confirmation">Hesaplama talebi</string>
    <string name="action_fill_confirmation">Doldurma talebi</string>
    <string name="action_ecarb_confirmation">Karonhidrat talebi</string>
-    <string name="action_cpp_confirmation">CPP talebi</string>
+    <string name="action_profile_switch_confirmation">Profil Değişimi İstendi</string>
    <string name="action_target" comment="In temp target menu, single target value">Hedef</string>
    <string name="action_low" comment="In temp target menu, lower value from range">Düşük</string>
    <string name="action_high" comment="In temp target menu, higher value from range">Yüksek</string>
@ -112,7 +111,7 @@
    <string name="cancel_bolus">BOLUS İPTAL ET</string>
    <string name="status_pump">Pompa</string>
    <string name="status_loop">Döngü</string>
-    <string name="status_cpp">CPP</string>
+    <string name="status_profile_switch">Profil değiştir</string>
    <string name="status_tdd">GTD</string>
    <string name="activity_carb">Karb</string>
    <string name="activity_IOB">IOB</string>
--- a/wear/src/main/res/values-zh-rCN/strings.xml
+++ b/wear/src/main/res/values-zh-rCN/strings.xml
@ -2,15 +2,6 @@
 <resources>
    <string name="app_name">AAPS</string>
    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(大)</string>
-    <string name="label_xdrip_big_chart">AAPS(大图)</string>
-    <string name="label_xdrip_no_chart">AAPS(无图)</string>
-    <string name="label_xdrip_circle">AAPS(圆形)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(驾驶)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_digitalstyle">AAPS(数字风格)</string>
    <string name="label_actions_tile">AAPS(操作)</string>
    <string name="label_temp_target_tile">AAPS(临时目标)</string>
    <string name="label_quick_wizard_tile">AAPS(快速向导)</string>
@ -64,7 +55,6 @@
    <string name="pref_complication_tap_action">折叠Tap操作</string>
    <string name="pref_unicode_in_complications">折叠中的代码</string>
    <string name="pref_version">版本</string>
-    <string name="pref_moreWatchfaceSettings">更多手表表盘设置</string>
    <string name="pref_lookInYourWatchfaceConfiguration">请查看手表表盘配置。</string>
    <string name="menu_tempt">临时目标</string>
    <string name="menu_wizard">计算器</string>
@ -90,7 +80,6 @@
    <string name="action_wizard_confirmation">计算请求</string>
    <string name="action_fill_confirmation">Fill 充盈请求</string>
    <string name="action_ecarb_confirmation">碳水化合物请求</string>
-    <string name="action_cpp_confirmation">CPP请求</string>
    <string name="action_target" comment="In temp target menu, single target value">目标</string>
    <string name="action_low" comment="In temp target menu, lower value from range">低</string>
    <string name="action_high" comment="In temp target menu, higher value from range">高</string>
@ -112,7 +101,6 @@
    <string name="cancel_bolus">取消大剂量</string>
    <string name="status_pump">胰岛素泵</string>
    <string name="status_loop">闭环</string>
-    <string name="status_cpp">CPP</string>
    <string name="status_tdd">日总量</string>
    <string name="activity_carb">碳水化合物</string>
    <string name="activity_IOB">活性胰岛素</string>