From d4365a235216d8e93cd07637e343df287ac0f143 Mon Sep 17 00:00:00 2001
From: "Markus M. May" <triplem@javafreedom.org>
Date: Wed, 10 Jan 2018 22:11:20 +0100
Subject: [PATCH 01/12] Add a unit test for Insulin Plugin

---
 .../info/nightscout/androidaps/data/Iob.java  |  22 +++
 .../Insulin/InsulinOrefBasePlugin.java        |  31 ++++-
 .../Insulin/InsulinOrefBasePluginTest.java    | 131 ++++++++++++++++++
 3 files changed, 177 insertions(+), 7 deletions(-)
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePluginTest.java

diff --git a/app/src/main/java/info/nightscout/androidaps/data/Iob.java b/app/src/main/java/info/nightscout/androidaps/data/Iob.java
index ee70699604..762352782b 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/Iob.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/Iob.java
@@ -12,4 +12,26 @@ public class Iob {
         activityContrib += iob.activityContrib;
         return this;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Iob iob = (Iob) o;
+
+        if (Double.compare(iob.iobContrib, iobContrib) != 0) return false;
+        return Double.compare(iob.activityContrib, activityContrib) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        long temp;
+        temp = Double.doubleToLongBits(iobContrib);
+        result = (int) (temp ^ (temp >>> 32));
+        temp = Double.doubleToLongBits(activityContrib);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
index cbe5f2ff64..b91eefdc9c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.Insulin;
 
+import com.squareup.otto.Bus;
+
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Iob;
@@ -44,38 +46,53 @@ public abstract class InsulinOrefBasePlugin implements PluginBase, InsulinInterf
         return true;
     }
 
+    public Bus getBus() {
+        return MainApp.bus();
+    }
+
     @Override
     public double getDia() {
         double dia = getUserDefinedDia();
         if(dia >= MIN_DIA){
             return dia;
         } else {
-            if((System.currentTimeMillis() - lastWarned) > 60*1000) {
-                lastWarned = System.currentTimeMillis();
-                Notification notification = new Notification(Notification.SHORT_DIA, String.format(MainApp.sResources.getString(R.string.dia_too_short), dia, MIN_DIA), Notification.URGENT);
-                MainApp.bus().post(new EventNewNotification(notification));
-            }
+            sendShortDiaNotification(dia);
             return MIN_DIA;
         }
     }
 
+    void sendShortDiaNotification(double dia) {
+        if((System.currentTimeMillis() - lastWarned) > 60*1000) {
+            lastWarned = System.currentTimeMillis();
+            Notification notification = new Notification(Notification.SHORT_DIA, String.format(this.getNotificationPattern(), dia, MIN_DIA), Notification.URGENT);
+            this.getBus().post(new EventNewNotification(notification));
+        }
+    }
+
+    public String getNotificationPattern() {
+        return MainApp.sResources.getString(R.string.dia_too_short);
+    }
+
     public double getUserDefinedDia() {
         return MainApp.getConfigBuilder().getProfile() != null ? MainApp.getConfigBuilder().getProfile().getDia() : MIN_DIA;
     }
 
