diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e10ccfb5f..77d54c80e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -5,8 +5,9 @@
   <string name="action_settings">Einstellungen</string>
   <string name="action_debug">Debug</string>
   <string name="action_quit">Beenden</string>
+  <string name="controlcenter_fetch_activity_data">Synchronisieren</string>
   <string name="controlcenter_start_sleepmonitor">Schlafmonitor (ALPHA)</string>
-  <string name="controlcenter_find_device">Verlegtes Gerät finden</string>
+  <string name="controlcenter_find_device">Suche verlegtes Gerät...</string>
   <string name="controlcenter_take_screenshot">Bildschirmfoto</string>
   <string name="controlcenter_disconnect">Trennen</string>
   <string name="title_activity_debug">Debug</string>
@@ -14,6 +15,11 @@
   <string name="title_activity_appmanager">App Manager</string>
   <string name="appmananger_app_delete">Löschen</string>
   <!--Strings related to FwAppInstaller-->
+  <string name="title_activity_fw_app_insaller">FW/App Installer</string>
+  <string name="fw_upgrade_notice">Es soll die Firmware %s anstelle der aktuell installierten Version aufs Mi Band gespielt werden.</string>
+  <string name="miband_firmware_known">Diese Firmware ist getestet worden und ist zu Gadgetbridge kompatibel.</string>
+  <string name="miband_firmware_unknown_warning">Diese Firmware ist nicht getestet und könnte inkompatibel mit Gadgetbridge sind.\n\nEs wird nicht empfohlen sie zu installieren!</string>
+  <string name="miband_firmware_suggest_whitelist">Falls die Firmware trotzdem installiert werden soll und nachher alles korrekt funktioniert, melde bitte den Gadgetbridge Entwicklern, dass die Firmware %s tauglich ist.</string>
   <!--Strings related to Settings-->
   <string name="title_activity_settings">Einstellungen</string>
   <string name="pref_header_general">Allgemeine Einstellungen</string>
@@ -38,6 +44,8 @@
   <string name="pref_title_pebble_settings">Pebble Einstellungen</string>
   <string name="pref_title_pebble_forceprotocol">Benachrichtigungsprotokoll erzwingen</string>
   <string name="pref_summary_pebble_forceprotocol">Diese Option erzwingt das neuste Benachrichtigungsprotokoll abhängig von der Firmwareversion. NUR EINSCHALTEN, WENN DU WEISST WAS DU TUST!</string>
+  <string name="pref_title_pebble_forceuntested">Ungetestete Features freischalten</string>
+  <string name="pref_summary_pebble_forceuntested">Schaltet ungetetestete Features frei. TU DIES NUR, WENN DU WEIßT, WAS DU TUST!</string>
   <string name="not_connected">nicht verbunden</string>
   <string name="connecting">verbinde</string>
   <string name="connected">verbunden</string>
@@ -57,6 +65,7 @@
   <string name="installing_binary_d_d">installiere Datei %1$d/%2$d</string>
   <string name="installation_failed_">Installation fehlgeschlagen!</string>
   <string name="installation_successful">Installation erfolgreich</string>
+  <string name="firmware_install_warning">DU VERSUCHST EINE FIRMWARE ZU INSTALLIEREN; FAHRE AUF EIGENES RISIKO FORT.\n\n\nDiese Firmware ist für HW Revision: %s</string>
   <string name="app_install_info">Du bist dabei die folgende app zu installieren:\n\n\n%1$s Version %2$s von %3$s\n</string>
   <string name="n_a">N/A</string>
   <string name="initialized">initialisiert</string>
@@ -114,6 +123,7 @@
   <string name="pref_screen_notification_profile_incoming_call">Benachrichtigung für eingehende Anrufe</string>
   <string name="control_center_find_lost_device">Verlegtes Gerät suchen</string>
   <string name="control_center_cancel_to_stop_vibration">Abbrechen um die Vibration zu stoppen.</string>
