diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 795c121236..f4263041b4 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -494,6 +494,7 @@
     <string name="dexcomg5_xdripupload_title">Odesílat data do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dat 640g/Eversense</string>
     <string name="nsclientbg">Glykémie z NS</string>
+    <string name="nsclientbgshort">NSGL</string>
     <string name="overview_editquickwizard_usebg">Kalkulace glykémie</string>
     <string name="overview_editquickwizard_usebolusiob">Kalkulace bolusového IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Kalkulace bazálního IOB</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 977b5a5b32..2375b013bd 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -494,6 +494,7 @@
     <string name="dexcomg5_xdripupload_title">Sende BZ-Werte zu xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Wähle in xDrip+ 640g/Eversense als Daten-Quelle.</string>
     <string name="nsclientbg">Nightscout-Client BZ</string>
+    <string name="nsclientbgshort">NS BZ</string>
     <string name="overview_editquickwizard_usebg">BZ Berechnung</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus-IOB Berechnung</string>
     <string name="overview_editquickwizard_usebasaliob">Basal-IOB Berechnung</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index a7b672e3c4..5b7d0981f8 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -494,6 +494,7 @@
     <string name="dexcomg5_xdripupload_title">שליחת נתוני סוכר אל xDrip</string>
     <string name="dexcomg5_xdripupload_summary">ב-xDrip בחרו 640g/Eversense כמקור נתונים</string>
     <string name="nsclientbg">רמת סוכר מ-NSClient</string>
+    <string name="nsclientbgshort">סוכר NS</string>
     <string name="overview_editquickwizard_usebg">חישוב רמת הסוכר</string>
     <string name="overview_editquickwizard_usebolusiob">חישוב IOB של בולוס</string>
     <string name="overview_editquickwizard_usebasaliob">חישוב IOB של בזאלי</string>
diff --git a/automation/src/main/res/values-cs-rCZ/strings.xml b/automation/src/main/res/values-cs-rCZ/strings.xml
index 4f30a85513..5b993f0975 100644
--- a/automation/src/main/res/values-cs-rCZ/strings.xml
+++ b/automation/src/main/res/values-cs-rCZ/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">Glykémie není k dispozici</string>
     <string name="glucosecomparedmgdl">Glykémie %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glykémie %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Dočasný cíl neexistuje</string>
+    <string name="temptargetcomparedmgdl">Dočasný cíl %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Dočasný cíl %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profil pct %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">A</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Zem. šířka:</string>
     <string name="longitude_short">Zem. délka:</string>
     <string name="glucose_u">Glykémie [%1$s]:</string>
+    <string name="target_u">Cíl [%1$s]:</string>
     <string name="lastboluslabel">Poslední bolus</string>
     <string name="lastboluscompared">Poslední bolus %1$s před %2$s min</string>
     <string name="triggercoblabel">COB</string>
diff --git a/automation/src/main/res/values-de-rDE/strings.xml b/automation/src/main/res/values-de-rDE/strings.xml
index acb6f2480a..2845766192 100644
--- a/automation/src/main/res/values-de-rDE/strings.xml
+++ b/automation/src/main/res/values-de-rDE/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">Glukosewert nicht verfügbar</string>
     <string name="glucosecomparedmgdl">Glukosewert %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glukosewert %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Kein temporäres Ziel vorhanden</string>
+    <string name="temptargetcomparedmgdl">Temp. Zielwert %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Temp. Zielwert %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profil-Prozentsatz %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">Und</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Breitengrad:</string>
     <string name="longitude_short">Längengrad:</string>
     <string name="glucose_u">Glukosewert [%1$s]:</string>
+    <string name="target_u">Zielwert [%1$s]:</string>
     <string name="lastboluslabel">Letzter Bolus vor</string>
     <string name="lastboluscompared">Letzter Bolus vor %1$s %2$s Min</string>
     <string name="triggercoblabel">COB</string>