+    public Iob iobCalcForTreatment(Treatment treatment, long time) {
+        return this.iobCalcForTreatment(treatment, time, 0d);
+    }
+
     @Override
     public Iob iobCalcForTreatment(Treatment treatment, long time, double dia) {
         Iob result = new Iob();
 
         int peak = getPeak();
 
-
         if (treatment.insulin != 0d) {
 
             long bolusTime = treatment.date;
             double t = (time - bolusTime) / 1000d / 60d;
 
-            double td = getDia()*60; //getDIA() always > 5
+            double td = getDia()*60; //getDIA() always >= MIN_DIA
             double tp = peak;
 
             // force the IOB to 0 if over DIA hours have passed
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePluginTest.java
new file mode 100644
index 0000000000..de128175cc
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePluginTest.java
@@ -0,0 +1,131 @@
+package info.nightscout.androidaps.plugins.Insulin;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import info.nightscout.androidaps.data.Iob;
+import info.nightscout.androidaps.db.Treatment;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Created by triplem on 07.01.18.
+ */
+
+public class InsulinOrefBasePluginTest extends InsulinOrefBasePlugin {
+
+    private int peak;
+    private double dia;
+
+    private boolean shortDiaNotificationSend;
+
+    @Before
+    public void setUp() throws Exception {
+        this.peak = 0;
+        this.dia = InsulinOrefBasePlugin.MIN_DIA;
+        this.shortDiaNotificationSend = false;
+    }
+
+    @Test
+    public void testGetDia() throws Exception {
+        assertEquals(InsulinOrefBasePlugin.MIN_DIA, this.getDia(), 0);
+
+        this.dia = InsulinOrefBasePlugin.MIN_DIA + 1;
+        assertEquals(InsulinOrefBasePlugin.MIN_DIA + 1, this.getDia(), 0);
+
+        this.dia = InsulinOrefBasePlugin.MIN_DIA - 1;
+        assertEquals(InsulinOrefBasePlugin.MIN_DIA, this.getDia(), 0);
+        assertTrue(this.shortDiaNotificationSend);
+    }
+
+    @Test
+    public void testIobCalcForTreatment() {
+        Treatment treatment = new Treatment();
+        Iob expected = new Iob();
+
+        assertEquals(expected, this.iobCalcForTreatment(treatment, 0, 0d));
+
+        this.peak = 30;
+        long time = System.currentTimeMillis();
+        treatment.date = time - 1 * 60 * 60 * 1000; // 1 hour
+        treatment.insulin = 10d;
+
+        assertEquals(3.92, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
+    }
+
+
+    /**
+     * this method is implemented to allow tests of the iobCalcForTreatment calculation
+      * @return
+     */
+    @Override
+    int getPeak() {
+        return this.peak;
+    }
+
+    /**
+     * Userdefined Dia is implemented to allow tests of the getDia method
+     *
+     * @return
+     */
+    public double getUserDefinedDia() {
+        return this.dia;
+    }
+
+    void sendShortDiaNotification(double dia) {
+        this.shortDiaNotificationSend = true;
+    }
+
+
+    // the following methods are implemented, but not needed...
+    @Override
+    String commentStandardText() {
+        return null;
+    }
+
+    @Override
+    public String getFragmentClass() {
+        return null;
+    }
+
+    @Override
+    public int getId() {
+        return 0;
+    }
+
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public String getFriendlyName() {
+        return null;
+    }
+
+    @Override
+    public boolean isEnabled(int type) {
+        return false;
+    }
+
+    @Override
+    public boolean isVisibleInTabs(int type) {
+        return false;
+    }
+
+    @Override
+    public void setFragmentEnabled(int type, boolean fragmentEnabled) {
+
+    }
+
+    @Override
+    public void setFragmentVisible(int type, boolean fragmentVisible) {
+
+    }
+
+    @Override
+    public int getPreferencesId() {
+        return 0;
+    }
+}

From 8d792a24db9ba081c608e2e448614182e4ddfd07 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 25 Jan 2018 11:21:27 +0100
Subject: [PATCH 02/12] bump 1.57a-dev

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6ecea2b3e1..169e5c8a5e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,7 +56,7 @@ android {
         targetSdkVersion 23
         multiDexEnabled true
         versionCode 1500
-        version "1.57-dev"
+        version "1.57a-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
 

From b11e30139144591e3e888866434d90d2e9b4a10a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 29 Jan 2018 20:05:16 +0100
Subject: [PATCH 03/12] ES translations

---
 app/src/main/res/values-es/strings.xml | 463 +++++++++++++++++++++++--
 1 file changed, 438 insertions(+), 25 deletions(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 988a92928d..d3f1c23744 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -296,7 +296,7 @@
     <string name="correctionbous">Corr</string>
     <string name="disabledloop">Loop Inactivo</string>
     <string name="mealbolus">Bolo Comida</string>
-    <string name="openapsma_valueoutofrange">Valor %s fuera de limites</string>
+    <string name="openapsma_valueoutofrange" formatted="false">Valor %s fuera de limites</string>
     <string name="overview_editquickwizard_buttontext">Botón Texto:</string>
     <string name="overview_editquickwizard_carbs">Carbs:</string>
     <string name="overview_editquickwizard_valid">Validar:</string>
@@ -314,7 +314,7 @@
     <string name="smscommunicator_tempbasalfailed">Fallo inicio basal temporal</string>
     <string formatted="false" name="smscommunicator_tempbasalset">Basal temporal %.2fU/h para %d min iniciada correctamente</string>
     <string name="smscommunicator_remotecommandsallowed">Permitir comandos SMS remotos</string>
-    <string name="smscommunicator_basalstopreplywithcode">Para parar basal temporal responder con codigo %s</string>
+    <string name="smscommunicator_basalstopreplywithcode" formatted="false">Para parar basal temporal responder con codigo %s</string>
     <string name="androidaps_start">AndroidAPS iniciado</string>
     <string name="es_lang">Español</string>
     <string name="ns_upload_only">NS solo subida (sinc. inactiva)</string>
@@ -326,27 +326,25 @@
     <string name="smscommunicator_unknowncommand">Comando desconocido o respuesta incorrecta</string>
     <string name="fillwarning">¡Por favor asegurar que la cantidad coincide con la especificación del set de infusión!</string>
     <string formatted="false" name="smscommunicator_basalreplywithcode">Para iniciar basal %.2fU/h responder con código %s</string>
-    <string name="actions_shortname">" "</string>
-    <string name="wear_shortname">" "</string>
-    <string name="virtualpump_shortname">" "</string>
-    <string name="treatments_shortname">" "</string>
-    <string name="temptargetrange_shortname">" "</string>
-    <string name="tempbasals_shortname">" "</string>
-    <string name="smscommunicator_shortname">" "</string>
-    <string name="simpleprofile_shortname">" "</string>
-    <string name="profileviewer_shortname">" "</string>
-    <string name="overview_shortname">" "</string>
-    <string name="objectives_shortname">" "</string>
-    <string name="oaps_shortname">" "</string>
-    <string name="loop_shortname">" "</string>
-    <string name="localprofile_shortname">" "</string>
-    <string name="danarpump_shortname">" "</string>
-    <string name="configbuilder_shortname">" "</string>
-    <string name="circadian_percentage_profile_shortname">" "</string>
-    <string name="careportal_shortname">" "</string>
+    <string name="actions_shortname">"acciones"</string>
+    <string name="virtualpump_shortname">"bomba virtual"</string>
+    <string name="treatments_shortname">"tratamientos"</string>
+    <string name="temptargetrange_shortname">" objectivos temporales"</string>
+    <string name="tempbasals_shortname">"objtemp"</string>
+    <string name="smscommunicator_shortname">"comunicacíon sms"</string>
+    <string name="simpleprofile_shortname">"Profil simple"</string>
+    <string name="profileviewer_shortname">"Profiles"</string>
+    <string name="overview_shortname">"General"</string>
+    <string name="objectives_shortname">"Objectivos"</string>
+    <string name="oaps_shortname">"OAPS"</string>
+    <string name="loop_shortname">"LOOP"</string>
+    <string name="localprofile_shortname">"LP"</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="configbuilder_shortname">"conf"</string>
+    <string name="careportal_shortname">CP</string>
     <string name="activity">Actividad</string>
-    <string name="alert_dialog_storage_permission_text">Por favo reinicia el teléfono o AndroidAPS desde ajustes de sistema, sino AndroidAPS no guardara registros (importantes para trazar y verificar que el algoritmo funciona correctamente)</string>
-    <string name="array_of_elements">Matriz de %d elementos. Valor actual:</string>
+    <string name="alert_dialog_storage_permission_text">Por favor reinicia el teléfono o AndroidAPS desde ajustes de sistema, sino AndroidAPS no guardara registros (importantes para trazar y verificar que el algoritmo funciona correctamente)</string>
+    <string name="array_of_elements" formatted="false">Matriz de %d elementos. Valor actual:</string>
     <string name="basal_rate">Ratio Basal:</string>
     <string name="basalvaluebelowminimum">Valor basal menor del mínimo. Perfil no fijado.</string>
     <string name="base_profile_label">Perfil Base</string>
@@ -363,7 +361,7 @@
     <string name="long_avgdelta">Media Larga Delta</string>
     <string name="low_mark">Marca BAJO</string>
     <string name="lowbattery">Batería Baja</string>
-    <string name="minago">%dmin antes</string>
+    <string name="minago" formatted="false">%dmin antes</string>
     <string name="openapsama_useautosens">Usar característica AMA autosens</string>
     <string name="openapsma_autosensdata_label">Datos Autosens</string>
     <string name="percentagefactor_hint">Factor porcentual para multiplicar el perfil base</string>
@@ -379,15 +377,430 @@
     <string name="short_avgdelta">Media corta delta</string>
     <string name="sms_bolus">Bolo:</string>
     <string name="sms_lastbg">Último BG:</string>
-    <string name="sms_minago">%dmin antes</string>
+    <string name="sms_minago" formatted="false">%dmin antes</string>
     <string name="smscommunicator_bolusdelivered">Bolo %.2fU enviado correctamente</string>
     <string name="target_range">Rango Objetivo:</string>
     <string name="units">Unidades:</string>
     <string name="error_only_numeric_digits_allowed">Sólo se permiten caracteres numéricos</string>
-    <string name="error_only_numeric_digits_range_allowed">Sólo se permiten dígitos en el rango %1$s - %2$s</string>
+    <string name="error_only_numeric_digits_range_allowed" formatted="false">Sólo se permiten dígitos en el rango %1$s - %2$s</string>
     <string name="error_field_must_not_be_empty">Este campo no puede estar vacío</string>
     <string name="error_phone_not_valid">Número de teléfono inválido</string>
     <string name="waitingforpump">Esperando bomba</string>
     <string name="it_lang">Italian</string>
     <string name="app_name">AndroidAPS</string>
+    <string name="nl_lang">hollandes</string>
+    <string name="el_lang">Griego</string>
+    <string name="ru_lang">Ruso</string>
+    <string name="sv_lang">Sueco</string>
+    <string name="openapsma_maxbasal_title">Max U/h para el perfil base</string>
+    <string name="openapsma_maxiob_title">"Max IOB basal OpenAPs puede emitir "</string>
+    <string name="smscommunicator_calibrationreplywithcode" formatted="false">Para enviar calibracion %.2f responder con codigo %s</string>
+    <string name="bolusrequested" formatted="false">Entregaré %.2fU</string>
+    <string name="danarprofile_dia_summary">Duración de acitividad de insulina</string>
+    <string name="pump_errors_history">Errores</string>
+    <string name="objectives_7_objective">habilitar funciones adicionales para uso durante el día como SMB</string>
+    <string name="openapsma_valuelimitedto" formatted="false">%.2f limitado a %.\"f</string>
+    <string name="smscommunicator_remotecommandnotallowed">no permitido el mando remoto</string>
+    <string name="smscommunicator_suspendreplywithcode" formatted="false">Para cancelar loop por %d minutos responde con codigo %s</string>
+    <string name="primefill">Rellenar/Llenar</string>
+    <string name="fillbolus_title">Llenar/Rellenar cantidad de insulina estándar</string>
+    <string name="timeshift_hint">Tiempo en horas en el que el perfil será movido</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="dia">DIA:</string>
+    <string name="edit_base_basal">Editar Base-Basal:</string>
+    <string name="edit_base_isf">Edidat Base-ISF:</string>
+    <string name="edit_base_ic">Editar Base-IC:</string>
+    <string name="circadian_percentage_profile">CircadianPercentageProfile</string>
+    <string name="wear">Reloj</string>
+    <string name="open_settings_on_wear">Abrir ajustes en reloj</string>
+    <string name="batterydischarged">Batería de la bomba descargada</string>
+    <string name="danarkoreanpump">DanaR Korean</string>
+    <string name="sms_actualbg">BG:</string>
+    <string name="mdi">MDI</string>
+    <string name="MM640g">MM640g</string>
+    <string name="ongoingnotificaction">Avisos permanentes</string>
+    <string name="old_data">DATOS CADUCADOS</string>
+    <string name="openapsama">OpenAPS AMA</string>
+    <string name="openapsma_scriptdebugdata_label">Script debug</string>
+    <string name="refresheventsfromnightscout">Renovar datos desde NS</string>
+    <string name="danar_stats">DanaR Stats</string>
+    <string name="danar_stats_cumulative_tdd">Dosis diaria cumulativa</string>
+    <string name="danar_stats_expweight">"Dosis diaria ampliada exponencialmente "</string>
+    <string name="danar_stats_basalrate">Base</string>
+    <string name="danar_stats_bolus">Bolo</string>
+    <string name="danar_stats_tdd">Dosis diaria</string>
+    <string name="danar_stats_date">Fecha</string>
+    <string name="danar_stats_ratio">Cuota</string>
+    <string name="danar_stats_amount_days"># Días</string>
+    <string name="danar_stats_weight">Peso</string>
+    <string name="danar_stats_warning_Message">Probablemente impreciso usando bolo para llenar/rellenar!</string>
+    <string name="danar_stats_olddata_Message">Datos caducados pro favor pincha RELOAD</string>
+    <string name="danar_stats_tbb">Basal total</string>
+    <string name="danar_stats_tbb2">Basal diaria *2</string>
+    <string name="circadian_percentage_profile_shortname">CPP</string>
+    <string name="wear_shortname">Reloj</string>
+    <string name="short_tabtitles">Tab titulo corto</string>
+    <string name="prefs_delta_title">Ajustes Delta</string>
+    <string name="always_use_shortavg">Usa siempre delta media corto en vez de delta simple</string>
+    <string name="always_use_shortavg_summary">Recomendado si los datos de origen no filtrados como xDrip son inestables.</string>
+    <string name="advancedsettings_title">Ajustes avancados</string>
+    <string name="danar_model" formatted="false">Modelo: %02X Protocolo: %02X Codigo: %02X</string>
+    <string name="profile">Perfiles</string>
+    <string name="openapsama_max_daily_safety_multiplier" translatable="false">max_daily_safety_multiplier</string>
+    <string name="openapsama_max_daily_safety_multiplier_summary">"Valor por defecte: 3 Esto es valor de seguridad establecido pos OpenAPS. Limita tu base al máximo de x3 de tu base máxima. No necesitas cambiar esto, pero debes tener en cuenta, que esto se esta discutiento sobre „3 x max diario; 4x actual“ pro razones de seguridad. "</string>
+    <string name="openapsama_current_basal_safety_multiplier" translatable="false">current_basal_safety_multiplier</string>
+    <string name="openapsama_current_basal_safety_multiplier_summary">"Ajuste pro defecto: 4 Esto es la otra mitad de los ajustes de seguridad de OpenAPS y la otra mitad de \"3x max diario, 4x actual\". Esto significa, que tu base no puede ser mas alta que el numero que multiplica tu base. Esto es para evitar que las personas se encuentren en situaciones peligrosas por aumentar mucho la base sin entender el algoritmo del sistema. El ajuste por defecto es x4. La mayoría de las personas nunca tendra que cambiar estos ajustes, si no debe modificar otros ajustes en la terapia. "</string>
+    <string name="openapsama_autosens_max" translatable="false">autosens_max</string>
+    <string name="openapsama_autosens_max_summary">"Ajuste por defecto: 1.2\nEsto es un multilicador para autosens (y pronto autotune) para poner un 20% limite máximo a la cota de autosens ratio, la que determina cuantos ajustes autosens puede hacer a la base, a cuanto puede ajustar ISF y a cuanto puede bajar el objective de glucosa.  "</string>
+    <string name="openapsama_autosens_min" translatable="false">autosens_min</string>
+    <string name="openapsama_autosens_min_summary">Ajuste pro defecto: 0.7\nEl otro lade de limitaciones de seguridad de autosens, limitando a cuanto puede bajar la base y a cuanto puede subir ISF y BG objectivos.</string>
+    <string name="openapsama_autosens_adjusttargets" translatable="false">autosens_adjust_targets</string>
+    <string name="openapsama_autosens_adjusttargets_summary">Ajuste pro defcto: true\nEsto se usa para permitir autosens a ajustar objectivos BG en addicion a ISF y bases.</string>
+    <string name="openapsama_bolussnooze_dia_divisor" translatable="false">bolussnooze_dia_divisor</string>
+    <string name="openapsama_bolussnooze_dia_divisor_summary">Ajuste pro defecto: 2 \nDormir bolo es iniciado después de proveder un bolo para comida, así el loop no interactuará con low temps cuando acabas de comer. El ajuste pro defecto es 2; quiere decir con el DIA de 3 h el bolo será dormido por fases por 1.5 h (3DIA/2).</string>
+    <string name="openapsama_min_5m_carbimpact" translatable="false">5_min_carb_impact</string>
+    <string name="openapsama_min_5m_carbimpact_summary">"Ajustes pro defecto: 3.0\nEsto es un ajuste pro defecto para la absorcion de carbohidratos pro 5 minutos. Por defecto se espera 3mg/dl/5min. Esto afecta la velocidad de reduccion de COB y cuanta absorcion se usa para calcular el BG futuro previsto, si la glucosa diminua mas de lo previsto o aumenta mas de lo previsto. "</string>
+    <string name="openapsama_link_to_preferncejson_doc_txt">"Atención!\nNormalment no tienes que editar los valores a continuacion. Por favor PINCHA AQUI y LEE el texto y PROCURA ENTENDER antes de cambiar alguno de los valores. "</string>
+    <string name="openapsama_link_to_preferncejson_doc">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
+    <string name="smscommunicator_invalidphonennumber">numero de telefonp incorrecto</string>
+    <string name="copy_to_clipboard">Copiar al Clipboard</string>
+    <string name="copied_to_clipboard">Copiado al clipboard</string>
+    <string name="nav_show_logcat">mostrar log</string>
+    <string name="overview_calibration">Calibracion</string>
+    <string name="overview_calibration_bg_label">Calibracion</string>
+    <string name="send_calibration" formatted="false">Mandar calibracion %.lf a xDrip?</string>
+    <string name="xdripnotinstalled">xDrip+ no instalado</string>
+    <string name="calibrationsent">Calibracion mandada a xDrip</string>
+    <string name="smscommunicator_remotecalibrationnotallowed">Calibracion remota no admitida</string>
+    <string name="smscommunicator_calibrationsent">Mandar calibracion tiene que ser activada en xDrip.</string>
+    <string name="smscommunicator_calibrationfailed">xDrip no recibe calibraciones</string>
+    <string name="dont_show_again">no mostrar otra vez</string>
+    <string name="pumpsuspendedclicktorefresh">Bomba parada. Pincha para aktualizar</string>
+    <string name="pumpsuspended">bomba parada</string>
+    <string name="gettingpumpstatus">recibir estado de bomba</string>
+    <string name="settingtempbasal">iniciando base temporal</string>
+    <string name="stoppingtempbasal">parando base temporal</string>
+    <string name="settingextendedbolus">iniciando bolo prolongado</string>
+    <string name="stoppingextendedbolus">parando bolo prolongado</string>
+    <string name="updatingbasalrates">actualizando cuota base</string>
+    <string name="disconnecting">Desconectando</string>
+    <string name="executing">Efectuando</string>
+    <string name="virtualpump_settings">Ajustes bomba virtual</string>
+    <string name="virtualpump_uploadstatus_title">Subiendo estado a NS</string>
+    <string name="wrongpassword">Contrasena invalida</string>
+    <string name="settings_password">Contrasena para ajustes</string>
+    <string name="unlock_settings">desbloquear ajustes</string>
+    <string name="approachingdailylimit">llegando al limite de insulina diario</string>
+    <string name="nsclientinternal">NSClient</string>
+    <string name="nsclientinternal_shortname">NSCI</string>
+    <string name="nsclientinternal_url">URL:</string>
+    <string name="nsclientinternal_autoscroll">Autoscroll</string>
+    <string name="restart">Reiniciar</string>
+    <string name="nsclientinternal_title">NSClient</string>
+    <string name="nsclientinternal_url_title">Nightscout URL</string>
+    <string name="nsclientinternal_url_dialogmessage">Indica Nightscout URL</string>
+    <string name="nsclientinternal_secret_title">NS API secret</string>
+    <string name="nsclientinternal_secret_dialogtitle">NS API secret</string>
+    <string name="nsclientinternal_secret_dialogmessage">Indica NS API secret (min 12 chars)</string>
+    <string name="nsclientinternal_devicename_title">Nombre aparato</string>
+    <string name="nsclientinternal_devicename_dialogtitle">Indica nombre aparato</string>
+    <string name="nsclientinternal_devicename_dialogmessage">Se usara para enteredBy field</string>
+    <string name="deliver_now">entregar ahora</string>
+    <string name="clear_queue">borrar cola</string>
+    <string name="show_queue">mostrar cola</string>
+    <string name="queue">Cola:</string>
+    <string name="status">Estado:</string>
+    <string name="paused">Pausado</string>
+    <string name="clearlog">Borrar log</string>
+    <string name="nowritepermission">NSCLIENT no tiene derecho para editar. API secret incorrecto?</string>
+    <string name="wear_settings">Ajustes reloj</string>
+    <string name="wear_detailedIOB_title">mostrar detalles IOB</string>
+    <string name="wear_detailedIOB_summary">Separar IOB en bolo y base en el reloj</string>
+    <string name="nosuccess">sin efecto - por favor controlar en móvil</string>
+    <string name="notavailable">no disponible</string>
+    <string name="patientage">Edad paciente</string>
+    <string name="child">Menor de edad</string>
+    <string name="teenage">Adolescente</string>
+    <string name="adult">Adulto</string>
+    <string name="patientage_summary">Por favor elige edad del paciente para emplear limites de seguridad</string>
+    <string name="Glimp">Glimp</string>
+    <string name="batteryoptimalizationerror">Aparato parece no soportar optimisacion de bateria whitelisting!</string>
+    <string name="pleaseallowpermission">Por favor permita Permission</string>
+    <string name="needwhitelisting" formatted="false">%s necesita optimisacion de bateria whitelisting para funcionar bien</string>
+    <string name="loopsuspended">Loop desactivado</string>
+    <string name="loopsuspendedfor" formatted="false">desactivado (%d m)</string>
+    <string name="loopsuperbolusfor" formatted="false">Superbolus (%d m)</string>
+    <string name="loopmenu">Loop menu</string>
+    <string name="suspendloopfor1h">Desactivar loop por 1h</string>
+    <string name="suspendloopfor2h">Desactivar loop por 2h</string>
+    <string name="suspendloopfor3h">Desactivar loop por 3h</string>
+    <string name="suspendloopfor10h">Desactivar loop por 10 h</string>
+    <string name="disconnectpumpfor30m">Desconectar bomba por 30 min</string>
+    <string name="disconnectpumpfor1h">Desconectar bomba por 1 h</string>
+    <string name="disconnectpumpfor2h">Desconectar bomba por 2 h</string>
+    <string name="disconnectpumpfor3h">Desconectar bomba por 3 h</string>
+    <string name="disconnectpumpfor10h">Desconectar bomba por 10 h</string>
+    <string name="resume">Reiniciar</string>
+    <string name="smscommunicator_wrongduration">duracion incorrecta</string>
+    <string name="smscommunicator_loopsuspended">Loop desactivado</string>
+    <string name="smscommunicator_loopresumed">Loop reiniciado</string>
+    <string name="treatments_wizard_bgtrend_label">Tendencia 15 min</string>
+    <string name="treatments_wizard_cob_label">COB</string>
+    <string name="superbolus">Superbolo</string>
+    <string name="ns_logappstartedevent">Indica app start en NS</string>
+    <string name="restartingapp">Aplicacion existente para aplicar ajustes.</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="configbuilder_insulin">Insulina</string>
+    <string name="fastactinginsulin">Insulina acción rápida</string>
+    <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
+    <string name="ultrafastactinginsulincomment">Fiasp</string>
+    <string name="insulin_shortname">INS</string>
+    <string name="fastactinginsulinprolonged">Insulina acción rápida prolongada</string>
+    <string name="enablesuperbolus">activar superbolo en wizard</string>
+    <string name="enablesuperbolus_summary">Activar función superbolo en wizard. No lo actives hasta que hayas aprendido lo que realmente hace. PUEDE CAUSAR SOBREDOSIS DE INSULINA usandolo sin precaucion!</string>
+    <string name="iob">IOB</string>
+    <string name="cob">COB</string>
+    <string name="predictionshortlabel">PRE</string>
+    <string name="basalshortlabel">BAS</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_bluetooth_status">Estado de bluetooth</string>
+    <string name="nav_about">Sobre</string>
+    <string name="smscommunicator_missingsmspermission">"Falta permitir SMS "</string>
+    <string name="dev">DEV</string>
+    <string name="xdripstatus_settings">xDrip Status (reloj)</string>
+    <string name="xdripstatus">xDrip Statusline (reloj)</string>
+    <string name="xdripstatus_shortname">xds</string>
+    <string name="wear_showbgi_title">Mostrar BGI</string>
+    <string name="wear_showbgi_summary">agregar BGI a status line</string>
+    <string name="ns_noupload">No upload to NS</string>
+    <string name="ns_noupload_summary">Todos los datos mandados a NS son borrados. AAPS esta conectado to NS pero no hay cambios en NS</string>
+    <string name="basal_step">Nivel base</string>
+    <string name="bolus_step">Nivel bolo</string>
+    <string name="extendedbolus">Bolo prolongado</string>
+    <string name="temptarget">"Objectivo temporal "</string>
+    <string name="overview_extendedbolus_cancel_button">cancelar bolo prolongado</string>
+    <string name="careportal_sensorage_label">Edad sensor</string>
+    <string name="careportal_canulaage_label">Edad cánula</string>
+    <string name="careportal_insulinage_label">Edad insulina</string>
+    <string name="hours">horas</string>
+    <string name="overview_newtempbasal_basaltype_label">Tipo base</string>
+    <string name="isfmissing">Falta ISF en perfil. Usando ajuste por defecto.</string>
+    <string name="icmissing">Falta IC en perfil. Usando ajuste por defecto.</string>
+    <string name="basalmissing">Falta base en perfil. Usando ajuste por defecto.</string>
+    <string name="targetmissing">"Falta objectivo en perfil. Usando ajuste por defecto. "</string>
+    <string name="invalidprofile">Perfil invalido !!!</string>
+    <string name="profileswitch">CambioPerfil</string>
+    <string name="careportal_pbage_label">Edad bateria bomba</string>
+    <string name="careportal_pumpbatterychange">Cambio bateria bomba</string>
+    <string name="ns_alarmoptions">Opciones alama</string>
+    <string name="nsalarm_urgenthigh">Urgente alto</string>
+    <string name="nsalarm_high">Alto</string>
+    <string name="nsalarm_low">Bajo</string>
+    <string name="nsalarm_urgentlow">Urgente bajo</string>
+    <string name="nsalarm_summary" formatted="false">Actualmente puesto a %f</string>
+    <string name="nsalarm_staledata">Stale data</string>
+    <string name="nsalarm_urgentstaledata">Urgent stale data</string>
+    <string name="nsalarm_staledatavalue_label">Stale data threshold [min]</string>
+    <string name="nsalarm_urgent_staledatavalue_label">Urgent stale data threshold [min]</string>
+    <string name="openapsama_autosens_period">Interval para autosens [h]</string>
+    <string name="openapsama_autosens_period_summary">Horas en el pasado para detectar sensividad (tiempo de absorcion de carbohidratos no incluidos)</string>
+    <string name="ratio_short">SEN</string>
+    <string name="do_not_track_profile_switch">"Ignora evenos de cambio de perfil "</string>
+    <string name="do_not_track_profile_switch_summary">"Totos los cambios de perfil son ignorados y se usa siempre el perfil actual "</string>
+    <string name="pump">Bomba</string>
+    <string name="openaps">OpenAPS</string>
+    <string name="device">Aparato</string>
+    <string name="uploader">Uploader</string>
+    <string name="configbuilder_sensitivity">Deteccion sensividad</string>
+    <string name="sensitivity_shortname">SENS</string>
+    <string name="sensitivityoref0">Sensitivity Oref0</string>
+    <string name="sensitivityaaps">Sensitivity AAPS</string>
+    <string name="absorptionsettings_title">Ajustes absorcion</string>
+    <string name="absorption_maxtime_title">Tiempo max absorcion comida [h]</string>
+    <string name="absorption_maxtime_summary">Tiempo esperado en el que todos los carbohidratos son absorbados</string>
+    <string name="danar_visualizeextendedaspercentage_title" formatted="false">mostrar bolo prolongado en %</string>
+    <string name="careportal_sensorage_label_short">SAGE</string>
+    <string name="careportal_insulinage_label_short">IAGE</string>
+    <string name="careportal_canulaage_label_short">CAGE</string>
+    <string name="careportal_pbage_label_short">PBAGE</string>
+    <string name="openaps_short">OAPS</string>
+    <string name="uploader_short">UPLD</string>
+    <string name="basal_short">BAS</string>
+    <string name="virtualpump_extendedbolus_label_short">EXT</string>
+    <string name="lock_screen">Pantalle proteccion</string>
+    <string name="lock_screen_short">Cierre</string>
+    <string name="sensitivity_warning">Al activar autosens recuerda editar todos carbohidratos comidos. Si no, sensividad será calculada incorrectamente !!!</string>
+    <string name="sensitivityweightedaverage">Sensitivity WeightedAverage</string>
+    <string name="mdtp_ok">OK</string>
+    <string name="mdtp_cancel">Cancelar</string>
+    <string name="cpp_sync_setting_missing">necesita ser activado para mandar valores a la bomba!</string>
+    <string name="cpp_notloadedplugins">Faltan perfiles!</string>
+    <string name="cpp_valuesnotstored">Valores no guardados!</string>
+    <string name="wear_overviewnotifications">Resumen avisos</string>
+    <string name="wear_overviewnotifications_summary">Mandar resumen de avisos como avisos de confirmacion por reloj.</string>
+    <string name="combopump" translatable="false">Accu-Chek Combo</string>
+    <string name="combopump_shortname" translatable="false">COMBO</string>
+    <string name="ns_localbroadcasts">Activar mensajes a otras aplicaciones (como xDrip).</string>
+    <string name="ns_localbroadcasts_title">Activar mensajes locales.</string>
+    <string name="careportal_activity_label">ACTIVITY Y FEEDBACK</string>
+    <string name="careportal_carbsandbolus_label">CARBS Y BOLUS</string>
+    <string name="careportal_cgm_label">CGM Y OPENAPS</string>
+    <string name="careportal_pump_label">PUMP</string>
+    <string name="overview_newtempbasal_basalabsolute">Valor base [U/h]</string>
+    <string name="careportal_newnstreatment_duration_min_label">Duracion [min]</string>
+    <string name="insulin_oref_peak">IOB Curve Peak Time</string>
+    <string name="insulin_peak_time">Peak Time [min]</string>
+    <string name="free_peak_oref">Free-Peak Oref</string>
+    <string name="rapid_acting_oref">Rapid-Acting Oref</string>
+    <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
+    <string name="dia_too_short" formatted="false">DIA de %s demasiado corto - usando %s!</string>
+    <string name="activate_profile">ACTIVAR PERFIL</string>
+    <string name="date">Fecha</string>
+    <string name="invalid">INVALIDO</string>
+    <string name="waitingforpairing">Esperando para conectar con bomba</string>
+    <string name="pairingok">Coneccion OK</string>
+    <string name="pairingtimedout">Coneccion fuera de tiempo</string>
+    <string name="pairing">CONECTANDO</string>
+    <string name="danars_nodeviceavailable">aparato no enconrado</string>
+    <string name="emptyreservoir">Deposito vacio</string>
+    <string name="bloodsugarmeasurementalert">Alerta de control de BG</string>
+    <string name="remaininsulinalert">Insulina restante en deposito</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="selectedpump">Bomba sleccionada</string>
+    <string name="pairpump">Conectar bomba nueva</string>
+    <string name="bolusspeed">Velocidad bolo</string>
+    <string name="danar_setbasalstep001">Poner paso base a 0.01 U/h</string>
+    <string name="serialnumber">Numero de serie</string>
+    <string name="careportal_newnstreatment_percentage_label">Porcientos</string>
+    <string name="careportal_newnstreatment_timeshift_label">Cambio de tiepmo</string>
+    <string name="default_temptargets">Ojbectivo temporal por defecto</string>
+    <string name="eatingsoon_duration">duracion comiendopronto</string>
+    <string name="eatingsoon_target">objectivo comiendopronto</string>
+    <string name="activity_duration">duracion actividad</string>
+    <string name="activity_target">objectivo actividad</string>
+    <string name="danar_history_prime">Prime</string>
+    <string name="gettingextendedbolusstatus">recibiendo estado de bolo prolongado</string>
+    <string name="gettingbolusstatus">recibiendo estado bolo</string>
+    <string name="gettingtempbasalstatus">recibiendo estado bolo temporal</string>
+    <string name="gettingpumpsettings">recibiendo ah´justes bomba</string>
+    <string name="gettingpumptime">recibiendo hora bomba</string>
+    <string name="reuse">usar otra vez</string>
+    <string name="wearcontrol_title">Control desde reloj</string>
+    <string name="wearcontrol_summary">editar y emitir abjectivos temp. y tratamientos por reloj</string>
+    <string name="connectiontimedout">Fuera tiempo coneccion</string>
+    <string name="food">comida</string>
+    <string name="shortgramm">g</string>
+    <string name="none"><![CDATA[<none>]]></string>
+    <string name="shortkilojoul">kJ</string>
+    <string name="shortenergy">En</string>
+    <string name="shortprotein">Pr</string>
+    <string name="shortfat">Grasa</string>
+    <string name="active"><![CDATA[<Active>]]></string>
+    <string name="waitingforestimatedbolusend" formatted="false">Esperande terminar bolo. Faltan %d seg.</string>
+    <string name="processinghistory">Processando</string>
+    <string name="startingbolus">"Iniciando emisioin bolo "</string>
+    <string name="executingrightnow">Orden se esta efectuando en este momento</string>
+    <string name="pumpdrivercorrected">control de la bomba corigido</string>
+    <string name="pump_unreachable">bomba no alcanzable</string>
+    <string name="missed_bg_readings">"Falta lectura BG "</string>
+    <string name="raise_notifications_as_android_notifications">Usa avisos del sistema para alarmas y avisos</string>
+    <string name="localalertsettings_title">Alarma local</string>
+    <string name="enable_missed_bg_readings_alert">Alarma si no llegan datos BG</string>
+    <string name="enable_pump_unreachable_alert">Alarma si bomba no es alcanzable</string>
+    <string name="urgent_alarm">Alarma urgente</string>
+    <string name="info">INFO</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Apaga el bluetooth del móvil por un segundo si no hay coneccion con la bomba. Esto ayuda con algunos moviles con problemas de establecer coneccion bluetooth estable.</string>
+    <string name="DexcomG5">DexcomG5 App (patched)</string>
+    <string name="dexcomg5_nsupload_title">Envias datos BG a NS</string>
+    <string name="dexcomg5_upload">G5 upload ajustes</string>
+    <string name="customapp">APK adaptada para bajar</string>
+    <string name="wear_detailed_delta_title">"mostrar detalles delta "</string>
+    <string name="wear_detailed_delta_summary">mostrar delta con una plaza decimal mas</string>
+    <string name="unsupportedfirmware">firmware de la bomba no apoyada</string>
+    <string name="dexcomg5_xdripupload_title">mandar BG a xDrip</string>
+    <string name="dexcomg5_xdripupload_summary">En xDrip elige 640g/Eversense date source</string>
+    <string name="nsclientbg">NSClient BG</string>
+    <string name="minimalbasalvaluereplaced">Valor base remplazado por valor mínimo</string>
+    <string name="overview_editquickwizard_usebg">Calculacion BG</string>
+    <string name="overview_editquickwizard_usebolusiob">Calculacion bolo IOB</string>
+    <string name="overview_editquickwizard_usebasaliob">Calculacion base IOB</string>
+    <string name="overview_editquickwizard_usetrend">Calculacion tendencia</string>
+    <string name="overview_editquickwizard_usesuperbolus">Calculacion superbolo</string>
+    <string name="yes">Si</string>
+    <string name="no">No</string>
+    <string name="positiveonly">Solo positivo</string>
+    <string name="negativeonly">Solo negativo</string>
+    <string name="overview_editquickwizard_usecob">Calculacion COB</string>
+    <string name="overview_editquickwizard_usetemptarget">Calculacion objectivo temporal</string>
+    <string name="loopenabled">Loop activado</string>
+    <string name="apsselected">APS seleccionado</string>
+    <string name="nsclienthaswritepermission">NSClient tiene permission de escribir</string>
+    <string name="closedmodeenabled">Modo cerrado activado</string>
+    <string name="maxiobset">Máximo IOB puesto correctamente</string>
+    <string name="hasbgdata">BG adquirible del origen seleccionado</string>
+    <string name="basalprofilenotaligned" formatted="false">Valores base no asignados a las horas: %s</string>
+    <string name="zerovalueinprofile" formatted="false">Perfil invalido: %s</string>
+    <string name="combo_programming_bolus">Programando bomba para emitir bolo</string>
+    <string name="combo_refresh">Actualizar</string>
+    <string name="combo_tdds">TDDS</string>
+    <string name="combo_pump_state_label">Estado</string>
+    <string name="combo_pump_activity_label">Actividad</string>
+    <string name="combo_no_pump_connection" formatted="false">Ninguna coneccnion por %d min</string>
+    <string name="combo_tbr_remaining" formatted="false">%d%% (%d min restan)</string>
+    <string name="combo_last_bolus" formatted="false">%.1f U (%s, %s)</string>
+    <string name="combo_pump_action_initializing">Iniciando</string>
+    <string name="combo_pump_state_disconnected">Desconectado</string>
+    <string name="combo_pump_state_suspended_due_to_error">Apagado por error</string>
+    <string name="combo_pump_state_suspended_by_user">Apagado por usario</string>
+    <string name="combo_pump_state_running">Funcionando</string>
+    <string name="combo_pump_action_cancelling_tbr">Cancelando TBR</string>
+    <string name="combo_pump_action_setting_tbr" formatted="false">Poniendo TBR (%d%% / %d min)</string>
+    <string name="combo_pump_action_bolusing" formatted="false">Emitiendo bolo (%.1f U)</string>
+    <string name="combo_pump_action_refreshing">Actualizando</string>
+    <string name="combo_pump_never_connected">Nunca</string>
+    <string name="combo_pump_unsupported_operation">"Acción no disponible en la bomba "</string>
+    <string name="combo_low_suspend_forced_notification">Uso inseguro: bolo prolongado o multiwave activo. Modo Loop ha sido puesto a baja emision para solo 6 horas. Solo bolo normal se puede emitir en modo loop.</string>
+    <string name="combo_force_disabled_notification">"Uso inseguro: la bomba usa base diferente a la primera. El loop ha sido apagado. Elige primero perfil en la bomba y acualiza. "</string>
+    <string name="bolus_frequency_exceeded">Un bolo de mismo valor ha sido dado durante el pasado minuto. Para evitar bolos dobles y asegurarse contra bugs esto no es permitido.</string>
+    <string name="combo_pump_connected_now">Ahora</string>
+    <string name="combo_activity_reading_pump_history">Leiendo historia bomba</string>
+    <string name="combo_pump_alerts">Alarmas</string>
+    <string name="combo_activity_setting_basal_profile">" Activando perfil base "</string>
+    <string name="combo_pump_cartridge_low_warrning">"Nivel del deposito bajo "</string>
+    <string name="combo_pump_battery_low_warrning">Bateria casi agotada</string>
+    <string name="combo_is_in_error_state" formatted="false">La bomba muesta el error E%d: %s</string>
+    <string name="combo_no_alert_data_note">Para leer historial de los errores, pincha unos segundo el boton \"ALARMAS\" ATENCION: esto puede causar un bug. La bomba no vuelve a conectarse - necesitas pulsar un boton en la misma bomba para reiniciarse. Deberias evitar esto.</string>
+    <string name="combo_no_tdd_data_note">Para leer el hisorial TDD de la bomba pulsa el boton TDDS unso segundos. ATENCION: esto puede causar un bug. La bomba no vuelve a conectarse - necesitas pulsar un boton en la misma bomba para reiniciarse. Deberias evitar esto.</string>
+    <string name="combo_tdd_minimum" formatted="false">Mínimo: %3.1f U</string>
+    <string name="combo_tdd_average" formatted="false">Media: %3.1f U</string>
+    <string name="combo_tdd_maximum" formatted="false">Máximo: %3.1f U</string>
+    <string name="combo_reservoir_low">Bajo</string>
+    <string name="combo_reservoir_empty">Vacio</string>
+    <string name="combo_reservoir_normal">Normal</string>
+    <string name="combo_notification_check_time_date">Se necesita actualizar reloj de la bomba</string>
+    <string name="combo_history">Historial</string>
+    <string name="combo_warning">Alerta</string>
+    <string name="combo_read_full_history_warning">"Esto lee todo el historial y estado de la bomba, tus datos, la base. Bolos, basales temporales y tratamientos seran copiados y agregados si no existen ya. Esto puede causar duplicaciones, por que la hora de la bomba no es precisa. Es uso de esto con el loop normal solo deb ser usado en cirumstancisas especiales. Si de todas meneras quieres usar esto pulsa este boton unos segundos otra vez. ADVERTENCIA: esto puede causar un bug. La bomba no vuelve a conectarse - necesitas pulsar un boton en la misma bomba para reiniciarse. Deberias evitar esto.   "</string>
+    <string name="combo_read_full_history_confirmation">"Estas seguro, de que quieres leer todos los datos de la bomba y acceptar las consequencias de esta acción? "</string>
+    <string name="combo_pump_tbr_cancelled_warrning">TBR cancelada, advertencia acceptada</string>
+    <string name="combo_error_no_bolus_delivered">Emision del bolo fallado. Ningún bolo se ha emitido. Para asegurarse, por favor controle la bomba para evitar bolo doble. Para evitar bugs no se reinician bolos automaticamente.</string>
+    <string name="combo_error_partial_bolus_delivered" formatted="false">"Solo %.2f U del bolo mandado de %.2f U ha sido emitido por causa de un error. Por favorn controla la bomba para confirmar y toma acciones apropiadas. "</string>
+    <string name="combo_error_bolus_verification_failed">"Fallo de emitir bolo y de controlar historical de la bomba.Por favor controla manualmente y crea un record en Careportal si el bolo ha sido emitido. "</string>
+    <string name="combo_error_bolus_recovery_progress">Reestablecido coneccion fallada.</string>
+    <string name="combo_reservoir_level_insufficient_for_bolus">"No hay suficiente insulina en el deposito para emitir bolo. "</string>
+    <string name="extendedbolusdeliveryerror">"Error al emitir bolo prolongado. "</string>
+    <string name="pump_unreachable_threshold">bomba no alcanzable treshold [min]</string>
+    <string name="treatments_wizard_tt_label">TT</string>
+    <string name="unsupportednsversion">Versión no acceptada de Nightscout</string>
+    <string name="enableloop">Activar loop</string>
+    <string name="disableloop">Desactivar loop</string>
+    <string name="sms_basal">Base:</string>
+    <string name="tempbasaldeliveryerror">Base temporal no emitida</string>
+    <string name="tempbasal">Base temporal</string>
+    <string name="sms_delta">Delta:</string>
+    <string name="sms_iob">IOB:</string>
 </resources>

From 44e6c874c0e2bc78a9b65af9cf35d53970724ba9 Mon Sep 17 00:00:00 2001
From: Andrew Warrington <awarring000@yahoo.com>
Date: Mon, 29 Jan 2018 23:31:54 +0100
Subject: [PATCH 04/12] BaseWatchFace: Resolve issue causing Bolus and Wizard
 activities to fail to complete.

---
 .../info/nightscout/androidaps/watchfaces/BaseWatchFace.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
index ea5b41176b..4da66729e3 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
@@ -70,7 +70,6 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
     public boolean layoutSet = false;
     public boolean bIsRound = false;
     public int pointSize = 2;
-    public int missed_readings_alert_id = 818;
     public BgGraphBuilder bgGraphBuilder;
     public LineChartView chart;
     public ArrayList<BgWatchData> bgDataList = new ArrayList<>();
@@ -181,7 +180,6 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
                 }
             }
         );
-        ListenerService.requestData(this);
         wakeLock.acquire(50);
     }
 
@@ -639,7 +637,7 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
             chart.setViewportCalculationEnabled(true);
             chart.setMaximumViewport(chart.getMaximumViewport());
         } else {
-            ListenerService.requestData(this);
+            //ListenerService.requestData(this);
         }
     }
 

