From 90e0f48ddc7d9a82bf750a352a216040e9318964 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 7 Feb 2023 10:51:07 +0100
Subject: [PATCH 1/4] G7 support

---
 app/src/main/AndroidManifest.xml                              | 1 +
 .../java/info/nightscout/androidaps/receivers/DataReceiver.kt | 4 +++-
 .../main/java/info/nightscout/interfaces/receivers/Intents.kt | 1 +
 .../src/main/java/info/nightscout/source/DexcomPlugin.kt      | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 124d50535e..1d5b47af92 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -88,6 +88,7 @@
                 <action android:name="it.ct.glicemia.ACTION_GLUCOSE_MEASURED" />
                 <!-- Receiver from Dexcom -->
                 <action android:name="com.dexcom.cgm.EXTERNAL_BROADCAST" />
+                <action android:name="com.dexcom.g7.EXTERNAL_BROADCAST" />
                 <!-- Receiver from Poctech -->
                 <action android:name="com.china.poctech.data" />
                 <!-- Receiver from Tomato -->
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt
index 09c93b9195..d642569246 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt
@@ -70,9 +70,11 @@ open class DataReceiver : DaggerBroadcastReceiver() {
             Intents.EVERSENSE_BG                      ->
                 OneTimeWorkRequest.Builder(EversensePlugin.EversenseWorker::class.java)
                     .setInputData(dataWorkerStorage.storeInputData(bundle, intent.action)).build()
-            Intents.DEXCOM_BG                         ->
+
+            Intents.DEXCOM_BG, Intents.DEXCOM_G7_BG   ->
                 OneTimeWorkRequest.Builder(DexcomPlugin.DexcomWorker::class.java)
                     .setInputData(dataWorkerStorage.storeInputData(bundle, intent.action)).build()
+
             Intents.AIDEX_NEW_BG_ESTIMATE             ->
                 OneTimeWorkRequest.Builder(AidexPlugin.AidexWorker::class.java)
                     .setInputData(dataWorkerStorage.storeInputData(bundle, intent.action)).build()
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt
index 81716dbe36..ad058a5af0 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt
@@ -31,6 +31,7 @@ interface Intents {
         const val ACTION_REMOTE_CALIBRATION = "com.eveningoutpost.dexdrip.NewCalibration"
         const val GLIMP_BG = "it.ct.glicemia.ACTION_GLUCOSE_MEASURED"
         const val DEXCOM_BG = "com.dexcom.cgm.EXTERNAL_BROADCAST"
+        const val DEXCOM_G7_BG = "com.dexcom.g7.EXTERNAL_BROADCAST"
         const val EVERSENSE_BG = "com.senseonics.AndroidAPSEventSubscriber.BROADCAST"
         const val POCTECH_BG = "com.china.poctech.data"
         const val TOMATO_BG = "com.fanqies.tomatofn.BgEstimate"
diff --git a/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt
index 99d8db5525..16b2f58c36 100644
--- a/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt
@@ -244,7 +244,8 @@ class DexcomPlugin @Inject constructor(
             "com.dexcom.cgm.region1.mgdl", "com.dexcom.cgm.region1.mmol",
             "com.dexcom.cgm.region2.mgdl", "com.dexcom.cgm.region2.mmol",
             "com.dexcom.g6.region1.mmol", "com.dexcom.g6.region2.mgdl",
-            "com.dexcom.g6.region3.mgdl", "com.dexcom.g6.region3.mmol", "com.dexcom.g6"
+            "com.dexcom.g6.region3.mgdl", "com.dexcom.g6.region3.mmol",
+            "com.dexcom.g6", "com.dexcom.g7"
         )
         const val PERMISSION = "com.dexcom.cgm.EXTERNAL_PERMISSION"
     }

From 92701fa98bd89c7dbba384207eb159d58119f8ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 12:18:51 +0000
Subject: [PATCH 2/4] chore(deps): bump com.android.tools.build:gradle from
 7.4.0 to 7.4.1

Bumps com.android.tools.build:gradle from 7.4.0 to 7.4.1.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 325670ffce..6c7bd4a1cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath 'com.google.gms:google-services:4.3.14'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
 

From 5ebf4987942a7ec0edc9c817348947ba3dd66b67 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 7 Feb 2023 13:44:42 +0100
Subject: [PATCH 3/4] New Crowdin updates (#2381)

* New translations strings.xml (French)

* New translations strings.xml (Turkish)

* New translations exam.xml (French)

* New translations exam.xml (Turkish)

* New translations exam.xml (French)

* New translations strings.xml (Slovak)

* New translations exam.xml (Slovak)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations exam.xml (Norwegian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations exam.xml (Russian)
---
 .../ui/src/main/res/values-fr-rFR/strings.xml |  3 ++
 .../ui/src/main/res/values-no-rNO/strings.xml |  3 ++
 .../ui/src/main/res/values-ru-rRU/strings.xml |  3 ++
 .../ui/src/main/res/values-sk-rSK/strings.xml |  3 ++
 .../ui/src/main/res/values-tr-rTR/strings.xml |  3 ++
 .../src/main/res/values-fr-rFR/exam.xml       | 32 +++++++++++++++++++
 .../src/main/res/values-no-rNO/exam.xml       | 32 +++++++++++++++++++
 .../src/main/res/values-ru-rRU/exam.xml       |  7 ++++
 .../src/main/res/values-sk-rSK/exam.xml       | 32 +++++++++++++++++++
 .../src/main/res/values-tr-rTR/exam.xml       | 32 +++++++++++++++++++
 .../src/main/res/values-no-rNO/strings.xml    | 12 +++++++
 .../src/main/res/values-ru-rRU/strings.xml    |  4 +++
 12 files changed, 166 insertions(+)

diff --git a/core/ui/src/main/res/values-fr-rFR/strings.xml b/core/ui/src/main/res/values-fr-rFR/strings.xml
index 97aafd9ae7..cdc24e5b49 100644
--- a/core/ui/src/main/res/values-fr-rFR/strings.xml
+++ b/core/ui/src/main/res/values-fr-rFR/strings.xml
@@ -556,6 +556,9 @@
     <!-- SmsCommunicator -->
     <string name="smscommunicator_missingsmspermission">Autorisation SMS manquante</string>
     <!-- About -->
+    <string name="cta_dont_kill_my_app_info">Garder l\'appli en arrière plan ?</string>
+    <string name="fabric_upload_disabled">Téléchargement des logs de plantage désactivé !</string>
+    <string name="about_link_urls">\n\nDocumentation :\nhttps://wiki.aaps.app/fr/latest/\n\nfacebook :\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <plurals name="days">
         <item quantity="one">%1$d jour</item>
         <item quantity="other">%1$d jours</item>
diff --git a/core/ui/src/main/res/values-no-rNO/strings.xml b/core/ui/src/main/res/values-no-rNO/strings.xml
index 35d67494f7..5d99fe89e0 100644
--- a/core/ui/src/main/res/values-no-rNO/strings.xml
+++ b/core/ui/src/main/res/values-no-rNO/strings.xml
@@ -556,6 +556,9 @@
     <!-- SmsCommunicator -->
     <string name="smscommunicator_missingsmspermission">Mangler SMS-tillatelse</string>
     <!-- About -->
+    <string name="cta_dont_kill_my_app_info">Ikke terminer min app?</string>
+    <string name="fabric_upload_disabled">Opplast av krasj logger er deaktivert!</string>
+    <string name="about_link_urls">\n\nDokumentasjon:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dager</item>
diff --git a/core/ui/src/main/res/values-ru-rRU/strings.xml b/core/ui/src/main/res/values-ru-rRU/strings.xml
index 5351646116..66ff8992d3 100644
--- a/core/ui/src/main/res/values-ru-rRU/strings.xml
+++ b/core/ui/src/main/res/values-ru-rRU/strings.xml
@@ -556,6 +556,9 @@
     <!-- SmsCommunicator -->
     <string name="smscommunicator_missingsmspermission">Отсутствует смс разрешение</string>
     <!-- About -->
+    <string name="cta_dont_kill_my_app_info">Не останавливать приложение?</string>
+    <string name="fabric_upload_disabled">Загрузка журналов сбоя на сервер отключена!</string>
+    <string name="about_link_urls">\n\nDocumentation:\nhttps://wiki.aaps.app\n\nFacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <plurals name="days">
         <item quantity="one">%1$d день</item>
         <item quantity="few">%1$d дня</item>
diff --git a/core/ui/src/main/res/values-sk-rSK/strings.xml b/core/ui/src/main/res/values-sk-rSK/strings.xml
index 34f0f123fe..a68bf9a6d2 100644
--- a/core/ui/src/main/res/values-sk-rSK/strings.xml
+++ b/core/ui/src/main/res/values-sk-rSK/strings.xml
@@ -556,6 +556,9 @@
     <!-- SmsCommunicator -->
     <string name="smscommunicator_missingsmspermission">Chýbajúce povolenie SMS príkazov</string>
     <!-- About -->
+    <string name="cta_dont_kill_my_app_info">Nepotláčať moju aplikáciu?</string>
+    <string name="fabric_upload_disabled">Odosielanie protokolov o zlyhaní je zakázané!</string>
+    <string name="about_link_urls">\n\nDokumentace:\nhttps://wiki.aaps.app\n\nFacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <plurals name="days">
         <item quantity="one">%1$d deň</item>
         <item quantity="few">%1$d dní</item>
diff --git a/core/ui/src/main/res/values-tr-rTR/strings.xml b/core/ui/src/main/res/values-tr-rTR/strings.xml
index d6e40ae2d2..d62f45fb34 100644
--- a/core/ui/src/main/res/values-tr-rTR/strings.xml
+++ b/core/ui/src/main/res/values-tr-rTR/strings.xml
@@ -556,6 +556,9 @@
     <!-- SmsCommunicator -->
     <string name="smscommunicator_missingsmspermission">SMS izni eksik</string>
     <!-- About -->
+    <string name="cta_dont_kill_my_app_info">Uygulamamı devre dışı bırakma?</string>
+    <string name="fabric_upload_disabled">Çökme günlükleri yükleme devre dışı bırakıldı!</string>
+    <string name="about_link_urls">\n\nDokümantasyon:\nhttps://wiki.aaps.app\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <plurals name="days">
         <item quantity="one">%1$d gün</item>
         <item quantity="other">%1$d gün</item>
diff --git a/plugins/constraints/src/main/res/values-fr-rFR/exam.xml b/plugins/constraints/src/main/res/values-fr-rFR/exam.xml
index 1371ce92c5..f7e834f313 100644
--- a/plugins/constraints/src/main/res/values-fr-rFR/exam.xml
+++ b/plugins/constraints/src/main/res/values-fr-rFR/exam.xml
@@ -5,9 +5,12 @@
     <string name="dia_profile">Vous devez définir la valeur de DAI dans votre profil.</string>
     <string name="dia_minimumis5h">La valeur minimale autorisée est de 5 heures.</string>
     <string name="dia_hint1">https://wiki.aaps.app/fr/latest/Configuration/Config-Builder.html#insuline</string>
+    <string name="dia_meaningisequaltodiapump">Si vous êtes convaincu que la valeur de DAI utilisée dans votre pompe avant AAPS marche bien, il n\'y a pas besoin de la changer lorsque vous commencez à utiliser la boucle.</string>
     <string name="dia_valuemustbedetermined">Vous devez déterminer par vous-même la valeur appropriée pour la DAI.</string>
     <string name="hypott_label">Cible temporaire Hypo</string>
+    <string name="hypott_whenhypott">Quelle est la raison principale pour définir une cible temp hypo?</string>
     <string name="hypott_wrongbasal">Pour corriger les hypos causés par des paramètres de débit basal incorrects.</string>
+    <string name="hypott_preventoversmb">Pour empêcher AAPS de surcorriger une hausse de glycémie causée par les glucides à action rapide utilisés pour traiter une hypo.</string>
     <string name="hypott_exercise">Pour corriger une hypo due à un exercice.</string>
     <string name="hypott_0basal">Pour éviter que la glycémie ne baisse s\'il y a déjà un débit de basal temporaire de 0%.</string>
     <string name="hypott_hint1">https://wiki.aaps.app/fr/latest/Usage/temptarget.html</string>
@@ -16,7 +19,10 @@
     <string name="offlineprofile_nsprofile">Le profil NS peut être utilisé, mais il n\'est pas configuré.</string>
     <string name="offlineprofile_hint1">https://wiki.aaps.app/fr/latest/Configuration/Config-Builder.html#profil</string>
     <string name="pumpdisconnect_label">Motifs pour l\'utilisation de la \"Déconnexion de pompe\" dans AAPS</string>
+    <string name="pumpdisconnect_whattodo">Que faire lorsque vous déconnectez la pompe de votre corps ?</string>
     <string name="pumpdisconnect_unnecessary">C\'est inutile car l\'insuline ne sera pas délivrée si la pompe est physiquement déconnectée.</string>
+    <string name="pumpdisconnect_missinginsulin">Cela empêche AAPS de comptabiliser l\'insuline qui n\'a pas été injectée quand la pompe est physiquement déconnectée.</string>
+    <string name="pumpdisconnect_notstop">Cela n\'arrêtera pas la distribution d\'insuline si la pompe reste connectée à votre corps.</string>
     <string name="pumpdisconnect_openloop">Cela passera AAPS en mode boucle ouverte.</string>
     <string name="pumpdisconnect_hint1">https://wiki.aaps.app/fr/latest/Getting-Started/FAQ.html#autres-parametres</string>
     <string name="objectives_label">Paramètres AAPS</string>
@@ -82,6 +88,7 @@
     <string name="prerequisites2_what">Qu\'est-ce qui est essentiel pour mettre en place et utiliser AAPS ?</string>
     <string name="prerequisites2_profile">Informations validées pour configurer un profil (SI, ratio G/I, débits de basal, DAI, etc.).</string>
     <string name="prerequisites2_device">Un appareil Android compatible (par ex. téléphone mobile, montre Android version complète ou tablette).</string>
+    <string name="prerequisites2_internet">AAPS nécessite une connexion internet pour fonctionner en boucle fermée.</string>
     <string name="prerequisites2_supportedcgm">Une MGC prise en charge et une application appropriée pour recevoir des valeurs de glycémie sur le téléphone/appareil.</string>
     <string name="prerequisites2_hint1">https://wiki.aaps.app/fr/latest/Module/module.html</string>
     <string name="update_label">Mise à jour d\'AAPS</string>
@@ -111,6 +118,9 @@
     <string name="sensitivity_label">Plugins de Sensibilité</string>
     <string name="sensitivity_which">Sélectionnez toutes les bonnes réponses.</string>
     <string name="sensitivity_adjust">Les plugins de sensibilité permettent à AAPS de s\'adapter aux changements temporaires ou de courte durée de la sensibilité à l\'insuline (par ex. changements hormonaux ou problèmes d\'absorption sur le site d\'infusion).</string>
+    <string name="sensitivity_edit">Les plugins de sensibilité fournissent à l\'utilisateur des modifications suggérées pour les débits de basal, les ratios G/I et SI qui peuvent être utilisés pour éditer le profil.</string>
+    <string name="sensitivity_cannula">Le changement de canule réinitialisera le ratio Autosens à 100%.</string>
+    <string name="sensitivity_time">Certaines des options du plugin ont des plages de temps configurables qui peuvent être définies par l\'utilisateur.</string>
     <string name="sensitivity_hint1">https://wiki.aaps.app/fr/latest/Configuration/Sensitivity-detection-and-COB.html</string>
     <string name="sensitivity_hint2">https://wiki.aaps.app/fr/latest/Usage/Open-APS-features.html#autosens</string>
     <string name="wrongcarbs_label">Entrées de glucides erronées</string>
@@ -120,15 +130,23 @@
     <string name="wrongcarbs_donothing">Ne faites rien – AAPS effectuera les ajustements appropriés.</string>
     <string name="wrongcarbs_bolus">Bolus avec insuline en utilisant le bouton Insuline (bolus) dans Aperçu (Accueil).</string>
     <string name="wronginsulin_label">Erreurs de saisie/injection d\'insuline</string>
+    <string name="wronginsulin_whattodo">Que devriez-vous faire si vous avez reçu moins d\'insuline que l\'historique de la pompe suggère par ex. à cause d\'une occlusion, d\'une mauvaise canule ou d\'un oubli de rebranchement de la pompe après une douche ?</string>
     <string name="wronginsulin_careportal">Supprimez les données d\'insuline de Nightscout Careportal pour le retirer de l\'historique de la pompe.</string>
     <string name="wronginsulin_compare">Comparer les valeurs dans l\'historique d\'AAPS et de la pompe (si la pompe le permet).</string>
     <string name="wronginsulin_prime">Faites un bolus du montant de votre insuline calculée « manquante » soit par seringue / stylo ou en utilisant un amorçage.</string>
     <string name="wronginsulin_donothing">Ne faites rien et laissez AAPS corriger le taux élevé de glycémie qui en résulte.</string>
     <string name="cob_label">Glucides Actifs (GA)</string>
+    <string name="cob_question">Comment le changement de la SI impacte le calcul des GA effectué par AAPS ?</string>
+    <string name="cob_longer">L\'augmentation de la SI allongera le temps d\'absorption des glucides calculé</string>
+    <string name="cob_shorter">L\'augmentation de la SI réduira le temps d\'absorption des glucides calculé</string>
     <string name="cob_no_effect">L\'augmentation de la SI n\'affectera pas les calculs de l\'absorption des glucides</string>
     <string name="cob2_question">Comment le changement de G/I impacte le calcul des GA ?</string>
+    <string name="cob2_longer">L\'augmentation du G/I allongera le temps d\'absorption des glucides calculé</string>
+    <string name="cob2_shorter">L\'augmentation du G/I réduira le temps d\'absorption des glucides calculé</string>
     <string name="cob2_no_effect">L\'augmentation de G/I n\'impactera pas l\'absorption des glucides calculés</string>
     <string name="cob3_question">Comment le changement du pourcentage de profil impacte le calcul des GA ?</string>
+    <string name="cob3_longer">Définir le profil à 150% allongera le temps d\'absorption des glucides calculé</string>
+    <string name="cob3_shorter">Définir le profil à 150% réduira le temps d\'absorption des glucides calculé</string>
     <string name="cob3_no_effect">Définir le profil à 150% n\'impactera pas le calcul de l\'absorption des glucides</string>
     <string name="iob_value">La valeur de l\'IA est impactée par les débits de basal temporaires émis.</string>
     <string name="iob_hightemp">Une basale temp haute ne sera pas donnée quand votre glycémie est en dessous de la cible.</string>
@@ -137,6 +155,7 @@
     <string name="breadgrams_label">Entrée de glucides et bolus</string>
     <string name="breadgrams_grams">Seuls les grammes doivent être utilisés pour estimer et enregistrer les glucides consommés.</string>
     <string name="breadgrams_exchange">Les glucides consommés peuvent être enregistrés à l\'aide d\'un système d\'échange approprié (par exemple, les échanges DAFNE \"CHO\" ou les \"Unités de Pain\" européennes).</string>
+    <string name="breadgrams_decay">AAPS utilise un modèle dynamique pour estimer l\'absorption des glucides et calculer les GA.</string>
     <string name="breadgrams_calc">Si les glycémies sont en dehors des valeurs acceptables (trop faibles ou trop élevées), la calculatrice de bolus peut être utilisée pour fournir des suggestions de corrections de glucides ou d\'insuline.</string>
     <string name="breadgrams_hint1">https://wiki.aaps.app/fr/latest/Getting-Started/FAQ.html#rapport-glucides-insuline-g-i-g-u</string>
     <string name="extendedcarbs_label">e-Glucides</string>
@@ -144,6 +163,7 @@
     <string name="extendedcarbs_future">Pour planifier les glucides dans le futur, éventuellement répartis sur un intervalle de temps (similaire à un bolus étendu distribuant l\'insuline sur une durée).</string>
     <string name="extendedcarbs_free">Pour enregistrer des glucides d\'exercice \"libres\" que vous souhaitez masquer à AAPS.</string>
     <string name="extendedcarbs_fat">Les e-glucides (distribués plus tard) peuvent aider AAPS à traiter les repas à haute teneur en graisses/protéines.</string>
+    <string name="extendedcarbs_rescue">Pour enregistrer les glucides de secours que vous utilisez pour traiter la glycémie faible.</string>
     <string name="extendedcarbs_hint1">https://wiki.aaps.app/fr/latest/Usage/Extended-Carbs.html</string>
     <string name="nsclient_label">Surveillance à distance</string>
     <string name="nsclient_howcanyou">Comment pouvez-vous surveiller AAPS à distance (par exemple pour votre enfant) ?</string>
@@ -154,6 +174,8 @@
     <string name="nsclient_hint1">https://wiki.aaps.app/fr/latest/Children/Children.html</string>
     <string name="isf_label_exam">Sensibilité à l\'Insuline (SI)</string>
     <string name="isf_increasingvalue">Augmenter la SI entraînera une augmentation de la quantité d\'insuline pour couvrir une quantité spécifique de glucides.</string>
+    <string name="isf_decreasingvalue">Réduire la SI entraînera une augmentation de la quantité d\'insuline pour corriger une glycémie supérieure à la cible.</string>
+    <string name="isf_noeffect">L\'augmentation ou la diminution de la SI n\'affectent pas l\'injection d\'insuline lorsque la glycémie est inférieur à la cible.</string>
     <string name="isf_preferences">La SI doit être saisie dans vos préférences AAPS.</string>
     <string name="isf_profile">La modification de la SI dans le profil est suffisant pour appliquer le changement.</string>
     <string name="isf_hint1">https://wiki.aaps.app/fr/latest/Getting-Started/FAQ.html#sensibilite-a-l-insuline-si-mmol-l-u-ou-mg-dl-u</string>
@@ -165,14 +187,17 @@
     <string name="ic_decreasingvalue">Les ratios G/I plus faibles conduisent à moins d\'insuline injectée pour une quantité donnée de glucides.</string>
     <string name="ic_noeffect">Si vous avez 0 GA, changer le ratio G/I conduira à différentes quantités d\'insuline pour corriger une valeur de glycémie donnée.</string>
     <string name="ic_different">Le G/I sera différent si vous comptez l\'unité (d\'échange) de pain à 10g ou à 12g.</string>
+    <string name="ic_meaning">Le G/I (Ratio Glucides/Insuline) est : combien d\'unités (d\'échange) de pain sont couverte par 1U d\'insuline?</string>
     <string name="ic_hint1">https://wiki.aaps.app/fr/latest/Getting-Started/FAQ.html#rapport-glucides-insuline-g-i-g-u</string>
     <string name="profileswitch_label">Changement de profil</string>
+    <string name="profileswitch_pctwillchange">Quand vous spécifiez un changement de profil à 90%, quelles réponses sont vraies ?</string>
     <string name="profileswitch_basallower">Le débit de base sera diminuée de 10%.</string>
     <string name="profileswitch_isfhigher">La valeur de SI sera augmentée de 10%.</string>
     <string name="profileswitch_iclower">La valeur du ratio G/I sera un nombre 10% inférieur.</string>
     <string name="profileswitch_unchanged">Les ratios SI et G/I seront inchangés.</string>
     <string name="profileswitch_hint1" formatted="false">https://wiki.aaps.app/fr/latest/Usage/Profiles.html</string>
     <string name="profileswitch2_label">Changement de profil</string>
+    <string name="profileswitch2_pctwillchange">Quand vous spécifiez un changement de profil à 120%, quelles réponses sont vraies ?</string>
     <string name="profileswitch2_bghigher">La glycémie cible sera 20% plus élevée.</string>
     <string name="profileswitch2_basalhigher">Le débit de base sera 20% plus élevé.</string>
     <string name="profileswitch2_bgunchanged">La glycémie cible sera inchangée.</string>
@@ -181,14 +206,21 @@
     <string name="profileswitchtime_iwant">Si vous vous réveillez 2 heures plus tôt que d\'habitude, comment informez-vous AAPS du changement de votre planning ?</string>
     <string name="profileswitchtime_2">Faites un changement de profil avec un décalage horaire de 2</string>
     <string name="profileswitchtime__2">Faites un changement de profil avec un décalage horaire de -2</string>
+    <string name="profileswitchtime_tt">Fixez la cible temp \"repas imminent\".</string>
+    <string name="profileswitchtime_100">Faites un changement de profil à plus de 100%.</string>
     <string name="profileswitchtime_hint1">https://wiki.aaps.app/fr/latest/Usage/Profiles.html#decalage-horaire</string>
     <string name="profileswitch4_label">Changements de profils</string>
     <string name="profileswitch4_rates">Les débits de basal, SI, ratios G/I, etc. doivent être définis dans les profils.</string>
     <string name="profileswitch4_internet">L\'activation des modifications apportées à votre profil Nightscout nécessite que votre téléphone AAPS soit connecté à Internet.</string>
     <string name="profileswitch4_sufficient">Modifier les profils pour changer des valeurs est suffisant pour mettre en œuvre toutes les modifications effectuées.</string>
+    <string name="profileswitch4_multi">Plusieurs profils peuvent être définis et sélectionnés pour s\'adapter à des circonstances changeantes (par ex. changements hormonaux, changement de poste de travail, jours de semaine/week-end).</string>
     <string name="basalhelp_hint1">https://wiki.aaps.app/fr/latest/Module/module.html#un-bon-algorithme-de-dosage-individuel-pour-votre-diabete</string>
     <string name="basalhelp_label">Aide sur les débits de basal</string>
+    <string name="basalhelp_where">Où aller pour obtenir de l\'aide pour la configuration de votre débit de basal et d\'autres paramètres.</string>
     <string name="basalhelp_diabetesteam">Votre équipe médicale</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
+    <string name="other_medication_label">Autres médicaments. Veuillez lire l\'énoncé ci-dessous et cocher la case pour accepter la déclaration.</string>
+    <string name="other_medication_text">AAPS réduit le débit de basal ou suspend l\'injection d\'insuline pour augmenter le taux de sucre dans le sang. Les médicaments du groupe d\'inhibiteurs SGLT2 (gliflozins) peuvent empêcher l\'augmentation de la glycémie et ainsi produire une carence dangereuse en insuline conduisant à une acidocétose DKA.
+\nLes noms de marque communes sont : Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nJe m\'engage à ne pas prendre ces médicaments lors de l\'utilisation d\'AAPS ou à désactiver la boucle avant de les utiliser.</string>
 </resources>
diff --git a/plugins/constraints/src/main/res/values-no-rNO/exam.xml b/plugins/constraints/src/main/res/values-no-rNO/exam.xml
index 6ccb53391d..814af09aa8 100644
--- a/plugins/constraints/src/main/res/values-no-rNO/exam.xml
+++ b/plugins/constraints/src/main/res/values-no-rNO/exam.xml
@@ -5,9 +5,12 @@
     <string name="dia_profile">Du skal sette verdien for DIA i profilen din.</string>
     <string name="dia_minimumis5h">Minimum tillatt DIA verdi er 5 timer.</string>
     <string name="dia_hint1">https://wiki.aaps.app/en/latest/Configuration/Config-Builder.html#insulin</string>
+    <string name="dia_meaningisequaltodiapump">Hvis du føler at DIA verdien (insulinvarigheten) som du benyttet i pumpen fungerte godt før du tok i bruk AndroidAPS, da er det ikke nødvendig å endre dette når du starter å loope.</string>
     <string name="dia_valuemustbedetermined">Du må selv bestemme hvilken verdi som passer for DIA.</string>
     <string name="hypott_label">Hypo Temp-Target (TT)</string>
+    <string name="hypott_whenhypott">Hva er hovedgrunnen til å velge en hypo temp-target?</string>
     <string name="hypott_wrongbasal">For å korrigere følinger som er forårsaket av feil i dine basalinnstillinger.</string>
+    <string name="hypott_preventoversmb">For å forhindre at AAPS overkorrigerer for en blodglukoseøkning forårsaket av de hurtigvirkende karbohydratene som brukes til behandling av en hypo.</string>
     <string name="hypott_exercise">For å korrigere for en føling som er et resultat av trening.</string>
     <string name="hypott_0basal">For å forhindre at blodsukkeret blir lavt selv om basaldosen allerede er 0%.</string>
     <string name="hypott_hint1">https://wiki.aaps.app/en/latest/Usage/temptarget.html</string>
@@ -16,7 +19,10 @@
     <string name="offlineprofile_nsprofile">NS profil kan brukes, men ikke konfigureres.</string>
     <string name="offlineprofile_hint1">https://wiki.aaps.app/en/latest/Configuration/Config-Builder.html#profile</string>
     <string name="pumpdisconnect_label">Årsaker for å velge \"Koble fra pumpen\" i AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">Hva skal gjøres når du kobler pumpen fra kroppen din?</string>
     <string name="pumpdisconnect_unnecessary">Dette er unødvendig siden insulin ikke vil bli levert hvis pumpen er fysisk frakoblet.</string>
+    <string name="pumpdisconnect_missinginsulin">Det hjelper AndroidAPS å forstå at ingen insulin ble levert mens pumpen var fysisk frakoblet.</string>
+    <string name="pumpdisconnect_notstop">Det stopper ikke tilførselen av insulin hvis pumpen forblir koblet til kroppen din.</string>
     <string name="pumpdisconnect_openloop">Det vil sette AndroidAPS i åpen loop modus.</string>
     <string name="pumpdisconnect_hint1">https://wiki.aaps.app/en/latest/Getting-Started/FAQ.html#other-settings</string>
     <string name="objectives_label">AAPS innstillinger</string>
@@ -82,6 +88,7 @@
     <string name="prerequisites2_what">Hva er nødvendig for å sette opp og bruke AAPS?</string>
     <string name="prerequisites2_profile">Validert informasjon for å konfigurere din profil (ISF, KH ratio, basal doser, DIA etc.).</string>
     <string name="prerequisites2_device">En kompatibel Android enhet (f.eks. mobiltelefon, full Android klokke, eller nettbrett).</string>
+    <string name="prerequisites2_internet">AndroidAPS krever en internett forbindelse for å kunne kjøre lukket loop.</string>
     <string name="prerequisites2_supportedcgm">En støttet CGM og passende app som mottar blodsukkerverdier på mobilen/enheten.</string>
     <string name="prerequisites2_hint1">https://wiki.aaps.app/en/latest/Module/module.html</string>
     <string name="update_label">Oppdatering av AAPS</string>
@@ -111,6 +118,9 @@
     <string name="sensitivity_label">Sensitivitets plugin</string>
     <string name="sensitivity_which">Kontroller alle riktige svar.</string>
     <string name="sensitivity_adjust">Sensitivitets plugin gjør det mulig for AAPS å gjøre midlertidige eller kortvarige justeringer av insulin sensitivitet (f. eks. hormonelle forandringer eller problemer med absorpsjon ved innstikkstedet).</string>
+    <string name="sensitivity_edit">Sensitivitets plugin gir brukeren forslag til endringer i basaldoser, KH ratio og ISF som kan benyttes til å redigere profilen.</string>
+    <string name="sensitivity_cannula">Hvis du logger bytte av kanyle vil Autosens verdien tilbakestilles til 100%.</string>
+    <string name="sensitivity_time">Noen plugins har konfigurerbare tidsintervaller som kan settes av brukeren.</string>
     <string name="sensitivity_hint1">https://wiki.aaps.app/en/latest/Configuration/Sensitivity-detection-and-COB.html</string>
     <string name="sensitivity_hint2">https://wiki.aaps.app/en/latest/Usage/Open-APS-features.html#autosens</string>
     <string name="wrongcarbs_label">Feil i KH angivelse</string>
@@ -120,15 +130,23 @@
     <string name="wrongcarbs_donothing">Gjør ingenting - AndroidAPS vil gjøre nødvendige justeringer.</string>
     <string name="wrongcarbs_bolus">Gi bolus ved hjelp av Insulin knappen på hjem/oversikts siden.</string>
     <string name="wronginsulin_label">Feil i insulin levering/registrering</string>
+    <string name="wronginsulin_whattodo">Hva ska du gjøre hvis du har fått mindre insulin enn hva pumpens historikk viser, f.eks. på grunn av okklusjon, feil med kanyle eller om du har glemt å koble på pumpen etter en dusj?</string>
     <string name="wronginsulin_careportal">Fjern insulindata fra Nightscout slik at det slettes fra pumpens historikk.</string>
     <string name="wronginsulin_compare">Sammenlign verdiene i AndroidAPS og pumpehistorikken (hvis pumpen støtter dette).</string>
     <string name="wronginsulin_prime">Gi en bolus med en del av det insulinet du mangler enten med penn eller ved å bruke prime funksjonen.</string>
     <string name="wronginsulin_donothing">Ikke gjør noe og la AndroidAPS korrigere eventuelle høye blodsukkerverdier.</string>
     <string name="cob_label">Karbohydrater ombord (COB)</string>
+    <string name="cob_question">Hvordan vil endring av ISF-verdi påvirke COB-beregninger utført av AAPS?</string>
+    <string name="cob_longer">Økning av ISF verdien vil gjøre den beregnede karbohydrat absorpsjonstiden lengre</string>
+    <string name="cob_shorter">Økning av ISF verdien vil gjøre den beregnede karbohydrat absorpsjonstiden kortere</string>
     <string name="cob_no_effect">Økning av ISF påvirker ikke beregningen av absorbering av karbohydrater</string>
     <string name="cob2_question">Hvordan vil endring av IC-verdi påvirke COB-beregning?</string>
+    <string name="cob2_longer">Økning av IK-faktoren vil gjøre den beregnede karbohydrat absorpsjonstiden lengre</string>
+    <string name="cob2_shorter">Økning av IK-faktoren vil gjøre den beregnede karbohydrat absorpsjonstiden kortere</string>
     <string name="cob2_no_effect">Økning av IC påvirker ikke beregningen av absorbering av karbohydrater</string>
     <string name="cob3_question">Hvordan vil endring av profil-prosent påvirke COB-beregning?</string>
+    <string name="cob3_longer">Å sette profilen til 150% vil gjøre den beregnede karbohydrat absorpsjonstiden lengre</string>
+    <string name="cob3_shorter">Å sette profilen til 150% vil gjøre den beregnede karbohydrat absorpsjonstiden kortere</string>
     <string name="cob3_no_effect">Ved å sette profilen til 150% påvirkes ikke beregningen av absorbering av karbohydrater</string>
     <string name="iob_value">IOB verdi påvirkes av midlertidige temp basaler.</string>
     <string name="iob_hightemp">Høy temp basal vil ikke bli gitt når ditt blodsukker er under målverdi.</string>
@@ -137,6 +155,7 @@
     <string name="breadgrams_label">Karbohydrater og bolus</string>
     <string name="breadgrams_grams">Bare gram skal benyttes for å estimere og registrere spiste karbohydrater.</string>
     <string name="breadgrams_exchange">Karbohydrater som konsumeres kan registreres ved hjelp av et passende byttesystem (f.eks. DAFNE \"CHO\" eller europeiske \"brødenheter\").</string>
+    <string name="breadgrams_decay">AAPS bruker en dynamisk modell til å estimere karbohydrat opptaket og beregne COB.</string>
     <string name="breadgrams_calc">Hvis blodsukkernivået er utenfor akseptable verdier (for lavt eller for høy), kan boluskalkulatoren brukes til å gi forslag til korreksjoner for karbohydrater eller insulin.</string>
     <string name="breadgrams_hint1">https://wiki.aaps.app/en/latest/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
     <string name="extendedcarbs_label">e-Karbo</string>
@@ -144,6 +163,7 @@
     <string name="extendedcarbs_future">For å angi karbohydrater i fremtiden og/eller fordele dem over et tidsintervall (tilsvarende en forlenget bolus over et intervall).</string>
     <string name="extendedcarbs_free">For å logge \"frie\" treningskarbohydrater som du vil skjule for AndroidAPS.</string>
     <string name="extendedcarbs_fat">E-karbo som er registrert i fremtiden kan hjelpe AAPS å håndtere måltider som er fett/proteinrike.</string>
+    <string name="extendedcarbs_rescue">For å registrere karbohydrater som brukes til å korrigere lavt blodsukker.</string>
     <string name="extendedcarbs_hint1">https://wiki.aaps.app/en/latest/Usage/Extended-Carbs.html</string>
     <string name="nsclient_label">Fjernovervåking</string>
     <string name="nsclient_howcanyou">Hvordan kan du overvåke AndroidAPS (for eksempel for ditt barn) på eksternt?</string>
@@ -154,6 +174,8 @@
     <string name="nsclient_hint1">https://wiki.aaps.app/en/latest/Children/Children.html</string>
     <string name="isf_label_exam">Insulin Sensitivitetsfaktor (ISF)</string>
     <string name="isf_increasingvalue">Økte ISF-verdiene vil føre til levering av mer insulin for å dekke opp en viss mengde karbohydrater.</string>
+    <string name="isf_decreasingvalue">Redusering av ISF verdien vil føre til mer insulintilførsel for å korrigere et blodsukker som ligger over målverdien.</string>
+    <string name="isf_noeffect">Å øke eller senke ISF verdien har ingen effekt på insulintilførselen når blodsukkeret er lavere enn målverdien.</string>
     <string name="isf_preferences">ISF skal angis i dine AndroidAPS innstillinger.</string>
     <string name="isf_profile">Å endre ISF verdien i din profil er tilstrekkelig for å ta i bruk endringen.</string>
     <string name="isf_hint1">https://wiki.aaps.app/en/latest/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
@@ -165,14 +187,17 @@
     <string name="ic_decreasingvalue">Lavere insulin karbohydratforhold fører til at mindre insulin leveres for en gitt mengde karbohydrater.</string>
     <string name="ic_noeffect">Hvis du har 0 COB, vil endring av IK forholdet føre til endring av insulinmengden som trengs for å korrigere ditt BS nivå.</string>
     <string name="ic_different">IK vil være forskjellig hvis du regner en skive brød som 10g eller 12g.</string>
+    <string name="ic_meaning">IK faktor betyr: Hvor mange brødenheter som dekkes av 1E insulin?</string>
     <string name="ic_hint1">https://wiki.aaps.app/en/latest/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
     <string name="profileswitch_label">Profil bytte</string>
+    <string name="profileswitch_pctwillchange">Når du spesifiserer et profilbytte på 90%, hvilke svar er korrekte?</string>
     <string name="profileswitch_basallower">Basaldoser vil være 10% lavere.</string>
     <string name="profileswitch_isfhigher">ISF verdien vil være 10% høyere.</string>
     <string name="profileswitch_iclower">Verdien av KH ratio vil være 10 % lavere.</string>
     <string name="profileswitch_unchanged">ISF og KH ratio er uendret.</string>
     <string name="profileswitch_hint1" formatted="false">https://wiki.aaps.app/en/latest/Usage/Profiles.html#profile-switch</string>
     <string name="profileswitch2_label">Profil bytte</string>
+    <string name="profileswitch2_pctwillchange">Når du spesifiserer et profilbytte på 120%, hvilke svar er korrekte?</string>
     <string name="profileswitch2_bghigher">Blodsukkermålet vil være 20% høyere.</string>
     <string name="profileswitch2_basalhigher">Basaldoser vil være 20% høyere.</string>
     <string name="profileswitch2_bgunchanged">Blodsukkermålet vil være uforandret.</string>
@@ -181,14 +206,21 @@
     <string name="profileswitchtime_iwant">Hvis du står opp 2 timer tidligere enn vanlig, hvordan forteller du AndroidAPS om endringen i døgnrytmen din?</string>
     <string name="profileswitchtime_2">Gjør et profilbytte med en tidsforskyvning på 2</string>
     <string name="profileswitchtime__2">Gjør et profilbytte med en tidsforskyvning på -2</string>
+    <string name="profileswitchtime_tt">Angi et \"spise snart\" temp target.</string>
+    <string name="profileswitchtime_100">Gjør et profilbytte til mer enn 100%.</string>
     <string name="profileswitchtime_hint1">https://wiki.aaps.app/en/latest/Usage/Profiles.html#timeshift</string>
     <string name="profileswitch4_label">Endring av profil</string>
     <string name="profileswitch4_rates">Basalrater, ISF, KH ratio, etc., bør defineres i profiler.</string>
     <string name="profileswitch4_internet">Aktivering av endringer i Nightscout profilen din krever at din AndroidAPS telefon er koblet til Internett.</string>
     <string name="profileswitch4_sufficient">Å redigere verdier i profilen din er tilstrekkelig for å aktivere profilendringen.</string>
+    <string name="profileswitch4_multi">Flere profiler kan defineres og velges for å håndtere endringer i omstendigheter (f.eks. hormonelle endringer, skift arbeid, hverdager/helgedager).</string>
     <string name="basalhelp_hint1">https://wiki.aaps.app/en/latest/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
     <string name="basalhelp_label">Hjelp med basaldoser</string>
+    <string name="basalhelp_where">Hvor kan du få hjelp til å sette opp basalsatsen og andre innstillinger.</string>
     <string name="basalhelp_diabetesteam">Ditt diabetesteam</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
+    <string name="other_medication_label">Annen medisinering. Vennligst les utsagnet nedenfor, og kryss av i boksen for å godta erklæringen.</string>
+    <string name="other_medication_text">AndroidAPS reduserer basaldoser eller utsetter insulindoser for å få en økning i blodsukkerverdier. Medisiner av typen SGLT2 hemmere (gliflozins) kan redusere eller hemme forventet økning i blodsukker og kan derfor føre til akutt og farlig høyt blodsukker ketoacidose (DKA).
+\nVanlige medisinnavn er: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nJeg lover å ikke ta slike medisiner mens jeg bruker AndroidAPS og vil deaktivere bruken av loop mens jeg bruker slik medisin.</string>
 </resources>
diff --git a/plugins/constraints/src/main/res/values-ru-rRU/exam.xml b/plugins/constraints/src/main/res/values-ru-rRU/exam.xml
index 53abaa6134..735a53a492 100644
--- a/plugins/constraints/src/main/res/values-ru-rRU/exam.xml
+++ b/plugins/constraints/src/main/res/values-ru-rRU/exam.xml
@@ -5,9 +5,12 @@
     <string name="dia_profile">Следует задать значение DIA в вашем профиле.</string>
     <string name="dia_minimumis5h">Минимально допустимое значение-5 часов.</string>
     <string name="dia_hint1">https://wiki.aaps.app/en/latest/Configuration/Config-Builder.html#insulin</string>
+    <string name="dia_meaningisequaltodiapump">Если вы удовлетворены значением длительности действия инсулина DIA, заданным в помпе до AAPS, то при запуске цикла изменять это значение не требуется.</string>
     <string name="dia_valuemustbedetermined">Следует самостоятельно определить DIA подходящее для вас.</string>
     <string name="hypott_label">Временная цель Гипо </string>
+    <string name="hypott_whenhypott">Какова основная причина для установки временной цели гипо?</string>
     <string name="hypott_wrongbasal">Для коррекции гипо, вызванных неверными настройками базальной скорости.</string>
+    <string name="hypott_preventoversmb">Чтобы не допустить чрезмерной коррекции подъема ГК, вызванного быстрыми углеводами, принятыми для устранения гипо.</string>
     <string name="hypott_exercise">Чтобы исправить гипо вызванное нагрузкой.</string>
     <string name="hypott_0basal">Чтобы предотвратить снижение уровня глюкозы в крови, если временная базальная скорость уже 0%.</string>
     <string name="hypott_hint1">https://wiki.aaps.app/en/latest/Usage/temptarget.html</string>
@@ -16,7 +19,10 @@
     <string name="offlineprofile_nsprofile">Профилем NS можно пользоваться, но не настраивать.</string>
     <string name="offlineprofile_hint1">https://wiki.aaps.app/en/latest/Configuration/Config-Builder.html#profile</string>
     <string name="pumpdisconnect_label">Причины применения опции «Отсоединить помпу» в AAPS</string>
+    <string name="pumpdisconnect_whattodo">Что следует делать при снятии помпы (отсоединении помпы от организма)?</string>
     <string name="pumpdisconnect_unnecessary">This is unnecessary as insulin will not be delivered if the pump is physically disconnected.</string>
+    <string name="pumpdisconnect_missinginsulin">Это позволяет AAPS не учитывать инсулин, который не был подан во время физического отключения помпы.</string>
+    <string name="pumpdisconnect_notstop">Это не прекратит подачу инсулина если помпа остается подключенной.</string>
     <string name="pumpdisconnect_openloop">Это переведет AAPS в режим открытого цикла.</string>
     <string name="pumpdisconnect_hint1">https://wiki.aaps.app/en/latest/Getting-Started/FAQ.html#other-settings</string>
     <string name="objectives_label">Настройки AAPS</string>
@@ -82,6 +88,7 @@
     <string name="prerequisites2_what">Что необходимо для настройки и использования AAPS?</string>
     <string name="prerequisites2_profile">Проверенные настройки профиля (чувствительность ISF, I:C, скорость базала, продолжительность действия инсулина и т.д.).</string>
     <string name="prerequisites2_device">Совместимое устройство на Android (мобильный телефон, планшет или часы на полноценном Android).</string>
+    <string name="prerequisites2_internet">AAPS требует подключения к интернету, чтобы работать в режиме замкнутого цикла.</string>
     <string name="prerequisites2_supportedcgm">Поддерживаемая система мониторинга и подходящее приложение для получения данных ГК на устройстве.</string>
     <string name="prerequisites2_hint1">https://wiki.aaps.app/en/latest/Module/module.html</string>
     <string name="update_label">Обновление AAPS</string>
diff --git a/plugins/constraints/src/main/res/values-sk-rSK/exam.xml b/plugins/constraints/src/main/res/values-sk-rSK/exam.xml
index 4aae92f32e..9bb5b627a1 100644
--- a/plugins/constraints/src/main/res/values-sk-rSK/exam.xml
+++ b/plugins/constraints/src/main/res/values-sk-rSK/exam.xml
@@ -5,9 +5,12 @@
     <string name="dia_profile">Mali by ste nastaviť hodnotu DIA vo vašom profile.</string>
     <string name="dia_minimumis5h">Minimálna hodnota je 5 hodín.</string>
     <string name="dia_hint1">https://wiki.aaps.app/cs/latest/Configuration/Config-Builder.html#inzulin</string>
+    <string name="dia_meaningisequaltodiapump">Pokiaľ ste spokojní s tým, že hodnota DIA použitá v pumpe pred AAPS dobre fungovala, nie je potrebné ju meniť, keď začínate s uzavretým okruhom.</string>
     <string name="dia_valuemustbedetermined">Mali by ste si pre seba určiť príslušnú hodnotu DIA.</string>
     <string name="hypott_label">Dočasný cieľ pri hypoglykémii</string>
+    <string name="hypott_whenhypott">Čo je primárnym dôvodom k nastaveniu dočasného cieľa \"Hypoglykémia\"?</string>
     <string name="hypott_wrongbasal">Upravovať hypoglykémie, spôsobené nesprávnym nastavením bazálu.</string>
+    <string name="hypott_preventoversmb">Aby sa zabránilo prehnanej korekcii, spôsobenej rýchlymi sacharidmi, použitými k liečbe hypoglykémie.</string>
     <string name="hypott_exercise">Napraviť hypo, ako dôsledok fyzickej aktivity.</string>
     <string name="hypott_0basal">Aby sa zabránilo zníženiu hladiny glukózy v krvi, pokiaľ už beží 0% dočasný bazál.</string>
     <string name="hypott_hint1">https://wiki.aaps.app/cs/latest/Usage/temptarget.html</string>
@@ -16,7 +19,10 @@
     <string name="offlineprofile_nsprofile">NS profil môže byť použitý, ale nenakonfigurovaný.</string>
     <string name="offlineprofile_hint1">https://wiki.aaps.app/cs/latest/Configuration/Config-Builder.html#profil</string>
     <string name="pumpdisconnect_label">Dôvody pre použitie \"Odpojiť pumpu\" v AAPS</string>
+    <string name="pumpdisconnect_whattodo">Čo je potrebné urobiť pri odpojení pumpy?</string>
     <string name="pumpdisconnect_unnecessary">Toto je zbytočné, pretože inzulín nebude vydaný v prípade, že je pumpa fyzicky odpojená.</string>
+    <string name="pumpdisconnect_missinginsulin">Zabraňuje AndroidAPS započítať inzulín, ktorý nebol vydaný, keď je pumpa fyzicky odpojená.</string>
+    <string name="pumpdisconnect_notstop">Nezastaví vydávanie inzulínu, pokiaľ pumpa zostane pripojená.</string>
     <string name="pumpdisconnect_openloop">Prepne AAPS do režimu otvoreného okruhu.</string>
     <string name="pumpdisconnect_hint1">https://wiki.aaps.app/cs/latest/Getting-Started/FAQ.html#dalsi-nastaveni</string>
     <string name="objectives_label">Nastavenie AAPS</string>
@@ -82,6 +88,7 @@
     <string name="prerequisites2_what">Čo je nevyhnutné pre nastavenie a používanie AAPS?</string>
     <string name="prerequisites2_profile">Overené informácie pre nastavenie profilu (ISF, pomer I:C, bazálne dávky, DIA atď.).</string>
     <string name="prerequisites2_device">Kompatibilné Android zariadenie (napr. mobilný telefón, Android hodinky, alebo tablet).</string>
+    <string name="prerequisites2_internet">AAPS vyžaduje pripojenie k internetu pre spustenie uzavretého okruhu.</string>
     <string name="prerequisites2_supportedcgm">Podporované CGM a vhodná aplikácia pre prijímanie glykémií v telefóne/zariadení.</string>
     <string name="prerequisites2_hint1">https://wiki.aaps.app/cs/latest/Module/module.html</string>
     <string name="update_label">Aktualizujem AAPS</string>
@@ -111,6 +118,9 @@
     <string name="sensitivity_label">Pluginy Citlivosť</string>
     <string name="sensitivity_which">Zaškrtnite všetky správne odpovede.</string>
     <string name="sensitivity_adjust">Pluginy citlivosti umožňujú AndroidAPS prispôsobiť sa dočasným, alebo krátkodobým zmenám v citlivosti inzulínu (napríklad hormonálne zmeny, alebo problémy s absorbciou na infúznom mieste).</string>
+    <string name="sensitivity_edit">Pluginy citlivosti poskytujú používateľovi návrh zmien bazálnych hodnôt, I:C pomerov a ISF, ktoré môžu byť použité k úprave profilu.</string>
+    <string name="sensitivity_cannula">Záznam o výmene kanyly, automaticky zresetuje hodnotu Autosense späť na 100%.</string>
+    <string name="sensitivity_time">Niektoré pluginy majú konfigurovateľné časové rozmedzie a používateľ si ich môže nastaviť.</string>
     <string name="sensitivity_hint1">https://wiki.aaps.app/cs/latest/Configuration/Sensitivity-detection-and-COB.html</string>
     <string name="sensitivity_hint2">https://wiki.aaps.app/cs/latest/Usage/Open-APS-features.html#autosens</string>
     <string name="wrongcarbs_label">Chyby pri zadávaní sacharidov</string>
@@ -120,15 +130,23 @@
     <string name="wrongcarbs_donothing">Nič nerobte – AAPS urobí vhodné úpravy.</string>
     <string name="wrongcarbs_bolus">Pošlite inzulín pomocou ikony Inzulín v prehľade.</string>
     <string name="wronginsulin_label">Chyby pri podávaní inzulínu</string>
+    <string name="wronginsulin_whattodo">Čo by ste mali urobiť, pokiaľ ste dostali menej inzulínu, než ukazuje história pumpy, napr. v dôsledku oklúzie, vadnej kanyly, alebo zabudnutia na opätovné pripojenie pumpy po sprche?</string>
     <string name="wronginsulin_careportal">Odstráňte dáta z Nightscoutu pre odstránenie z histórie pumpy.</string>
     <string name="wronginsulin_compare">Porovnaj hodnoty v AAPS z históriou v tvojej pumpe (ak pumpa podporuje túto funkciu).</string>
     <string name="wronginsulin_prime">Pošlite bolus na vypočítaný „chýbajúci“ inzulín buď injekčnou striekačkou, alebo perom, alebo pomocou plnenia na pumpe.</string>
     <string name="wronginsulin_donothing">Nerobte nič a dovoľte AAPS upraviť akúkoľvek výslednú vysokú hladinu glukózy v krvi.</string>
     <string name="cob_label">Aktívne sacharidy (COB)</string>
+    <string name="cob_question">Ako ovplyvňuje zmena hodnoty citlivosti výpočet COB?</string>
+    <string name="cob_longer">Zvýšenie citlivosti spôsobí, že vypočítaná doba absorbcie sacharidov bude dlhšia</string>
+    <string name="cob_shorter">Zvýšenie citlivosti spôsobí, že vypočítaná doba absorbcie sacharidov bude kratšia</string>
     <string name="cob_no_effect">Zvýšenie citlivosti neovplyvní vypočítanú absorbciu sacharidov</string>
     <string name="cob2_question">Ako ovplyvňuje zmena inzulíno-sacharidového pomeru výpočet COB?</string>
+    <string name="cob2_longer">Zvýšenie inzulino-sacharidového prevodu spôsobí, že vypočítaná doba absorbcie sacharidov bude dlhšia</string>
+    <string name="cob2_shorter">Zvýšenie inzulino-sacharidového prevodu spôsobí, že vypočítaná doba absorbcie sacharidov bude kratšia</string>
     <string name="cob2_no_effect">Zvýšenie inzulíno-sacharidového pomeru neovplyvní vypočítanú absorbciu sacharidov</string>
     <string name="cob3_question">Ako ovplyvňuje percentuálna zmena profilu výpočet COB?</string>
+    <string name="cob3_longer">Nastavenie profilu na 150% spôsobí, že vypočítaná doba absorbcie sacharidov bude dlhšia</string>
+    <string name="cob3_shorter">Nastavenie profilu na 150% spôsobí, že vypočítaná doba absorbcie sacharidov bude kratšia</string>
     <string name="cob3_no_effect">Nastavenie profilu na 150% neovplyvní vypočítanú absorbciu sacharidov</string>
     <string name="iob_value">Hodnota IOB je ovplyvnená vydanými dočasnými bazálmi.</string>
     <string name="iob_hightemp">Vysoký dočasný bazál nebude spustený, pokiaľ je Vaša glykémia nižšia, ako cieľ.</string>
@@ -137,6 +155,7 @@
     <string name="breadgrams_label">Zadávanie sacharidov a bolusov</string>
     <string name="breadgrams_grams">Iba gramy by mali byť použité pre odhad a záznam spotrebovaných sacharidov.</string>
     <string name="breadgrams_exchange">Spotrebované sacharidy je možné zaznamenávať pomocou vhodného systému (napr. \"sacharidové jednotky\").</string>
+    <string name="breadgrams_decay">AAPS používa dynamický model k odhadu vstrebávania sacharidov a k výpočtu COB.</string>
     <string name="breadgrams_calc">Pokiaľ sú hladiny glykémie v krvi mimo prijateľných hodnôt (príliš nízke, alebo príliš vysoké), môže byť použitá bolusová kalkulačka k podávaniu návrhov na sacharidy, alebo na korekčný bolus.</string>
     <string name="breadgrams_hint1">https://wiki.aaps.app/cs/latest/Getting-Started/FAQ.html#inzulinovosacharidovy-pomer-ic-g-u</string>
     <string name="extendedcarbs_label">e-sacharidy</string>
@@ -144,6 +163,7 @@
     <string name="extendedcarbs_future">Pre plánovanie budúcich sacharidov, prípadne distribuovaných v intervale (podobné predĺženému bolusu).</string>
     <string name="extendedcarbs_free">Pre zaznamenávanie \'falošných\' sacharidov pri cvičení, ktoré chcete skryť pred AAPS.</string>
     <string name="extendedcarbs_fat">e-sacharidy (distribuované v budúcnosti) môžu AAPS pomôcť pri narábaní s jedlami s vysokým obsahom tukov/bielkovín.</string>
+    <string name="extendedcarbs_rescue">Pre zaznamenávanie rýchlych sacharidov, použitých k liečbe nízkej hladiny glukózy v krvi.</string>
     <string name="extendedcarbs_hint1">https://wiki.aaps.app/cs/latest/Usage/Extended-Carbs.html</string>
     <string name="nsclient_label">Vzdialený monitoring</string>
     <string name="nsclient_howcanyou">Ako môžete vzdialene monitorovať AAPS (napríklad svoje dieťa)?</string>
@@ -154,6 +174,8 @@
     <string name="nsclient_hint1">https://wiki.aaps.app/cs/latest/Children/Children.html</string>
     <string name="isf_label_exam">Citlivosť inzulínu (ISF)</string>
     <string name="isf_increasingvalue">Zvýšenie hodnôt citlivosti povedie k väčšej dodávke inzulínu na pokrytie určitého množstva sacharidov.</string>
+    <string name="isf_decreasingvalue">Zníženie hodnôt citlivosti vedie k väčšiemu množstvu inzulínu na korekciu vyššej glykémie.</string>
+    <string name="isf_noeffect">Zvýšenie, alebo zníženie citlivosti nemá žiadny vplyv na výdaj inzulínu, pokiaľ sú hladiny glukózy v krvi pod cieľovou hodnotou.</string>
     <string name="isf_preferences">ISF by mala byť zadaná v nastaveniach AAPS.</string>
     <string name="isf_profile">Zmena hodnoty citlivosti vo vašom profile stačí k tomu, aby se táto zmena použila.</string>
     <string name="isf_hint1">https://wiki.aaps.app/cs/latest/Getting-Started/FAQ.html#inzulinovosacharidovy-pomer-ic-g-u</string>
@@ -165,14 +187,17 @@
     <string name="ic_decreasingvalue">Nižšie hodnoty I:C vedú k menšej dávke inzulínu ku rovnakému množstvu sacharidov.</string>
     <string name="ic_noeffect">Pokiaľ máte 0 COB, zmena inzulíno-sacharidového pomeru povedie k inému množstvu inzulínu vydanému pre korekciu glykémie.</string>
     <string name="ic_different">Inzulíno-sacharidový pomer sa bude líšiť podľa toho, či počítate sacharidovú jednotku ako 10 g, alebo ako 12 g sacharidov.</string>
+    <string name="ic_meaning">Inzulíno-sacharidový pomer vyjadruje: koľko sacharidových jednotiek pokryje 1 jednotka inzulínu?</string>
     <string name="ic_hint1">https://wiki.aaps.app/cs/latest/Getting-Started/FAQ.html#inzulinovosacharidovy-pomer-ic-g-u</string>
     <string name="profileswitch_label">Prepnutie profilu</string>
+    <string name="profileswitch_pctwillchange">Keď zadáte 90% profil, ktoré odpovede sú pravdivé?</string>
     <string name="profileswitch_basallower">Bazály budú o 10 % nižšie.</string>
     <string name="profileswitch_isfhigher">Hodnota citlivosti bude o 10 % vyššia.</string>
     <string name="profileswitch_iclower">Hodnota pomeru I:C bude o 10% nižšia.</string>
     <string name="profileswitch_unchanged">Hodnoty ISF a I:C budú nezmenené.</string>
     <string name="profileswitch_hint1" formatted="false">https://wiki.aaps.app/cs/latest/Usage/Profiles.html</string>
     <string name="profileswitch2_label">Prepnutie profilu</string>
+    <string name="profileswitch2_pctwillchange">Keď zadáte 120% profil, ktoré odpovede sú pravdivé?</string>
     <string name="profileswitch2_bghigher">Cieľová glykémia bude o 20 % vyššia.</string>
     <string name="profileswitch2_basalhigher">Bazály budú o 20 % vyššie.</string>
     <string name="profileswitch2_bgunchanged">Cieľová glykémia sa nezmení.</string>
@@ -181,14 +206,21 @@
     <string name="profileswitchtime_iwant">Pokiaľ sa prebudíte o 2 hodiny skôr než obvykle, ako by ste mali oznámiť AAPS túto zmenu?</string>
     <string name="profileswitchtime_2">Urobte prepnutie profilu s posunom času 2</string>
     <string name="profileswitchtime__2">Urobte prepnutie profilu s posunom času -2</string>
+    <string name="profileswitchtime_tt">Nastavte dočasný cieľ pre blížiace sa jedlo.</string>
+    <string name="profileswitchtime_100">Prepnite profil na viac ako 100 %.</string>
     <string name="profileswitchtime_hint1">https://wiki.aaps.app/cs/latest/Usage/Profiles.html</string>
     <string name="profileswitch4_label">Zmeny profilov</string>
     <string name="profileswitch4_rates">V profiloch by mali byť nastavené bazálne dávky, ISF, I:C pomery, atď.</string>
     <string name="profileswitch4_internet">Aktivácia zmien vašeho profilu Nightscout vyžaduje, aby váš telefón s AAPS mal k dispozícii pripojenie k internetu.</string>
     <string name="profileswitch4_sufficient">Úprava profilov za účelom zmeny hodnôt je dostatočná k vykonaniu všetkých urobených zmien.</string>
+    <string name="profileswitch4_multi">Je možné nastaviť a vybrať z viacerých profilov za účelom prispôsobenia sa meniacim sa okolnostiam (napr. hormonálne zmeny, práca na smeny, pracovné dni/životný štýl cez víkend).</string>
     <string name="basalhelp_hint1">https://wiki.aaps.app/cs/latest/Module/module.html#spravny-individualni-algoritmus-davkovani-pro-lecbu-vaseho-diabetu</string>
     <string name="basalhelp_label">Pomoc s bazálmi</string>
+    <string name="basalhelp_where">Kde ísť pre pomoc s nastavením vašeho bazálu a dalších nastavení.</string>
     <string name="basalhelp_diabetesteam">K Vášmu lekárovi</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
+    <string name="other_medication_label">Ostatné lieky. Prečítajte si prosím nižšie uvedené prehlásenie a potom zaškrtnite políčko pre prijatie prehlásenia.</string>
+    <string name="other_medication_text">AAPS znižuje bazály, alebo pozastavuje podávanie inzulínu, aby sa zvýšila hladina cukru v krvi. Lieky zo skupiny inhibítorov SGLT2 (gliflozíny) môžu zabrániť očakávanému zvýšeniu hodnoty glykémie a tak môžu produkovať nebezpečný nedostatok inzulínu (ketoacidózu).
+\nBežné značky sú: Invokana ®, Forxiga ®, Jardiance ®, Steglatro ®, Suglat ®, Apleway ®, Deberza ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\n. Týmto sľubujem, že tieto lieky neberiem pri používaní AAPS, alebo deaktivujem uzavretý okruh pred užívaním týchto liekov.</string>
 </resources>
diff --git a/plugins/constraints/src/main/res/values-tr-rTR/exam.xml b/plugins/constraints/src/main/res/values-tr-rTR/exam.xml
index 60449046e3..bfbc6cc953 100644
--- a/plugins/constraints/src/main/res/values-tr-rTR/exam.xml
+++ b/plugins/constraints/src/main/res/values-tr-rTR/exam.xml
@@ -5,9 +5,12 @@
     <string name="dia_profile">Profilinizde İES değerini ayarlamalısınız.</string>
     <string name="dia_minimumis5h">İzin verilen minimum değer 5 saattir.</string>
     <string name="dia_hint1">https://wiki.aaps.app/tr/latest/Configuration/Config-Builder.html#insulin</string>
+    <string name="dia_meaningisequaltodiapump">AAPS\'den önce pompanızda kullandığınız İES değerinin doğru olduğundan eminseniz, döngüye başladığınızda bunu değiştirmenize gerek yoktur.</string>
     <string name="dia_valuemustbedetermined">İES için uygun değeri kendiniz belirlemelisiniz.</string>
     <string name="hypott_label">Hipo Geçici-Hedef</string>
+    <string name="hypott_whenhypott">Hipo geçici hedef belirlemenin birincil nedeni nedir?</string>
     <string name="hypott_wrongbasal">Yanlış bazal oranı ayarlarından kaynaklanan hipoları düzeltmek için.</string>
+    <string name="hypott_preventoversmb">Hipo tedavisinde kullanılan hızlı etkili karbonhidratların neden olduğu kan şekeri artışında, AAPS\'in aşırı düzeltme yapmasını önlemek.</string>
     <string name="hypott_exercise">Egzersizin bir sonucu olarak tetiklenen hipoyu düzeltmek için.</string>
     <string name="hypott_0basal">Halihazırda %0 geçici bazal oran çalışıyorsa, kan şekerinin düşmesini önlemek için.</string>
     <string name="hypott_hint1">https://wiki.aaps.app/tr/latest/Usage/temptarget.html</string>
@@ -16,7 +19,10 @@
     <string name="offlineprofile_nsprofile">NS Profili kullanılabilir ancak yapılandırılamaz.</string>
     <string name="offlineprofile_hint1">https://wiki.aaps.app/tr/latest/Configuration/Config-Builder.html#profile</string>
     <string name="pumpdisconnect_label">AAPS\'de Pompa bağlantısını kesme nedenleri</string>
+    <string name="pumpdisconnect_whattodo">Pompa bağlantısı kesilirken ne yapılmalı?</string>
     <string name="pumpdisconnect_unnecessary">Pompanın fiziksel olarak bağlantısı kesilirse insülin iletilmeyeceğinden bu gereksizdir.</string>
+    <string name="pumpdisconnect_missinginsulin">AAPS\'nin, pompa fiziksel olarak bağlı değilken iletilmeyen insülini hesaba katmasını önler.</string>
+    <string name="pumpdisconnect_notstop">Pompa vücuda bağlı kalırsa insülin iletimini durdurmaz.</string>
     <string name="pumpdisconnect_openloop">AAPS\'yi açık döngü moduna gönderir.</string>
     <string name="pumpdisconnect_hint1">https://wiki.aaps.app/tr/latest/Getting-Started/FAQ.html#other-settings</string>
     <string name="objectives_label">AAPS Ayarları</string>
@@ -82,6 +88,7 @@
     <string name="prerequisites2_what">AAPS\'yi kurmak ve kullanmak için gerekenler nelerdir?</string>
     <string name="prerequisites2_profile">Profil oluşturmak için doğrulanmış bilgiler (ISF, I:C oranı, bazal oranlar, DIA vb.).</string>
     <string name="prerequisites2_device">Uyumlu bir Android cihaz (ör. cep telefonu, Android saat veya tablet).</string>
+    <string name="prerequisites2_internet">AAPS\'in kapalı döngüde çalışması için internet bağlantısı gerekir.</string>
     <string name="prerequisites2_supportedcgm">Telefonda/cihazda kan şekeri değerlerini almak için desteklenen bir CGM ve uygulama.</string>
     <string name="prerequisites2_hint1">https://wiki.aaps.app/tr/latest/Module/module.html</string>
     <string name="update_label">AAPS\'i güncelleme</string>
@@ -111,6 +118,9 @@
     <string name="sensitivity_label">Duyarlılık Eklentileri</string>
     <string name="sensitivity_which">Tüm doğru cevapları kontrol edin.</string>
     <string name="sensitivity_adjust">Duyarlılık eklentileri, AAPS\'nin insülin duyarlılığındaki geçici veya kısa süreli değişiklikleri (örneğin hormonal değişiklikler veya infüzyon bölgesinde emilim sorunları) ayarlamasına olanak tanır.</string>
+    <string name="sensitivity_edit">Duyarlılık eklentileri, kullanıcıya profili düzenlemek için kullanılabilecek bazal oranlar, K:İ oranları ve İDF için önerilen değişiklikleri sağlar.</string>
+    <string name="sensitivity_cannula">Bir kanül değişikliğinin kaydedilmesi, Otoduyarlılık oranını %100\'e sıfırlayacaktır.</string>
+    <string name="sensitivity_time">Eklenti seçeneklerinden bazıları, kullanıcı tarafından ayarlanabilen yapılandırılabilir zaman aralıklarına sahiptir.</string>
     <string name="sensitivity_hint1">https://wiki.aaps.app/tr/latest/Configuration/Sensitivity-detection-and-COB.html</string>
     <string name="sensitivity_hint2">https://wiki.aaps.app/tr/latest/Usage/Open-APS-features.html#autosens</string>
     <string name="wrongcarbs_label">Karbonhidrat Giriş Hataları</string>
@@ -120,15 +130,23 @@
     <string name="wrongcarbs_donothing">Hiçbir şey yapmayın – AAPS uygun ayarlamaları yapacaktır.</string>
     <string name="wrongcarbs_bolus">Genel Bakış\'ta İnsülin (bolus) düğmesini kullanarak insülin gönderme.</string>
     <string name="wronginsulin_label">İnsülin gönderme/giriş hataları</string>
+    <string name="wronginsulin_whattodo">Tıkanma, başarısız bir kanül veya duştan sonra pompayı tekrar takmayı unutma v.s. nedeniyle, pompa geçmişinin önerdiğinden daha az insülin aldıysanız ne yapmalısınız?</string>
     <string name="wronginsulin_careportal">Pompa geçmişinden çıkarmak için insülin verilerini Nightscout Bakım Portalından silin.</string>
     <string name="wronginsulin_compare">AAPS ve pompa geçmişindeki değerleri karşılaştırın (pompa bunu destekliyorsa).</string>
     <string name="wronginsulin_prime">Şırınga/kalem veya başlatma kullanarak hesaplanan \"eksik\" insülininizi bolus olarak karşılayın.</string>
     <string name="wronginsulin_donothing">Hiçbir şey yapmayın ve AAPS\'in ortaya çıkabilecek yüksek kan şekeri seviyesini düzeltmesine müsade edin.</string>
     <string name="cob_label">Aktif Karbonhidrat (AKRB)</string>
+    <string name="cob_question">İDF değerinin değiştirilmesi AKRB (Aktif karbonhidrat) hesaplamasını nasıl etkiler?</string>
+    <string name="cob_longer">Artan İDF, hesaplanan karbonhidrat emilim süresini uzatacaktır</string>
+    <string name="cob_shorter">Artan İDF, hesaplanan karbonhidrat emilim süresini kısaltır</string>
     <string name="cob_no_effect">Artan İDF, hesaplanan karbonhidrat emilimini etkilemez</string>
     <string name="cob2_question">Değişen Kİ değeri AKRB hesaplamasını nasıl etkiler?</string>
+    <string name="cob2_longer">Artan Kİ oranı, hesaplanan karbonhidrat emilim süresini uzatacaktır</string>
+    <string name="cob2_shorter">Artan Kİ oranı, hesaplanan karbonhidrat emilim süresini kısaltır</string>
     <string name="cob2_no_effect">Artan Kİ oranı, hesaplanan karbonhidrat emilimini etkilemez</string>
     <string name="cob3_question">Değişen profil yüzdesi AKRB hesaplamasını nasıl etkiler?</string>
+    <string name="cob3_longer">Profili %150\'ye ayarlamak, hesaplanan karbonhidrat emilim süresini uzatır</string>
+    <string name="cob3_shorter">Profili %150\'ye ayarlamak, hesaplanan karbonhidrat emilim süresini kısaltır</string>
     <string name="cob3_no_effect">Profili %150\'ye ayarlamak hesaplanan karbonhidrat emilimini etkilemez</string>
     <string name="iob_value">AİNS değeri, verilen geçici bazallardan etkilenir.</string>
     <string name="iob_hightemp">Kan şekeriniz hedefin altına düştüğünde yüksek geçici bazal verilmeyecektir.</string>
@@ -137,6 +155,7 @@
     <string name="breadgrams_label">Karbonhidrat girişi ve boluslar</string>
     <string name="breadgrams_grams">Tüketilen karbonhidratları tahmin etmek ve kaydetmek için sadece gram kullanılmalıdır.</string>
     <string name="breadgrams_exchange">Tüketilen karbonhidratlar uygun bir değişim sistemi kullanılarak kaydedilebilir (örn. DAFNE \"CHO\" değişimleri veya Avrupa \"Ekmek Birimleri\").</string>
+    <string name="breadgrams_decay">AAPS, karbonhidrat emilimini tahmin etmek ve AKRB\'ı hesaplamak için dinamik bir model kullanır.</string>
     <string name="breadgrams_calc">Kan şekeri seviyeleri kabul edilebilir değerlerin dışındaysa (çok düşük veya çok yüksek), karbonhidrat veya insülin düzeltmeleri için öneriler sağlamak için bolus hesaplayıcı kullanılabilir.</string>
     <string name="breadgrams_hint1">https://wiki.aaps.app/tr/latest/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
     <string name="extendedcarbs_label">yayma-karbonhidratlar</string>
@@ -144,6 +163,7 @@
     <string name="extendedcarbs_future">Gelecekte karbonhidratları planlamak için, muhtemelen bir aralığa dağıtılır (bir aralıkta insülin dağıtan yayma bolusa benzer).</string>
     <string name="extendedcarbs_free">AAPS\'den gizlemek istediğiniz \'ücretsiz\' egzersiz karbonhidratlarını kaydetmek için.</string>
     <string name="extendedcarbs_fat">y-karbonhidratlar (gelecekte dağıtılacak) AAPS\'nin yüksek yağ/proteinli öğünlerle uğraşmasına yardımcı olabilir.</string>
+    <string name="extendedcarbs_rescue">Düşük kan şekerini tedavi etmek için kullandığınız karbonhidratları günlüğe kaydetmek için.</string>
     <string name="extendedcarbs_hint1">https://wiki.aaps.app/tr/latest/Usage/Extended-Carbs.html</string>
     <string name="nsclient_label">Uzaktan İzleme</string>
     <string name="nsclient_howcanyou">AAPS\'i (örneğin çocuğunuz için) uzaktan nasıl izleyebilirsiniz?</string>
@@ -154,6 +174,8 @@
     <string name="nsclient_hint1">https://wiki.aaps.app/tr/latest/Children/Children.html</string>
     <string name="isf_label_exam">İnsülin Duyarlılık Faktörü (İDF)</string>
     <string name="isf_increasingvalue">ISF değerlerini yükseltmek, belirli bir karbonhidrat miktarını karşılamak için daha fazla insülin verilmesine yol açacaktır.</string>
+    <string name="isf_decreasingvalue">İDF değerlerinin düşürülmesi, hedefin üzerinde bir kan şekerini düzeltmek için daha fazla insülin verilmesine yol açacaktır.</string>
+    <string name="isf_noeffect">İDF\'nin yükseltilmesi veya düşürülmesi, kan şekeri seviyeleri hedefin altında olduğunda insülin iletimini etkilemez.</string>
     <string name="isf_preferences">İDF, AAPS Tercihlerinize girilmelidir.</string>
     <string name="isf_profile">Profilinizdeki ISF değerini değiştirmeniz değişikliği uygulamak için yeterlidir.</string>
     <string name="isf_hint1">https://wiki.aaps.app/tr/latest/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
@@ -165,14 +187,17 @@
     <string name="ic_decreasingvalue">Daha düşük I:C oranları, belirli bir miktarda karbonhidrat için daha az insülin verilmesine yol açar.</string>
     <string name="ic_noeffect">0 AKRB varsa, Kİ oranını değiştirmek, belirli bir KŞ değerini düzeltmek için farklı insülin miktarına sebep olur.</string>
     <string name="ic_different">Ekmek (değişim) birimini 10g veya 12g olarak sayarsanız IC farklı olacaktır.</string>
+    <string name="ic_meaning">Kİ oranı anlamı şudur: 1Ü insülin kaç ekmek (takas) birimini kapsıyor?</string>
     <string name="ic_hint1">https://wiki.aaps.app/tr/latest/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
     <string name="profileswitch_label">Profil Değiştirme</string>
+    <string name="profileswitch_pctwillchange">%90\'lık bir profil değişimi belirlediğinizde hangi yanıtlar doğrudur?</string>
     <string name="profileswitch_basallower">Bazal oranlar %10 daha düşük olacaktır.</string>
     <string name="profileswitch_isfhigher">ISF %10 daha yüksek olacaktır.</string>
     <string name="profileswitch_iclower">I:C oranının değeri %10 daha düşük bir sayı olacaktır.</string>
     <string name="profileswitch_unchanged">ISF ve I:C oranları değişmeyecektir.</string>
     <string name="profileswitch_hint1" formatted="false">https://wiki.aaps.app/tr/latest/Usage/Profiles.html#profile-switch</string>
     <string name="profileswitch2_label">Profil Değiştirme</string>
+    <string name="profileswitch2_pctwillchange">%120\'lık bir profil değişimi belirlediğinizde hangi yanıtlar doğrudur?</string>
     <string name="profileswitch2_bghigher">Hedef kan şekeri %20 daha yüksek olacaktır.</string>
     <string name="profileswitch2_basalhigher">Bazal oranlar %20 daha yüksek olacaktır.</string>
     <string name="profileswitch2_bgunchanged">Hedef kan şekeri değişmeyecektir.</string>
@@ -181,14 +206,21 @@
     <string name="profileswitchtime_iwant">Normalden 2 saat önce kalkarsanız, zaman değişikliğini AAPS\'e nasıl bildirmelisiniz?</string>
     <string name="profileswitchtime_2">2 saatlik bir zaman kayması ile bir profil değişikliği başlatın</string>
     <string name="profileswitchtime__2">-2saatlik bir zaman kayması ile bir profil değişikliği başlatın</string>
+    <string name="profileswitchtime_tt">Geçici hedef olarak \"Yakında Öğün\" belirleyin.</string>
+    <string name="profileswitchtime_100">%100\'den fazla bir profil geçişi yapın.</string>
     <string name="profileswitchtime_hint1">https://wiki.aaps.app/tr/latest/Usage/Profiles.html#timeshift</string>
     <string name="profileswitch4_label">Profillerdeki değişiklikler</string>
     <string name="profileswitch4_rates">Profillerde bazal oranlar, ISF, I:C oranları vb. ayarlanmalıdır.</string>
     <string name="profileswitch4_internet">Nightscout Profilinizdeki değişiklikleri etkinleştirmek, AAPS kurulu telefonunuzun internete bağlı olmasını gerektirir.</string>
     <string name="profileswitch4_sufficient">Değerleri değiştirmek için profi düzenlemek, yapılan değişiklikleri yürürlüğe koymak için yeterlidir.</string>
+    <string name="profileswitch4_multi">Değişen koşullara (ör. hormonal değişiklikler, vardiyalı çalışma, hafta içi/hafta sonu yaşam tarzı) uyum sağlamak için birden fazla profil ayarlanabilir ve seçilebilir.</string>
     <string name="basalhelp_hint1">https://wiki.aaps.app/tr/latest/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
     <string name="basalhelp_label">Bazal oranlarla ilgili yardım</string>
+    <string name="basalhelp_where">Bazal oranınızı ve diğer ayarlarınızı ayarlama konusunda yardım için nereye başvurabilirsiniz.</string>
     <string name="basalhelp_diabetesteam">Diyabet ekibiniz</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
+    <string name="other_medication_label">Diğer ilaçlarla etkileşim. Lütfen aşağıdaki beyanı okuyun ve ardından kabul etmek için kutuyu işaretleyin.</string>
+    <string name="other_medication_text">AAPS, kan şekerini yükseltmek için bazal oranları düşürür veya insülin iletimini askıya alır. SGLT2 inhibitörleri (gliflozinler) sınıfındaki ilaçlar kan şekerindeki artışları önleyebilir ve bu nedenle DKA\'ya (Diyabetik ketoasidoz) yol açan tehlikeli bir insülin eksikliğine yol açabilir.
+\nYaygın marka isimleri şunlardır: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nAAPS kullanırken bu tür ilaçları almayacağıma veya bu tür ilaçları kullanmadan önce döngüyü devre dışı bırakacağıma söz veriyorum.</string>
 </resources>
diff --git a/plugins/sync/src/main/res/values-no-rNO/strings.xml b/plugins/sync/src/main/res/values-no-rNO/strings.xml
index 69a188356a..88bb822eaf 100644
--- a/plugins/sync/src/main/res/values-no-rNO/strings.xml
+++ b/plugins/sync/src/main/res/values-no-rNO/strings.xml
@@ -102,5 +102,17 @@
     <string name="working">Prosesserer</string>
     <!-- xDrip status line -->
     <!-- Xdrip StatusLine -->
+    <string name="xdrip">xDrip+</string>
+    <string name="xdrip_shortname">XD</string>
+    <string name="description_xdrip">Send data til xDrip+</string>
+    <string name="xdrip_status_detailed_iob_title">Vis detaljert IOB</string>
+    <string name="xdrip_status_detailed_iob_summary">Splitt IOB i bolus- og basal-IOB på klokken</string>
+    <string name="xdrip_status_show_bgi_title">Vis BGI</string>
+    <string name="xdrip_status_show_bgi_summary">Legg til BGI i statuslinje</string>
+    <string name="xdrip_status_settings">xDrip+ avansert statuslinje</string>
+    <string name="disabled_loop">Loop deaktivert</string>
+    <string name="xdrip_send_status_title">Send statuslinje til xDrip+</string>
+    <string name="xdrip_not_installed">xDrip+ ikke installert</string>
+    <string name="calibration_sent">Kalibrering sendt til xDrip+</string>
     <!--    DataBroadcast-->
 </resources>
diff --git a/plugins/sync/src/main/res/values-ru-rRU/strings.xml b/plugins/sync/src/main/res/values-ru-rRU/strings.xml
index 5772e574bf..08f35efa07 100644
--- a/plugins/sync/src/main/res/values-ru-rRU/strings.xml
+++ b/plugins/sync/src/main/res/values-ru-rRU/strings.xml
@@ -109,6 +109,10 @@
     <string name="xdrip_status_detailed_iob_summary">Показать разбивку IOB на болюсный и базальный IOB на циферблате</string>
     <string name="xdrip_status_show_bgi_title">Показывать ГК</string>
     <string name="xdrip_status_show_bgi_summary">Добавить ГК в строку состояния</string>
+    <string name="xdrip_status_settings">Строка состояния xDrip+ подробно</string>
     <string name="disabled_loop">Цикл не активирован</string>
+    <string name="xdrip_send_status_title">Отправить строку состояния на xDrip+</string>
+    <string name="xdrip_not_installed">xDrip+ не установлен</string>
+    <string name="calibration_sent">Калибровка отправлена на xDrip+</string>
     <!--    DataBroadcast-->
 </resources>

From 1da267f05c65ccbe8e6f463abae525a2d65a892a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 7 Feb 2023 15:22:33 +0100
Subject: [PATCH 4/4] test targetsdk 33

---
 core/main/android_dependencies.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/main/android_dependencies.gradle b/core/main/android_dependencies.gradle
index 43ea057c27..fe07010896 100644
--- a/core/main/android_dependencies.gradle
+++ b/core/main/android_dependencies.gradle
@@ -1,8 +1,8 @@
 android {
-    compileSdkVersion 33
+    compileSdk 33
     defaultConfig {
         minSdkVersion 28
-        targetSdkVersion 28
+        targetSdkVersion 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }