diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 485104f9..fcac601c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,71 +1,76 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
-    <string name="action_settings">Einstellungen</string>
-    <string name="action_debug">Debug</string>
-    <string name="action_quit">Beenden</string>
-    <string name="action_refresh">Aktualisieren</string>
-
-    <string name="title_activity_debug">Debug</string>
-
-    <!-- Strings related to AppManager -->
-    <string name="title_activity_appmanager">App Manager</string>
-    <string name="appmananger_app_delete">Löschen</string>
-
-    <!-- Strings related to AppInstaller -->
-    <string name="title_activity_appinstaller">App Installer</string>
-
-    <!-- Strings related to Settings -->
-    <string name="title_activity_settings">Einstellungen</string>
-
-    <string name="pref_header_general">Allgemeine Einstellungen</string>
-    <string name="pref_title_general_autoconnectonbluetooth">Verbinde, wenn Bluetooth eingeschaltet wird</string>
-
-    <string name="pref_header_datetime">Datum und Zeit</string>
-    <string name="pref_title_datetime_syctimeonconnect">Synchronisiere die Uhrzeit nach dem Verbindungsaufbau</string>
-
-    <string name="pref_header_notifications">Benachrichtigungen</string>
-    <string name="pref_title_notifications_sms">SMS</string>
-    <string name="pref_title_notifications_k9mail">K9-Mail</string>
-    <string name="pref_title_notifications_pebblemsg">Pebble Benachrichtigungen</string>
-    <string name="pref_summary_notifications_pebblemsg">Unterstützung für Applikationen, die Benachrichtigungen per Intent an die Pebble senden. Das wird für Conversations benötigt.</string>
-    <string name="pref_title_notifications_generic">Andere Benachrichtigungen</string>
-    <string name="pref_title_whenscreenon">… auch wenn der Bildschirm an ist</string>
-    <string name="always">immer</string>
-    <string name="when_screen_off">wenn der Bilschirm aus ist</string>
-    <string name="never">nie</string>
-
-    <string name="pref_header_development">Entwickleroptionen</string>
-    <string name="pref_title_development_miaddr">Mi Band MAC-Adresse</string>
-
-    <string name="not_connected">nicht verbunden</string>
-    <string name="connecting">verbinde</string>
-    <string name="connected">verbunden</string>
-    <string name="unknown_state">unbekannter Zustand</string>
-    <string name="connectionstate_hw_fw">HW: %1$s FW: %2$s</string>
-    <string name="connectionstate_fw">FW: %1$s</string>
-    <string name="_unknown_">(unknown)</string>
-    <string name="test">Test</string>
-    <string name="test_notification">Test Benachrichtigung</string>
-    <string name="this_is_a_test_notification_from_gadgetbridge">Dies ist eine Test Benachrichtigung von Gadgetbridge</string>
-    <string name="bluetooth_is_not_supported_">Bluetooth wird nicht unterstützt.</string>
-    <string name="bluetooth_is_disabled_">Bluetooth ist abgeschaltet.</string>
-    <string name="tap_connected_device_for_app_mananger">berühre das verbundene Gerät, um den App Mananger zu starten</string>
-    <string name="tap_a_device_to_connect">berühre ein Gerät zum Verbinden</string>
-    <string name="cannot_connect_bt_address_invalid_">Verbindung kann nicht aufgebaut werden. BT Adresse ungültig?</string>
-    <string name="gadgetbridge_running">Gadgetbridge läuft</string>
-    <string name="battery_low">niedrig</string>
-    <string name="battery_medium">mittel</string>
-    <string name="battery_full">voll</string>
-    <string name="battery_not_charging">lädt nicht</string>
-    <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 VESUCHST EINE FIRMWARE ZU INSTALLIEREN, FAHRE AUF DEIN EIGENES RISIKO FORT.\n\n\n Diese 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>
-    <string name="appversion_by_creator">%1$s von %2$s</string>
+  <string name="app_name">Gadgetbridge</string>
+  <string name="title_activity_controlcenter">Gadgetbridge</string>
+  <string name="action_settings">Einstellungen</string>
+  <string name="action_debug">Debug</string>
+  <string name="action_quit">Beenden</string>
+  <string name="action_refresh">Aktualisieren</string>
+  <string name="title_activity_debug">Debug</string>
+  <!--Strings related to AppManager-->
+  <string name="title_activity_appmanager">App Manager</string>
+  <string name="appmananger_app_delete">Löschen</string>
+  <!--Strings related to AppInstaller-->
+  <string name="title_activity_appinstaller">App Installer</string>
+  <!--Strings related to Settings-->
+  <string name="title_activity_settings">Einstellungen</string>
+  <string name="pref_header_general">Allgemeine Einstellungen</string>
+  <string name="pref_title_general_autoconnectonbluetooth">Verbinde, wenn Bluetooth eingeschaltet wird</string>
+  <string name="pref_header_datetime">Datum und Zeit</string>
+  <string name="pref_title_datetime_syctimeonconnect">Synchronisiere die Uhrzeit nach dem Verbindungsaufbau</string>
+  <string name="pref_header_notifications">Benachrichtigungen</string>
+  <string name="pref_title_notifications_sms">SMS</string>
+  <string name="pref_title_notifications_k9mail">K9-Mail</string>
+  <string name="pref_title_notifications_pebblemsg">Pebble Nachrichten</string>
+  <string name="pref_summary_notifications_pebblemsg">Unterstützung für Apps, die per Intent Nachrichten an die Pebble senden. Wird für die Unterstützung von Conversation benötigt.</string>
+  <string name="pref_title_notifications_generic">Andere Benachrichtigungen</string>
+  <string name="pref_title_whenscreenon">… auch wenn der Bilschrim an ist</string>
+  <string name="always">immer</string>
+  <string name="when_screen_off">wenn der Bildschirm aus ist</string>
+  <string name="never">niemals</string>
+  <string name="pref_header_development">Entwickleroptionen</string>
+  <string name="pref_title_development_miaddr">Mi Band MAC Adresse</string>
+  <string name="not_connected">nicht verbunden</string>
+  <string name="connecting">verbinde</string>
+  <string name="connected">verbunden</string>
+  <string name="unknown_state">unbekannter Zustand</string>
+  <string name="connectionstate_hw_fw">HW: %1$s FW: %2$s</string>
+  <string name="connectionstate_fw">FW: %1$s</string>
+  <string name="_unknown_">(unknown)</string>
+  <string name="test">Test</string>
+  <string name="test_notification">Test Benachrichtigung</string>
+  <string name="this_is_a_test_notification_from_gadgetbridge">Dies ist eine Test Benachrichtigung von Gadgetbridge</string>
+  <string name="bluetooth_is_not_supported_">Bluetooth wird nicht unterstützt.</string>
+  <string name="bluetooth_is_disabled_">Bluetooth ist abgeschaltet.</string>
+  <string name="tap_connected_device_for_app_mananger">berühre das verbundene Gerät, um den App Mananger zu starten</string>
+  <string name="tap_a_device_to_connect">berühre ein Gerät zum verbinden</string>
+  <string name="cannot_connect_bt_address_invalid_">Verbindung kann nicht aufgebaut werden. BT Adresse ungültig?</string>
+  <string name="gadgetbridge_running">Gadgetbridge läuft</string>
+  <string name="battery_low">niedrig</string>
+  <string name="battery_medium">mittel</string>
+  <string name="battery_full">voll</string>
+  <string name="battery_not_charging">lädt nicht</string>
+  <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 VESUCHST EINE FIRMWARE ZU INSALLIEREN, FAHRE AUF DEIN EIGENES RISIKO FORT.\n\n\n Diese Firmware is 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>
+  <string name="appversion_by_creator">%1$s von %2$s</string>
+  <string name="title_activity_discovery">Gerätesuche</string>
+  <string name="discovery_stop_scanning">Suche beenden</string>
+  <string name="discovery_start_scanning">Suche starten</string>
+  <string name="action_discover">Gerät suchen</string>
+  <string name="device_with_rssi">%1$s (%2$s)</string>
+  <string name="title_activity_android_pairing">Gerät paaren</string>
+  <string name="android_pairing_hint">Verwende den Android Bluetooth Paaren-Dialog um Dein Gerät zu paaren.</string>
+  <string name="title_activity_mi_band_pairing">Paare Dein Mi Band</string>
+  <string name="miband_pairing">Paarung mit %s…</string>
+  <string name="message_cannot_pair_no_mac">Kein MAC Adresse bekommen, kann nicht paaren.</string>
+  <string name="preferences_category_device_specific_settings">Gerätespezifische Einstellungen</string>
+  <string name="preferences_miband_settings">Mi Band Einstellungen</string>
+  <string name="male">männlich</string>
+  <string name="female">weiblich</string>
+  <string name="other">anderes</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 906d5240..7ce9d006 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,66 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
-    <string name="action_settings">Ajustes</string>
-    <string name="action_debug">Depurar</string>
-    <string name="action_quit">Salir</string>
-    <string name="action_refresh">Actulizar</string>
-
-    <string name="title_activity_debug">Depurar</string>
-
-    <!-- Strings related to AppManager -->
-    <string name="title_activity_appmanager">Gestor de App</string>
-    <string name="appmananger_app_delete">Borrar</string>
-
-    <!-- Strings related to AppInstaller -->
-    <string name="title_activity_appinstaller">Instalador de App</string>
-
-    <!-- Strings related to Settings -->
-    <string name="title_activity_settings">Ajustes</string>
-
-    <string name="pref_header_general">Ajustes generales</string>
-    <string name="pref_title_general_autoconnectonbluetooth">Conectar con el dispositivo cuando el bluetooth se encienda</string>
-
-    <string name="pref_header_datetime">Fecha y hora</string>
-    <string name="pref_title_datetime_syctimeonconnect">Sincronizar la hora al conectar</string>
-
-    <string name="pref_header_notifications">Notificaciones</string>
-    <string name="pref_title_notifications_sms">SMS</string>
-    <string name="pref_title_notifications_k9mail">K9-Mail</string>
-    <string name="pref_title_notifications_generic">Soporte para notificaciones genéricas</string>
-    <string name="pref_title_whenscreenon">… también cuando la pantalla está encendida</string>
-
-    <string name="pref_header_development">Opciones de desarrollador</string>
-    <string name="pref_title_development_miaddr">Dirección de Miband</string>
-
-    <string name="not_connected">no conectado</string>
-    <string name="connecting">conectando</string>
-    <string name="connected">conectado</string>
-    <string name="unknown_state">estado desconocido</string>
-    <string name="connectionstate_hw_fw">HW: %1$s FW: %2$s</string>
-    <string name="connectionstate_fw">FW: %1$s</string>
-    <string name="_unknown_">(desconocido)</string>
-    <string name="test">Probar</string>
-    <string name="test_notification">Probar notificación</string>
-    <string name="this_is_a_test_notification_from_gadgetbridge">Esta es una notificación de prueba desde Gadgetbridge</string>
-    <string name="bluetooth_is_not_supported_">Bluetooth no está soportado.</string>
-    <string name="bluetooth_is_disabled_">Bluetooth está desactivado.</string>
-    <string name="tap_connected_device_for_app_mananger">pulsa el dispositivo conectado para el Gestor de App</string>
-    <string name="tap_a_device_to_connect">pulsa un dispositivo para conectar</string>
-    <string name="cannot_connect_bt_address_invalid_">No se puede conectar. ¿Dirección BT incorrecta?</string>
-    <string name="gadgetbridge_running">Gadgetbridge funcionando</string>
-    <string name="battery_low">baja</string>
-    <string name="battery_medium">media</string>
-    <string name="battery_full">llena</string>
-    <string name="battery_not_charging">no cargando</string>
-    <string name="installing_binary_d_d">instalando binario %1$d/%2$d</string>
-    <string name="installation_failed_">¡la instalación ha fallado!</string>
-    <string name="installation_successful">instalación satisfactoria</string>
-    <string name="firmware_install_warning">ESTÁS INTENTANDO INSTALAR UN FIRMWARE, CONTINÚA BAJO TU RESPONSABILIDAD.\n\n\n Este firmware es para la revisión HW: %s</string>
-    <string name="app_install_info">Estás a punto de instalar la siguiente app:\n\n\n%1$s Versión %2$s de %3$s\n</string>
-    <string name="n_a">N/A</string>
-    <string name="initialized">iniciado</string>
-    <string name="appversion_by_creator">%1$s de %2$s</string>
+  <string name="app_name">Gadgetbridge</string>
+  <string name="title_activity_controlcenter">Gadgetbridge</string>
+  <string name="action_settings">Ajustes</string>
+  <string name="action_debug">Depurar</string>
+  <string name="action_quit">Salir</string>
+  <string name="action_refresh">Actulizar</string>
+  <string name="title_activity_debug">Depurar</string>
+  <!--Strings related to AppManager-->
+  <string name="title_activity_appmanager">Gestor de App</string>
+  <string name="appmananger_app_delete">Borrar</string>
+  <!--Strings related to AppInstaller-->
+  <string name="title_activity_appinstaller">Instalador de App</string>
+  <!--Strings related to Settings-->
+  <string name="title_activity_settings">Ajustes</string>
+  <string name="pref_header_general">Ajustes generales</string>
+  <string name="pref_title_general_autoconnectonbluetooth">Conectar con el dispositivo cuando el bluetooth se encienda</string>
+  <string name="pref_header_datetime">Fecha y hora</string>
+  <string name="pref_title_datetime_syctimeonconnect">Sincronizar la hora al conectar</string>
+  <string name="pref_header_notifications">Notificaciones</string>
+  <string name="pref_title_notifications_generic">Soporte para notificaciones genéricas</string>
+  <string name="pref_title_whenscreenon">… también cuando la pantalla está encendida</string>
+  <string name="pref_header_development">Opciones de desarrollador</string>
+  <string name="not_connected">no conectado</string>
+  <string name="connecting">conectando</string>
+  <string name="connected">conectado</string>
+  <string name="unknown_state">estado desconocido</string>
+  <string name="_unknown_">(desconocido)</string>
+  <string name="test">Probar</string>
+  <string name="test_notification">Probar notificación</string>
+  <string name="this_is_a_test_notification_from_gadgetbridge">Esta es una notificación de prueba desde Gadgetbridge</string>
+  <string name="bluetooth_is_not_supported_">Bluetooth no está soportado.</string>
+  <string name="bluetooth_is_disabled_">Bluetooth está desactivado.</string>
+  <string name="tap_connected_device_for_app_mananger">pulsa el dispositivo conectado para el Gestor de App</string>
+  <string name="tap_a_device_to_connect">pulsa un dispositivo para conectar</string>
+  <string name="cannot_connect_bt_address_invalid_">No se puede conectar. ¿Dirección BT incorrecta?</string>
+  <string name="gadgetbridge_running">Gadgetbridge funcionando</string>
+  <string name="battery_low">baja</string>
+  <string name="battery_medium">media</string>
+  <string name="battery_full">llena</string>
+  <string name="battery_not_charging">no cargando</string>
+  <string name="installing_binary_d_d">instalando binario %1$d/%2$d</string>
+  <string name="installation_failed_">¡la instalación ha fallado!</string>
+  <string name="installation_successful">instalación satisfactoria</string>
+  <string name="firmware_install_warning">ESTÁS INTENTANDO INSTALAR UN FIRMWARE, CONTINÚA BAJO TU RESPONSABILIDAD.\n\n\n Este firmware es para la revisión HW: %s</string>
+  <string name="app_install_info">Estás a punto de instalar la siguiente app:\n\n\n%1$s Versión %2$s de %3$s\n</string>
+  <string name="n_a">N/A</string>
+  <string name="initialized">iniciado</string>
+  <string name="appversion_by_creator">%1$s de %2$s</string>
 </resources>