From 0f9273093a9a9947326193f10f9b0563c4c480fe Mon Sep 17 00:00:00 2001
From: Andrew Warrington <awarring000@yahoo.com>
Date: Mon, 29 Jan 2018 23:34:03 +0100
Subject: [PATCH 05/12] BaseWatchFace: Resolve issue causing Bolus and Wizard
 activities to fail to complete.

---
 .../info/nightscout/androidaps/watchfaces/BaseWatchFace.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
index 4da66729e3..fab81aafb9 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
@@ -636,8 +636,6 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
             chart.setLineChartData(bgGraphBuilder.lineData());
             chart.setViewportCalculationEnabled(true);
             chart.setMaximumViewport(chart.getMaximumViewport());
-        } else {
-            //ListenerService.requestData(this);
         }
     }
 

From 3a0d5d73f8215a86650bdb26ee83cce90c037db0 Mon Sep 17 00:00:00 2001
From: AdrianLxM <AdrianLxM@users.noreply.github.com>
Date: Tue, 30 Jan 2018 01:02:21 +0100
Subject: [PATCH 06/12] filter null BT devices

---
 .../PumpDanaR/BluetoothDevicePreference.java  | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/BluetoothDevicePreference.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/BluetoothDevicePreference.java
index 63e14f0921..e39fdcfdaa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/BluetoothDevicePreference.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/BluetoothDevicePreference.java
@@ -6,6 +6,7 @@ import android.preference.ListPreference;
 import android.util.AttributeSet;
 
 import java.util.Set;
