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 41fb4f8e467..78abd2c5d76 100644
--- a/core/interfaces/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/interfaces/src/main/res/values-cs-rCZ/strings.xml
@@ -61,8 +61,12 @@
     <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="pref_show_seconds">Zobrazovat sekundy</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="default_custom_watchface_external_comment">Výchozí ciferník včetně externích zobrazení pro sledující, chcete-li vygenerovat šablonu, můžete kliknout na tlačítko EXPORTOVAT CIFERNÍK</string>
     <string name="wear_default_watchface">Výchozí ciferník</string>
     <string name="wear_more_watchfaces">Další ciferníky</string>
+    <string name="temp_basal_absolute_rate">%1$.2f U/h @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_percent_rate">%1$.2f%% @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_extended_bolus">E %1$.2f U/h @%2$s %3$d/%4$d min</string>
 </resources>
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 48d26f5d99d..9afe90129a6 100644
--- a/core/interfaces/src/main/res/values-es-rES/strings.xml
+++ b/core/interfaces/src/main/res/values-es-rES/strings.xml
@@ -61,8 +61,12 @@
     <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="pref_show_seconds">Mostrar segundos</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="default_custom_watchface_external_comment">Esfera de reloj predeterminada que incluye vistas externas para los seguidores. Puedes hacer clic en el botón EXPORTAR WATCHFACE para generar una plantilla</string>
     <string name="wear_default_watchface">Esfera por defecto</string>
     <string name="wear_more_watchfaces">Más esferas</string>
+    <string name="temp_basal_absolute_rate">%1$.2f U/h @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_percent_rate">%1$.2f%% @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_extended_bolus">E %1$.2f U/h @%2$s %3$d/%4$d min</string>
 </resources>
diff --git a/core/interfaces/src/main/res/values-fr-rFR/strings.xml b/core/interfaces/src/main/res/values-fr-rFR/strings.xml
index 49f155c192d..93d2fb77f70 100644
--- a/core/interfaces/src/main/res/values-fr-rFR/strings.xml
+++ b/core/interfaces/src/main/res/values-fr-rFR/strings.xml
@@ -61,8 +61,12 @@
     <string name="pref_show_ago">Afficher Min Passées</string>
     <string name="pref_show_week_number">Afficher numéro semaine</string>
     <string name="pref_show_date">Afficher la date</string>
+    <string name="pref_show_seconds">Afficher les secondes</string>
     <string name="default_custom_watchface_comment">Cadran par défaut, vous pouvez cliquer sur le bouton EXPORTER WATCHFACE pour générer un modèle</string>
     <string name="default_custom_watchface_external_comment">Cadran par défaut incluant les vues externes pour les suiveurs, vous pouvez cliquer sur le bouton EXPORTER LE MODÈLE pour générer un modèle</string>
     <string name="wear_default_watchface">Cadran par défaut</string>
     <string name="wear_more_watchfaces">Plus de cadrans</string>
+    <string name="temp_basal_absolute_rate">%1$.2f U/h @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_percent_rate">%1$.2f%% @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_extended_bolus">E %1$.2f U/h @%2$s %3$d/%4$d min</string>
 </resources>
diff --git a/core/interfaces/src/main/res/values-it-rIT/strings.xml b/core/interfaces/src/main/res/values-it-rIT/strings.xml
index a51992490d5..97e78c03bcb 100644
--- a/core/interfaces/src/main/res/values-it-rIT/strings.xml
+++ b/core/interfaces/src/main/res/values-it-rIT/strings.xml
@@ -61,8 +61,12 @@
     <string name="pref_show_ago">Mostra Indietro</string>
     <string name="pref_show_week_number">Mostra numeri della settimana</string>
     <string name="pref_show_date">Mostra la data</string>
+    <string name="pref_show_seconds">Mostra i Secondi</string>
     <string name="default_custom_watchface_comment">Watchface predefinita, puoi fare click sul tasto ESPORTA WATCHFACE per generare un template</string>
     <string name="default_custom_watchface_external_comment">La watchface predefinita include le viste esterne per i follower, è possibile fare clic sul pulsante ESPORTA WATCHFACE per generare un modello</string>
     <string name="wear_default_watchface">Watchface predefinita</string>
     <string name="wear_more_watchfaces">Più quadranti</string>
+    <string name="temp_basal_absolute_rate">%1$.2f U/h @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_percent_rate">%1$.2f%% @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_extended_bolus">E %1$.2f U/h @%2$s %3$d/%4$d min</string>
 </resources>
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 aef92df21ec..962b26a0738 100644
--- a/core/interfaces/src/main/res/values-iw-rIL/strings.xml
+++ b/core/interfaces/src/main/res/values-iw-rIL/strings.xml
@@ -59,6 +59,7 @@
     <string name="pref_show_ago">הצג עבר</string>
     <string name="pref_show_week_number">הצג מספר שבוע</string>
     <string name="pref_show_date">הצג תאריך</string>
+    <string name="pref_show_seconds">הצג שניות</string>
     <string name="default_custom_watchface_comment">ברירת המחדל של פני השעון, ניתן ללחוץ על כפתור ייצוא פני שעון כדי ליצור תבנית</string>
     <string name="wear_default_watchface">ברירת מחדל פני שעון</string>
     <string name="wear_more_watchfaces">עוד פני שעון</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 f34a27c4220..5a9c367838b 100644
--- a/core/interfaces/src/main/res/values-nb-rNO/strings.xml
+++ b/core/interfaces/src/main/res/values-nb-rNO/strings.xml
@@ -46,23 +46,27 @@
     <string name="pref_show_iob">Vis IOB</string>
     <string name="pref_show_detailed_iob">Vis detaljert IOB</string>
     <string name="pref_show_cob">Vis COB</string>
-    <string name="pref_show_delta">Vis Delta</string>
-    <string name="pref_show_detailed_delta">Vis detaljert Delta</string>
-    <string name="pref_show_avgdelta">Vis Gj. snitt Delta</string>
+    <string name="pref_show_delta">Vis delta</string>
+    <string name="pref_show_detailed_delta">Vis detaljert delta</string>
+    <string name="pref_show_avgdelta">Vis gj.snittsdelta</string>
     <string name="pref_show_tempTarget">Vis midlertidig mål</string>
     <string name="pref_show_reservoir_level">Vis reservoarnivå</string>
     <string name="pref_show_phone_battery">Vis telefonbatteri</string>
     <string name="pref_show_rig_battery">Vis riggens batteri</string>
     <string name="pref_show_basal_rate">Vis basaldose</string>
-    <string name="pref_show_loop_status">Vis loop status</string>
+    <string name="pref_show_loop_status">Vis loopstatus</string>
     <string name="pref_show_bg">Vis BS</string>
     <string name="pref_show_bgi">Vis BGI</string>
     <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="pref_show_seconds">Vis sekunder</string>
     <string name="default_custom_watchface_comment">Standard urskive, du kan klikke på EKSPORTER MAL for å lage en mal</string>
     <string name="default_custom_watchface_external_comment">Standard urskive inkludert eksterne visninger for følgere, du kan klikke på knappen EKSPORTER URSKIVE for å generere en mal</string>
     <string name="wear_default_watchface">Standard urskive</string>
     <string name="wear_more_watchfaces">Flere urskiver</string>
+    <string name="temp_basal_absolute_rate">%1$.2f E/t @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_percent_rate">%1$.2f%% @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_extended_bolus">F %1$.2f E/t @%2$s %3$d/%4$d min</string>
 </resources>
diff --git a/core/interfaces/src/main/res/values-sk-rSK/strings.xml b/core/interfaces/src/main/res/values-sk-rSK/strings.xml
index c9e3e6d523e..400d49507ba 100644
--- a/core/interfaces/src/main/res/values-sk-rSK/strings.xml
+++ b/core/interfaces/src/main/res/values-sk-rSK/strings.xml
@@ -61,8 +61,12 @@
     <string name="pref_show_ago">Zobraziť aktualizované pred</string>
     <string name="pref_show_week_number">Zobraziť číslo týždňa</string>
     <string name="pref_show_date">Zobraziť dátum</string>
+    <string name="pref_show_seconds">Zobraziť sekundy</string>
     <string name="default_custom_watchface_comment">Predvolený ciferník. Môžete kliknúť na tlačítko EXPORTOVAŤ CIFERNÍK pre vygenerovanie šablóny</string>
     <string name="default_custom_watchface_external_comment">Predvolený ciferník vrátane externých zobrazení pre sledovateľov, môžete kliknúť na tlačidlo EXPORTOVAŤ CIFERNÍK ak chcete vygenerovať šablónu</string>
     <string name="wear_default_watchface">Predvolený ciferník</string>
     <string name="wear_more_watchfaces">Ďalšie ciferníky</string>
+    <string name="temp_basal_absolute_rate">%1$.2f JI/h @%2$s %3$d/%4$d</string>
+    <string name="temp_basal_percent_rate">%1$.2f%% @%2$s %3$d/%4$d</string>
+    <string name="temp_basal_extended_bolus">E %1$.2f JI/h @%2$s %3$d/%4$d min</string>
 </resources>
diff --git a/core/interfaces/src/main/res/values-zh-rTW/strings.xml b/core/interfaces/src/main/res/values-zh-rTW/strings.xml
index 8a4243e7e74..6d4e899719f 100644
--- a/core/interfaces/src/main/res/values-zh-rTW/strings.xml
+++ b/core/interfaces/src/main/res/values-zh-rTW/strings.xml
@@ -61,8 +61,12 @@
     <string name="pref_show_ago">顯示前</string>
     <string name="pref_show_week_number">顯示週數</string>
     <string name="pref_show_date">顯示日期</string>
+    <string name="pref_show_seconds">顯示秒數</string>
     <string name="default_custom_watchface_comment">預設錶盤，您可以點擊匯出錶盤按鈕來生成模板</string>
     <string name="default_custom_watchface_external_comment">預設錶盤包含外部視圖供追蹤者使用，您可以點擊匯出錶盤按鈕來生成模板</string>
     <string name="wear_default_watchface">預設錶盤</string>
     <string name="wear_more_watchfaces">更多錶盤</string>