diff --git a/automation/src/main/res/values-fr-rFR/strings.xml b/automation/src/main/res/values-fr-rFR/strings.xml
index 44315399d7..a42641de69 100644
--- a/automation/src/main/res/values-fr-rFR/strings.xml
+++ b/automation/src/main/res/values-fr-rFR/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">La glycémie n\'est pas disponible</string>
     <string name="glucosecomparedmgdl">Glycémie %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glycémie %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">La Cible Temp. n\'existe pas</string>
+    <string name="temptargetcomparedmgdl">Cible Temp. %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Cible Temp. %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profil %% %1$s %2$d</string>
     <string name="iobcompared">IA %1$s %2$.1f</string>
     <string name="and">Et</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Lat :</string>
     <string name="longitude_short">Long :</string>
     <string name="glucose_u">Glycémie [%1$s] :</string>
+    <string name="target_u">Cible [%1$s]:</string>
     <string name="lastboluslabel">Lors du dernier Bolus</string>
     <string name="lastboluscompared">Heure du dernier bolus %1$s il y a %2$s min</string>
     <string name="triggercoblabel">GA</string>
diff --git a/automation/src/main/res/values-iw-rIL/strings.xml b/automation/src/main/res/values-iw-rIL/strings.xml
index bb745d18cc..46a2efd8ef 100644
--- a/automation/src/main/res/values-iw-rIL/strings.xml
+++ b/automation/src/main/res/values-iw-rIL/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">גלוקוז אינו זמין</string>
     <string name="glucosecomparedmgdl">גלוקוז %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">גלוקוז %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">ערך המטרה הזמני לא קיים</string>
+    <string name="temptargetcomparedmgdl">ערך מטרה זמני %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">ערך מטרה זמני %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">אחוז פרופיל %1$s %2$d</string>
     <string name="iobcompared">אינסולין פעיל %1$s %2$.1f</string>
     <string name="and">וגם</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">רוחב:</string>
     <string name="longitude_short">אורך:</string>
     <string name="glucose_u">גלוקוז [%1$s]:</string>
+    <string name="target_u">מטרה [%1$s]:</string>
     <string name="lastboluslabel">בולוס אחרון</string>
     <string name="lastboluscompared">הבולוס האחרון היה לפני %1$s %2$s דק\'</string>
     <string name="triggercoblabel">פחמ\' פעילות</string>
diff --git a/automation/src/main/res/values-sk-rSK/strings.xml b/automation/src/main/res/values-sk-rSK/strings.xml
index 4ab6b045d5..b06dc622ac 100644
--- a/automation/src/main/res/values-sk-rSK/strings.xml
+++ b/automation/src/main/res/values-sk-rSK/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">Glykémia nedostupná</string>
     <string name="glucosecomparedmgdl">Glykémia %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glykémia %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Dočasný cieľ neexistuje</string>
+    <string name="temptargetcomparedmgdl">Doč. cieľ %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Doč. cieľ %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Percentuálny profil %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">A</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Lat:</string>
     <string name="longitude_short">Lon:</string>
     <string name="glucose_u">Glykémia [%1$s]:</string>
+    <string name="target_u">Cieľ [%1$s]:</string>
     <string name="lastboluslabel">Od posledného bolusu</string>
     <string name="lastboluscompared">Čas posledného bolusu: pred %1$s %2$s min </string>
     <string name="triggercoblabel">COB</string>
diff --git a/build.gradle b/build.gradle
index 1ef4a476aa..69f3e7777a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         rxkotlin_version = '2.4.0'
         room_version = '2.3.0'
         lifecycle_version = '2.3.1'
-        dagger_version = '2.39'
+        dagger_version = '2.39.1'
         coroutinesVersion = '1.4.1'
         activityVersion = '1.3.1'
         fragmentktx_version = '1.3.6'
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index 225b6b206a..33289e55b3 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -196,6 +196,7 @@
     <string name="careportal_openapsoffline">OpenAPS vypnuto</string>
     <string name="careportal_pumpbatterychange">Výměna baterie pumpy</string>
     <string name="careportal_temporarytarget">Dočasný cíl</string>
