diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 0ff3f162df..7d83f9f64f 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -1161,4 +1161,5 @@
     <string name="trend_arrow">Šipka trendu</string>
     <string name="cannula">Kanyla</string>
     <string name="userentry">Vstup uživatele</string>
+    <string name="common_values">Použijte hodnoty pro největší jídlo, jaké obvykle jíte\n</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 8cffc8b783..106f34a0af 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1162,4 +1162,5 @@ Unerwartetes Verhalten.</string>
     <string name="trend_arrow">Trendpfeil</string>
     <string name="cannula">Kanüle</string>
     <string name="userentry">Benutzereingabe</string>
+    <string name="common_values">Verwende die Werte der größten Mahlzeit, die Du normalerweise zu Dir nimmst\n</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/objectives.xml b/app/src/main/res/values-fr-rFR/objectives.xml
index 288de82bbb..54809e4ba5 100644
--- a/app/src/main/res/values-fr-rFR/objectives.xml
+++ b/app/src/main/res/values-fr-rFR/objectives.xml
@@ -21,7 +21,7 @@
     <string name="objectives_smb_objective">Activation de fonctionnalités supplémentaires pour l\'utilisation en journée, telles que la fonction SMB</string>
     <string name="objectives_auto_objective">Activation de l\'automatisation</string>
     <string name="objectives_smb_gate">Lisez le wiki et augmentez le maxIA pour que les SMBs fonctionnent correctement ! Un bon début est maxIA = moyenne des Bolus Repas + 3 x maximum débit Basal quotidien</string>
-    <string name="objectives_auto_gate">Lisez la documentation comment l\'automatisation fonctionne. Configurez vos premières règles simples. Au lieu de mettre une action, configurez une notification. Quand vous êtes sûr que l\'automatisation est déclenchée au bon moment, remplacez la notification par une action réelle. (https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/Automation.html)</string>
+    <string name="objectives_auto_gate">Lisez la documentation comment l\'automatisation fonctionne. Configurez vos premières règles simples. Au lieu de mettre une action, configurez une notification. Quand vous êtes sûr que l\'automatisation est déclenchée au bon moment, remplacez la notification par une action réelle. (https://androidaps.readthedocs.io/fr/latest/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">Glycémie disponible sur NS</string>
     <string name="objectives_pumpstatusavailableinns">Statut de la pompe disponible sur NS</string>
     <string name="objectives_manualenacts">Activation manuelle</string>
@@ -36,7 +36,7 @@
     <string name="objectives_useloop">Affichage du contenu du plugin Boucle</string>
     <string name="objectives_usescale">Modification de l\'échelle du graphique par un appui long sur la courbe de glycémie</string>
     <string name="objectives_button_enter">Entrer</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si vous avez au moins 3 mois d\'expérience de boucle fermée avec d\'autres systèmes, vous pourriez avoir droit à un code permettant d\'ignorer les objectifs. Voir https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/Objectives.html#ignorer-les-objectifs pour plus de détails.</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si vous avez au moins 3 mois d\'expérience de boucle fermée avec d\'autres systèmes, vous pourriez avoir droit à un code permettant d\'ignorer les objectifs. Voir https://androidaps.readthedocs.io/fr/latest/Usage/Objectives.html#ignorer-les-objectifs pour plus de détails.</string>
     <string name="codeaccepted">Code accepté</string>
     <string name="codeinvalid">Code invalide</string>
     <string name="objectives_exam_objective">Prouver ses connaissances</string>
@@ -46,10 +46,10 @@
     <string name="unfinshed_button">Prochain non terminé</string>
     <string name="requestcode">Code requis : %1$s</string>
     <string name="objectives_hint">(Sélectionnez toutes les bonnes réponses)</string>
-    <string name="disconnectpump_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath</string>
-    <string name="usetemptarget_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Getting-Started/Screenshots.html#the-homescreen</string>
-    <string name="useaction_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Getting-Started/Screenshots.html#config-builder</string>
-    <string name="usescale_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Getting-Started/Screenshots.html#the-homescreen</string>
+    <string name="disconnectpump_hint" formatted="false">https://androidaps.readthedocs.io/fr/latest/Getting-Started/FAQ.html#que-faire-pour-prendre-une-douche-ou-un-bain</string>
+    <string name="usetemptarget_hint" formatted="false">https://androidaps.readthedocs.io/fr/latest/Getting-Started/Screenshots.html</string>
+    <string name="useaction_hint" formatted="false">https://androidaps.readthedocs.io/fr/latest/Configuration/Config-Builder.html</string>
+    <string name="usescale_hint" formatted="false">https://androidaps.readthedocs.io/fr/latest/Getting-Started/Screenshots.html</string>
     <string name="notconnected">Non connecté à Internet</string>
     <string name="failedretrievetime">Échec de la récupération de l\'heure</string>
     <string name="requirementnotmet">Exigences de l\'objectif non atteintes</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index b8a1ace3fd..959da11884 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1162,4 +1162,5 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="trend_arrow">Flèche de tendance</string>
     <string name="cannula">Canule</string>
     <string name="userentry">Entrées utilisateur</string>
