diff --git a/app/src/main/res/values-it-rIT/exam.xml b/app/src/main/res/values-it-rIT/exam.xml
index 1841752c18..93738aef2c 100644
--- a/app/src/main/res/values-it-rIT/exam.xml
+++ b/app/src/main/res/values-it-rIT/exam.xml
@@ -136,6 +136,19 @@
     <string name="wronginsulin_compare">Compara i valori in AndroidAPS con lo storico micro (se supportato).</string>
     <string name="wronginsulin_prime">Erogare un bolo con parte della tua insulina calcolata \"mancante\" usando una siringa/penna o la funzione caricamento.</string>
     <string name="wronginsulin_donothing">Non fare nulla e permettere ad AndroidAPS di correggere eventuali glicemie alte.</string>
+    <string name="cob_label">CHO attivi (COB)</string>
+    <string name="cob_question">In che modo la modifica del valore ISF influisce sul calcolo dei COB?</string>
+    <string name="cob_longer">L\'aumento di ISF richiederà un tempo maggiore per l\'assorbimento dei CHO</string>
+    <string name="cob_shorter">L\'aumento di ISF richiederà un tempo minore per l\'assorbimento dei CHO</string>
+    <string name="cob_no_effect">L\'aumento di ISF non influirà sull\'assorbimento calcolato dei CHO</string>
+    <string name="cob2_question">In che modo la modifica del valore IC influisce sul calcolo dei COB?</string>
+    <string name="cob2_longer">L\'aumento di IC richiederà un tempo maggiore per l\'assorbimento dei CHO</string>
+    <string name="cob2_shorter">L\'aumento di IC richiederà un tempo minore per l\'assorbimento dei CHO</string>
+    <string name="cob2_no_effect">L\'aumento di IC non influirà sull\'assorbimento calcolato dei CHO</string>
+    <string name="cob3_question">In che modo la modifica della percentuale profilo influisce sul calcolo dei COB?</string>
+    <string name="cob3_longer">Impostare il profilo al 150% richiederà un tempo maggiore per l\'assorbimento dei CHO</string>
+    <string name="cob3_shorter">Impostare il profilo al 150% richiederà un tempo minore per l\'assorbimento dei CHO</string>
+    <string name="cob3_no_effect">Impostare il profilo al 150% non influirà sull\'assorbimento calcolato dei CHO</string>
     <string name="iob_label">Insulina attiva (IOB)</string>
     <string name="iob_value">Il valore IOB è influenzato dalle basali temporanee emesse.</string>
     <string name="iob_hightemp">Non verrà emessa una basale temporanea alta quando la tua glicemia è al di sotto del target.</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 3ef0aad794..699936420f 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1037,10 +1037,12 @@
     <string name="a11y_only_on_watch">solo su smartwatch</string>
     <string name="a11y_only_on_phone">solo su telefono</string>
     <string name="a11y_drag_and_drop_handle">trascina e rilascia</string>
+    <string name="search">Cerca</string>
     <!-- Aidex Cgms -->
     <string name="aidex">GlucoRx Aidex</string>
     <string name="aidex_short">GlucoRx Aidex</string>
     <string name="description_source_aidex">Ricevi valori glicemia da CGM GlucoRx Aidex.</string>
     <string name="blocked_by_charging">Bloccato dalle opzioni di ricarica</string>
     <string name="blocked_by_connectivity">Bloccato dalle opzioni di connettività</string>
+    <string name="no_watch_connected">(Nessuno smartwatch connesso)</string>
 </resources>
diff --git a/automation/src/main/res/values-it-rIT/strings.xml b/automation/src/main/res/values-it-rIT/strings.xml
index 926f76ebc6..e341ede3d4 100644
--- a/automation/src/main/res/values-it-rIT/strings.xml
+++ b/automation/src/main/res/values-it-rIT/strings.xml
@@ -123,4 +123,5 @@
     <string name="run_automations">Esegui automazioni</string>
     <string name="add_automation">Aggiungi regola</string>
     <string name="remove_sort">Rimuovi/ordina</string>
