diff --git a/core/interfaces/src/main/res/values-cs-rCZ/strings.xml b/core/interfaces/src/main/res/values-cs-rCZ/strings.xml
index 319ab6e24f..a1e2dc8ea0 100644
--- a/core/interfaces/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/interfaces/src/main/res/values-cs-rCZ/strings.xml
@@ -58,6 +58,7 @@
     <string name="pref_show_direction_arrow">Zobrazit trendovou šipku</string>
     <string name="pref_show_ago">Zobrazit aktualizováno před</string>
     <string name="pref_show_week_number">Zobrazit číslo týdne</string>
+    <string name="pref_show_date">Zobrazit datum</string>
     <string name="default_custom_watchface_comment">Výchozí ciferník. Můžete kliknout na tlačítko EXPORTOVAT CIFERNÍK pro vygenerování šablony</string>
     <string name="wear_default_watchface">Výchozí ciferník</string>
     <string name="cwf_comment_background">Tapeta</string>
diff --git a/core/interfaces/src/main/res/values-es-rES/strings.xml b/core/interfaces/src/main/res/values-es-rES/strings.xml
index ae10c6672e..b9b7dd616b 100644
--- a/core/interfaces/src/main/res/values-es-rES/strings.xml
+++ b/core/interfaces/src/main/res/values-es-rES/strings.xml
@@ -58,6 +58,7 @@
     <string name="pref_show_direction_arrow">Mostrar flecha de dirección</string>
     <string name="pref_show_ago">Mostrar \"hace\"</string>
     <string name="pref_show_week_number">Mostrar número de semana</string>
+    <string name="pref_show_date">Mostrar fecha</string>
     <string name="default_custom_watchface_comment">Esfera predeterminada, puedes hacer clic en el botón EXPORTAR ESFERA para generar una plantilla</string>
     <string name="wear_default_watchface">Esfera por defecto</string>
     <string name="cwf_comment_background">Imagen de fondo</string>
diff --git a/core/interfaces/src/main/res/values-iw-rIL/strings.xml b/core/interfaces/src/main/res/values-iw-rIL/strings.xml
index a9843ae423..3e31901c3c 100644
--- a/core/interfaces/src/main/res/values-iw-rIL/strings.xml
+++ b/core/interfaces/src/main/res/values-iw-rIL/strings.xml
@@ -57,6 +57,7 @@
     <string name="pref_show_direction_arrow">הצג חץ מגמה</string>
     <string name="pref_show_ago">הצג עבר</string>
     <string name="pref_show_week_number">הצג מספר שבוע</string>
+    <string name="pref_show_date">הצג תאריך</string>
     <string name="default_custom_watchface_comment">ברירת המחדל של פני השעון, ניתן ללחוץ על כפתור ייצוא פני שעון כדי ליצור תבנית</string>
     <string name="wear_default_watchface">ברירת מחדל פני שעון</string>
     <string name="cwf_comment_background">תמונת רקע</string>
diff --git a/core/interfaces/src/main/res/values-nb-rNO/strings.xml b/core/interfaces/src/main/res/values-nb-rNO/strings.xml
index 4f650e3bf1..757f9d6e6a 100644
--- a/core/interfaces/src/main/res/values-nb-rNO/strings.xml
+++ b/core/interfaces/src/main/res/values-nb-rNO/strings.xml
@@ -58,6 +58,7 @@
     <string name="pref_show_direction_arrow">Vis retningspil</string>
     <string name="pref_show_ago">Vis tid siden</string>
     <string name="pref_show_week_number">Vis ukenummer</string>
+    <string name="pref_show_date">Vis dato</string>
     <string name="default_custom_watchface_comment">Standard klokkebakgrunn, du kan klikke på EKSPORTER KLOKKEBAKGRUNN for å lage en mal</string>
     <string name="wear_default_watchface">Standard klokkebakgrunn</string>
     <string name="cwf_comment_background">Bakgrunnsbilde</string>
diff --git a/core/interfaces/src/main/res/values-ro-rRO/strings.xml b/core/interfaces/src/main/res/values-ro-rRO/strings.xml
index 11cc2ea792..b3a532cc1f 100644
--- a/core/interfaces/src/main/res/values-ro-rRO/strings.xml
+++ b/core/interfaces/src/main/res/values-ro-rRO/strings.xml
@@ -58,6 +58,7 @@
     <string name="pref_show_direction_arrow">Arată săgeată tendință</string>
     <string name="pref_show_ago">Afişare în urmă</string>
     <string name="pref_show_week_number">Arată numărul săptămânii</string>
+    <string name="pref_show_date">Arată data</string>
     <string name="default_custom_watchface_comment">Fațetă implicită. Poți apăsa pe butonul EXPORT pentru a genera un șablon</string>
     <string name="wear_default_watchface">Fațetă implicită</string>
     <string name="cwf_comment_background">Imagine de fundal</string>
diff --git a/core/ui/src/main/res/values-nb-rNO/strings.xml b/core/ui/src/main/res/values-nb-rNO/strings.xml
index 02b5024141..0541e669eb 100644
--- a/core/ui/src/main/res/values-nb-rNO/strings.xml
+++ b/core/ui/src/main/res/values-nb-rNO/strings.xml
@@ -496,8 +496,8 @@
     <string name="reservoir_label">Reservoar</string>
     <string name="last_connection_label">Siste tilkobling</string>
     <string name="last_bolus_label">Siste bolus</string>
-    <string name="base_basal_rate_label">Profilens basaldose</string>
-    <string name="tempbasal_label">Midl. basal</string>
+    <string name="base_basal_rate_label">Profilens basal</string>
+    <string name="tempbasal_label">Midlertidig basal</string>
     <string name="extended_bolus_label">Forlenget bolus</string>
     <string name="serial_number">Serienummer</string>
     <string name="disconnected">Frakoblet</string>
diff --git a/insight/src/main/res/values-nb-rNO/strings.xml b/insight/src/main/res/values-nb-rNO/strings.xml
index 3e678013b2..9a923b443f 100644
--- a/insight/src/main/res/values-nb-rNO/strings.xml
+++ b/insight/src/main/res/values-nb-rNO/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="enable_tbr_over_notification">Aktiver varsel når slutt på temp basal\n(pumpeinnstilling)</string>
-    <string name="disable_tbr_over_notification">Slå av varsel når slutt på temp basal\n(pumpeinnstilling)</string>
+    <string name="enable_tbr_over_notification">Aktiver varsel når slutt på midlertidig basal\n(pumpeinnstilling)</string>
+    <string name="disable_tbr_over_notification">Slå av varsel når slutt på midlertidig basal\n(pumpeinnstilling)</string>
     <string name="not_paired">Ikke sammenkoblet</string>
     <string name="recovering">Gjenoppretter</string>
     <string name="insight_status">Status</string>
@@ -32,7 +32,7 @@
     <string name="disable_vibration">Slå av vibrasjoner på manuell bolus</string>
     <string name="disable_vibration_summary">For bolus og forlenget bolus (bare tilgjengelig med Insight firmware 3.x)</string>
     <string name="disable_vibration_auto">Slå av vibrasjoner ved automatisk bolus</string>
-    <string name="disable_vibration_auto_summary">For SMB og temp basal med TBR emulering (bare tilgjengelig med Insight firmware 3.x)</string>
+    <string name="disable_vibration_auto_summary">For SMB og midlertidig basal med TBR emulering (bare tilgjengelig med Insight firmware 3.x)</string>
     <string name="timeout_during_handshake">En timeout oppstod i paringsprosessen - restart Bluetooth</string>
     <string name="pump_stopped">Pumpen stoppet</string>
     <string name="pump_started">Pumpen startet</string>
@@ -60,7 +60,7 @@
     <string name="log_operating_mode_changes">Logg endring i driftsmodus</string>
     <string name="log_alerts">Logg varslinger</string>
     <string name="enable_tbr_emulation">Aktiver emulering av TBR</string>
-    <string name="enable_tbr_emulation_summary">Bruk forlenget bolus i stedet for temp basaler for å omgå 250%% grensen</string>
+    <string name="enable_tbr_emulation_summary">Bruk forlenget bolus i stedet for midlertidig basaler for å omgå 250%% grensen</string>
     <string name="disconnect_delay">Utsett frakobling [s]</string>
     <string name="max_recovery_duration">Maks pause mellom tilkoblingsforsøk [s]</string>
     <string name="min_recovery_duration">Min pause mellom tilkoblingsforsøk [s]</string>
diff --git a/plugins/constraints/src/main/res/values-nb-rNO/exam.xml b/plugins/constraints/src/main/res/values-nb-rNO/exam.xml
index ee21a0a22c..b11346f829 100644
--- a/plugins/constraints/src/main/res/values-nb-rNO/exam.xml
+++ b/plugins/constraints/src/main/res/values-nb-rNO/exam.xml
@@ -7,8 +7,8 @@
     <string name="dia_hint1">https://wiki.aaps.app/en/latest/Configuration/Config-Builder.html#insulin</string>
     <string name="dia_meaningisequaltodiapump">Hvis du føler at DIA verdien (insulinvarigheten) som du benyttet i pumpen fungerte godt før du tok i bruk AndroidAPS, da er det ikke nødvendig å endre dette når du starter å loope.</string>
     <string name="dia_valuemustbedetermined">Du må selv bestemme hvilken verdi som passer for DIA.</string>
-    <string name="hypott_label">Hypo Temp-Target (TT)</string>
-    <string name="hypott_whenhypott">Hva er hovedgrunnen til å velge en hypo temp-target?</string>
+    <string name="hypott_label">Hypo midlertidig mål (TT)</string>
+    <string name="hypott_whenhypott">Hva er hovedgrunnen til å velge et Hypo midlertidig mål?</string>
     <string name="hypott_wrongbasal">For å korrigere følinger som er forårsaket av feil i dine basalinnstillinger.</string>
     <string name="hypott_preventoversmb">For å forhindre at AAPS overkorrigerer for en blodglukoseøkning forårsaket av de hurtigvirkende karbohydratene som brukes til behandling av en hypo.</string>
     <string name="hypott_exercise">For å korrigere for en føling som er et resultat av trening.</string>
@@ -55,11 +55,11 @@
     <string name="exercise_label">Trening og midlertidige målverdier (temp targets)</string>
     <string name="exercise_whattodo">Hvordan kan du bruke midlertidige målverdier til å hjelpe systemet å håndtere aerobic trening?</string>
     <string name="exercise_settt">Sett et midlertidig mål for blodsukkeret som starter en passende tid før treningen begynner.</string>
