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 bfd2113f9f..b88518c065 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
@@ -34,4 +34,10 @@
     <string name="disconnecting">Desconectando</string>
     <string name="waiting_for_disconnection">Esperando la desconexión</string>
     <!-- Custom Watchface -->
+    <string name="metadata_label_watchface_created_at">Creada: %1$s</string>
+    <string name="metadata_label_watchface_author">Autor: %1$s</string>
+    <string name="metadata_label_watchface_name">Nombre: %1$s</string>
+    <string name="metadata_wear_import_filename">Nombre de archivo:%1$s</string>
+    <string name="metadata_label_watchface_version">Versión de esfera: %1$s</string>
+    <string name="wear_default_watchface">Esfera por defecto</string>
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-fr-rFR/strings.xml b/app-wear-shared/shared/src/main/res/values-fr-rFR/strings.xml
index 81daf56453..c9f5c0322f 100644
--- a/app-wear-shared/shared/src/main/res/values-fr-rFR/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-fr-rFR/strings.xml
@@ -34,4 +34,10 @@
     <string name="disconnecting">Déconnexion en cours</string>
     <string name="waiting_for_disconnection">Attente de déconnexion</string>
     <!-- Custom Watchface -->
+    <string name="metadata_label_watchface_created_at">Créé le : %1$s</string>
+    <string name="metadata_label_watchface_author">Auteur : %1$s</string>
+    <string name="metadata_label_watchface_name">Nom : %1$s</string>
+    <string name="metadata_wear_import_filename">Nom du fichier : %1$s</string>
+    <string name="metadata_label_watchface_version">Version du cadran : %1$s</string>
+    <string name="wear_default_watchface">Cadran par défaut</string>
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-hr-rHR/strings.xml b/app-wear-shared/shared/src/main/res/values-hr-rHR/strings.xml
index a63512e487..a098b3c42d 100644
--- a/app-wear-shared/shared/src/main/res/values-hr-rHR/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-hr-rHR/strings.xml
@@ -10,4 +10,5 @@
     <string name="connected">Povezano</string>
     <string name="disconnecting">Odspajanje</string>
     <string name="waiting_for_disconnection">Čeka se prekid veze</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-it-rIT/strings.xml b/app-wear-shared/shared/src/main/res/values-it-rIT/strings.xml
index 1a2b166652..33f9c02f2c 100644
--- a/app-wear-shared/shared/src/main/res/values-it-rIT/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-it-rIT/strings.xml
@@ -34,4 +34,10 @@
     <string name="disconnecting">Disconnessione</string>
     <string name="waiting_for_disconnection">In attesa della disconnessione</string>
     <!-- Custom Watchface -->
+    <string name="metadata_label_watchface_created_at">Creato: %1$s</string>
+    <string name="metadata_label_watchface_author">Autore: %1$s</string>
+    <string name="metadata_label_watchface_name">Nome: %1$s</string>
+    <string name="metadata_wear_import_filename">Nome file: %1$s</string>
+    <string name="metadata_label_watchface_version">Versione watchface: %1$s</string>
+    <string name="wear_default_watchface">Watchface predefinita</string>
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-ko-rKR/strings.xml b/app-wear-shared/shared/src/main/res/values-ko-rKR/strings.xml
index 1c9655df64..8d6cd13d9a 100644
--- a/app-wear-shared/shared/src/main/res/values-ko-rKR/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-ko-rKR/strings.xml
@@ -23,4 +23,5 @@
     <string name="handshaking">통신 확인</string>
     <string name="connected">연결됨</string>
     <string name="disconnecting">연결끊기중</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-lt-rLT/strings.xml b/app-wear-shared/shared/src/main/res/values-lt-rLT/strings.xml
index 9ee1697cf6..d6e9d6c88b 100644
--- a/app-wear-shared/shared/src/main/res/values-lt-rLT/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-lt-rLT/strings.xml
@@ -33,4 +33,5 @@
     <string name="connected">Prisijungta</string>
     <string name="disconnecting">Atsijungiama</string>
     <string name="waiting_for_disconnection">Laukiama atsijungimo</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-nl-rNL/strings.xml b/app-wear-shared/shared/src/main/res/values-nl-rNL/strings.xml
index 0ed86a870d..837064af63 100644
--- a/app-wear-shared/shared/src/main/res/values-nl-rNL/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-nl-rNL/strings.xml
@@ -33,4 +33,5 @@
     <string name="connected">Verbonden</string>
     <string name="disconnecting">Verbinding aan het verbreken</string>
     <string name="waiting_for_disconnection">Wachten op het loskoppelen</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-no-rNO/strings.xml b/app-wear-shared/shared/src/main/res/values-no-rNO/strings.xml
index 5bbf6a3155..6ccee6300e 100644
--- a/app-wear-shared/shared/src/main/res/values-no-rNO/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-no-rNO/strings.xml
@@ -33,4 +33,11 @@
     <string name="connected">Tilkoblet</string>
     <string name="disconnecting">Frakobler</string>
     <string name="waiting_for_disconnection">Venter på frakobling</string>
+    <!-- Custom Watchface -->
+    <string name="metadata_label_watchface_created_at">Opprettet: %1$s</string>
+    <string name="metadata_label_watchface_author">Laget av: %1$s</string>
+    <string name="metadata_label_watchface_name">Navn: %1$s</string>
+    <string name="metadata_wear_import_filename">Filnavn: %1$s</string>
+    <string name="metadata_label_watchface_version">Klokkebakgrunn versjon: %1$s</string>
+    <string name="wear_default_watchface">Standard klokkebakgrunn</string>
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-pl-rPL/strings.xml b/app-wear-shared/shared/src/main/res/values-pl-rPL/strings.xml
index 92c17e47e5..56cf722093 100644
--- a/app-wear-shared/shared/src/main/res/values-pl-rPL/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-pl-rPL/strings.xml
@@ -33,4 +33,5 @@
     <string name="connected">Połączono</string>
     <string name="disconnecting">Rozłączanie</string>
     <string name="waiting_for_disconnection">Oczekiwanie na rozłączenie</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-pt-rBR/strings.xml b/app-wear-shared/shared/src/main/res/values-pt-rBR/strings.xml
index 9c42e5ab28..e5db0fbaae 100644
--- a/app-wear-shared/shared/src/main/res/values-pt-rBR/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-pt-rBR/strings.xml
@@ -33,4 +33,5 @@
     <string name="connected">Conectado</string>
     <string name="disconnecting">A desligar</string>
     <string name="waiting_for_disconnection">Aguardando a desconexão</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-pt-rPT/strings.xml b/app-wear-shared/shared/src/main/res/values-pt-rPT/strings.xml
index 83ac751573..67714dcc93 100644
--- a/app-wear-shared/shared/src/main/res/values-pt-rPT/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-pt-rPT/strings.xml
@@ -24,4 +24,5 @@
     <string name="connected">Ligado</string>
     <string name="disconnecting">A desconectar</string>
     <string name="waiting_for_disconnection">A aguardar a desconexão</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-ru-rRU/strings.xml b/app-wear-shared/shared/src/main/res/values-ru-rRU/strings.xml
index d2cc53a053..5b863992db 100644
--- a/app-wear-shared/shared/src/main/res/values-ru-rRU/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-ru-rRU/strings.xml
@@ -33,4 +33,5 @@
     <string name="connected">соединение установлено</string>
     <string name="disconnecting">разъединение</string>
     <string name="waiting_for_disconnection">Ожидание разъединения</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-sk-rSK/strings.xml b/app-wear-shared/shared/src/main/res/values-sk-rSK/strings.xml
index 11cc20f26f..5de0663dd8 100644
--- a/app-wear-shared/shared/src/main/res/values-sk-rSK/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-sk-rSK/strings.xml
@@ -33,4 +33,5 @@
     <string name="connected">Pripojené</string>
     <string name="disconnecting">Odpájanie</string>
     <string name="waiting_for_disconnection">Čakám na odpojenie</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-sr-rCS/strings.xml b/app-wear-shared/shared/src/main/res/values-sr-rCS/strings.xml
index 57a8e7b549..dc0f7891d7 100644
--- a/app-wear-shared/shared/src/main/res/values-sr-rCS/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-sr-rCS/strings.xml
@@ -2,4 +2,5 @@
 <resources>
     <!--    DateUtil-->
     <!-- Rx -->
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-sv-rSE/strings.xml b/app-wear-shared/shared/src/main/res/values-sv-rSE/strings.xml
index 2015c4df18..5d66f1de86 100644
--- a/app-wear-shared/shared/src/main/res/values-sv-rSE/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-sv-rSE/strings.xml
@@ -25,4 +25,5 @@
     <string name="connected">Ansluten</string>
     <string name="disconnecting">Kopplar från</string>
     <string name="waiting_for_disconnection">Väntar på frånkoppling</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-tr-rTR/strings.xml b/app-wear-shared/shared/src/main/res/values-tr-rTR/strings.xml
index dfa1a955c3..0cbb6e1e2b 100644
--- a/app-wear-shared/shared/src/main/res/values-tr-rTR/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-tr-rTR/strings.xml
@@ -33,4 +33,5 @@
     <string name="connected">Bağlandı</string>
     <string name="disconnecting">Bağlantı kesiliyor</string>
     <string name="waiting_for_disconnection">Bağlantının kesilmesi bekleniyor</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values-zh-rCN/strings.xml b/app-wear-shared/shared/src/main/res/values-zh-rCN/strings.xml
index 982683ea2e..484f6371f1 100644
--- a/app-wear-shared/shared/src/main/res/values-zh-rCN/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values-zh-rCN/strings.xml
@@ -33,4 +33,5 @@
     <string name="connected">已连接</string>
     <string name="disconnecting">正在断开连接</string>
     <string name="waiting_for_disconnection">正在等待连接</string>
+    <!-- Custom Watchface -->
 </resources>
diff --git a/core/ui/src/main/res/values-it-rIT/strings.xml b/core/ui/src/main/res/values-it-rIT/strings.xml
index b70d1551fe..17cbf227b5 100644
--- a/core/ui/src/main/res/values-it-rIT/strings.xml
+++ b/core/ui/src/main/res/values-it-rIT/strings.xml
@@ -376,7 +376,9 @@
     <string name="carbs_g">CHO %1$d g</string>
     <string name="extended_bolus_u_min">BOLO ESTESO %1$.2f U %2$d min</string>
     <string name="load_events">CARICA EVENTI</string>
+    <string name="clear_alarms">CANCELLA ALLARMI</string>
     <string name="deactivate">DISATTIVA</string>
+    <string name="update_time">AGGIORNAMENTO TEMPO</string>
     <string name="load_history">CARICA STORICO %1$d</string>
     <string name="load_tdds">CARICA TDD</string>
     <string name="set_profile">IMPOSTA PROFILO</string>
diff --git a/core/ui/src/main/res/values-no-rNO/strings.xml b/core/ui/src/main/res/values-no-rNO/strings.xml
index fdf2a4eb08..44ba5ef0e4 100644
--- a/core/ui/src/main/res/values-no-rNO/strings.xml
+++ b/core/ui/src/main/res/values-no-rNO/strings.xml
@@ -376,6 +376,9 @@
     <string name="carbs_g">KARBO %1$d g</string>
     <string name="extended_bolus_u_min">UTVIDET BOLUS %1$.2f E %2$d min</string>
     <string name="load_events">LAST INN HENDELSER</string>
+    <string name="clear_alarms">NULLSTILLE ALARMER</string>
+    <string name="deactivate">DEAKTIVER</string>
+    <string name="update_time">OPPDATER TID</string>
     <string name="load_history">LAST INN HENDELSESLOGG %1$d</string>
     <string name="load_tdds">LAST INN TDDs</string>
     <string name="set_profile">SETT PROFIL</string>