+    <string name="stop_processing">Interrompere l\'elaborazione</string>
 </resources>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 0f86119b89..fa7260b877 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -488,6 +488,7 @@
     <string name="autotune_run_without_autoswitch">Autotune eseguito senza cambio profilo</string>
     <string name="autotune_run_with_autoswitch">Autotune eseguito e profilo cambiato automaticamente</string>
     <string name="autotune_run_with_error">Errore durante l\'ultima esecuzione di Autotune</string>
+    <string name="autotune_run_cancelled">È stata rilevata un\'altra esecuzione di Autotune, esecuzione annullata</string>
     <plurals name="days">
         <item quantity="one">%1$d giorno</item>
         <item quantity="other">%1$d giorni</item>
diff --git a/pump-common/src/main/res/values-es-rES/strings.xml b/pump-common/src/main/res/values-es-rES/strings.xml
index b138c249cc..24850a5c07 100644
--- a/pump-common/src/main/res/values-es-rES/strings.xml
+++ b/pump-common/src/main/res/values-es-rES/strings.xml
@@ -4,6 +4,7 @@
     <string name="pump_operation_not_supported_by_pump_driver">Operación no soportada por la bomba y/o por el controlador.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Operación no soportada todavía por la bomba.</string>
     <string name="common_resultok">OK</string>
+    <string name="pump_serial_number">Número de serie de la bomba</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Nunca contactado</string>
     <string name="pump_status_waking_up">En fase de inicio</string>
@@ -13,6 +14,13 @@
     <string name="pump_status_invalid_config">Configuración inválida</string>
     <string name="pump_status_active">Activo</string>
     <string name="pump_status_sleeping">Suspendida</string>
+    <string name="pump_status_not_initialized">No Inicializado</string>
+    <string name="pump_status_initialized">Inicializado</string>
+    <string name="pump_status_encrypt">Encriptando comunicación</string>
+    <string name="pump_status_ready">Preparado</string>
+    <string name="pump_status_busy">Ocupado</string>
+    <string name="pump_status_suspended">Suspendido</string>
+    <string name="pump_status_executing_command">Ejecutando comando</string>
     <!-- PumpCommon - History Group -->
     <string name="history_group_basal">Basales</string>
     <string name="history_group_configuration">Configuraciones</string>
@@ -24,9 +32,59 @@
     <string name="history_group_prime">Cebado</string>
     <string name="history_group_alarm">Alarmas</string>
     <string name="history_group_glucose">Glucosa</string>
+    <string name="history_group_base">Base</string>
+    <string name="history_group_other">Otro</string>
+    <string name="history_group_events">Todos los Eventos</string>
+    <string name="history_group_events_no_stat">Eventos (sin estadísticas)</string>
     <!-- Time -->
+    <string name="time_today">Hoy</string>
+    <string name="time_last_hour">Última hora</string>
+    <string name="time_last_3_hours">Últimas 3 horas</string>
+    <string name="time_last_6_hours">Últimas 6 horas</string>
+    <string name="time_last_12_hours">Últimas 12 horas</string>
+    <string name="time_last_2_days">Últimos 2 días</string>
+    <string name="time_last_4_days">Últimos 4 días</string>
+    <string name="time_last_week">Última semana</string>
+    <string name="time_last_month">Último mes</string>
     <!-- BLE Config -->
+    <string name="ble_config_button_scan_start">Escanear</string>
+    <string name="ble_config_scan_stop">Parar</string>
+    <string name="ble_config_scan_selected">Seleccionado</string>
+    <string name="ble_config_scan_scanning">Escaneando</string>
+    <string name="ble_config_scan_finished">Escaneo finalizado</string>
+    <string name="ble_config_scan_error">Error escaneando: %1$d</string>
+    <string name="ble_config_connected_never">Nunca</string>
+    <string name="ble_config_remove">Eliminar</string>
     <!-- BLE Errors -->
