diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 21d9eda7bf..508b3d9b88 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index cc75608581..665ca1f253 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -64,8 +64,8 @@ public class MainApp extends Application {
             pluginsList.add(OverviewFragment.getPlugin());
             if (Config.DANAR) pluginsList.add(DanaRFragment.getPlugin());
             if (Config.MM640G) pluginsList.add(MM640gFragment.getPlugin());
-            pluginsList.add(VirtualPumpFragment.getPlugin());
             if (Config.CAREPORTALENABLED) pluginsList.add(CareportalFragment.getPlugin());
+            pluginsList.add(VirtualPumpFragment.getPlugin());
             if (Config.LOOPENABLED) pluginsList.add(LoopFragment.getPlugin());
             if (Config.OPENAPSMAENABLED) pluginsList.add(OpenAPSMAFragment.getPlugin());
             pluginsList.add(NSProfileViewerFragment.getPlugin());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Objectives/ObjectivesFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Objectives/ObjectivesFragment.java
index 131c022ae6..1cfca7a407 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Objectives/ObjectivesFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Objectives/ObjectivesFragment.java
@@ -187,7 +187,7 @@ public class ObjectivesFragment extends Fragment implements View.OnClickListener
         recyclerView.setHasFixedSize(true);
         llm = new LinearLayoutManager(view.getContext());
         recyclerView.setLayoutManager(llm);
-        enableFake = (CheckBox) view.findViewById(R.id.objectives_fake);
+        enableFake =  (CheckBox) view.findViewById(R.id.objectives_fake);
         fake_layout = (LinearLayout) view.findViewById(R.id.objectives_fake_layout);
         reset = (TextView) view.findViewById(R.id.objectives_reset);
         enableFake.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index 4ce1433036..5c7a1ee8e5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -178,7 +178,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener {
 
         editBg = new PlusMinusEditText(view, R.id.treatments_wizard_bginput, R.id.treatments_wizard_bginput_plus, R.id.treatments_wizard_bginput_minus, 0d, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false);
         editCarbs = new PlusMinusEditText(view, R.id.treatments_wizard_carbsinput, R.id.treatments_wizard_carbsinput_plus, R.id.treatments_wizard_carbsinput_minus, 0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false);
-        editCorr = new PlusMinusEditText(view, R.id.treatments_wizard_correctioninput, R.id.treatments_wizard_correctioninput_plus, R.id.treatments_wizard_correctioninput_minus, 0d, 0d, maxCorrection, 0.05d, new DecimalFormat("0.00"), false);
+        editCorr = new PlusMinusEditText(view, R.id.treatments_wizard_correctioninput, R.id.treatments_wizard_correctioninput_plus, R.id.treatments_wizard_correctioninput_minus, 0d, -maxCorrection, maxCorrection, 0.05d, new DecimalFormat("0.00"), false);
         editCarbTime = new PlusMinusEditText(view, R.id.treatments_wizard_carbtimeinput, R.id.treatments_wizard_carbtime_plus, R.id.treatments_wizard_carbtime_minus, 0d, -60d, 60d, 5d, new DecimalFormat("0"), false);
         initDialog();
 
diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
index e20788fc00..45eb92f862 100644
--- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
+++ b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
@@ -48,7 +48,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:width="100dp"
+                    android:width="80dp"
                     android:gravity="center_horizontal"
                     android:inputType="numberDecimal"
                     android:padding="10dp"
@@ -144,11 +144,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:width="100dp"
+                    android:width="80dp"
                     android:gravity="center_horizontal"
                     android:inputType="numberDecimal"
                     android:padding="10dp"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:visibility="gone" />
 
                 <ImageView
                     android:id="@+id/careportal_newnstreatment_carbs_plus"
@@ -204,7 +205,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:width="100dp"
+                    android:width="80dp"
                     android:gravity="center_horizontal"
                     android:inputType="numberDecimal"
                     android:padding="10dp"
@@ -265,7 +266,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:width="100dp"
+                    android:width="80dp"
                     android:gravity="center_horizontal"
                     android:inputType="numberDecimal"
                     android:padding="10dp"
@@ -325,7 +326,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:width="100dp"
+                    android:width="80dp"
                     android:gravity="center_horizontal"
                     android:inputType="numberDecimal"
                     android:padding="10dp"
@@ -387,7 +388,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:width="100dp"
+                    android:width="80dp"
                     android:gravity="center_horizontal"
                     android:inputType="numberDecimal"
                     android:padding="10dp"
@@ -447,7 +448,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:width="100dp"
+                    android:width="80dp"
                     android:gravity="center_horizontal"
                     android:inputType="numberDecimal"
                     android:padding="10dp"
@@ -507,7 +508,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:width="100dp"
+                    android:width="80dp"
                     android:gravity="center_horizontal"
                     android:inputType="numberDecimal"
                     android:padding="10dp"
@@ -590,7 +591,7 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="85dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:padding="10dp"
@@ -599,7 +600,7 @@
 
                 <Button
                     android:id="@+id/careportal_newnstreatment_eventdate"
-                    android:layout_width="wrap_content"
+                    android:layout_width="106dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:width="150dp"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000000..74ee32b038
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,309 @@
+<resources>
+    <string name="app_name">AndroidAPS</string>
+    <string name="treatmentssafety_title">Seguridad tratamientos</string>
+    <string name="treatmentssafety_maxbolus_title">Máximo Bolo permitido [U]</string>
+    <string name="treatmentssafety_maxcarbs_title">Máximos carbohidratos permitidos [g]</string>
+
+    <string name="nav_preferences">Preferencias</string>
+    <string name="nav_refreshtreatments">Refrescar tratamientos desde NS</string>
+    <string name="nav_backup">Backup</string>
+    <string name="nav_test_alert">Test alarma</string>
+    <string name="nav_resetdb">Restablecer las bases de datos</string>
+    <string name="nav_exit">Salida</string>
+    <string name="danar_useextended_title">Usar bolos extendidos para&gt; 200%</string>
+    <string name="danar_bt_name_title">DanaR dispositivo Bluetooth</string>
+    <string name="ns_sync_use_absolute_title">Utilizar siempre valores basales absolutos</string>
+
+    <string name="objectives_objective_label_string">Objetivo:</string>
+    <string name="objectives_gate_label_string">Meta:</string>
+    <string name="objectives_button_start">Inicio</string>
+    <string name="objectives_button_verify">Verificar</string>
+    <string name="nsprofileview_units_label">Unidades:</string>
+    <string name="nsprofileview_dia_label">DIA (Duración Insulina Activa):</string>
+    <string name="nsprofileview_activeprofile_label">Perfil activo:</string>
+    <string name="nsprofileview_ic_label">IC (Insulina/Carbohidratos Ratio):</string>
+    <string name="nsprofileview_isf_label">ISF (Factor Sensibilidad Insulina):</string>
+    <string name="nsprofileview_basal_label">Dosis Basal:</string>
+    <string name="nsprofileview_target_label">Objetivo:</string>
+    <string name="nsprofileview_noprofile_text">PERFIL NO ACTIVO</string>
+    <string name="treatments_insulin_label_string">Insulina:</string>
+    <string name="treatments_carbs_label_string">Carbohidratos:</string>
+    <string name="treatments_iob_label_string">IOB:</string>
+    <string name="treatments_activity_string">Actividad:</string>
+    <string name="treatments_iobtotal_label_string">Total IOB:</string>
+    <string name="treatments_iobactivitytotal_label_string">Actividad total IOB:</string>
+    <string name="tempbasals_realduration_label_string">Dur:</string>
+    <string name="tempbasals_netratio_label_string">Dosis:</string>
+    <string name="tempbasals_netinsulin_label_string">Ins:</string>
+    <string name="tempbasals_iob_label_string">IOB:</string>
+    <string name="tempbasals_iobtotal_label_string">IOB Total:</string>
+    <string name="treatments_newtreatment_insulinamount_label">Insulina [U]</string>
+    <string name="treatments_newtreatment_carbsamount_label">Carbohidratos [g]</string>
+    <string name="treatments_wizard_bg_label">BG</string>
+    <string name="treatments_wizard_carbs_label">Hidratos Carbono</string>
+    <string name="treatments_wizard_correction_label">Corrección</string>
+    <string name="treatments_wizard_unit_label">U</string>
+    <string name="treatments_wizard_bolusiob_label">bolo IOB</string>
+    <string name="treatments_wizard_total_label">TOTAL</string>
+    <string name="openapsma_run">Ejecutar ahora</string>
+    <string name="vitualpump_label">BOMBA VIRTUAL</string>
+    <string name="virtualpump_basebasalrate_label">Dosis Basal Base:</string>
+    <string name="virtualpump_tempbasal_label">Basal Temporal:</string>
+    <string name="virtualpump_extendedbolus_label">Bolo extendido:</string>
+    <string name="virtualpump_battery_label">Batería:</string>
+    <string name="virtualpump_reservoir_label">Depósito:</string>
+    <string name="virtualpump_resultok">OK</string>
+    <string name="virtualpump_sqlerror">Error de SQL</string>
+    <string name="openapsma_lastrun_label">Última ejecución</string>
+    <string name="openapsma_inputparameters_label">Parámetros de entrada</string>
+    <string name="openapsma_glucosestatus_label">Estado de glucosa</string>
+    <string name="openapsma_currenttemp_label">Basal temporal actual</string>
+    <string name="openapsma_iobdata_label">IOB datos</string>
+    <string name="openapsma_profile_label">Perfil</string>
+    <string name="openapsma_mealdata_label">Datos de comidas</string>
+    <string name="openapsma_result_label">Resultado</string>
+    <string name="openapsma_noglucosedata">No hay disponibles datos de glucosa</string>
+    <string name="openapsma_noprofile">Sin perfil disponible</string>
+    <string name="openapsma_nopump">No se dispone de bomba</string>
+    <string name="nochangerequested">Ninguna acción requerida</string>
+    <string name="openapsma_request_label">Solicitud</string>
+    <string name="openapsma_minbg_label">Objetivo mínimo</string>
+    <string name="rate">Dosis</string>
+    <string name="duration">Duración</string>
+    <string name="reason">Razón</string>
+    <string name="glucose">Glucosa</string>
+    <string name="delta">Delta</string>
+    <string name="avgdelta">Avg. delta</string>
+    <string name="minago">min antes</string>
+
+    <string name="configbuilder">Config Builder</string>
+    <string name="objectives">Objetivos</string>
+    <string name="openapsma">OpenAPS MA</string>
+    <string name="overview">Sinopsis</string>
+    <string name="profileviewer">Perfil NS</string>
+    <string name="simpleprofile">Perfil simple</string>
+    <string name="tempbasals">Temp basales</string>
+    <string name="treatments">Tratamientos</string>
+    <string name="virtualpump">Bomba virtual</string>
+    <string name="careportal">Careportal</string>
+
+
+    <string name="configbuilder_pump">Bomba</string>
+    <string name="configbuilder_treatments">Tratamientos</string>
+    <string name="configbuilder_tempbasals">Temp Basales</string>
+    <string name="configbuilder_profile">Perfil</string>
+    <string name="configbuilder_aps">APS</string>
+    <string name="configbuilder_general">General</string>
+    <string name="days">días</string>
+    <string name="objectives_minimalduration">Duración mínima</string>
+    <string name="configbuilder_constraints">Restricciones</string>
+
+    <string name="loop">Lazo</string>
+    <string name="configbuilder_loop">Lazo</string>
+    <string name="loop_aps_label">APS</string>
+    <string name="loop_constraintsprocessed_label">Tras procesar limitaciones</string>
+    <string name="loop_setbypump_label">Definido por la bomba</string>
+    <string name="openapsma_lastenact_label">Última aceptada</string>
+    <string name="refreshfromnightscout">¿Quieres actualizar tratamientos de Nightscout?</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancelar</string>
+    <string name="noapsselected">NO APS Seleccionado</string>
+    <string name="safety">Seguridad</string>
+    <string name="openapsma_disabled">Plugin está desactivado</string>
+    <string name="constraints_violation">Violación restricciones</string>
+    <string name="treatmentdeliveryerror">Error de administración del bolo</string>
+    <string name="overview_newtempbasal_basal_label">Valor basal</string>
+    <string name="overview_newtempbasal_percent_label">% (100% = actual)</string>
+    <string name="setbasalquestion">Aceptar nueva basal temporal:</string>
+    <string name="overview_bolus_label">Bolo</string>
+    <string name="overview_calculator_label">Calculadora</string>
+    <string name="constraintapllied">Restricción aplicada!</string>
+    <string name="confirmation">Confirmación</string>
+    <string name="entertreatmentquestion">Introduzca nuevo tratamiento:</string>
+    <string name="bolus">Bolo</string>
+    <string name="basal">Basal</string>
+    <string name="carbs">Carbohidratos</string>
+    <string name="changeyourinput">Cambiar datos!</string>
+    <string name="setextendedbolusquestion">Establecer nuevo bolo extendido:</string>
+    <string name="configbuilder_bgsource">Origen BG</string>
+    <string name="xdrip">xDrip</string>
+    <string name="nsclient">NSClient</string>
+    <string name="apsmode_title">Modo APS</string>
+
+    <string name="closedloop">Lazo cerrado</string>
+    <string name="openloop">Lazo abierto</string>
+    <string name="openloop_newsuggestion">Nueva propuesta disponible</string>
+    <string name="unsupportedclientver">Versión de NSClient no soportada</string>
+    <string name="nsclientnotinstalled">NSClient no instalado. Registro perdido!</string>
+    <string name="objectives_bgavailableinns">BG disponible en NS</string>
+    <string name="objectives_pumpstatusavailableinns">Estado de la bomba disponible en NS</string>
+    <string name="objectives_manualenacts">Aceptados</string>
+    <string name="loopdisabled">LAZO DESACTIVADO POR RESTRICCIONES</string>
+    <string name="cs_lang">checo</string>
+    <string name="en_lang">Inglés</string>
+    <string name="treatments_wizard_basaliob_label">Basal IOB</string>
+    <string name="bolusconstraintapplied">Restricción aplicada en bolo</string>
+    <string name="carbsconstraintapplied">Restricción aplicada en carbohidratos</string>
+    <string name="careportal_bgcheck">MEDIR GLUCOSA</string>
+    <string name="careportal_announcement">ANUNCIO</string>
+    <string name="careportal_note">NOTA</string>
+    <string name="careportal_question">Pregunta</string>
+    <string name="careportal_exercise">Ejercicio</string>
+    <string name="careportal_pumpsitechange">Cambio Lugar Bomba</string>
+    <string name="careportal_cgmsensorinsert">Insertar sensor</string>
+    <string name="careportal_cgmsensorstart">Iniciar sensor</string>
+    <string name="careportal_insulincartridgechange">Cambio Cartucho insulina</string>
+    <string name="careportal_profileswitch">Cambio de perfil</string>
+    <string name="careportal_snackbolus">Bolo de aperitivo</string>
+    <string name="careportal_mealbolus">Bolo de comida</string>
+    <string name="careportal_correctionbolus">Bolo de corrección</string>
+    <string name="careportal_combobolus">Combo bolo</string>
+    <string name="careportal_tempbasalstart">Basal Temporal Inicio</string>
+    <string name="careportal_tempbasalend">Basal Temporal Fin</string>
+    <string name="careportal_carbscorrection">Hidratos Carbono Corrección</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
+
+    <string name="careportal_newnstreatment_eventtype">Tipo de evento</string>
+    <string name="careportal_newnstreatment_other">Otro</string>
+    <string name="careportal_newnstreatment_meter">Metro</string>
+    <string name="careportal_newnstreatment_sensor">Sensor</string>
+    <string name="careportal_newnstreatment_carbs_label">Hidratos Carbono</string>
+    <string name="careportal_newnstreatment_insulin_label">Insulina</string>
+    <string name="careportal_newnstreatment_carbtime_label">Tiempo absorción</string>
+    <string name="careportal_newnstreatment_split_label">Dividir</string>
+    <string name="careportal_newnstreatment_duration_label">Duración</string>
+    <string name="careportal_newnstreatment_percent_label">Porcentaje</string>
+    <string name="careportal_newnstreatment_absolute_label">Absoluto</string>
+    <string name="careportal_newnstreatment_duration_min">min</string>
+    <string name="careportal_newnstreatment_notes_label">Notas</string>
+    <string name="careportal_newnstreatment_eventtime_label">Fecha Hora</string>
+    <string name="careportal_newnstreatment_profile_label">Perfil</string>
+    <string name="careportal_newnstreatment_enteredby_title">Introducido por</string>
+    <string name="careportal_newnstreatment_glucosetype">Tipo de glucosa</string>
+    <string name="noprofile">Pendiente carga perfil NS</string>
+    <string name="overview_tempbasal_button">Basal Temporal</string>
+    <string name="overview_extendedbolus_button">Bolo extendido</string>
+    <string name="configbuilder_nsclientversion_label">NSClient versión:</string>
+    <string name="configbuilder_nightscoutversion_label">Nightscout versión:</string>
+    <string name="send">ENVIAR</string>
+    <string name="missing">Desaparecido</string>
+    <string name="enabled">Habilitado</string>
+    <string name="visible">Visible</string>
+    <string name="up">Arriba</string>
+    <string name="exported">Preferencias exportadas</string>
+    <string name="export_to">Exportar ajustes a</string>
+    <string name="import_from">Importar configuración de</string>
+    <string name="setting_imported">Ajustes importados</string>
+    <string name="filenotfound">Archivo no encontrado</string>
+    <string name="nav_export">Ajustes de exportación</string>
+    <string name="nav_import">Importar ajustes</string>
+    <string name="de_lang">alemán</string>
+    <string name="openapsma_low_summary">Valor mínimo de BG para estar en rango.</string>
+    <string name="openapsma_high_summary">Valor máximo BG para estar en rango.</string>
+    <string name="openapsma_maxbasal_summary">Max valor U / hr en Basal temporal</string>
+    <string name="openapsma_maxiob_summary">Máximos basales IOB para OpenAPS [U]</string>
+    <string name="bg_lang">búlgaro</string>
+    <string name="dismiss">DESCARTAR</string>
+    <string name="language">Idioma</string>
+
+    <string name="danarpump">DanaR</string>
+    <string name="connecting">Conectando</string>
+    <string name="connected">Conectado</string>
+    <string name="disconnected">Desconectado</string>
+    <string name="syncprofiletopump_title">Sincronizar perfil Nightscout a bomba</string>
+    <string name="danar_pump_settings">Ajustes de la bomba DanaR</string>
+    <string name="nightscout">Nightscout</string>
+    <string name="end_user_license_agreement">Acuerdo de licencia de usuario final</string>
+    <string name="end_user_license_agreement_text">No deben utilizarse para tomar decisiones médicas. NO HAY GARANTÍA PARA EL PROGRAMA, la extensión permitida por la legislación aplicable. Excepto cuando se indique de otra forma por escrito, los tenedores del copyright y / u otras partes proporcionan el programa \"tal cual\" sin garantía de ningún tipo, ya sea expresa o implícita, incluyendo, pero no limitado a, las garantías implícitas de COMERCIALIZACIÓN E IDONEIDAD PARA UN FIN DETERMINADO . TODO EL RIESGO EN CUANTO A LA CALIDAD Y RENDIMIENTO DEL PROGRAMA ES CON USTED. SI EL PROGRAMA TIENE UN ERROR, asume el coste de cualquier servicio, reparación o corrección.</string>
+    <string name="end_user_license_agreement_i_understand">Entiendo y acepto</string>
+    <string name="save">Salvar</string>
+    <string name="nobtadapter">No se encuentra adaptador Bluetooth</string>
+    <string name="devicenotfound">El dispositivo seleccionado no se encuentra</string>
+    <string name="connectionerror">Error de conexión de la bomba</string>
+    <string name="virtualpump_lastconnection_label">Última conexión:</string>
+    <string name="danar_iob_label">Bomba IOB:</string>
+    <string name="danar_dailyunits">Unidades diarias:</string>
+    <string name="danar_lastbolus">Último bolo:</string>
+    <string name="hoursago">h antes</string>
+    <string name="danar_invalidinput">Datos invalidos</string>
+    <string name="danar_valuenotsetproperly">Valor no establecido correctamente</string>
+    <string name="reloadprofile">Recargar Perfil</string>
+    <string name="danar_viewprofile">Ver perfil</string>
+    <string name="enacted">Aceptada</string>
+    <string name="comment">Comentario</string>
+    <string name="success">Correcto</string>
+    <string name="percent">Porciento</string>
+    <string name="absolute">Absoluto</string>
+    <string name="canceltemp">Cancelar basal temporal</string>
+    <string name="smscommunicator">SMS Communicator</string>
+    <string name="mm640g">MM 640g</string>
+    <string name="waitingforpumpresult">Esperando resultado</string>
+    <string name="smscommunicator_allowednumbers">Números de teléfono permitidos</string>
+    <string name="smscommunicator_allowednumbers_summary">XXXXXXXXXX +; + YYYYYYYYYY</string>
+    <string formatted="false" name="replywithcode">Para entregar bolo% .2fU responder con código% s</string>
+    <string name="bolusfailed">bolo falló</string>
+    <string formatted="false" name="bolusdelivered">Bolo% .2fU entregado con éxito</string>
+    <string formatted="false" name="bolusdelivering">Entregando% .2fU</string>
+    <string name="smscommunicator_remotebolusingallowed">Permitir bolos remotos por SMS</string>
+    <string name="remotebolusnotallowed">Bolo remoto no permitido</string>
+    <string name="glucosetype_finger">Dedo</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="glucosetype_manual">Manual</string>
+    <string name="careportal_temporarytarget">Objetivo temporal</string>
+    <string name="careportal_temporarytargetcancel">Cancelar Objetivo temporal</string>
+    <string name="danarprofile">Configuración perfil DanaR</string>
+    <string name="danarprofile_dia">DIA [h]</string>
+    <string name="danarprofile_car">Tasa de absorción de carbohidratos</string>
+    <string name="failedupdatebasalprofile">No se pudo actualizar el perfil basal</string>
+    <string name="danar_history">Historial</string>
+    <string name="danar_historyreload">Recargar</string>
+    <string name="uploading">Subiendo</string>
+    <string name="danar_ebolus">E bolo</string>
+    <string name="danar_dsbolus">bolo DS</string>
+    <string name="danar_debolus">DE bolo</string>
+    <string name="danar_error">error</string>
+    <string name="danar_refill">rellenar</string>
+    <string name="danar_basalhour">basal hora</string>
+    <string name="danar_glucose">glucosa</string>
+    <string name="danar_carbohydrate">carbohidratos</string>
+    <string name="danar_alarm">alarma</string>
+    <string formatted="false" name="danar_totaluploaded">Total %d registros subidos</string>
+    <string name="danar_sbolus">S bolo</string>
+    <string name="danar_history_alarm">alarmas</string>
+    <string name="danar_history_basalhours">Basal Horas</string>
+    <string name="danar_history_bolus">bolos</string>
+    <string name="danar_history_carbohydrates">Carbohidratos</string>
+    <string name="danar_history_dailyinsulin">Insulina Diaria</string>
+    <string name="danar_history_errors">Errores</string>
+    <string name="danar_history_glucose">Glucosa</string>
+    <string name="danar_history_refill">Rellenar</string>
+    <string name="danar_history_syspend">Suspender</string>
+    <string formatted="false" name="danar_history_connectingfor">Conexión de %d s</string>
+    <string name="danar_password">Contraseña de la bomba</string>
+    <string name="wrongpumppassword">Contraseña de la bomba incorrecta!</string>
+    <string name="pumpbusy">Bomba ocupada</string>
+    <string name="overview_bolusprogress_delivered">Entregado</string>
+    <string name="overview_bolusprogress_stoped">Detenido</string>
+    <string name="overview_bolusiprogress_occlusion">Oclusión</string>
+    <string name="overview_bolusprogress_stop">Detener</string>
+    <string name="overview_bolusprogress_stoppressed">Parar pulsado</string>
+    <string name="waitingforpump">Esperando bomba</string>
+    <string formatted="false" name="overview_bolusprogress_goingtodeliver">Va a entregar% .2fU</string>
+    <string name="objectives_0_objective">Configuración de visualización y monitoreo, y el análisis de los basales y ratios</string>
+    <string name="objectives_0_gate">Comprobar que los datos de BG están disponibles en Nightscout, y que los datos de la bomba de insulina se están subiendo</string>
+    <string name="objectives_1_objective">Empezar con bucle abierto</string>
+    <string name="objectives_1_gate">Ejecutar en modo de lazo abierto durante unos días, y aceptar manualmente las basales temporales</string>
+    <string name="objectives_2_objective">Entender el lazo abierto, incluidas las recomendaciones de basales temporales</string>
+    <string name="objectives_2_gate">Sobre la base de esa experiencia, decidir valores de máximo basal, y ajustar la bomba y preferencias</string>
+    <string name="objectives_3_objective">Iniciar el bucle cerrado con suspensión con baja glucosa</string>
+    <string name="objectives_3_gate">Ejecutar en lazo cerrado con max IOB=0 durante unos dias sin demasiados valores bajos de glucosa</string>
+    <string name="objectives_4_objective">Ajuste del bucle cerrado, aumento máximo IOB por encima de 0 y bajando gradualmente objetivos BG</string>
+    <string name="objectives_4_gate">Funcionando unos cuantos días, y al menos una noche sin alarmas bajas BG, y bajar gradualmente BG</string>
+    <string name="objectives_5_objective">Ajustar los basales y ratios, si es necesario, y luego activar auto-sens</string>
+    <string name="objectives_5_gate">1 semana lazo cerrado completado con entrada regular de carbohidratos</string>
+    <string name="objectives_6_objective">Habilitar funciones adicionales para su uso durante el día, como asistente de comida avanzado</string>
+    <string name="youareonallowedlimit">Alcanzado el límite permitido</string>
+    <string name="openapsma_target_bg">Valor objetivo para los cálculos</string>
+    <string name="noprofileselected">Sin perfil seleccionado</string>
+
+</resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index f092799237..7cda951524 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -15,11 +15,13 @@
         <item>@string/cs_lang</item>
         <item>@string/de_lang</item>
         <item>@string/bg_lang</item>
+        <item>@string/es_lang</item>
     </string-array>
     <string-array name="languagesValues" translatable="false">
         <item>en</item>
         <item>cs</item>
         <item>de</item>
         <item>bg</item>
+        <item>es</item>
     </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 84dbc46616..685bdf8898 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -198,6 +198,7 @@
     <string name="nav_export">Export settings</string>
     <string name="nav_import">Import settings</string>
     <string name="de_lang">German</string>
+    <string name="es_lang">Español</string>
     <string name="openapsma_low_summary">The minimum BG value to be in range.</string>
     <string name="openapsma_high_summary">The maximum BG value to be in range.</string>
     <string name="openapsma_maxbasal_summary">Max U/hr a Temp Basal can be set to</string>