+    <string name="temp_basal_absolute_rate">%1$.2f U/h @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_percent_rate">%1$.2f%% @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_extended_bolus">E %1$.2f U/h @%2$s %3$d/%4$d min</string>
 </resources>
diff --git a/core/interfaces/src/main/res/values/strings.xml b/core/interfaces/src/main/res/values/strings.xml
index 1815ce63f3c..6d54fef4c0f 100644
--- a/core/interfaces/src/main/res/values/strings.xml
+++ b/core/interfaces/src/main/res/values/strings.xml
@@ -65,9 +65,13 @@
     <string name="pref_show_ago">Show Ago</string>
     <string name="pref_show_week_number">Show Week number</string>
     <string name="pref_show_date">Show Date</string>
+    <string name="pref_show_seconds">Show Seconds</string>
     <string name="default_custom_watchface_comment">Default watchface, you can click on EXPORT WATCHFACE button to generate a template</string>
     <string name="default_custom_watchface_external_comment">Default watchface including external views for followers, you can click on EXPORT WATCHFACE button to generate a template</string>
     <string name="wear_default_watchface">Default Watchface</string>
     <string name="wear_more_watchfaces">More watchfaces</string>
+    <string name="temp_basal_absolute_rate">%1$.2f U/h @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_percent_rate">%1$.2f%% @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_extended_bolus">E %1$.2f U/h @%2$s %3$d/%4$d min</string>
 
 </resources>
diff --git a/plugins/aps/src/main/res/values-nb-rNO/strings.xml b/plugins/aps/src/main/res/values-nb-rNO/strings.xml
index 0c05631979c..cf4cbd4adcc 100644
--- a/plugins/aps/src/main/res/values-nb-rNO/strings.xml
+++ b/plugins/aps/src/main/res/values-nb-rNO/strings.xml
@@ -50,7 +50,7 @@
     <string name="openapsma_max_iob_summary">Denne verdien kalles Maks IOB av OpenAPS\nAAPS vil ikke gi mere insulin hvis mengden insulin ombord (IOB) overstiger denne verdien.</string>
     <string name="openapsama_autosens_adjust_targets_summary">Standard verdi: sann\nGir autosens tillatelse til å justere BS-mål, i tillegg til ISF og basaler.</string>
     <string name="openapsama_autosens_adjust_targets">Autosens justerer også BS målverdier</string>
-    <string name="openapsama_min_5m_carb_impact_summary">Standardverdi er: 3.0 (AMA) eller 8.0 (SMB). Dette er grunninnstillingen for KH-opptak per 5 minutt. Den påvirker hvor raskt COB skal reduseres, og benyttes i beregning av fremtidig BS-kurve når BS enten synker eller øker mer enn forventet. Standardverdi er 3mg/dl/5 min.</string>
+    <string name="openapsama_min_5m_carb_impact_summary">Standardverdi: 3.0 (AMA) eller 8.0 (SMB). Dette er en innstilling for standard karboabsorpsjonsvirkning per 5 minutter. Standard forventet er 3mg/dl/5min. Dette påvirker hvor raskt COB avtar, og hvor mye karboabsorpsjon antas ved beregning av fremtidig forventet BS, når BS faller mer enn forventet, eller når det ikke stiger så mye som forventet.</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Standardverdi: 3 Dette er en viktig OpenAPS sikkerhetsbegrensning. Dette begrenser dine basaler til maks 3x av din høyeste basalverdi. Du vil trolig ikke behøve å endre denne verdien, men les og forstå hva som menes med \"3x max daglig; 4x gjeldende\" som sikkerhetsinnstilling.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Standardverdi: 4 Dette er en viktig OpenAPS sikkerhetsbegrensning. Dette begrenser dine temp basal til max 4 ganger din nåværende basal dose, uansett hva som er maks basal i pumpen. Dette er for å unngå at man setter farlige høye maks basaldoser uten at man har forstått algoritmene. Når du taket i denne begrensningen bør du i stedet fokusere på å endre andre innstillinger.</string>
     <string name="openapsama_bolus_snooze_dia_divisor_summary">Standard verdi: 2\nBolus-slumre er aktivt etter at du har gitt en måltidsbolus slik at loop ikke skal forsøke å sette lav-temp når du nettopp har spist. I dette eksempelet brukes standardverdi på 2, så med en DIA på 3 timer vil bolus-slumre begrensningen gradvis forsvinne etter 1.5 timer (3DIA / 2).</string>
diff --git a/plugins/aps/src/main/res/values-zh-rTW/strings.xml b/plugins/aps/src/main/res/values-zh-rTW/strings.xml
index 5e99fb59f5f..44052eac5a5 100644
--- a/plugins/aps/src/main/res/values-zh-rTW/strings.xml
+++ b/plugins/aps/src/main/res/values-zh-rTW/strings.xml
@@ -8,7 +8,7 @@
     <string name="high_temptarget_raises_sensitivity_title">高臨時目標提高敏感度</string>
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[對於臨時目標>= 100，提高靈敏度]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">低臨時目標降低靈敏度</string>
-    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[對於溫度目標< 100，降低靈敏度]]></string>
+    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[對於臨時目標< 100，降低靈敏度]]></string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="openaps_smb_dynamic_isf">動態ISF</string>
     <string name="openaps_auto_isf">自動ISF</string>
@@ -35,7 +35,7 @@
     <string name="openapsma_last_run_label">最後執行</string>
     <string name="openapsma_input_parameters_label">輸入參數</string>
     <string name="openapsma_glucose_status_label">血糖狀態</string>
-    <string name="openapsma_current_temp_label">目前溫度</string>
+    <string name="openapsma_current_temp_label">目前臨時基礎率</string>
     <string name="openapsma_iob_data_label">IOB資料</string>
     <string name="openapsma_profile_label">檔案</string>
     <string name="openapsma_meal_data_label">餐飲資料</string>
diff --git a/plugins/automation/src/main/res/values-ar-rSA/strings.xml b/plugins/automation/src/main/res/values-ar-rSA/strings.xml
index a8d820d8397..2d1f44e2196 100644
--- a/plugins/automation/src/main/res/values-ar-rSA/strings.xml
+++ b/plugins/automation/src/main/res/values-ar-rSA/strings.xml
@@ -5,4 +5,5 @@
     <string name="count_selected">%1$d محدد</string>
     <!--    Reminders-->
     <!--    Autotune-->
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-bg-rBG/strings.xml b/plugins/automation/src/main/res/values-bg-rBG/strings.xml
index 94871299050..6d64b201ac6 100644
--- a/plugins/automation/src/main/res/values-bg-rBG/strings.xml
+++ b/plugins/automation/src/main/res/values-bg-rBG/strings.xml
@@ -120,4 +120,5 @@
     <string name="autotune_run_with_autoswitch">Стартиране на Autotune и автоматична смяна на профила</string>
     <string name="autotune_run_with_error">Възникна грешка по време на последното стартиране на Autotune</string>
     <string name="autotune_run_cancelled">Друго стартиране на Autotune е засечено, текущото е отказано</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-ca-rES/strings.xml b/plugins/automation/src/main/res/values-ca-rES/strings.xml
index 644f1f862e0..489bf937d60 100644
--- a/plugins/automation/src/main/res/values-ca-rES/strings.xml
+++ b/plugins/automation/src/main/res/values-ca-rES/strings.xml
@@ -105,4 +105,5 @@
     <!--    Reminders-->
     <string name="time_to_bolus">Hora d’aplicar bolus!\nExecuteu l\'assistent de bolus i torneu a fer els càlculs.</string>
     <!--    Autotune-->
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-cs-rCZ/strings.xml b/plugins/automation/src/main/res/values-cs-rCZ/strings.xml
index b1cc8286771..bf3c40ec24c 100644
--- a/plugins/automation/src/main/res/values-cs-rCZ/strings.xml
+++ b/plugins/automation/src/main/res/values-cs-rCZ/strings.xml
@@ -137,4 +137,8 @@
     <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>
     <string name="autotune_run_cancelled">Byla zjištěna jiná běžící úloha Autotune, spuštění zrušeno</string>
+    <!--    Steps count-->
+    <string name="triggerStepsCountLabel">Počet kroků</string>
+    <string name="triggerStepsCountDesc">Počet kroků za %1$s minut %2$s %3$.0f</string>
+    <string name="triggerStepsCountDropdownLabel">Délka měření</string>
 </resources>
diff --git a/plugins/automation/src/main/res/values-da-rDK/strings.xml b/plugins/automation/src/main/res/values-da-rDK/strings.xml
index 0e78d09289a..b63128ca946 100644
--- a/plugins/automation/src/main/res/values-da-rDK/strings.xml
+++ b/plugins/automation/src/main/res/values-da-rDK/strings.xml
@@ -120,4 +120,5 @@
     <string name="autotune_run_with_autoswitch">Autotune kørte og profilen blev automatisk skiftet</string>
     <string name="autotune_run_with_error">Fejl under sidste Autotune kørsel</string>
     <string name="autotune_run_cancelled">Autotune kører allerede, annulleret</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-de-rDE/strings.xml b/plugins/automation/src/main/res/values-de-rDE/strings.xml
index 04f6826c36a..2f31b651cc0 100644
--- a/plugins/automation/src/main/res/values-de-rDE/strings.xml
+++ b/plugins/automation/src/main/res/values-de-rDE/strings.xml
@@ -120,4 +120,5 @@
     <string name="autotune_run_with_autoswitch">Autotune ausgeführt und Profil wurde automatisch gewechselt</string>
     <string name="autotune_run_with_error">Fehler beim letzten Autotune Lauf</string>
     <string name="autotune_run_cancelled">Ein weiterer Lauf von Autotune wurde erkannt, Lauf abgebrochen</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-el-rGR/strings.xml b/plugins/automation/src/main/res/values-el-rGR/strings.xml