-    <string name="exercise_setfinished">Angi en temp mål for Trening etter at du har avsluttet treningen.</string>
+    <string name="exercise_setfinished">Angi et midlertidig mål for Aktivitet etter at du har avsluttet treningen.</string>
     <string name="exercise_setunchanged">La målverdien for ditt blodsukker være uforandret.</string>
-    <string name="exercise_15g">Vent til blodsukkeret ditt synker under Hypo temp target og spis så 15 gram med hurtigvirkende karbohydrater.</string>
+    <string name="exercise_15g">Vent til blodsukkeret ditt synker under Hypo midlertidig mål og spis så 15 gram med hurtigvirkende karbohydrater.</string>
     <string name="exercise_hint1">https://wiki.aaps.app/en/latest/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_doigetinsulin">Får jag insulin når loop er stanset/pauset?</string>
+    <string name="suspendloop_doigetinsulin">Får jeg insulin når loop er stanset/pauset?</string>
     <string name="suspendloop_yes">Ja, basal insulin vil fortsatt bli levert.</string>
     <string name="suspendloop_no">Nei, levering av insulin er stanset.</string>
     <string name="basaltest_label">Test av basaldoser, ISF og KH ratio</string>
@@ -150,7 +150,7 @@
     <string name="cob3_no_effect">Ved å sette profilen til 150% påvirkes ikke beregningen av absorbering av karbohydrater</string>
     <string name="cob_hint1">https://wiki.aaps.app/en/latest/Usage/COB-calculation.html#how-does-aaps-calculate-the-cob-value</string>
     <string name="iob_value">IOB verdi påvirkes av midlertidige temp basaler.</string>
-    <string name="iob_hightemp">Høy temp basal vil ikke bli gitt når ditt blodsukker er under målverdi.</string>
+    <string name="iob_hightemp">Høy midlertidig basal vil ikke bli gitt når ditt blodsukker er under målverdi.</string>
     <string name="iob_negiob">Negativ IOB i en lengre periode selv om du ikke trener tyder på at profilen din gir for mye insulin og kanskje bør reduseres i innstillingene.</string>
     <string name="iob_posiob">Positiv IOB for en lengre periode tyder på enten økt insulinresistens eller uannonserte måltider.</string>
     <string name="breadgrams_label">Karbohydrater og bolus</string>
@@ -207,7 +207,7 @@
     <string name="profileswitchtime_iwant">Hvis du står opp 2 timer tidligere enn vanlig, hvordan forteller du AndroidAPS om endringen i døgnrytmen din?</string>
     <string name="profileswitchtime_2">Gjør et profilbytte med en tidsforskyvning på 2</string>
     <string name="profileswitchtime__2">Gjør et profilbytte med en tidsforskyvning på -2</string>
-    <string name="profileswitchtime_tt">Angi et \"spise snart\" temp target.</string>
+    <string name="profileswitchtime_tt">Angi et \"Spise snart\" midlertidig mål.</string>
     <string name="profileswitchtime_100">Gjør et profilbytte til mer enn 100%.</string>
     <string name="profileswitchtime_hint1">https://wiki.aaps.app/en/latest/Usage/Profiles.html#timeshift</string>
     <string name="profileswitch4_label">Endring av profil</string>
diff --git a/plugins/constraints/src/main/res/values-nb-rNO/objectives.xml b/plugins/constraints/src/main/res/values-nb-rNO/objectives.xml
index 1ab33145aa..9663716381 100644
--- a/plugins/constraints/src/main/res/values-nb-rNO/objectives.xml
+++ b/plugins/constraints/src/main/res/values-nb-rNO/objectives.xml
@@ -54,12 +54,12 @@
     <string name="objectives_exam_learned_dia">Insulinvarighet (DIA) i looping har en annen betydning (tid før alt insulin er absorbert) enn ved klassisk pumpebehandling (tid før det meste av insulinet er absorbert).</string>
     <string name="objectives_exam_learned_isf">Du lærte betydningen av ISF-verdien og hvordan det påvirker mengden insulin som brukes for korreksjon av BS.</string>
     <string name="objectives_exam_learned_ic">Du lærte betydningen av IK-verdien og hvordan det påvirker mengden insulin som brukes for dekke karbohydratene.</string>
-    <string name="objectives_exam_learned_hypott">Hypo temp target bør brukes for å forhindre enn overkorreksjon etter en hypo situasjon, når det vanligvis er bygget opp negativ IOB. Ytterligere tiltak bør vurderes for å forebygge denne situasjonen igjen i fremtiden.</string>
+    <string name="objectives_exam_learned_hypott">Hypo midlertidig mål bør brukes for å forhindre enn overkorreksjon etter en hypo situasjon, når det vanligvis er bygget opp negativ IOB. Ytterligere tiltak bør vurderes for å forebygge denne situasjonen igjen i fremtiden.</string>
     <string name="objectives_exam_learned_profileswitch">Bruk av prosent påvirker ikke målverdier for BS men basal, ISF og IK justeres for å gi mer insulin (over 100%%) eller mindre insulin (under 100%%).</string>
     <string name="objectives_exam_learned_profileswitchtime">Ved å bruke tidsskifte i profilbytte kan du tilpasse døgnprofilen til uregelmessigheter som for eksempel en sen oppvåkning.</string>
     <string name="objectives_exam_learned_profileswitch4">Redigering av profilen er ikke tilstrekkelig til å gjøre en endring. Du må fremdeles fysisk aktivere et profil bytte for å registrere endringene.</string>
     <string name="objectives_exam_learned_exercise">Du bør redusere mengden insulin i kroppen minst 1 time før du starter treningen ved å velge profil under 100 %.</string>
-    <string name="objectives_exam_learned_exercise2">Ved å sette høyere temp target minst 1 time før trening så vil det bidra til å redusere mengden med insulin i kroppen.</string>
+    <string name="objectives_exam_learned_exercise2">Ved å sette høyere midlertidig mål minst 1 time før trening så vil det bidra til å redusere mengden med insulin i kroppen.</string>
     <string name="objectives_exam_learned_noisycgm">Hvis du ikke stoler på CGM-verdier bør du ikke bruke loop uten tilsyn.</string>
     <string name="objectives_exam_learned_pumpdisconnect">AAPS må vite at pumpen ikke er tilkoblet for å beregne IOB riktig.</string>
     <string name="objectives_exam_learned_insulin">Å vite hvilken type insulin som er i pumpen er nødvendig for å beregne IOB korrekt.</string>
diff --git a/plugins/constraints/src/main/res/values-pt-rBR/strings.xml b/plugins/constraints/src/main/res/values-pt-rBR/strings.xml
index 65f5dcc99c..12842503ca 100644
--- a/plugins/constraints/src/main/res/values-pt-rBR/strings.xml
+++ b/plugins/constraints/src/main/res/values-pt-rBR/strings.xml
@@ -48,6 +48,6 @@
     <string name="doyouwantresetstart">Deseja reiniciar o objetivo? Pode perder seu progresso.</string>
     <string name="objectives_next_button">Próxima</string>
     <string name="objectives_previous_button">Anterior</string>
-    <string name="objectives_button_unfinish">Redefinir estado terminado</string>
-    <string name="objectives_button_unstart">Redefinir estado terminado</string>
+    <string name="objectives_button_unfinish">Reiniciar objetivo</string>
+    <string name="objectives_button_unstart">Reiniciar objetivo</string>
 </resources>
diff --git a/plugins/main/src/main/res/values-nb-rNO/strings.xml b/plugins/main/src/main/res/values-nb-rNO/strings.xml
index 744707877f..80763c022b 100644
--- a/plugins/main/src/main/res/values-nb-rNO/strings.xml
+++ b/plugins/main/src/main/res/values-nb-rNO/strings.xml
@@ -156,7 +156,7 @@
     <!-- Actions -->
     <string name="actions">Handlinger</string>
     <string name="description_actions">Hurtigknapper for rask tilgang til ofte brukte funksjoner</string>
-    <string name="actions_shortname">HNDL</string>
+    <string name="actions_shortname">HAN</string>
     <string name="tempbasal_button">Midlertidig basal</string>
     <string name="extended_bolus_button">Forlenget bolus</string>
     <string name="extended_bolus_cancel_button">Avbryt forlenget bolus</string>
diff --git a/plugins/sync/src/main/res/values-cs-rCZ/strings.xml b/plugins/sync/src/main/res/values-cs-rCZ/strings.xml
index 7a7f1f4ef7..7a4f5469a3 100644
--- a/plugins/sync/src/main/res/values-cs-rCZ/strings.xml
+++ b/plugins/sync/src/main/res/values-cs-rCZ/strings.xml
@@ -120,6 +120,7 @@
     <string name="data_broadcaster_description">Odesílání dat do Garmin aplikace G-Watch Wear App</string>
     <!-- GarminPlugin -->
     <string name="garmin">Garmin</string>
+    <string name="garmin_description">Připojení k zařízení Garmin (Fenix, Edge, …)</string>
     <string name="key_garmin_settings">Nastavení hodinek Garmin</string>
     <!--    Wear-->
     <string name="wear_shortname">WEAR</string>
diff --git a/plugins/sync/src/main/res/values-nb-rNO/oh_strings.xml b/plugins/sync/src/main/res/values-nb-rNO/oh_strings.xml
index 4ec943494a..f7c56b1798 100644
--- a/plugins/sync/src/main/res/values-nb-rNO/oh_strings.xml
+++ b/plugins/sync/src/main/res/values-nb-rNO/oh_strings.xml
@@ -31,7 +31,7 @@
     <string name="profile_switches">Profilbytter</string>
     <string name="total_daily_doses">Totale daglige doser</string>
     <string name="temporary_basal_rates">Midlertidige basal doser</string>
-    <string name="temporary_targets">Temp Target</string>
+    <string name="temporary_targets">Midlertidige mål</string>
     <string name="settings">Innstillinger</string>
     <string name="application_version">Programversjon</string>
     <string name="device_model">Enhetsmodell</string>
diff --git a/plugins/sync/src/main/res/values-nb-rNO/strings.xml b/plugins/sync/src/main/res/values-nb-rNO/strings.xml
index 16042b3b8b..a8ed13d158 100644
--- a/plugins/sync/src/main/res/values-nb-rNO/strings.xml
+++ b/plugins/sync/src/main/res/values-nb-rNO/strings.xml
@@ -18,8 +18,8 @@
     <string name="blocked_by_charging">Blokkert på grunn av ladealternativer</string>
     <string name="blocked_by_connectivity">Blokkert på grunn av tilkoblingsalternativer</string>
     <string name="unsupported_ns_version">Versjonen av Nightscout støttes ikke</string>