@@ -453,6 +456,7 @@
     <string name="cobvsiob">COB vs IOB</string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!! Advarsel: Oppdaget treg absorpsjon av karbohydrater: %2$d%% av tiden. Dobbeltsjekk din beregning. COB kan være misvisende og du risikerer å få for mye insulin !!</font>]]></string>
     <string name="partialboluswizard">Doser denne delen av resultatet fra bolusveiviseren [%]</string>
+    <string name="partialboluswizard_reset_time">Terskel for gammel BS-verdi [min]</string>
     <string name="bolus_constraint_applied_warn">Bolus begrensning brukt: %1$.2f E til %2$.2f E</string>
     <string name="bolus_recorded_only">Bolus vil bare bli loggført (ikke levert av pumpe)</string>
     <string name="advisoralarm">Aktiver alarm når det er på tide å spise</string>
diff --git a/plugins/automation/src/main/res/values-it-rIT/strings.xml b/plugins/automation/src/main/res/values-it-rIT/strings.xml
index 22eb2b16a1..ac8cdb3e93 100644
--- a/plugins/automation/src/main/res/values-it-rIT/strings.xml
+++ b/plugins/automation/src/main/res/values-it-rIT/strings.xml
@@ -93,6 +93,7 @@
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="triggerHeartRate">Frequenza cardiaca</string>
+    <string name="triggerHeartRateDesc">FC %1$s %2$.0f</string>
     <string name="iob_u">IOB [U]:</string>
     <string name="distance_short">Dist [m]:</string>
     <string name="recurringTime">Tempo ricorrente</string>
diff --git a/plugins/configuration/src/main/res/values-af-rZA/strings.xml b/plugins/configuration/src/main/res/values-af-rZA/strings.xml
index f8ee06391c..daed111930 100644
--- a/plugins/configuration/src/main/res/values-af-rZA/strings.xml
+++ b/plugins/configuration/src/main/res/values-af-rZA/strings.xml
@@ -71,5 +71,6 @@
     <string name="nav_resetdb">Herstel databasis</string>
     <string name="resettodefaults">Herstel na verstek</string>
     <!-- Maintenance -->
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
diff --git a/plugins/configuration/src/main/res/values-bg-rBG/strings.xml b/plugins/configuration/src/main/res/values-bg-rBG/strings.xml
index f02f4a5d76..a4fb079ab9 100644
--- a/plugins/configuration/src/main/res/values-bg-rBG/strings.xml
+++ b/plugins/configuration/src/main/res/values-bg-rBG/strings.xml
@@ -151,6 +151,7 @@
     <string name="prefdecrypt_issue_wrong_pass">Грешка при декриптиране, грешна парола или файлът с настройки е модифициран! Възможно е импортираният файл да е експортиран с различна парола.</string>
     <string name="prefdecrypt_issue_wrong_format">Липсва конфигурация на шифроване, форматът на настройките е невалиден!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Неподдържан или непотвърден алгоритъм за криптиране!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Моля рестартирайте телефона си или AAPS от Системни настройки, иначе AAPS няма да има логове (това е важно за да се проследява и верифицира, че алгоритъма работи правилно)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-ca-rES/strings.xml b/plugins/configuration/src/main/res/values-ca-rES/strings.xml
index a561395fc4..244139ff2e 100644
--- a/plugins/configuration/src/main/res/values-ca-rES/strings.xml
+++ b/plugins/configuration/src/main/res/values-ca-rES/strings.xml
@@ -131,5 +131,6 @@
     <string name="prefdecrypt_issue_wrong_pass">Error de desencriptació, la clau proporcionada no és vàlida o l\'arxiu de configuració ha estat alterat! Pot donar-se si l\'arxiu importat va ser exportat amb una clau mestra diferent.</string>
     <string name="prefdecrypt_issue_wrong_format">Falta la configuració per encriptar, el format de la configuració és incorrecte!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algoritme d\'encriptació no compatible o no especificat!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
diff --git a/plugins/configuration/src/main/res/values-cs-rCZ/strings.xml b/plugins/configuration/src/main/res/values-cs-rCZ/strings.xml
index 419240f752..bc01bba636 100644
--- a/plugins/configuration/src/main/res/values-cs-rCZ/strings.xml
+++ b/plugins/configuration/src/main/res/values-cs-rCZ/strings.xml
@@ -151,6 +151,8 @@
     <string name="prefdecrypt_issue_wrong_pass">Chyba dešifrování, zadané heslo je neplatné, nebo byl soubor nastavení změněn! Může se stát, že importovaný soubor byl exportován s jiným hlavním heslem.</string>
     <string name="prefdecrypt_issue_wrong_format">Chybí konfigurace šifrování, formát nastavení je neplatný!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nepodporovaný nebo neurčený šifrovací algoritmus!</string>
+    <!-- Custom Watchface -->
+    <string name="wear_import_custom_watchface_title">Vyberte vlastní ciferník</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Prosím restartujte Váš telefon nebo restartujte AAPS z nastavení systému\njinak nebudou zaznamenány ladící informace (důležité pro sledování a kontrolu, zda algoritmus pracuje správně)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-da-rDK/strings.xml b/plugins/configuration/src/main/res/values-da-rDK/strings.xml
index 661275b52a..44b12e2524 100644
--- a/plugins/configuration/src/main/res/values-da-rDK/strings.xml
+++ b/plugins/configuration/src/main/res/values-da-rDK/strings.xml
@@ -142,6 +142,7 @@
     <string name="prefdecrypt_issue_wrong_pass">Dekrypteringsfejl, det angivne kodeord er ugyldigt, eller indstillingsfilen er ændret. Det kan forekomme, at den importerede fil er eksporteret med et andet masterkodeord.</string>
     <string name="prefdecrypt_issue_wrong_format">Manglende krypteringskonfiguration, indstillingsformat er ugyldigt!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Ikke-understøttet eller ikke angivet krypteringsalgoritme!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Genstart venligst din telefon eller genstart AAPS fra Systemindstillinger \nellers vil AndroidAPS ikke have logning (vigtigt at spore og kontrollere, at algoritmerne fungerer korrekt)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-de-rDE/strings.xml b/plugins/configuration/src/main/res/values-de-rDE/strings.xml
index 38a29919b9..32c2ad6df4 100644
--- a/plugins/configuration/src/main/res/values-de-rDE/strings.xml
+++ b/plugins/configuration/src/main/res/values-de-rDE/strings.xml
@@ -151,6 +151,7 @@
     <string name="prefdecrypt_issue_wrong_pass">Entschlüsselungsfehler. Das angegebene Passwort ist ungültig oder die Einstellungsdatei wurde verändert! Evtl. wurde die importierte Datei mit einem anderen Master-Passwort exportiert.</string>
     <string name="prefdecrypt_issue_wrong_format">Fehlende Verschlüsselungskonfiguration, Einstellungsformat ist ungültig!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nicht unterstützter oder nicht angegebener Verschlüsselungsalgorithmus!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Bitte starte dein Telefon neu oder starte AndroidAPS in den System-Einstellungen neu.\nAndernfalls wird AndroidAPS nichts protokollieren (wichtig zum Nachverfolgen und Verifizieren, dass der Algorithmus korrekt funktioniert)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-el-rGR/strings.xml b/plugins/configuration/src/main/res/values-el-rGR/strings.xml
index 92c8118978..bb330cd935 100644
--- a/plugins/configuration/src/main/res/values-el-rGR/strings.xml
+++ b/plugins/configuration/src/main/res/values-el-rGR/strings.xml
@@ -91,5 +91,6 @@
     <string name="nav_resetdb">Επαναφορά Βάσεων Δεδομένων</string>
     <string name="resettodefaults">Επαναφορά προεπιλογών</string>
     <!-- Maintenance -->
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
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 f5b7e23915..4c0f15227d 100644
--- a/plugins/configuration/src/main/res/values-es-rES/strings.xml
+++ b/plugins/configuration/src/main/res/values-es-rES/strings.xml
@@ -151,6 +151,8 @@
     <string name="prefdecrypt_issue_wrong_pass">Error de descifrado. La contraseña proporcionada no es válida o se ha modificado el archivo de ajustes. Puede suceder que el archivo importado se haya exportado con una contraseña maestra diferente.</string>
     <string name="prefdecrypt_issue_wrong_format">Falta la configuración de cifrado, ¡el formato configuración no es válido!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">¡Algoritmo de cifrado no soportado o no especificado!</string>
+    <!-- Custom Watchface -->
+    <string name="wear_import_custom_watchface_title">Seleccionar esfera por defecto</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Por favor, reinicia el teléfono o AAPS desde los ajustes del sistema \nde lo contrario AAPS no guardará registros (importante para trazar y verificar que el algoritmo está funcionando correctamente)</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-fr-rFR/strings.xml b/plugins/configuration/src/main/res/values-fr-rFR/strings.xml
index 022c52374a..3c9d184748 100644
--- a/plugins/configuration/src/main/res/values-fr-rFR/strings.xml
+++ b/plugins/configuration/src/main/res/values-fr-rFR/strings.xml
@@ -152,6 +152,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="prefdecrypt_issue_wrong_pass">Erreur de décryptage, le mot de passe fourni est invalide ou le fichier de paramètres à été modifié ! Cela peut arriver si le fichier a été exporté avec un mot de passe principal différent.</string>
     <string name="prefdecrypt_issue_wrong_format">Configuration du cryptage manquant, format des paramètres invalide !</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algorithme de cryptage non pris en charge ou non spécifié !</string>
+    <!-- Custom Watchface -->
+    <string name="wear_import_custom_watchface_title">Sélectionner un cadran personnalisé</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Veuillez redémarrer votre téléphone ou redémarrer AAPS à partir des Paramètres du système\nsinon AAPS ne sera pas connecté aux journaux (important pour suivre et vérifier que les algorithmes fonctionnent correctement)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-ga-rIE/strings.xml b/plugins/configuration/src/main/res/values-ga-rIE/strings.xml
index 57d979381f..c9d1523289 100644
--- a/plugins/configuration/src/main/res/values-ga-rIE/strings.xml
+++ b/plugins/configuration/src/main/res/values-ga-rIE/strings.xml
@@ -24,5 +24,6 @@
     <!--    Maintenance-->
     <string name="reset_db_confirm">An bhfuil tú cinnte gur mian leat an bhunachair sonraí a athshocrú?</string>
     <!-- Maintenance -->
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
diff --git a/plugins/configuration/src/main/res/values-hr-rHR/strings.xml b/plugins/configuration/src/main/res/values-hr-rHR/strings.xml
index 2c683b84a9..eab136d8de 100644
--- a/plugins/configuration/src/main/res/values-hr-rHR/strings.xml
+++ b/plugins/configuration/src/main/res/values-hr-rHR/strings.xml
@@ -62,6 +62,7 @@
     <string name="prefdecrypt_issue_wrong_pass">Pogreška dešifriranja, navedena lozinka je nevažeća ili je datoteka postavki izmijenjena! Može se dogoditi da je uvezena datoteka izvezena s drugom glavnom lozinkom.</string>
     <string name="prefdecrypt_issue_wrong_format">Nedostaje konfiguracija enkripcije, format postavki nije valjan!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algoritam šifriranja nije podržan ili nije naveden!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Ponovno pokrenite telefon ili ponovno pokrenite AAPS iz postavki sustava \n u suprotnom Android APS neće imati zapisivanje (važno je pratiti i provjeriti rade li algoritmi ispravno)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-hu-rHU/strings.xml b/plugins/configuration/src/main/res/values-hu-rHU/strings.xml