index 45ba2db3f94..e27b9d3dc89 100644
--- a/plugins/automation/src/main/res/values-el-rGR/strings.xml
+++ b/plugins/automation/src/main/res/values-el-rGR/strings.xml
@@ -120,4 +120,5 @@
     <string name="autotune_run_with_autoswitch">Το Autotune έτρεξε έγινε αυτόματη αλλαγή προφίλ</string>
     <string name="autotune_run_with_error">Σφάλμα κατά την τελευταία εκτέλεση του Autotune</string>
     <string name="autotune_run_cancelled">Εντοπίστηκε μια άλλη εκτέλεση του Autotune, η εκτέλεση ακυρώθηκε</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-es-rES/strings.xml b/plugins/automation/src/main/res/values-es-rES/strings.xml
index 1d1c15f8a00..e3b2998ee93 100644
--- a/plugins/automation/src/main/res/values-es-rES/strings.xml
+++ b/plugins/automation/src/main/res/values-es-rES/strings.xml
@@ -137,4 +137,8 @@
     <string name="autotune_run_with_autoswitch">Ejecutar Autotune y cambiar de perfil automáticamente</string>
     <string name="autotune_run_with_error">Error durante la última ejecución de Autotune</string>
     <string name="autotune_run_cancelled">Se ha detectado otra ejecución de Autotune, ejecución cancelada</string>
+    <!--    Steps count-->
+    <string name="triggerStepsCountLabel">Número de pasos</string>
+    <string name="triggerStepsCountDesc">Número de pasos por %1$s minutos %2$s %3$.0f</string>
+    <string name="triggerStepsCountDropdownLabel">Duración de la medición</string>
 </resources>
diff --git a/plugins/automation/src/main/res/values-fr-rFR/strings.xml b/plugins/automation/src/main/res/values-fr-rFR/strings.xml
index 61a09c088d2..1c1dff8b007 100644
--- a/plugins/automation/src/main/res/values-fr-rFR/strings.xml
+++ b/plugins/automation/src/main/res/values-fr-rFR/strings.xml
@@ -137,4 +137,8 @@
     <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>
     <string name="autotune_run_cancelled">Une autre exécution d\'Autotune est détectée, l\'exécution est annulée</string>
+    <!--    Steps count-->
+    <string name="triggerStepsCountLabel">Compteur de pas</string>
+    <string name="triggerStepsCountDesc">Nombre de pas par %1$s minutes %2$s %3$.0f</string>
+    <string name="triggerStepsCountDropdownLabel">Durée de la mesure</string>
 </resources>
diff --git a/plugins/automation/src/main/res/values-hr-rHR/strings.xml b/plugins/automation/src/main/res/values-hr-rHR/strings.xml
index 44543475e88..37ab7360ad9 100644
--- a/plugins/automation/src/main/res/values-hr-rHR/strings.xml
+++ b/plugins/automation/src/main/res/values-hr-rHR/strings.xml
@@ -15,4 +15,5 @@
     <string name="autotune_run_with_autoswitch">Autotune je pokrenut i profil se automatski promijenio</string>
     <string name="autotune_run_with_error">Pogreška tijekom zadnjeg pokretanja automatskog podešavanja</string>
     <string name="autotune_run_cancelled">Otkriveno je još jedno pokretanje Autotunea, pokretanje je otkazano</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-hu-rHU/strings.xml b/plugins/automation/src/main/res/values-hu-rHU/strings.xml
index 12b0155c73e..1a1f344b089 100644
--- a/plugins/automation/src/main/res/values-hu-rHU/strings.xml
+++ b/plugins/automation/src/main/res/values-hu-rHU/strings.xml
@@ -23,4 +23,5 @@
     <string name="count_selected">%1$d kiválasztva</string>
     <!--    Reminders-->
     <!--    Autotune-->
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-it-rIT/strings.xml b/plugins/automation/src/main/res/values-it-rIT/strings.xml
index 9edc185f616..8df1f957645 100644
--- a/plugins/automation/src/main/res/values-it-rIT/strings.xml
+++ b/plugins/automation/src/main/res/values-it-rIT/strings.xml
@@ -137,4 +137,8 @@
     <string name="autotune_run_with_autoswitch">Autotune eseguito e profilo cambiato automaticamente</string>
     <string name="autotune_run_with_error">Errore durante l\'ultima esecuzione di Autotune</string>
     <string name="autotune_run_cancelled">È stata rilevata un\'altra esecuzione di Autotune, esecuzione annullata</string>
+    <!--    Steps count-->
+    <string name="triggerStepsCountLabel">Conteggio Passi</string>
+    <string name="triggerStepsCountDesc">Conteggio passi per %1$s minuti %2$s %3$.0f</string>
+    <string name="triggerStepsCountDropdownLabel">Durata Della Misurazione</string>
 </resources>
diff --git a/plugins/automation/src/main/res/values-iw-rIL/strings.xml b/plugins/automation/src/main/res/values-iw-rIL/strings.xml
index f9ccce82097..8a62601be64 100644
--- a/plugins/automation/src/main/res/values-iw-rIL/strings.xml
+++ b/plugins/automation/src/main/res/values-iw-rIL/strings.xml
@@ -121,4 +121,5 @@
     <string name="autotune_run_with_autoswitch">כוונון אוטומטי הופעל והפרופיל הוחלף אוטומטית</string>
     <string name="autotune_run_with_error">שגיאה במהלך הכיוונון האוטומטי האחרון</string>
     <string name="autotune_run_cancelled">נמצאה הפעלה נוספת של הכוונון האוטומטי ברקע, ההפעלה בוטלה</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-ko-rKR/strings.xml b/plugins/automation/src/main/res/values-ko-rKR/strings.xml
index 9b0adf2c734..3b8da2a28eb 100644
--- a/plugins/automation/src/main/res/values-ko-rKR/strings.xml
+++ b/plugins/automation/src/main/res/values-ko-rKR/strings.xml
@@ -120,4 +120,5 @@
     <string name="autotune_run_with_autoswitch">Autotune 및 프로파일 자동 전환이 실행되었습니다</string>
     <string name="autotune_run_with_error">마지막 Autotune 실행시 오류가 발생했습니다</string>
     <string name="autotune_run_cancelled">Autotune의 또 다른 실행이 감지되었습니다, 실행이 취소되었습니다</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-lt-rLT/strings.xml b/plugins/automation/src/main/res/values-lt-rLT/strings.xml
index af6df8cdf37..a098b449a22 100644
--- a/plugins/automation/src/main/res/values-lt-rLT/strings.xml
+++ b/plugins/automation/src/main/res/values-lt-rLT/strings.xml
@@ -137,4 +137,5 @@
     <string name="autotune_run_with_autoswitch">Autotune veikė ir profilis automatiškai pakeistas</string>
     <string name="autotune_run_with_error">Paskutinio Autotune klaida</string>
     <string name="autotune_run_cancelled">Nustatytas kitas Autotune veikimas, jis atšauktas</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-nb-rNO/strings.xml b/plugins/automation/src/main/res/values-nb-rNO/strings.xml
index 2112c7b0811..d222e32ece4 100644
--- a/plugins/automation/src/main/res/values-nb-rNO/strings.xml
+++ b/plugins/automation/src/main/res/values-nb-rNO/strings.xml
@@ -137,4 +137,8 @@
     <string name="autotune_run_with_autoswitch">Autotune utført og profil ble automatisk skiftet ut</string>
     <string name="autotune_run_with_error">Feil oppdaget under siste Autotune kjøring</string>
     <string name="autotune_run_cancelled">Autotune kjører allerede. Kjøring avbrutt</string>
+    <!--    Steps count-->
+    <string name="triggerStepsCountLabel">Antall skritt</string>
+    <string name="triggerStepsCountDesc">Antall skritt per %1$s minutter %2$s %3$.0f</string>
+    <string name="triggerStepsCountDropdownLabel">Varighet for måling</string>
 </resources>
diff --git a/plugins/automation/src/main/res/values-nl-rNL/strings.xml b/plugins/automation/src/main/res/values-nl-rNL/strings.xml
index f1bb6d44f03..9d474693c67 100644
--- a/plugins/automation/src/main/res/values-nl-rNL/strings.xml
+++ b/plugins/automation/src/main/res/values-nl-rNL/strings.xml
@@ -137,4 +137,6 @@
     <string name="autotune_run_with_autoswitch">Autotune uitgevoerd en profiel automatisch gewisseld</string>
     <string name="autotune_run_with_error">Fout tijdens laatste Autotune uitvoeren</string>
     <string name="autotune_run_cancelled">Een ander Autotune proces loopt nog, de uitvoering is geannuleerd</string>
+    <!--    Steps count-->
+    <string name="triggerStepsCountDesc">Aantal stappen per %1$s minuten %2$s %3$.0f</string>
 </resources>
diff --git a/plugins/automation/src/main/res/values-pl-rPL/strings.xml b/plugins/automation/src/main/res/values-pl-rPL/strings.xml
index a7b4a77d353..437e835a74f 100644
--- a/plugins/automation/src/main/res/values-pl-rPL/strings.xml
+++ b/plugins/automation/src/main/res/values-pl-rPL/strings.xml
@@ -137,4 +137,5 @@
     <string name="autotune_run_with_autoswitch">W wyniku uruchomienia Autotune profil został automatycznie przełączony</string>
     <string name="autotune_run_with_error">Błąd podczas ostatniego uruchomienia Autotune</string>
     <string name="autotune_run_cancelled">Wykryto Autotune w toku, anulowano próbę kolejnego uruchomienia</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-pt-rBR/strings.xml b/plugins/automation/src/main/res/values-pt-rBR/strings.xml
index 972f13015fc..5d1e1229f61 100644
--- a/plugins/automation/src/main/res/values-pt-rBR/strings.xml
+++ b/plugins/automation/src/main/res/values-pt-rBR/strings.xml
@@ -120,4 +120,5 @@
     <string name="autotune_run_with_autoswitch">Autotune executado e perfil alterado automaticamente</string>
     <string name="autotune_run_with_error">Erro durante a última execução do Autotune</string>
     <string name="autotune_run_cancelled">Outra execução de Autotune foi detectada, execução cancelada</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-pt-rPT/strings.xml b/plugins/automation/src/main/res/values-pt-rPT/strings.xml