+  <string name="title_activity_charts">Deine Aktivität</string>
   <string name="title_activity_set_alarm">Wecker stellen</string>
   <string name="controlcenter_start_configure_alarms">Wecker stellen</string>
   <string name="title_activity_alarm_details">Wecker Stellen</string>
@@ -127,4 +137,39 @@
   <string name="alarm_smart_wakeup">Intelligenter Wecker </string>
   <string name="user_feedback_miband_set_alarms_failed">Beim Stellen der Wecker ist ein Fehler aufgetreten. Bitte erneut versuchen!</string>
   <string name="user_feedback_miband_set_alarms_ok">Wecker wurden auf dem Gerät gestellt!</string>
+  <string name="chart_no_data_synchronize">Keine Daten. Gerät synchronisieren?</string>
+  <string name="user_feedback_miband_activity_data_transfer">%1$s an Daten werden übertragen, beginnend mit %2$s</string>
+  <string name="miband_prefs_fitness_goal">Ziel Anzahl Schritte pro Tag</string>
+  <string name="dbaccess_error_executing">Fehler beim Ausführen von \'%1$s\'</string>
+  <string name="controlcenter_start_activitymonitor">Deine Aktivität (ALPHA)</string>
+  <string name="cannot_connect">Kann keine Verbindung herstellen: %1$s</string>
+  <string name="installer_activity_unable_to_find_handler">Kann keinen Handler für die Installation dieser Datei finden.</string>
+  <string name="pbw_install_handler_unable_to_install">Kann die gegebene Datei %1$s nicht installieren</string>
+  <string name="pbw_install_handler_hw_revision_mismatch">Kann die gegebene Firmware nicht installieren. Sie passt nicht zur Hardware Revision der Pebble.</string>
+  <string name="installer_activity_wait_while_determining_status">Bitte warten während der Installationsoption festgestellt wird...</string>
+  <string name="notif_battery_low_title">Gadget Akkustand niedrig!</string>
+  <string name="notif_battery_low_percent">%1$s Akku übrig: %2$s%%</string>
+  <string name="notif_battery_low_bigtext_last_charge_time">Zuletzt aufgeladen: %s\n</string>
+  <string name="notif_battery_low_bigtext_number_of_charges">Anzahl Ladungen: %s</string>
+  <string name="sleepchart_your_sleep">Dein Schlaf</string>
+  <string name="weekstepschart_steps_a_week">Schritte der Woche</string>
+  <string name="activity_sleepchart_activity_and_sleep">Deine Aktivität und Schlaf</string>
+  <string name="updating_firmware">Firmware wird aktualisiert...</string>
+  <string name="fwapp_install_device_not_ready">Datei kann nicht installiert werden, Gerät nicht bereit.</string>
+  <string name="miband_installhandler_miband_firmware">Mi Band Firmware %1$s</string>
+  <string name="miband_fwinstaller_compatible_version">Kompatible Version</string>
+  <string name="miband_fwinstaller_untested_version">Ungetestete Version!</string>
+  <string name="fwappinstaller_connection_state">Verbindung zum Gerät: %1$s</string>
+  <string name="pbw_installhandler_pebble_firmware">Pebble Firmware %1$s</string>
+  <string name="pbwinstallhandler_correct_hw_revision">Korrekte Hardware Revision</string>
+  <string name="pbwinstallhandler_incorrect_hw_revision">Falsche Hardware Revision!</string>
+  <string name="pbwinstallhandler_app_item">%1$s (%2$s)</string>
+  <string name="updatefirmwareoperation_updateproblem_do_not_reboot">Problem mit der Firmwareübertragung: NICHT das Mi Band neu starten!</string>
+  <string name="updatefirmwareoperation_metadata_updateproblem">Problem bei der Firmware Metadatenübertragung</string>
+  <string name="updatefirmwareoperation_update_complete">Firmware Installation erfolgreich beendet</string>
+  <string name="updatefirmwareoperation_update_complete_rebooting">Firmware Installation erfolgreich beendet, Gerät wird neu gestartet...</string>
+  <string name="updatefirmwareoperation_write_failed">Schreiben der Firmware fehlgeschlagen</string>
+  <string name="chart_steps">Schritte</string>
+  <string name="liveactivity_live_activity">Live Aktivität</string>
+  <string name="weeksteps_today_steps_description">Schritte heute, Ziel: %1$s</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0bfb925f4..d888ee7da 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -7,7 +7,7 @@
   <string name="action_quit">Salir</string>
   <string name="controlcenter_fetch_activity_data">Sincronizar</string>
   <string name="controlcenter_start_sleepmonitor">Monitor de sueño (ALPHA)</string>