+    <string name="ble_error_bt_disabled">Bluetooth desactivado</string>
+    <string name="ble_error_no_bt_adapter">No hay adaptador Bluetooth</string>
+    <string name="ble_error_configured_pump_not_found">Bomba configurada no encontrada</string>
+    <string name="ble_error_pump_unreachable">Bomba inalcanzable</string>
+    <string name="ble_error_failed_to_conn_to_ble_device">Error al conectar al dispositivo BLE</string>
+    <string name="ble_error_encryption_failed">Encriptación fallida</string>
+    <string name="ble_error_pump_found_unbonded">Encontrada bomba no vinculada</string>
     <!-- Pump Error -->
+    <string name="pump_settings_error_basal_profiles_not_enabled">La configuración de perfiles basales no está habilitada en la bomba. Habilítalo en la bomba.</string>
+    <string name="pump_settings_error_incorrect_basal_profile_selected">El perfil basal establecido en la bomba es incorrecto (debe ser %s).</string>
+    <string name="pump_settings_error_wrong_tbr_type_set">EL TBR establecido en la bomba es incorrecto (debe ser %s).</string>
+    <string name="pump_settings_error_wrong_max_bolus_set">El máximo bolo establecido en la bomba es incorrecto (debe ser %1$.2f),</string>
+    <string name="pump_settings_error_wrong_max_basal_set">La basal máxima establecida en la bomba es incorrecta (debe ser %1$.2f).</string>
     <!-- Pump History -->
+    <string name="pump_history_type">Tipo:</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d día</item>
+        <item quantity="other">%1$d días</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d hora</item>
+        <item quantity="other">%1$d horas</item>
+    </plurals>
+    <plurals name="hoursago">
+        <item quantity="one">Hace %1$d hora</item>
+        <item quantity="other">Hace %1$d horas</item>
+    </plurals>
+    <plurals name="daysago">
+        <item quantity="one">Hace %1$d día</item>
+        <item quantity="other">Hace %1$d días</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-fr-rFR/strings.xml b/pump-common/src/main/res/values-fr-rFR/strings.xml
index 557d7cb0aa..5a8c14e3e7 100644
--- a/pump-common/src/main/res/values-fr-rFR/strings.xml
+++ b/pump-common/src/main/res/values-fr-rFR/strings.xml
@@ -4,6 +4,7 @@
     <string name="pump_operation_not_supported_by_pump_driver">Opération non prise en charge par la pompe et/ou le pilote.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Opération PAS ENCORE supportée par la pompe.</string>
     <string name="common_resultok">OK</string>
+    <string name="pump_serial_number">Numéro de série de la pompe</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Jamais contacté</string>
     <string name="pump_status_waking_up">Réveil en cours</string>
@@ -13,6 +14,13 @@
     <string name="pump_status_invalid_config">Configuration invalide</string>
     <string name="pump_status_active">Actif</string>
     <string name="pump_status_sleeping">En veille</string>
+    <string name="pump_status_not_initialized">Non initialisé</string>
+    <string name="pump_status_initialized">Initialisé</string>
+    <string name="pump_status_encrypt">Cryptage de la communication</string>
+    <string name="pump_status_ready">Prêt</string>
+    <string name="pump_status_busy">Occupé</string>
+    <string name="pump_status_suspended">Suspendu</string>
+    <string name="pump_status_executing_command">Exécution de la commande</string>
     <!-- PumpCommon - History Group -->
     <string name="history_group_basal">Basales</string>
     <string name="history_group_configuration">Configurations</string>
@@ -24,9 +32,59 @@
     <string name="history_group_prime">Amorcer</string>
     <string name="history_group_alarm">Alarmes</string>
     <string name="history_group_glucose">Glycémie</string>
+    <string name="history_group_base">Base</string>
+    <string name="history_group_other">Autre</string>
+    <string name="history_group_events">Tous les événements</string>
+    <string name="history_group_events_no_stat">Événements (sans stat)</string>
     <!-- Time -->