index 26cc745e824..b9ee2a9f318 100644
--- a/plugins/automation/src/main/res/values-pt-rPT/strings.xml
+++ b/plugins/automation/src/main/res/values-pt-rPT/strings.xml
@@ -115,4 +115,5 @@
     <string name="time_to_bolus">Hora de fazer o bólus!\nExecute o assistente de bólus e faça o cálculo novamente.</string>
     <string name="error_setting_reminder">Erro ao configurar alarme futuro</string>
     <!--    Autotune-->
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-ro-rRO/strings.xml b/plugins/automation/src/main/res/values-ro-rRO/strings.xml
index 7eb5e427610..d2812bd835e 100644
--- a/plugins/automation/src/main/res/values-ro-rRO/strings.xml
+++ b/plugins/automation/src/main/res/values-ro-rRO/strings.xml
@@ -120,4 +120,5 @@
     <string name="autotune_run_with_autoswitch">Autotune a rulat și profilul a fost automat schimbat</string>
     <string name="autotune_run_with_error">Eroare în timpul ultimei rulări Autotune</string>
     <string name="autotune_run_cancelled">O altă rulare Autotune este detectată, rularea este anulată</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-ru-rRU/strings.xml b/plugins/automation/src/main/res/values-ru-rRU/strings.xml
index 2fff07c2d38..77a9f01f350 100644
--- a/plugins/automation/src/main/res/values-ru-rRU/strings.xml
+++ b/plugins/automation/src/main/res/values-ru-rRU/strings.xml
@@ -137,4 +137,5 @@
     <string name="autotune_run_with_autoswitch">Autotune выполнен и профиль переключён автоматически</string>
     <string name="autotune_run_with_error">Ошибка во время последнего выполнения Autotune</string>
     <string name="autotune_run_cancelled">Обнаружен другой запуск Autotune, выполнение отменено</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-sk-rSK/strings.xml b/plugins/automation/src/main/res/values-sk-rSK/strings.xml
index eaa934cb038..53ef796a167 100644
--- a/plugins/automation/src/main/res/values-sk-rSK/strings.xml
+++ b/plugins/automation/src/main/res/values-sk-rSK/strings.xml
@@ -137,4 +137,8 @@
     <string name="autotune_run_with_autoswitch">Autotune spustený a profil automaticky prepnutý</string>
     <string name="autotune_run_with_error">Chyba pri poslednom spustení Autotune</string>
     <string name="autotune_run_cancelled">Bola zistená iná spustená úloha Autotune, spustenie zrušené</string>
+    <!--    Steps count-->
+    <string name="triggerStepsCountLabel">Počet krokov</string>
+    <string name="triggerStepsCountDesc">Počet krokov za %1$s minút %2$s %3$.0f</string>
+    <string name="triggerStepsCountDropdownLabel">Trvanie merania</string>
 </resources>
diff --git a/plugins/automation/src/main/res/values-sr-rCS/strings.xml b/plugins/automation/src/main/res/values-sr-rCS/strings.xml
index 77fc473ba74..70e5fb24b0b 100644
--- a/plugins/automation/src/main/res/values-sr-rCS/strings.xml
+++ b/plugins/automation/src/main/res/values-sr-rCS/strings.xml
@@ -5,4 +5,5 @@
     <string name="count_selected">%1$d izabrano</string>
     <!--    Reminders-->
     <!--    Autotune-->
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-sv-rSE/strings.xml b/plugins/automation/src/main/res/values-sv-rSE/strings.xml
index 8dba0d477b9..179a81b2d46 100644
--- a/plugins/automation/src/main/res/values-sv-rSE/strings.xml
+++ b/plugins/automation/src/main/res/values-sv-rSE/strings.xml
@@ -120,4 +120,5 @@
     <string name="autotune_run_with_autoswitch">Autotune körde och profilen byttes automatiskt</string>
     <string name="autotune_run_with_error">Fel under senaste körning av Autotune</string>
     <string name="autotune_run_cancelled">En annan Autotune-körning upptäcktes, körning avbruten</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-tr-rTR/strings.xml b/plugins/automation/src/main/res/values-tr-rTR/strings.xml
index 49911aa2ac7..4f24581a7e9 100644
--- a/plugins/automation/src/main/res/values-tr-rTR/strings.xml
+++ b/plugins/automation/src/main/res/values-tr-rTR/strings.xml
@@ -137,4 +137,5 @@
     <string name="autotune_run_with_autoswitch">OtoAyar çalıştı 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>
     <string name="autotune_run_cancelled">Başka bir OtoAyar çalıştırması tespit edildi, çalıştırma iptal edildi</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-uk-rUA/strings.xml b/plugins/automation/src/main/res/values-uk-rUA/strings.xml
index 8925bfc3c2f..33ed7c19882 100644
--- a/plugins/automation/src/main/res/values-uk-rUA/strings.xml
+++ b/plugins/automation/src/main/res/values-uk-rUA/strings.xml
@@ -11,4 +11,5 @@
     <string name="autotune_run_with_autoswitch">Autotune запущений і профіль автоматично перемикається</string>
     <string name="autotune_run_with_error">Помилка при останньому запуску Autotune</string>
     <string name="autotune_run_cancelled">Виявлено ще один запуск Autotune, запуск скасовано</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-zh-rCN/strings.xml b/plugins/automation/src/main/res/values-zh-rCN/strings.xml
index 38daa1af40d..f41e6bb5f4f 100644
--- a/plugins/automation/src/main/res/values-zh-rCN/strings.xml
+++ b/plugins/automation/src/main/res/values-zh-rCN/strings.xml
@@ -114,4 +114,5 @@
     <string name="autotune_run_with_autoswitch">运行 Autotune 并自动切换配置文件</string>
     <string name="autotune_run_with_error">上次 Autotune 运行期间出错</string>
     <string name="autotune_run_cancelled">检测到另一次自动调试运行，本次运行已取消</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values-zh-rTW/strings.xml b/plugins/automation/src/main/res/values-zh-rTW/strings.xml
index 47367b158b5..e491d9e884d 100644
--- a/plugins/automation/src/main/res/values-zh-rTW/strings.xml
+++ b/plugins/automation/src/main/res/values-zh-rTW/strings.xml
@@ -137,4 +137,5 @@
     <string name="autotune_run_with_autoswitch">自動調整運行並自動切換檔案</string>
     <string name="autotune_run_with_error">上次自動調整運行時出錯</string>
     <string name="autotune_run_cancelled">偵測到另一個自動調整運行，運行已取消</string>
+    <!--    Steps count-->
 </resources>
diff --git a/plugins/automation/src/main/res/values/strings.xml b/plugins/automation/src/main/res/values/strings.xml
index df3f1681020..33786f8fe4f 100644
--- a/plugins/automation/src/main/res/values/strings.xml
+++ b/plugins/automation/src/main/res/values/strings.xml
@@ -140,4 +140,10 @@
     <string name="autotune_run_with_error">Error during last Autotune run</string>
     <string name="autotune_run_cancelled">Another run of Autotune is detected, run cancelled</string>
 
+
+    <!--    Steps count-->
+    <string name="triggerStepsCountLabel">Steps Count</string>
+    <string name="triggerStepsCountDesc">Steps count per %1$s minutes %2$s %3$.0f</string>
+    <string name="triggerStepsCountDropdownLabel">Measurement Duration</string>
+
 </resources>
\ No newline at end of file
diff --git a/plugins/configuration/src/main/res/values-sk-rSK/strings.xml b/plugins/configuration/src/main/res/values-sk-rSK/strings.xml
index 1ee19c71905..03ca701a867 100644
--- a/plugins/configuration/src/main/res/values-sk-rSK/strings.xml
+++ b/plugins/configuration/src/main/res/values-sk-rSK/strings.xml
@@ -81,6 +81,8 @@
     <string name="allow_hardware_pump_text">POZOR: Pokiaľ aktivujete a pripojíte skutočnú pumpu, AndroidAPS nakopíruje nastavenie bazálu z aktívneho profilu do pumpy. Overte si, že máte v AAPS korektný bazálny profil. Pokiaľ si nieste istí, alebo nechcete prepísať bazály v pumpe, stlačte Zrušiť a opakujte prepnutie na inú pumpu neskôr.</string>
     <string name="a11y_open_settings">otvoriť nastavenia</string>
     <string name="nsclient_version_does_not_match">Verzia NSClienta nesúhlasí z verziou AndroidAPS. Prosím aktualizujte si ju.</string>
+    <string name="expand_category">Rozbaliť kategóriu</string>
+    <string name="collapse_category">Zbaliť kategóriu</string>
     <!--ImportExport-->
     <string name="nav_preferences">Nastavenia</string>
     <string name="password_preferences_encrypt_prompt">Budete vyzvaný na zadanie hlavného hesla, ktoré bude použité na dešifrovanie exportovaných nastavení.</string>
diff --git a/plugins/main/src/main/res/values-cs-rCZ/strings.xml b/plugins/main/src/main/res/values-cs-rCZ/strings.xml
index 7fcef00275f..a06fb3da0c8 100644
--- a/plugins/main/src/main/res/values-cs-rCZ/strings.xml
+++ b/plugins/main/src/main/res/values-cs-rCZ/strings.xml
@@ -153,8 +153,8 @@
     <string name="dia_short">DIA</string>
     <string name="target_short">CÍL</string>
     <string name="basal_short">BAZ</string>
-    <string name="isf_dynamic_label">Váš algoritmus může poskytnout dynamický výpočet ISF. Níže uvedené hodnoty jsou použity pouze jako záložní v případě chybějících údajů</string>
-    <string name="ic_dynamic_label">Váš algoritmus může poskytnout dynamický výpočet IC. Níže uvedené hodnoty jsou použity pouze jako záložní v případě chybějících dat</string>
+    <string name="isf_dynamic_label_warning">Váš algoritmus dokáže poskytovat dynamický výpočet ISF. Níže uvedené hodnoty mohou být použity pouze jako záložní v případě chybějících údajů nebo jako referenční</string>
+    <string name="ic_dynamic_label_warning">Váš algoritmus dokáže poskytovat dynamický výpočet IC. Níže uvedené hodnoty mohou být použity pouze jako záložní v případě chybějících údajů nebo jako referenční</string>
     <!-- Actions -->
     <string name="actions">Akce</string>
     <string name="description_actions">Tlačítka k běžně používaným úkonům</string>