-  <string name="controlcenter_find_device">Encontrar dispositivo...</string>
+  <string name="controlcenter_find_device">Encontrar dispositivo perdido...</string>
   <string name="controlcenter_take_screenshot">Capturar pantall</string>
   <string name="controlcenter_disconnect">Desconectar</string>
   <string name="title_activity_debug">Depuración</string>
@@ -16,6 +16,10 @@
   <string name="appmananger_app_delete">Borrar</string>
   <!--Strings related to FwAppInstaller-->
   <string name="title_activity_fw_app_insaller">Instalador de FW/App</string>
+  <string name="fw_upgrade_notice">Estás a punto de instalar el firmware %s en lugar del que está en tu MiBand.</string>
+  <string name="miband_firmware_known">Este firmware ha sido probado y se sabe que es compatible con Gadgetbridge.</string>
+  <string name="miband_firmware_unknown_warning">Este firmware no ha sido probado y puede no se compatible con Gadgetbridge.\n\nNO se recomienda la instalación en tu MiBand!.</string>
+  <string name="miband_firmware_suggest_whitelist">Si aún así quieres seguir y las cosas continúan funcionando correctamente después de esto, por favor indícales a los desarrolladores de Gadgetbridge que la versión del firmware: %s funciona bien</string>
   <!--Strings related to Settings-->
   <string name="title_activity_settings">Ajustes</string>
   <string name="pref_header_general">Ajustes generales</string>
@@ -69,7 +73,7 @@
   <string name="title_activity_discovery">Detección de dispositivos</string>
   <string name="discovery_stop_scanning">Finalizar el escaneo</string>
   <string name="discovery_start_scanning">Comenzar la detección</string>
-  <string name="action_discover">Detectar dispositivo</string>
+  <string name="action_discover">Conectar un nuevo dispositivo</string>
   <string name="device_with_rssi">%1$s (%2$s)</string>
   <string name="title_activity_android_pairing">Emparejar dispositivo</string>
   <string name="android_pairing_hint">Usar el menú de emparejar Bluetooth de Android para emparejar el dispositivo.</string>
@@ -140,9 +144,32 @@
   <string name="controlcenter_start_activitymonitor">Tu actividad (ALPHA)</string>
   <string name="cannot_connect">No se puede conectar: %1$s</string>
   <string name="installer_activity_unable_to_find_handler">No se ha podido encontrar un controlador para instalar este archivo.</string>
-  <string name="pbw_install_handler_unable_to_install">No se puede instalar el archivo: $1%s</string>
+  <string name="pbw_install_handler_unable_to_install">No se puede instalar el archivo: %1$s</string>
   <string name="pbw_install_handler_hw_revision_mismatch">No se puede instalar este firmware: no coincide con la revision hardware de tu Pebble.</string>
+  <string name="installer_activity_wait_while_determining_status">Por favor, espera mientras se determina el estado de la instalación...</string>
+  <string name="notif_battery_low_title">Batería baja del Gadget!</string>
+  <string name="notif_battery_low_percent">A %1$s le queda: %2$s%% batería</string>
+  <string name="notif_battery_low_bigtext_last_charge_time">Última carga: %s \n</string>
+  <string name="notif_battery_low_bigtext_number_of_charges">Número de cargas: %s</string>
   <string name="sleepchart_your_sleep">Tu sueño</string>
   <string name="weekstepschart_steps_a_week">Pasos por semana</string>
   <string name="activity_sleepchart_activity_and_sleep">Tu actividad y sueño</string>