index 6a7b46105a..578fb269ea 100644
--- a/plugins/configuration/src/main/res/values-hu-rHU/strings.xml
+++ b/plugins/configuration/src/main/res/values-hu-rHU/strings.xml
@@ -23,5 +23,6 @@
     <!--    Maintenance-->
     <string name="configbuilder_nightscoutversion_label">Nightscout verzió:</string>
     <!-- Maintenance -->
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
diff --git a/plugins/configuration/src/main/res/values-it-rIT/strings.xml b/plugins/configuration/src/main/res/values-it-rIT/strings.xml
index d280685dfe..0ee3645040 100644
--- a/plugins/configuration/src/main/res/values-it-rIT/strings.xml
+++ b/plugins/configuration/src/main/res/values-it-rIT/strings.xml
@@ -151,6 +151,8 @@
     <string name="prefdecrypt_issue_wrong_pass">Errore decrittazione, la password fornita è errata o il file delle impostazioni è stato modificato! È possibile che il file importato sia stato esportato con una diversa password master.</string>
     <string name="prefdecrypt_issue_wrong_format">Configurazione crittografia mancante, il formato delle impostazioni non è valido!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo di crittografia non supportato o non specificato!</string>
+    <!-- Custom Watchface -->
+    <string name="wear_import_custom_watchface_title">Seleziona watchface personalizzata</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Riavvia il tuo telefono oppure fai ripartire AndroidAPS dalle impostazioni di sistema \naltrimenti Android APS non farà il log (è importante monitorare e verificare che gli algoritmi stiano funzionando correttamente)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-iw-rIL/strings.xml b/plugins/configuration/src/main/res/values-iw-rIL/strings.xml
index 2408ef47ed..5611c1cd5d 100644
--- a/plugins/configuration/src/main/res/values-iw-rIL/strings.xml
+++ b/plugins/configuration/src/main/res/values-iw-rIL/strings.xml
@@ -151,6 +151,7 @@
     <string name="prefdecrypt_issue_wrong_pass">שגיאת פענוח, הסיסמה שסופקה אינה חוקית או שקובץ ההגדרות שונה! יתכן שהקובץ המיובא יוצא עם סיסמה ראשית אחרת.</string>
     <string name="prefdecrypt_issue_wrong_format">תצורת הצפנה חסרה, פורמט ההגדרות אינו חוקי!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">אלגוריתם ההצפנה לא צוין או שלא נתמך!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">נא לאתחל את הסמרטפון שלכם או הפעילו מחדש את אפלקציית AndroidAPS בהגדרות המערכת \nאחרת AndroidAPS לא יוכל לבצע רישום (חשוב לעקוב ולוודא כי האלגוריתמים פועלים כראוי)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-ja-rJP/strings.xml b/plugins/configuration/src/main/res/values-ja-rJP/strings.xml
index 3c0771e4bc..e0bd486057 100644
--- a/plugins/configuration/src/main/res/values-ja-rJP/strings.xml
+++ b/plugins/configuration/src/main/res/values-ja-rJP/strings.xml
@@ -38,5 +38,6 @@
     <string name="configbuilder_nightscoutversion_label">Nightscoutバージョン:</string>
     <string name="nav_resetdb">リセット データベース</string>
     <!-- Maintenance -->
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
diff --git a/plugins/configuration/src/main/res/values-ko-rKR/strings.xml b/plugins/configuration/src/main/res/values-ko-rKR/strings.xml
index d186faaba1..341135bb33 100644
--- a/plugins/configuration/src/main/res/values-ko-rKR/strings.xml
+++ b/plugins/configuration/src/main/res/values-ko-rKR/strings.xml
@@ -131,5 +131,6 @@
     <string name="prefdecrypt_issue_wrong_pass">해독 에러, 입력한 비밀번호가 유효하지 않거나 설정 파일이 수정되었습니다. 가져온 파일이 다른 마스터 비밀번호로 내보내기 되었을 가능성이 있습니다.</string>
     <string name="prefdecrypt_issue_wrong_format">암호화 설정이 누락되었음, 설정 형식이 유효하지 않습니다!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">지원되지 않는 또는 명시되지 않은 암호화 알고리즘!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
diff --git a/plugins/configuration/src/main/res/values-lt-rLT/strings.xml b/plugins/configuration/src/main/res/values-lt-rLT/strings.xml
index 32935ef321..d0580febc0 100644
--- a/plugins/configuration/src/main/res/values-lt-rLT/strings.xml
+++ b/plugins/configuration/src/main/res/values-lt-rLT/strings.xml
@@ -151,6 +151,7 @@
     <string name="prefdecrypt_issue_wrong_pass">Iššifravimas klaida, slaptažodis yra neteisingas arba nustatymų failas buvo pakeistas! Taip nutinka, jei importuotas failas buvo eksportuotas su kitu slaptažodžiu.</string>
     <string name="prefdecrypt_issue_wrong_format">Trūksta šifravimo sąrankos parametrų, nustatymų formatas yra neteisingas!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nepalaikomas arba nepatikslintas šifravimo algoritmas!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Prašome perkrauti telefoną arba sistemos nustatymuose iš naujo paleisti AAPS \nkitaip AndroidAPS negalės registruoti prisijungimų (svarbu stebėti ir tikrinti, ar algoritmai veikia tinkamai)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-nl-rNL/strings.xml b/plugins/configuration/src/main/res/values-nl-rNL/strings.xml
index d9e35b1050..299808c3c6 100644
--- a/plugins/configuration/src/main/res/values-nl-rNL/strings.xml
+++ b/plugins/configuration/src/main/res/values-nl-rNL/strings.xml
@@ -151,6 +151,7 @@
     <string name="prefdecrypt_issue_wrong_pass">Decoderingsfout, het opgegeven wachtwoord is ongeldig of het instellingenbestand is gewijzigd / mee geknoeid. Wellicht was het geïmporteerde bestand geëxporteerd met een ander masterwachtwoord.</string>
     <string name="prefdecrypt_issue_wrong_format">Ontbrekende versleutelingsconfiguratie, instellingen indeling is ongeldig!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Niet-ondersteund of niet opgegeven versleutelingsalgoritme!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Herstart je telefoon of herstart AndroidAPS vanuit de systeem instellingen a. u. b. \nanders zal AndroidAPS geen log mogelijkheid hebben (Dit is belangrijk om te controleren of de algoritmes correct werken)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-no-rNO/strings.xml b/plugins/configuration/src/main/res/values-no-rNO/strings.xml
index 964b2c136d..68946e5a15 100644
--- a/plugins/configuration/src/main/res/values-no-rNO/strings.xml
+++ b/plugins/configuration/src/main/res/values-no-rNO/strings.xml
@@ -151,6 +151,8 @@
     <string name="prefdecrypt_issue_wrong_pass">Dekrypteringsfeil, det oppgitte passordet er ugyldig eller filen har blitt endret! Det kan hende filen ble eksportert med et annet passord.</string>
     <string name="prefdecrypt_issue_wrong_format">Mangler krypteringsinformasjon, formatet på innstillinger er ugyldig!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Ugyldig eller ikke spesifisert krypteringsalgoritme!</string>
+    <!-- Custom Watchface -->
+    <string name="wear_import_custom_watchface_title">Velg tilpasset klokkebakgrunn</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Vennligst start mobilen på nytt eller restart AAPS fra Innstillinger \nellers vil ikke AAPS ha aktivert loggføring (viktig for å spore og kontrollere at algoritmene fungerer riktig)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-pl-rPL/strings.xml b/plugins/configuration/src/main/res/values-pl-rPL/strings.xml
index 3f50e47b74..6d4e963f02 100644
--- a/plugins/configuration/src/main/res/values-pl-rPL/strings.xml
+++ b/plugins/configuration/src/main/res/values-pl-rPL/strings.xml
@@ -151,6 +151,7 @@
     <string name="prefdecrypt_issue_wrong_pass">Błąd deszyfrowania, podane hasło jest niepoprawne lub plik ustawień został zmodyfikowany! Może się zdarzyć, że zaimportowany plik został wyeksportowany z innym hasłem głównym.</string>
     <string name="prefdecrypt_issue_wrong_format">Brak konfiguracji szyfrowania, format ustawień jest nieprawidłowy!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nieobsługiwany lub nieokreślony algorytm szyfrowania!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Proszę uruchomić ponownie telefon lub zrestartować AAPS (z poziomu ustawieniach systemu telefonu / menu aplikacje)\ninaczej AAPS nie będzie w stanie zapisywać dziennika (ważne ze względu na śledzenie błędów i sprawdzanie poprawności działania algorytmów)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-pt-rBR/strings.xml b/plugins/configuration/src/main/res/values-pt-rBR/strings.xml
index 03b7149724..d07c881400 100644
--- a/plugins/configuration/src/main/res/values-pt-rBR/strings.xml
+++ b/plugins/configuration/src/main/res/values-pt-rBR/strings.xml
@@ -151,6 +151,7 @@
     <string name="prefdecrypt_issue_wrong_pass">Erro de desencriptação, a senha é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o arquivo importado foi exportado com uma senha mestre diferente.</string>
     <string name="prefdecrypt_issue_wrong_format">Configuração de encriptação ausente, formato de configurações é inválido!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo de encriptação não suportado ou não especificado!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Por favor, reinicie seu telefone ou reinicie o AndroidAPS nas Configurações do Sistema \nCaso contrário o Android APS não terá registro (importante para rastrear e verificar se os algoritmos estão funcionando corretamente)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-pt-rPT/strings.xml b/plugins/configuration/src/main/res/values-pt-rPT/strings.xml
index 0ea57aa122..48282b2f81 100644
--- a/plugins/configuration/src/main/res/values-pt-rPT/strings.xml
+++ b/plugins/configuration/src/main/res/values-pt-rPT/strings.xml
@@ -134,5 +134,6 @@
     <string name="prefdecrypt_issue_wrong_pass">Erro de Desencriptação, a senha é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o ficheiro importado foi exportado com uma Senha Mestra diferente.</string>
     <string name="prefdecrypt_issue_wrong_format">Configuração de encriptação ausente, formato de definições é inválido!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo de encriptação não suportado ou não especificado!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
diff --git a/plugins/configuration/src/main/res/values-ro-rRO/strings.xml b/plugins/configuration/src/main/res/values-ro-rRO/strings.xml
index 0b0363e5d3..1a619e1546 100644
--- a/plugins/configuration/src/main/res/values-ro-rRO/strings.xml
+++ b/plugins/configuration/src/main/res/values-ro-rRO/strings.xml
@@ -135,5 +135,6 @@
     <string name="prefdecrypt_issue_wrong_pass">Eroare la decriptare, parola furnizată este invalidă sau fişierul de setări a fost modificat! Se poate întâmpla ca fişierul importat să fi fost exportat cu o parolă master diferită.</string>
     <string name="prefdecrypt_issue_wrong_format">Lipseşte configuraţia de criptare, formatul setărilor este invalid!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algoritm de criptare nesuportat sau nespecificat!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
diff --git a/plugins/configuration/src/main/res/values-ru-rRU/strings.xml b/plugins/configuration/src/main/res/values-ru-rRU/strings.xml
index 18a05814ae..2d4a8d2c81 100644
--- a/plugins/configuration/src/main/res/values-ru-rRU/strings.xml
+++ b/plugins/configuration/src/main/res/values-ru-rRU/strings.xml
@@ -151,6 +151,7 @@
     <string name="prefdecrypt_issue_wrong_pass">Ошибка расшифровки, указан недопустимый пароль или файл параметров изменен! Возможно, импортированный файл был экспортирован с использованием другого главного пароля.</string>
     <string name="prefdecrypt_issue_wrong_format">Отсутствует конфигурация шифрования, формат параметров недопустим!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Неподдерживаемый или не прописанный алгоритм шифрования!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Перезагрузите телефон или перезапустите AAPS из системных настроек \n иначе AAPS не будет вести лог (важно для отслеживания и проверки алгоритмов)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-sk-rSK/strings.xml b/plugins/configuration/src/main/res/values-sk-rSK/strings.xml