diff --git a/plugins/main/src/main/res/values-es-rES/strings.xml b/plugins/main/src/main/res/values-es-rES/strings.xml
index 194a403e16f..bfb06b7a40a 100644
--- a/plugins/main/src/main/res/values-es-rES/strings.xml
+++ b/plugins/main/src/main/res/values-es-rES/strings.xml
@@ -153,8 +153,8 @@
     <string name="dia_short">DIA</string>
     <string name="target_short">OBJ</string>
     <string name="basal_short">BAS</string>
-    <string name="isf_dynamic_label">El algoritmo puede proporcionar cálculos dinámicos de ISF. Los valores se utilizan sólo como un recurso en caso de falta de datos</string>
-    <string name="ic_dynamic_label">El algoritmo puede proporcionar cálculos dinámicos de IC. Los valores se utilizan sólo como un recurso en caso de falta de datos</string>
+    <string name="isf_dynamic_label_warning">El algoritmo puede proporcionar un cálculo dinámico del ISF. Los valores mostrados se pueden utilizar sólo como alternativa en caso de que falten datos o como valor de referencia</string>
+    <string name="ic_dynamic_label_warning">Su algoritmo puede proporcionar un cálculo dinámico de IC. Los valores mostrados se pueden utilizar sólo como alternativa en caso de que falten datos o como valor de referencia</string>
     <!-- Actions -->
     <string name="actions">Acciones</string>
     <string name="description_actions">Algunos botones para acceder rápidamente a funciones comunes</string>
diff --git a/plugins/main/src/main/res/values-fr-rFR/strings.xml b/plugins/main/src/main/res/values-fr-rFR/strings.xml
index 127b020ff01..12947fd2bad 100644
--- a/plugins/main/src/main/res/values-fr-rFR/strings.xml
+++ b/plugins/main/src/main/res/values-fr-rFR/strings.xml
@@ -153,8 +153,8 @@
     <string name="dia_short">DAI</string>
     <string name="target_short">CIBLE</string>
     <string name="basal_short">BAS</string>
-    <string name="isf_dynamic_label">Votre algorithme peut fournir le calcul dynamique de la SI. Les valeurs ci-dessous ne sont utilisées que comme solution de secours en cas de données manquantes</string>
-    <string name="ic_dynamic_label">Votre algorithme peut fournir le calcul dynamique de la G/I. Les valeurs ci-dessous ne sont utilisées que comme solution de secours en cas de données manquantes</string>
+    <string name="isf_dynamic_label_warning">Votre algorithme peut fournir le calcul dynamique de la SI. Les valeurs ci-dessous sont utilisées comme solution de secours en cas de données manquantes ou comme valeur de référence pour le calcul de la SI</string>
+    <string name="ic_dynamic_label_warning">Votre algorithme peut fournir le calcul dynamique de la G/I. Les valeurs ci-dessous sont utilisées comme solution de secours en cas de données manquantes ou comme valeur de référence pour le calcul de la G/I</string>
     <!-- Actions -->
     <string name="actions">Actions</string>
     <string name="description_actions">Quelques boutons pour accéder rapidement aux fonctions communes</string>
diff --git a/plugins/main/src/main/res/values-it-rIT/strings.xml b/plugins/main/src/main/res/values-it-rIT/strings.xml
index 8a3796e9288..cfb59c03fc0 100644
--- a/plugins/main/src/main/res/values-it-rIT/strings.xml
+++ b/plugins/main/src/main/res/values-it-rIT/strings.xml
@@ -153,8 +153,8 @@
     <string name="dia_short">DIA</string>
     <string name="target_short">TARG</string>
     <string name="basal_short">BAS</string>
-    <string name="isf_dynamic_label">Il tuo algoritmo può fornire il calcolo dinamico di ISF. I valori sottostanti sono utilizzati solo come fallback in caso di dati mancanti</string>
-    <string name="ic_dynamic_label">Il tuo algoritmo può fornire il calcolo dinamico di ISF. I valori sottostanti sono utilizzati solo come fallback in caso di dati mancanti</string>
+    <string name="isf_dynamic_label_warning">Il tuo algoritmo può fornire il calcolo dinamico dell\'ISF. I valori sottostanti sono utilizzati solo come fallback in caso di dati mancanti</string>
+    <string name="ic_dynamic_label_warning">Il tuo algoritmo può fornire il calcolo dinamico dell\'IC. I valori sottostanti sono utilizzati solo come fallback in caso di dati mancanti</string>
     <!-- Actions -->
     <string name="actions">Azioni</string>
     <string name="description_actions">Alcuni tasti per accedere rapidamente alle funzioni comuni</string>
diff --git a/plugins/main/src/main/res/values-iw-rIL/strings.xml b/plugins/main/src/main/res/values-iw-rIL/strings.xml
index 2c4194f7ca9..9d274cc8652 100644
--- a/plugins/main/src/main/res/values-iw-rIL/strings.xml
+++ b/plugins/main/src/main/res/values-iw-rIL/strings.xml
@@ -153,8 +153,6 @@
     <string name="dia_short">DIA</string>
     <string name="target_short">ע\' מטרה</string>
     <string name="basal_short">בזאלי</string>
-    <string name="isf_dynamic_label">האלגוריתם שלכם יכול לספק חישוב דינמי של רגישות לאינסולין. הערכים הבאים יהיו בשימוש רק במקרה של מחסור במידע</string>
-    <string name="ic_dynamic_label">האלגוריתם שלכם יכול לספק חישוב דינמי של יחס פחמימות לאינסולין. הערכים הבאים יהיו בשימוש רק במקרה של מחסור במידע</string>
     <!-- Actions -->
     <string name="actions">פעולות</string>
     <string name="description_actions">לחצנים לגישה מהירה לפונקציות שימושיות</string>
diff --git a/plugins/main/src/main/res/values-lt-rLT/strings.xml b/plugins/main/src/main/res/values-lt-rLT/strings.xml
index 99a7ae8fa6c..c2fc68fc634 100644
--- a/plugins/main/src/main/res/values-lt-rLT/strings.xml
+++ b/plugins/main/src/main/res/values-lt-rLT/strings.xml
@@ -153,8 +153,6 @@
     <string name="dia_short">IVT</string>
     <string name="target_short">TIKSLAS</string>
     <string name="basal_short">VB</string>
-    <string name="isf_dynamic_label">Jūsų algoritmas gali dinamiškai apskaičiuoti JIF reikšmę. Pateiktos reikšmės naudojamos tik kaip atsarginis variantas, jei trūksta duomenų</string>
-    <string name="ic_dynamic_label">Jūsų algoritmas gali dinamiškai apskaičiuoti angliavandenių santykį. Pateiktos reikšmės naudojamos tik kaip atsarginis variantas, jei trūksta duomenų</string>
     <!-- Actions -->
     <string name="actions">Veiksmai</string>
     <string name="description_actions">Mygtukai greitesniam pagrindinių funkcijų paleidimui</string>
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 9ce950de12a..1e829ee2892 100644
--- a/plugins/main/src/main/res/values-nb-rNO/strings.xml
+++ b/plugins/main/src/main/res/values-nb-rNO/strings.xml
@@ -153,8 +153,8 @@
     <string name="dia_short">DIA</string>
     <string name="target_short">MÅL</string>
     <string name="basal_short">BAS</string>
-    <string name="isf_dynamic_label">Algoritmen din kan gi dynamisk beregning av ISF. Verdiene nedenfor brukes bare som en reserveløsning i tilfelle av manglende data</string>
-    <string name="ic_dynamic_label">Algoritmen din kan gi dynamisk beregning av IK. Verdiene nedenfor brukes bare som en reserveløsning i tilfelle av manglende data</string>
+    <string name="isf_dynamic_label_warning">Algoritmen din kan gi dynamisk beregning av ISF. Verdiene nedenfor brukes bare som en reserveløsning i tilfelle av manglende data eller bare som en referanseverdi</string>
+    <string name="ic_dynamic_label_warning">Algoritmen din kan gi dynamisk beregning av IK. Verdiene nedenfor brukes bare som en reserveløsning i tilfelle av manglende data eller bare som en referanseverdi</string>
     <!-- Actions -->
     <string name="actions">Handlinger</string>
     <string name="description_actions">Hurtigknapper for rask tilgang til ofte brukte funksjoner</string>
@@ -276,8 +276,8 @@
     <string name="overview_show_cob">Aktive KH (COB)</string>
     <string name="overview_show_iob">Aktivt insulin (IOB)</string>
     <string name="overview_show_basals">Basaler</string>
-    <string name="overview_show_abs_insulin">Absolutt insulinmengde</string>
-    <string name="overview_show_variable_sens">Variabel sensitivitet</string>
+    <string name="overview_show_abs_insulin">Absolutt insulin</string>
+    <string name="overview_show_variable_sens">Dynamisk ISF</string>
     <string name="prediction_shortname">PRED</string>
     <string name="basal_shortname">BAS</string>
     <string name="deviation_shortname">AVVIK</string>
@@ -288,7 +288,7 @@
     <string name="treatments_shortname">BEH</string>
     <string name="heartRate_shortname">PULS</string>
     <string name="sensitivity_shortname">SENS%</string>
-    <string name="variable_sensitivity_shortname">VSENS</string>
+    <string name="variable_sensitivity_shortname">DISF</string>
     <string name="graph_scale">Graf-skala</string>
     <string name="graph_menu_divider_header">Graf</string>
     <string name="temp_basal_overview_short_name">M:</string>
diff --git a/plugins/main/src/main/res/values-nl-rNL/strings.xml b/plugins/main/src/main/res/values-nl-rNL/strings.xml
index f772169fc6d..7f59f33d301 100644
--- a/plugins/main/src/main/res/values-nl-rNL/strings.xml
+++ b/plugins/main/src/main/res/values-nl-rNL/strings.xml
@@ -153,8 +153,6 @@
     <string name="dia_short">DIA</string>
     <string name="target_short">DOEL</string>
     <string name="basal_short">BAS</string>