+    <string name="time_today">Aujourd’hui</string>
+    <string name="time_last_hour">Dernière heure</string>
+    <string name="time_last_3_hours">3 dernières heures</string>
+    <string name="time_last_6_hours">6 dernières heures</string>
+    <string name="time_last_12_hours">12 dernières heures</string>
+    <string name="time_last_2_days">2 derniers jours</string>
+    <string name="time_last_4_days">4 derniers jours</string>
+    <string name="time_last_week">Dernière semaine</string>
+    <string name="time_last_month">Mois dernier</string>
     <!-- BLE Config -->
+    <string name="ble_config_button_scan_start">Scanner</string>
+    <string name="ble_config_scan_stop">Arrêter</string>
+    <string name="ble_config_scan_selected">Sélectionné</string>
+    <string name="ble_config_scan_scanning">Recherche en cours</string>
+    <string name="ble_config_scan_finished">Recherche terminée</string>
+    <string name="ble_config_scan_error">Erreur de scan : %1$d</string>
+    <string name="ble_config_connected_never">Jamais</string>
+    <string name="ble_config_remove">Supprimer</string>
     <!-- BLE Errors -->
+    <string name="ble_error_bt_disabled">Bluetooth désactivé</string>
+    <string name="ble_error_no_bt_adapter">Aucun adaptateur Bluetooth</string>
+    <string name="ble_error_configured_pump_not_found">Pompe configurée introuvable</string>
+    <string name="ble_error_pump_unreachable">Pompe hors de portée</string>
+    <string name="ble_error_failed_to_conn_to_ble_device">Échec de la connexion à l’appareil BLE</string>
+    <string name="ble_error_encryption_failed">Echec du cryptage</string>
+    <string name="ble_error_pump_found_unbonded">Pas de pompe appairée trouvée</string>
     <!-- Pump Error -->
+    <string name="pump_settings_error_basal_profiles_not_enabled">Le réglage des profils de basal n\'est pas activé sur la pompe. Activez-le sur la pompe.</string>
+    <string name="pump_settings_error_incorrect_basal_profile_selected">Le profil Basal défini sur la pompe est incorrect (doit être %s).</string>
+    <string name="pump_settings_error_wrong_tbr_type_set">Mauvais type DBT (TBR) réglé sur la pompe (doit être %s).</string>
+    <string name="pump_settings_error_wrong_max_bolus_set">Mauvais paramètre Max Bolus sur la pompe (doit être %1$.2f).</string>
+    <string name="pump_settings_error_wrong_max_basal_set">Mauvais paramètre Max Basal sur la pompe (doit être %1$.2f).</string>
     <!-- Pump History -->
+    <string name="pump_history_type">Type :</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d jour</item>
+        <item quantity="other">%1$d jours</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d heure</item>
+        <item quantity="other">%1$d heures</item>
+    </plurals>
+    <plurals name="hoursago">
+        <item quantity="one">Il y a %1$d heure</item>
+        <item quantity="other">Il y a %1$d heures</item>
+    </plurals>
+    <plurals name="daysago">
+        <item quantity="one">Il y a %1$d jour</item>
+        <item quantity="other">Il y a %1$d jours</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-it-rIT/strings.xml b/pump-common/src/main/res/values-it-rIT/strings.xml
index 2ba2c4ef21..010278c8ce 100644
--- a/pump-common/src/main/res/values-it-rIT/strings.xml
+++ b/pump-common/src/main/res/values-it-rIT/strings.xml
@@ -4,6 +4,7 @@
     <string name="pump_operation_not_supported_by_pump_driver">Operazione non supportata dal micro e/o dal driver.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Operazione NON ANCORA supportata dal micro.</string>
     <string name="common_resultok">OK</string>
+    <string name="pump_serial_number">Numero seriale micro</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Mai connesso</string>
     <string name="pump_status_waking_up">Risveglio</string>
@@ -13,6 +14,13 @@
     <string name="pump_status_invalid_config">Configurazione non valida</string>
     <string name="pump_status_active">Attivo</string>
     <string name="pump_status_sleeping">In sospensione</string>