index d0079220b6..899059c185 100644
--- a/plugins/configuration/src/main/res/values-sk-rSK/strings.xml
+++ b/plugins/configuration/src/main/res/values-sk-rSK/strings.xml
@@ -151,6 +151,7 @@
     <string name="prefdecrypt_issue_wrong_pass">Chyba dešifrovania, zadané heslo je neplatné, alebo bol súbor nastavení zmenený! Môže sa stať, že importovaný súbor bol exportovaný s iným hlavným heslom.</string>
     <string name="prefdecrypt_issue_wrong_format">Chýba konfigurácia šifrovania, formát nastavení je neplatný!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nepodporovaný alebo neurčený šifrovací algoritmus!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Prosím reštartujte Váš telefón, alebo reštartujte AndroidAPS z nastavení \nv opačnom prípade AndroidAPS nebude mocť zaznamenávať logy (dôležité kvôli sledovaniu a overovaniu, že algoritmus pracuje správne)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-sr-rCS/strings.xml b/plugins/configuration/src/main/res/values-sr-rCS/strings.xml
index 79c9ec4e5b..03adfec6b6 100644
--- a/plugins/configuration/src/main/res/values-sr-rCS/strings.xml
+++ b/plugins/configuration/src/main/res/values-sr-rCS/strings.xml
@@ -53,5 +53,6 @@
     <string name="configbuilder_nightscoutversion_label">Nightscout verzija:</string>
     <string name="nav_resetdb">Poništite baze podataka</string>
     <!-- Maintenance -->
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
diff --git a/plugins/configuration/src/main/res/values-sv-rSE/strings.xml b/plugins/configuration/src/main/res/values-sv-rSE/strings.xml
index 4ca512d384..7bd98497a0 100644
--- a/plugins/configuration/src/main/res/values-sv-rSE/strings.xml
+++ b/plugins/configuration/src/main/res/values-sv-rSE/strings.xml
@@ -133,5 +133,6 @@
     <string name="prefdecrypt_issue_wrong_pass">Dekrypteringsfel. Det angivna lösenordet är ogiltigt eller så har inställningsfilen ändrats. Filen verkar ha exporterats med ett annat lösenord.</string>
     <string name="prefdecrypt_issue_wrong_format">Krypteringskonfigurationen saknas. Inställningsformatet är ogiltigt!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Ej stödd eller ej angiven krypteringsalgoritm!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
diff --git a/plugins/configuration/src/main/res/values-tr-rTR/strings.xml b/plugins/configuration/src/main/res/values-tr-rTR/strings.xml
index 6c3a4a53ba..d3badf8ca1 100644
--- a/plugins/configuration/src/main/res/values-tr-rTR/strings.xml
+++ b/plugins/configuration/src/main/res/values-tr-rTR/strings.xml
@@ -151,6 +151,7 @@
     <string name="prefdecrypt_issue_wrong_pass">Şifre çözme hatası, sağlanan şifre geçersiz veya ayar dosyası değiştirildi! İçe aktarılan dosya farklı bir Ana parola ile dışa aktarılmış olabilir.</string>
     <string name="prefdecrypt_issue_wrong_format">Şifreleme yapılandırması eksik, ayar formatı geçersiz!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Desteklenmeyen veya belirtilmeyen şifreleme algoritması!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Lütfen telefonunu yeniden başlat, yada AAPS sistem ayarları üzerinden yeniden başlat.\nAksi taktirde Android APS hiç bir günlük tutmayacak (takip ve doğrulama, algoritmanın düzenli çalışmasi için önemli)!</string>
 </resources>
diff --git a/plugins/configuration/src/main/res/values-zh-rCN/strings.xml b/plugins/configuration/src/main/res/values-zh-rCN/strings.xml
index 425df34f71..cbe111c769 100644
--- a/plugins/configuration/src/main/res/values-zh-rCN/strings.xml
+++ b/plugins/configuration/src/main/res/values-zh-rCN/strings.xml
@@ -133,5 +133,6 @@
     <string name="prefdecrypt_issue_wrong_pass">解密错误，提供的密码无效或设置文件已修改! 导入的文件可能是使用其他主密码导出的。</string>
     <string name="prefdecrypt_issue_wrong_format">缺少加密配置，设置格式无效!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">不支持或未指定加密算法!</string>
+    <!-- Custom Watchface -->
     <!-- Permissions -->
 </resources>
diff --git a/plugins/main/src/main/res/values-es-rES/strings.xml b/plugins/main/src/main/res/values-es-rES/strings.xml
index 1a6086c56f..083353487a 100644
--- a/plugins/main/src/main/res/values-es-rES/strings.xml
+++ b/plugins/main/src/main/res/values-es-rES/strings.xml
@@ -317,6 +317,11 @@
     <string name="wear_notifysmb_summary">Mostrar los SMB en el reloj como un bolo estándar</string>
     <string name="wear_predictions_summary">Mostrar las predicciones en la esfera</string>
     <string name="wear_predictions_title">Predicciones</string>
+    <string name="wear_custom_watchface">Esfera personalizada: %1$s</string>
+    <string name="wear_load_watchface">Cargar esfera</string>
+    <string name="wear_send_watchface">Enviar esfera</string>
+    <string name="wear_export_watchface">Exportar esfera</string>
+    <string name="wear_new_custom_watchface_exported">Esfera personalizada exportada</string>
     <string name="resend_all_data">Reenviar todos los datos</string>
     <string name="open_settings_on_wear">Abrir ajustes en el reloj</string>
     <!--    PersistentNotification-->
diff --git a/plugins/main/src/main/res/values-fr-rFR/strings.xml b/plugins/main/src/main/res/values-fr-rFR/strings.xml
index 09d2dff60d..216dc0dcef 100644
--- a/plugins/main/src/main/res/values-fr-rFR/strings.xml
+++ b/plugins/main/src/main/res/values-fr-rFR/strings.xml
@@ -316,6 +316,11 @@
     <string name="wear_notifysmb_summary">Afficher SMB sur la montre comme un bolus standard.</string>
     <string name="wear_predictions_summary">Affichez les prédictions sur l\'écran de la montre.</string>
     <string name="wear_predictions_title">Prédictions</string>
+    <string name="wear_custom_watchface">Cadran personnalisé : %1$s</string>
+    <string name="wear_load_watchface">Charger le cadran</string>
+    <string name="wear_send_watchface">Envoyer le cadran</string>
+    <string name="wear_export_watchface">Exporter le cadran</string>
+    <string name="wear_new_custom_watchface_exported">Cadran personnalisé exporté</string>
     <string name="resend_all_data">Renvoyer toutes les données</string>
     <string name="open_settings_on_wear">Afficher les Paramètres sur la Montre</string>
     <!--    PersistentNotification-->
diff --git a/plugins/main/src/main/res/values-it-rIT/strings.xml b/plugins/main/src/main/res/values-it-rIT/strings.xml
index 1fdfed8233..f10b2446c8 100644
--- a/plugins/main/src/main/res/values-it-rIT/strings.xml
+++ b/plugins/main/src/main/res/values-it-rIT/strings.xml
@@ -316,6 +316,11 @@
     <string name="wear_notifysmb_summary">Mostra SMB sullo smartwatch come un bolo standard.</string>
     <string name="wear_predictions_summary">Mostra le predizioni sulla watchface.</string>
     <string name="wear_predictions_title">Predizioni</string>
+    <string name="wear_custom_watchface">Watchface personalizzata: %1$s</string>
+    <string name="wear_load_watchface">Carica watchface</string>
+    <string name="wear_send_watchface">Invia watchface</string>
+    <string name="wear_export_watchface">Esporta watchface</string>
+    <string name="wear_new_custom_watchface_exported">Watchface personalizzata esportata</string>
     <string name="resend_all_data">Invia di nuovo tutti i dati</string>
     <string name="open_settings_on_wear">Apri impostazioni sullo smartwatch</string>
     <!--    PersistentNotification-->
diff --git a/plugins/main/src/main/res/values-no-rNO/strings.xml b/plugins/main/src/main/res/values-no-rNO/strings.xml
index 791b512dfe..ce477d1138 100644
--- a/plugins/main/src/main/res/values-no-rNO/strings.xml
+++ b/plugins/main/src/main/res/values-no-rNO/strings.xml
@@ -243,6 +243,7 @@
     <string name="short_tabtitles">Korte navn i menyfaner</string>
     <string name="overview_show_notes_field_in_dialogs_title">Vis merknadsfelt i dialogvindu for behandlinger</string>
     <string name="deliverpartofboluswizard">Bolusveiviser utfører beregninger, men bare denne del av beregnet insulin leveres. Nyttig ved bruk av SMB-algoritmen.</string>
