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 0541e669eb..ebd68a9b71 100644
--- a/core/ui/src/main/res/values-nb-rNO/strings.xml
+++ b/core/ui/src/main/res/values-nb-rNO/strings.xml
@@ -51,6 +51,7 @@
     <string name="extended_bolus">Forlenget bolus</string>
     <string name="paused">Pauset</string>
     <string name="tdd_total">TDD Total</string>
+    <string name="tdd_old_data">Gammel data</string>
     <string name="goingtodeliver">Leverer %1$.2f enheter</string>
     <string name="waitingforpump">Venter på pumpen</string>
     <string name="androidaps_start">AAPS startet</string>
@@ -167,6 +168,8 @@
     <string name="virtualpump_uploadstatus_title">Last opp pumpestatus til NS eller Tidepool</string>
     <string name="suspendloop_label">Deaktivert/pauset loop</string>
     <string name="iob_label">Aktivt insulin (IOB)</string>
+    <string name="loopstatus_targets">MÅLVERDIER:</string>
+    <string name="loopstatus_OAPS_result">OAPS resultat:</string>
     <!--    Protection-->
     <string name="wrongpassword">Feil passord</string>
     <string name="wrongpin">Feil PIN-kode</string>
@@ -462,6 +465,8 @@
     <string name="bolus_recorded_only">Bolus vil bare bli loggført (ikke levert av pumpe)</string>
     <string name="advisoralarm">Aktiver alarm når det er på tide å spise</string>
     <string name="no_action_selected">Ingen handling valgt. Ingenting endres</string>
+    <string name="carb_equal_zero_no_action">Karbo = 0. Ingen handling utført!</string>
+    <string name="wizard_no_insulin_required">Insulin er ikke nødvendig!</string>
     <string name="wizard_no_actual_bg">Mangler nylige BS-verdier til å gjøre beregninger!</string>
     <string name="wizard_no_active_profile">Det er ikke angitt noen aktiv profil!</string>
     <string name="wizard_no_cob">Ukjent COB! BS-verdier mangler eller nylig oppstart av appen?</string>
diff --git a/core/ui/src/main/res/values-pl-rPL/strings.xml b/core/ui/src/main/res/values-pl-rPL/strings.xml
index 08e5d69b6e..bbfd50590e 100644
--- a/core/ui/src/main/res/values-pl-rPL/strings.xml
+++ b/core/ui/src/main/res/values-pl-rPL/strings.xml
@@ -51,6 +51,7 @@
     <string name="extended_bolus">Bolus Przedłużony</string>
     <string name="paused">Wstrzymano</string>
     <string name="tdd_total">TDD Całkowita</string>
+    <string name="tdd_old_data">Stare dane</string>
     <string name="goingtodeliver">Zamierzam podać %1$.2f U</string>
     <string name="waitingforpump">Czekam na pompę</string>
     <string name="androidaps_start">AAPS uruchomiony</string>
@@ -167,6 +168,8 @@
     <string name="virtualpump_uploadstatus_title">Prześlij status pompy do NS lub Tidepool</string>
     <string name="suspendloop_label">Wyłączona/zawieszona pętla</string>
     <string name="iob_label">Aktywna insulina (IOB)</string>
+    <string name="loopstatus_targets">CELE:</string>
+    <string name="loopstatus_OAPS_result">WYNIK OAPS:</string>
     <!--    Protection-->
     <string name="wrongpassword">Złe hasło</string>
     <string name="wrongpin">Nieprawidłowy PIN</string>
@@ -462,6 +465,8 @@
     <string name="bolus_recorded_only">Bolus zostanie jedynie odnotowany (nie będzie podany przez pompę)</string>
     <string name="advisoralarm">Uruchom alarm kiedy będzie czas na jedzenie</string>
     <string name="no_action_selected">Nie wybrano żadnej akcji, zdarzenie nie będzie wprowadzone</string>
+    <string name="carb_equal_zero_no_action">Węglowodany = 0. Nie podjęto żadnych działań!</string>
+    <string name="wizard_no_insulin_required">Insulina nie jest wymagana!</string>
     <string name="wizard_no_actual_bg">Brak niezbędnego do obliczeń bieżącego pomiaru glikemi!</string>
     <string name="wizard_no_active_profile">Nie ustawiono aktywnego profilu!</string>
     <string name="wizard_no_cob">Nieznane COB! Może brakuje odczytu glikemii lub niedawno zrestartowano aplikację?</string>