+    <string name="careportal_temporarytargetvalue">Hodnota dočasného cíle</string>
     <string name="careportal_temporarytargetcancel">Dočasný cíl konec</string>
     <string name="boluswizard">Bolusová kalkulačka</string>
     <string name="glucosetype_finger">Glukoměr</string>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index d5b5d2adb6..70ba734fdd 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -196,6 +196,7 @@
     <string name="careportal_openapsoffline">OpenAPS offline</string>
     <string name="careportal_pumpbatterychange">Pumpenbatterie-Wechsel</string>
     <string name="careportal_temporarytarget">Temporäres Ziel</string>
+    <string name="careportal_temporarytargetvalue">Temporärer Zielwert</string>
     <string name="careportal_temporarytargetcancel">Temporäres Ziel abbrechen</string>
     <string name="boluswizard">Bolus-Rechner</string>
     <string name="glucosetype_finger">Finger</string>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 06efb1d051..756cafcab6 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -196,6 +196,7 @@
     <string name="careportal_openapsoffline">OpenAPS hors ligne</string>
     <string name="careportal_pumpbatterychange">Changement pile pompe</string>
     <string name="careportal_temporarytarget">Cible Temp</string>
+    <string name="careportal_temporarytargetvalue">Valeur de Cible Temporaire</string>
     <string name="careportal_temporarytargetcancel">Annuler Cible Temporaire</string>
     <string name="boluswizard">Assistant Bolus</string>
     <string name="glucosetype_finger">Doigt</string>
@@ -385,6 +386,20 @@
     <string name="uel_loop_removed">BOUCLE SUPPRIMÉE</string>
     <string name="uel_other">AUTRE</string>
     <!-- HardLimits -->
+    <string name="profile_low_target">Cible basse du profil</string>
+    <string name="profile_high_target">Cible haute du profil</string>
+    <string name="temp_target_low_target">Valeur basse de Cible Temp.</string>
+    <string name="temp_target_high_target">Valeur haute de Cible Temp.</string>
+    <string name="temp_target_value">Valeur de Cible Temporaire</string>
+    <string name="profile_dia">Valeur DAI du profil</string>
+    <string name="profile_sensitivity_value">Valeur de sensibilité du profil</string>
+    <string name="profile_max_daily_basal_value">Basale maximale du profil</string>
+    <string name="current_basal_value">Basale actuelle</string>
+    <string name="profile_carbs_ratio_value">Rapport glucides/insuline de profil</string>
+    <string name="valuelimitedto">%1$.2f limité à %2$.2f</string>
+    <string name="valueoutofrange">\"%1$s\" est en dehors des limites</string>
+    <string name="value_out_of_hard_limits">\"%1$s\" %2$.2f est en dehors des limites</string>
+    <string name="basal_value">Valeur de Basal</string>
     <plurals name="days">
         <item quantity="one">%1$d jour</item>
         <item quantity="other">%1$d jours</item>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
index 34c0d220b3..c62d2a2dfe 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -196,6 +196,7 @@
     <string name="careportal_openapsoffline">OpenAPS במצב לא מקוון</string>
     <string name="careportal_pumpbatterychange">החלפת סוללת משאבה</string>
     <string name="careportal_temporarytarget">ערך מטרה זמני</string>
+    <string name="careportal_temporarytargetvalue">ערך המטרה הזמני</string>
     <string name="careportal_temporarytargetcancel">ביטול ערך מטרה זמני</string>
     <string name="boluswizard">אשף בולוס</string>
     <string name="glucosetype_finger">אצבע</string>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 02bf0993a0..10c4e30f10 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -196,6 +196,7 @@
     <string name="careportal_openapsoffline">OpenAPS vypnuté</string>
     <string name="careportal_pumpbatterychange">Výmena batérie v pumpe</string>
     <string name="careportal_temporarytarget">Dočasný cieľ</string>