+    <string name="deliver_part_of_boluswizard_reset_time">Gi full bolus (100 %) dersom blodsukker er eldre enn</string>
     <string name="enable_bolus_advisor">Aktiver boluskalkulator</string>
     <string name="enable_bolus_advisor_summary">Bruk en påminnelse om å spise senere isetdet for beregnet av kalkulator når blodsukker er høyt (\"pre-bolus\")</string>
     <string name="enablesuperbolus">Aktiver superbolus i veiviser</string>
@@ -315,6 +316,11 @@
     <string name="wear_notifysmb_summary">Vis SMB på klokken som en standard bolus.</string>
     <string name="wear_predictions_summary">Vis blodsukkerprognoser på klokken.</string>
     <string name="wear_predictions_title">Prognoser</string>
+    <string name="wear_custom_watchface">Tilpasset klokkebakgrunn: %1$s</string>
+    <string name="wear_load_watchface">Last inn klokkebakgrunn</string>
+    <string name="wear_send_watchface">Send klokkebakgrunn</string>
+    <string name="wear_export_watchface">Eksporter klokkebakgrunn</string>
+    <string name="wear_new_custom_watchface_exported">Tilpasset klokkebakgrunn eksportert</string>
     <string name="resend_all_data">Send alle data på nytt</string>
     <string name="open_settings_on_wear">Åpne Innstillinger på klokken</string>
     <!--    PersistentNotification-->
diff --git a/pump/combo/src/main/res/values-it-rIT/strings.xml b/pump/combo/src/main/res/values-it-rIT/strings.xml
index f08a8cd598..551f31df84 100644
--- a/pump/combo/src/main/res/values-it-rIT/strings.xml
+++ b/pump/combo/src/main/res/values-it-rIT/strings.xml
@@ -21,7 +21,7 @@
     <string name="combo_pump_connected_now">Adesso</string>
     <string name="combo_activity_setting_basal_profile">Impostazione profilo basale</string>
     <string name="combo_pump_cartridge_low_warrning">Livello cartuccia basso</string>
-    <string name="combo_pump_battery_low_warrning">Livello batteria basso</string>
+    <string name="combo_pump_battery_low_warrning">Batteria micro quasi scarica</string>
     <string name="combo_is_in_error_state">Il micro sta mostrando l\'errore E%1$d: %2$s</string>
     <string name="combo_reservoir_low">Basso</string>
     <string name="combo_reservoir_empty">Vuoto</string>
diff --git a/pump/combov2/src/main/res/values-fr-rFR/strings.xml b/pump/combov2/src/main/res/values-fr-rFR/strings.xml
index 342c80e2ef..802f7be3fc 100644
--- a/pump/combov2/src/main/res/values-fr-rFR/strings.xml
+++ b/pump/combov2/src/main/res/values-fr-rFR/strings.xml
@@ -38,6 +38,7 @@
     <string name="combov2_pairing_combo_scan_timeout_reached">Délai d\'attente de recherche de la combo atteint</string>
     <string name="combov2_pairing_failed_due_to_error">L\'appairage a échoué en raison de l\'erreur : %1$s</string>
     <string name="combov2_pairing_aborted_unknown_reasons">L\'appairage a échoué pour raisons inconnues</string>
+    <string name="combov2_pairing_invalid_pin_length">"Longueur du code PIN d'appairage invalide : %1$d chiffres nécessaires, %2$d reçu"</string>
     <string name="combov2_scanning_for_pump">Recherche de la pompe</string>
     <string name="combov2_establishing_bt_connection">Établissement de la connexion Bluetooth (tentative n° %1$d)</string>
     <string name="combov2_pairing_performing_handshake">Initialisation de la communication avec la pompe</string>
@@ -115,4 +116,6 @@
     <string name="combov2_refresh_pump_status_after_error">Actualisation de l\'état de la pompe après que la pompe ait signalé une erreur</string>
     <string name="combov2_go_back">Retour</string>
     <string name="combov2_cannot_pair_driver_not_initialized_explanation">Impossible d\'effectuer l\'appairage car le pilote n\'est pas initialisé. Cela se produit généralement parce que les autorisations Bluetooth nécessaires n\'ont pas été accordées. Revenez en arrière, accordez les autorisations Bluetooth, puis essayez à nouveau de vous associer.</string>
+    <string name="combov2_bluetooth_disabled">Impossible de démarrer le driver - Bluetooth est désactivé</string>
+    <string name="combov2_bluetooth_not_supported">Le driver ne peut pas fonctionner - cet appareil ne prend pas en charge le Bluetooth</string>
 </resources>
diff --git a/pump/combov2/src/main/res/values-it-rIT/strings.xml b/pump/combov2/src/main/res/values-it-rIT/strings.xml
index 8e14cf8101..6e809d31a2 100644
--- a/pump/combov2/src/main/res/values-it-rIT/strings.xml
+++ b/pump/combov2/src/main/res/values-it-rIT/strings.xml
@@ -47,6 +47,7 @@ Se non viene stabilita alcuna connessione dopo più di ~5 minuti:\n\n
     <string name="combov2_pairing_combo_scan_timeout_reached">Scansione Combo: timeout raggiunto</string>
     <string name="combov2_pairing_failed_due_to_error">Associazione fallita a causa di un errore: %1$s</string>
     <string name="combov2_pairing_aborted_unknown_reasons">Associazione interrotta per motivi sconosciuti</string>
+    <string name="combov2_pairing_invalid_pin_length">"PIN di associazione - lunghezza non valida: necessarie %1$d cifre, ricevute %2$d"</string>
     <string name="combov2_scanning_for_pump">Scansione micro</string>
     <string name="combov2_establishing_bt_connection">Connessione Bluetooth (tentativo n. %1$d)</string>
     <string name="combov2_pairing_performing_handshake">Esecuzione dell\'associazione con il micro</string>
@@ -90,7 +91,7 @@ Se non viene stabilita alcuna connessione dopo più di ~5 minuti:\n\n
     <string name="combov2_current_tbr_less_than_1min">%1$d%% (meno di 1 minuto rimanente)</string>
     <string name="combov2_load_tdds_cancelled">Caricamento TDD annullato</string>
     <string name="combov2_retrieving_tdds_failed">Recupero TDD fallito</string>
-    <string name="combov2_battery_low_warning">Livello batteria basso</string>
+    <string name="combov2_battery_low_warning">Batteria micro quasi scarica</string>
     <string name="combov2_reservoir_low_warning">Il livello del serbatoio del micro è basso</string>
     <string name="combov2_setting_tbr_succeeded">Impostazione TBR riuscita</string>
     <string name="combov2_setting_tbr_failed">Impostazione TBR fallita</string>
@@ -124,4 +125,6 @@ Se non viene stabilita alcuna connessione dopo più di ~5 minuti:\n\n
     <string name="combov2_refresh_pump_status_after_error">Aggiornamento dello stato del micro dopo che il micro ha segnalato un errore</string>
     <string name="combov2_go_back">Torna indietro</string>
     <string name="combov2_cannot_pair_driver_not_initialized_explanation">Impossibile eseguire l\'associazione perché il driver non è inizializzato. Questo accade tipicamente perché i permessi Bluetooth necessari non sono stati concessi. Torna indietro, concedi i permessi Bluetooth, quindi riprova ad associare.</string>
+    <string name="combov2_bluetooth_disabled">Impossibile avviare il driver - il bluetooth è disabilitato</string>
+    <string name="combov2_bluetooth_not_supported">Impossibile eseguire il driver - questo dispositivo non supporta il bluetooth</string>
 </resources>
diff --git a/pump/combov2/src/main/res/values-no-rNO/strings.xml b/pump/combov2/src/main/res/values-no-rNO/strings.xml
index 83d5d63dc2..c31eb9b14f 100644
--- a/pump/combov2/src/main/res/values-no-rNO/strings.xml
+++ b/pump/combov2/src/main/res/values-no-rNO/strings.xml
@@ -48,6 +48,7 @@ knappene samtidig for å avbryte parringen)\n
     <string name="combov2_pairing_combo_scan_timeout_reached">Combo tidsgrense for sammenkobling ble nådd</string>
     <string name="combov2_pairing_failed_due_to_error">Sammenkobling mislyktes på grunn av feil: %1$s</string>
     <string name="combov2_pairing_aborted_unknown_reasons">Sammenkobling avbrutt av ukjente årsaker</string>
+    <string name="combov2_pairing_invalid_pin_length">"Ugyldig lengde på PIN: trenger %1$d siffer, fikk %2$d"</string>
     <string name="combov2_scanning_for_pump">Søker etter pumpen</string>
     <string name="combov2_establishing_bt_connection">Oppretter Bluetooth-tilkobling (forsøk nr. %1$d)</string>
     <string name="combov2_pairing_performing_handshake">Utfører sammenkobling med pumpe</string>
@@ -125,4 +126,6 @@ knappene samtidig for å avbryte parringen)\n
     <string name="combov2_refresh_pump_status_after_error">Oppdaterer pumpestatus etter at pumpen tidligere har rapportert en feil</string>
     <string name="combov2_go_back">Gå tilbake</string>
     <string name="combov2_cannot_pair_driver_not_initialized_explanation">Kan ikke sammenkoble fordi driveren ikke er initialisert. Dette skjer vanligvis fordi de nødvendige Bluetooth-tillatelser ikke er gitt. Gå tilbake, gi Bluetooth-tillatelser, og prøv igjen å parre.</string>
+    <string name="combov2_bluetooth_disabled">Kan ikke starte driver - Bluetooth er deaktivert</string>
+    <string name="combov2_bluetooth_not_supported">Driver kan ikke kjøre - denne enheten støtter ikke Bluetooth</string>
 </resources>
diff --git a/pump/dana/src/main/res/values-it-rIT/strings.xml b/pump/dana/src/main/res/values-it-rIT/strings.xml
index 5b871ef9bc..50fafb940e 100644
--- a/pump/dana/src/main/res/values-it-rIT/strings.xml
+++ b/pump/dana/src/main/res/values-it-rIT/strings.xml
@@ -23,7 +23,7 @@
     <string name="overview_bolusprogress_stoped">Stoppato</string>
     <string name="unsupportedfirmware">Firmware del micro non supportato</string>
     <string name="pumperror">Errore micro</string>
-    <string name="lowbattery">Livello batteria basso</string>
+    <string name="lowbattery">Batteria quasi scarica</string>
     <string name="basalcompare">Erogazione inferiore rispetto alla velocità basale preimpostata</string>
     <string name="pumpshutdown">Arresto micro</string>
     <string name="batterydischarged">Batteria del micro scarica</string>
diff --git a/pump/medtrum/src/main/res/values-cs-rCZ/strings.xml b/pump/medtrum/src/main/res/values-cs-rCZ/strings.xml
index 0bd6c25637..047acb6d2a 100644
--- a/pump/medtrum/src/main/res/values-cs-rCZ/strings.xml
+++ b/pump/medtrum/src/main/res/values-cs-rCZ/strings.xml
@@ -4,7 +4,7 @@
     <string name="medtrum">Medtrum</string>
     <string name="medtrum_pump_shortname">MT</string>
     <string name="medtrum_pump_description">Integrace pumpy Medtrum Nano</string>
-    <string name="medtrumpump_settings">Nastavení pumpy Medtrum</string>
+    <string name="medtrum_pump_setting">Nastavení pumpy Medtrum</string>
     <string name="pump_error">Chyba pumpy: %1$s!! </string>
     <string name="pump_unsupported">Nevyzkoušená pumpa: %1$d! Kontaktujte nás na Discordu nebo Githubu, kde získáte podporu.</string>
     <string name="pump_is_suspended">Pumpa je pozastavena</string>
@@ -36,11 +36,11 @@
     <string name="alarm_pump_low_battery">Téměř vybitá baterie pumpy</string>
     <string name="alarm_pump_low_reservoir">Téměř prázdný zásobník pumpy</string>
     <string name="alarm_pump_expires_soon">Pumpa brzy vyprší</string>
-    <string name="alarm_lowbg_suspended">Smyčka pozastavena nízká glykémie</string>
-    <string name="alarm_lowbg_suspended2">Smyčka pozastavena nízká glykémie 2</string>
+    <string name="alarm_low_bg_suspended">Smyčka pozastavena nízká glykémie</string>
+    <string name="alarm_low_bg_suspended2">Smyčka pozastavena nízká glykémie 2</string>
     <string name="alarm_auto_suspended">Automatické pozastavení</string>
-    <string name="alarm_hmax_suspended">Pozastavení z důvodu hodinového překročení</string>
-    <string name="alarm_dmax_suspended">Pozastavení z důvodu denního překročení</string>
+    <string name="alarm_hourly_max_suspended">pozastavení z důvodu hodinového překročení</string>
+    <string name="alarm_daily_max_suspended">pozastavení z důvodu denního překročení</string>
     <string name="alarm_suspended">Pozastaveno</string>
     <string name="alarm_paused">Pozastaveno</string>
     <string name="alarm_occlusion">Okluze</string>
@@ -81,7 +81,6 @@
     <string name="priming_error">Nepodařilo se provést plnění, zkuste to znovu stisknutím tlačítka <b>Opakovat</b>.</string>
     <string name="press_next">Stiskněte <b>Další</b> pro pokračování.</string>
     <string name="press_next_to_start_activation">Stiskněte <b>Další</b> pro spuštění aktivace.</string>
-    <string name="attach_patch_to_body">Odstraňte bezpečnostní zámek. Připojte pumpu k tělu. Stiskněte tlačítko jehly.</string>
     <string name="remove_safety_lock">Odstraňte bezpečnostní zámek. Připojte pumpu k tělu. Stiskněte tlačítko jehly.</string>
     <string name="activating_pump">Aktivace Pacthe a nastavení počátečního bazálu. Počkejte prosím.</string>
     <string name="activating_error">Chyba při aktivaci, stiskněte <b>Opakovat</b> pro nový pokus.</string>
@@ -111,9 +110,8 @@
     <string name="daily_max_insulin_title">Denní maximální inzulín</string>
     <string name="daily_max_insulin_summary">Zadejte maximální povolené množství inzulínu za den. Pokud je překročeno, pumpa bude pozastavena.</string>
     <!-- treatment state-->
-    <string name="waitingforestimatedbolusend">Čekání na konec bolusu. Zbývá %1$d sek.</string>
-    <string name="gettingpumpstatus">Nahrávám stav pumpy</string>
-    <string name="gettingbolusstatus">Nahrávám stav bolusu</string>
-    <string name="gettingtempbasalstatus">Nahrávám stav dočasného bazálu</string>
-    <string name="settingpumpsettings">Nastavení uživatelských voleb</string>
+    <string name="getting_pump_status">Nahrávám stav pumpy</string>
+    <string name="getting_bolus_status">Nahrávám stav bolusu</string>
+    <string name="getting_temp_basal_status">Nahrávám stav dočasného bazálu</string>
+    <string name="setting_pump_settings">Nastavení uživatelských voleb</string>
 </resources>
diff --git a/pump/medtrum/src/main/res/values-es-rES/strings.xml b/pump/medtrum/src/main/res/values-es-rES/strings.xml
index 0358cd08c9..73a29a3d38 100644
--- a/pump/medtrum/src/main/res/values-es-rES/strings.xml
+++ b/pump/medtrum/src/main/res/values-es-rES/strings.xml
@@ -4,7 +4,7 @@
     <string name="medtrum">Medtrum</string>
     <string name="medtrum_pump_shortname">MT</string>
     <string name="medtrum_pump_description">Integración de bombas de insulina Medtrum Nano</string>