-    <string name="isf_dynamic_label">Uw algoritme kan een dynamische berekening van ISF bieden. De waarden hieronder worden alleen gebruikt om op terug te vallen in geval van ontbrekende gegevens</string>
-    <string name="ic_dynamic_label">Uw algoritme kan een dynamische berekening van IC bieden. De waarden hieronder worden alleen gebruikt om op terug te vallen in geval van ontbrekende gegevens</string>
     <!-- Actions -->
     <string name="actions">Acties</string>
     <string name="description_actions">Een aantal knoppen voor snelle toegang tot algemene functies</string>
diff --git a/plugins/main/src/main/res/values-pl-rPL/strings.xml b/plugins/main/src/main/res/values-pl-rPL/strings.xml
index 072de92c676..61a51daf6d4 100644
--- a/plugins/main/src/main/res/values-pl-rPL/strings.xml
+++ b/plugins/main/src/main/res/values-pl-rPL/strings.xml
@@ -153,8 +153,6 @@
     <string name="dia_short">DIA</string>
     <string name="target_short">CEL</string>
     <string name="basal_short">BAS</string>
-    <string name="isf_dynamic_label">Twój algorytm może dostarczyć dynamiczne obliczenia ISF. Wartości poniżej są używane tylko awaryjnie w przypadku braku danych</string>
-    <string name="ic_dynamic_label">Twój algorytm może dostarczyć dynamiczne obliczenia IC. Wartości poniżej są używane tylko awaryjnie w przypadku braku danych</string>
     <!-- Actions -->
     <string name="actions">Akcje</string>
     <string name="description_actions">Niektóre przyciski umożliwiające szybki dostęp do typowych funkcji</string>
diff --git a/plugins/main/src/main/res/values-ru-rRU/strings.xml b/plugins/main/src/main/res/values-ru-rRU/strings.xml
index 5fbfc4b80d1..106ecb8a921 100644
--- a/plugins/main/src/main/res/values-ru-rRU/strings.xml
+++ b/plugins/main/src/main/res/values-ru-rRU/strings.xml
@@ -153,8 +153,6 @@
     <string name="dia_short">Время действия инсулина DIA</string>
     <string name="target_short">ЦЕЛЬ</string>
     <string name="basal_short">БАЗАЛ</string>
-    <string name="isf_dynamic_label">Алгоритм обеспечивает динамический расчет чувствительности к инсулину ISF. Значения ниже используются только в качестве запасного варианта при отсутствии данных</string>
-    <string name="ic_dynamic_label">Алгоритм обеспечивает динамический расчет углеводного коэффициента IC. Значения ниже используются только в качестве запасного варианта при отсутствии данных</string>
     <!-- Actions -->
     <string name="actions">Действия</string>
     <string name="description_actions">Кнопки быстрого доступа к некоторым распространенным настройкам</string>
diff --git a/plugins/main/src/main/res/values-sk-rSK/strings.xml b/plugins/main/src/main/res/values-sk-rSK/strings.xml
index c33e81e0614..6b3874481ff 100644
--- a/plugins/main/src/main/res/values-sk-rSK/strings.xml
+++ b/plugins/main/src/main/res/values-sk-rSK/strings.xml
@@ -153,8 +153,8 @@
     <string name="dia_short">DIA</string>
     <string name="target_short">CIEĽ</string>
     <string name="basal_short">BAZ</string>
-    <string name="isf_dynamic_label">Váš algoritmus môže poskytnúť dynamický výpočet ISF. Nižšie uvedené hodnoty sú použité iba ako záložné v prípade chýbajúcich údajov</string>
-    <string name="ic_dynamic_label">Váš algoritmus môže poskytnúť dynamický výpočet ISF. Nižšie uvedené hodnoty sú použité iba ako záložné v prípade chýbajúcich údajov</string>
+    <string name="isf_dynamic_label_warning">Váš algoritmus môže poskytnúť dynamický výpočet ISF. Nižšie uvedené hodnoty sú použité iba ako záložné v prípade chýbajúcich údajov, alebo iba ako referenčné hodnoty</string>
+    <string name="ic_dynamic_label_warning">Váš algoritmus môže poskytnúť dynamický výpočet ISF. Nižšie uvedené hodnoty sú použité iba ako záložné v prípade chýbajúcich údajov, alebo iba ako referenčné hodnoty</string>
     <!-- Actions -->
     <string name="actions">Akcie</string>
     <string name="description_actions">Niektoré tlačidlá na rýchly prístup do spoločných funkcií</string>
diff --git a/plugins/main/src/main/res/values-tr-rTR/strings.xml b/plugins/main/src/main/res/values-tr-rTR/strings.xml
index f7f7d20a868..ce3353746d4 100644
--- a/plugins/main/src/main/res/values-tr-rTR/strings.xml
+++ b/plugins/main/src/main/res/values-tr-rTR/strings.xml
@@ -153,8 +153,6 @@
     <string name="dia_short">İES</string>
     <string name="target_short">HDF</string>
     <string name="basal_short">BAZ</string>
-    <string name="isf_dynamic_label">Algoritmanız İDF\'nin dinamik hesaplamasını sağlayabilir. Aşağıdaki değerler yalnızca eksik veri olması durumunda geri dönüş olarak kullanılır</string>
-    <string name="ic_dynamic_label">Algoritmanız Kİ\'nin dinamik hesaplamasını sağlayabilir. Aşağıdaki değerler yalnızca eksik veri olması durumunda geri dönüş olarak kullanılır</string>
     <!-- Actions -->
     <string name="actions">Eylemler</string>
     <string name="description_actions">Ortak özelliklere hızlıca erişmek için bazı düğmeler</string>
diff --git a/plugins/main/src/main/res/values-zh-rTW/strings.xml b/plugins/main/src/main/res/values-zh-rTW/strings.xml
index 8c09bc7bb80..3824484bc7a 100644
--- a/plugins/main/src/main/res/values-zh-rTW/strings.xml
+++ b/plugins/main/src/main/res/values-zh-rTW/strings.xml
@@ -153,8 +153,6 @@
     <string name="dia_short">DIA</string>
     <string name="target_short">目標</string>
     <string name="basal_short">基礎速率</string>
-    <string name="isf_dynamic_label">你已啟用動態計算 ISF，以下數值僅在資料遺失時作為備用。</string>
-    <string name="ic_dynamic_label">你已啟用動態計算 IC，以下數值僅在資料遺失時作為備用。</string>
     <!-- Actions -->
     <string name="actions">手動操作</string>
     <string name="description_actions">一些快速查看常用功能的按鈕</string>
diff --git a/plugins/main/src/main/res/values/strings.xml b/plugins/main/src/main/res/values/strings.xml
index d1d78301e54..5ae39ca2fd7 100644
--- a/plugins/main/src/main/res/values/strings.xml
+++ b/plugins/main/src/main/res/values/strings.xml
@@ -163,8 +163,8 @@
     <string name="dia_short">DIA</string>
     <string name="target_short">TARG</string>
     <string name="basal_short">BAS</string>
-    <string name="isf_dynamic_label">Your algorithm can provide dynamic calculation of ISF. Values below are used only as a fallback in case of missing data</string>
-    <string name="ic_dynamic_label">Your algorithm can provide dynamic calculation of IC. Values below are used only as a fallback in case of missing data</string>
+    <string name="isf_dynamic_label_warning">Your algorithm can provide dynamic calculation of ISF. Values below can be used only as a fallback in case of missing data or as a reference value only</string>
+    <string name="ic_dynamic_label_warning">Your algorithm can provide dynamic calculation of IC. Values below cen be used only as a fallback in case of missing data or as a reference value only</string>
 
     <!-- Actions -->
     <string name="actions">Actions</string>
diff --git a/plugins/sensitivity/src/main/res/values-nb-rNO/strings.xml b/plugins/sensitivity/src/main/res/values-nb-rNO/strings.xml
index 0d1a525bf3b..47a8a9efc9f 100644
--- a/plugins/sensitivity/src/main/res/values-nb-rNO/strings.xml
+++ b/plugins/sensitivity/src/main/res/values-nb-rNO/strings.xml
@@ -17,7 +17,7 @@
     <string name="openapsama_autosens_min_summary">Standardverdi: 0.7\nDette er en multiplikatorbegrensning for autosens-sikkerhet. Den begrenser autosens til å redusere basalverdier, og øke isulinssensitivitet (ISF) og BS mål med ikke mer enn enn 30%.</string>
     <string name="openapsama_autosens_max">Maks autosens ratio</string>
     <string name="openapsama_autosens_min">Minimum autosens ratio</string>
-    <string name="openapsama_min_5m_carb_impact_summary">Standardverdi er: 3.0 (AMA) eller 8.0 (SMB). Dette er grunninnstillingen for KH-opptak per 5 minutt. Den påvirker hvor raskt COB skal reduseres, og benyttes i beregning av fremtidig BS-kurve når BS enten synker eller øker mer enn forventet. Standardverdi er 3mg/dl/5 min.</string>
+    <string name="openapsama_min_5m_carb_impact_summary">Standardverdi: 3.0 (AMA) eller 8.0 (SMB). Dette er en innstilling for standard karboabsorpsjonsvirkning per 5 minutter. Standard forventet er 3mg/dl/5min. Dette påvirker hvor raskt COB avtar, og hvor mye karboabsorpsjon antas ved beregning av fremtidig forventet BS, når BS faller mer enn forventet, eller når det ikke stiger så mye som forventet.</string>
     <string name="absorption_cutoff_title">Maks absorpsjonstid for måltid [t]</string>
     <string name="absorption_cutoff_summary">Etter denne tiden forventes det at måltidet er absorbert. Eventuelle gjenværende karbo vil tas ut av beregninger.</string>
 </resources>
