Merge pull request #2971 from nightscout/dev

Release 3.2.0.1
This commit is contained in:
Milos Kozak 2023-10-23 20:54:07 +02:00 committed by GitHub
commit aeed6e2083
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 4 deletions

View file

@ -151,7 +151,9 @@ android {
useLibrary("org.apache.http.legacy") useLibrary("org.apache.http.legacy")
//Deleting it causes a binding error //Deleting it causes a binding error
dataBinding { enable } buildFeatures {
dataBinding = true
}
} }
allprojects { allprojects {

View file

@ -2,7 +2,7 @@ import org.gradle.api.JavaVersion
object Versions { object Versions {
const val appVersion = "3.2.0.0" const val appVersion = "3.2.0.1"
const val versionCode = 1500 const val versionCode = 1500
const val ndkVersion = "21.1.6352462" const val ndkVersion = "21.1.6352462"

View file

@ -51,6 +51,7 @@
<string name="extended_bolus">Bolus étendu</string> <string name="extended_bolus">Bolus étendu</string>
<string name="paused">En pause</string> <string name="paused">En pause</string>
<string name="tdd_total">DTQ Total</string> <string name="tdd_total">DTQ Total</string>
<string name="tdd_old_data">Données anciennes</string>
<string name="goingtodeliver">%1$.2f U vont être injectées</string> <string name="goingtodeliver">%1$.2f U vont être injectées</string>
<string name="waitingforpump">Attente connection pompe</string> <string name="waitingforpump">Attente connection pompe</string>
<string name="androidaps_start">AAPS démarré</string> <string name="androidaps_start">AAPS démarré</string>
@ -167,6 +168,8 @@
<string name="virtualpump_uploadstatus_title">Télécharger l\'état de la pompe sur NS ou Tidepool</string> <string name="virtualpump_uploadstatus_title">Télécharger l\'état de la pompe sur NS ou Tidepool</string>
<string name="suspendloop_label">Boucle désactivée/suspendue</string> <string name="suspendloop_label">Boucle désactivée/suspendue</string>
<string name="iob_label">Insuline Active (IA)</string> <string name="iob_label">Insuline Active (IA)</string>
<string name="loopstatus_targets">CIBLES:</string>
<string name="loopstatus_OAPS_result">RÉSULTATS OAPS:</string>
<!-- Protection--> <!-- Protection-->
<string name="wrongpassword">Mot de passe incorrect</string> <string name="wrongpassword">Mot de passe incorrect</string>
<string name="wrongpin">Code PIN incorrect</string> <string name="wrongpin">Code PIN incorrect</string>
@ -462,6 +465,8 @@
<string name="bolus_recorded_only">Les bolus seront seulement enregistrés (pas délivrés par la pompe)</string> <string name="bolus_recorded_only">Les bolus seront seulement enregistrés (pas délivrés par la pompe)</string>
<string name="advisoralarm">Alerter quand il est temps de manger</string> <string name="advisoralarm">Alerter quand il est temps de manger</string>
<string name="no_action_selected">Aucune action sélectionnée, rien ne se passera</string> <string name="no_action_selected">Aucune action sélectionnée, rien ne se passera</string>
<string name="carb_equal_zero_no_action">Glucides = 0. Aucune action !</string>
<string name="wizard_no_insulin_required">Aucune insuline requise !</string>
<string name="wizard_no_actual_bg">Pas de glycémie récente pour calculer !</string> <string name="wizard_no_actual_bg">Pas de glycémie récente pour calculer !</string>
<string name="wizard_no_active_profile">Aucun profil activé !</string> <string name="wizard_no_active_profile">Aucun profil activé !</string>
<string name="wizard_no_cob">GA inconnu! glycémie manquante ou démarrage récent de l\'application ?</string> <string name="wizard_no_cob">GA inconnu! glycémie manquante ou démarrage récent de l\'application ?</string>

View file

@ -51,6 +51,7 @@
<string name="extended_bolus">Vertraagde bolus</string> <string name="extended_bolus">Vertraagde bolus</string>
<string name="paused">Gepauzeerd</string> <string name="paused">Gepauzeerd</string>
<string name="tdd_total">TDD Totaal</string> <string name="tdd_total">TDD Totaal</string>
<string name="tdd_old_data">Oude gegevens</string>
<string name="goingtodeliver">%1$.2f E toedienen</string> <string name="goingtodeliver">%1$.2f E toedienen</string>
<string name="waitingforpump">Wacht op pomp</string> <string name="waitingforpump">Wacht op pomp</string>
<string name="androidaps_start">AAPS gestart</string> <string name="androidaps_start">AAPS gestart</string>
@ -167,6 +168,8 @@
<string name="virtualpump_uploadstatus_title">Upload pomp status naar NS of Tidepool</string> <string name="virtualpump_uploadstatus_title">Upload pomp status naar NS of Tidepool</string>
<string name="suspendloop_label">Uitgeschakelde/onderbroken loop</string> <string name="suspendloop_label">Uitgeschakelde/onderbroken loop</string>
<string name="iob_label">Insuline aan boord (IOB)</string> <string name="iob_label">Insuline aan boord (IOB)</string>
<string name="loopstatus_targets">DOELWAARDE:</string>
<string name="loopstatus_OAPS_result">OAPS RESULTAAT:</string>
<!-- Protection--> <!-- Protection-->
<string name="wrongpassword">Verkeerd wachtwoord</string> <string name="wrongpassword">Verkeerd wachtwoord</string>
<string name="wrongpin">Onjuiste PIN-code</string> <string name="wrongpin">Onjuiste PIN-code</string>
@ -462,6 +465,8 @@
<string name="bolus_recorded_only">Bolus wordt alleen geregistreerd (niet toegediend door pomp)</string> <string name="bolus_recorded_only">Bolus wordt alleen geregistreerd (niet toegediend door pomp)</string>
<string name="advisoralarm">Start alarm wanneer het tijd is om te eten</string> <string name="advisoralarm">Start alarm wanneer het tijd is om te eten</string>
<string name="no_action_selected">Geen actie geselecteerd, er zal niets uitgevoerd worden</string> <string name="no_action_selected">Geen actie geselecteerd, er zal niets uitgevoerd worden</string>
<string name="carb_equal_zero_no_action">Koolhydraten = 0. Geen actie!</string>
<string name="wizard_no_insulin_required">Geen insuline nodig!</string>
<string name="wizard_no_actual_bg">Geen recente BG om de berekening op te baseren!</string> <string name="wizard_no_actual_bg">Geen recente BG om de berekening op te baseren!</string>
<string name="wizard_no_active_profile">Geen actief profiel ingesteld!</string> <string name="wizard_no_active_profile">Geen actief profiel ingesteld!</string>
<string name="wizard_no_cob">Onbekende COB! BG uitlezing ontbreekt of de recente app herstart?</string> <string name="wizard_no_cob">Onbekende COB! BG uitlezing ontbreekt of de recente app herstart?</string>

View file

@ -97,7 +97,6 @@
<string name="combov2_cannot_set_absolute_tbr_if_basal_zero">לא ניתן להגדיר בזאלי זמני אם המינון הבזאלי הבסיסי הוא 0</string> <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">לא ניתן להגדיר בזאלי זמני אם המינון הבזאלי הבסיסי הוא 0</string>
<string name="combov2_pair_with_pump_summary">צימוד AndroidAPS ואנדרואיד עם משאבת Accu-Chek combo שאינה מצומדת</string> <string name="combov2_pair_with_pump_summary">צימוד AndroidAPS ואנדרואיד עם משאבת Accu-Chek combo שאינה מצומדת</string>
<string name="combov2_unpair_pump_summary">ביטול צימוד AndroidAPS ואנדרואיד ממשאבת Accu-Chek combo המצומדת</string> <string name="combov2_unpair_pump_summary">ביטול צימוד AndroidAPS ואנדרואיד ממשאבת Accu-Chek combo המצומדת</string>
<string name="combov2_unknown_tbr_detected">נמצא מינון בזאלי זמני לא ברור והוא נעצר; %1$d%; זמן נותר: %2$s</string>
<string name="combov2_connection_error">שגיאת חיבור: %1$s</string> <string name="combov2_connection_error">שגיאת חיבור: %1$s</string>
<string name="combov2_short_status_last_connection">חיבור אחרון: לפני %1$d דקות</string> <string name="combov2_short_status_last_connection">חיבור אחרון: לפני %1$d דקות</string>
<string name="combov2_short_status_alert">התראה: %s</string> <string name="combov2_short_status_alert">התראה: %s</string>

View file

@ -7,7 +7,7 @@
<string name="label_watchface_no_chart">AAPS (SansGraph)</string> <string name="label_watchface_no_chart">AAPS (SansGraph)</string>
<string name="label_watchface_circle">AAPS (Cercle)</string> <string name="label_watchface_circle">AAPS (Cercle)</string>
<string name="label_watchface_digital_style">AAPS (Digital)</string> <string name="label_watchface_digital_style">AAPS (Digital)</string>
<string name="label_watchface_custom">AAPS(perso)</string> <string name="label_watchface_custom">AAPS (perso)</string>
<string name="label_actions_tile">AAPS (Actions)</string> <string name="label_actions_tile">AAPS (Actions)</string>
<string name="label_temp_target_tile">AAPS(Cible Temp)</string> <string name="label_temp_target_tile">AAPS(Cible Temp)</string>
<string name="label_quick_wizard_tile">AAPS(Assistant rapide)</string> <string name="label_quick_wizard_tile">AAPS(Assistant rapide)</string>