+  <string name="updating_firmware">Actualizando firmware...</string>
+  <string name="fwapp_install_device_not_ready">El archivo no puede ser instalado, el dispositivo no está listo.</string>
+  <string name="miband_installhandler_miband_firmware">Firmware de Miband %1$s</string>
+  <string name="miband_fwinstaller_compatible_version">Versión compatible</string>
+  <string name="miband_fwinstaller_untested_version">Versión no probada!</string>
+  <string name="fwappinstaller_connection_state">Conexión al dispositivo: %1$s</string>
+  <string name="pbw_installhandler_pebble_firmware">Firmware de Pebble %1$s</string>
+  <string name="pbwinstallhandler_correct_hw_revision">Revisión de hardware correcta</string>
+  <string name="pbwinstallhandler_incorrect_hw_revision">La revisión de hardware no coincide!</string>
+  <string name="pbwinstallhandler_app_item">%1$s (%2$s)</string>
+  <string name="updatefirmwareoperation_updateproblem_do_not_reboot">Hubo un problema con la transferencia de firmware. NO REINICIES tu MiBand!</string>
+  <string name="updatefirmwareoperation_metadata_updateproblem">Hubo un problema con la transferencia de metadatos del firmware</string>
+  <string name="updatefirmwareoperation_update_complete">Instalación del firmware completa</string>
+  <string name="updatefirmwareoperation_update_complete_rebooting">Instalación del firmware completa, reiniciando dispositivo...</string>
+  <string name="updatefirmwareoperation_write_failed">Falló la escritura del firmware</string>
+  <string name="chart_steps">Pasos</string>
+  <string name="liveactivity_live_activity">Actividad</string>
+  <string name="weeksteps_today_steps_description">Pasos hoy, objetivo: %1$s</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a86ebf6b6..e971ee2f0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -7,7 +7,6 @@
   <string name="action_quit">Quitter</string>
   <string name="controlcenter_fetch_activity_data">Synchroniser</string>
   <string name="controlcenter_start_sleepmonitor">Moniteur de sommeil (ALPHA)</string>
-  <string name="controlcenter_find_device">Trouver l\'appareil</string>
   <string name="controlcenter_take_screenshot">Prendre une capture d\'écran</string>
   <string name="controlcenter_disconnect">Déconnexion</string>
   <string name="title_activity_debug">Débugger</string>
@@ -71,7 +70,6 @@
   <string name="title_activity_discovery">Décourir les appareils</string>
   <string name="discovery_stop_scanning">Arreter de scanner</string>
   <string name="discovery_start_scanning">Démarrer le scan</string>
-  <string name="action_discover">Découvrir l\'appareil</string>
   <string name="device_with_rssi">%1$s (%2$s)</string>
   <string name="title_activity_android_pairing">Coupler l\'appareil</string>
   <string name="android_pairing_hint">Utiliser l\'appareillage bluetouth d\'android pour coupler l\'appareil</string>
@@ -142,7 +140,7 @@
   <string name="controlcenter_start_activitymonitor">Votre activité (ALPHA)</string>
   <string name="cannot_connect">Impossible de se connecter: %1$s</string>
   <string name="installer_activity_unable_to_find_handler">Impossible de trouver un gestionnaire pour installer ce fichier.</string>
-  <string name="pbw_install_handler_unable_to_install">Impossible d\'installer le fichier donné: $1%s</string>
+  <string name="pbw_install_handler_unable_to_install">Impossible d\'installer le fichier donné: %1$s</string>
   <string name="pbw_install_handler_hw_revision_mismatch">Impossible d\'installer le firmware donnée: il ne correspond pas à la version du matériel de votre Pebble.</string>
   <string name="installer_activity_wait_while_determining_status">S\'il vous plait patientez pendant la détermination du status de l\'installation...</string>
   <string name="notif_battery_low_title">Gadget batterie Vide!</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6196ad5a8..b71c7f161 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -7,7 +7,6 @@
   <string name="action_quit">Esci</string>
   <string name="controlcenter_fetch_activity_data">Sincronizza</string>
   <string name="controlcenter_start_sleepmonitor">Monitoraggio del sonno (ALPHA)</string>