diff --git a/pump/combov2/src/main/res/values-nb-rNO/strings.xml b/pump/combov2/src/main/res/values-nb-rNO/strings.xml
index b246ec706d9..561d42f3f73 100644
--- a/pump/combov2/src/main/res/values-nb-rNO/strings.xml
+++ b/pump/combov2/src/main/res/values-nb-rNO/strings.xml
@@ -107,7 +107,7 @@ knappene samtidig for å avbryte parringen)\n
     <string name="combov2_short_status_last_connection">Siste tilkobling: %1$d min siden</string>
     <string name="combov2_short_status_alert">Varsel: %s</string>
     <string name="combov2_short_status_last_bolus">LastBolus: %1$s E @ %2$s</string>
-    <string name="combov2_short_status_temp_basal">Temp: %s</string>
+    <string name="combov2_short_status_temp_basal">Midl. basal: %s</string>
     <string name="combov2_short_status_reservoir">Reservoar: %d E</string>
     <string name="combov2_short_status_battery_state_empty">tom</string>
     <string name="combov2_short_status_battery_state_low">lavt</string>
diff --git a/pump/omnipod-common/src/main/res/values-bg-rBG/strings.xml b/pump/omnipod-common/src/main/res/values-bg-rBG/strings.xml
index 3bc998dd83a..f3d7060bd6e 100644
--- a/pump/omnipod-common/src/main/res/values-bg-rBG/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-bg-rBG/strings.xml
@@ -158,7 +158,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Няма активен под</string>
     <string name="omnipod_common_short_status_last_connection">Последно свързване: преди %1$d минути</string>
-    <string name="omnipod_common_short_status_last_bolus">Болус: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Врем базал: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Удължен: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Рез.: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-ca-rES/strings.xml b/pump/omnipod-common/src/main/res/values-ca-rES/strings.xml
index 73a53bfce61..bf2d0341554 100644
--- a/pump/omnipod-common/src/main/res/values-ca-rES/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-ca-rES/strings.xml
@@ -156,7 +156,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Cap pod actiu</string>
     <string name="omnipod_common_short_status_last_connection">Darrera connexió: fa %1$d min</string>
-    <string name="omnipod_common_short_status_last_bolus">Darrer bolus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Temp: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Estès: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Reservori.: %1$s U</string>
diff --git a/pump/omnipod-common/src/main/res/values-cs-rCZ/strings.xml b/pump/omnipod-common/src/main/res/values-cs-rCZ/strings.xml
index 04db381f821..b73d08f93d6 100644
--- a/pump/omnipod-common/src/main/res/values-cs-rCZ/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-cs-rCZ/strings.xml
@@ -164,7 +164,7 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Žádný aktivní Pod</string>
     <string name="omnipod_common_short_status_last_connection">Poslední spoj: před %1$d min</string>
-    <string name="omnipod_common_short_status_last_bolus">Poslední bolus: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_last_bolus">Poslední bolus: %1$sU @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Doč. bazál: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Prodl. bolus: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Zásobník: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-da-rDK/strings.xml b/pump/omnipod-common/src/main/res/values-da-rDK/strings.xml
index 078545b5d6e..9601548202d 100644
--- a/pump/omnipod-common/src/main/res/values-da-rDK/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-da-rDK/strings.xml
@@ -162,7 +162,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Ingen aktiv pod</string>
     <string name="omnipod_common_short_status_last_connection">Seneste forb: %1$d min siden</string>
-    <string name="omnipod_common_short_status_last_bolus">Sidste bolus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Midl: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Forlænget: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Reservoir: %1$sIE</string>
diff --git a/pump/omnipod-common/src/main/res/values-de-rDE/strings.xml b/pump/omnipod-common/src/main/res/values-de-rDE/strings.xml
index 04d461c2910..8350e0f96e0 100644
--- a/pump/omnipod-common/src/main/res/values-de-rDE/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-de-rDE/strings.xml
@@ -157,7 +157,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Kein aktiver Pod</string>
     <string name="omnipod_common_short_status_last_connection">Letzte Verb.: vor %1$d min</string>
-    <string name="omnipod_common_short_status_last_bolus">Letzter Bolus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Temp: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Verlängert: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Reserv: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-el-rGR/strings.xml b/pump/omnipod-common/src/main/res/values-el-rGR/strings.xml
index 63370e9d6e5..c732758a314 100644
--- a/pump/omnipod-common/src/main/res/values-el-rGR/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-el-rGR/strings.xml
@@ -163,7 +163,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Δεν Υπάρχει Ενεργό Pod</string>
     <string name="omnipod_common_short_status_last_connection">Τελευταία Σύνδεση: %1$d λεπτά πριν</string>
-    <string name="omnipod_common_short_status_last_bolus">Τελευταίο Bolus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Προσωρινός Ρυθμός: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Εκτεταμένο bolus: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Δεξαμενή: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-es-rES/strings.xml b/pump/omnipod-common/src/main/res/values-es-rES/strings.xml
index f71016fbdba..aceeb73b935 100644
--- a/pump/omnipod-common/src/main/res/values-es-rES/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-es-rES/strings.xml
@@ -165,7 +165,7 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Ningún Pod Activo</string>
     <string name="omnipod_common_short_status_last_connection">ÚltimaConexión: hace %1$d minutos</string>
-    <string name="omnipod_common_short_status_last_bolus">ÚltimoBolo: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_last_bolus">ÚltimoBolo: %1$s U @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Temp: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Extendido: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Reservorio: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-fr-rFR/strings.xml b/pump/omnipod-common/src/main/res/values-fr-rFR/strings.xml
index 4e5374fd1ca..938f5023e8c 100644
--- a/pump/omnipod-common/src/main/res/values-fr-rFR/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-fr-rFR/strings.xml
@@ -164,7 +164,7 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Pas de Pod actif</string>
     <string name="omnipod_common_short_status_last_connection">Dernière connexion : il y a %1$d min</string>
-    <string name="omnipod_common_short_status_last_bolus">Dernier bolus : %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_last_bolus">Dernier bolus: %1$sU @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Temps : %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Étendu : %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Réserve : %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-it-rIT/strings.xml b/pump/omnipod-common/src/main/res/values-it-rIT/strings.xml
index 6daff6b2651..5b860b7e0fe 100644
--- a/pump/omnipod-common/src/main/res/values-it-rIT/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-it-rIT/strings.xml
@@ -164,7 +164,7 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Nessun pod attivo</string>
     <string name="omnipod_common_short_status_last_connection">Ultima conn.: %1$d min fa</string>
-    <string name="omnipod_common_short_status_last_bolus">Ultimo bolo: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_last_bolus">Ultimo Bolo: %1$sU @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Temp: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Esteso: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Serb: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-iw-rIL/strings.xml b/pump/omnipod-common/src/main/res/values-iw-rIL/strings.xml
index 88fd3fae796..59200c2a91e 100644
--- a/pump/omnipod-common/src/main/res/values-iw-rIL/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-iw-rIL/strings.xml
@@ -163,7 +163,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">אין פוד פעיל</string>
     <string name="omnipod_common_short_status_last_connection">חיבור אחרון: לפני %1$d דקות</string>
-    <string name="omnipod_common_short_status_last_bolus">בולוס אחרון: %1$s ב-%2$s</string>
     <string name="omnipod_common_short_status_temp_basal">בזאלי זמני: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">ממושך: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">מכל: %1$s יח\'</string>
diff --git a/pump/omnipod-common/src/main/res/values-ko-rKR/strings.xml b/pump/omnipod-common/src/main/res/values-ko-rKR/strings.xml
index 97e48a8d4ef..f263a33c5b7 100644
--- a/pump/omnipod-common/src/main/res/values-ko-rKR/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-ko-rKR/strings.xml
@@ -157,7 +157,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">활성화된 Pod 없음</string>
     <string name="omnipod_common_short_status_last_connection">마지막 연결: %1$d 분 전</string>
-    <string name="omnipod_common_short_status_last_bolus">마지막 bolus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">임시: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">확장: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">잔여 인슐린 양: %1$s U</string>
diff --git a/pump/omnipod-common/src/main/res/values-lt-rLT/strings.xml b/pump/omnipod-common/src/main/res/values-lt-rLT/strings.xml
index 6189aa85df9..080ae479a4d 100644
--- a/pump/omnipod-common/src/main/res/values-lt-rLT/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-lt-rLT/strings.xml
@@ -164,7 +164,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Nėra aktyvaus Pod</string>
     <string name="omnipod_common_short_status_last_connection">Pask. prijung: prieš %1$d min</string>
-    <string name="omnipod_common_short_status_last_bolus">PaskBolusas: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Laik.bazė: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Ištęstas: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Rezerv: %1$svv</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 d0510d1eeb8..2d7824b3e4f 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
@@ -164,8 +164,8 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Ingen aktiv Pod</string>
     <string name="omnipod_common_short_status_last_connection">Siste tilkobling: %1$d min siden</string>
-    <string name="omnipod_common_short_status_last_bolus">Siste bolus: %1$s @ %2$s</string>
-    <string name="omnipod_common_short_status_temp_basal">Temp: %1$s</string>
+    <string name="omnipod_common_short_status_last_bolus">Siste bolus: %1$s E @%2$s</string>
+    <string name="omnipod_common_short_status_temp_basal">Midl. basal: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Forlenget: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Reservoar: %1$s E</string>
     <!-- Omnipod - Other -->
diff --git a/pump/omnipod-common/src/main/res/values-nl-rNL/strings.xml b/pump/omnipod-common/src/main/res/values-nl-rNL/strings.xml
index 0ab1eccd3a4..e47e076549b 100644
--- a/pump/omnipod-common/src/main/res/values-nl-rNL/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-nl-rNL/strings.xml
@@ -164,7 +164,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Geen actieve Pod</string>
     <string name="omnipod_common_short_status_last_connection">Laatste verbinding: %1$d min geleden</string>