+import java.util.Vector;
 
 public class BluetoothDevicePreference extends ListPreference {
 
@@ -13,25 +14,22 @@ public class BluetoothDevicePreference extends ListPreference {
         super(context, attrs);
 
         BluetoothAdapter bta = BluetoothAdapter.getDefaultAdapter();
-        Integer size = 0;
-        if (bta != null) {
-            size += bta.getBondedDevices().size();
-        }
-        CharSequence[] entries = new CharSequence[size];
-        int i = 0;
+        Vector<CharSequence> entries = new Vector<CharSequence>();
         if (bta != null) {
             Set<BluetoothDevice> pairedDevices = bta.getBondedDevices();
             for (BluetoothDevice dev : pairedDevices) {
-                entries[i] = dev.getName();
-                i++;
+                String name = dev.getName();
+                if(name != null) {
+                    entries.add(name);
+                }
             }
         }
-        setEntries(entries);
-        setEntryValues(entries);
+        setEntries(entries.toArray(new CharSequence[0]));
+        setEntryValues(entries.toArray(new CharSequence[0]));
     }
 
     public BluetoothDevicePreference(Context context) {
         this(context, null);
     }
 
-}
\ No newline at end of file
+}

From a6f65f5d338caf25d6d2c7d5fe424dfa86c9fc84 Mon Sep 17 00:00:00 2001
From: "Markus M. May" <triplem@javafreedom.org>
Date: Tue, 30 Jan 2018 19:52:57 +0100
Subject: [PATCH 07/12] Enhance insulin plugin test

---
 .../Insulin/InsulinOrefBasePluginTest.java    | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePluginTest.java