-    <string name="openaps_short">OAPS</string>
-    <string name="uploader_short">OPPL</string>
+    <string name="openaps_short">OpenAPS</string>
+    <string name="uploader_short">Opplaster</string>
     <string name="ns_malfunction">NSClient feil. Vurder omstart av NS og NSClient.</string>
     <!-- NSClient -->
     <string name="no_write_permission">NSCLIENT har ingen skriverettighet. Feil API-nøkkel?</string>
diff --git a/plugins/sync/src/main/res/values-nl-rNL/strings.xml b/plugins/sync/src/main/res/values-nl-rNL/strings.xml
index 14d5adc4d0..442817ec94 100644
--- a/plugins/sync/src/main/res/values-nl-rNL/strings.xml
+++ b/plugins/sync/src/main/res/values-nl-rNL/strings.xml
@@ -116,11 +116,14 @@
     <string name="xdrip_local_broadcasts_summary">Verzend glucose en behandelingsgegevens naar xDrip+. Gegevensbron \"xDrip+ Sync Follower\" moet worden geselecteerd en het accepteren van gegevens moet worden ingeschakeld in Instellingen - Inter-app instellingen - Accepteer Glucose/Behandelingen</string>
     <string name="xdrip_local_broadcasts_title">Activeer uitzendingen naar xDrip+.</string>
     <!--    DataBroadcast-->
+    <string name="data_broadcaster_short">DBRO</string>
+    <string name="data_broadcaster_description">Verzend gegevens naar Garmin\'s G-Watch Wear App</string>
     <!-- GarminPlugin -->
     <string name="garmin">Garmin</string>
     <string name="garmin_description">Verbinding met Garmin apparaat (Fenix, Edge, …)</string>
     <string name="key_garmin_settings">Garmin instellingen</string>
     <!--    Wear-->
+    <string name="wear_shortname">WEAR</string>
     <string name="description_wear">Monitor en bedien AAPS met uw WearOS horloge.</string>
     <string name="no_watch_connected">(Geen horloge verbonden)</string>
     <string name="pump_status">Pomp status</string>
diff --git a/pump/combo/src/main/res/values-nb-rNO/strings.xml b/pump/combo/src/main/res/values-nb-rNO/strings.xml
index b13cd45cd5..833ea8926c 100644
--- a/pump/combo/src/main/res/values-nb-rNO/strings.xml
+++ b/pump/combo/src/main/res/values-nb-rNO/strings.xml
@@ -27,7 +27,7 @@
     <string name="combo_reservoir_empty">Tom</string>
     <string name="combo_reservoir_normal">Normal</string>
     <string name="combo_notification_check_time_date">Pumpens tid må oppdateres</string>
-    <string name="combo_pump_tbr_cancelled_warrning">Varsel om kansellering av temp basal er bekreftet</string>
+    <string name="combo_pump_tbr_cancelled_warrning">Varsel om kansellering av midlertidig basal er bekreftet</string>
     <string name="combo_error_no_connection_no_bolus_delivered">Ingen kontakt med pumpen. Ingen bolus er levert</string>
     <string name="combo_error_no_bolus_delivered">Bolus avbrutt. Det virker som ingen bolus er levert. For å være sikker, sjekk pumpen for å unngå levering av dobbel bolus og gjør evt et nytt forsøk. For å unngå feil vil systemet aldri prøve å levere ny bolus.</string>
     <string name="combo_error_partial_bolus_delivered">Bare %1$.2f E av bolusdosen på %2$.2f E ble levert på grunn av en feil. Sjekk pumpen for å kontrollere dette og iverksett nødvendige tiltak.</string>
@@ -37,7 +37,7 @@
     <string name="combo_actvity_reading_basal_profile">Leser basalprofil</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Pumpe historikken har blitt endret siden bolus kalkuleringen ble utført. Bolus har ikke blitt levert. Vennligst rekalkuler om bolus fortsatt er nødvendig.</string>
     <string name="combo_error_updating_treatment_record">Bolus har blitt levert, men det oppsto en feil ved loggføring i behandlinger. Dette kan oppstå hvis to små bolus på samme størrelse blir levert i løpet av to minutter. Vennligst sjekk pumpe historikken og behandlinger loggen, og bruk Helseportal for å legge til de manglende behandlingene. Pass på at du ikke legger til to identiske behandlinger på samme minutt.</string>
-    <string name="combo_high_temp_rejected_due_to_pump_history_changes">Avviser høy temp target siden kalkuleringen ikke tok hensyn til nylige endringer i pumpe historikken</string>
+    <string name="combo_high_temp_rejected_due_to_pump_history_changes">Avviser høyt midlertidig mål siden kalkuleringen ikke tok hensyn til nylige endringer i pumpe historikken</string>
     <string name="combo_activity_checking_pump_state">Oppdaterer pumpestatus</string>
     <string name="combo_warning_pump_basal_rate_changed">Basal dosen i pumpen har blitt endret og vil i løpet av kort tid bli oppdatert</string>
     <string name="combo_error_failure_reading_changed_basal_rate">Basalsats endret i pumpe, men lesing av den feilet</string>
@@ -46,7 +46,7 @@
     <string name="combo_check_date">Den siste bolus er eldre enn 24t eller er i fremtiden. Vennligst sjekk at datoen i pumpen er korrekt.</string>
     <string name="combo_suspious_bolus_time">Tid/dato for levert bolus i pumpen er trolig feil, og IOB beregningen blir da feil. Vennligst sjekk pumpens tid/dato.</string>
     <string name="combo_bolus_count">Antall boluser</string>
-    <string name="combo_tbr_count">Antall temp basaler TBR</string>
+    <string name="combo_tbr_count">Antall midlertidige basaler TBR</string>
     <string name="bolusstopped">Bolus stoppet</string>
     <string name="bolusstopping">Stopper bolus</string>
     <string name="pump_commerror_label">Komm. feiltelling</string>
diff --git a/pump/dana/src/main/res/values-nb-rNO/strings.xml b/pump/dana/src/main/res/values-nb-rNO/strings.xml
index e561897b03..3e46d39399 100644
--- a/pump/dana/src/main/res/values-nb-rNO/strings.xml
+++ b/pump/dana/src/main/res/values-nb-rNO/strings.xml
@@ -39,7 +39,7 @@
     <string name="gettingpumpstatus">Henter pumpestatus</string>
     <string name="gettingextendedbolusstatus">Henter forlenget bolus status</string>
     <string name="gettingbolusstatus">Henter bolus status</string>
-    <string name="gettingtempbasalstatus">Henter temp basal status</string>
+    <string name="gettingtempbasalstatus">Henter status om midlertidig basal</string>
     <string name="gettingpumpsettings">Henter pumpe innstillinger</string>
     <string name="gettingpumptime">Henter pumpens tid</string>
     <string name="largetimedifftitle">Stor tidsforskjell</string>
@@ -48,11 +48,11 @@
     <string name="approachingdailylimit">Maksimal daglig insulindose er snart nådd</string>
     <string name="startingbolus">Starter bolus dosering</string>
     <string name="waitingforestimatedbolusend">Venter på bolus slutt. Gjenværende %1$d sek.</string>
-    <string name="stoppingtempbasal">Stopper temp basal</string>
+    <string name="stoppingtempbasal">Stopper midlertidig basal</string>
     <string name="settingextendedbolus">Setter forlenget bolus</string>
     <string name="stoppingextendedbolus">Stopper forlenget bolus</string>
     <string name="updatingbasalrates">Oppdaterer basaldoser</string>
-    <string name="settingtempbasal">Setter temp basal</string>
+    <string name="settingtempbasal">Setter midlertidig basal</string>
     <string name="waitingfortimesynchronization">Venter på tidsykronisering (%1$d sek)</string>
     <string name="wrongpumppassword">Feil pumpepassord!</string>
     <string name="danar_history_alarm">Alarmer</string>
diff --git a/pump/diaconn/src/main/res/values-nb-rNO/strings.xml b/pump/diaconn/src/main/res/values-nb-rNO/strings.xml
index 744ca26447..0f357fbe30 100644
--- a/pump/diaconn/src/main/res/values-nb-rNO/strings.xml
+++ b/pump/diaconn/src/main/res/values-nb-rNO/strings.xml
@@ -24,8 +24,8 @@
     <string name="startingbolus">Starter bolus dosering</string>
     <string name="waitingforestimatedbolusend">Venter på avsluttet bolus dosering</string>
     <string name="gettingbolusstatus">Leser bolus status</string>
-    <string name="stoppingtempbasal">Stopper temp basal</string>
-    <string name="settingtempbasal">Setter temp basal</string>
+    <string name="stoppingtempbasal">Stopper midlertidig basal</string>
+    <string name="settingtempbasal">Setter midlertidig basal</string>
     <string name="settingextendedbolus">Setter forlenget bolus</string>
     <string name="stoppingextendedbolus">Stopper forlenget bolus</string>
     <string name="updatingbasalrates">Oppdaterer basaldoser</string>
@@ -54,7 +54,7 @@
     <string name="processinghistory">"Behandler hendelse "</string>
     <string name="apslastLogNum">aps_last_log_num</string>
     <string name="apsWrappingCount">aps_wrapping_count</string>
-    <string name="diaconn_g8_history_tempbasal">Temp basal</string>
+    <string name="diaconn_g8_history_tempbasal">Midlertidig basal</string>
     <string name="diaconng8_pump_settings">Diaconn pumpe innstillinger</string>
     <string name="diaconn_g8_pumpalarm">Lyd</string>
     <string name="diaconn_g8_pumpalarm_sound">lyd</string>
@@ -146,12 +146,12 @@
     <string name="diaconn_g8_errotpreceivedyet">Kommandoen ble ikke utført. Vennligst prøv igjen.</string>
     <string name="diaconn_g8_logtubechange_title">Logg bytte av slangesett</string>
     <string name="diaconn_g8_logtubechange_summary">Legg til \"Slangesettbytte\" i Helseportal når den oppdages i historikken</string>