-    <string name="medtrumpump_settings">Ajustes de bomba Medtrum</string>
+    <string name="medtrum_pump_setting">Ajustes de bomba Medtrum</string>
     <string name="pump_error">Error de bomba: %1$s !! </string>
     <string name="pump_unsupported">Bomba no probada: %1$d! Por favor, contacta con nosotros en Discord o GitHub para obtener soporte</string>
     <string name="pump_is_suspended">Bomba suspendida</string>
@@ -36,11 +36,11 @@
     <string name="alarm_pump_low_battery">Batería baja de la bomba</string>
     <string name="alarm_pump_low_reservoir">Reservorio bajo en la bomba</string>
     <string name="alarm_pump_expires_soon">El parche caduca pronto</string>
-    <string name="alarm_lowbg_suspended">Suspensión por glucosa baja</string>
-    <string name="alarm_lowbg_suspended2">Suspensión por glucosa baja 2</string>
+    <string name="alarm_low_bg_suspended">Suspensión por glucosa baja</string>
+    <string name="alarm_low_bg_suspended2">Suspensión por glucosa baja 2</string>
     <string name="alarm_auto_suspended">Auto suspendido</string>
-    <string name="alarm_hmax_suspended">suspensión por máximo por hora</string>
-    <string name="alarm_dmax_suspended">suspensión por máximo por día</string>
+    <string name="alarm_hourly_max_suspended">suspensión por máximo por hora</string>
+    <string name="alarm_daily_max_suspended">suspensión por máximo por día</string>
     <string name="alarm_suspended">Suspendido</string>
     <string name="alarm_paused">Pausado</string>
     <string name="alarm_occlusion">Oclusión</string>
@@ -81,7 +81,6 @@
     <string name="priming_error">No se ha podido purgar, pulsa <b>Reintentar</b> para volver a intentarlo.</string>
     <string name="press_next">Presiona <b>Siguiente</b> para continuar.</string>
     <string name="press_next_to_start_activation">Presiona <b>Siguiente</b> para comenzar la activación.</string>
-    <string name="attach_patch_to_body">Retira el cierre de seguridad. Acopla la bomba al cuerpo. Pulsa el botón de la aguja.</string>
     <string name="remove_safety_lock">Retira el cierre de seguridad. Acopla la bomba al cuerpo. Pulsa el botón de la aguja.</string>
     <string name="activating_pump">Activando la bomba y ajustando la tasa basal inicial. Espera por favor.</string>
     <string name="activating_error">Fallo al activar, pulsa <b>Reintentar</b> para volver a intenetarlo.</string>
@@ -111,9 +110,8 @@
     <string name="daily_max_insulin_title">Insulina máxima diaria</string>
     <string name="daily_max_insulin_summary">Especificar las unidades máximas de insulina permitidas por día. Si se superan, la bomba se suspenderá.</string>
     <!-- treatment state-->
-    <string name="waitingforestimatedbolusend">Esperando el fin del bolo. Quedan %1$d seg.</string>
-    <string name="gettingpumpstatus">Obteniendo el estado de la bomba</string>
-    <string name="gettingbolusstatus">Obteneniendo el estado del bolo</string>
-    <string name="gettingtempbasalstatus">Obteniendo el estado de la basal temporal</string>
-    <string name="settingpumpsettings">Configurar las opciones del usuario</string>
+    <string name="getting_pump_status">Obteniendo el estado de la bomba</string>
+    <string name="getting_bolus_status">Obteneniendo el estado del bolo</string>
+    <string name="getting_temp_basal_status">Obteniendo el estado de la basal temporal</string>
+    <string name="setting_pump_settings">Configurar las opciones del usuario</string>
 </resources>
diff --git a/pump/medtrum/src/main/res/values-fr-rFR/arrays.xml b/pump/medtrum/src/main/res/values-fr-rFR/arrays.xml
index 3ea04e700d..81edba0fac 100644
--- a/pump/medtrum/src/main/res/values-fr-rFR/arrays.xml
+++ b/pump/medtrum/src/main/res/values-fr-rFR/arrays.xml
@@ -1,2 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string-array name="alarmSettings">
+        <item>Lumière, vibreur et bip</item>
+        <item>Lumière et vibreur</item>
+        <item>Lumière et bip</item>
+        <item>Lumière</item>
+        <item>Vibreur et bip</item>
+        <item>Vibreur</item>
+        <item>Bip</item>
+        <item>Muet</item>
+    </string-array>
+</resources>
diff --git a/pump/medtrum/src/main/res/values-fr-rFR/strings.xml b/pump/medtrum/src/main/res/values-fr-rFR/strings.xml
index 8830648bd7..0056074ac0 100644
--- a/pump/medtrum/src/main/res/values-fr-rFR/strings.xml
+++ b/pump/medtrum/src/main/res/values-fr-rFR/strings.xml
@@ -4,7 +4,7 @@
     <string name="medtrum">Medtrum</string>
     <string name="medtrum_pump_shortname">MT</string>
     <string name="medtrum_pump_description">Intégration de pompe pour Medtrum Nano</string>
-    <string name="medtrumpump_settings">Paramètres de la pompe Medtrum</string>
+    <string name="medtrum_pump_setting">Paramètres de la pompe Medtrum</string>
     <string name="pump_error">Erreur pompe: %1$s!! </string>
     <string name="pump_unsupported">Pompe non testée : %1$d! Veuillez nous contacter sur discord ou github pour obtenir de l\'aide</string>
     <string name="pump_is_suspended">La pompe est suspendue</string>
@@ -36,11 +36,11 @@
     <string name="alarm_pump_low_battery">Batterie de la pompe faible</string>
     <string name="alarm_pump_low_reservoir">Réservoir bas</string>
     <string name="alarm_pump_expires_soon">La pompe expire bientôt</string>
-    <string name="alarm_lowbg_suspended">Arrêt Glycémie Basse</string>
-    <string name="alarm_lowbg_suspended2">Arrêt Glycémie Basse 2</string>
+    <string name="alarm_low_bg_suspended">Arrêt Glycémie Basse</string>
+    <string name="alarm_low_bg_suspended2">Arrêt Glycémie Basse 2</string>
     <string name="alarm_auto_suspended">Suspension auto</string>
-    <string name="alarm_hmax_suspended">suspension max horaire</string>
-    <string name="alarm_dmax_suspended">suspension max journalier</string>
+    <string name="alarm_hourly_max_suspended">suspension max horaire</string>
+    <string name="alarm_daily_max_suspended">suspension max journalier</string>
     <string name="alarm_suspended">Suspendu</string>
     <string name="alarm_paused">En pause</string>
     <string name="alarm_occlusion">Occlusion</string>
@@ -81,7 +81,6 @@
     <string name="priming_error">Échec d\'amorçage, appuyez sur <b>Réessayez</b> pour éssayer à nouveau.</string>
     <string name="press_next">Appuyez sur <b>Suivant</b> pour continuer.</string>
     <string name="press_next_to_start_activation">Appuyez sur <b>Suivant</b> pour démarrer l\'activation.</string>
-    <string name="attach_patch_to_body">Retirez le verrou de sécurité. Fixez la pompe au corps. Appuyez sur le bouton de l\'aiguille.</string>
     <string name="remove_safety_lock">Retirez le verrou de sécurité. Fixez la pompe au corps. Appuyez sur le bouton de l\'aiguille.</string>
     <string name="activating_pump">Activation de la pompe et du débit de base initial. Veuillez patienter.</string>
     <string name="activating_error">Échec de l\'activation, appuyez sur <b>Réessayez</b> pour éssayer à nouveau.</string>
@@ -111,9 +110,8 @@
     <string name="daily_max_insulin_title">Insuline maximale quotidienne</string>
     <string name="daily_max_insulin_summary">Spécifiez le nombre maximum d\'unités d\'insuline autorisées par jour. Si ce montant est dépassé, la pompe sera suspendue.</string>
     <!-- treatment state-->
-    <string name="waitingforestimatedbolusend">Bolus en cours. %1$d sec. restantes.</string>
-    <string name="gettingpumpstatus">Obtenir l\'état de la pompe</string>
-    <string name="gettingbolusstatus">Obtenir l\'état du bolus</string>
-    <string name="gettingtempbasalstatus">Obtenir l\'état du basal temporaire</string>
-    <string name="settingpumpsettings">Réglage des paramètres utilisateur</string>
+    <string name="getting_pump_status">Mise à jour de l\'état pompe</string>
+    <string name="getting_bolus_status">Obtenir l\'état du bolus</string>
+    <string name="getting_temp_basal_status">Obtenir le statut du basal temporaire</string>
+    <string name="setting_pump_settings">Définir les options utilisateur</string>
 </resources>
diff --git a/pump/medtrum/src/main/res/values-it-rIT/arrays.xml b/pump/medtrum/src/main/res/values-it-rIT/arrays.xml
index 3ea04e700d..170d27866f 100644
--- a/pump/medtrum/src/main/res/values-it-rIT/arrays.xml
+++ b/pump/medtrum/src/main/res/values-it-rIT/arrays.xml
@@ -1,2 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string-array name="alarmSettings">
+        <item>Luce, vibrazione e suono</item>
+        <item>Luce e vibrazione</item>
+        <item>Luce e suono</item>
+        <item>Luce</item>
+        <item>Vibrazione e suono</item>
+        <item>Vibrazione</item>
+        <item>Suono</item>
+        <item>Silenzioso</item>
+    </string-array>
+</resources>
diff --git a/pump/medtrum/src/main/res/values-it-rIT/strings.xml b/pump/medtrum/src/main/res/values-it-rIT/strings.xml
index 492785a918..171ed444b6 100644
--- a/pump/medtrum/src/main/res/values-it-rIT/strings.xml
+++ b/pump/medtrum/src/main/res/values-it-rIT/strings.xml
@@ -3,30 +3,115 @@
     <!-- MedtrumPump -->
     <string name="medtrum">Medtrum</string>
     <string name="medtrum_pump_shortname">MT</string>
+    <string name="medtrum_pump_description">Integrazione del microinfusore Medtrum Nano</string>
+    <string name="medtrum_pump_setting">Impostazioni micro Medtrum</string>
     <string name="pump_error">Errore micro: %1$s!! </string>
+    <string name="pump_unsupported">Micro non testato: %1$d! Contattaci su discord o github per supporto</string>
     <string name="pump_is_suspended">Il micro è sospeso</string>
+    <string name="pump_is_suspended_hour_max">Il micro è sospeso a causa del superamento della massima insulina oraria</string>
+    <string name="pump_is_suspended_day_max">Il micro è sospeso a causa del superamento della massima insulina giornaliera</string>
+    <string name="patch_not_active">Patch non attivata</string>
+    <string name="pump_setting_failed">Errore nella configurazione delle impostazioni utente sul micro!</string>
     <!-- overview fragment -->
     <string name="ble_status_label">Stato BLE</string>
     <string name="last_connection_label">Ultima connessione</string>
     <string name="pump_state_label">Stato micro</string>
+    <string name="active_alarms_label">Attiva allarmi</string>
     <string name="reservoir_level"> %.2f U</string>
+    <string name="battery_voltage"> %.2f V</string>
     <string name="basal_type_label">Tipo basale</string>
     <string name="basal_rate_label">Velocità basale</string>
     <string name="current_basal_rate"> %.2f U/h</string>
     <string name="pump_type_label">Tipo micro</string>
+    <string name="fw_version_label">Versione FW</string>
+    <string name="patch_no_label">Patch no</string>
+    <string name="patch_expiry_label">Patch scaduta</string>
     <string name="refresh_label">Aggiorna</string>