diff --git a/plugins/aps/src/main/res/values-es-rES/strings.xml b/plugins/aps/src/main/res/values-es-rES/strings.xml
index cfcd0e2efc..33d4d77b19 100644
--- a/plugins/aps/src/main/res/values-es-rES/strings.xml
+++ b/plugins/aps/src/main/res/values-es-rES/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dynisf_adjust_sensitivity">Ajustar sensibilidad y glucosa</string>
-    <string name="DynISFAdjust_title" formatted="false">Factor de ajuste de Isf Dinámico %</string>
-    <string name="DynISFAdjust_summary" formatted="false">Factor de ajuste para el DynamicISF. Establezca más de 100% para una corrección más agresiva, y menos de 100% para correcciones más susves.</string>
+    <string name="DynISFAdjust_title" formatted="false">Factor de ajuste de ISF Dinámico %</string>
+    <string name="DynISFAdjust_summary" formatted="false">Factor de ajuste para ISF Dinámico. Establezca más de 100% para una corrección más agresiva, y menos de 100% para correcciones más susves.</string>
     <string name="high_temptarget_raises_sensitivity_title">Objetivo temporal alto aumenta la sensibilidad</string>
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Aumentar la sensibilidad para objetivos temporales >= 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Objetivo temporal bajo reduce la sensibilidad</string>
diff --git a/plugins/sync/src/main/res/values-fr-rFR/strings.xml b/plugins/sync/src/main/res/values-fr-rFR/strings.xml
index ff12a17acf..c3ef782ac8 100644
--- a/plugins/sync/src/main/res/values-fr-rFR/strings.xml
+++ b/plugins/sync/src/main/res/values-fr-rFR/strings.xml
@@ -116,6 +116,7 @@
     <string name="xdrip_local_broadcasts_summary">Envoyer les glycémies et les traitements à xDrip+. La source de données \"xDrip+ Sync Follower\" doit être sélectionnée et l\'acceptation des données doit être activée dans Paramètres - Paramètres Inter-app - Accepter Glycémies/Traitements</string>
     <string name="xdrip_local_broadcasts_title">Activer les diffusions vers xDrip+.</string>
     <!--    DataBroadcast-->
+    <string name="data_broadcaster">Diffusue de données</string>
     <string name="data_broadcaster_short">DD</string>
     <string name="data_broadcaster_description">Diffuser des données sur l\'application G-Watch Wear de Garmin</string>
     <!-- GarminPlugin -->
diff --git a/pump/combov2/src/main/res/values-iw-rIL/strings.xml b/pump/combov2/src/main/res/values-iw-rIL/strings.xml
index f231e76bd7..37f974cb89 100644
--- a/pump/combov2/src/main/res/values-iw-rIL/strings.xml
+++ b/pump/combov2/src/main/res/values-iw-rIL/strings.xml
@@ -97,6 +97,7 @@
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">לא ניתן להגדיר בזאלי זמני אם המינון הבזאלי הבסיסי הוא 0</string>
     <string name="combov2_pair_with_pump_summary">צימוד AndroidAPS ואנדרואיד עם משאבת Accu-Chek combo שאינה מצומדת</string>
     <string name="combov2_unpair_pump_summary">ביטול צימוד AndroidAPS ואנדרואיד ממשאבת Accu-Chek combo המצומדת</string>
+    <string name="combov2_unknown_tbr_detected">נמצא מינון בזאלי זמני לא ברור והוא נעצר; %1$d%; זמן נותר: %2$s</string>
     <string name="combov2_connection_error">שגיאת חיבור: %1$s</string>
     <string name="combov2_short_status_last_connection">חיבור אחרון: לפני %1$d דקות</string>
     <string name="combov2_short_status_alert">התראה: %s</string>
diff --git a/pump/medtrum/src/main/res/values-lt-rLT/strings.xml b/pump/medtrum/src/main/res/values-lt-rLT/strings.xml
index 7c1e714e87..da7983f437 100644
--- a/pump/medtrum/src/main/res/values-lt-rLT/strings.xml
+++ b/pump/medtrum/src/main/res/values-lt-rLT/strings.xml
@@ -108,7 +108,9 @@
     <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-ro-rRO/strings.xml b/pump/medtrum/src/main/res/values-ro-rRO/strings.xml
index 0fdf3679e8..01b5297304 100644
--- a/pump/medtrum/src/main/res/values-ro-rRO/strings.xml
+++ b/pump/medtrum/src/main/res/values-ro-rRO/strings.xml
@@ -114,7 +114,9 @@
     <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 ec2b2ded32..c029351280 100644
--- a/pump/medtrum/src/main/res/values-ru-rRU/strings.xml
+++ b/pump/medtrum/src/main/res/values-ru-rRU/strings.xml
@@ -114,7 +114,9 @@
     <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 0b179c64c9..a03c3f0d9a 100644
--- a/pump/medtrum/src/main/res/values-sk-rSK/strings.xml
+++ b/pump/medtrum/src/main/res/values-sk-rSK/strings.xml
@@ -114,7 +114,9 @@
     <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-tr-rTR/strings.xml b/pump/medtrum/src/main/res/values-tr-rTR/strings.xml
index f0b22a57aa..143f6dab14 100644
--- a/pump/medtrum/src/main/res/values-tr-rTR/strings.xml
+++ b/pump/medtrum/src/main/res/values-tr-rTR/strings.xml
@@ -114,7 +114,9 @@
     <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>