-    <string name="diaconn_g8_logtempstart">Temp Basal startet</string>
+    <string name="diaconn_g8_logtempstart">Midlertidig basal startet</string>
     <string name="diaconn_g8_errorcode_32">Vel Lav Glukose Stopp (LGS) er injeksjoner begrenset</string>
     <string name="diaconn_g8_errorcode_33">LGS status er PÅ. PÅ kommando er nektet.</string>
     <string name="diaconn_g8_errorcode_34">LGS status er AV. AV kommandoen er avslått.</string>
-    <string name="diaconn_g8_errorcode_35">Temp basal avslått siden det allerede kjøres en temp basal</string>
-    <string name="diaconn_g8_errorcode_36">Stopp av temp basal avslått siden det ikke kjøres en temp basal</string>
+    <string name="diaconn_g8_errorcode_35">Midlertidig basal avslått siden det allerede kjøres en midlertidig basal</string>
+    <string name="diaconn_g8_errorcode_36">Stopp av midlertidig basal avslått siden det ikke kjøres en midlertidig basal</string>
     <string name="diaconn_g8_cloudsend_summary">Send pumpe logger til Diaconn Cloud.</string>
     <string name="diaconn_g8_cloudsend_title">Diaconn Cloud Sync</string>
 </resources>
diff --git a/pump/eopatch/src/main/res/values-nb-rNO/strings.xml b/pump/eopatch/src/main/res/values-nb-rNO/strings.xml
index 4f4d1f0686..ae85750325 100644
--- a/pump/eopatch/src/main/res/values-nb-rNO/strings.xml
+++ b/pump/eopatch/src/main/res/values-nb-rNO/strings.xml
@@ -92,9 +92,9 @@
     <string name="patch_cancel_pairing">Avbryt paringen</string>
     <string name="symbol_days">dager</string>
     <string name="all_dose_unit">&#160;E</string>
-    <string name="insulin_suspend_msg1">Når du pauser pumpen vil gjeldende bolus dosering &amp; Temp basal bli kansellert. \n\nDosering : %1$s E/time\nGjenstående tid : %2$s\n&amp; Gjenværende insulin å levere: %3$.2f E</string>
+    <string name="insulin_suspend_msg1">Når du pauser pumpen vil gjeldende bolus dosering &amp; midlertidig basal bli kansellert. \n\nDosering : %1$s E/time\nGjenstående tid : %2$s\n&amp; Gjenværende insulin å levere: %3$.2f E</string>
     <string name="insulin_suspend_msg2">Når du pauser pumpen vil levering av bolus dose bli avbrutt. \n\nGjenværende insulin : %1$.2f E</string>
-    <string name="insulin_suspend_msg3">Når du pauser pumpen vil gjeldende Temp basal dosering bli kansellert. \n\nDosering : %1$s E/time\nGjenstående tid : %2$s</string>
+    <string name="insulin_suspend_msg3">Når du pauser pumpen vil gjeldende midlertidig basaldosering bli kansellert. \n\nDosering : %1$s E/time\nGjenstående tid : %2$s</string>
     <string name="insulin_suspend_msg4">Insulintilførsel er pauset.</string>
     <string name="string_change_patch">Kast/bytt patch</string>
     <string name="string_activate_patch">Aktiver Patch</string>
diff --git a/pump/medtronic/src/main/res/values-nb-rNO/strings.xml b/pump/medtronic/src/main/res/values-nb-rNO/strings.xml
index 7a7ffa8595..065eecdecb 100644
--- a/pump/medtronic/src/main/res/values-nb-rNO/strings.xml
+++ b/pump/medtronic/src/main/res/values-nb-rNO/strings.xml
@@ -71,8 +71,8 @@
     <string name="medtronic_cmd_desc_get_model">Henter pumpe modell</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Henter basal profil</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Angi basal profil</string>
-    <string name="medtronic_cmd_desc_get_tbr">Henter Temp Basal</string>
-    <string name="medtronic_cmd_desc_set_tbr">Angi Temp Basal</string>
+    <string name="medtronic_cmd_desc_get_tbr">Henter midlertidig basal</string>
+    <string name="medtronic_cmd_desc_set_tbr">Angi midlertidig basal</string>
     <string name="medtronic_cmd_desc_cancel_tbr">Avbryt midlertidig basal</string>
     <string name="medtronic_cmd_desc_set_bolus">Angi Bolus</string>
     <string name="medtronic_cmd_desc_get_remaining_insulin">Oppdater status insulinvolum</string>
@@ -88,7 +88,7 @@
     <string name="common_off">Av</string>
     <string name="pump_time_updated">Pumpens tid ble oppdatert</string>
     <string name="set_neutral_temps_title">Sett nøytrale temp basaler</string>
-    <string name="set_neutral_temps_summary">Hvis aktivert så vil den stoppe en temp basal rett før hver hele time for å stoppe noen pumpers varsler/vibreringer på hver hele time.</string>
+    <string name="set_neutral_temps_summary">Hvis aktivert så vil den stoppe en midlertidig 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>
diff --git a/pump/medtrum/src/main/res/values-bg-rBG/strings.xml b/pump/medtrum/src/main/res/values-bg-rBG/strings.xml
index 0fc18261f7..84c09b2d0c 100644
--- a/pump/medtrum/src/main/res/values-bg-rBG/strings.xml
+++ b/pump/medtrum/src/main/res/values-bg-rBG/strings.xml
@@ -105,9 +105,7 @@
     <string name="alarm_setting_summary">Изберете предпочитани настройки за аларми на помпата.</string>
     <string name="patch_expiration_title">Срок на пач помпата</string>
     <string name="patch_expiration_summary">След активация, пач помпата има срок от 3 дни с допълнителен период от 8 часа след това.</string>
-    <string name="hourly_max_insulin_title">Максимално количество инсулин за час</string>
     <string name="hourly_max_insulin_summary">Посочете максималните единици инсулин за час. Ако бъдат превишени, помпата ще бъде изключена.</string>
-    <string name="daily_max_insulin_title">Максимално количество инсулин за ден</string>
     <string name="daily_max_insulin_summary">Посочете максималните единици инсулин за ден. Ако бъдат превишени, помпата ще бъде изключена.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Получава статус на помпата</string>
diff --git a/pump/medtrum/src/main/res/values-cs-rCZ/strings.xml b/pump/medtrum/src/main/res/values-cs-rCZ/strings.xml
index 1493204dbf..2cf4e15177 100644
--- a/pump/medtrum/src/main/res/values-cs-rCZ/strings.xml
+++ b/pump/medtrum/src/main/res/values-cs-rCZ/strings.xml
@@ -112,11 +112,13 @@
     <string name="alarm_setting_summary">Vyberte preferované nastavení alarmů.</string>
     <string name="pump_warning_notification_title">Oznámení o varování pumpy</string>
     <string name="pump_warning_notification_summary">Zobrazit upozornění na nekritická varování pumpy: vybitá baterie, téměř prázdný zásobník (20 jednotek) a brzy dojde inzulin. Doporučeno ponechat zapnuté, když jsou výstrahy pumpy nastaveny na ticho.</string>
+    <string name="pump_warning_expiry_hour_title">Varování před vypršením platnosti pumpy [hodiny]</string>
+    <string name="pump_warning_expiry_hour_summary">Zobrazit upozornění v určené hodině po aktivaci.</string>
     <string name="patch_expiration_title">Vypršení platnosti Patche</string>
     <string name="patch_expiration_summary">Pokud je povoleno, Patch vyprší po 3 dnech s maximální dobou odkladu 8 hodin.</string>
-    <string name="hourly_max_insulin_title">Hodinové maximum inzulínu</string>
+    <string name="hourly_max_insulin_title">Hodinové maximum inzulínu [U]</string>
     <string name="hourly_max_insulin_summary">Zadejte maximální povolený počet jednotek inzulínu za hodinu. Pokud je překročeno, pumpa bude pozastavena.</string>
-    <string name="daily_max_insulin_title">Denní maximální inzulín</string>
+    <string name="daily_max_insulin_title">Denní maximum inzulínu [U]</string>
     <string name="daily_max_insulin_summary">Zadejte maximální povolené množství inzulínu za den. Pokud je překročeno, pumpa bude pozastavena.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Nahrávám stav pumpy</string>
diff --git a/pump/medtrum/src/main/res/values-da-rDK/strings.xml b/pump/medtrum/src/main/res/values-da-rDK/strings.xml
index 1195d5afbe..9e7e7ca7c8 100644
--- a/pump/medtrum/src/main/res/values-da-rDK/strings.xml
+++ b/pump/medtrum/src/main/res/values-da-rDK/strings.xml
@@ -107,9 +107,7 @@
     <string name="alarm_setting_summary">Vælg dine fortrukne pumpealarmindstillinger.</string>
     <string name="patch_expiration_title">Patch Udløber</string>
     <string name="patch_expiration_summary">Efter aktivering udløber patchen efter 3 dage med en nådeperiode på 8 timer herefter.</string>
-    <string name="hourly_max_insulin_title">Maksimal Insulin pr. Time</string>
     <string name="hourly_max_insulin_summary">Specificér det maksimale tilladte antal enheder insulin per time. Hvis denne overskrides, pauseres pumpen.</string>
-    <string name="daily_max_insulin_title">Maksimal Insulin pr. Dag</string>
     <string name="daily_max_insulin_summary">Specificér det maksimale tilladte antal enheder insulin per Dag. Hvis denne overskrides, pauseres pumpen.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Henter pumpestatus</string>
diff --git a/pump/medtrum/src/main/res/values-de-rDE/strings.xml b/pump/medtrum/src/main/res/values-de-rDE/strings.xml
index 997e3b8ef9..51f6acd6cb 100644
--- a/pump/medtrum/src/main/res/values-de-rDE/strings.xml
+++ b/pump/medtrum/src/main/res/values-de-rDE/strings.xml
@@ -105,9 +105,7 @@
     <string name="alarm_setting_summary">Wählen Sie Ihre bevorzugten Pumpen-Alarmeinstellungen.</string>
     <string name="patch_expiration_title">Patch Ablaufdatum</string>
     <string name="patch_expiration_summary">Wenn aktiviert, läuft der Patch nach 3 Tagen ab, mit einer Nachfrist von 8 Stunden danach.</string>
-    <string name="hourly_max_insulin_title">Stündliches Maximum Insulin</string>
     <string name="hourly_max_insulin_summary">Lege die maximale Anzahl an Insulineinheiten pro Stunde fest. Bei Überschreitung wird die Pumpe ausgesetzt.</string>
