diff --git a/app-wear-shared/shared/src/main/res/values-es-rES/strings.xml b/app-wear-shared/shared/src/main/res/values-es-rES/strings.xml
index 21bc82f66c..9762c43894 100644
--- a/app-wear-shared/shared/src/main/res/values-es-rES/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-es-rES/strings.xml
@@ -47,7 +47,7 @@
     <string name="pref_show_detailed_delta">Mostrar delta detallado</string>
     <string name="pref_show_avgdelta">Mostrar delta promedio</string>
     <string name="pref_show_phone_battery">Mostrar batería del teléfono</string>
-    <string name="pref_show_rig_battery">Mostrar batería de la plataforma</string>
+    <string name="pref_show_rig_battery">Mostrar batería global del lazo</string>
     <string name="pref_show_basal_rate">Mostrar la tasa basal</string>
     <string name="pref_show_loop_status">Mostrar estado del lazo</string>
     <string name="pref_show_bg">Mostrar glucosa</string>
diff --git a/core/ui/src/main/res/values-es-rES/strings.xml b/core/ui/src/main/res/values-es-rES/strings.xml
index cfc454e047..8fe61b985a 100644
--- a/core/ui/src/main/res/values-es-rES/strings.xml
+++ b/core/ui/src/main/res/values-es-rES/strings.xml
@@ -17,7 +17,7 @@
     <string name="bolus_delivered_successfully">Bolo %1$.2fU entregado correctamente</string>
     <string name="no_valid_basal_rate">Tasa basal no válida leída en la bomba</string>
     <string name="limiting_iob">Limitando IOB a %1$.1f U debido a %2$s</string>
-    <string name="loop_disabled">BUCLE DESACTIVADO POR RESTRICCIONES</string>
+    <string name="loop_disabled">LAZO DESACTIVADO POR RESTRICCIONES</string>
     <string name="event_type">Tipo de evento</string>
     <string name="reload">Recargar</string>
     <string name="mgdl">mg/dl</string>
@@ -86,11 +86,11 @@
     <string name="pump_time_updated">Hora actualizada en la bomba</string>
     <string name="exit">Salir</string>
     <string name="removerecord">Eliminar registro</string>
-    <string name="loopisdisabled">Bucle desactivado</string>
+    <string name="loopisdisabled">Lazo desactivado</string>
     <string name="alarm">Alarma</string>
-    <string name="disableloop">Desactivar bucle</string>
-    <string name="enableloop">Activar bucle</string>
-    <string name="resumeloop">Reanudar el bucle</string>
+    <string name="disableloop">Desactivar lazo</string>
+    <string name="enableloop">Activar lazo</string>
+    <string name="resumeloop">Reanudar el lazo</string>
     <string name="suspendloop">Suspender lazo</string>
     <string name="duration_min_label">Duración [min]</string>
     <string name="notification">Notificación</string>
@@ -118,7 +118,7 @@
     <string name="shortgramm">g</string>
     <string name="pumpsuspended">Bomba parada</string>
     <string name="notconfigured">Sin configurar</string>
-    <string name="loopsuspended">Bucle suspendido</string>
+    <string name="loopsuspended">Lazo suspendido</string>
     <string name="trend_arrow">Flecha de tendencia</string>
     <string name="a11y_autosens_label">Auto sens</string>
     <string name="required">req</string>
@@ -156,8 +156,8 @@
     <string name="prime_fill">Cebar/Llenar</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="stoptemptarget">Detener objetivo temporal</string>
-    <string name="closedloop">Bucle cerrado</string>
-    <string name="openloop">Bucle abierto</string>
+    <string name="closedloop">Lazo cerrado</string>
+    <string name="openloop">Lazo abierto</string>
     <string name="lowglucosesuspend">Suspensión por glucosa baja (LGS)</string>
     <string name="dia">DIA</string>
     <string name="ic_short">IC</string>
@@ -165,7 +165,7 @@
     <string name="canceling_tbr_failed">Error cancelando la basal temporal</string>
     <string name="canceling_eb_failed">Error cancelando el bolo extendido</string>
     <string name="virtualpump_uploadstatus_title">Subir estado de la bomba a NS o Tidepool</string>
-    <string name="suspendloop_label">Desactiva/suspende el bucle</string>
+    <string name="suspendloop_label">Desactiva/suspende el lazo</string>
     <string name="iob_label">Insulina a bordo (IOB)</string>
     <!--    Protection-->
     <string name="wrongpassword">Contraseña incorrecta</string>
@@ -234,7 +234,7 @@
     <string name="wear">Reloj</string>
     <string name="automation">Automatización</string>
     <string name="custom">Personalizado</string>
-    <string name="loop">Bucle</string>
+    <string name="loop">Lazo</string>
     <string name="ns">NS</string>
     <string name="record">Registro</string>
     <!--    Command-->
@@ -278,11 +278,11 @@
     <string name="uel_store_profile">GUARDAR PERFIL</string>
     <string name="uel_profile_switch">CAMBIO DE PERFIL</string>
     <string name="uel_profile_switch_cloned">CAMBIO DE PERFIL CLONADO</string>