+    <string name="pump_status_not_initialized">Non inizializzato</string>
+    <string name="pump_status_initialized">Inizializzato</string>
+    <string name="pump_status_encrypt">Comunicazione crittata</string>
+    <string name="pump_status_ready">Pronto</string>
+    <string name="pump_status_busy">Occupato</string>
+    <string name="pump_status_suspended">Sospeso</string>
+    <string name="pump_status_executing_command">Eseguzione comando</string>
     <!-- PumpCommon - History Group -->
     <string name="history_group_basal">Basali</string>
     <string name="history_group_configuration">Configurazioni</string>
@@ -24,9 +32,59 @@
     <string name="history_group_prime">Caricamento</string>
     <string name="history_group_alarm">Allarmi</string>
     <string name="history_group_glucose">Glicemia</string>
+    <string name="history_group_base">Base</string>
+    <string name="history_group_other">Altro</string>
+    <string name="history_group_events">Tutti gli eventi</string>
+    <string name="history_group_events_no_stat">Eventi (no stat)</string>
     <!-- Time -->
+    <string name="time_today">Oggi</string>
+    <string name="time_last_hour">Ultima ora</string>
+    <string name="time_last_3_hours">Ultime 3 ore</string>
+    <string name="time_last_6_hours">Ultime 6 ore</string>
+    <string name="time_last_12_hours">Ultime 12 ore</string>
+    <string name="time_last_2_days">Ultimi 2 giorni</string>
+    <string name="time_last_4_days">Ultimi 4 giorni</string>
+    <string name="time_last_week">Ultima settimana</string>
+    <string name="time_last_month">Ultimo mese</string>
     <!-- BLE Config -->
+    <string name="ble_config_button_scan_start">Scansione</string>
+    <string name="ble_config_scan_stop">Stop</string>
+    <string name="ble_config_scan_selected">Selezionato</string>
+    <string name="ble_config_scan_scanning">Scansione</string>
+    <string name="ble_config_scan_finished">Scansione terminata</string>
+    <string name="ble_config_scan_error">Errore scansione: %1$d</string>
+    <string name="ble_config_connected_never">Mai</string>
+    <string name="ble_config_remove">Rimuovi</string>
     <!-- BLE Errors -->
+    <string name="ble_error_bt_disabled">Bluetooth disabilitato</string>
+    <string name="ble_error_no_bt_adapter">Nessun trasmettitore bluetooth</string>
+    <string name="ble_error_configured_pump_not_found">Micro configurato non trovato</string>
+    <string name="ble_error_pump_unreachable">Micro irraggiungibile</string>
+    <string name="ble_error_failed_to_conn_to_ble_device">Impossibile connettersi al dispositivo BLE</string>
+    <string name="ble_error_encryption_failed">Crittografia fallita</string>
+    <string name="ble_error_pump_found_unbonded">Trovato micro non collegato</string>
     <!-- Pump Error -->
+    <string name="pump_settings_error_basal_profiles_not_enabled">L\'impostazione di modelli/profili basali non è abilitata sul micro. Abilitarla.</string>
+    <string name="pump_settings_error_incorrect_basal_profile_selected">Il profilo basale impostato sul micro non è corretto (deve essere %s).</string>
+    <string name="pump_settings_error_wrong_tbr_type_set">Il tipo di TBR impostato sul micro è errato (deve essere %s).</string>
+    <string name="pump_settings_error_wrong_max_bolus_set">Il bolo massimo impostato sul micro è errato (deve essere %1$.2f).</string>
+    <string name="pump_settings_error_wrong_max_basal_set">La basale massima impostata sul micro è errata (deve essere %1$.2f).</string>
     <!-- Pump History -->