+    <string name="careportal_temporarytargetvalue">Hodnota dočasného cieľa</string>
     <string name="careportal_temporarytargetcancel">Zrušiť dočasný cieľ</string>
     <string name="boluswizard">Bolusová kalkulačka</string>
     <string name="glucosetype_finger">Prst</string>
@@ -385,6 +386,20 @@
     <string name="uel_loop_removed">UZAVRETÝ OKRUH ODSTRÁNENÝ</string>
     <string name="uel_other">INÉ</string>
     <!-- HardLimits -->
+    <string name="profile_low_target">Dolný cieľ profilu</string>
+    <string name="profile_high_target">Horný cieľ profilu</string>
+    <string name="temp_target_low_target">Dolná hodnota dočasného cieľa</string>
+    <string name="temp_target_high_target">Horná hodnota dočasného cieľa</string>
+    <string name="temp_target_value">Hodnota dočasného cieľa</string>
+    <string name="profile_dia">Profilová hodnota DIA</string>
+    <string name="profile_sensitivity_value">Profilová hodnota citlivosti</string>
+    <string name="profile_max_daily_basal_value">Profilová maximálna hodnota bazálu</string>
+    <string name="current_basal_value">Aktuálna hodnota bazálu</string>
+    <string name="profile_carbs_ratio_value">Profilový inzulino-sacharidový pomer</string>
+    <string name="valuelimitedto">%1$.2f obmedzené na %2$.2f</string>
+    <string name="valueoutofrange">»%1$s« je mimo pevne nastavené limity</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f je mimo pevne nastavených limitov</string>
+    <string name="basal_value">Hodnota bazálu</string>
     <plurals name="days">
         <item quantity="one">%1$d deň</item>
         <item quantity="few">%1$d dní</item>
diff --git a/diaconn/src/main/res/values-sk-rSK/strings.xml b/diaconn/src/main/res/values-sk-rSK/strings.xml
index 71526bae89..b0da6f5f9a 100644
--- a/diaconn/src/main/res/values-sk-rSK/strings.xml
+++ b/diaconn/src/main/res/values-sk-rSK/strings.xml
@@ -63,6 +63,38 @@
     <string name="diaconn_g8_pumpalarmlevel">Hlasitosť alarmu</string>
     <string name="diaconn_g8_pumpalarm_intensity_low">nízka</string>
     <string name="diaconn_g8_pumpalarm_intensity_middle">stredná</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">vysoká</string>