-    <string name="omnipod_common_short_status_last_bolus">Laatste bolus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Tijdelijk: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Verlengd: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Reservoir: %1$sE</string>
diff --git a/pump/omnipod-common/src/main/res/values-pl-rPL/strings.xml b/pump/omnipod-common/src/main/res/values-pl-rPL/strings.xml
index 25a5237a3a7..1a23fb41e3f 100644
--- a/pump/omnipod-common/src/main/res/values-pl-rPL/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-pl-rPL/strings.xml
@@ -164,7 +164,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Brak akt. Poda</string>
     <string name="omnipod_common_short_status_last_connection">Ost.Poł.: %1$d m. temu</string>
-    <string name="omnipod_common_short_status_last_bolus">Ost.Bolus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Tymcz.: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Rozsz.: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Zbior.: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-pt-rBR/strings.xml b/pump/omnipod-common/src/main/res/values-pt-rBR/strings.xml
index 09699019655..5cf0d2fb719 100644
--- a/pump/omnipod-common/src/main/res/values-pt-rBR/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-pt-rBR/strings.xml
@@ -157,7 +157,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Nenhum Pod Ativo</string>
     <string name="omnipod_common_short_status_last_connection">Última conexão: %1$d minutos atrás</string>
-    <string name="omnipod_common_short_status_last_bolus">Último bolus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">AlvoTemporário: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Estendido: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Reservatório: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-pt-rPT/strings.xml b/pump/omnipod-common/src/main/res/values-pt-rPT/strings.xml
index 1b5ff3971bc..85aa0f04651 100644
--- a/pump/omnipod-common/src/main/res/values-pt-rPT/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-pt-rPT/strings.xml
@@ -158,7 +158,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Nenhum Pod Activo</string>
     <string name="omnipod_common_short_status_last_connection">ÚltimaLig: %1$d min. atrás</string>
-    <string name="omnipod_common_short_status_last_bolus">ÚltimoBólus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Temp: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Estendido: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Reserv: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-ro-rRO/strings.xml b/pump/omnipod-common/src/main/res/values-ro-rRO/strings.xml
index 251db93f7dc..38a848a7131 100644
--- a/pump/omnipod-common/src/main/res/values-ro-rRO/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-ro-rRO/strings.xml
@@ -164,7 +164,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Niciun Pod activ</string>
     <string name="omnipod_common_short_status_last_connection">UltimaConexiune: acum %1$d min</string>
-    <string name="omnipod_common_short_status_last_bolus">UltimulBolus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">BazalaTemporara: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">BolusExtins: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Rezervor: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-ru-rRU/strings.xml b/pump/omnipod-common/src/main/res/values-ru-rRU/strings.xml
index 083dc5518c7..3e148d37857 100644
--- a/pump/omnipod-common/src/main/res/values-ru-rRU/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-ru-rRU/strings.xml
@@ -164,7 +164,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Нет активных Pod</string>
     <string name="omnipod_common_short_status_last_connection">Предыдущее соединение: %1$d мин. назад</string>
-    <string name="omnipod_common_short_status_last_bolus">Предыдущий болюс: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Временн %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Пролонгированный: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Резервуар: %1$sед</string>
diff --git a/pump/omnipod-common/src/main/res/values-sk-rSK/strings.xml b/pump/omnipod-common/src/main/res/values-sk-rSK/strings.xml
index a1798fa88e2..77f3ed17540 100644
--- a/pump/omnipod-common/src/main/res/values-sk-rSK/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-sk-rSK/strings.xml
@@ -164,7 +164,7 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Žiadny aktívny Pod</string>
     <string name="omnipod_common_short_status_last_connection">Posledné spoj: pred %1$d min</string>
-    <string name="omnipod_common_short_status_last_bolus">Posledný Bolus: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_last_bolus">Posledný bolus: %1$s JI @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Doč. bazál: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Predl. bolus: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Zásobník: %1$sJI</string>
diff --git a/pump/omnipod-common/src/main/res/values-sv-rSE/strings.xml b/pump/omnipod-common/src/main/res/values-sv-rSE/strings.xml
index 9e05a882500..dafb39aaa98 100644
--- a/pump/omnipod-common/src/main/res/values-sv-rSE/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-sv-rSE/strings.xml
@@ -157,7 +157,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Ingen aktiv pod</string>
     <string name="omnipod_common_short_status_last_connection">Sen ansl: %1$d min sedan</string>
-    <string name="omnipod_common_short_status_last_bolus">Sen Bolus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Temp: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Förl: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Res: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-tr-rTR/strings.xml b/pump/omnipod-common/src/main/res/values-tr-rTR/strings.xml
index 39fb3b22b8e..c8f601eb905 100644
--- a/pump/omnipod-common/src/main/res/values-tr-rTR/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-tr-rTR/strings.xml
@@ -164,7 +164,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">Aktif Pod Yok</string>
     <string name="omnipod_common_short_status_last_connection">Son bağl: %1$d dak. önce</string>
-    <string name="omnipod_common_short_status_last_bolus">SonBolus: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Geçici: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Yayma: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Rezerv: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-zh-rCN/strings.xml b/pump/omnipod-common/src/main/res/values-zh-rCN/strings.xml
index fc2ecd0e496..d69a97ed2b4 100644
--- a/pump/omnipod-common/src/main/res/values-zh-rCN/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-zh-rCN/strings.xml
@@ -157,7 +157,6 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">没有活动的 Pod</string>
     <string name="omnipod_common_short_status_last_connection">上次连接: %1$d 分钟以前</string>
-    <string name="omnipod_common_short_status_last_bolus">上传大剂量: %1$s @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">临时: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">扩展: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">储药器v: %1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values-zh-rTW/strings.xml b/pump/omnipod-common/src/main/res/values-zh-rTW/strings.xml
index 16ef5a5c4bd..f7ee106f08e 100644
--- a/pump/omnipod-common/src/main/res/values-zh-rTW/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-zh-rTW/strings.xml
@@ -164,7 +164,7 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">無可用的 Pod</string>
     <string name="omnipod_common_short_status_last_connection">最後連線：%1$d 分鐘前</string>
-    <string name="omnipod_common_short_status_last_bolus">最後劑量：%1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_last_bolus">最後注射：%1$s U @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">臨時基礎率：%1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">延長劑量：%1$s</string>
     <string name="omnipod_common_short_status_reservoir">儲存槽：%1$sU</string>
diff --git a/pump/omnipod-common/src/main/res/values/strings.xml b/pump/omnipod-common/src/main/res/values/strings.xml
index 21af59b636a..c52a9e0ab03 100644
--- a/pump/omnipod-common/src/main/res/values/strings.xml
+++ b/pump/omnipod-common/src/main/res/values/strings.xml
@@ -196,7 +196,7 @@
     <!-- Omnipod - Short status -->
     <string name="omnipod_common_short_status_no_active_pod">No Active Pod</string>
     <string name="omnipod_common_short_status_last_connection">LastConn: %1$d min ago</string>
-    <string name="omnipod_common_short_status_last_bolus">LastBolus: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_last_bolus">LastBolus: %1$s U @ %2$s</string>
     <string name="omnipod_common_short_status_temp_basal">Temp: %1$s</string>
     <string name="omnipod_common_short_status_extended_bolus">Extended: %1$s</string>
     <string name="omnipod_common_short_status_reservoir">Reserv: %1$sU</string>
diff --git a/ui/src/main/res/values-nb-rNO/strings.xml b/ui/src/main/res/values-nb-rNO/strings.xml
index 24646c52f56..a50b189b622 100644
--- a/ui/src/main/res/values-nb-rNO/strings.xml
+++ b/ui/src/main/res/values-nb-rNO/strings.xml
@@ -73,7 +73,7 @@
     <string name="result_insulin_carbs">Resultat: %1$s %2$s</string>
     <string name="missing_carbs">Mangler %1$d g</string>
     <string name="a11y_current_bg">nåværende blodsukker</string>
-    <string name="carb_time_label">Karbo-tid</string>
+    <string name="carb_time_label">Karbotid</string>
     <string name="a11y_set_carb_timer">angi nedtellingsalarm for karbo</string>
     <string name="show_calculation">Vis beregning</string>
     <!-- Treatments -->
diff --git a/wear/src/main/res/values-nb-rNO/strings.xml b/wear/src/main/res/values-nb-rNO/strings.xml
index 99d27ee2bc1..9287e5b3356 100644
--- a/wear/src/main/res/values-nb-rNO/strings.xml
+++ b/wear/src/main/res/values-nb-rNO/strings.xml
@@ -26,21 +26,21 @@
     <string name="pref_show_iob">Vis IOB</string>
     <string name="pref_show_detailed_iob">Vis detaljert IOB</string>
     <string name="pref_show_cob">Vis COB</string>
-    <string name="pref_show_delta">Vis Delta</string>
-    <string name="pref_show_detailed_delta">Vis detaljert Delta</string>
-    <string name="pref_show_avgdelta">Vis Gj.snittDelta</string>
+    <string name="pref_show_delta">Vis delta</string>
+    <string name="pref_show_detailed_delta">Vis detaljert delta</string>
+    <string name="pref_show_avgdelta">Vis gj.snittsdelta</string>
     <string name="pref_show_phone_battery">Vis telefonbatteri</string>
     <string name="pref_show_rig_battery">Vis riggens batteri</string>
     <string name="pref_show_basal_rate">Vis basaldose</string>
     <string name="pref_show_temp_target">Vis midlertidig mål</string>
     <string name="pref_show_reservoir_level">Vis reservoarnivå</string>
-    <string name="pref_show_loop_status">Vis loop status</string>
+    <string name="pref_show_loop_status">Vis loopstatus</string>
     <string name="pref_show_bg">Vis BS</string>
     <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 midl. basal</string>
-    <string name="pref_show_bolus">Vis Bolus &amp; SMB</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>
     <string name="pref_highlight_basals">Marker basaler</string>
@@ -56,7 +56,7 @@
     <string name="pref_5_min">5 min</string>
     <string name="pref_10_min">10 min</string>
     <string name="pref_15_min">15 min</string>
-    <string name="pref_input_design">Innlesing design</string>
+    <string name="pref_input_design">Inndatadesign</string>
     <string name="pref_default">Standard</string>
     <string name="pref_quick_righty">Raskt høyre</string>
     <string name="pref_quick_lefty">Raskt venstre</string>