index de128175cc..83e9442364 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePluginTest.java
@@ -47,11 +47,33 @@ public class InsulinOrefBasePluginTest extends InsulinOrefBasePlugin {
         assertEquals(expected, this.iobCalcForTreatment(treatment, 0, 0d));
 
         this.peak = 30;
+        this.dia = 4;
         long time = System.currentTimeMillis();
+
+        // check directly after bolus
+        treatment.date = time;
+        treatment.insulin = 10d;
+        assertEquals(10d, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
+
+        // check after 1 hour
         treatment.date = time - 1 * 60 * 60 * 1000; // 1 hour
         treatment.insulin = 10d;
-
         assertEquals(3.92, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
+
+        // check after 2 hour
+        treatment.date = time - 2 * 60 * 60 * 1000; // 1 hour
+        treatment.insulin = 10d;
+        assertEquals(0.77, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
+
+        // check after 3 hour
+        treatment.date = time - 3 * 60 * 60 * 1000; // 1 hour
+        treatment.insulin = 10d;
+        assertEquals(0.10, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
+
+        // check after dia
+        treatment.date = time - 4 * 60 * 60 * 1000;
+        treatment.insulin = 10d;
+        assertEquals(0d, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
     }
 
 

From 1ea324d87165905a6a9c5099533254a95d72dfc3 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Wed, 31 Jan 2018 14:42:36 +0100
Subject: [PATCH 08/12] Add issue template.

---
 ISSUE_TEMPLATE.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 ISSUE_TEMPLATE.md

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..db66ffec38
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,10 @@
+Reporting bugs
+--------------
+- Note the precise time the problem occurred and describe the circumstances and steps that caused
+  the problem
+- Note the Build version (found in the About dialog in the app, when pressing the three dots in the
+  upper-right corner).
+- Obtain the app's log files, which can be found on the phone in
+  _/storage/emulated/0/Android/data/info.nightscout.androidaps/_
+  See https://github.com/MilosKozak/AndroidAPS/wiki/Accessing-logfiles
+- Open an issue at https://github.com/MilosKozak/AndroidAPS/issues/new
\ No newline at end of file

From 2157022735dfa45e966af81660442c52f845ea29 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 31 Jan 2018 23:21:02 +0100
Subject: [PATCH 09/12] bump 1.58

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5cd4c9af95..2f22df9728 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ android {
         targetSdkVersion 23
         multiDexEnabled true
         versionCode 1500
-        version "1.57a-dev"
+        version "1.58"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
 

From f3769521a5a612bc96a5c11ec454efff953336ed Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 1 Feb 2018 10:25:28 +0100
Subject: [PATCH 10/12] bump 1.59-dev

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2f22df9728..736759f8dd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ android {
         targetSdkVersion 23
         multiDexEnabled true
         versionCode 1500
-        version "1.58"
+        version "1.59-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
 

From 96668cbf9ba655bf435f3e3e4e5bfd1053d3539b Mon Sep 17 00:00:00 2001
From: AdrianLxM <AdrianLxM@users.noreply.github.com>
Date: Thu, 1 Feb 2018 18:45:48 +0100
Subject: [PATCH 11/12] check for null profile

---
 .../wearintegration/WatchUpdaterService.java  | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
index d7bda4781b..4adec23560 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
@@ -523,27 +523,31 @@ public class WatchUpdaterService extends WearableListenerService implements
     private void sendStatus() {
 
         if (googleApiClient.isConnected()) {
-
-            TreatmentsInterface treatmentsInterface = MainApp.getConfigBuilder();
-            treatmentsInterface.updateTotalIOBTreatments();
-            IobTotal bolusIob = treatmentsInterface.getLastCalculationTreatments().round();
-            treatmentsInterface.updateTotalIOBTempBasals();
-            IobTotal basalIob = treatmentsInterface.getLastCalculationTempBasals().round();
-
-            String iobSum = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob);
-            String iobDetail = "(" + DecimalFormatter.to2Decimal(bolusIob.iob) + "|" + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
-            String cobString = generateCOBString();
-            String currentBasal = generateBasalString(treatmentsInterface);
-
-            //bgi
-            String bgiString = "";
             Profile profile = MainApp.getConfigBuilder().getProfile();
+            String status = MainApp.instance().getString(R.string.noprofile);
+            String iobSum, iobDetail, cobString, currentBasal, bgiString;
+            iobSum =  iobDetail = cobString = currentBasal = bgiString = "";
             if(profile!=null) {
+                TreatmentsInterface treatmentsInterface = MainApp.getConfigBuilder();
+                treatmentsInterface.updateTotalIOBTreatments();
+                IobTotal bolusIob = treatmentsInterface.getLastCalculationTreatments().round();
+                treatmentsInterface.updateTotalIOBTempBasals();
+                IobTotal basalIob = treatmentsInterface.getLastCalculationTempBasals().round();
+
+                iobSum = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob);
+                iobDetail = "(" + DecimalFormatter.to2Decimal(bolusIob.iob) + "|" + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
+                cobString = generateCOBString();
+                currentBasal = generateBasalString(treatmentsInterface);
+
+                //bgi
+
+
                 double bgi = -(bolusIob.activity + basalIob.activity) * 5 * profile.getIsf();
                 bgiString = "" + ((bgi >= 0) ? "+" : "") + DecimalFormatter.to1Decimal(bgi);
+
+                status = generateStatusString(profile, currentBasal,iobSum, iobDetail, bgiString);
             }
 
-            String status = generateStatusString(profile, currentBasal,iobSum, iobDetail, bgiString);
 
             //batteries
             int phoneBattery = getBatteryLevel(getApplicationContext());

From 463031bd312a792a6a87fb58ba23379c3aef91c9 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 1 Feb 2018 20:17:42 +0100
Subject: [PATCH 12/12] FR language

---
 app/src/main/res/values-fr/strings.xml | 707 +++++++++++++++++++++++++
 app/src/main/res/values/arrays.xml     |   3 +
 2 files changed, 710 insertions(+)
 create mode 100644 app/src/main/res/values-fr/strings.xml

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000000..31cdf9b3b5
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,707 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">AndroidAPS</string>
+    <string name="treatmentssafety_title">Traitements de sécurité</string>
+    <string name="treatmentssafety_maxbolus_title">Bolus max. autorisé [U]</string>
+    <string name="treatmentssafety_maxcarbs_title">Glucides max. autorisés [g]</string>
+    <string name="nav_preferences">Préférences</string>
+    <string name="nav_refreshtreatments">Actualiser les données depuis NS</string>
+    <string name="nav_backup">Sauvegarde</string>
+    <string name="nav_test_alert">Alarme test</string>
+    <string name="nav_resetdb">"Réinitialiser les Bases de Données "</string>
+    <string name="reset_db_confirm">Voulez-vous vraiment réinitialiser les bases de données ?</string>
+    <string name="nav_exit">Quitter</string>
+    <string name="danar_useextended_title">Utiliser les bolus étendus à > 200%</string>
+    <string name="danar_bt_name_title">Dispositif Bluetooth DanaR</string>
+    <string name="ns_sync_use_absolute_title">utiliser toujours les valeurs absolues du basal</string>
+    <string name="alert_dialog_storage_permission_text">Rebootez votre smartphone ou redémarrez AndroidAPS depuis les paramètres système sinon AndroidAPS ne sera pas connecté ( important de suivre et vérifier que les algorithmes fonctionnent correctement)!</string>
+    <string name="objectives_objective_label_string">Objectif:</string>
+    <string name="objectives_button_start">Activer</string>
+    <string name="objectives_gate_label_string">Gate :</string>
+    <string name="objectives_button_verify">Vérifier</string>
+    <string name="nsprofileview_units_label">Unités</string>
+    <string name="nsprofileview_dia_label">Durée d’Action</string>
+    <string name="nsprofileview_activeprofile_label">Profil actif</string>
+    <string name="nsprofileview_ic_label">"I:G (Ratio Insuline/Glucides)                       "</string>
+    <string name="nsprofileview_isf_label">"Facteur SI                  "</string>
+    <string name="nsprofileview_basal_label">Basal</string>
+    <string name="nsprofileview_target_label">Cible</string>
+    <string name="treatments_insulin_label_string">Insuline:</string>
+    <string name="noprofileset">PAS DE PROFIL PRÉDÉFINI</string>
+    <string name="treatments_carbs_label_string">Glucides:</string>
+    <string name="treatments_iob_label_string">IR:</string>
+    <string name="sms_iob">IR:</string>
+    <string name="treatments_activity_string">Activité:</string>
+    <string name="treatments_iobtotal_label_string">IR Totale:</string>
+    <string name="treatments_iobactivitytotal_label_string">Activité IR Totale:</string>
+    <string name="tempbasals_realduration_label_string">Dur:</string>
+    <string name="tempbasals_netratio_label_string">Ratio:</string>
+    <string name="tempbasals_netinsulin_label_string">Ins:</string>
+    <string name="tempbasals_iob_label_string">IR:</string>
+    <string name="tempbasals_iobtotal_label_string">IR Totale:</string>
+    <string name="treatments_newtreatment_insulinamount_label">Insuline:</string>
+    <string name="treatments_newtreatment_carbsamount_label">Glucides:</string>
+    <string name="treatments_wizard_bg_label">G</string>
+    <string name="treatments_wizard_tt_label">CT</string>
+    <string name="treatments_wizard_carbs_label">Glucides</string>
+    <string name="treatments_wizard_correction_label">Corr</string>
+    <string name="treatments_wizard_unit_label">U</string>
+    <string name="treatments_wizard_bolusiob_label">Bolus IR</string>
+    <string name="treatments_wizard_total_label">TOTAL</string>
+    <string name="openapsma_run">"Exécuter maintenant "</string>
+    <string name="vitualpump_label">POMPE VIRTUELLE</string>
+    <string name="virtualpump_basebasalrate_label">"Taux du Débit de Base  "</string>
+    <string name="virtualpump_tempbasal_label">Basal Temporaire</string>
+    <string name="virtualpump_extendedbolus_label">Bolus étendu</string>
+    <string name="virtualpump_battery_label">Niveau Batterie</string>
+    <string name="virtualpump_reservoir_label">Niveau Réservoir</string>
+    <string name="virtualpump_resultok">Confirmer</string>
+    <string name="virtualpump_sqlerror">Erreur SQL</string>
+    <string name="openapsma_lastrun_label">Dérnière exécution</string>
+    <string name="openapsma_inputparameters_label">Paramètres de saisie</string>
+    <string name="openapsma_glucosestatus_label">État de la glycémie</string>
+    <string name="openapsma_currenttemp_label">Débit temporaire actuel</string>
+    <string name="openapsma_iobdata_label">Données IR</string>
+    <string name="openapsma_profile_label">Profil</string>
+    <string name="openapsma_mealdata_label">Données repas</string>
+    <string name="result">Résultat</string>
+    <string name="openapsma_noglucosedata">Pas de données glycémiques dispo</string>
+    <string name="openapsma_noprofile">Pas de profil dispo</string>
+    <string name="openapsma_nopump">Pas de pompe dispo</string>
+    <string name="openapsma_request_label">Requête</string>
+    <string name="rate">"Taux "</string>
+    <string name="duration">Durée</string>
+    <string name="reason">Raison</string>
+    <string name="glucose">Glucose</string>
+    <string name="delta">Delta</string>
+    <string name="sms_delta">Delta:</string>
+    <string name="avgdelta">Moyenne</string>
+    <string name="configbuilder">Config Builder</string>
+    <string name="objectives">Objectifs</string>
+    <string name="openapsma">OpenAPS MA</string>
+    <string name="overview">Aperçu</string>
+    <string name="profileviewer">Profil NS</string>
+    <string name="simpleprofile">Profile simple</string>
+    <string name="tempbasal">Basal Tempo</string>
+    <string name="treatments">Traitements</string>
+    <string name="virtualpump">Pompe virtuelle</string>
+    <string name="careportal">Careportal</string>
+    <string name="configbuilder_pump">Pompe</string>
+    <string name="configbuilder_treatments">Traitements</string>
+    <string name="configbuilder_tempbasals">Basaux tempo</string>
+    <string name="configbuilder_profile">Profil</string>
+    <string name="configbuilder_aps">APS</string>
+    <string name="configbuilder_general">Général</string>
+    <string name="days">Jours</string>
+    <string name="objectives_minimalduration">Durée minimale</string>
+    <string name="configbuilder_constraints">Restrictions</string>
+    <string name="loop">Loop</string>
+    <string name="configbuilder_loop">Loop</string>
+    <string name="loop_aps_label">APS</string>
+    <string name="loop_constraintsprocessed_label">Après traitement des restrictions</string>
+    <string name="loop_setbypump_label">"Défini par pompe  "</string>
+    <string name="openapsma_lastenact_label">Dérnière mise en marche</string>
+    <string name="ok">Confirmer</string>
+    <string name="cancel">Annuler</string>
+    <string name="noapsselected">Pas d\'APS séléctionné ou résultat fourni</string>
+    <string name="safety">Sécurité</string>
+    <string name="openapsma_disabled">Plugin désactivé</string>
+    <string name="constraints_violation">Violation des restrictions</string>
+    <string name="treatmentdeliveryerror">Erreur administration bolus</string>
+    <string name="tempbasaldeliveryerror">Erreur administration temporaire</string>
+    <string name="overview_newtempbasal_basalpercent">Valeur Basal [%]</string>
+    <string name="overview_newtempbasal_percent_label">% (100% = current)</string>
+    <string name="setbasalquestion">Acceptez nouveau basal temp</string>
+    <string name="overview_bolus_label">Bolus</string>
+    <string name="overview_calculator_label">Calculateur de Bolus</string>
+    <string name="constraintapllied">Restriction appliquée!</string>
+    <string name="confirmation">Confirmation</string>
+    <string name="entertreatmentquestion">Entrez nouveau traitement</string>
+    <string name="bolus">Bolus</string>
+    <string name="sms_bolus">Bolus:</string>
+    <string name="basal">Basal</string>
+    <string name="sms_basal">Basal:</string>
+    <string name="carbs">Glucides</string>
+    <string name="changeyourinput">Changez vos entrées!</string>
+    <string name="setextendedbolusquestion">Définir un nouveau bolus étendu</string>
+    <string name="configbuilder_bgsource">Source de glycémie</string>
+    <string name="xdrip">xDrip</string>
+    <string name="nsclient">NSClient</string>
+    <string name="apsmode_title">Mode APS</string>
+    <string name="closedloop">Boucle fermée</string>
+    <string name="openloop">Boucle ouverte</string>
+    <string name="disabledloop">"Loop Désactivé "</string>
+    <string name="disableloop">Désactiver Loop</string>
+    <string name="enableloop">Activer Loop</string>
+    <string name="openloop_newsuggestion">"Nouvelle recommendation dispo "</string>
+    <string name="unsupportednsversion">Version Nightscout incompatible</string>
+    <string name="nsclientnotinstalled">NSClient non installé. Enregistrement perdu!</string>
+    <string name="objectives_bgavailableinns">G disponible sur NS</string>
+    <string name="objectives_pumpstatusavailableinns">état pompe non dispo sur NS</string>
+    <string name="objectives_manualenacts">Activation manuelle</string>
+    <string name="loopdisabled">"LOOP DÉSACTIVÉ PAR RÉSTRICTIONS "</string>
+    <string name="cs_lang">Czech</string>
+    <string name="en_lang">English</string>
+    <string name="treatments_wizard_basaliob_label">Basal IR</string>
+    <string name="bolusconstraintapplied">"Réstriction du Bolus appliquée "</string>
+    <string name="carbsconstraintapplied">Réstriction des Glucides appliquée</string>
+    <string name="careportal_bgcheck">Contrôle de Glycémie</string>
+    <string name="careportal_announcement">Notification</string>
+    <string name="careportal_note">Remarque</string>
+    <string name="careportal_exercise">Question</string>
+    <string name="careportal_pumpsitechange">Changement Zone D\'insertion</string>
+    <string name="careportal_cgmsensorinsert">Insertion Capteur CGM</string>
+    <string name="careportal_cgmsensorstart">Début Capteur CGM</string>
+    <string name="careportal_insulincartridgechange">Changement du Réservoir</string>
+    <string name="careportal_profileswitch">Changement de Profile</string>
+    <string name="careportal_snackbolus">"Bolus Goûter "</string>
+    <string name="careportal_mealbolus">Bolus Repas</string>
+    <string name="careportal_correctionbolus">Bolus de correction</string>
+    <string name="careportal_combobolus">"Bolus Combiné "</string>
+    <string name="careportal_tempbasalstart">"Lancer Débit Temporaire "</string>
+    <string name="careportal_tempbasalend">Fin du Débit Temporaire</string>
+    <string name="careportal_carbscorrection">Correction Glucides</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
+    <string name="careportal_newnstreatment_eventtype">"Type d'événement "</string>
+    <string name="careportal_newnstreatment_other">Autre</string>
+    <string name="careportal_newnstreatment_meter">Lecteur</string>
+    <string name="careportal_newnstreatment_sensor">Capteur</string>
+    <string name="careportal_newnstreatment_carbs_label">Glucides</string>
+    <string name="careportal_newnstreatment_insulin_label">Insuline</string>
+    <string name="careportal_newnstreatment_carbtime_label">Durée glucides</string>
+    <string name="careportal_newnstreatment_split_label">"Diviser "</string>
+    <string name="careportal_newnstreatment_duration_label">Durée</string>
+    <string name="careportal_newnstreatment_percent_label">"Pour cent "</string>
+    <string name="careportal_newnstreatment_absolute_label">Absolu</string>
+    <string name="careportal_newnstreatment_notes_label">Remarques</string>
+    <string name="careportal_newnstreatment_eventtime_label">"Heure de l'événement "</string>
+    <string name="careportal_newnstreatment_profile_label">Profil</string>
+    <string name="careportal_newnstreatment_enteredby_title">Entré par</string>
+    <string name="careportal_newnstreatment_glucosetype">Source de Glycémie</string>
+    <string name="noprofile">Pas de profil téléchargé encore depuis NS</string>
+    <string name="overview_tempbasal_button">Basal Tempo</string>
+    <string name="overview_extendedbolus_button">Bolus étendu</string>
+    <string name="configbuilder_nightscoutversion_label">Version Nightscout:</string>
+    <string name="send">TRANSMETTRE</string>
+    <string name="missing">Manquants</string>
+    <string name="enabled">Activé</string>
+    <string name="visible">Visible</string>
+    <string name="up">Up</string>
+    <string name="exported">Préférences exportées</string>
+    <string name="export_to">Exporter les paramètres au</string>
+    <string name="import_from">Importer les paramètres depuis</string>
+    <string name="setting_imported">Paramètres importés</string>
+    <string name="filenotfound">Fichier introuvable</string>
+    <string name="nav_export">Exporter les paramètres</string>
+    <string name="nav_import">Importer les paramètres</string>
+    <string name="nl_lang">Dutch</string>
+    <string name="de_lang">German</string>
+    <string name="es_lang">Spanish</string>
+    <string name="el_lang">Greek</string>
+    <string name="it_lang">Italian</string>
+    <string name="ru_lang">Russian</string>
+    <string name="sv_lang">Swedish</string>
+    <string name="openapsma_maxbasal_title">"U/hr Max avec laquelle le débit temp pourra être programmé "</string>
+    <string name="openapsma_maxbasal_summary">Cette valeur est appelée basal maximum dans le contexte OpenAPS</string>
+    <string name="openapsma_maxiob_title">Le Basal IR maximum que l\'OpenAPS pourra délivrer [U]</string>
+    <string name="openapsma_maxiob_summary">Cette valeur est appelée Max IOB dans le contexte OpenAPS</string>
+    <string name="bg_lang">Bulgarian</string>
+    <string name="danarpump">DanaR</string>
+    <string name="dismiss">REJETER</string>
+    <string name="language">Langue</string>
+    <string name="connecting">Connection en cours</string>
+    <string name="connected">Connectée</string>
+    <string name="disconnected">Déconnectée</string>
+    <string name="danar_pump_settings">Paramètres pompe DanaR</string>
+    <string name="nightscout">Nightscout</string>
+    <string name="end_user_license_agreement">Contrat de Licence pour Utilisateur Final</string>
+    <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
+    <string name="end_user_license_agreement_i_understand">JE COMPRENDS ET J\'ACCEPTE LES CONDITIONS DU CONTRAT</string>
+    <string name="save">Sauvegarder</string>
+    <string name="nobtadapter">L\'adaptateur bluetooth est introuvable</string>
+    <string name="devicenotfound">L\'appareil sélectionné est introuvable</string>
+    <string name="connectionerror">Erreur connection pompe</string>
+    <string name="danar_iob_label">IR affichée sur pompe</string>
+    <string name="danar_dailyunits">Unités Journalières</string>
+    <string name="danar_lastbolus">Dernier Bolus</string>
+    <string name="hoursago">h passées</string>
+    <string name="danar_invalidinput">Données saisies invalides</string>
+    <string name="danar_valuenotsetproperly">Valeur n\'est pas reglée correctement</string>
+    <string name="reloadprofile">Actualiser le profil</string>
+    <string name="danar_viewprofile">Consulter le profil</string>
+    <string name="enacted">Activée</string>
+    <string name="comment">Commentaire</string>
+    <string name="percent">Pour cent</string>
+    <string name="absolute">Absolu</string>
+    <string name="canceltemp">Annuler basal tempo</string>
+    <string name="smscommunicator">Communicateur SMS</string>
+    <string name="waitingforpumpresult">Attente de résultat</string>
+    <string name="smscommunicator_allowednumbers">Numéros de tél autorisés</string>
+    <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
+    <string name="smscommunicator_bolusreplywithcode" formatted="false">Administrer bolus %.2fU retour avec un code %s</string>
+    <string name="smscommunicator_calibrationreplywithcode" formatted="false">Envoyer calibrage %.2fU retour avec un code %s</string>
+    <string name="smscommunicator_bolusfailed">Bolus interrompu</string>
+    <string name="bolusdelivered" formatted="false">Bolus %.2fU administré avec succès</string>
+    <string name="bolusrequested" formatted="false">" %.2fU va être administré"</string>
+    <string name="smscommunicator_bolusdelivered" formatted="false">%.2fU de bolus administré avec succès</string>
+    <string name="bolusdelivering" formatted="false">Entrain d\'administrer %.2fU</string>
+    <string name="smscommunicator_remotecommandsallowed">Autoriser les commandes à distance par SMS</string>
+    <string name="smscommunicator_remotebolusnotallowed">Bolus à distance non autorisé</string>
+    <string name="glucosetype_finger">Doigt</string>
+    <string name="glucosetype_sensor">Capteur</string>
+    <string name="manual">Manuel</string>
+    <string name="careportal_temporarytarget">Cible Temporaire</string>
+    <string name="careportal_temporarytargetcancel">Annulation Cible Temporaire</string>
+    <string name="danarprofile">Paramètres du profil DanaR</string>
+    <string name="danarprofile_dia">"Durée d'Action [h] "</string>
+    <string name="danarprofile_dia_summary">Durée d\'Action d\'Insuline</string>
+    <string name="failedupdatebasalprofile">La mise à jour du profil basal a échouée</string>
+    <string name="danar_history">Historique</string>
+    <string name="danar_historyreload">Actualiser</string>
+    <string name="uploading">Téléchargement en cours</string>
+    <string name="danar_ebolus">Bolus e</string>
+    <string name="danar_dsbolus">Bolus DS</string>
+    <string name="danar_debolus">Bolus DE</string>
+    <string name="danar_error">Erreur</string>
+    <string name="danar_refill">Remplir</string>
+    <string name="danar_basalhour">Heure basal</string>
+    <string name="danar_glucose">Glucose</string>
+    <string name="danar_carbohydrate">Glucides</string>
+    <string name="danar_alarm">Alarme</string>
+    <string name="danar_totaluploaded" formatted="false">Total %d des enregistrements téléchargés</string>
+    <string name="danar_sbolus">Bolus S</string>
+    <string name="danar_history_alarm">Alarmes</string>
+    <string name="danar_history_basalhours">Heures Basal</string>
+    <string name="danar_history_bolus">Bolus</string>
+    <string name="danar_history_carbohydrates">Glucides</string>
+    <string name="danar_history_dailyinsulin">Insuline quotidienne</string>
+    <string name="danar_history_errors">Erreurs</string>
+    <string name="danar_history_glucose">Glucose</string>
+    <string name="danar_history_refill">Remplir</string>
+    <string name="danar_history_syspend">Arrêter</string>
+    <string name="danar_password_title">Mot de passe pompe</string>
+    <string name="wrongpumppassword">"Mot de passe pompe incorrect "</string>
+    <string name="pumpbusy">Pompe occupée</string>
+    <string name="overview_bolusprogress_delivered">Délivré</string>
+    <string name="overview_bolusprogress_stoped">Arrêté</string>
+    <string name="occlusion">Occlusion</string>
+    <string name="overview_bolusprogress_stop">Stop</string>
+    <string name="overview_bolusprogress_stoppressed">Boutton Stop Activé</string>
+    <string name="waitingforpump">Attente connection pompe</string>
+    <string name="waitingforpumpclicktorefresh">Attente connection pompe. Cliquez sur Actualiser</string>
+    <string name="overview_bolusprogress_goingtodeliver" formatted="false">%.2fU va être administré</string>
+    <string name="objectives_0_objective">Paramétrez la visualisation et la surveillance des données, analysez les débits de base et les ratios</string>
+    <string name="objectives_0_gate">Vérifiez que la G est disponible sur Nightscout, et les données d’insuline sur pompe ont été téléchargées</string>
+    <string name="objectives_1_objective">Commencez par le système boucle ouverte</string>
+    <string name="objectives_1_gate">Utilisez le système Open Loop pour quelques jours, et activez manuellement plusieurs débits de base tempo</string>
+    <string name="objectives_2_objective">Comprendre votre système boucle ouverte, y compris ses recommandations de débit de base tempo</string>
+    <string name="objectives_2_gate">"Partant de ce constat, décidez quel est le débit de base maximum à choisir, et entrez le dans la pompe et les préférences "</string>
+    <string name="objectives_3_objective">Commencez par utiliser la boucle fermée avec le système Low Glucose Suspend</string>
+    <string name="nochangerequested">Pas de changement demandé</string>
+    <string name="unsupportedclientver">Version Nightscout incompatible</string>
+    <string name="objectives_3_gate">Utiliser le système de boucle fermée avec max IOB = 0 pour quelques jours sans avoir beaucoup d’événements LGS</string>
+    <string name="objectives_4_objective">Ajustez votre système boucle fermée, augmentez la fonction « max IOB » au dela de 0 et diminuez progressivement vos cibles glycémiques</string>
+    <string name="objectives_4_gate">Utiliser pendant quelques jours, et au moins une nuit sans les alarmes d’hypoglycémie, avant la baisse de G</string>
+    <string name="objectives_5_objective">Ajustez les débits de base et les ratios si besoin, ensuite activez « auto-sens »</string>
+    <string name="objectives_5_gate">Une semaine réussie avec des journées en boucle fermée, avec un entrée normale de glucides</string>
+    <string name="objectives_6_objective">Activez d’autres fonctionalités pour l’utilisation journalière, tel que advanced meal assist</string>
+    <string name="youareonallowedlimit">Vous avez atteint la limite maximale</string>
+    <string name="noprofileselected">Aucun profil séléctionné</string>
+    <string name="smscommunicator_loophasbeendisabled">Loop a été désactivé</string>
+    <string name="smscommunicator_loophasbeenenabled">Loop a été désactivé</string>
+    <string name="smscommunicator_loopisdisabled">"Loop est désactivé "</string>
+    <string name="smscommunicator_loopisenabled">Loop est activé</string>
+    <string name="openapsma_valuelimitedto" formatted="false">%.2f limité à %.2f</string>
+    <string name="openapsma_valueoutofrange" formatted="false">La valeur %s est hors limites strictes</string>
+    <string name="smscommunicator_remotebasalnotallowed">Le réglage du basal à distance n\'est pas autorisé</string>
+    <string name="smscommunicator_remotecommandnotallowed">La commande à distance n\'est pas autorisée</string>
+    <string name="smscommunicator_basalreplywithcode" formatted="false">Lancer le basal %.2fU/h retour avec un code %s</string>
+    <string name="smscommunicator_suspendreplywithcode" formatted="false">Suspendre Loop pour %d minutes retour avec un code %s</string>
+    <string name="smscommunicator_tempbasalset" formatted="false">Démarrage réussi pour %.2fU/h de basal tempo pour %d min</string>
+    <string name="smscommunicator_tempbasalfailed">Démarage échoué pour basal tempo</string>
+    <string name="smscommunicator_basalstopreplywithcode" formatted="false">Arrêter basal tempo retour avec un code %s</string>
+    <string name="smscommunicator_tempbasalcanceled">Basal tempo annulé</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Annuler basal tempo échoué</string>
+    <string name="smscommunicator_unknowncommand">"Commande inconnue ou réponse fausse "</string>
+    <string name="quickwizard">Assistant Bolus Rapide</string>
+    <string name="quickwizardsettings">Paramètres assistant bolus rapide</string>
+    <string name="overview_editquickwizard_buttontext">Titre sur la touche:</string>
+    <string name="overview_editquickwizard_carbs">Glucides:</string>
+    <string name="overview_editquickwizard_valid">Valide:</string>
+    <string name="overview_editquickwizardlistactivity_add">Ajouter</string>
+    <string name="overview_quickwizard_item_edit_button">Éditer</string>
+    <string name="overview_quickwizard_item_remove_button">Retirer</string>
+    <string name="mealbolus">Repas</string>
+    <string name="correctionbous">Corr</string>
+    <string name="ko_lang">Coréenne</string>
+    <string name="actions">Actions</string>
+    <string name="androidaps_start">AndroidAPS est lancé</string>
+    <string name="ns_upload_only">Uniquement téléchargement NS (sync désactivée)</string>
+    <string name="ns_upload_only_summary">Uniquement téléchargement NS. Ceci n’est pas efficace pour les SGV à moins qu’une source locale comme xDrip soit sélectionnée. Ceci n’est pas efficace sur les profils lorsque les profils NS sont utilisés</string>
+    <string name="pumpNotInitialized">Pompe non initialisée!</string>
+    <string name="pumpNotInitializedProfileNotSet">Pompe non initialisée, profil non prédéfini</string>
+    <string name="primefill">Amorcer/Remplir</string>
+    <string name="fillwarning">Veillez à ce que la quantité corresponde à la spécification de votre KT!</string>
+    <string name="othersettings_title">Autres</string>
+    <string name="fillbolus_title">Remplir/Amorcer des quantités standard d’insuline</string>
+    <string name="button1">Touche 1</string>
+    <string name="button2">Touche 2</string>
+    <string name="button3">Touche 3</string>
+    <string name="percentagefactor_hint">Le facteur pourcentage avec lequel le profil de base sera multiplié</string>
+    <string name="timeshift_hint">Temps en heures avec lequel le profil sera modifié en round-robin</string>
+    <string name="units">Unités</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="dia">Durée d\'Action</string>
+    <string name="target_range">Fourchette cible:</string>
+    <string name="edit_base_basal">"Éditer Débit de Base:  "</string>
+    <string name="edit_base_isf">"Éditer Facteur SI de Base:                  "</string>
+    <string name="edit_base_ic">"Éditer I:G de Base:                      "</string>
+    <string name="base_profile_label">Profil de Base:</string>
+    <string name="circadian_percentage_profile">Profil en Pourcentage Circadien</string>
+    <string name="prefs_range_title">Écart de visualisation</string>
+    <string name="prefs_range_summary">Les repères hauts et bas sur les graphiques pour l’apercu et la montre</string>
+    <string name="low_mark">Repère BAS</string>
+    <string name="high_mark">Repère HAUT</string>
+    <string name="wear">Wear</string>
+    <string name="resend_all_data">Retransmettre toutes les données</string>
+    <string name="open_settings_on_wear">Afficher les Paramètres sur la Montre</string>
+    <string name="pumperror">Erreur Pompe</string>
+    <string name="lowbattery">Niveau Batterie Bas</string>
+    <string name="pumpshutdown">Arrêt de la Pompe</string>
+    <string name="batterydischarged">Baterie Pompe déchargée</string>
+    <string name="danarkoreanpump">DanaR Coréenne</string>
+    <string name="basal_rate">Taux du Débit de Base:</string>
+    <string name="profile_set_failed">Réglage du profil de base a échoué</string>
+    <string name="profile_set_ok">Mise à jour du profil de base dans la pompe</string>
+    <string name="danar_disableeasymode">Désactiver le mode Facile UI dans la pompe</string>
+    <string name="danar_enableextendedbolus">Activer les bolus étendus dans la pompe</string>
+    <string name="danar_switchtouhmode">"Modifier le mode U/d au U/h dans la pompe "</string>
+    <string name="basalvaluebelowminimum">Le débit de base est en dessous du minimum. Profil non prédéfini!</string>
+    <string name="sms_actualbg">G:</string>
+    <string name="sms_lastbg">Dernière G</string>
+    <string name="mdi">IQM</string>
+    <string name="MM640g">MM640g</string>
+    <string name="ongoingnotificaction">Notification En Cours</string>
+    <string name="old_data">ANCIENNES DONNÉES</string>
+    <string name="minago" formatted="false">%dmin passées</string>
+    <string name="sms_minago" formatted="false">%dmin passées</string>
+    <string name="localprofile">Profile Local</string>
+    <string name="openapsama">OpenAPS AMA</string>
+    <string name="short_avgdelta">Courte moyenne delta</string>
+    <string name="long_avgdelta">Longue moyenne delta</string>
+    <string name="array_of_elements" formatted="false">Panoplie de %d d\'élements. Valeur réelle</string>
+    <string name="openapsma_autosensdata_label">Données autosens</string>
+    <string name="openapsma_scriptdebugdata_label">Script de débogage</string>
+    <string name="openapsama_useautosens">Utiliser la fonction AMA autosens</string>
+    <string name="refresheventsfromnightscout">Actualiser les événements depuis NS</string>
+    <string name="eatingsoon">Manger Bientôt</string>
+    <string name="activity">Activité</string>
+    <string name="removerecord">Retirer l\'enregistrement:</string>
+    <string name="danar_stats">Dana Stats</string>
+    <string name="danar_stats_cumulative_tdd">DTQ Cumulative</string>
+    <string name="danar_stats_expweight">DTQ avec Pondération Exponentielle</string>
+    <string name="danar_stats_basalrate">Basal</string>
+    <string name="danar_stats_bolus">Bolus</string>
+    <string name="danar_stats_tdd">DTQ</string>
+    <string name="danar_stats_date">Date</string>
+    <string name="danar_stats_ratio">Ratio</string>
+    <string name="danar_stats_amount_days"># Jours</string>
+    <string name="danar_stats_weight">Pondération</string>
+    <string name="danar_stats_warning_Message">Peut-être inexact(e) si les bolus sont utilisés pour l’amorçage et le remplissage!</string>
+    <string name="danar_stats_olddata_Message">Pour les anciennes données appuyez sur Actualiser svp</string>
+    <string name="danar_stats_tbb">Débit de Base Total</string>
+    <string name="danar_stats_tbb2">DBT*2</string>
+    <string name="initializing">En cours d\'initialisation</string>
+    <string name="actions_shortname">ACT</string>
+    <string name="configbuilder_shortname">CONF</string>
+    <string name="loop_shortname">LOOP</string>
+    <string name="simpleprofile_shortname">SP</string>
+    <string name="oaps_shortname">OAPS</string>
+    <string name="temptargetrange_shortname">TT</string>
+    <string name="localprofile_shortname">LP</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="circadian_percentage_profile_shortname">CPP</string>
+    <string name="tempbasals_shortname">TB</string>
+    <string name="overview_shortname">HOME</string>
+    <string name="virtualpump_shortname">POMPEV</string>
+    <string name="profileviewer_shortname">PROFILE NS</string>
+    <string name="treatments_shortname">TRAITER</string>
+    <string name="careportal_shortname">CP</string>
+    <string name="objectives_shortname">OBJ</string>
+    <string name="wear_shortname">WEAR</string>
+    <string name="smscommunicator_shortname">SMS</string>
+    <string name="short_tabtitles">Raccourcir les titres des onglets</string>
+    <string name="prefs_delta_title">Paramètres Delta</string>
+    <string name="always_use_shortavg">Toujours utilisez une moyenne (delta) courte au lieu d’une moyenne normale</string>
+    <string name="always_use_shortavg_summary">Utile quand les données provenant de sources non filtrées lorsque xDrip devient bruyant</string>
+    <string name="advancedsettings_title">Paramètres Avancés</string>
+    <string name="danar_model" formatted="false">Modèle: %02X Protocole: %02X Code: %02X</string>
+    <string name="profile">Profil</string>
+    <string name="openapsama_autosens_adjusttargets_summary">Valeur par défaut : true</string>
+    <string name="error_only_numeric_digits_range_allowed">Seuls les chiffres numériques qui se trouvent dans la fourchette %1$s - %2$s sont autorisés</string>
+    <string name="error_field_must_not_be_empty">Le champs ne doit pas être vide</string>
+    <string name="error_phone_not_valid">Num de tél est invalide</string>
+    <string name="smscommunicator_invalidphonennumber">"Num tél du SMS invalide "</string>
+    <string name="copy_to_clipboard">Copier dans le Presse-Papiers</string>
+    <string name="copied_to_clipboard">Copier dans le Presse-Papiers</string>
+    <string name="nav_show_logcat">Afficher le journal</string>
+    <string name="overview_calibration">Étalonnage</string>
+    <string name="overview_calibration_bg_label">Étalonnage</string>
+    <string name="send_calibration" formatted="false">Transmettre l\'étalonnage %.1f à xDrip?</string>
+    <string name="xdripnotinstalled">xDrip+ n\'est pas installé</string>
+    <string name="calibrationsent">Étalonnage envoyé à xDrip</string>
+    <string name="smscommunicator_remotecalibrationnotallowed">L\'étalonnage à distance n\'est pas autorisé</string>
+    <string name="smscommunicator_calibrationsent">"Étalonnage envoyé. La récepetion doit être activée dans xDrip. "</string>
+    <string name="smscommunicator_calibrationfailed">xDrip ne reçoit pas les étalonnages</string>
+    <string name="dont_show_again">Ne plus montrer ce message</string>
+    <string name="pumpsuspendedclicktorefresh">Pompe suspendue.Cliquez pour actualiser le profile</string>
+    <string name="pumpsuspended">Pompe suspendue</string>
+    <string name="gettingpumpstatus">Obtenir l\'état de pompe</string>
+    <string name="settingtempbasal">Définir basal tempo</string>
+    <string name="stoppingtempbasal">Arrêter basal tempo</string>
+    <string name="settingextendedbolus">Définir bolus étendu</string>
+    <string name="stoppingextendedbolus">Arrêter bolus étendu</string>
+    <string name="updatingbasalrates">Mettre à jour les taux de debit de base</string>
+    <string name="disconnecting">Déconnexion en cours</string>
+    <string name="executing">Exécution en cours</string>
+    <string name="virtualpump_settings">"Paramètres pompe virtuelle "</string>
+    <string name="virtualpump_uploadstatus_title">Téléchargement d\'état sur NS</string>
+    <string name="wrongpassword">Mauvais mot de passe</string>
+    <string name="settings_password">Mot de passe pour paramètres</string>
+    <string name="unlock_settings">Déverrouiller</string>
+    <string name="approachingdailylimit">L\'insuline journalière s\'approche de la limite</string>
+    <string name="nsclientinternal">NSClient</string>
+    <string name="nsclientinternal_shortname">NCSI</string>
+    <string name="nsclientinternal_url">URL:</string>
+    <string name="nsclientinternal_autoscroll">Défilement automatique</string>
+    <string name="restart">Redémarrer</string>
+    <string name="nsclientinternal_title">NSClient</string>
+    <string name="nsclientinternal_url_title">URL Nightscout</string>
+    <string name="nsclientinternal_url_dialogmessage">Entrez L’URL Nightscout</string>
+    <string name="nsclientinternal_secret_title">NS API secret</string>
+    <string name="nsclientinternal_secret_dialogtitle">NS API secret</string>
+    <string name="nsclientinternal_secret_dialogmessage">Entrez NS API secret (12 carac. min)</string>
+    <string name="nsclientinternal_devicename_title">Nom de l\'appareil</string>
+    <string name="nsclientinternal_devicename_dialogtitle">Entrez le nom de l\'appareil</string>
+    <string name="nsclientinternal_devicename_dialogmessage">Cela sera utilisé pour le champ \"Entré par\"</string>
+    <string name="deliver_now">Transmettre maintenant</string>
+    <string name="clear_queue">Vider la file d\'attente</string>
+    <string name="show_queue">Afficher la file d\'attente</string>
+    <string name="queue">File d\'attente:</string>
+    <string name="status">État</string>
+    <string name="paused">Interrompu</string>
+    <string name="clearlog">Effacer histo</string>
+    <string name="nowritepermission">NSCLIENT ne possède pas la permission d\'écriture. Mauvais API secret?</string>
+    <string name="wear_settings">Paramètres Wear</string>
+    <string name="wear_detailedIOB_title">Afficher l\'IR détaillée</string>
+    <string name="wear_detailedIOB_summary">Décomposer l’IR dans l\'IR du bolus et basal sur la montre</string>
+    <string name="nosuccess">Sans succès - vérifiez votre téléphone</string>
+    <string name="notavailable">Non disponible</string>
+    <string name="patientage">l\'Age du patient</string>
+    <string name="child">" Enfant"</string>
+    <string name="teenage">Adolescent</string>
+    <string name="adult">Adulte</string>
+    <string name="patientage_summary">Veuillez sélectionner l’âge du patient pour paramétrer les limites de sécurité svp</string>
+    <string name="Glimp">Glimp</string>
+    <string name="batteryoptimalizationerror">Le dispositif n’apparaît pas pour renforcer la liste blanche de l’optimisation de batterie!</string>
+    <string name="pleaseallowpermission">Autorisez l\'accès svp</string>
+    <string name="needwhitelisting">% a besoin de la liste blanche de l’optimisation batterie  pour une bonne performance</string>
+    <string name="loopsuspended">Loop suspendu</string>
+    <string name="loopsuspendedfor" formatted="false">Suspendu (%d m)</string>
+    <string name="loopsuperbolusfor" formatted="false">Superbolus (%d m)</string>
+    <string name="loopmenu">Menu loop</string>
+    <string name="suspendloopfor1h">Suspendre Loop pour 1h</string>
+    <string name="suspendloopfor2h">Suspendre Loop pour 2h</string>
+    <string name="suspendloopfor3h">Suspendre Loop pour 3h</string>
+    <string name="suspendloopfor10h">Suspendre Loop pour 10h</string>
+    <string name="disconnectpumpfor30m">Déconnecter la pompe 30min</string>
+    <string name="disconnectpumpfor1h">Déconnecter la pompe 1h</string>
+    <string name="disconnectpumpfor2h">Déconnecter la pompe 2h</string>
+    <string name="disconnectpumpfor3h">Déconnecter la pompe 3h</string>
+    <string name="disconnectpumpfor10h">Déconnecter la pompe 10h</string>
+    <string name="resume">Reprendre</string>
+    <string name="smscommunicator_wrongduration">Durée incorrecte</string>
+    <string name="smscommunicator_loopsuspended">Loop suspendu</string>
+    <string name="smscommunicator_loopresumed">Loop relancé</string>
+    <string name="treatments_wizard_bgtrend_label">Tendance 15 min</string>
+    <string name="treatments_wizard_cob_label">GR</string>
+    <string name="superbolus">Superbolus</string>
+    <string name="ns_logappstartedevent">Entrer le démarrage de l\'app dans NS</string>
+    <string name="restartingapp">Sortir de l’application pour modifier les réglages</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="configbuilder_insulin">Insuline</string>
+    <string name="fastactinginsulin">Insuline à action rapide</string>
+    <string name="fastactinginsulincomment">Novorapid, Humalog, Apidra</string>
+    <string name="ultrafastactinginsulincomment">Fiasp</string>
+    <string name="insulin_shortname">INS</string>
+    <string name="fastactinginsulinprolonged">Insuline Rapide à Action Prolongée</string>
+    <string name="enablesuperbolus">Activer les Superbolus dans l’assistant</string>
+    <string name="enablesuperbolus_summary">Activer la fonctionalité superbolus dans l’assistant. Ne pas l’activez jusqu’au moment où vous appreniez comment il fonctionne réellement. IL PEUT PROVOQUER UNE OVERDOSE D’INSULINE SI UTILISÉ AVEUGLÉMENT!</string>
+    <string name="iob">" IR"</string>
+    <string name="cob">GR</string>
+    <string name="predictionshortlabel">"PRÉ "</string>
+    <string name="basalshortlabel">BAS</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="virtualpump_lastconnection_label">Dernière Connexion</string>
+    <string name="danar_bluetooth_status">état du Bluetooth</string>
+    <string name="nav_about">à propos de</string>
+    <string name="smscommunicator_missingsmspermission">Autorisation SMS manquante</string>
+    <string name="dev">DEV</string>
+    <string name="xdripstatus_settings">État Xdrip (hr)</string>
+    <string name="xdripstatus">Barre d\'état pour xDrip (Montre)</string>
+    <string name="xdripstatus_shortname">xds</string>
+    <string name="wear_showbgi_title">Afficher l’IG</string>
+    <string name="wear_showbgi_summary">Ajouter l’IG sur la barre d\'état</string>
+    <string name="ns_noupload">Pas de téléchargement sur NS</string>
+    <string name="ns_noupload_summary">Toutes les données envoyées à NS sont abandonées. AAPS est connecté à NS mais aucun changement dans NS n’est fait</string>
+    <string name="basal_step">Incrément Basal</string>
+    <string name="bolus_step">Incrément Bolus</string>
+    <string name="extendedbolus">Bolus étendu</string>
+    <string name="temptarget">Cible Tempo</string>
+    <string name="overview_extendedbolus_cancel_button">Annuler Bolus étendu</string>
+    <string name="careportal_sensorage_label">Durée capteur</string>
+    <string name="careportal_canulaage_label">Durée canule</string>
+    <string name="careportal_insulinage_label">Durée d\'insuline</string>
+    <string name="hours">Heures</string>
+    <string name="overview_newtempbasal_basaltype_label">Type du Basal</string>
+    <string name="isfmissing">"Facteur SI manquant dans le profile. Utilisez les valeurs par défaut. "</string>
+    <string name="icmissing">I:G manquant dans le profile. Utilisez les valeurs par défaut.</string>
+    <string name="basalmissing">Basal manquant dans le profile. Utilisez les valeurs par défaut</string>
+    <string name="targetmissing">Cible manquante dans le profile. Utilisez les valeurs par défaut</string>
+    <string name="invalidprofile">Profile incorrect!!!</string>
+    <string name="profileswitch">Changement de Profil</string>
+    <string name="careportal_pbage_label">Durée batterie pompe</string>
+    <string name="careportal_pumpbatterychange">Changement Batterie Pompe</string>
+    <string name="ns_alarmoptions">Options d\'alarme</string>
+    <string name="nsalarm_urgenthigh">"Haute urgent "</string>
+    <string name="nsalarm_high">Haute</string>
+    <string name="nsalarm_low">Basse</string>
+    <string name="nsalarm_urgentlow">Basse urgent</string>
+    <string name="nsalarm_summary" formatted="false">Actuellement programmé à %f</string>
+    <string name="nsalarm_staledata">"Données obsolètes "</string>
+    <string name="nsalarm_urgentstaledata">Données obsolètes urgent</string>
+    <string name="nsalarm_staledatavalue_label">"Seuil des données obsolètes [min] "</string>
+    <string name="nsalarm_urgent_staledatavalue_label">Seuil d\'urgence pour les données obsolètes [min]</string>
+    <string name="openapsama_autosens_period">"l’intervalle pour autosens [h] "</string>
+    <string name="openapsama_autosens_period_summary">Le nombre d’heures écoulées pour la détection de sensibilité (le temps d’absorption des glucides est exclu)</string>
+    <string name="ratio_short">SEN</string>
+    <string name="do_not_track_profile_switch">Ignorer les événements de changement de profil</string>
+    <string name="do_not_track_profile_switch_summary">Tout les événements de changement de profils sont ignorés et le profil actif reste le seul profil en activité continue</string>
+    <string name="pump">Pompe</string>
+    <string name="openaps">OpenAPS</string>
+    <string name="device">Dispositif</string>
+    <string name="uploader">Uploader</string>
+    <string name="configbuilder_sensitivity">Détection de sensibilité</string>
+    <string name="sensitivity_shortname">SENS</string>
+    <string name="sensitivityoref0">Sensibilité Oref0</string>
+    <string name="sensitivityaaps">"Sensibilité AAPS "</string>
+    <string name="absorptionsettings_title">Paramètres d’absorption</string>
+    <string name="absorption_maxtime_title">Durée maximale d’absorption pour un repas</string>
+    <string name="absorption_maxtime_summary">Le temps estimé en heures pour une absorbption totale des glucides d’un repas</string>
+    <string name="danar_visualizeextendedaspercentage_title">Afficher le bolus étendu en %</string>
+    <string name="careportal_sensorage_label_short">SAGE</string>
+    <string name="careportal_insulinage_label_short">IAGE</string>
+    <string name="careportal_canulaage_label_short">CAGE</string>
+    <string name="careportal_pbage_label_short">PBAGE</string>
+    <string name="openaps_short">OAPS</string>
+    <string name="uploader_short">UPLD</string>
+    <string name="basal_short">BAS</string>
+    <string name="virtualpump_extendedbolus_label_short">EXT</string>
+    <string name="lock_screen">écran verrouillé</string>
+    <string name="lock_screen_short">verrouiller</string>
+    <string name="sensitivity_warning">En activant la fonction Autosens, n’oubliez pas de rentrer tout les glucides consommés. Sinon les déviations de glucides seront incorrectement identifiées alors que la sensibilité change !!</string>
+    <string name="sensitivityweightedaverage">Sensibilité avec moyenne pondérée</string>
+    <string name="mdtp_ok">OK</string>
+    <string name="mdtp_cancel">Annuler</string>
+    <string name="cpp_sync_setting_missing">Besoin d’être activé(e) pour que les valeurs soient envoyées à la pompe!</string>
+    <string name="cpp_notloadedplugins">Pas tous les profils sont téléchargés!</string>
+    <string name="cpp_valuesnotstored">Valeurs non enregistrées!</string>
+    <string name="wear_overviewnotifications">Notifications d\'aperçu</string>
+    <string name="wear_overviewnotifications_summary">Transférez les notifications d’aperçu comme des messages de confirmation sur la montre.</string>
+    <string name="ns_localbroadcasts">Activer les transmissions de données sur d\'autres app. (ex. Xdrip)</string>
+    <string name="ns_localbroadcasts_title">Activer les transmissions locales.</string>
+    <string name="careportal_activity_label">"ACTIVITÉ "</string>
+    <string name="careportal_question">Question</string>
+    <string name="success">Succès</string>
+    <string name="danar_history_connectingfor" formatted="false">Se connecter pour %d s</string>
+    <string name="careportal_pump_label">POMPE</string>
+    <string name="overview_newtempbasal_basalabsolute">"Valeur Basal [U/h] "</string>
+    <string name="careportal_newnstreatment_duration_min_label">Durée [min]</string>
+    <string name="insulin_oref_peak">Durée du Pic de la Courbe IR</string>
+    <string name="free_peak_oref">Réglage Durée Insuline Post Prandiale Oref</string>
+    <string name="insulin_peak_time">"Durée du Pic [min] "</string>
+    <string name="rapid_acting_oref">"Insuline à Action Rapide Oref "</string>
+    <string name="ultrarapid_oref">Insuline à Action Ultra Rapide Oref</string>
+    <string name="dia_too_short" formatted="false">Durée d’Action pour %s trop courte - utiliser %s à la place!</string>
+    <string name="activate_profile">ACTIVER LE PROFIL</string>
+    <string name="date">" Date"</string>
+    <string name="invalid">INVALID</string>
+    <string name="waitingforpairing">Attente pour le jumelage avec la pompe</string>
+    <string name="pairingok">Jumelage réussi</string>
+    <string name="pairingtimedout">Jumelage interrompu</string>
+    <string name="pairing">JUMELAGE</string>
+    <string name="danars_nodeviceavailable">Jusqu\'à présent aucun appareil n\'a été trouvé</string>
+    <string name="emptyreservoir">Réservoir vide</string>
+    <string name="bloodsugarmeasurementalert">Alerte de mesure de glycémie</string>
+    <string name="remaininsulinalert">Niveau d\'insuline restant</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="selectedpump">Pompe selectionée</string>
+    <string name="pairpump">Jumeler nouvelle pompe</string>
+    <string name="bolusspeed">Vitesse bolus</string>
+    <string name="danar_setbasalstep001">Régler incrément basal à 0.01 U/h</string>
+    <string name="serialnumber">numéro de série</string>
+    <string name="careportal_newnstreatment_percentage_label">Pourcentage</string>
+    <string name="careportal_newnstreatment_timeshift_label">Time shift</string>
+    <string name="default_temptargets">Cibles Temporaires par défaut</string>
+    <string name="eatingsoon_duration">Durée pour le prochain repas</string>
+    <string name="eatingsoon_target">Cible pour le prochain repas</string>
+    <string name="activity_duration">Durée d\'activité</string>
+    <string name="activity_target">Cible pour l\'activité</string>
+    <string name="danar_history_prime">Amorcer</string>
+    <string name="gettingextendedbolusstatus">Obtenir l\'état du bolus étendu</string>
+    <string name="gettingbolusstatus">Obtenir l\'état du bolus</string>
+    <string name="gettingtempbasalstatus">Obtenir l\'état du basal tempo</string>
+    <string name="gettingpumpsettings">Obtenir les paramètres pompe</string>
+    <string name="gettingpumptime">Obtenir l\'heure sur la pompe</string>
+    <string name="reuse">réutiliser</string>
+    <string name="wearcontrol_title">Commandes depuis la montre</string>
+    <string name="wearcontrol_summary">Définir les Cibles Temp et entrer les Traitements depuis la montre</string>
+    <string name="connectiontimedout">Connexion interrompue</string>
+    <string name="food">Aliments</string>
+    <string name="waitingforestimatedbolusend" formatted="false">Attendre la fin du bolus. %d sec. restants</string>
+    <string name="processinghistory">Traitement d\'événement</string>
+    <string name="startingbolus">Administration du bolus lancée</string>
+    <string name="executingrightnow">Commande exécutée à l\'instant</string>
+    <string name="pumpdrivercorrected">Pilote pompe corrigé</string>
+    <string name="pump_unreachable">"Pompe hors de portée "</string>
+    <string name="missed_bg_readings">Léctures de glycémie qui manquent</string>
+    <string name="raise_notifications_as_android_notifications">Utiliser le système de notifications pour les alertes et les notifications</string>
+    <string name="localalertsettings_title">Alertes locales</string>
+    <string name="enable_missed_bg_readings_alert">Alerte si aucune donnée glycémique n’est reçue</string>
+    <string name="enable_pump_unreachable_alert">Alerte si la pompe est hors portée</string>
+    <string name="pump_unreachable_threshold">Seuil de \"hors portée\" à la pompe</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Ceci va arrêter le Bluetooth du tel pour une seconde si la pompe n’est pas connectée. Cela pourrait aider dans certains tél où la connexion Bluetooth reste bancale.</string>
+    <string name="DexcomG5">App Dexcom G5 (adaptée)</string>
+    <string name="dexcomg5_nsupload_title">Télécharger Les données glycémiques sur NS</string>
+    <string name="dexcomg5_upload">Paramètres de téléchargement du G5</string>
+    <string name="customapp">APK personalisée pour le téléchargement</string>
+    <string name="wear_detailed_delta_title">Afficher le delta détaillé</string>
+    <string name="wear_detailed_delta_summary">Afficher delta avec une décimale supplémentaire</string>
+    <string name="unsupportedfirmware">"Firmware pompe incompatible "</string>
+    <string name="dexcomg5_xdripupload_title">Transmettre les données G sur xDrip+</string>
+    <string name="dexcomg5_xdripupload_summary">Dand xDrip+ veuillez séléctionner 640g/Eversense comme source de données</string>
+    <string name="nsclientbg">"G NSClient "</string>
+    <string name="minimalbasalvaluereplaced">"Valeur du basal remplacée par la valeur minimale supportée "</string>
+    <string name="overview_editquickwizard_usebg">Calcul de G</string>
+    <string name="overview_editquickwizard_usebolusiob">Calcul IR du Bolus</string>
+    <string name="overview_editquickwizard_usebasaliob">Calcul IR du Basal</string>
+    <string name="overview_editquickwizard_usetrend">Calcul de tendance</string>
+    <string name="overview_editquickwizard_usesuperbolus">Calcul SuperBolus</string>
+    <string name="yes">Oui</string>
+    <string name="no">Non</string>
+    <string name="overview_editquickwizard_usecob">Caclcul GR</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 660f6ee00e..1fad149686 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -15,6 +15,7 @@
         <item>@string/bg_lang</item>
         <item>@string/cs_lang</item>
         <item>@string/de_lang</item>
+        <item>@string/fr_lang</item>
         <item>@string/nl_lang</item>
         <item>@string/es_lang</item>
         <item>@string/el_lang</item>
@@ -29,6 +30,7 @@
         <item>bg</item>
         <item>cs</item>
         <item>de</item>
+        <item>fr</item>
         <item>nl</item>
         <item>es</item>
         <item>el</item>
@@ -100,4 +102,5 @@
         <item>@string/yes</item>
     </string-array>
 
+    <string name="fr_lang">French</string>
 </resources>
\ No newline at end of file