-    <string name="daily_max_insulin_title">Tägliches Maximum Insulin</string>
     <string name="daily_max_insulin_summary">Legen Sie die maximale Anzahl an Insulineinheiten pro Tag fest. Bei Überschreitung wird die Pumpe ausgesetzt.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Pumpenstatus wird abgerufen</string>
diff --git a/pump/medtrum/src/main/res/values-el-rGR/strings.xml b/pump/medtrum/src/main/res/values-el-rGR/strings.xml
index 68d9aed6f3..8158a6bc8b 100644
--- a/pump/medtrum/src/main/res/values-el-rGR/strings.xml
+++ b/pump/medtrum/src/main/res/values-el-rGR/strings.xml
@@ -107,9 +107,7 @@
     <string name="alarm_setting_summary">Επιλέξτε τις προτιμώμενες ρυθμίσεις συναγερμού της αντλίας σας.</string>
     <string name="patch_expiration_title">Λήξη Patch</string>
     <string name="patch_expiration_summary">Όταν ενεργοποιηθεί, το patch θα λήξει μετά από 3 ημέρες, με περίοδο χάριτος 8 ώρες μετά από αυτό.</string>
-    <string name="hourly_max_insulin_title">Μέγιστη Ωριαία Ινσουλίνη</string>
     <string name="hourly_max_insulin_summary">Καθορίστε τις μέγιστες μονάδες ινσουλίνης που επιτρέπονται ανά ώρα. Αν ξεπεραστείη ποσότητα αυτή, η αντλία θα αναστείλει.</string>
-    <string name="daily_max_insulin_title">Ημερήσια Μέγιστη Ινσουλίνη</string>
     <string name="daily_max_insulin_summary">Καθορίστε τις μέγιστες μονάδες ινσουλίνης που επιτρέπονται ανά ημέρα. Αν ξεπεραστεί η ποσότητα αυτή, η αντλία θα αναστείλει.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Φόρτωση κατάστασης αντλίας</string>
diff --git a/pump/medtrum/src/main/res/values-es-rES/strings.xml b/pump/medtrum/src/main/res/values-es-rES/strings.xml
index c8c013cc15..388e599806 100644
--- a/pump/medtrum/src/main/res/values-es-rES/strings.xml
+++ b/pump/medtrum/src/main/res/values-es-rES/strings.xml
@@ -114,9 +114,7 @@
     <string name="pump_warning_notification_summary">Mostrar notificación en advertencias de la bomba no críticas: batería baja, reserva baja (20 unidades) y próxima a caducar. Se recomienda dejarlo habilitado cuando las alarmas de la bomba estén configuradas en silencio.</string>
     <string name="patch_expiration_title">Caducidad del parche</string>
     <string name="patch_expiration_summary">Cuando está activado, el parche caducará a los 3 días, con un periodo de gracia de 8 horas adicionales</string>
-    <string name="hourly_max_insulin_title">Insulina máxima por hora</string>
     <string name="hourly_max_insulin_summary">Especificar las unidades máximas de insulina permitidas por hora. Si se supera, la bomba se suspenderá.</string>
-    <string name="daily_max_insulin_title">Insulina máxima diaria</string>
     <string name="daily_max_insulin_summary">Especificar las unidades máximas de insulina permitidas por día. Si se superan, la bomba se suspenderá.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Obteniendo el estado de la bomba</string>
diff --git a/pump/medtrum/src/main/res/values-fr-rFR/strings.xml b/pump/medtrum/src/main/res/values-fr-rFR/strings.xml
index fc64927cd3..a971250f5f 100644
--- a/pump/medtrum/src/main/res/values-fr-rFR/strings.xml
+++ b/pump/medtrum/src/main/res/values-fr-rFR/strings.xml
@@ -114,9 +114,7 @@
     <string name="pump_warning_notification_summary">Afficher une notification sur les avertissements non critiques de la pompe : pile faible, réservoir faible (20 unités) et expire bientôt. Il est recommandé de laisser activé lorsque les alarmes de la pompe sont réglées sur silencieux.</string>
     <string name="patch_expiration_title">Expiration du Patch</string>
     <string name="patch_expiration_summary">Lorsqu\'il est activé, le Patch expirera après 3 jours, avec un délai de grâce de 8 heures au-delà.</string>
-    <string name="hourly_max_insulin_title">Insuline maximale horaire</string>
     <string name="hourly_max_insulin_summary">Spécifiez le nombre maximum d\'unités d\'insuline autorisées par heure. Si ce montant est dépassé, la pompe sera suspendue.</string>
-    <string name="daily_max_insulin_title">Insuline maximale quotidienne</string>
     <string name="daily_max_insulin_summary">Spécifiez le nombre maximum d\'unités d\'insuline autorisées par jour. Si ce montant est dépassé, la pompe sera suspendue.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Mise à jour de l\'état pompe</string>
diff --git a/pump/medtrum/src/main/res/values-it-rIT/strings.xml b/pump/medtrum/src/main/res/values-it-rIT/strings.xml
index 594c3290fb..b5de1d6fea 100644
--- a/pump/medtrum/src/main/res/values-it-rIT/strings.xml
+++ b/pump/medtrum/src/main/res/values-it-rIT/strings.xml
@@ -105,9 +105,7 @@
     <string name="alarm_setting_summary">Seleziona le tue impostazioni di allarme del micro preferite.</string>
     <string name="patch_expiration_title">Scadenza patch</string>
     <string name="patch_expiration_summary">Una volta abilitata, la patch scadrà dopo 3 giorni, con un periodo di grazia di 8 ore.</string>
-    <string name="hourly_max_insulin_title">Insulina massima oraria</string>
     <string name="hourly_max_insulin_summary">Specificare le unità massime di insulina consentite per ora. Se superate, il micro sarà sospeso.</string>
-    <string name="daily_max_insulin_title">Insulina massima giornaliera</string>
     <string name="daily_max_insulin_summary">Specificare le unità massime di insulina consentite per giorno. Se superate, il micro sarà sospeso.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Ricezione stato micro</string>
diff --git a/pump/medtrum/src/main/res/values-ko-rKR/strings.xml b/pump/medtrum/src/main/res/values-ko-rKR/strings.xml
index 7046fb4f4f..c84fadfdef 100644
--- a/pump/medtrum/src/main/res/values-ko-rKR/strings.xml
+++ b/pump/medtrum/src/main/res/values-ko-rKR/strings.xml
@@ -106,9 +106,7 @@
     <string name="alarm_setting_summary">선호하는 펌프 알람 설정을 선택하세요.</string>
     <string name="patch_expiration_title">Patch 만료</string>
     <string name="patch_expiration_summary">활성화되면, patch는 3일 후에 만료되며, 이후 8시간의 유예 기간이 적용됩니다.</string>
-    <string name="hourly_max_insulin_title">시간당 최대 인슐린</string>
     <string name="hourly_max_insulin_summary">시간당 허용되는 인슐린 최대 unit을 정합니다. 이를 초과하면, 펌프는 중지됩니다.</string>
-    <string name="daily_max_insulin_title">일일 최대 인슐린</string>
     <string name="daily_max_insulin_summary">하루에 허용되는 인슐린 최대 unit을 정합니다. 이를 초과하면, 펌프는 중지됩니다.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">펌프 상태 가져오기</string>
diff --git a/pump/medtrum/src/main/res/values-lt-rLT/strings.xml b/pump/medtrum/src/main/res/values-lt-rLT/strings.xml
index da7983f437..7c1e714e87 100644
--- a/pump/medtrum/src/main/res/values-lt-rLT/strings.xml
+++ b/pump/medtrum/src/main/res/values-lt-rLT/strings.xml
@@ -108,9 +108,7 @@
     <string name="alarm_setting_summary">Pasirinkite pompos aliarmų nustatymus</string>
     <string name="patch_expiration_title">Rezervuaras išsijungs</string>
     <string name="patch_expiration_summary">Įgalinus, rezervuaras išsijungs po 3 parų ir 8 val.</string>
-    <string name="hourly_max_insulin_title">Valandos insulino limitas</string>
     <string name="hourly_max_insulin_summary">Nustatykite maksimalų insulino kiekį valandai. Jį viršijus pompa bus sustabdyta.</string>
-    <string name="daily_max_insulin_title">Paros insulino limitas</string>
     <string name="daily_max_insulin_summary">Nustatykite maksimalų insulino kiekį parai. Jį viršijus pompa bus sustabdyta.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Gaunamas pompos statusas</string>
diff --git a/pump/medtrum/src/main/res/values-nb-rNO/strings.xml b/pump/medtrum/src/main/res/values-nb-rNO/strings.xml
index 8100bc66f2..3a459c4d90 100644
--- a/pump/medtrum/src/main/res/values-nb-rNO/strings.xml
+++ b/pump/medtrum/src/main/res/values-nb-rNO/strings.xml
@@ -114,9 +114,7 @@
     <string name="pump_warning_notification_summary">Vis varsel om ikke-kritisk pumpeadvarsel: lavt batteri, lavt reservoar (20 enheter) og utløper snart. Anbefales og la være aktivert når pumpealarmer er satt til stillemodus.</string>
     <string name="patch_expiration_title">Patch utløpsdato</string>
     <string name="patch_expiration_summary">Når aktivert vil plasteret utløpe etter 3 dager, med en nådeperiode på 8 timer etter det.</string>
-    <string name="hourly_max_insulin_title">Maksimal insulin per time</string>
     <string name="hourly_max_insulin_summary">Angi maksimalt antall enheter insulin tillatt per time. Hvis overskredet vil pumpen suspendere.</string>
-    <string name="daily_max_insulin_title">Maksimal insulin per dag</string>
     <string name="daily_max_insulin_summary">Angi maksimalt antall enheter insulin tillatt per dag. Hvis overskredet vil pumpen suspendere.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Henter pumpestatus</string>
diff --git a/pump/medtrum/src/main/res/values-nl-rNL/strings.xml b/pump/medtrum/src/main/res/values-nl-rNL/strings.xml
index c566589058..33773439f3 100644
--- a/pump/medtrum/src/main/res/values-nl-rNL/strings.xml
+++ b/pump/medtrum/src/main/res/values-nl-rNL/strings.xml
@@ -114,9 +114,7 @@
     <string name="pump_warning_notification_summary">Melding weergeven op niet-kritische pompwaarschuwingen: batterij bijna leeg, reservoir bijna leeg (20 eenheden) en vervalt bijna. Aanbevolen om ingeschakeld te laten wanneer pomp alarmen op stil zijn ingesteld.</string>
     <string name="patch_expiration_title">Patch vervalt</string>
     <string name="patch_expiration_summary">Wanneer ingeschakeld, zal de patch na 3 dagen verlopen met een extra periode van 8 uur coulance.</string>