+    <string name="diaconn_g8_screentimeout">Čas pred vypnutím displeja [sekundy]</string>
+    <string name="diaconn_g8_saveuseroptions">ULOŽIŤ NASTAVENIA DO PUMPY</string>
+    <string name="diaconn_g8_language">Jazyk</string>
+    <string name="diaconn_g8_bolus_speed">Rýchlosť bolusu</string>
+    <string name="diaconn_g8_pumplang_chiness">Čínština</string>
+    <string name="diaconn_g8_pumplang_korean">Kórejčina</string>
+    <string name="diaconn_g8_pumplang_english">Angličtina</string>
+    <string name="diaconn_g8_screentimeout_10">"10 "</string>
+    <string name="diaconn_g8_pumpscreentimeout_10">10</string>
+    <string name="diaconn_g8_pumpscreentimeout_20">20</string>
+    <string name="diaconn_g8_pumpscreentimeout_30">30</string>
+    <string name="diaconn_g8_pumpalarm_low">nízka</string>
+    <string name="injectionblocked">Zablokované vydávanie</string>
+    <string name="batterywarning">Upozornenie na nízky stav batérie</string>
+    <string name="insulinlackwarning">Upozornenie na nedostatok inzulínu</string>
+    <string name="needbatteryreplace">Je požadovaná výmena batérie</string>
+    <string name="needinsullinreplace">Je požadovaná výmena inzulínu</string>
+    <string name="pumpversion">pump_version</string>
+    <string name="apsIncarnationNo">aps_incarnation_no</string>
+    <string name="pumpserialno">pump_serial_no</string>
+    <string name="diaconn_g8_loginsulinchange_title">Zaznamenať výmenu zásobníka</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Pridať udalosť \"Výmena inzulínu\" do portálu starostlivosti, pokiaľ je zistená v histórii</string>
+    <string name="diaconn_g8_logcanulachange_title">Zaznamenať výmenu kanyly</string>
+    <string name="diaconn_g8_logcanulachange_summary">Pridať udalosť \"Výmena setu\" do portálu starostlivosti, pokiaľ je zistená v histórii</string>
+    <string name="diaconn_g8_logbatterychange_summary">Pridať udalosť \"Výmena batérie\" do portálu starostlivosti, pokiaľ je zistená v histórii</string>
+    <string name="diaconn_g8_logbatterychange_title">Zaznamenať výmenu batérie</string>
+    <string name="diaconn_g8_logsyncinprogress">Prebieha synchronizácia logov</string>
+    <string name="diaconn_g8_loginsulinshorage">Nedostatok inzulínu</string>
+    <string name="diaconn_g8_logbatteryshorage">Slabá batéria</string>
+    <string name="diaconn_g8_logneedleprime">Plnenie ihly :%1$.2fJI</string>
+    <string name="diaconn_g8_logtubeprime">Plnenie hadičky :%1$.2fJI</string>
     <string name="diaconn_g8_resetfactoryreset">Resetovať po obnovení na továrenské nastavenia</string>
     <string name="diaconn_g8_resetemergencyoff">Resetovať po núdzovom vypnutí</string>
     <string name="diaconn_g8_resetbatteryreplacement">Resetovať po výmene batérie</string>
diff --git a/omnipod-common/src/main/res/values-cs-rCZ/strings.xml b/omnipod-common/src/main/res/values-cs-rCZ/strings.xml
index bb5e830b06..a3c487cd99 100644
--- a/omnipod-common/src/main/res/values-cs-rCZ/strings.xml
+++ b/omnipod-common/src/main/res/values-cs-rCZ/strings.xml
@@ -111,6 +111,10 @@
     <string name="omnipod_common_preferences_category_other">Jiné</string>
     <string name="omnipod_common_preferences_category_alerts">Výstrahy</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Potvrzovací pípnutí</string>
+    <string name="omnipod_common_preferences_category_notifications">Oznámení</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Zvuk pro nejistý dočasný bazál povolen</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Zvuk oznámení pro nejisté SMB povoleno</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Zvuk oznámení pro nejistý bolus povolen</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Žádný aktivní Pod</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Probíhá nastavování (čeká se na aktivaci Podu)</string>
diff --git a/omnipod-common/src/main/res/values-fr-rFR/strings.xml b/omnipod-common/src/main/res/values-fr-rFR/strings.xml
index 1aef96fcf9..5d0849d85f 100644
--- a/omnipod-common/src/main/res/values-fr-rFR/strings.xml
+++ b/omnipod-common/src/main/res/values-fr-rFR/strings.xml
@@ -111,6 +111,10 @@
     <string name="omnipod_common_preferences_category_other">Autres</string>
     <string name="omnipod_common_preferences_category_alerts">Alertes</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Bips de confirmation</string>