+    <string name="reset_alarms_label">Reset allarmi</string>
+    <string name="change_patch_label">Cambio patch</string>
+    <string name="requested_by_user" comment="26 characters max for translation">Richiesto da utente</string>
     <string name="expiry_not_enabled">Non abilitato</string>
     <!-- Alarm strings -->
     <string name="alarm_none">Nessuno</string>
+    <string name="alarm_pump_low_battery">Batteria micro quasi scarica</string>
+    <string name="alarm_pump_low_reservoir">Serbatoio micro quasi vuoto</string>
+    <string name="alarm_pump_expires_soon">Il micro scadrà presto</string>
+    <string name="alarm_low_bg_suspended">sospensione per glicemia bassa</string>
+    <string name="alarm_low_bg_suspended2">sospensione per glicemia bassa 2</string>
+    <string name="alarm_auto_suspended">Autosospeso</string>
+    <string name="alarm_hourly_max_suspended">sospensione per massimo orario</string>
+    <string name="alarm_daily_max_suspended">sospensione per massimo giornaliero</string>
     <string name="alarm_suspended">Sospeso</string>
     <string name="alarm_paused">In pausa</string>
     <string name="alarm_occlusion">Occlusione</string>
     <string name="alarm_expired">Scaduto</string>
     <string name="alarm_reservoir_empty">Serbatoio vuoto</string>
+    <string name="alarm_patch_fault">Guasto patch</string>
+    <string name="alarm_patch_fault2">Guasto patch 2</string>
+    <string name="alarm_base_fault">Guasto base</string>
+    <string name="alarm_battery_out">Batteria scarica</string>
+    <string name="alarm_no_calibration">No calibrazione</string>
+    <string name="pump_time_update_failed">Impossibile aggiornare il fuso orario del microinfusore, posticipare il messaggio e aggiornare manualmente.</string>
     <!-- wizard-->
+    <string name="retry">Riprova</string>
+    <string name="next">Avanti</string>
+    <string name="discard">Scarta</string>
+    <string name="step_prepare_patch">Attiva patch</string>
+    <string name="step_prepare_patch_connect">Connetti e riempi</string>
+    <string name="step_prime">Caricamento</string>
+    <string name="step_priming">Caricamento</string>
+    <string name="step_priming_complete">Caricamento completato</string>
+    <string name="step_attach">Fissa patch</string>
+    <string name="step_activate">Attivazione...</string>
+    <string name="step_activate_complete">Attivazione completata</string>
+    <string name="step_deactivate">Disattiva patch</string>
+    <string name="step_deactivating">Disattivazione...</string>
+    <string name="step_deactivate_complete">Patch disattivata</string>
+    <string name="step_retry_activation">Attivazione in corso</string>
+    <string name="unexpected_state">Stato inaspettato: %1$s</string>
+    <string name="no_profile_selected">Nessun profilo selezionato. Seleziona un profilo e riprova.</string>
+    <string name="base_serial">Seriale base micro: %1$X</string>
+    <string name="patch_begin_activation">Nessuna patch attiva. Premi <b>Avanti</b> per iniziare il processo di attivazione.</string>
+    <string name="patch_not_active_note">La base del micro non deve essere collegata alla patch fino alla fase successiva!</string>
+    <string name="connect_pump_base">Collegare la base del micro a una nuova patch, rimuovere l\'aria residua e riempire con insulina, quindi premere <b>Avanti</b>.</string>
+    <string name="note_min_70_units">Nota: per l\'attivazione è richiesto un minimo di 70 unità.</string>
+    <string name="do_not_attach_to_body">Non attaccare ancora la patch al corpo.</string>
+    <string name="half_press_needle">Premere a metà il tasto dell\'ago. Poi tocca <b>Avanti</b> per avviare il caricamento.</string>
+    <string name="wait_for_priming">Attendi il completamento del caricamento.</string>
+    <string name="priming_error">Impossibile caricare, premi <b>Riprova</b> per riprovare.</string>
+    <string name="press_next">Premi <b>Avanti</b> per continuare.</string>
+    <string name="press_next_to_start_activation">Premi <b>Avanti</b> per avviare l\'attivazione.</string>
+    <string name="remove_safety_lock">Rimuovere il blocco di sicurezza. Fissare il micro al corpo. Premere il tasto dell’ago.</string>
+    <string name="activating_pump">Attivazione del micro e impostazione della velocità basale iniziale. Attendere.</string>
+    <string name="activating_error">Impossibile attivare, premi <b>Riprova</b> per riprovare.</string>
+    <string name="activating_complete">Nuova patch attivata. %.2f unità rimanenti.</string>
+    <string name="press_OK_to_return">Premi <b>OK</b> per tornare alla schermata principale.</string>
+    <string name="deactivate_sure">Sei sicuro di voler disattivare la patch corrente?</string>
+    <string name="cancel_sure">Sei sicuro di voler annullare l\'attivazione?</string>
+    <string name="medtrum_deactivate_pump_confirm">Sei sicuro? Questa azione non può essere annullata!!</string>
+    <string name="press_next_or_cancel">Premi <b>Avanti</b> per disattivare o <b>Annulla</b> per tornare alla schermata principale.</string>
+    <string name="deactivating_pump">Disattivazione patch. Attendi.</string>
+    <string name="deactivating_error">Impossibile disattivare, premi <b>Scarta</b> to scartare la patch.</string>
+    <string name="retract_needle">Estrarre l’ago. Rimuovere la patch dal corpo.</string>
+    <string name="remove_base_discard_patch">Rimuovere la base del micro e smaltire in modo appropriato la patch usata.</string>
+    <string name="press_next_or_OK">Premi <b>OK</b> per tornare alla schermata principale. Premi <b>Avanti</b> per avviare l\'attivazione di una nuova patch.</string>
+    <string name="activation_in_progress">Oops! Qualcosa è andato storto, sembra ci sia già un\'attivazione in corso.</string>
+    <string name="press_retry_or_discard">Premi <b>Avanti</b> per riprendere l\'attivazione o <b>Scarta</b> per resettare lo stato di attivazione.</string>
+    <string name="reading_activation_status">Attendere, lettura dello stato di attivazione dal micro.</string>
     <!-- settings-->
     <string name="sn_input_title">Numero seriale</string>
+    <string name="sn_input_summary">Inserisci il numero di serie della base del micro.</string>
     <string name="alarm_setting_title">Impostazioni allarmi</string>
+    <string name="alarm_setting_summary">Seleziona le tue impostazioni di allarme del micro preferite.</string>
     <string name="patch_expiration_title">Scadenza patch</string>
+    <string name="patch_expiration_summary">Una volta abilitata, la patch scadrà dopo 3 giorni, con un periodo di grazia di 8 ore.</string>
+    <string name="hourly_max_insulin_title">Insulina massima oraria</string>
+    <string name="hourly_max_insulin_summary">Specificare le unità massime di insulina consentite per ora. Se superate, il micro sarà sospeso.</string>
+    <string name="daily_max_insulin_title">Insulina massima giornaliera</string>
+    <string name="daily_max_insulin_summary">Specificare le unità massime di insulina consentite per giorno. Se superate, il micro sarà sospeso.</string>
     <!-- treatment state-->
+    <string name="getting_pump_status">Ricezione stato micro</string>
+    <string name="getting_bolus_status">Ricezione stato bolo</string>
+    <string name="getting_temp_basal_status">Ricezione stato basale temporanea</string>
+    <string name="setting_pump_settings">Impostazione opzioni utente</string>
 </resources>
diff --git a/pump/medtrum/src/main/res/values-no-rNO/arrays.xml b/pump/medtrum/src/main/res/values-no-rNO/arrays.xml
index 3ea04e700d..185d307aff 100644
--- a/pump/medtrum/src/main/res/values-no-rNO/arrays.xml
+++ b/pump/medtrum/src/main/res/values-no-rNO/arrays.xml
@@ -1,2 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string-array name="alarmSettings">
+        <item>Lett, vibrer og pip</item>
+        <item>Lett og vibrer</item>
+        <item>Lett og pip</item>
+        <item>Lett</item>
+        <item>Vibrer og pip</item>
+        <item>Vibrer</item>
+        <item>Pip</item>
+        <item>Stille</item>
+    </string-array>
+</resources>
diff --git a/pump/medtrum/src/main/res/values-no-rNO/strings.xml b/pump/medtrum/src/main/res/values-no-rNO/strings.xml
index 36c8a820fe..832bb01740 100644
--- a/pump/medtrum/src/main/res/values-no-rNO/strings.xml
+++ b/pump/medtrum/src/main/res/values-no-rNO/strings.xml
@@ -1,9 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- MedtrumPump -->
+    <string name="medtrum">Medtrum</string>
+    <string name="medtrum_pump_shortname">MT</string>
+    <string name="medtrum_pump_description">Pumpeintegrasjon for Medtrum Nano</string>
+    <string name="medtrum_pump_setting">Medtrum pumpeinnstillinger</string>
+    <string name="pump_error">Pumpefeil: %1$s!! </string>
+    <string name="pump_unsupported">Pumpe ikke testet: %1$d! Kontakt oss på discord eller github for støtte</string>
+    <string name="pump_is_suspended">Pumpen er pauset</string>
+    <string name="pump_is_suspended_hour_max">Pumpe er pauset fordi maksimal insulinleveranse per time er overskredet</string>
+    <string name="pump_is_suspended_day_max">Pumpe er pauset fordi maksimal insulinleveranse per dag er overskredet</string>
+    <string name="patch_not_active">Patch ikke aktivert</string>
+    <string name="pump_setting_failed">Kunne ikke sende brukerinnstillinger til pumpen!</string>
     <!-- overview fragment -->
+    <string name="ble_status_label">Bluetooth Status</string>
+    <string name="last_connection_label">Siste tilkobling</string>
+    <string name="pump_state_label">Pumpestatus</string>
+    <string name="active_alarms_label">Aktive alarmer</string>
+    <string name="reservoir_level"> %.2f E</string>
+    <string name="battery_voltage"> %.2f V</string>
+    <string name="basal_type_label">Basal type</string>
+    <string name="basal_rate_label">Basalrate</string>
+    <string name="current_basal_rate"> %.2f E/t</string>
+    <string name="pump_type_label">Pumpetype</string>
+    <string name="fw_version_label">FW versjon</string>
+    <string name="patch_no_label">Patch nr</string>
+    <string name="patch_expiry_label">Patch utløper</string>
+    <string name="refresh_label">Oppdater</string>
+    <string name="reset_alarms_label">Nullstill alarmer</string>
+    <string name="change_patch_label">Bytte patch</string>
+    <string name="requested_by_user" comment="26 characters max for translation">Forespurt av bruker</string>
+    <string name="expiry_not_enabled">Ikke aktivert</string>
     <!-- Alarm strings -->
+    <string name="alarm_none">Ingen</string>
+    <string name="alarm_pump_low_battery">Lavt pumpebatteri</string>
+    <string name="alarm_pump_low_reservoir">Lavt pumpereservoar</string>
+    <string name="alarm_pump_expires_soon">Pumpe utløper snart</string>
+    <string name="alarm_low_bg_suspended">Stoppet pga lavt BS</string>
+    <string name="alarm_low_bg_suspended2">Stoppet pga lavt BS 2</string>
+    <string name="alarm_auto_suspended">Automatisk pauset</string>
+    <string name="alarm_hourly_max_suspended">maks stoppet per time</string>
+    <string name="alarm_daily_max_suspended">maks stoppet per dag</string>
+    <string name="alarm_suspended">Pauset</string>
+    <string name="alarm_paused">Pauset</string>
+    <string name="alarm_occlusion">Tilstopping</string>
+    <string name="alarm_expired">Utløpt</string>
+    <string name="alarm_reservoir_empty">Reservoaret er tomt</string>
+    <string name="alarm_patch_fault">Feil på patch</string>
+    <string name="alarm_patch_fault2">Feil på patch 2</string>
+    <string name="alarm_base_fault">Feil i base</string>
+    <string name="alarm_battery_out">Batteri er tatt ut</string>
+    <string name="alarm_no_calibration">Ingen kalibrering</string>
+    <string name="pump_time_update_failed">Kunne ikke oppdatere tidssone på pumpen. Bekreft meldingen og oppdater manuelt.</string>
     <!-- wizard-->