-    <string name="hourly_max_insulin_title">Maximale insuline per uur</string>
     <string name="hourly_max_insulin_summary">Geef de maximale hoeveelheid insuline per uur op. Indien overschreden zal de pomp de insuline toediening onderbreken.</string>
-    <string name="daily_max_insulin_title">Maximale insuline per dag</string>
     <string name="daily_max_insulin_summary">Geef de maximale hoeveelheid insuline per dag op. Indien overschreden zal de pomp de insuline toediening onderbreken.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Pompstatus aan het ophalen</string>
diff --git a/pump/medtrum/src/main/res/values-pl-rPL/strings.xml b/pump/medtrum/src/main/res/values-pl-rPL/strings.xml
index ddccc09c6d..9c0d32b315 100644
--- a/pump/medtrum/src/main/res/values-pl-rPL/strings.xml
+++ b/pump/medtrum/src/main/res/values-pl-rPL/strings.xml
@@ -111,9 +111,7 @@
     <string name="pump_warning_notification_summary">Pokaż powiadomienia o niekrytycznych ostrzeżeniach pompy takich jak: niski poziom baterii, niski poziom zbiornika (20 jednostek) i wkrótce wygasa. Zalecane zostawianie włączonych powiadomień, gdy alarmy pompy są wyciszone.</string>
     <string name="patch_expiration_title">Wygaśnięcie Patcha</string>
     <string name="patch_expiration_summary">Po uruchomieniu Patch wygaśnie po 3 dniach, z dodatkowym 8 godzinowym okresem karencji.</string>
-    <string name="hourly_max_insulin_title">Maksymalna Insulina w godzinę</string>
     <string name="hourly_max_insulin_summary">Określ maksymalną dozwoloną ilość jednostek insuliny podanych na godzinę. Po przekroczeniu tego limitu pompa zawiesi podaż insuliny.</string>
-    <string name="daily_max_insulin_title">Maksymalna Insulina dziennie</string>
     <string name="daily_max_insulin_summary">Określ maksymalną dozwoloną ilość jednostek insuliny podanych na dzień. Po przekroczeniu tego limitu pompa zawiesi podaż insuliny.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Uzyskiwanie statusu pompy</string>
diff --git a/pump/medtrum/src/main/res/values-ro-rRO/strings.xml b/pump/medtrum/src/main/res/values-ro-rRO/strings.xml
index 01b5297304..0fdf3679e8 100644
--- a/pump/medtrum/src/main/res/values-ro-rRO/strings.xml
+++ b/pump/medtrum/src/main/res/values-ro-rRO/strings.xml
@@ -114,9 +114,7 @@
     <string name="pump_warning_notification_summary">Arată notificare cu privire la avertismentele non-critice ale pompei: baterie scăzută, rezervor redus (20 de unități) și expiră în curând. Se recomandă să lăsaţi activat când alarmele pompei sunt setate la silențios.</string>
     <string name="patch_expiration_title">Patch Expirare</string>
     <string name="patch_expiration_summary">Când este activat, patchul va expira după 3 zile, cu o perioadă de graţie de 8 ore după expirare.</string>
-    <string name="hourly_max_insulin_title">Insulină maximă pe oră</string>
     <string name="hourly_max_insulin_summary">Specifică numărul maxim de unități de insulină permise pe oră. Dacă sunt depăşite, pompa se va suspenda.</string>
-    <string name="daily_max_insulin_title">Insulină maximă zilnică</string>
     <string name="daily_max_insulin_summary">Specifică numărul maxim de unități de insulină permise pe zi. Dacă sunt depăşite, pompa se va suspenda.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Se primește starea pompei</string>
diff --git a/pump/medtrum/src/main/res/values-ru-rRU/strings.xml b/pump/medtrum/src/main/res/values-ru-rRU/strings.xml
index c029351280..ec2b2ded32 100644
--- a/pump/medtrum/src/main/res/values-ru-rRU/strings.xml
+++ b/pump/medtrum/src/main/res/values-ru-rRU/strings.xml
@@ -114,9 +114,7 @@
     <string name="pump_warning_notification_summary">Показывать уведомления о некритических оповещениях помпы: низком заряде батареи, низком запасе инсулина (20 единиц) и приближающемся истечении срока работы. Рекомендуется оставить включенным, когда звук оповещений выключен.</string>
     <string name="patch_expiration_title">Окончание срока действия патча</string>
     <string name="patch_expiration_summary">Если включено, то патч закончит свое действие через 3 дня, с дополнительными 8 часами после этого.</string>
-    <string name="hourly_max_insulin_title">Максимальное количество инсулина в час</string>
     <string name="hourly_max_insulin_summary">Укажите максимальное количество инсулина, допустимое для ввода в течение часа. Если оно будет превышено - помпа будет приостановлена.</string>
-    <string name="daily_max_insulin_title">Максимальное количество инсулина в сутки</string>
     <string name="daily_max_insulin_summary">Укажите максимальное количество инсулина, допустимое для ввода в течение суток. Если оно будет превышено - помпа будет приостановлена.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Получение статуса помпы</string>
diff --git a/pump/medtrum/src/main/res/values-sk-rSK/strings.xml b/pump/medtrum/src/main/res/values-sk-rSK/strings.xml
index a03c3f0d9a..0b179c64c9 100644
--- a/pump/medtrum/src/main/res/values-sk-rSK/strings.xml
+++ b/pump/medtrum/src/main/res/values-sk-rSK/strings.xml
@@ -114,9 +114,7 @@
     <string name="pump_warning_notification_summary">Zobraziť upozornenie na nie kritické varovanie pumpy: vybitá batéria, takmer prázdny zásobník (20 jednotiek) a čoskoro dojde inzulín. Doporučené ponechať zapnuté, keď sú výstrahy pumpy nastavené na ticho.</string>
     <string name="patch_expiration_title">Expirácia Patch</string>
     <string name="patch_expiration_summary">Pokiaľ je povolené, Patch expiruje po 3 dňoch s maximálnou dobou odkladu 8 hodín.</string>
-    <string name="hourly_max_insulin_title">Hodinové maximum inzulínu</string>
     <string name="hourly_max_insulin_summary">Zadajte maximálny povolený počet jednotiek inzulínu za hodinu. Pokiaľ budú prekročené, pumpa bude pozastavená.</string>
-    <string name="daily_max_insulin_title">Denný maximálny inzulín</string>
     <string name="daily_max_insulin_summary">Zadajte maximálny povolený počet jednotiek inzulínu za deň. Pokiaľ budú prekročené, pumpa bude pozastavená.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Načítavam stav pumpy</string>
diff --git a/pump/medtrum/src/main/res/values-sv-rSE/strings.xml b/pump/medtrum/src/main/res/values-sv-rSE/strings.xml
index b15bcb2527..16c2153f26 100644
--- a/pump/medtrum/src/main/res/values-sv-rSE/strings.xml
+++ b/pump/medtrum/src/main/res/values-sv-rSE/strings.xml
@@ -106,9 +106,7 @@
     <string name="alarm_setting_summary">Ställ in dina föredragna larminställningar för pumpen.</string>
     <string name="patch_expiration_title">Poddens utgångsdatum</string>
     <string name="patch_expiration_summary">När den är aktiverad, kommer podden att löpa ut efter 3 dagar, med en tidsfrist på 8 timmar efter det.</string>
-    <string name="hourly_max_insulin_title">Maximalt insulin per timme</string>
     <string name="hourly_max_insulin_summary">Ange maximalt tillåtna insulin-enheter per timme. Om den överskrids kommer pumpen att pausas.</string>
-    <string name="daily_max_insulin_title">Maximal daglig insulin-dos</string>
     <string name="daily_max_insulin_summary">Ange maximalt tillåtna insulin-enheter per dag. Om den överskrids kommer pumpen att pausas.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Hämtar pumpstatus</string>
diff --git a/pump/medtrum/src/main/res/values-tr-rTR/strings.xml b/pump/medtrum/src/main/res/values-tr-rTR/strings.xml
index 143f6dab14..f0b22a57aa 100644
--- a/pump/medtrum/src/main/res/values-tr-rTR/strings.xml
+++ b/pump/medtrum/src/main/res/values-tr-rTR/strings.xml
@@ -114,9 +114,7 @@
     <string name="pump_warning_notification_summary">Kritik olmayan pompa uyarılarıyla ilgili bildirimi göster: düşük pil, düşük rezervuar (20 birim) ve yakında süresi doluyor. Pompa alarmları sessize ayarlandığında etkin bırakılması önerilir.</string>
     <string name="patch_expiration_title">Patch süre sonu</string>
     <string name="patch_expiration_summary">Etkinleştirildiğinde, patch 3 gün sonra sona erecek ve bunun ardından 8 saatlik bir ek süre tanınacaktır.</string>
-    <string name="hourly_max_insulin_title">Saatlik Maksimum insülin</string>
     <string name="hourly_max_insulin_summary">Bir saatte izin verilen maksimum insülini (Ü) belirtin. Bu değer aşılırsa pompa askıya alınır.</string>
-    <string name="daily_max_insulin_title">Günlük Maksimum insülin</string>
     <string name="daily_max_insulin_summary">Bir günde izin verilen maksimum insülini (Ü) belirtin. Bu değer aşılırsa pompa askıya alınır.</string>
     <!-- treatment state-->
     <string name="getting_pump_status">Pompa durumu alınıyor</string>
diff --git a/pump/omnipod-common/src/main/res/values-nb-rNO/strings.xml b/pump/omnipod-common/src/main/res/values-nb-rNO/strings.xml
index 6682ce3e14..121dfd1331 100644
--- a/pump/omnipod-common/src/main/res/values-nb-rNO/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-nb-rNO/strings.xml
@@ -116,7 +116,7 @@
     <string name="omnipod_common_preferences_category_alerts">Varsler</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Bekreftelseslyd</string>
     <string name="omnipod_common_preferences_category_notifications">Varsler</string>
-    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Lydvarsel for ubekreftet temp basal dosering (TBR) er aktivert</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Lydvarsel for ubekreftet midlertidig basaldosering (TBR) er aktivert</string>
     <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Lydvarsel for ubekreftet SMB er aktivert</string>
     <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Lydvarsel for ubekreftet bolus er aktivert</string>
     <!-- Omnipod - Pod Status -->