+    <string name="omnipod_common_preferences_category_notifications">Notifications</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Son pour les notifications DBT incertains activé</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Son pour les notifications SMB incertains activé</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Son pour les notifications bolus incertains activé</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Pas de Pod actif</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Configuration en cours (en attente d\'activation du Pod)</string>
diff --git a/omnipod-common/src/main/res/values-it-rIT/strings.xml b/omnipod-common/src/main/res/values-it-rIT/strings.xml
index deb65859b5..4bb95f407b 100644
--- a/omnipod-common/src/main/res/values-it-rIT/strings.xml
+++ b/omnipod-common/src/main/res/values-it-rIT/strings.xml
@@ -111,6 +111,8 @@
     <string name="omnipod_common_preferences_category_other">Altro</string>
     <string name="omnipod_common_preferences_category_alerts">Avvisi</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">BIP di conferma</string>
+    <string name="omnipod_common_preferences_category_notifications">Notifiche</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Suono notifiche TBR incerto abilitato</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Nessun pod attivo</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Configurazione in corso (attesa attivazione pod)</string>
diff --git a/omnipod-common/src/main/res/values-sk-rSK/strings.xml b/omnipod-common/src/main/res/values-sk-rSK/strings.xml
index afd53a9869..8be1c68069 100644
--- a/omnipod-common/src/main/res/values-sk-rSK/strings.xml
+++ b/omnipod-common/src/main/res/values-sk-rSK/strings.xml
@@ -111,6 +111,10 @@
     <string name="omnipod_common_preferences_category_other">Iné</string>
     <string name="omnipod_common_preferences_category_alerts">Výstrahy</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Potvrdzovacie pípnutia</string>
+    <string name="omnipod_common_preferences_category_notifications">Notifikácie</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Zvuk upozornenia pre neistý dočasný bazál povolený</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Zvuk upozornenia pre neistý SMB povolený</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Zvuk upozornenia pre neistý bolus povolený</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Žiadny aktívny Pod</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Prebieha inštalácia (čaká sa na aktiváciu Podu)</string>
diff --git a/omnipod-dash/src/main/res/values-fr-rFR/strings.xml b/omnipod-dash/src/main/res/values-fr-rFR/strings.xml
index 5cc149124d..a178c01d4f 100644
--- a/omnipod-dash/src/main/res/values-fr-rFR/strings.xml
+++ b/omnipod-dash/src/main/res/values-fr-rFR/strings.xml
@@ -4,6 +4,18 @@
     <string name="omnipod_dash_pump_description">Intégration de la pompe Omnipod Dash (le nouveau modèle Bluetooth, avec un bouchon d\'aiguille bleue).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">État Bluetooth</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Adresse Bluetooth</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Qualité de connexion</string>
+    <string name="omnipod_dash_overview_delivery_status">État de l\'injection</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Remplissez avec suffisamment d\'insuline pour 3 jours.\n\nVous devez entendre deux bips lors du remplissage du Pod. Ils indiquent que la quantité minimale de 85u a été ajouté. Assurez-vous de vider complètement la seringue de remplissage après avoir entendu les deux bips.\n\nAprès le remplissage du Pod, vous pouvez presser<b>Suivant</b>\n\n<b>Remarque :</b>N\'enlever pas la protection  de l\'aiguille du Pod à cette étape.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Tentative d\'appairage de d\'amorçage du nouveau Pod.\n\nUne fois le processus d\'initialisation terminé avec succès, vous pouvez appuyer sur <b>Suivant</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Son activé en cas de notification de pause d\'injection</string>
     <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Echec de connexion au pod</string>
+    <string name="omnipod_dash_found_too_many_pods">Trop de pods trouvés pour l\'activation</string>
+    <string name="omnipod_dash_scan_failed">Impossible de trouver un pod disponible pour l\'activation</string>
+    <string name="omnipod_dash_generic_error">Erreur générique : %1$s</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-it-rIT/strings.xml b/omnipod-dash/src/main/res/values-it-rIT/strings.xml
index 5f55d28285..d2863c37b3 100644
--- a/omnipod-dash/src/main/res/values-it-rIT/strings.xml
+++ b/omnipod-dash/src/main/res/values-it-rIT/strings.xml
@@ -4,6 +4,15 @@
     <string name="omnipod_dash_pump_description">Integrazione del microinfusore Omnipod Dash (il nuovo modello, abilitato al Bluetooth e con la protezione ago di colore blu).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Stato bluetooth</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Indirizzo bluetooth</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Qualità connessione</string>
+    <string name="omnipod_dash_overview_delivery_status">Stato erogazione</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Impossibile connettersi al pod</string>
+    <string name="omnipod_dash_found_too_many_pods">Trovati troppi pod per l\'attivazione</string>
+    <string name="omnipod_dash_scan_failed">Nessun pod disponibile per l\'attivazione</string>
+    <string name="omnipod_dash_generic_error">Errore generico: %1$s</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-sk-rSK/strings.xml b/omnipod-dash/src/main/res/values-sk-rSK/strings.xml
index 029f44a38e..bb75fed0a6 100644
--- a/omnipod-dash/src/main/res/values-sk-rSK/strings.xml
+++ b/omnipod-dash/src/main/res/values-sk-rSK/strings.xml
@@ -4,6 +4,18 @@
     <string name="omnipod_dash_pump_description">Integrácia pumpy pre Omnipod Dash (nový model s funkciou Bluetooth a modrým krytom).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Stav Bluetooth</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Adresa Bluetooth</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Kvalita pripojenia</string>
+    <string name="omnipod_dash_overview_delivery_status">Stav doručenia</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Naplňte nový Pod dostatkom inzulínu na 3 dni.\n\nČakajte na dve pípnutia z Podu v priebehu procesu plnenia. Tieto indikujú, že minimálne množstvo 85U bolo naplnené. Uistite sa, že striekačka je úplne vyprázdnená a to aj po vypočutí dvoch pípnutí.\n\nPo naplnení Podu, prosím, stlačte <b>Ďalšia</b>.\n\n<b>Poznámka:</b> zatiaľ nesnímajte kryt z ihly Podu.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Systém sa snaží spárovať s novým Podom a naplniť ho.\n\nAkonáhle bude inicializační proces úspešne dokončený, môžete stlačiť tlačítko <b>Ďalšia</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Zvuk oznámenia pri pozastavenom podávaní povolený</string>
     <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Nepodarilo sa pripojiť k Podu</string>
+    <string name="omnipod_dash_found_too_many_pods">Našlo sa príliš veľa Podov na aktiváciu</string>
+    <string name="omnipod_dash_scan_failed">Nemôžem nájsť dostupný Pod na aktiváciu</string>
+    <string name="omnipod_dash_generic_error">Všeobecná chyba: %1$s</string>
 </resources>
diff --git a/openhumans/src/main/res/values-sk-rSK/strings.xml b/openhumans/src/main/res/values-sk-rSK/strings.xml
index e65cd681d7..46eee7e8e7 100644
--- a/openhumans/src/main/res/values-sk-rSK/strings.xml
+++ b/openhumans/src/main/res/values-sk-rSK/strings.xml
@@ -2,9 +2,18 @@
 <resources>
     <string name="open_humans">Open Humans</string>
     <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans vám umožňuje nahrávať dáta vášho diabetu a darovať ich vedeckým projektom.</string>
     <string name="logout">Odhlásiť</string>
+    <string name="setup">Nastaviť</string>
+    <string name="setup_completed_info">Open Humans bol nastavený. Pokiaľ chcete prestať nahrávať, kliknite na \"Odhlásiť\".</string>
+    <string name="not_setup_info">Open Humans je momentálne neaktívny. Ak chcete začať nahrávať dáta, kliknite na tlačítko \"Nastaviť\".</string>
+    <string name="project_member_id">ID člena projektu: %1$s</string>
     <string name="only_upload_if_connected_to_wifi">Odoslať iba ak ste pripojený k Wi-Fi</string>
     <string name="only_upload_if_charging">Odoslať iba pri nabíjaní</string>
+    <string name="open_humans_uploading">Nahrávanie na Open Humans…</string>
+    <string name="open_humans_notifications">Notifikácie Open Humans</string>
+    <string name="uploading_to_open_humans">AndroidAPS nahráva na Open Humans. To môže chvíľu trvať.</string>
     <string name="you_have_been_signed_out_of_open_humans">Boli ste odhlásený z Open Humans</string>
     <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Kliknite sem, ak sa chcete prihlásiť znova, v prípade, že sa to stalo nedopatrením.</string>
+    <string name="upload_now">Nahrať teraz</string>
 </resources>