+    <string name="common_values">Utilisez les valeurs qui correspondent à vos plus gros repas\n</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index ccedf44eb5..8bfdf04a07 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1161,4 +1161,5 @@
     <string name="trend_arrow">Freccia trend</string>
     <string name="cannula">Cannula</string>
     <string name="userentry">Inserimento utente</string>
+    <string name="common_values">Usa i valori del cibo più abbondante che mangi di solito\n</string>
 </resources>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index b1450e9f52..2b8d794200 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -180,7 +180,7 @@
     <string name="save">שמור</string>
     <string name="reloadprofile">טעינה מחדש של הפרופיל</string>
     <string name="smscommunicator">תקשורת SMS</string>
-    <string name="smscommunicator_allowednumbers">מספרי טלפון מותרים</string>
+    <string name="smscommunicator_allowednumbers">מספרי טלפון מורשים</string>
     <string name="smscommunicator_allowednumbers_summary">+ XXXXXXXXXX; + YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">לאישור מתן בולוס %1$.2f יחידות יש להשיב עם הקוד %2$s</string>
     <string name="smscommunicator_mealbolusreplywithcode">למתן %1$.2f יחידות בולוס ארוחה יש להשיב עם הקוד %2$s</string>
@@ -1161,4 +1161,5 @@
     <string name="trend_arrow">חץ מגמה</string>
     <string name="cannula">צינורית</string>
     <string name="userentry">קלט המשתמש</string>
+    <string name="common_values">השתמשו בערכים הגבוהים ביותר של מזונות שאתם אוכלים בדרך כלל\n</string>
 </resources>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 181ac9fe55..e87337521a 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -1161,4 +1161,5 @@
     <string name="trend_arrow">Trend pil</string>
     <string name="cannula">Kanyle</string>
     <string name="userentry">Bruker registrering</string>
+    <string name="common_values">Bruk verdiene for det største måltidet du normalt spiser\n</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 50c0176157..543467fda4 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1161,4 +1161,5 @@
     <string name="trend_arrow">Seta de tendência</string>
     <string name="cannula">Cânula</string>
     <string name="userentry">Entrada de Utilizador</string>
+    <string name="common_values">Utilize valores da sua maior refeição que normalmente come\n</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 2e0825e547..af7bfd5b0b 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1163,4 +1163,5 @@ Context | Edit Context</string>
     <string name="trend_arrow">Стрелка тренда</string>
     <string name="cannula">Катетер помпы</string>
     <string name="userentry">Запись пользователя</string>
+    <string name="common_values">Введите максимальные значения вашего приема пищи \n</string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 29e570471f..9339c222f7 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -420,6 +420,7 @@
     <string name="basal_shortname">BAZ</string>
     <string name="deviation_shortname">DEV</string>
     <string name="activity_shortname">AKT</string>
+    <string name="bgi_shortname">-BGI</string>
     <string name="abs_insulin_shortname">ABS</string>
     <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">O aplikácii</string>
@@ -627,6 +628,7 @@
     <string name="ns_autobackfill_summary">Automaticky doplňovať chýbajúcu glykémiu z NS</string>
     <string name="loop_smbsetbypump_label">SMB podané pumpou</string>
     <string name="overview_show_activity">Aktivita</string>
+    <string name="overview_show_bgi">Vplyv na glykémiu (BGI)</string>
     <string name="overview_show_sensitivity">Citlivosť</string>
     <string name="overview_show_deviations">Odchýlky</string>
     <string name="overview_show_cob">Aktívne sacharidy</string>
@@ -1158,4 +1160,6 @@
     <string name="clear_filter">Vyčistiť filter</string>
     <string name="trend_arrow">Trendová šípka</string>
     <string name="cannula">Kanyla</string>
+    <string name="userentry">Vstup používateľa</string>
+    <string name="common_values">Použite hodnoty pre najväčšie jedlo, aké obvykle jete\n</string>
 </resources>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
index 73fb02164c..5c827de9cb 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -104,7 +104,7 @@
     <string name="unit_days">ימים</string>
     <string name="unit_weeks">שבועות</string>
     <string name="shortminute">דק\'</string>