@@ -134,7 +134,7 @@
     <string name="omnipod_common_cmd_discard_pod">Forkast Pod</string>
     <string name="omnipod_common_cmd_set_bolus">Angi Bolus</string>
     <string name="omnipod_common_cmd_cancel_bolus">Avbryt Bolus</string>
-    <string name="omnipod_common_cmd_set_tbr">Angi Midlertidig Basal</string>
+    <string name="omnipod_common_cmd_set_tbr">Angi midlertidig basal</string>
     <string name="omnipod_common_cmd_cancel_tbr_by_driver">Avbryt midlertidig basal (internt av driver)</string>
     <string name="omnipod_common_cmd_cancel_tbr">Avbryt midlertidig basal</string>
     <string name="omnipod_common_cmd_set_basal_schedule">Angi basalprogram</string>
diff --git a/pump/omnipod-eros/src/main/res/values-nb-rNO/strings.xml b/pump/omnipod-eros/src/main/res/values-nb-rNO/strings.xml
index ba11108eea..3c5e9c91cb 100644
--- a/pump/omnipod-eros/src/main/res/values-nb-rNO/strings.xml
+++ b/pump/omnipod-eros/src/main/res/values-nb-rNO/strings.xml
@@ -44,10 +44,10 @@
     <string name="omnipod_eros_error_set_basal_failed_delivery_might_be_suspended">Endring av basalprofil mislyktes. Insulinlevering kan bli stoppet! Vennligst velg Oppdater Pod fra Omnipod fanen og velg gjenoppta levering hvis nødvendig.</string>
     <string name="omnipod_eros_error_set_basal_might_have_failed_delivery_might_be_suspended">Endring av basalprofil kan ha feilet. Insulinlevering kan bli stoppet! Vennligst velg Oppdater Pod fra Omnipod fanen og velg gjenoppta levering hvis nødvendig.</string>
     <string name="omnipod_eros_error_set_basal_failed_delivery_suspended">Endring av basal profil mislyktes. Insulinlevering er stoppet! Velg gjenoppta levering manuelt fra Omnipod-menyen.</string>
-    <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">Mislyktes trolig med å kansellere temp basal. Vennligst oppdater Pod status manuelt fra Omnipod menyen.</string>
+    <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">Mislyktes trolig med å kansellere midlertidig basal. Vennligst oppdater Pod-status manuelt fra Omnipod-menyen.</string>
     <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Endring av midlertidig basal var mislykket. En tidligere midlertidig basal kan ha blitt kansellert. Oppdater statusen på Pod manuelt fra Omnipod fanen.</string>
-    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Setting av temp basal kan ha feilet. Hvis en temp basal allerede var aktiv så er den nå avbrutt. Vennligst oppdater Pod status manuelt fra Omnipod menyen.</string>
-    <string name="omnipod_eros_error_set_temp_basal_failed_validation">TBR varighet må være større enn null og et multiplum av %1$s minutter.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Setting av midlertidig basal kan ha feilet. Hvis en midlertidig basal allerede var aktiv så er den nå avbrutt. Vennligst oppdater Pod-status manuelt fra Omnipod-menyen.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_validation">Midlertidig basalvarighet må være større enn null og et multiplum av %1$s minutter.</string>
     <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">Innstilling av tid kan ha mislyktes. Insulinlevering kan være pauset! Oppdater statusen manuelt fra fanen Omnipod og gjenoppta levering hvis nødvendig.</string>
     <string name="omnipod_eros_error_set_time_failed_delivery_suspended">Endring av tid mislyktes. Insulinlevering er pauset! Velg gjenoppta levering manuelt fra Omnipod-fanen.</string>
     <string name="omnipod_eros_error_failed_to_read_pulse_log">Feilet i å lese Pulsloggen</string>
diff --git a/ui/src/main/res/values-nb-rNO/strings.xml b/ui/src/main/res/values-nb-rNO/strings.xml
index 206e1310d4..35ae9e2eb5 100644
--- a/ui/src/main/res/values-nb-rNO/strings.xml
+++ b/ui/src/main/res/values-nb-rNO/strings.xml
@@ -7,7 +7,7 @@
     <string name="start_activity_tt">Start midlertidig mål for Aktivitet</string>
     <string name="start_eating_soon_tt">Start midlertidig mål for Spise snart</string>
     <string name="start_hypo_tt">Start midlertidig mål for Hypo</string>
-    <string name="time_offset">Tids- forskyvning</string>
+    <string name="time_offset">Tidsforskyvning</string>
     <string name="unit_minute_short">min</string>
     <string name="remind_to_bolus_later">Påminnelse om å gi bolus senere</string>
     <string name="a11y_carb_reminder">angi påminnelse</string>
@@ -45,7 +45,7 @@
     <string name="do_not_bolus_record_only">Ikke gi bolus, bare loggfør hendelse</string>
     <!-- ProfileSwitchDialog -->
     <string name="reuse_profile_pct_hours">Gjenbruk %1$d%% %2$dt</string>
-    <string name="timeshift_label">Tids- forskyving</string>
+    <string name="timeshift_label">Tidsforskyving</string>
     <string name="percentage_label">Prosent</string>
     <!-- LoopDialog -->
     <string name="suspendloopfor1h">Pause loop i 1t</string>
diff --git a/wear/src/main/res/values-bg-rBG/strings.xml b/wear/src/main/res/values-bg-rBG/strings.xml
index eeca18334c..3bfc3b9773 100644
--- a/wear/src/main/res/values-bg-rBG/strings.xml
+++ b/wear/src/main/res/values-bg-rBG/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(Графика)</string>
     <string name="label_watchface_no_chart">AAPS(без Графика)</string>
     <string name="label_watchface_circle">AAPS(Кръгъл)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS (DigitalStyle)</string>
     <string name="label_watchface_custom">AAPS(Персонализиран)</string>
     <string name="label_actions_tile">AAPS(Действия)</string>
diff --git a/wear/src/main/res/values-cs-rCZ/strings.xml b/wear/src/main/res/values-cs-rCZ/strings.xml
index ff0f4e4dfb..30e21a1d06 100644
--- a/wear/src/main/res/values-cs-rCZ/strings.xml
+++ b/wear/src/main/res/values-cs-rCZ/strings.xml
@@ -7,7 +7,6 @@
     <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_digital_style">AAPS (DigitalStyle)</string>
     <string name="label_watchface_custom">AAPS (vlastní)</string>
     <string name="label_actions_tile">AAPS(Akce)</string>
diff --git a/wear/src/main/res/values-da-rDK/strings.xml b/wear/src/main/res/values-da-rDK/strings.xml
index 3dc905dda5..7253646633 100644
--- a/wear/src/main/res/values-da-rDK/strings.xml
+++ b/wear/src/main/res/values-da-rDK/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(StorGraf)</string>
     <string name="label_watchface_no_chart">AAPS(IngenGraf)</string>
     <string name="label_watchface_circle">AAPS(Cirkel)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS (DigitalStil)</string>
     <string name="label_watchface_custom">AAPS(Brugerdefineret)</string>
     <string name="label_actions_tile">AAPS (Handlinger)</string>
diff --git a/wear/src/main/res/values-de-rDE/strings.xml b/wear/src/main/res/values-de-rDE/strings.xml
index ea613f1c35..05c79df832 100644
--- a/wear/src/main/res/values-de-rDE/strings.xml
+++ b/wear/src/main/res/values-de-rDE/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(GroßerGraph)</string>
     <string name="label_watchface_no_chart">AAPS(KeinGraph)</string>
     <string name="label_watchface_circle">AAPS(Kreis)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS(DigitalStyle)</string>
     <string name="label_watchface_custom">AAPS(Custom)</string>
     <string name="label_actions_tile">AAPS(Aktionen)</string>
diff --git a/wear/src/main/res/values-el-rGR/strings.xml b/wear/src/main/res/values-el-rGR/strings.xml
index 52efac981f..2b1ce01ed0 100644
--- a/wear/src/main/res/values-el-rGR/strings.xml
+++ b/wear/src/main/res/values-el-rGR/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(μεγαλο_γράφημα)</string>
     <string name="label_watchface_no_chart">AAPS(χωρίς_γράφημα)</string>
     <string name="label_watchface_circle">AAPS(Κυκλικό)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS(ψηφιακό)</string>
     <string name="label_watchface_custom">AAPS(προσαρμοσμένα_χαρακτηριστικά)</string>
     <string name="label_actions_tile">AAPS( Ενέργειες)</string>
diff --git a/wear/src/main/res/values-es-rES/strings.xml b/wear/src/main/res/values-es-rES/strings.xml
index d7dd4c9ac3..7cbbf11d3d 100644
--- a/wear/src/main/res/values-es-rES/strings.xml
+++ b/wear/src/main/res/values-es-rES/strings.xml
@@ -7,7 +7,6 @@
     <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_digital_style">AAPS (Digital)</string>
     <string name="label_watchface_custom">AAPS(personalizado)</string>
     <string name="label_actions_tile">AAPS(Acciones)</string>
diff --git a/wear/src/main/res/values-fr-rFR/strings.xml b/wear/src/main/res/values-fr-rFR/strings.xml
index 3c0669aac0..fe943cf4cb 100644
--- a/wear/src/main/res/values-fr-rFR/strings.xml
+++ b/wear/src/main/res/values-fr-rFR/strings.xml
@@ -7,7 +7,6 @@
     <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_digital_style">AAPS (Digital)</string>
     <string name="label_watchface_custom">AAPS(perso)</string>
     <string name="label_actions_tile">AAPS (Actions)</string>
diff --git a/wear/src/main/res/values-hr-rHR/strings.xml b/wear/src/main/res/values-hr-rHR/strings.xml
index 9d657e0902..756134da41 100644
--- a/wear/src/main/res/values-hr-rHR/strings.xml
+++ b/wear/src/main/res/values-hr-rHR/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(Veliki Graf)</string>
     <string name="label_watchface_no_chart">AAPS(Bez grafa)</string>
     <string name="label_watchface_circle">AAPS(Kružni)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="pref_low">Nisko</string>
     <string name="pref_high">Visoko</string>
     <string name="menu_wizard">Kalkulator</string>