+    <string name="retry">Prøv igjen</string>
+    <string name="next">Neste</string>
+    <string name="discard">Forkast</string>
+    <string name="step_prepare_patch">Aktivere patch</string>
+    <string name="step_prepare_patch_connect">Koble til og fyll</string>
+    <string name="step_prime">Prime</string>
+    <string name="step_priming">Primer</string>
+    <string name="step_priming_complete">Priming ferdig</string>
+    <string name="step_attach">Fest patch</string>
+    <string name="step_activate">Aktiverer...</string>
+    <string name="step_activate_complete">Aktivering fullført</string>
+    <string name="step_deactivate">Deaktivere patch</string>
+    <string name="step_deactivating">Deaktiverer...</string>
+    <string name="step_deactivate_complete">Patch deaktivert</string>
+    <string name="step_retry_activation">Aktivering pågår</string>
+    <string name="unexpected_state">Uventet status: %1$s</string>
+    <string name="no_profile_selected">Ingen profil er valgt. Velg en profil og prøv igjen.</string>
+    <string name="base_serial">Pumpebasens serienummer: %1$X</string>
+    <string name="patch_begin_activation">Ingen aktiv patch. Trykk <b>Neste</b> for å starte aktiveringsprosessen.</string>
+    <string name="patch_not_active_note">Pumpebase skal ikke kobles til patch før neste steg!</string>
+    <string name="connect_pump_base">Koble pumpebase til ny patch, fjern overflødig luft og full med insulin. Deretter trykk <b>Neste</b>.</string>
+    <string name="note_min_70_units">Merk: Minimum 70 enheter kreves for aktivering.</string>
+    <string name="do_not_attach_to_body">Ikke koble patch til kroppen enda.</string>
+    <string name="half_press_needle">Trykk nål-knappen halvveis. Trykk deretter <b>Neste</b> for å starte priming.</string>
+    <string name="wait_for_priming">Vent mens priming fullføres.</string>
+    <string name="priming_error">Kunne ikke prime, trykk <b>Prøv igjen</b> for å prøve igjen.</string>
+    <string name="press_next">Trykk <b>Neste</b> for å fortsette.</string>
+    <string name="press_next_to_start_activation">Trykk <b>Neste</b> for å starte aktivering.</string>
+    <string name="remove_safety_lock">Fjern sikkerhetslåsen. Koble pumpen til kroppen. Trykk nål-knappen.</string>
+    <string name="activating_pump">Aktiverer pumpe og setter basalrate. Vennligst vent.</string>
+    <string name="activating_error">Kunne ikke aktivere, trykk <b>Prøv igjen</b> for å prøve igjen.</string>
+    <string name="activating_complete">Ny patch aktivert. %.2f enheter gjenstår.</string>
+    <string name="press_OK_to_return">Trykk <b>OK</b> for å gå tilbake til hovedskjermen.</string>
+    <string name="deactivate_sure">Er du sikker på at du vil deaktivere det gjeldende patch?</string>
+    <string name="cancel_sure">Er du sikker på at du vil avbryte aktiveringen?</string>
+    <string name="medtrum_deactivate_pump_confirm">Er du sikker? Denne handlingen kan ikke angres!!</string>
+    <string name="press_next_or_cancel">Trykk på <b>Neste</b> for å deaktivere eller <b>Avbryt</b> for å gå tilbake til hovedskjermen.</string>
+    <string name="deactivating_pump">Deaktiverer patch. Vent litt.</string>
+    <string name="deactivating_error">Kunne ikke deaktivere, trykk på <b>Forkast</b> for å glemme patch.</string>
+    <string name="retract_needle">Trekk ut kanylen. Fjern patch fra kroppen.</string>
+    <string name="remove_base_discard_patch">Fjern pumpebase og kast brukt patch på riktig måte.</string>
+    <string name="press_next_or_OK">Trykk på <b>OK</b> for å gå tilbake til hovedskjermen. Trykk på <b>Neste</b> for å begynne å aktivere ny patch.</string>
+    <string name="activation_in_progress">Oops! Noe gikk galt, det ser ut som at det allerede pågår en aktivering.</string>
+    <string name="press_retry_or_discard">Trykk <b>Neste</b> for å gjenoppta aktiveringen eller <b>Forkast</b> for å tilbakestille aktiveringsstatusen.</string>
+    <string name="reading_activation_status">Vennligst vent, leser aktiveringsstatus fra pumpen.</string>
     <!-- settings-->
+    <string name="sn_input_title">Serienummer</string>
+    <string name="sn_input_summary">Skriv inn serienummeret til pumpens base.</string>
+    <string name="alarm_setting_title">Alarminnstillinger</string>
+    <string name="alarm_setting_summary">Velg dine foretrukne alarminnstillinger.</string>
+    <string name="patch_expiration_title">Patch utløpsdato</string>
+    <string name="patch_expiration_summary">Når aktivert vil plasteret utløpe etter 3 dager, med en nådeperiode på 8 timer etter det.</string>
+    <string name="hourly_max_insulin_title">Maksimal insulin per time</string>
+    <string name="hourly_max_insulin_summary">Angi maksimalt antall enheter insulin tillatt per time. Hvis overskredet vil pumpen suspendere.</string>
+    <string name="daily_max_insulin_title">Maksimal insulin per dag</string>
+    <string name="daily_max_insulin_summary">Angi maksimalt antall enheter insulin tillatt per dag. Hvis overskredet vil pumpen suspendere.</string>
     <!-- treatment state-->
+    <string name="getting_pump_status">Henter pumpestatus</string>
+    <string name="getting_bolus_status">Henter bolus status</string>
+    <string name="getting_temp_basal_status">Henter midlertidig basal status</string>
+    <string name="setting_pump_settings">Setter brukerinnstillinger</string>
 </resources>
diff --git a/wear/src/main/res/values-es-rES/strings.xml b/wear/src/main/res/values-es-rES/strings.xml
index 8437dddeed..6d725d5f82 100644
--- a/wear/src/main/res/values-es-rES/strings.xml
+++ b/wear/src/main/res/values-es-rES/strings.xml
@@ -11,6 +11,7 @@
     <string name="label_watchface_cockpit">AAPS(Cockpit)</string>
     <string name="label_watchface_steampunk">AAPS(Steampunk)</string>
     <string name="label_watchface_digital_style">AAPS (Digital)</string>
+    <string name="label_watchface_custom">AAPS(personalizado)</string>
     <string name="label_actions_tile">AAPS(Acciones)</string>
     <string name="label_temp_target_tile">AAPS(Objetivo Temporal)</string>
     <string name="label_quick_wizard_tile">AAPS(Asistente Rápido)</string>
@@ -143,6 +144,7 @@
     <string name="pref_simplify_ui_sum">Mostrar sólo la hora y la glucosa</string>
     <string name="pref_vibrate_hourly">Vibrar cada hora</string>
     <string name="pref_show_weeknumber">Mostrar número de semana</string>
+    <string name="custom_pref_show_seconds">Mostrar segundos</string>
     <string name="digitalstyle_pref_your_style">Tu estilo:</string>
     <string name="digitalstyle_style_none">Sin estilo</string>
     <string name="digitalstyle_style_minimal">Estilo mínimo</string>
diff --git a/wear/src/main/res/values-fr-rFR/strings.xml b/wear/src/main/res/values-fr-rFR/strings.xml
index d41806af56..451b202835 100644
--- a/wear/src/main/res/values-fr-rFR/strings.xml
+++ b/wear/src/main/res/values-fr-rFR/strings.xml
@@ -11,6 +11,7 @@
     <string name="label_watchface_cockpit">AAPS (Cockpit)</string>
     <string name="label_watchface_steampunk">AAPS (Steampunk)</string>
     <string name="label_watchface_digital_style">AAPS (Digital)</string>
+    <string name="label_watchface_custom">AAPS(perso)</string>
     <string name="label_actions_tile">AAPS (Actions)</string>
     <string name="label_temp_target_tile">AAPS(Cible Temp)</string>
     <string name="label_quick_wizard_tile">AAPS(Assistant rapide)</string>
@@ -143,6 +144,7 @@
     <string name="pref_simplify_ui_sum">Afficher seulement l\'heure et la glycémie</string>
     <string name="pref_vibrate_hourly">Vibrer à l\'heure</string>
     <string name="pref_show_weeknumber">Afficher numéro semaine</string>
+    <string name="custom_pref_show_seconds">Afficher les secondes</string>
     <string name="digitalstyle_pref_your_style">Style :</string>
     <string name="digitalstyle_style_none">aucun</string>
     <string name="digitalstyle_style_minimal">minimal</string>
diff --git a/wear/src/main/res/values-it-rIT/strings.xml b/wear/src/main/res/values-it-rIT/strings.xml
index b95164d513..d0055a8b84 100644
--- a/wear/src/main/res/values-it-rIT/strings.xml
+++ b/wear/src/main/res/values-it-rIT/strings.xml
@@ -11,6 +11,7 @@
     <string name="label_watchface_cockpit">AAPS(Cockpit)</string>
     <string name="label_watchface_steampunk">AAPS(Steampunk)</string>
     <string name="label_watchface_digital_style">AAPS(DigitalStyle)</string>
+    <string name="label_watchface_custom">AAPS(Personalizzato)</string>
     <string name="label_actions_tile">AAPS(azioni)</string>
     <string name="label_temp_target_tile">AAPS(Temp Target)</string>
     <string name="label_quick_wizard_tile">AAPS(Quick Wizard)</string>
@@ -143,6 +144,7 @@
     <string name="pref_simplify_ui_sum">Mostra solo tempo e BG</string>
     <string name="pref_vibrate_hourly">Vibra a ogni ora</string>
     <string name="pref_show_weeknumber">Mostra numero settimana</string>
+    <string name="custom_pref_show_seconds">Mostra secondi</string>
     <string name="digitalstyle_pref_your_style">Il tuo stile:</string>
     <string name="digitalstyle_style_none">nessuno stile</string>
     <string name="digitalstyle_style_minimal">stile minimale</string>
diff --git a/wear/src/main/res/values-no-rNO/strings.xml b/wear/src/main/res/values-no-rNO/strings.xml
index 55f2d9a8f1..7c65895870 100644
--- a/wear/src/main/res/values-no-rNO/strings.xml
+++ b/wear/src/main/res/values-no-rNO/strings.xml
@@ -11,6 +11,7 @@
     <string name="label_watchface_cockpit">AAPS(Cockpit)</string>
     <string name="label_watchface_steampunk">AAPS(Steampunk)</string>
     <string name="label_watchface_digital_style">AAPS(Digitalstil)</string>
+    <string name="label_watchface_custom">AAPS(Tilpasset)</string>
     <string name="label_actions_tile">AAPS(Actions)</string>
     <string name="label_temp_target_tile">AAPS(Midl. Mål)</string>
     <string name="label_quick_wizard_tile">AAPS(Quick Wizard)</string>
@@ -143,6 +144,7 @@
     <string name="pref_simplify_ui_sum">Vis kun tid og BS</string>
     <string name="pref_vibrate_hourly">Vibrer hver time</string>
     <string name="pref_show_weeknumber">Vis ukenummer</string>
+    <string name="custom_pref_show_seconds">Vis sekunder</string>
     <string name="digitalstyle_pref_your_style">Din stil:</string>
     <string name="digitalstyle_style_none">ingen stil</string>
     <string name="digitalstyle_style_minimal">minimalistisk stil</string>