+    <string name="pump_history_type">Tipo:</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d giorno</item>
+        <item quantity="other">%1$d giorni</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d ora</item>
+        <item quantity="other">%1$d ore</item>
+    </plurals>
+    <plurals name="hoursago">
+        <item quantity="one">%1$d ora fa</item>
+        <item quantity="other">%1$d ore fa</item>
+    </plurals>
+    <plurals name="daysago">
+        <item quantity="one">%1$d giorno fa</item>
+        <item quantity="other">%1$d giorni fa</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-no-rNO/strings.xml b/pump-common/src/main/res/values-no-rNO/strings.xml
index 23b42b2961..560538d7cb 100644
--- a/pump-common/src/main/res/values-no-rNO/strings.xml
+++ b/pump-common/src/main/res/values-no-rNO/strings.xml
@@ -4,6 +4,7 @@
     <string name="pump_operation_not_supported_by_pump_driver">Operasjonen støttes ikke av pumpen og/eller driveren.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Operasjonen støttes ikke av pumpen ennå.</string>
     <string name="common_resultok">OK</string>
+    <string name="pump_serial_number">Pumpens serienummer</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Aldri kontaktet</string>
     <string name="pump_status_waking_up">Våkner opp</string>
@@ -13,6 +14,13 @@
     <string name="pump_status_invalid_config">Ugyldig oppsett av pumpe</string>
     <string name="pump_status_active">Aktiv</string>
     <string name="pump_status_sleeping">Hvilemodus</string>
+    <string name="pump_status_not_initialized">Pumpen er ikke startet</string>
+    <string name="pump_status_initialized">Pumpen er startet</string>
+    <string name="pump_status_encrypt">Krypterer kommunikasjon</string>
+    <string name="pump_status_ready">Klar</string>
+    <string name="pump_status_busy">Opptatt</string>
+    <string name="pump_status_suspended">Pauset</string>
+    <string name="pump_status_executing_command">Utfører kommando</string>
     <!-- PumpCommon - History Group -->
     <string name="history_group_basal">Basaldoser</string>
     <string name="history_group_configuration">Konfigurasjoner</string>
@@ -24,9 +32,59 @@
     <string name="history_group_prime">Prime</string>
     <string name="history_group_alarm">Alarmer</string>
     <string name="history_group_glucose">Blodsukker</string>
+    <string name="history_group_base">Utgangspunkt</string>
+    <string name="history_group_other">Annet</string>
+    <string name="history_group_events">Alle hendelser</string>
+    <string name="history_group_events_no_stat">Hendelser (ingen stat.)</string>
     <!-- Time -->
+    <string name="time_today">I dag</string>
+    <string name="time_last_hour">Siste time</string>
+    <string name="time_last_3_hours">Siste 3 timer</string>
+    <string name="time_last_6_hours">Siste 6 timer</string>
+    <string name="time_last_12_hours">Siste 12 timer</string>
+    <string name="time_last_2_days">Siste 2 dager</string>
+    <string name="time_last_4_days">Siste 4 dager</string>
+    <string name="time_last_week">Siste uke</string>
+    <string name="time_last_month">Siste måned</string>
     <!-- BLE Config -->
+    <string name="ble_config_button_scan_start">Søk</string>
+    <string name="ble_config_scan_stop">Stopp</string>
+    <string name="ble_config_scan_selected">Valgt</string>
+    <string name="ble_config_scan_scanning">Søker</string>
+    <string name="ble_config_scan_finished">Søk fullført</string>
+    <string name="ble_config_scan_error">Søk feilet: %1$d</string>
+    <string name="ble_config_connected_never">Aldri</string>
+    <string name="ble_config_remove">Fjern</string>
     <!-- BLE Errors -->
+    <string name="ble_error_bt_disabled">Bluetooth deaktivert</string>
+    <string name="ble_error_no_bt_adapter">Ingen Bluetooth adapter</string>
+    <string name="ble_error_configured_pump_not_found">Konfigurert pumpe ikke funnet</string>
+    <string name="ble_error_pump_unreachable">Pumpe utilgjengelig</string>
+    <string name="ble_error_failed_to_conn_to_ble_device">Kunne ikke koble til Bluetooth-enhet</string>
+    <string name="ble_error_encryption_failed">Kryptering feilet</string>
+    <string name="ble_error_pump_found_unbonded">Fant pumpe som ikke er tilkoblet</string>
     <!-- Pump Error -->