-    <string name="uel_closed_loop_mode">MODO BUCLE CERRADO</string>
-    <string name="uel_lgs_loop_mode">MODO BUCLE LGS</string>
-    <string name="uel_open_loop_mode">MODO BUCLEABIERTO</string>
-    <string name="uel_loop_disabled">BUCLE DESACTIVADO</string>
-    <string name="uel_loop_enabled">BUCLE ACTIVADO</string>
+    <string name="uel_closed_loop_mode">MODO LAZO CERRADO</string>
+    <string name="uel_lgs_loop_mode">MODO LAZO LGS</string>
+    <string name="uel_open_loop_mode">MODO LAZO ABIERTO</string>
+    <string name="uel_loop_disabled">LAZO DESACTIVADO</string>
+    <string name="uel_loop_enabled">LAZO ACTIVADO</string>
     <string name="uel_reconnect">RECONECTAR</string>
     <string name="uel_disconnect">DESCONECTAR</string>
     <string name="uel_resume">REANUDAR</string>
@@ -353,8 +353,8 @@
     <string name="ue_action">Acción</string>
     <string name="ue_timestamp">Fecha y hora</string>
     <string name="ue_none">Sin Unidad</string>
-    <string name="uel_loop_change">BUCLE CAMBIADO</string>
-    <string name="uel_loop_removed">BUCLE ELIMINADO</string>
+    <string name="uel_loop_change">LAZO CAMBIADO</string>
+    <string name="uel_loop_removed">LAZO ELIMINADO</string>
     <string name="uel_other">OTROS</string>
     <!-- HardLimits -->
     <string name="profile_low_target">Perfil de objetivo bajo</string>
diff --git a/plugins/configuration/src/main/res/values-es-rES/strings.xml b/plugins/configuration/src/main/res/values-es-rES/strings.xml
index 50a376287b..037856e883 100644
--- a/plugins/configuration/src/main/res/values-es-rES/strings.xml
+++ b/plugins/configuration/src/main/res/values-es-rES/strings.xml
@@ -68,8 +68,8 @@
     <string name="configbuilder_sync">Sincronización</string>
     <string name="configbuilder_sync_description">Subida de datos y sincronización de plugins</string>
     <string name="configbuilder_constraints_description">¿Qué restricciones se aplican?</string>
-    <string name="configbuilder_loop">Bucle</string>
-    <string name="configbuilder_loop_description">Usa esto para habilitar la integración de bucle de AAPS.</string>
+    <string name="configbuilder_loop">Lazo</string>
+    <string name="configbuilder_loop_description">Usa esto para habilitar la integración de lazo de AAPS</string>
     <string name="configbuilder_insulin_description">¿Qué tipo de insulina estás utilizando?</string>
     <string name="configbuilder_bgsource">Origen de Glucosa</string>
     <string name="configbuilder_bgsource_description">¿Desde dónde debería obtener AAPS los datos?</string>
diff --git a/plugins/main/src/main/res/values-iw-rIL/strings.xml b/plugins/main/src/main/res/values-iw-rIL/strings.xml
index 3fe04a2f12..bf509e0664 100644
--- a/plugins/main/src/main/res/values-iw-rIL/strings.xml
+++ b/plugins/main/src/main/res/values-iw-rIL/strings.xml
@@ -330,7 +330,6 @@
     <string name="grams_short">גר\'</string>
     <string name="hour_short">ש\'</string>
     <string name="no_active_profile">לא הופעלה החלפת פרופיל!</string>
-    <string name="profile_message">פרופיל:\n\nהיסט זמן: %1$\nאחוז: %2$d%\"</string>
     <string name="tdd_line">%1$.2fיח\' %1$.0f%</string>
     <string name="no_profile">לא נטען פרופיל</string>
     <string name="aps_only">חל רק במצב APS!</string>
@@ -350,5 +349,4 @@
     <string name="until">עד</string>
     <string name="default_range">טווח ברירת מחדל</string>
     <string name="target">מטרה</string>
-    <string name="rate_duration">מינון: %1$.2fיח\'\\ש\' (%2$.2f%) \nל-%3$d דק\'</string>
 </resources>
diff --git a/pump/combov2/src/main/res/values-iw-rIL/strings.xml b/pump/combov2/src/main/res/values-iw-rIL/strings.xml
index a983478c10..4353ad56ba 100644
--- a/pump/combov2/src/main/res/values-iw-rIL/strings.xml
+++ b/pump/combov2/src/main/res/values-iw-rIL/strings.xml
@@ -96,7 +96,6 @@
     <string name="combov2_cannot_set_absolute_tbr_if_basal_zero">לא ניתן להגדיר בזאלי זמני אם המינון הבזאלי הבסיסי הוא 0</string>
     <string name="combov2_pair_with_pump_summary">צימוד AndroidAPS ואנדרואיד עם משאבת Accu-Chek combo שאינה מצומדת</string>
     <string name="combov2_unpair_pump_summary">ביטול צימוד AndroidAPS ואנדרואיד ממשאבת Accu-Chek combo המצומדת</string>
-    <string name="combov2_unknown_tbr_detected">נמצא בזאלי זמני בלתי ידוע והוא נעצר; אחוזים: %1$d%; זמן שנשאר: %2$s</string>
     <string name="combov2_connection_error">שגיאת חיבור: %1$s</string>
     <string name="combov2_short_status_last_connection">חיבור אחרון: לפני %1$d דקות</string>
     <string name="combov2_short_status_alert">התראה: %s</string>