-  <string name="controlcenter_find_device">Trova dispositivo...</string>
   <string name="controlcenter_take_screenshot">Salva uno screenshot</string>
   <string name="controlcenter_disconnect">Disconetti</string>
   <string name="title_activity_debug">Debug</string>
@@ -65,7 +64,6 @@
   <string name="title_activity_discovery">Ricerca dispositivi</string>
   <string name="discovery_stop_scanning">Interrompi scansione</string>
   <string name="discovery_start_scanning">Inizia scansione</string>
-  <string name="action_discover">Cerca dispositivo</string>
   <string name="device_with_rssi">%1$s (%2$s)</string>
   <string name="title_activity_android_pairing">Accoppia dispositivo</string>
   <string name="android_pairing_hint">Utilizza la funzione del sistema operativo per accoppiare il dispositivo.</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index d797f5e72..3a5b0e913 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -6,7 +6,6 @@
   <string name="action_debug">디버그</string>
   <string name="action_quit">종료</string>
   <string name="controlcenter_start_sleepmonitor">수면 측정계 (초기 버전)</string>
-  <string name="controlcenter_find_device">기기 찾기</string>
   <string name="controlcenter_take_screenshot">스크린샷 찍기</string>
   <string name="controlcenter_disconnect">연결 해제</string>
   <string name="title_activity_debug">디버그</string>
@@ -64,7 +63,6 @@
   <string name="title_activity_discovery">기기 찾기</string>
   <string name="discovery_stop_scanning">스캔 중지</string>
   <string name="discovery_start_scanning">기기 탐색 시작</string>
-  <string name="action_discover">기기 발견</string>
   <string name="device_with_rssi">%1$s (%2$s)</string>
   <string name="title_activity_android_pairing">기기 페어링</string>
   <string name="android_pairing_hint">기기를 페어링하려면 안드로이드 블루투스 페어링 설정을 사용하세요</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7d7636808..7c0c35c35 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -6,7 +6,6 @@
   <string name="action_debug">Отладка</string>
   <string name="action_quit">Выход</string>
   <string name="controlcenter_start_sleepmonitor">Анализ сна (АЛЬФА)</string>
-  <string name="controlcenter_find_device">Найти устройство...</string>
   <string name="controlcenter_take_screenshot">Сделать снимок экрана</string>
   <string name="controlcenter_disconnect">Отключиться</string>
   <string name="title_activity_debug">Отладка</string>
@@ -64,7 +63,6 @@
   <string name="title_activity_discovery">Поиск устройства</string>
   <string name="discovery_stop_scanning">Остановить поиск</string>
   <string name="discovery_start_scanning">Умный поиск</string>
-  <string name="action_discover">Найти устройство</string>
   <string name="device_with_rssi">%1$s (%2$s)</string>
   <string name="title_activity_android_pairing">Сопряжение устройств</string>
   <string name="android_pairing_hint">Для сопряжения устройств используйте диалог Android.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a76853691..84da33892 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -159,7 +159,7 @@
     <string name="controlcenter_start_activitymonitor">Your Activity (ALPHA)</string>
     <string name="cannot_connect">Cannot connect: %1$s</string>
     <string name="installer_activity_unable_to_find_handler">Unable to find a handler to install this file.</string>
-    <string name="pbw_install_handler_unable_to_install">Unable to install the given file: $1%s</string>
+    <string name="pbw_install_handler_unable_to_install">Unable to install the given file: %1$s</string>
     <string name="pbw_install_handler_hw_revision_mismatch">Unable to install the given firmware: it doesn\'t match your Pebble\'s hardware revision.</string>
     <string name="installer_activity_wait_while_determining_status">Please wait while determining the installation status…</string>
     <string name="notif_battery_low_title">Gadget battery Low!</string>