+    <string name="pump_settings_error_basal_profiles_not_enabled">Basal-profil/program er ikke aktivert på pumpen. Aktiver det på pumpen.</string>
+    <string name="pump_settings_error_incorrect_basal_profile_selected">Basal-profil som er satt på pumpen er feil (må være %s).</string>
+    <string name="pump_settings_error_wrong_tbr_type_set">Feil TBR-type er valgt på pumpen (må være %s).</string>
+    <string name="pump_settings_error_wrong_max_bolus_set">Feil maks-bolus er satt på pumpen (må være %1$.2f).</string>
+    <string name="pump_settings_error_wrong_max_basal_set">Feil maks-basal er satt på pumpen (må være %1$.2f).</string>
     <!-- Pump History -->
+    <string name="pump_history_type">Type:</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dager</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d time</item>
+        <item quantity="other">%1$d timer</item>
+    </plurals>
+    <plurals name="hoursago">
+        <item quantity="one">%1$d time siden</item>
+        <item quantity="other">%1$d timer siden</item>
+    </plurals>
+    <plurals name="daysago">
+        <item quantity="one">%1$d dag siden</item>
+        <item quantity="other">%1$d dager siden</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-ru-rRU/strings.xml b/pump-common/src/main/res/values-ru-rRU/strings.xml
index 40bedc7d07..f6655e4645 100644
--- a/pump-common/src/main/res/values-ru-rRU/strings.xml
+++ b/pump-common/src/main/res/values-ru-rRU/strings.xml
@@ -4,6 +4,7 @@
     <string name="pump_operation_not_supported_by_pump_driver">Операция не поддерживается помпой и/или драйвером.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Операция ЕЩЕ не поддерживается помпой.</string>
     <string name="common_resultok">OK</string>
+    <string name="pump_serial_number">Серийный номер помпы</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Никогда не подключалась</string>
     <string name="pump_status_waking_up">Пробуждение</string>
@@ -13,6 +14,13 @@
     <string name="pump_status_invalid_config">Недопустимая конфигурация</string>
     <string name="pump_status_active">Работает</string>
     <string name="pump_status_sleeping">Спящий режим</string>
+    <string name="pump_status_not_initialized">Нет инициализации</string>
+    <string name="pump_status_initialized">Инициализировано</string>
+    <string name="pump_status_encrypt">Шифрование коммуникации</string>
+    <string name="pump_status_ready">Помпа готова</string>
+    <string name="pump_status_busy">Обработка</string>
+    <string name="pump_status_suspended">Помпа остановлена</string>
+    <string name="pump_status_executing_command">Выполнение команды</string>
     <!-- PumpCommon - History Group -->
     <string name="history_group_basal">Базалы</string>
     <string name="history_group_configuration">Конфигурации</string>
@@ -24,7 +32,14 @@
     <string name="history_group_prime">Заполнение</string>
     <string name="history_group_alarm">Оповещения</string>
     <string name="history_group_glucose">Гликемия</string>
+    <string name="history_group_base">База</string>
+    <string name="history_group_other">Другое</string>
+    <string name="history_group_events">Все события</string>
+    <string name="history_group_events_no_stat">События (без статистики)</string>
     <!-- Time -->
+    <string name="time_today">Сегодня</string>
+    <string name="time_last_hour">За прошедший час</string>
+    <string name="time_last_3_hours">За прошедшие 3 часа</string>
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
diff --git a/rileylink/src/main/res/values-zh-rCN/strings.xml b/rileylink/src/main/res/values-zh-rCN/strings.xml
index 894c82586d..bf830c54b6 100644
--- a/rileylink/src/main/res/values-zh-rCN/strings.xml
+++ b/rileylink/src/main/res/values-zh-rCN/strings.xml
@@ -25,7 +25,7 @@
     <string name="rileylink_address">地址：</string>
     <string name="rileylink_name">名称:</string>
     <string name="rileylink_battery_level">电池电量：</string>
-    <string name="rileylink_battery_level_value">%1$d %</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
     <string name="rileylink_connection_status">连接状态:</string>
     <string name="rileylink_connection_error">连接错误:</string>
     <string name="rileylink_device">设备</string>