diff --git a/wear/src/main/res/values-it-rIT/strings.xml b/wear/src/main/res/values-it-rIT/strings.xml
index bd62bf02ab..6f0c290eb7 100644
--- a/wear/src/main/res/values-it-rIT/strings.xml
+++ b/wear/src/main/res/values-it-rIT/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(BigChart)</string>
     <string name="label_watchface_no_chart">AAPS(NoChart)</string>
     <string name="label_watchface_circle">AAPS(Circle)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS(DigitalStyle)</string>
     <string name="label_watchface_custom">AAPS(Personalizzato)</string>
     <string name="label_actions_tile">AAPS(azioni)</string>
diff --git a/wear/src/main/res/values-iw-rIL/strings.xml b/wear/src/main/res/values-iw-rIL/strings.xml
index f967777df3..cce9270b65 100644
--- a/wear/src/main/res/values-iw-rIL/strings.xml
+++ b/wear/src/main/res/values-iw-rIL/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS (תרשים גדול)</string>
     <string name="label_watchface_no_chart">AAPS (ללא תרשים)</string>
     <string name="label_watchface_circle">AAPS (עיגול)</string>
-    <string name="label_watchface_v2">AAPS (v2)</string>
     <string name="label_watchface_digital_style">AAPS (דיגיטלי)</string>
     <string name="label_actions_tile">AAPS (פעולות)</string>
     <string name="label_temp_target_tile">AAPS (מטרה זמנית)</string>
diff --git a/wear/src/main/res/values-ko-rKR/strings.xml b/wear/src/main/res/values-ko-rKR/strings.xml
index fd4d545f9e..d29ae5d50f 100644
--- a/wear/src/main/res/values-ko-rKR/strings.xml
+++ b/wear/src/main/res/values-ko-rKR/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(큰차트)</string>
     <string name="label_watchface_no_chart">AAPS(차트없음)</string>
     <string name="label_watchface_circle">AAPS(원형)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS(디지털방식)</string>
     <string name="label_watchface_custom">AAPS(Custom)</string>
     <string name="label_actions_tile">AAPS(Actions)</string>
diff --git a/wear/src/main/res/values-lt-rLT/strings.xml b/wear/src/main/res/values-lt-rLT/strings.xml
index 4fe153c042..cc2c637eb5 100644
--- a/wear/src/main/res/values-lt-rLT/strings.xml
+++ b/wear/src/main/res/values-lt-rLT/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(DidelisGrafikas)</string>
     <string name="label_watchface_no_chart">AAPS(BeGrafiko)</string>
     <string name="label_watchface_circle">AAPS(Apvalus)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS(DigitalStyle)</string>
     <string name="label_watchface_custom">AAPS(suasmeninta)</string>
     <string name="label_actions_tile">AAPS(Veiksmai)</string>
diff --git a/wear/src/main/res/values-nb-rNO/strings.xml b/wear/src/main/res/values-nb-rNO/strings.xml
index a42336a2f1..6c153b2e00 100644
--- a/wear/src/main/res/values-nb-rNO/strings.xml
+++ b/wear/src/main/res/values-nb-rNO/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS (stor graf)</string>
     <string name="label_watchface_no_chart">AAPS (ingen graf)</string>
     <string name="label_watchface_circle">AAPS (sirkel)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS(Digitalstil)</string>
     <string name="label_watchface_custom">AAPS(Tilpasset)</string>
     <string name="label_actions_tile">AAPS(Actions)</string>
@@ -42,7 +41,7 @@
     <string name="pref_show_bgi">Vis BGI</string>
     <string name="pref_show_direction_arrow">Vis retningspil</string>
     <string name="pref_show_ago">Vis siden</string>
-    <string name="pref_show_temp_basal">Vis TBR</string>
+    <string name="pref_show_temp_basal">Vis midl. basal</string>
     <string name="pref_show_bolus">Vis Bolus &amp; SMB</string>
     <string name="pref_show_grid">Vis rutenett</string>
     <string name="pref_dark" comment="Enables dark visual theme">Mørkt</string>
diff --git a/wear/src/main/res/values-nl-rNL/strings.xml b/wear/src/main/res/values-nl-rNL/strings.xml
index 704466c59a..9bd4769f6a 100644
--- a/wear/src/main/res/values-nl-rNL/strings.xml
+++ b/wear/src/main/res/values-nl-rNL/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(GroteGrafiek)</string>
     <string name="label_watchface_no_chart">AAPS(GeenGrafiek)</string>
     <string name="label_watchface_circle">AAPS(Cirkel)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS(DigitaleStijl)</string>
     <string name="label_watchface_custom">AAPS(Custom)</string>
     <string name="label_actions_tile">AAPS(Acties)</string>
diff --git a/wear/src/main/res/values-pl-rPL/strings.xml b/wear/src/main/res/values-pl-rPL/strings.xml
index 2eb5cd5f3b..ba9833c5a6 100644
--- a/wear/src/main/res/values-pl-rPL/strings.xml
+++ b/wear/src/main/res/values-pl-rPL/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(DużyWykres)</string>
     <string name="label_watchface_no_chart">AAPS(BezWykresu)</string>
     <string name="label_watchface_circle">AAPS(Koło)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS(StylCyfrowy)</string>
     <string name="label_watchface_custom">AAPS(niestandardowy)</string>
     <string name="label_actions_tile">AAPS(Ustawienia)</string>
diff --git a/wear/src/main/res/values-pt-rBR/strings.xml b/wear/src/main/res/values-pt-rBR/strings.xml
index a30c53b003..e3e7c48a72 100644
--- a/wear/src/main/res/values-pt-rBR/strings.xml
+++ b/wear/src/main/res/values-pt-rBR/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(GrafGrande)</string>
     <string name="label_watchface_no_chart">AAPS(SemGraf)</string>
     <string name="label_watchface_circle">AAPS(Círculo)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS(DigitalStyle)</string>
     <string name="label_actions_tile">AAPS(Ações)</string>
     <string name="label_temp_target_tile">AAPS(Meta Temporária)</string>
diff --git a/wear/src/main/res/values-pt-rPT/strings.xml b/wear/src/main/res/values-pt-rPT/strings.xml
index 41bc5307b5..82c68af408 100644
--- a/wear/src/main/res/values-pt-rPT/strings.xml
+++ b/wear/src/main/res/values-pt-rPT/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(GrafGrande)</string>
     <string name="label_watchface_no_chart">AAPS(SemGraf)</string>
     <string name="label_watchface_circle">AAPS(Círculo)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS(DigitalStyle)</string>
     <string name="label_watchface_custom">AAPS(personalizado)</string>
     <string name="label_actions_tile">AAPS(Ações)</string>
diff --git a/wear/src/main/res/values-ro-rRO/strings.xml b/wear/src/main/res/values-ro-rRO/strings.xml
index 0fd9642499..ab68de875f 100644
--- a/wear/src/main/res/values-ro-rRO/strings.xml
+++ b/wear/src/main/res/values-ro-rRO/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(GraficMare)</string>
     <string name="label_watchface_no_chart">AAPS(FărăGrafic)</string>
     <string name="label_watchface_circle">AAPS(Cerc)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS (DigitalStyle)</string>
     <string name="label_watchface_custom">AAPS (Personalizat)</string>
     <string name="label_actions_tile">AAPS(Acțiuni)</string>
diff --git a/wear/src/main/res/values-ru-rRU/strings.xml b/wear/src/main/res/values-ru-rRU/strings.xml
index b1adbce79f..4e69bf0231 100644
--- a/wear/src/main/res/values-ru-rRU/strings.xml
+++ b/wear/src/main/res/values-ru-rRU/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS (Крупный график)</string>
     <string name="label_watchface_no_chart">AAPS (Без графика)</string>
     <string name="label_watchface_circle">AAPS (круглый)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS (ЦифровойСтиль)</string>
     <string name="label_watchface_custom">AAPS (настраиваемый)</string>
     <string name="label_actions_tile">AAPS (Действия)</string>
diff --git a/wear/src/main/res/values-sk-rSK/strings.xml b/wear/src/main/res/values-sk-rSK/strings.xml
index 86bdf56cb4..b1ce45a13d 100644
--- a/wear/src/main/res/values-sk-rSK/strings.xml
+++ b/wear/src/main/res/values-sk-rSK/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(VeľkýGraf)</string>
     <string name="label_watchface_no_chart">AAPS(ŽiadnyGraf)</string>
     <string name="label_watchface_circle">AAPS(Kruhový)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS (DigitalStyle)</string>
     <string name="label_watchface_custom">AAPS (vlastný)</string>
     <string name="label_actions_tile">AAPS (Akcie)</string>
diff --git a/wear/src/main/res/values-sv-rSE/strings.xml b/wear/src/main/res/values-sv-rSE/strings.xml
index 022ee17421..5de615b58c 100644
--- a/wear/src/main/res/values-sv-rSE/strings.xml
+++ b/wear/src/main/res/values-sv-rSE/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS (BigChart)</string>
     <string name="label_watchface_no_chart">AAPS (NoChart)</string>
     <string name="label_watchface_circle">AAPS (Circle)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS (DigitalStyle)</string>
     <string name="label_watchface_custom">AAPS (anpassad)</string>
     <string name="label_actions_tile">AAPS(Åtgärder)</string>
diff --git a/wear/src/main/res/values-tr-rTR/strings.xml b/wear/src/main/res/values-tr-rTR/strings.xml
index 5e2e96c084..37a7593d7e 100644
--- a/wear/src/main/res/values-tr-rTR/strings.xml
+++ b/wear/src/main/res/values-tr-rTR/strings.xml
@@ -7,7 +7,6 @@
     <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_digital_style">AAPS(DijitalStil)</string>
     <string name="label_watchface_custom">AAPS(Özel)</string>
     <string name="label_actions_tile">AAPS(Eylemler)</string>
diff --git a/wear/src/main/res/values-zh-rCN/strings.xml b/wear/src/main/res/values-zh-rCN/strings.xml
index 1d8d4093ae..5f1c9c315f 100644
--- a/wear/src/main/res/values-zh-rCN/strings.xml
+++ b/wear/src/main/res/values-zh-rCN/strings.xml
@@ -7,7 +7,6 @@
     <string name="label_watchface_big_chart">AAPS(大图)</string>
     <string name="label_watchface_no_chart">AAPS(无图)</string>
     <string name="label_watchface_circle">AAPS(圆形)</string>
-    <string name="label_watchface_v2">AAPS(v2)</string>
     <string name="label_watchface_digital_style">AAPS(数字风格)</string>
     <string name="label_actions_tile">AAPS(操作)</string>
     <string name="label_temp_target_tile">AAPS(临时目标)</string>