-    <string name="shortday">י\'</string>
+    <string name="shortday">י\' </string>
     <!--    Protection-->
     <string name="wrongpassword">סיסמה שגויה</string>
     <string name="passwords_dont_match">הסיסמאות אינן תואמות</string>
diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
index e18c52e3b0..5ea5b1f657 100644
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!--    Keys-->
     <!--    General-->
+    <string name="refresh">Atnaujinti</string>
     <string name="error">Klaida</string>
     <string name="not_set_short">Nenustatyta</string>
     <string name="failedupdatebasalprofile">Nepavyko atnaujinti bazės profilio</string>
@@ -255,4 +256,29 @@
     <string name="versionavailable">Versiją %1$s jau galima naudoti</string>
     <!-- Permissions -->
     <!-- WeekdayPicker -->
+    <string name="monday_short">P</string>
+    <string name="tuesday_short">A</string>
+    <string name="wednesday_short">T</string>
+    <string name="thursday_short">K</string>
+    <string name="friday_short">Pn</string>
+    <string name="saturday_short">Š</string>
+    <string name="sunday_short">S</string>
+    <plurals name="days">
+        <item quantity="one">%1$d d.</item>
+        <item quantity="few">%1$d d.</item>
+        <item quantity="many">%1$d d.</item>
+        <item quantity="other">%1$d d.</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%1$d val.</item>
+        <item quantity="few">%1$d val.</item>
+        <item quantity="many">%1$d val.</item>
+        <item quantity="other">%1$d val.</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%1$d min.</item>
+        <item quantity="few">%1$d min.</item>
+        <item quantity="many">%1$d min.</item>
+        <item quantity="other">%1$d min.</item>
+    </plurals>
 </resources>
diff --git a/core/src/main/res/values-no-rNO/strings.xml b/core/src/main/res/values-no-rNO/strings.xml
index 8c9da02017..b592b876d7 100644
--- a/core/src/main/res/values-no-rNO/strings.xml
+++ b/core/src/main/res/values-no-rNO/strings.xml
@@ -258,6 +258,13 @@
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Vennligst start mobilen på nytt eller restart AndroidAPS fra Innstillinger \nellers vil ikke AndroidAPS ha aktivert loggføring (viktig for å spore og kontrollere at algoritmene fungerer riktig!)</string>
     <!-- WeekdayPicker -->
+    <string name="monday_short">M</string>
+    <string name="tuesday_short">T</string>
+    <string name="wednesday_short">O</string>
+    <string name="thursday_short">T</string>
+    <string name="friday_short">F</string>
+    <string name="saturday_short">L</string>
+    <string name="sunday_short">S</string>
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dager</item>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index e92c15acc0..5b9008352c 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -258,6 +258,13 @@
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Prosím reštartujte Váš telefón, alebo reštartujte AndroidAPS z nastavení \nv opačnom prípade AndroidAPS nebude mocť zaznamenávať logy (dôležité kvôli sledovaniu a overovaniu, že algoritmus pracuje správne)!</string>
     <!-- WeekdayPicker -->
+    <string name="monday_short">Po</string>
+    <string name="tuesday_short">Ut</string>
+    <string name="wednesday_short">St</string>
+    <string name="thursday_short">Št</string>
+    <string name="friday_short">Pi</string>
+    <string name="saturday_short">So</string>
+    <string name="sunday_short">Ne</string>
     <plurals name="days">
         <item quantity="one">%1$d deň</item>
         <item quantity="few">%1$d dní</item>
diff --git a/omnipod-eros/src/main/res/values-fr-rFR/strings.xml b/omnipod-eros/src/main/res/values-fr-rFR/strings.xml
index 2cf968032d..3ecc9ac705 100644
--- a/omnipod-eros/src/main/res/values-fr-rFR/strings.xml
+++ b/omnipod-eros/src/main/res/values-fr-rFR/strings.xml
@@ -3,7 +3,7 @@
     <!-- Omnipod - Keys -->
     <!-- Omnipod - Non translatable -->
     <!-- Omnipod - Preferences -->
-    <string name="omnipod_config_riley_link_configuration">Configuration du RileyLink</string>
+    <string name="omnipod_config_riley_link_configuration">Configuration RileyLink</string>
     <string name="omnipod_config_bolus_beeps_enabled">Bips bolus activés</string>
     <string name="omnipod_config_basal_beeps_enabled">Bips basal activés</string>
     <string name="omnipod_config_smb_beeps_enabled">Bips SMB activés</string>