diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4656ac9f6..3bfaf57c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,17 @@
 ### Changelog
 
-#### Version 0.21.0 (next)
+#### Version 0.21.0
 * Initial NO.1 F1 support
+* Initial Teclast H30 support
 * Amazfit Bip: Display GPS firmware version
 * Amazfit Bip: Fix E-Mail notifications
 * Amazfit Bip: Fix call notification with unknown caller
+* Amazfit Bip: Fix crash when weather is updated and device reconnecting
+* Mi2/Bip: Fix crash when synchronizing calendar to alarms
 * Pebble: Fix crash when takeing screenshots on Android 8.0 (Oreo)
 * Pebble: Support some google app icons
 * Pebble: try to support spotify
+* Mi Band 2: Support configurable button actions
 * Fix language being reset to system default
 
 #### Version 0.20.2
diff --git a/README.md b/README.md
index a4fbd80ac..71b961fe0 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,8 @@ vendor's servers.
 * Mi Band 2 [Wiki section about mi band](https://github.com/Freeyourgadget/Gadgetbridge/wiki/Mi-Band), some parts apply to mi band 2 as well
 * Amazfit Bip (WIP) [Wiki section about the Amazfit Bip](https://github.com/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Bip)
 * HPlus Devices (e.g. ZeBand) [Wiki section about this device](https://github.com/Freeyourgadget/Gadgetbridge/wiki/HPlus)
+* Teclast H30 (WIP)
+* NO.1 F1 (WIP)
 * Liveview
 * Vibratissimo (experimental)
 
@@ -143,6 +145,8 @@ For more information read [this wiki article](https://github.com/Freeyourgadget/
 ### Additional device support
 
 * João Paulo Barraca (HPlus)
+* Vitaly Svyastyn (NO.1 F1)
+* Sami Alaoui (Teclast H30)
 
 ## Contribute
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
index 7028be7ce..bc0078d8a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
@@ -32,6 +32,11 @@ public final class MiBandConst {
     public static final String PREF_MIBAND_ALARMS = "mi_alarms";
     public static final String PREF_MIBAND_DONT_ACK_TRANSFER = "mi_dont_ack_transfer";
     public static final String PREF_MIBAND_RESERVE_ALARM_FOR_CALENDAR = "mi_reserve_alarm_calendar";
+    public static final String PREF_MIBAND_BUTTON_ACTION_ENABLE = "mi2_enable_button_action";
+    public static final String PREF_MIBAND_BUTTON_ACTION_VIBRATE = "mi2_button_action_vibrate";
+    public static final String PREF_MIBAND_BUTTON_PRESS_COUNT = "mi_button_press_count";
+    public static final String PREF_MIBAND_BUTTON_PRESS_MAX_DELAY = "mi_button_press_count_max_delay";
+    public static final String PREF_MIBAND_BUTTON_PRESS_BROADCAST = "mi_button_press_broadcast";
     public static final String PREF_MIBAND_USE_HR_FOR_SLEEP_DETECTION = "mi_hr_sleep_detection";
 	public static final String PREF_MIBAND_DEVICE_TIME_OFFSET_HOURS = "mi_device_time_offset_hours";
 	public static final String PREF_MI2_DATEFORMAT = "mi2_dateformat";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java
index c6fa3bc49..d1ac3c331 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java
@@ -24,7 +24,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.net.Uri;
+import android.preference.PreferenceManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.format.DateFormat;
 import android.widget.Toast;
@@ -123,6 +125,10 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ge
 
 public class MiBand2Support extends AbstractBTLEDeviceSupport {
 
+    // We introduce key press counter for notification purposes
+    private static int currentButtonPressCount = 0;
+    private static long currentButtonPressTime = 0;
+
     private static final Logger LOG = LoggerFactory.getLogger(MiBand2Support.class);
     private final DeviceInfoProfile<MiBand2Support> deviceInfoProfile;
     private final HeartRateProfile<MiBand2Support> heartRateProfile;
@@ -809,8 +815,48 @@ public class MiBand2Support extends AbstractBTLEDeviceSupport {
     }
 
     public void handleButtonPressed(byte[] value) {
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this.getContext());
+
         LOG.info("Button pressed");
         logMessageContent(value);
+
+        Prefs prefs = GBApplication.getPrefs();
+
+        // If disabled we return from function immediately
+        if (!prefs.getBoolean(MiBandConst.PREF_MIBAND_BUTTON_ACTION_ENABLE, false)) {
+            return;
+        }
+
+        int buttonPressMaxDelay = prefs.getInt(MiBandConst.PREF_MIBAND_BUTTON_PRESS_MAX_DELAY, 2000);
+        int requiredButtonPressCount = prefs.getInt(MiBandConst.PREF_MIBAND_BUTTON_PRESS_COUNT, 0);
+
+        String requiredButtonPressMessage = prefs.getString(MiBandConst.PREF_MIBAND_BUTTON_PRESS_BROADCAST,
+                this.getContext().getString(R.string.mi2_prefs_button_press_broadcast_default_value));
+
+        if (requiredButtonPressCount > 0) {
+            long timeSinceLastPress = System.currentTimeMillis() - currentButtonPressTime;
+
+            if ((currentButtonPressTime == 0) || (timeSinceLastPress < buttonPressMaxDelay)) {
+                currentButtonPressCount++;
+            }
+            else {
+                currentButtonPressCount = 0;
+            }
+
+            currentButtonPressTime = System.currentTimeMillis();
+            if (currentButtonPressCount >= requiredButtonPressCount) {
+                Intent in = new Intent();
+                in.setAction(requiredButtonPressMessage);
+                this.getContext().getApplicationContext().sendBroadcast(in);
+
+                currentButtonPressCount = 0;
+                currentButtonPressTime = System.currentTimeMillis();
+
+                if (prefs.getBoolean(MiBandConst.PREF_MIBAND_BUTTON_ACTION_VIBRATE, false)) {
+                    performPreferredNotification(null, null, null, MiBand2Service.ALERT_LEVEL_VIBRATE_ONLY, null);
+                }
+            }
+        }
     }
 
     private void handleUnknownCharacteristic(byte[] value) {
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index fc3d61ed1..4d92f1c78 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -47,7 +47,7 @@
   <string name="fw_multi_upgrade_notice">Instaluje firmwary %1$s a %2$s do Mi Band místo stávajícího.</string>
   <string name="miband_firmware_known">Tento firmware byl testován a je kompatibilní s Gadgetbridge.</string>
   <string name="miband_firmware_unknown_warning">Tento firmware nebyl testován a nemusí být kompatibilní s Gadgetbridge.\n\nNedoporučujeme jej nahrávat do Mi Band!</string>
-  <string name="miband_firmware_suggest_whitelist">Pokud budete prokračovat a vše bude fungovat běžně i potom, upozorněte vývojáře Gadgetbridge, aby označili tento firmware: %s jako vyzkoušený.</string>
+  <string name="miband_firmware_suggest_whitelist">Pokud budete prokračovat a vše bude fungovat běžně i potom, upozorněte vývojáře Gadgetbridge, aby označili tento firmware: %s jako vyzkoušený</string>
   <!--Strings related to Settings-->
   <string name="title_activity_settings">Nastavení</string>
   <string name="pref_header_general">Základní nastavení</string>
@@ -142,6 +142,8 @@
   <string name="connecting">Připojování</string>
   <string name="connected">Připojeno</string>
   <string name="unknown_state">Neznámý stav</string>
+  <string name="connectionstate_hw_fw">HW: %1$s FW: %2$s</string>
+  <string name="connectionstate_fw">Verze FW: %1$s</string>
   <string name="_unknown_">(neznámé)</string>
   <string name="test">Test</string>
   <string name="test_notification">Test notifikací</string>
@@ -405,4 +407,25 @@
     <string name="discovery_pair_question">Vyberte Párování pro spárování s vaším zaříením. Pokud to selže, tak to zkuste bez párování.</string>
     <string name="discovery_yes_pair">Párování</string>
     <string name="discovery_dont_pair">Nepárovat</string>
+    <string name="mi2_prefs_button_actions">Akce tlačítka</string>
+    <string name="mi2_prefs_button_actions_summary">Definujte akce při stisku tlačítka na Mi Band 2</string>
+    <string name="mi2_prefs_button_press_count">Počet stisků tlačítka</string>
+    <string name="mi2_prefs_button_press_count_summary">Definujte počet stisknutí tlačítka k vyslání broadcast zprávy</string>
+    <string name="mi2_prefs_button_press_broadcast">Zpráva k vyslání (broadcast)</string>
+    <string name="mi2_prefs_button_press_broadcast_summary">Zpráva k vyslání do systému pokud počtu stisknutí tlačítka (viz výše)</string>
+    <string name="mi2_prefs_button_press_broadcast_default_value">nodomain.freeyourgadget.gadgetbridge.mibandButtonPressed</string>
+    <string name="mi2_prefs_button_action">Povolit akci tlačítka</string>
+    <string name="mi2_prefs_button_action_summary">Povolit akci tlačítka na definovaný počet stisknutí</string>
+    <string name="mi2_prefs_button_action_vibrate">Povolit vibrace náramku</string>
+    <string name="mi2_prefs_button_action_vibrate_summary">Povolit vibrace náramku při vyslání broadcast zprávy</string>
+    <string name="mi2_prefs_button_press_count_max_delay">Maximální prodleva mezi stisky</string>
+    <string name="mi2_prefs_button_press_count_max_delay_summary">Maximální prodleva mezi stisky tlačítka v milisekundách</string>
+<string name="fw_upgrade_notice_amazfitbip">Chystáte se nainstalovat firmware %s namísto toho, který je aktuálně na vašem Amazfit Bipu.
+\n
+\nUjistěte se, že jste nainstalovali firmware .gps, pak soubor .res a nakonec soubor .fw. Hodiny se po instalaci souboru .fw restartují.
+\n
+\nPoznámka: Nemusíte instalovat soubory .res a .gps, pokud jsou tyto soubory přesně stejné jako ty, které byly dříve nainstalovány.
+\n
+\nEXPERIMENTÁLNÍ PROCES, DĚLÁTE NA VAŠE VLASTNÍ RIZIKO</string>
+    <string name="amazfitbip_firmware">"Firmware Amazfit Bipu  %1$s"</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 085d1f599..e4eafd3b6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -149,6 +149,8 @@
   <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">Firmware-Version %1$s</string>
   <string name="_unknown_">(unbekannt)</string>
   <string name="test">Test</string>
   <string name="test_notification">Test Benachrichtigung</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1b61547aa..ae1a4b1ee 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -8,7 +8,7 @@
   <string name="action_donate">Hacer donación</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 perdido...</string>
+  <string name="controlcenter_find_device">Encontrar dispositivo perdido</string>
   <string name="controlcenter_take_screenshot">Capturar pantalla</string>
   <string name="controlcenter_disconnect">Desconectar</string>
   <string name="controlcenter_delete_device">Borrar Dispositivo</string>
@@ -48,8 +48,10 @@
   <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="fw_multi_upgrade_notice">Estás a punto de instalar los firmwares %1$s y %2$s en lugar de los que están 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 que no sea compatible con Gadgetbridge.\n\n¡NO se recomienda la instalación en tu MiBand!.</string>
-  <string name="miband_firmware_suggest_whitelist">Si aun así quieres seguir y las cosas continúan funcionando correctamente, por favor indícales a los desarrolladores de Gadgetbridge que esta versión del firmware funciona bien: %s .</string>
+  <string name="miband_firmware_unknown_warning">Este firmware no ha sido probado y puede que no sea compatible con Gadgetbridge.
+\n
+\n¡NO se recomienda la instalación en tu MiBand!</string>
+  <string name="miband_firmware_suggest_whitelist">Si aun así quieres seguir y las cosas continúan funcionando correctamente, por favor indícales a los desarrolladores de Gadgetbridge que esta versión del firmware funciona bien: %s</string>
   <!--Strings related to Settings-->
   <string name="title_activity_settings">Ajustes</string>
   <string name="pref_header_general">Ajustes generales</string>
@@ -73,16 +75,16 @@
   <string name="pref_title_notifications_call">Llamadas telefónicas</string>
   <string name="pref_title_notifications_sms">SMS</string>
   <string name="pref_title_notifications_pebblemsg">Mensajes de Pebble</string>
-  <string name="pref_summary_notifications_pebblemsg">Soporte para aplicaciones que envían notificaciones a Pebble a través de PebbleKit.</string>
+  <string name="pref_summary_notifications_pebblemsg">Soporte para aplicaciones que envían notificaciones a Pebble a través de PebbleKit</string>
   <string name="pref_title_notifications_generic">Soporte para notificaciones genéricas</string>
-  <string name="pref_title_whenscreenon">… también con pantalla encendida</string>
+  <string name="pref_title_whenscreenon">…también con pantalla encendida</string>
   <string name="pref_title_notification_filter">No Molestar</string>
   <string name="pref_summary_notification_filter">Dejar de enviar notificaciones no deseadas basándose en el modo No Molestar</string>
   <string name="pref_title_transliteration">Transcripción</string>
   <string name="pref_summary_transliteration">Utilizar en caso de que tu dispositivo no soporte la fuente de tu idioma</string>
-  <string name="always">siempre</string>
-  <string name="when_screen_off">cuando la pantalla está apagada</string>
-  <string name="never">nunca</string>
+  <string name="always">Siempre</string>
+  <string name="when_screen_off">Cuando la pantalla está apagada</string>
+  <string name="never">Nunca</string>
   <string name="pref_header_privacy">Privacidad</string>
   <string name="pref_title_call_privacy_mode">Modo de privacidad de llamada</string>
   <string name="pref_call_privacy_mode_off">Mostrar nombre y número</string>
@@ -110,7 +112,7 @@
   <string name="pref_summary_enable_pebblekit">Permitir el soporte experimental para aplicaciones Android que usan PebbleKit</string>
   <string name="pref_header_pebble_timeline">Timeline Pebble</string>
   <string name="pref_title_sunrise_sunset">Salida y puesta de Sol</string>
-  <string name="pref_summary_sunrise_sunset">Enviar las horas de salida y puesta de Sol basándose en la localización a la línea cronológica del Pebble</string>
+  <string name="pref_summary_sunrise_sunset">Enviar las horas de salida y puesta de Sol basándose en la localización a la timeline del Pebble</string>
   <string name="pref_title_enable_calendar_sync">Sincronizar calendario</string>
   <string name="pref_summary_enable_calendar_sync">Enviar los eventos del calendario a la timeline</string>
   <string name="pref_title_autoremove_notifications">Eliminar automáticamente las notificaciones rechazadas</string>
@@ -120,7 +122,7 @@
   <string name="pref_pebble_privacy_mode_content">Desplaza la notificación fuera de la pantalla</string>
   <string name="pref_pebble_privacy_mode_complete">Muestra solo el icono de notificación</string>
   <string name="pref_header_location">Localización</string>
-  <string name="pref_title_location_aquire">Buscar localización</string>
+  <string name="pref_title_location_aquire">Obtener ubicación</string>
   <string name="pref_title_location_latitude">Latitud</string>
   <string name="pref_title_location_longitude">Longitud</string>
   <string name="pref_title_location_keep_uptodate">Mantener la localización actualizada</string>
@@ -132,10 +134,10 @@
   <string name="pref_title_pebble_forceuntested">Habilitar características no probadas</string>
   <string name="pref_summary_pebble_forceuntested">Habilita características que no han sido probadas. ¡HABILÍTALO SOLO SI SABES LO QUE ESTÁS HACIENDO!</string>
   <string name="pref_title_pebble_forcele">Preferir siempre BLE</string>
-  <string name="pref_summary_pebble_forcele">Usar el soporte experimental de Pebble LE para todos los Pebble en lugar del bluetooth clásico. Requiere vincular \"Pebble LE\" si un Pebble no-LE ha sido vinculado antes.</string>
+  <string name="pref_summary_pebble_forcele">Usar el soporte experimental de Pebble LE para todos los Pebble en lugar del Bluetooth clásico. Requiere vincular \"Pebble LE\" si un Pebble no-LE ha sido vinculado antes.</string>
   <string name="pref_title_pebble_mtu_limit">Pebble 2/LE límite de GATT MTU</string>
   <string name="pref_summary_pebble_mtu_limit">Si tu Pebble 2/Pebble LE no funciona correctamente, prueba esta opción para limitar el MTU (rango válido 20–512)</string>
-  <string name="pref_title_pebble_enable_applogs">Activar crear registros de la App del Reloj</string>
+  <string name="pref_title_pebble_enable_applogs">Activar los logs de las aplicaciones del reloj</string>
   <string name="pref_summary_pebble_enable_applogs">Producirá registros de las apps del reloj que Gadgetbridge guardará (necesita reconexión)</string>
   <string name="pref_title_pebble_always_ack_pebblekit">ACK antes de tiempo de PebbleKit</string>
   <string name="pref_summary_pebble_always_ack_pebblekit">Permitirá a los mensajes enviados a apps de terceros ser reconocidos siempre e inmediatamente</string>
@@ -145,25 +147,25 @@
   <string name="pref_title_screentime">Tiempo de pantalla encendida</string>
   <string name="prefs_title_all_day_heart_rate">Medición del ritmo cardíaco todo el día</string>
   <string name="preferences_hplus_settings">Ajustes de HPlus/Makibes</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="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">Notificación de prueba desde Gadgetbridge</string>
   <string name="bluetooth_is_not_supported_">El Bluetooth no está soportado.</string>
   <string name="bluetooth_is_disabled_">El Bluetooth está desactivado.</string>
-  <string name="tap_connected_device_for_app_mananger">Pulsa el dispositivo conectado para Gestión de App</string>
-  <string name="tap_connected_device_for_activity">Pulsa el dispositivo conectado para Actividad</string>
-  <string name="tap_connected_device_for_vibration">Pulsa el dispositivo conectado para Vibración</string>
+  <string name="tap_connected_device_for_app_mananger">Pulsa el dispositivo conectado para configurar las aplicaciones</string>
+  <string name="tap_connected_device_for_activity">Pulsa el dispositivo conectado para actividad</string>
+  <string name="tap_connected_device_for_vibration">Pulsa el dispositivo conectado para vibración</string>
   <string name="tap_a_device_to_connect">Pulsar un dispositivo para conectarlo</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="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 correcta</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 correcta</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 de 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>
@@ -171,13 +173,13 @@
   <string name="appversion_by_creator">%1$s de %2$s</string>
   <string name="title_activity_discovery">Detección de dispositivos</string>
   <string name="discovery_stop_scanning">Detener el escaneo</string>
-  <string name="discovery_start_scanning">Comenzar la detección</string>
+  <string name="discovery_start_scanning">Empezar la detección</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 emparejamiento Bluetooth de Android para vincular el dispositivo.</string>
   <string name="title_activity_mi_band_pairing">Emparejar tu MiBand</string>
-  <string name="pairing">Emparejando con %s...</string>
+  <string name="pairing">Emparejando con %s…</string>
   <string name="pairing_creating_bond_with">Creando emparejamiento con %1$s (%2$s)</string>
   <string name="pairing_unable_to_pair_with">No se ha podido emparejar con %1$s (%2$s)</string>
   <string name="pairing_in_progress">Emparejamiento en curso: %1$s (%2$s)</string>
@@ -188,8 +190,8 @@
   <string name="male">Hombre</string>
   <string name="female">Mujer</string>
   <string name="other">Otro</string>
-  <string name="left">izquierda</string>
-  <string name="right">derecha</string>
+  <string name="left">Izquierda</string>
+  <string name="right">Derecha</string>
   <string name="miband_pairing_using_dummy_userdata">No se han proporcionado datos de usuario válidos, se usarán datos de usuario por defecto.</string>
   <string name="miband_pairing_tap_hint">Cuando tu MiBand vibre y parpadee, púlsala repetidas veces.</string>
   <string name="appinstaller_install">Instalar</string>
@@ -199,8 +201,8 @@
   <string name="miband_prefs_alias">Nombre/Apodo</string>
   <string name="pref_header_vibration_count">Número de vibraciones</string>
   <string name="title_activity_sleepmonitor">Monitor de sueño</string>
-  <string name="pref_write_logfiles">Escribir archivos de registro</string>
-  <string name="initializing">iniciando</string>
+  <string name="pref_write_logfiles">Escribir registros</string>
+  <string name="initializing">Iniciando</string>
   <string name="busy_task_fetch_activity_data">Recuperando datos de actividad</string>
   <string name="sleep_activity_date_range">Desde %1$s a %2$s</string>
   <string name="miband_prefs_wearside">¿En derecha o en izquierda?</string>
@@ -217,11 +219,11 @@
   <string name="pref_screen_notification_profile_sms">Notificación de SMS</string>
   <string name="pref_header_vibration_settings">Ajustes de vibración</string>
   <string name="pref_screen_notification_profile_generic">Notificación genérica</string>
-  <string name="pref_screen_notification_profile_email">Notificación de email.</string>
+  <string name="pref_screen_notification_profile_email">Notificación de correo electrónico</string>
   <string name="pref_screen_notification_profile_incoming_call">Notificación de llamada entrante</string>
   <string name="pref_screen_notification_profile_generic_chat">Chat</string>
   <string name="pref_screen_notification_profile_generic_navigation">Navegación</string>
-  <string name="pref_screen_notification_profile_generic_social">Red Social</string>
+  <string name="pref_screen_notification_profile_generic_social">Red social</string>
   <string name="stats_title">Zonas de velocidad</string>
   <string name="stats_x_axis_label">Total de minutos</string>
   <string name="stats_y_axis_label">Pasos por minuto</string>
@@ -250,7 +252,7 @@
   <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 ha podido instalar el fichero: %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="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>
@@ -260,7 +262,7 @@
   <string name="weeksleepchart_today_sleep_description">Sueño hoy, objetivo: %1$s</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="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">Miband firmware %1$s</string>
   <string name="miband_fwinstaller_compatible_version">Versión compatible</string>
@@ -273,7 +275,7 @@
   <string name="updatefirmwareoperation_updateproblem_do_not_reboot">Hubo un problema con la transferencia de firmware. ¡NO REINICIES tu Mi Band!</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_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="calories">Calorías</string>
@@ -281,12 +283,12 @@
   <string name="clock">Reloj</string>
   <string name="heart_rate">Ritmo cardíaco</string>
   <string name="battery">Batería</string>
-  <string name="liveactivity_live_activity">Actividad</string>
+  <string name="liveactivity_live_activity">Actividad en directo</string>
   <string name="weeksteps_today_steps_description">Pasos hoy, objetivo: %1$s</string>
   <string name="pref_title_dont_ack_transfer">No confirmar transferencia</string>
   <string name="pref_summary_dont_ack_transfers">Si los datos no son marcados como descargados, no serán borrados de tu Mi Band. Útil si Gadgetbridge se usa conjuntamente con otras apps.</string>
   <string name="pref_summary_keep_data_on_device">Mantendrá los datos de actividad en la Mi Band incluso después de la sincronización. Útil si GB se usa junto con otras apps.</string>
-  <string name="pref_title_low_latency_fw_update">Usa el modo de baja latencia para las actualizaciones de FW</string>
+  <string name="pref_title_low_latency_fw_update">Usa el modo de baja latencia para las actualizaciones de firmware</string>
   <string name="pref_summary_low_latency_fw_update">Esto podría ayudar en dispositivos donde las actualizaciones de firmware fallan</string>
   <string name="live_activity_steps_history">Historial de pasos</string>
   <string name="live_activity_current_steps_per_minute">Pasos/min actuales</string>
@@ -303,7 +305,7 @@
   <string name="miband_fwinstaller_incompatible_version">Firmware incompatible</string>
   <string name="fwinstaller_firmware_not_compatible_to_device">Este firmware no es compatible con tu dispositivo</string>
   <string name="miband_prefs_reserve_alarm_calendar">Reserva de alarmas para próximos eventos</string>
-  <string name="miband_prefs_hr_sleep_detection">Usar sensor de pulsaciones para mejorar la detección del sueño</string>
+  <string name="miband_prefs_hr_sleep_detection">Usar el sensor de pulso para mejorar la detección del sueño</string>
   <string name="miband_prefs_device_time_offset_hours">Compensación de la hora del dispositivo en horas (para detectar el sueño de trabajadores a turnos)</string>
   <string name="miband2_prefs_dateformat">Mi2: Formato de fecha</string>
   <string name="dateformat_time">Tiempo</string>
@@ -323,30 +325,30 @@
   <string name="mi2_prefs_do_not_disturb_start">Hora de inicio</string>
   <string name="mi2_prefs_do_not_disturb_end">Hora de fin</string>
   <string name="FetchActivityOperation_about_to_transfer_since">A punto de transferir datos desde %1$s</string>
-  <string name="waiting_for_reconnect">esperando reconexión</string>
-  <string name="activity_prefs_about_you">Sobre ti</string>
+  <string name="waiting_for_reconnect">Esperando reconexión</string>
+  <string name="activity_prefs_about_you">Acerca de ti</string>
   <string name="activity_prefs_year_birth">Año de nacimiento</string>
   <string name="activity_prefs_gender">Género</string>
   <string name="activity_prefs_height_cm">Altura (cm)</string>
   <string name="activity_prefs_weight_kg">Peso (kg)</string>
-  <string name="authenticating">autenticando</string>
-  <string name="authentication_required">autenticación requerida</string>
+  <string name="authenticating">Autenticando</string>
+  <string name="authentication_required">Autenticación requerida</string>
   <string name="appwidget_text">Zzz</string>
   <string name="add_widget">Añadir widget</string>
   <string name="activity_prefs_sleep_duration">Horas de sueño deseadas</string>
   <string name="appwidget_alarms_set">Una alarma ha sido fijada para %1$02d:%2$02d</string>
-  <string name="device_hw">HW: %1$s</string>
-  <string name="device_fw">FW: %1$s</string>
+  <string name="device_hw">Revisión de hardware: %1$s</string>
+  <string name="device_fw">Versión de firmware: %1$s</string>
   <string name="error_creating_directory_for_logfiles">Error creando un directorio para los archivos de registro: %1$s</string>
-  <string name="DEVINFO_HR_VER">HR: </string>
+  <string name="DEVINFO_HR_VER">"RH: "</string>
   <string name="updatefirmwareoperation_update_in_progress">Actualización del Firmware en progreso</string>
   <string name="updatefirmwareoperation_firmware_not_sent">Firmware no enviado</string>
-  <string name="charts_legend_heartrate">Pulsaciones</string>
-  <string name="live_activity_heart_rate">Pulsaciones</string>
+  <string name="charts_legend_heartrate">Ritmo cardíaco</string>
+  <string name="live_activity_heart_rate">Ritmo cardíaco</string>
   <string name="pref_title_pebble_health_store_raw">Almacenar datos en bruto en la base de datos </string>
-  <string name="pref_summary_pebble_health_store_raw">Seleccionado, los datos archivados se guardan en bruto y están disponibles para ser interpretados más tarde. La base de datos será más grande. </string>
-  <string name="action_db_management">Administración de Bases de Datos</string>
-  <string name="title_activity_db_management">Administración de Bases de Datos</string>
+  <string name="pref_summary_pebble_health_store_raw">Una vez seleccionado, los datos archivados se guardan en bruto y están disponibles para ser interpretados más tarde. Nota: ¡La base de datos será más grande!</string>
+  <string name="action_db_management">Administración de bases de datos</string>
+  <string name="title_activity_db_management">Administración de bases de datos</string>
   <string name="activity_db_management_import_export_explanation">La base de datos usa la siguiente ubicación en su dispositivo.\nEsta ubicación está accesible para otras aplicaciones Android y para su ordenador.\nEncontrará sus bases de datos exportadas (o la que quiere importar) aquí:</string>
   <string name="activity_db_management_merge_old_title">Borrar la base de datos antigua</string>
   <string name="dbmanagementactivvity_cannot_access_export_path">No se puede acceder a la ruta para exportar . Por favor, contacta con los desarrolladores.</string>
@@ -373,7 +375,7 @@
   <string name="title_activity_vibration">Vibración</string>
   <!--Strings related to Pebble Pairing Activity-->
   <string name="title_activity_pebble_pairing">Emparejando con Pebble</string>
-  <string name="pebble_pairing_hint">En su dispositivo Android va a aparecer un mensaje para emparejarse. Si no apareciera, mira en el cajón de notificaciones y acepta la propuesta de emparejamiento. Después acepta también en tu Pebble.</string>
+  <string name="pebble_pairing_hint">En su dispositivo Android aparecerá un mensaje para emparejar. Si no aparece, mira en el cajón de notificaciones y acepta la propuesta de emparejamiento. Después acepta también en tu Pebble.</string>
   <string name="weather_notification_label">Asegúrate de que este tema esté activado en la aplicación de notificación del tiempo para obtener la información en tu Pebble.\n\nNo se requiere configuración.\n\nPuedes activar la aplicación del tiempo del sistema desde la configuración de la app.\n\nLas watchfaces soportadas mostrarán la información del tiempo automáticamente.</string>
   <string name="pref_title_setup_bt_pairing">Activar el emparejamiento Bluetooth</string>
   <string name="pref_summary_setup_bt_pairing">Desactiva esto si tienes problemas de conexión</string>
@@ -387,18 +389,26 @@
   <string name="miband2_prefs_timeformat">Mi2: formato de hora</string>
   <string name="mi2_fw_installhandler_fw53_hint">¡Debes instalar la versión %1$s antes de instalar este firmware!</string>
   <string name="mi2_enable_text_notifications">Notificaciones textuales</string>
-  <string name="mi2_enable_text_notifications_summary"><![CDATA[Needs firmware >= 1.0.1.28 and Mili_pro.ft* installed.]]></string>
-  <string name="off">off</string>
-  <string name="mi2_dnd_off">Off</string>
+  <string name="mi2_enable_text_notifications_summary">Requiere firmware &gt;= 1.0.1.28 e instalar Mili_pro.ft*</string>
+  <string name="off">Apagado</string>
+  <string name="mi2_dnd_off">Apagado</string>
   <string name="mi2_dnd_automatic">Automático (detección de sueño)</string>
   <string name="mi2_dnd_scheduled">Programado (intervalo de tiempo)</string>
   <string name="discovery_attempting_to_pair">Intento de emparejamiento con %1$s</string>
-  <string name="discovery_bonding_failed_immediately">El enlace con %1$s falló instantáneamente</string>
+  <string name="discovery_bonding_failed_immediately">El enlace con %1$s ha fallado</string>
   <string name="discovery_trying_to_connect_to">Intentando conectar con: %1$s</string>
   <string name="discovery_enable_bluetooth">Activa el Bluetooth para encontrar dispositivos.</string>
-  <string name="discovery_successfully_bonded">Correctamente conectado con %1$s</string>
+  <string name="discovery_successfully_bonded">Correctamente enlazado con %1$s</string>
   <string name="discovery_pair_title">Emparejar con %1$s?</string>
   <string name="discovery_pair_question">Selecciona Emparejar para emparejar tus dispositivos. Si esto falla, prueba de nuevo sin emparejar.</string>
   <string name="discovery_yes_pair">Emparejar</string>
   <string name="discovery_dont_pair">No emparejar</string>
-</resources>
+<string name="fw_upgrade_notice_amazfitbip">Estás a punto de instalar el firmware %s en lugar del que está actualmente en tu Amazfit Bip.
+\n
+\nPor favor, asegúrate de instalar el firmware .gps, luego el archivo .res, y finalmente el binario .fw. Tu reloj reiniciará después de instalar el archivo .fw.
+\n
+\nNota: no tienes que instalar .res y .gps si estos archivos son los mismos que los previamente instalados.
+\n
+\nEXPERIMENTAL, PROCEDE BAJO TU PROPIA RESPONSABILIDAD</string>
+    <string name="amazfitbip_firmware">Firmware Amazfit Bip %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 373690b62..19e87a46e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -8,7 +8,7 @@
   <string name="action_donate">Faire un don</string>
   <string name="controlcenter_fetch_activity_data">Synchroniser</string>
   <string name="controlcenter_start_sleepmonitor">Suivi du sommeil (ALPHA)</string>
-  <string name="controlcenter_find_device">Retrouver un appareil perdu...</string>
+  <string name="controlcenter_find_device">Retrouver un appareil perdu</string>
   <string name="controlcenter_take_screenshot">Prendre une capture d\'écran</string>
   <string name="controlcenter_disconnect">Déconnexion</string>
   <string name="controlcenter_delete_device">Supprimer l’appareil</string>
@@ -48,7 +48,9 @@
   <string name="fw_upgrade_notice">Vous êtes sur le point d\'installer le micrologiciel %s à la place de celui qui est actuellement sur votre Mi Band.</string>
   <string name="fw_multi_upgrade_notice">Vous êtes sur le point d\'installer les micrologiciels %1$s et %2$s à la place de ceux qui sont actuellement sur votre Mi Band.</string>
   <string name="miband_firmware_known">Ce micrologiciel a été testé et est connu pour être compatible avec Gadgetbridge.</string>
-  <string name="miband_firmware_unknown_warning">Ce micrologiciel n\'a pas été testé et peut ne pas être compatible avec Gadgetbridge.\n\nIl n\'est pas conseillé de le flasher sur votre Mi Band.</string>
+  <string name="miband_firmware_unknown_warning">Ce micrologiciel n\'a pas été testé et peut ne pas être compatible avec Gadgetbridge.
+\n
+\nIl n\'est pas conseillé de le flasher sur votre Mi Band !</string>
   <string name="miband_firmware_suggest_whitelist">Si vous désirez continuer et que tout fonctionne correctement par la suite, veuillez en informer les développeurs de Gadgetbridge pour demander l\'ajout de ce micrologiciel à leur liste: %s</string>
   <!--Strings related to Settings-->
   <string name="title_activity_settings">Paramètres</string>
@@ -73,16 +75,16 @@
   <string name="pref_title_notifications_call">Appels téléphoniques</string>
   <string name="pref_title_notifications_sms">Textos</string>
   <string name="pref_title_notifications_pebblemsg">Messages Pebble</string>
-  <string name="pref_summary_notifications_pebblemsg">Support des applications qui envoient des notification à Pebble par PebbleKit.</string>
+  <string name="pref_summary_notifications_pebblemsg">Support des applications qui envoient des notification à Pebble via PebbleKit.</string>
   <string name="pref_title_notifications_generic">Support des notifications génériques</string>
-  <string name="pref_title_whenscreenon">... y compris quand l\'écran est allumé</string>
+  <string name="pref_title_whenscreenon">...y compris quand l\'écran est allumé</string>
   <string name="pref_title_notification_filter">Ne Pas Déranger</string>
-  <string name="pref_summary_notification_filter">Arrêter l’envoi des notifications non-désirées en mode Ne Pas Déranger.</string>
+  <string name="pref_summary_notification_filter">Arrêter l’envoi des notifications non désirées en mode Ne Pas Déranger</string>
   <string name="pref_title_transliteration">Transcription</string>
   <string name="pref_summary_transliteration">Activez ceci si votre appareil ne supporte pas la police de caractères</string>
-  <string name="always">toujours</string>
-  <string name="when_screen_off">quand l\'écran est éteint</string>
-  <string name="never">jamais</string>
+  <string name="always">Toujours</string>
+  <string name="when_screen_off">Quand l\'écran est éteint</string>
+  <string name="never">Jamais</string>
   <string name="pref_header_privacy">Confidentialité</string>
   <string name="pref_title_call_privacy_mode">Mode de confidentialité d\'appel</string>
   <string name="pref_call_privacy_mode_off">Afficher le nom et le numéro</string>
@@ -128,11 +130,11 @@
   <string name="toast_enable_networklocationprovider">Veuillez activer la localisation réseau</string>
   <string name="toast_aqurired_networklocation">Emplacement obtenu</string>
   <string name="pref_title_pebble_forceprotocol">Forcer le protocole de notification</string>
-  <string name="pref_summary_pebble_forceprotocol">Cette option force l\'utilisation du plus récent protocole de notification qui dépend de la version du micrologiciel. ACTIVEZ-LA UNIQUEMENT SI VOUS SAVEZ CE QUE VOUS FAITES!</string>
+  <string name="pref_summary_pebble_forceprotocol">Cette option force l\'utilisation du plus récent protocole de notification qui dépend de la version du micrologiciel. ACTIVEZ-LA UNIQUEMENT SI VOUS SAVEZ CE QUE VOUS FAITES !</string>
   <string name="pref_title_pebble_forceuntested">Activer les fonctionnalités non-testées</string>
-  <string name="pref_summary_pebble_forceuntested">Activer les fonctionnalités non-testées. ACTIVEZ UNIQUEMENT SI VOUS SAVEZ CE QUE VOUS FAITES!</string>
+  <string name="pref_summary_pebble_forceuntested">Activer les fonctionnalités non-testées. ACTIVEZ UNIQUEMENT SI VOUS SAVEZ CE QUE VOUS FAITES !</string>
   <string name="pref_title_pebble_forcele">Toujours préférer le BLE</string>
-  <string name="pref_summary_pebble_forcele">Utiliser le support expérimental du LE pour toutes les Pebble au lieu du Bluetooth classique ; cela requiert l’appairage d\'une \"Pebble LE\" après qu’une non-LE ait déjà été connectée</string>
+  <string name="pref_summary_pebble_forcele">Utiliser le support expérimental du LE pour toutes les Pebble au lieu du Bluetooth classique ; cela requiert le jumelage d\'une \"Pebble LE\" après qu’une non-LE ait déjà été connectée</string>
   <string name="pref_title_pebble_mtu_limit">Limite du GATT MTU de Pebble 2/LE</string>
   <string name="pref_summary_pebble_mtu_limit">Si votre Pebble 2/LE ne fonctionne pas correctement, essayez d\'activer cette option pour limiter le MTU (plage valide 20-512)</string>
   <string name="pref_title_pebble_enable_applogs">Activer les logs des Watch App</string>
@@ -145,10 +147,10 @@
   <string name="pref_title_screentime">Durée d\'écran allumé</string>
   <string name="prefs_title_all_day_heart_rate">Mesure de la fréquence cardiaque toute la journée</string>
   <string name="preferences_hplus_settings">Paramètres HPlus/Makibes</string>
-  <string name="not_connected">non connecté</string>
-  <string name="connecting">connexion en cours</string>
-  <string name="connected">connecté</string>
-  <string name="unknown_state">état inconnu</string>
+  <string name="not_connected">Non connecté</string>
+  <string name="connecting">Connexion en cours</string>
+  <string name="connected">Connecté</string>
+  <string name="unknown_state">État inconnu</string>
   <string name="_unknown_">(inconnu)</string>
   <string name="test">Test</string>
   <string name="test_notification">Notification de test</string>
@@ -158,11 +160,11 @@
   <string name="tap_connected_device_for_app_mananger">Cliquez sur l\'appareil pour ouvrir le gestionnaire d\'application</string>
   <string name="tap_connected_device_for_activity">Cliquez sur l\'appareil pour ouvrir le gestionnaire d’activité</string>
   <string name="tap_connected_device_for_vibration">Cliquez sur connecter pour envoyer une vibration</string>
-  <string name="tap_a_device_to_connect">Tapottez sur le périphérique pour le connecter.</string>
-  <string name="cannot_connect_bt_address_invalid_">Connexion impossible. L’adresse Bluetooth est-elle valide? </string>
+  <string name="tap_a_device_to_connect">Tapez sur le périphérique pour le connecter</string>
+  <string name="cannot_connect_bt_address_invalid_">Connexion impossible. L’adresse Bluetooth est-elle valide ?</string>
   <string name="gadgetbridge_running">Gadgetbridge est en fonctionnement</string>
-  <string name="installing_binary_d_d">Installation du fichier %1$d/%2$d</string>
-  <string name="installation_failed_">échec de l\'installation !</string>
+  <string name="installing_binary_d_d">Installation du binaire %1$d/%2$d</string>
+  <string name="installation_failed_">Échec de l\'installation</string>
   <string name="installation_successful">Installation réalisée avec succès</string>
   <string name="firmware_install_warning">VOUS TENTEZ D\'INSTALLER UN MICROLOGICIEL, PROCÉDEZ À VOS RISQUES ET PÉRILS.\n\n\nCe micrologiciel est pour la version de matériel: %s</string>
   <string name="app_install_info">Vous êtes sur le point d\'installer l\'application suivante:\n\n\n%1$s Version %2$s par %3$s\n</string>
@@ -175,14 +177,14 @@
   <string name="action_discover">Connecter un nouvel appareil</string>
   <string name="device_with_rssi">%1$s (%2$s)</string>
   <string name="title_activity_android_pairing">Appairer l\'appareil</string>
-  <string name="android_pairing_hint">Utiliser l’appairage Bluetooth d\'Android pour appairer l\'appareil</string>
+  <string name="android_pairing_hint">Utiliser le l\'appairage Bluetooth d\'Android pour jumeler l\'appareil</string>
   <string name="title_activity_mi_band_pairing">Appairer votre Mi Band</string>
-  <string name="pairing">Appairage avec %s...</string>
+  <string name="pairing">Jumelage avec %s…</string>
   <string name="pairing_creating_bond_with">Création d’un lien avec %1$s (%2$s)</string>
   <string name="pairing_unable_to_pair_with">Impossible se s’appairer avec %1$s (%2$s)</string>
   <string name="pairing_in_progress">Création du lien en cours : %1$s (%2$s)</string>
-  <string name="pairing_already_bonded">Déjà lié avec %1$s (%2$s), connexion...</string>
-  <string name="message_cannot_pair_no_mac">Aucune adresse MAC fournie, ne peut être appairé</string>
+  <string name="pairing_already_bonded">Déjà lié avec %1$s (%2$s), connexion…</string>
+  <string name="message_cannot_pair_no_mac">Aucune adresse MAC fournie, ne peut être appairé.</string>
   <string name="preferences_category_device_specific_settings">Paramètres spécifiques à l\'appareil </string>
   <string name="preferences_miband_settings">Paramètres Mi Band</string>
   <string name="male">Homme</string>
@@ -190,11 +192,11 @@
   <string name="other">Autre</string>
   <string name="left">Gauche</string>
   <string name="right">Droite</string>
-  <string name="miband_pairing_using_dummy_userdata">Aucune donnée utilisateur valide fournie,  utilisation de données fictives pour le moment</string>
+  <string name="miband_pairing_using_dummy_userdata">Aucune donnée utilisateur valide fournie, utilisation de données fictives pour le moment.</string>
   <string name="miband_pairing_tap_hint">Quand votre Mi Band vibre et clignote, appuyez dessus plusieurs fois d\'affilée.</string>
   <string name="appinstaller_install">Installer</string>
   <string name="discovery_connected_devices_hint">Mettez votre appareil en mode visible. Les appareils déjà connectés ne seront pas visibles. Sur Android 6 ou supérieur, vous devez activer la localisation (ex. GPS). Désactivez Privacy Guard pour Gadgetbridge, il pourrait stopper et redémarrer votre téléphone. Si votre appareil n\'est pas visible après 2 minutes, réessayez après avoir redémarré votre téléphone.</string>
-  <string name="discovery_note">Note:</string>
+  <string name="discovery_note">Note :</string>
   <string name="candidate_item_device_image">Image de l\'appareil</string>
   <string name="miband_prefs_alias">Nom/Pseudo</string>
   <string name="pref_header_vibration_count">Nombre de vibrations</string>
@@ -203,7 +205,7 @@
   <string name="initializing">Initialisation</string>
   <string name="busy_task_fetch_activity_data">Récupération des données d\'activité</string>
   <string name="sleep_activity_date_range">De %1$s à %2$s</string>
-  <string name="miband_prefs_wearside">Port main gauche ou droite?</string>
+  <string name="miband_prefs_wearside">Port main gauche ou droite ?</string>
   <string name="pref_screen_vibration_profile">Profil de vibration</string>
   <string name="vibration_profile_staccato">Saccadé</string>
   <string name="vibration_profile_short">Court</string>
@@ -217,7 +219,7 @@
   <string name="pref_screen_notification_profile_sms">Notification Texto</string>
   <string name="pref_header_vibration_settings">Paramètres des vibrations</string>
   <string name="pref_screen_notification_profile_generic">Notification générique</string>
-  <string name="pref_screen_notification_profile_email">Notification des Mails</string>
+  <string name="pref_screen_notification_profile_email">Notification des mails</string>
   <string name="pref_screen_notification_profile_incoming_call">Notification d\'appels entrants</string>
   <string name="pref_screen_notification_profile_generic_chat">Tchat</string>
   <string name="pref_screen_notification_profile_generic_navigation">Navigation</string>
@@ -239,9 +241,9 @@
   <string name="alarm_fri_short">Ven</string>
   <string name="alarm_sat_short">Sam</string>
   <string name="alarm_smart_wakeup">Réveil intelligent</string>
-  <string name="user_feedback_miband_set_alarms_failed">Une erreur s\'est produite lors du paramétrage des alarmes, veuillez réessayer!</string>
-  <string name="user_feedback_miband_set_alarms_ok">Alarmes envoyées à l\'appareil!</string>
-  <string name="chart_no_data_synchronize">Aucune donnée. Synchroniser l\'appareil?</string>
+  <string name="user_feedback_miband_set_alarms_failed">Une erreur s\'est produite lors du paramétrage des alarmes, veuillez réessayer !</string>
+  <string name="user_feedback_miband_set_alarms_ok">Alarmes envoyées à l\'appareil !</string>
+  <string name="chart_no_data_synchronize">Aucune donnée. Synchroniser l\'appareil ?</string>
   <string name="user_feedback_miband_activity_data_transfer">Sur le point de transférer %1$s de données à partir de %2$s</string>
   <string name="miband_prefs_fitness_goal">Objectif de pas par jour</string>
   <string name="dbaccess_error_executing">Erreur lors de l’exécution de %1$s\'</string>
@@ -250,8 +252,8 @@
   <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 ficher suivant: %1$s</string>
   <string name="pbw_install_handler_hw_revision_mismatch">Impossible d\'installer le micrologiciel spécifié: il ne correspond pas à la version du matériel de votre Pebble.</string>
-  <string name="installer_activity_wait_while_determining_status">Veuillez patienter pendant la détermination de l\'état de l\'installation...</string>
-  <string name="notif_battery_low_title">Niveau de batterie faible!</string>
+  <string name="installer_activity_wait_while_determining_status">Veuillez patienter pendant la détermination de l\'état de l\'installation…</string>
+  <string name="notif_battery_low_title">Niveau de batterie faible !</string>
   <string name="notif_battery_low_percent">%1$s batterie restante: %2$s%%</string>
   <string name="notif_battery_low_bigtext_last_charge_time">Dernière charge: %s \n</string>
   <string name="notif_battery_low_bigtext_number_of_charges">Nombre de charges: %s</string>
@@ -260,20 +262,20 @@
   <string name="weeksleepchart_today_sleep_description">Sommeil aujourd\'hui, objectif: %1$s</string>
   <string name="weekstepschart_steps_a_week">Pas de la semaine</string>
   <string name="activity_sleepchart_activity_and_sleep">Votre activité et sommeil</string>
-  <string name="updating_firmware">Mise à jour du micrologiciel...</string>
+  <string name="updating_firmware">Mise à jour du micrologiciel…</string>
   <string name="fwapp_install_device_not_ready">Le fichier ne peut pas être installé, l\'appareil n\'est pas prêt.</string>
   <string name="miband_installhandler_miband_firmware">Micrologiciel Mi Band %1$s</string>
   <string name="miband_fwinstaller_compatible_version">Version compatible</string>
-  <string name="miband_fwinstaller_untested_version">Version non-testée!</string>
+  <string name="miband_fwinstaller_untested_version">Version non-testée !</string>
   <string name="fwappinstaller_connection_state">Connexion  à l\'appareil: %1$s</string>
   <string name="pbw_installhandler_pebble_firmware">Micrologiciel Pebble %1$s</string>
   <string name="pbwinstallhandler_correct_hw_revision">Version du matériel correcte</string>
-  <string name="pbwinstallhandler_incorrect_hw_revision">Version du matériel incorrecte!</string>
+  <string name="pbwinstallhandler_incorrect_hw_revision">Version du matériel incorrecte !</string>
   <string name="pbwinstallhandler_app_item">%1$s (%2$s)</string>
-  <string name="updatefirmwareoperation_updateproblem_do_not_reboot">Problème avec le transfert du micrologiciel. Ne redémarrez pas votre Mi Band!</string>
+  <string name="updatefirmwareoperation_updateproblem_do_not_reboot">Problème avec le transfert du micrologiciel. Ne redémarrez pas votre Mi Band !</string>
   <string name="updatefirmwareoperation_metadata_updateproblem">Problème avec le transfert de métadonnées du micrologiciel</string>
   <string name="updatefirmwareoperation_update_complete">Installation complète du micrologiciel</string>
-  <string name="updatefirmwareoperation_update_complete_rebooting">Installation complète du micrologiciel, redémarrage de l\'appareil</string>
+  <string name="updatefirmwareoperation_update_complete_rebooting">Installation complète du micrologiciel, redémarrage de l\'appareil…</string>
   <string name="updatefirmwareoperation_write_failed">Échec lors de l\'écriture du micrologiciel</string>
   <string name="chart_steps">Pas</string>
   <string name="calories">Calories</string>
@@ -323,33 +325,35 @@
   <string name="mi2_prefs_do_not_disturb_start">Heure de début</string>
   <string name="mi2_prefs_do_not_disturb_end">Heure de fin</string>
   <string name="FetchActivityOperation_about_to_transfer_since">Sur le point de transférer des données depuis %1$s</string>
-  <string name="waiting_for_reconnect">en attente de reconnexion</string>
+  <string name="waiting_for_reconnect">En attente de reconnexion</string>
   <string name="activity_prefs_about_you">À propos de vous</string>
   <string name="activity_prefs_year_birth">Année de naissance</string>
   <string name="activity_prefs_gender">Genre</string>
   <string name="activity_prefs_height_cm">Taille en cm</string>
   <string name="activity_prefs_weight_kg">Poids en kg</string>
-  <string name="authenticating">authentification</string>
-  <string name="authentication_required">authentification requise</string>
+  <string name="authenticating">Authentification</string>
+  <string name="authentication_required">Authentification requise</string>
   <string name="appwidget_text">ZzZz</string>
   <string name="add_widget">Ajouter un widget</string>
   <string name="activity_prefs_sleep_duration">
 Temps de sommeil péféré en heures</string>
   <string name="appwidget_alarms_set">Une alarme a été enregistré pour %1$02d:%2$02d</string>
-  <string name="device_hw">Modèle: %1$s</string>
-  <string name="device_fw">Micrologiciel: %1$s</string>
+  <string name="device_hw">Révision matérielle: %1$s</string>
+  <string name="device_fw">Version du micrologiciel: %1$s</string>
   <string name="error_creating_directory_for_logfiles">Erreur à la création de votre fichier log : %1$s</string>
-  <string name="DEVINFO_HR_VER">HR:</string>
+  <string name="DEVINFO_HR_VER">"Révision matérielle : "</string>
   <string name="updatefirmwareoperation_update_in_progress">Le micrologiciel se met à jour</string>
   <string name="updatefirmwareoperation_firmware_not_sent">Échec lors de l\'écriture du micrologiciel</string>
-  <string name="charts_legend_heartrate">Rythme cardiaque</string>
-  <string name="live_activity_heart_rate">Rythme cardiaque</string>
+  <string name="charts_legend_heartrate">Fréquence cardiaque</string>
+  <string name="live_activity_heart_rate">Fréquence cardiaque</string>
   <string name="pref_title_pebble_health_store_raw">Stockez les enregistrements brut dans la base de données</string>
   <string name="pref_summary_pebble_health_store_raw">Si coché, les données sont stockées \"telles quelles\" et seront disponibles pour une interprétation ultérieure. 
 NOTE: la base de données sera bien évidement plus grande !</string>
   <string name="action_db_management">Gestion de base de données</string>
   <string name="title_activity_db_management">Gestion de base de données</string>
-  <string name="activity_db_management_import_export_explanation">Les opérations sur la base de donnée ont utilisé le chemin suivant sur votre appareil.\nCe chemin n\'est pas accessible par d\'autres applications Android ou par votre ordinateur.\nVous trouverez votre base de données (ou celle que vous souhaitez importer) ici:</string>
+  <string name="activity_db_management_import_export_explanation">Les opérations sur la base de donnée ont utilisé le chemin suivant sur votre appareil.
+\nCe chemin n\'est pas accessible par d\'autres applications Android ou par votre ordinateur.
+\nVous trouverez votre base de données (ou celle que vous souhaitez importer) ici :</string>
   <string name="activity_db_management_merge_old_title">Effacer l\'ancienne base de données</string>
   <string name="dbmanagementactivvity_cannot_access_export_path">Impossible d\'accéder au fichier d\'export. Merci de contacter les développeurs.</string>
   <string name="dbmanagementactivity_exported_to">Exporter vers : %1$s</string>
@@ -374,10 +378,10 @@ NOTE: la base de données sera bien évidement plus grande !</string>
   <!--Strings related to Vibration Activity-->
   <string name="title_activity_vibration">Vibration</string>
   <!--Strings related to Pebble Pairing Activity-->
-  <string name="title_activity_pebble_pairing">Appairage avec une Pebble</string>
-  <string name="pebble_pairing_hint">Une fenêtre d’appairage va s’afficher sur votre téléphone. Si cela ne se produit pas, regardez dans vos notifications et acceptez la demande d’appairage. Acceptez ensuite la demande d’appairage sur votre Pebble.</string>
+  <string name="title_activity_pebble_pairing">Jumelage avec une Pebble</string>
+  <string name="pebble_pairing_hint">Une fenêtre de jumelage va s’afficher sur votre téléphone. Si cela ne se produit pas, regardez dans vos notifications et acceptez-la. Acceptez ensuite la demande de jumelage sur votre Pebble.</string>
   <string name="weather_notification_label">Assurez vous que ce thème soit activé dans l\'application de notification de la météo pour recevoir les informations sur votre Pebble.\n\nAucune configuration n\'est requise.\n\nVous pouvez activer l\'application météo système de votre Pebble depuis la configuration de l\'application.\n\nLes watchfaces supportées afficheront la météo automatiquement.</string>
-  <string name="pref_title_setup_bt_pairing">Activer l\'appairage Bluetooth</string>
+  <string name="pref_title_setup_bt_pairing">Activer le jumelage Bluetooth</string>
   <string name="pref_summary_setup_bt_pairing">Désactivez ceci si vous avez des problèmes de connexion</string>
   <string name="unit_metric">Mesure</string>
   <string name="unit_imperial">Impériale</string>
@@ -385,22 +389,30 @@ NOTE: la base de données sera bien évidement plus grande !</string>
   <string name="timeformat_am_pm">AM/PM</string>
   <string name="pref_screen_notification_profile_alarm_clock">Réveil</string>
   <string name="StringUtils_sender">(%1$s)</string>
-  <string name="find_device_you_found_it">Vous l\'avez trouvé!</string>
+  <string name="find_device_you_found_it">Vous l\'avez trouvé !</string>
   <string name="miband2_prefs_timeformat">Mi2: format de l\'heure</string>
-  <string name="mi2_fw_installhandler_fw53_hint">Vous devez installer la version %1$s avant d\'installer ce micrologiciel!</string>
+  <string name="mi2_fw_installhandler_fw53_hint">Vous devez installer la version %1$s avant d\'installer ce micrologiciel !</string>
   <string name="mi2_enable_text_notifications">Notifications textuelles</string>
   <string name="mi2_enable_text_notifications_summary"><![CDATA[Requis: micrologiciel version 1.0.1.28 ou plus, fichier Mili_pro.ft* installé.]]></string>
-  <string name="off">off</string>
-  <string name="mi2_dnd_off">Off</string>
+  <string name="off">Éteint</string>
+  <string name="mi2_dnd_off">Éteint</string>
   <string name="mi2_dnd_automatic">Automatique (détection de sommeil)</string>
   <string name="mi2_dnd_scheduled">Programmé (intervalle de temps)</string>
-  <string name="discovery_attempting_to_pair">Tentative d\'appairage avec %1$s</string>
+  <string name="discovery_attempting_to_pair">Tentative de jumelage avec %1$s</string>
   <string name="discovery_bonding_failed_immediately">Le lien avec %1$s a échoué instantanément</string>
   <string name="discovery_trying_to_connect_to">Tentative de connexion à: %1$s</string>
   <string name="discovery_enable_bluetooth">Activez le Bluetooth pour trouver des dispositifs</string>
   <string name="discovery_successfully_bonded">Correctement lié à %1$s</string>
-  <string name="discovery_pair_title">Appairer avec %1$s</string>
-  <string name="discovery_pair_question">Sélectionnez Appairer pour appairer vos dispositifs. Si cela échoue, essayez à nouveau sans appairage.</string>
-  <string name="discovery_yes_pair">Appairage</string>
+  <string name="discovery_pair_title">Appairer avec %1$s ?</string>
+  <string name="discovery_pair_question">Sélectionnez Jumeler pour associer vos dispositifs. Si cela échoue, essayez à nouveau sans jumelage.</string>
+  <string name="discovery_yes_pair">Jumelage</string>
   <string name="discovery_dont_pair">Ne pas appairer</string>
-</resources>
+<string name="fw_upgrade_notice_amazfitbip">Vous êtes sur le point d\'installer le micrologiciel %s au lieu de celui actuellement présent sur votre Amazfit Bip.
+\n
+\nVeuillez installer le micrologiciel .gps, ensuite le fichier .res, puis le fichier .fw. Votre montre redémarrera après installation du .fw.
+\n
+\nNote: vous ne devez pas installer .res et .gps si ceux-ci sont identiques à ceux installés précédemment.
+\n
+\nEXPÉRIMENTAL, CONTINUEZ À VOS RISQUES</string>
+    <string name="amazfitbip_firmware">Firmware Amazfit Bip %1$s</string>
+    </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 3745f7140..7b6782a05 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -7,7 +7,7 @@
   <string name="action_quit">יציאה</string>
   <string name="controlcenter_fetch_activity_data">סנכרון</string>
   <string name="controlcenter_start_sleepmonitor">מעקב שינה (בבדיקה)</string>
-  <string name="controlcenter_find_device">איתור התקן שאבד…</string>
+  <string name="controlcenter_find_device">איתור התקן שאבד</string>
   <string name="controlcenter_take_screenshot">צילום המסך</string>
   <string name="controlcenter_disconnect">ניתוק</string>
   <string name="controlcenter_delete_device">מחיקת התקן</string>
@@ -33,7 +33,7 @@
   <string name="app_configure">הגדרה</string>
   <string name="app_move_to_top">העברה למעלה</string>
   <!--Strings related to AppBlacklist-->
-  <string name="title_activity_appblacklist">חסימת דיווחים</string>
+  <string name="title_activity_appblacklist">רשימת התרעות חסומות</string>
   <!--Strings related to CalBlacklist-->
   <!--Strings related to FwAppInstaller-->
   <string name="title_activity_fw_app_insaller">התקנת קושחה/יישומון</string>
@@ -52,7 +52,7 @@
   <string name="pref_default">בררת מחדל</string>
   <string name="pref_header_datetime">שעה ותאריך</string>
   <string name="pref_title_datetime_syctimeonconnect">סנכרון השעה</string>
-  <string name="pref_summary_datetime_syctimeonconnect">סנכרון השעה בהתקן בעת ההתחברות וכאשר השעה או אזור הזמן משתנים באנדרואיד.</string>
+  <string name="pref_summary_datetime_syctimeonconnect">סנכרון השעה בהתקן בעת ההתחברות וכאשר השעה או אזור הזמן משתנים באנדרואיד</string>
   <string name="pref_title_theme">ערכת עיצוב</string>
   <string name="pref_theme_light">בהירה</string>
   <string name="pref_theme_dark">כהה</string>
@@ -69,7 +69,7 @@
   <string name="pref_title_notifications_generic">תמיכה בדיווחים גנריים</string>
   <string name="pref_title_whenscreenon">…גם כאשר המסך פעיל</string>
   <string name="pref_title_notification_filter">לא להפריע</string>
-  <string name="pref_summary_notification_filter">חסימת שליחה של דיווחים בלתי רצויים בהתבסס על המצב לא להפריע.</string>
+  <string name="pref_summary_notification_filter">חסימת שליחה של התרעות בלתי רצויות בהתבסס על המצב לא להפריע</string>
   <string name="pref_title_transliteration">תעתיק</string>
   <string name="always">תמיד</string>
   <string name="when_screen_off">כאשר המסך כבוי</string>
@@ -87,7 +87,7 @@
   <string name="pref_title_canned_messages_set">עדכון ב־Pebble</string>
   <string name="pref_header_development">אפשרויות פיתוח</string>
   <string name="pref_title_development_miaddr">כתובת </string>
-  <string name="pref_title_pebble_settings">הגדרות </string>
+  <string name="pref_title_pebble_settings">הגדרות Pebble</string>
   <string name="pref_header_activitytrackers">עוקבי פעילות</string>
   <string name="pref_title_pebble_activitytracker">עוקב פעילות מועדף</string>
   <string name="pref_title_pebble_sync_health">סנכרון Pebble Health</string>
@@ -98,7 +98,7 @@
   <string name="pref_title_enable_pebblekit">לאפשר גישה ליישומוני צד שלישי באנדרואיד</string>
   <string name="pref_summary_enable_pebblekit">הפעלת תמיכה ניסיונית ביישומוני אנדרואיד באמצעות PebbleKit</string>
   <string name="pref_title_sunrise_sunset">זריחה ושקיעה</string>
-  <string name="pref_summary_sunrise_sunset">שליחת מועדי זריחה ושקיעה בהתבסס על המיקום לציר הזמן של pebble</string>
+  <string name="pref_summary_sunrise_sunset">שליחת מועדי זריחה ושקיעה בהתבסס על המיקום לציר הזמן של Pebble</string>
   <string name="pref_title_autoremove_notifications">הסרה אוטומטית של דיווחים שהתעלמת מהם</string>
   <string name="pref_summary_autoremove_notifications">דיווחים מוסרים אוטומטית מה־Pebble כשהתעלמת מהם בהתקן האנדרואיד</string>
   <string name="pref_title_pebble_privacy_mode">מצב פרטיות</string>
@@ -118,7 +118,7 @@
   <string name="pref_title_pebble_forceuntested">הפעלת תכונות שלא נבדקו</string>
   <string name="pref_summary_pebble_forceuntested">הפעלת תכונות שלא נבדקו. יש להפעיל רק אם ההשלכות ברורות לך לחלוטין!!</string>
   <string name="pref_title_pebble_forcele">תמיד להעדיף BLE</string>
-  <string name="pref_summary_pebble_forcele">שימוש בתמיכה ניסיונית ב־Pebble LE עבור כל סוגי ה־Pebble במקום ה־Bluetooth הקלסי, נדרש צימוד „Pebble LE“ לאחר שנוצר חיבור שאינו LE בעבר.</string>
+  <string name="pref_summary_pebble_forcele">שימוש בתמיכה ניסיונית ב־Pebble LE עבור כל סוגי ה־Pebble במקום ה־Bluetooth הקלסי, נדרש צימוד „Pebble LE“ לאחר שנוצר חיבור שאינו LE בעבר</string>
   <string name="pref_title_pebble_mtu_limit">מגבלת ה־MTU של GATT ל־Pebble 2/LE</string>
   <string name="pref_summary_pebble_mtu_limit">אם ה־Pebble 2/Pebble LE שלך אינו עובד כצפוי, יש לנסות אפשרות זאת כדי להגביל את כמות הנתונים המועברת - MTU (טווח תקני 20–512)</string>
   <string name="pref_title_pebble_enable_applogs">הפעלת מעקב רישום אחר יישומון השעון</string>
@@ -132,23 +132,23 @@
   <string name="prefs_title_all_day_heart_rate">מדידת דופק במשך כל היום</string>
   <string name="preferences_hplus_settings">הגדרות HPlus/Makibes</string>
   <string name="not_connected">לא מחובר</string>
-  <string name="connecting">מחובר</string>
-  <string name="connected">מתחבר</string>
+  <string name="connecting">בהתחברות</string>
+  <string name="connected">מחובר</string>
   <string name="unknown_state">מצב לא ידוע</string>
   <string name="_unknown_">(לא ידוע)</string>
   <string name="test">בדיקה</string>
-  <string name="test_notification">דיווח לבדיקה</string>
-  <string name="this_is_a_test_notification_from_gadgetbridge">זהו דיווח לבדיקה מ־Gadgetbridge</string>
+  <string name="test_notification">התרעה לבדיקה</string>
+  <string name="this_is_a_test_notification_from_gadgetbridge">זוהי התרעה לבדיקה מ־Gadgetbridge</string>
   <string name="bluetooth_is_not_supported_">אין תמיכה ב־Bluetooth.</string>
   <string name="bluetooth_is_disabled_">ה־Bluetooth מנוטרל.</string>
   <string name="tap_connected_device_for_app_mananger">נקישה על ההתקן המחובר למנהל היישומים</string>
   <string name="tap_connected_device_for_activity">נקישה על ההתקן המחובר לפעילות</string>
   <string name="tap_connected_device_for_vibration">נקישה על ההתקן המחובר לרטט</string>
   <string name="tap_a_device_to_connect">יש לגעת בהתקן כדי להתחבר</string>
-  <string name="cannot_connect_bt_address_invalid_">לא ניתן להתחבר. כתובת ה־BT שגויה?</string>
+  <string name="cannot_connect_bt_address_invalid_">לא ניתן להתחבר. כתובת ה־Bluetooth שגויה?</string>
   <string name="gadgetbridge_running">Gadgetbridge פעיל</string>
   <string name="installing_binary_d_d">התקנת הבינרי %1$d/%2$d</string>
-  <string name="installation_failed_">ההתקנה נכשלה!</string>
+  <string name="installation_failed_">ההתקנה נכשלה</string>
   <string name="installation_successful">ההתקנה הצליחה</string>
   <string name="firmware_install_warning">זהו ניסיון להתקנת קושחה, ניתן להמשיך אם ברורות לך ההשלכות.\n\n\n קושחה זו מיועדת לחומרה במהדורה: %s</string>
   <string name="app_install_info">היישומון המועמד להתקנה הוא:\n\n\n%1$s גרסה %2$s מאת %3$s\n</string>
@@ -157,9 +157,9 @@
   <string name="appversion_by_creator">%1$s מאת %2$s</string>
   <string name="title_activity_discovery">גילוי התקנים</string>
   <string name="discovery_stop_scanning">להפסיק את הסריקה</string>
-  <string name="discovery_start_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="device_with_rssi">%1$s‏ (%2$s)</string>
   <string name="title_activity_android_pairing">צימוד התקן</string>
   <string name="android_pairing_hint">יש להשתמש בדו־שיח צימוד ה־Bluetooth לאנדרואיד כדי ליצור צימוד להתקן.</string>
   <string name="title_activity_mi_band_pairing">צימוד ה־Mi Band שלך</string>
@@ -170,7 +170,7 @@
   <string name="pairing_already_bonded">כבר נוצר איגוד עם %1$s (%2$s), מתבצעת התחברות…</string>
   <string name="message_cannot_pair_no_mac">לא הועברה כתובת חומרה, לא ניתן לצמד.</string>
   <string name="preferences_category_device_specific_settings">הגדרות ייעודיות להתקן</string>
-  <string name="preferences_miband_settings">הגדרות Mi Band</string>
+  <string name="preferences_miband_settings">הגדרות Mi Band / Bip</string>
   <string name="male">זכר</string>
   <string name="female">נקבה</string>
   <string name="other">אחר</string>
@@ -185,7 +185,7 @@
   <string name="miband_prefs_alias">שם/כינוי</string>
   <string name="pref_header_vibration_count">ספירת רטט</string>
   <string name="title_activity_sleepmonitor">מעקב שינה</string>
-  <string name="pref_write_logfiles">כתיבת קובצי יומן</string>
+  <string name="pref_write_logfiles">כתיבת קובצי רישום</string>
   <string name="initializing">מתבצע אתחול</string>
   <string name="busy_task_fetch_activity_data">נתוני הפעילות מתקבלים</string>
   <string name="sleep_activity_date_range">מ־%1$s עד %2$s</string>
@@ -200,11 +200,11 @@
   <string name="vibration_profile_alarm_clock">שעון מעורר</string>
   <string name="miband_prefs_vibration">רטט</string>
   <string name="vibration_try">בדיקה</string>
-  <string name="pref_screen_notification_profile_sms">דיווח על מסרון</string>
+  <string name="pref_screen_notification_profile_sms">התרעת מסרון</string>
   <string name="pref_header_vibration_settings">הגדרות רטט</string>
-  <string name="pref_screen_notification_profile_generic">דיווחים כלליים</string>
-  <string name="pref_screen_notification_profile_email">דיווח על דוא״ל</string>
-  <string name="pref_screen_notification_profile_incoming_call">דיווח על שיחה נכנסת</string>
+  <string name="pref_screen_notification_profile_generic">התרעות כלליות</string>
+  <string name="pref_screen_notification_profile_email">התרעה על דוא״ל</string>
+  <string name="pref_screen_notification_profile_incoming_call">התרעה על שיחה נכנסת</string>
   <string name="pref_screen_notification_profile_generic_chat">צ׳אט</string>
   <string name="pref_screen_notification_profile_generic_navigation">ניווט</string>
   <string name="pref_screen_notification_profile_generic_social">רשת חברתית</string>
@@ -300,12 +300,12 @@
   <string name="add_widget">הוספת וידג׳ט</string>
   <string name="activity_prefs_sleep_duration">משך השינה המועדף בשעות</string>
   <string name="appwidget_alarms_set">הוגדרה התרעה לשעה %1$02d:%2$02d</string>
-  <string name="device_hw">חומרה: %1$s</string>
-  <string name="device_fw">קושחה: %1$s</string>
+  <string name="device_hw">מהדורת חומרה: %1$s</string>
+  <string name="device_fw">מהדורת קושחה: %1$s</string>
   <string name="error_creating_directory_for_logfiles">אירעה שגיאה ביצירת תיקייה לקובצי הרישום: %1$s</string>
-  <string name="DEVINFO_HR_VER">דופק:</string>
+  <string name="DEVINFO_HR_VER">"דופק: "</string>
   <string name="updatefirmwareoperation_update_in_progress">מתבצע עדכון קושחה</string>
-  <string name="updatefirmwareoperation_firmware_not_sent">לא הוגדרה קושחה</string>
+  <string name="updatefirmwareoperation_firmware_not_sent">לא נשלחה קושחה</string>
   <string name="charts_legend_heartrate">דופק</string>
   <string name="live_activity_heart_rate">דופק</string>
   <string name="pref_title_pebble_health_store_raw">אחסון נתונים גולמיים במסד הנתונים</string>
@@ -363,7 +363,7 @@
     <string name="pref_blacklist_calendars">חסימת יומנים</string>
 
     <string name="pref_header_pebble_timeline">ציר זמן Pebble</string>
-    <string name="pref_title_enable_calendar_sync">סנכרון יומנים</string>
+    <string name="pref_title_enable_calendar_sync">סנכרון יומן</string>
     <string name="pref_summary_enable_calendar_sync">שליחת אירועים מהיומן לציר הזמן</string>
 
     <string name="stats_title">אזורי מהירות</string>
@@ -388,4 +388,33 @@
     <string name="mi2_prefs_inactivity_warnings_dnd_summary">השבתת אזהרות חוסר הפעילות לפרק זמן מסוים</string>
     <string name="mi2_prefs_do_not_disturb_start">מועד ההתחלה</string>
     <string name="mi2_prefs_do_not_disturb_end">מועד הסיום</string>
-    </resources>
+    <string name="fw_upgrade_notice_amazfitbip">ביקשת להתקין את הקושחה %s במקום זו שכרגע מותקנת ב־Amazfit Bip שלך.
+\n
+\nנא לוודא את התקנת הקושחה ‎.gps בהתחלה, לאחר מכן את קובץ ה־‎.res ולבסוף קובץ ה־‎.fw
+\n
+\n
+\nלתשומת לבך: אין צורך בהתקנת קובצי ה־‎.res וה־‎.gps אם הם כבר זהים לאלו שהתקנת בעבר.
+\n
+\nניסיוני! המשך התהליך הוא על אחריותך!</string>
+    <string name="pref_summary_transliteration">יש להפעיל אפשרות זו אם להתקן אין תמיכה בגופן השפה שלך</string>
+
+    <string name="amazfitbip_firmware">קושחה של Amazfit Bip גרסה %1$s</string>
+    <string name="dbmanagementactivity_error_exporting_shared">שגיאה בייצוא ההעדפה: %1$s</string>
+    <string name="dbmanagementactivity_error_importing_shared">שגיאה בייבוא העדפה: %1$s</string>
+    <string name="mi2_fw_installhandler_fw53_hint">עליך להתקין את הגרסה %1$s בטרם התקנת קושחה זו!</string>
+    <string name="mi2_enable_text_notifications">התרעות טקסט</string>
+    <string name="mi2_enable_text_notifications_summary">נדרשת קושחה &gt;= 1.0.1.28 והקובץ Mili_pro.ft*‎ מותקן.</string>
+    <string name="off">כבוי</string>
+    <string name="mi2_dnd_off">כבוי</string>
+    <string name="mi2_dnd_automatic">אוטומטי (זיהוי שינה)</string>
+    <string name="mi2_dnd_scheduled">מתוזמן (הפרשי זמן)</string>
+    <string name="discovery_attempting_to_pair">מתבצע ניסיון לצימוד עם %1$s</string>
+    <string name="discovery_bonding_failed_immediately">האיגוד עם %1$s נכשל מיידית.</string>
+    <string name="discovery_trying_to_connect_to">מתבצע ניסיון להתחבר אל: %1$s</string>
+    <string name="discovery_enable_bluetooth">יש להפעיל Bluetooth כדי לגלות התקנים.</string>
+    <string name="discovery_successfully_bonded">האיגוד עם %1$s הצליח.</string>
+    <string name="discovery_pair_title">ליצור צימוד עם %1$s?</string>
+    <string name="discovery_pair_question">יש לבחור בצימוד כדי לצמד את ההתקנים שלך. אם התהליך נכשל, יש לנסות שוב ללא צימוד.</string>
+    <string name="discovery_yes_pair">לצמד</string>
+    <string name="discovery_dont_pair">לא לצמד</string>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c51412f7f..3cd65cb67 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -7,7 +7,7 @@
   <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 smarrito...</string>
+  <string name="controlcenter_find_device">Trova dispositivo smarrito</string>
   <string name="controlcenter_take_screenshot">Salva uno screenshot</string>
   <string name="controlcenter_disconnect">Disconnetti</string>
   <string name="controlcenter_delete_device">Rimuovi dispositivo</string>
@@ -74,14 +74,14 @@
   <string name="pref_title_notifications_pebblemsg">Messaggi Pebble</string>
   <string name="pref_summary_notifications_pebblemsg">Supporto per applicazioni che inviano le notifiche a Pebble usando PebbleKit.</string>
   <string name="pref_title_notifications_generic">Notifiche generiche</string>
-  <string name="pref_title_whenscreenon">… anche se lo schermo è acceso</string>
+  <string name="pref_title_whenscreenon">…anche se lo schermo è acceso</string>
   <string name="pref_title_notification_filter">Non disturbare</string>
   <string name="pref_summary_notification_filter">Non inviare notifiche nei periodi configurati come \"non disturbare\".</string>
   <string name="pref_title_transliteration">Traslitterazione</string>
   <string name="pref_summary_transliteration">Abilita questa opzione se il tuo dispositivo non supporta tutti i caratteri della tua lingua</string>
   <string name="always">sempre</string>
   <string name="when_screen_off">se lo schermo è spento</string>
-  <string name="never">mai</string>
+  <string name="never">Mai</string>
   <string name="pref_header_privacy">Privacy</string>
   <string name="pref_title_call_privacy_mode">Impostazioni privacy chiamate</string>
   <string name="pref_call_privacy_mode_off">Mostra nome e numero chiamante</string>
@@ -140,24 +140,26 @@
   <string name="pref_title_screentime">Durata dell\'accensione dello schermo</string>
   <string name="prefs_title_all_day_heart_rate">Misura il battito cardiaco continuativamente</string>
   <string name="preferences_hplus_settings">Impostazioni HPlus/Makibes</string>
-  <string name="not_connected">non connesso</string>
-  <string name="connecting">in collegamento</string>
-  <string name="connected">connesso</string>
-  <string name="unknown_state">stato sconosciuto</string>
+  <string name="not_connected">Non connesso</string>
+  <string name="connecting">In collegamento</string>
+  <string name="connected">Connesso</string>
+  <string name="unknown_state">Stato sconosciuto</string>
+  <string name="connectionstate_hw_fw">HW: %1$s FW: %2$s</string>
+  <string name="connectionstate_fw">Versione firmware: %1$s</string>
   <string name="_unknown_">(sconosciuto)</string>
   <string name="test">Test</string>
   <string name="test_notification">Notifica di prova</string>
   <string name="this_is_a_test_notification_from_gadgetbridge">Notifica di prova creata da Gadgetbridge</string>
   <string name="bluetooth_is_not_supported_">Bluetooth non supportato.</string>
   <string name="bluetooth_is_disabled_">Bluetooth disabilitato.</string>
-  <string name="tap_connected_device_for_app_mananger">tocca il dispositivo connesso per gestire le App</string>
+  <string name="tap_connected_device_for_app_mananger">Tocca il dispositivo connesso per gestire le App</string>
   <string name="tap_connected_device_for_activity">Tocca il dispositivo connesso per vedere le tue attività</string>
   <string name="tap_connected_device_for_vibration">Tocca il dispositivo connesso per la vibrazione</string>
   <string name="tap_a_device_to_connect">tocca il dispositivo a cui connettersi</string>
-  <string name="cannot_connect_bt_address_invalid_">Impossibile connettersi. Indirizzo BT non valido?</string>
+  <string name="cannot_connect_bt_address_invalid_">Impossibile connettersi. Indirizzo Bluetooth non valido?</string>
   <string name="gadgetbridge_running">Gadgetbridge in esecuzione</string>
-  <string name="installing_binary_d_d">installazione del binario %1$d/%2$d</string>
-  <string name="installation_failed_">Installazione fallita!</string>
+  <string name="installing_binary_d_d">Installazione del binario %1$d/%2$d</string>
+  <string name="installation_failed_">Installazione fallita</string>
   <string name="installation_successful">installazione conclusa con successo</string>
   <string name="firmware_install_warning">STAI INSTALLANDO UN FIRMWARE, PROCEDI A TUO RISCHIO.\n\n Questo firmware è per la versione HW: %s</string>
   <string name="app_install_info">Si sta per installare la app:\n\n\n%1$s Versione %2$s di %3$s\n</string>
@@ -179,12 +181,12 @@
   <string name="pairing_already_bonded">Bonding già effettuato con %1$s (%2$s), connessione in corso...</string>
   <string name="message_cannot_pair_no_mac">Indirizzo MAC mancante, impossibile completare l\'accoppiamento.</string>
   <string name="preferences_category_device_specific_settings">Impostazioni specifiche dispositivo</string>
-  <string name="preferences_miband_settings">Impostazioni Mi Band</string>
-  <string name="male">uomo</string>
-  <string name="female">donna</string>
-  <string name="other">altro</string>
-  <string name="left">sinistro</string>
-  <string name="right">destro</string>
+  <string name="preferences_miband_settings">Impostazioni Mi Band / Bip</string>
+  <string name="male">Uomo</string>
+  <string name="female">Donna</string>
+  <string name="other">Altro</string>
+  <string name="left">Sinistro</string>
+  <string name="right">Destro</string>
   <string name="miband_pairing_using_dummy_userdata">Dati dell\'utente non inseriti, vengono usati dati d\'esempio.</string>
   <string name="miband_pairing_tap_hint">Quando la Mi Band vibra e lampeggia, dalle qualche leggero colpetto.</string>
   <string name="appinstaller_install">Installa</string>
@@ -195,7 +197,7 @@
   <string name="pref_header_vibration_count">Numero vibrazioni</string>
   <string name="title_activity_sleepmonitor">Monitoraggio del sonno</string>
   <string name="pref_write_logfiles">Salva il log su file</string>
-  <string name="initializing">inizializzazione in corso</string>
+  <string name="initializing">Inizializzazione in corso</string>
   <string name="busy_task_fetch_activity_data">Recupero dati attività</string>
   <string name="sleep_activity_date_range">Da %1$s a %2$s</string>
   <string name="miband_prefs_wearside">Indossato sul braccio sinistro o destro?</string>
@@ -302,14 +304,14 @@
   <string name="activity_prefs_gender">Genere</string>
   <string name="activity_prefs_height_cm">Altezza in cm</string>
   <string name="activity_prefs_weight_kg">Peso in kg</string>
-  <string name="authenticating">in autenticazione</string>
-  <string name="authentication_required">autenticazione necessaria</string>
+  <string name="authenticating">In autenticazione</string>
+  <string name="authentication_required">Autenticazione necessaria</string>
   <string name="appwidget_text">Zzz</string>
   <string name="add_widget">Aggiungi widget</string>
   <string name="activity_prefs_sleep_duration">Ore di sonno preferite</string>
   <string name="appwidget_alarms_set">Impostata sveglia per %1$02d:%2$02d</string>
-  <string name="device_hw">HW: %1$s</string>
-  <string name="device_fw">FW: %1$s</string>
+  <string name="device_hw">Versione Hardware: %1$s</string>
+  <string name="device_fw">Versione Firmware: %1$s</string>
   <string name="error_creating_directory_for_logfiles">Errore durante la creazione della directory per i file di log: %1$s</string>
   <string name="DEVINFO_HR_VER">HR:</string>
   <string name="updatefirmwareoperation_update_in_progress">Aggiornamento firmware in corso</string>
@@ -357,5 +359,26 @@
   <string name="miband2_prefs_timeformat">Mi2: Formato dell\'orario</string>
   <string name="mi2_fw_installhandler_fw53_hint">E\' necessario installare la verione %1$s prima di installare questo firmware!</string>
   <string name="mi2_enable_text_notifications">Notifiche</string>
-  <string name="off">spento</string>
-</resources>
+  <string name="off">Spento</string>
+<string name="action_donate">Dona</string>
+    <string name="title_activity_calblacklist">Calendari con notifiche bloccate</string>
+
+    <string name="pref_blacklist_calendars">Blocca calendari</string>
+
+    <string name="pref_title_enable_calendar_sync">Sincronizza calendari</string>
+    <string name="pref_summary_enable_calendar_sync">Mostra eveti dei calendari sulla timeline</string>
+
+    <string name="stats_x_axis_label">Minuti totali</string>
+    <string name="stats_y_axis_label">Passi al minuto</string>
+
+    <string name="calories">Calorie</string>
+    <string name="distance">Distanza</string>
+    <string name="battery">Batteria</string>
+    <string name="dateformat_date_time">Ora e data</string>
+    <string name="mi2_prefs_goal_notification">Notifica al raggiungimento dell\'obiettivo</string>
+    <string name="mi2_prefs_goal_notification_summary">Il dispositivo vibrerà quando l\'obiettivo giornaliero di passi viene raggiunto</string>
+    <string name="mi2_prefs_do_not_disturb">Non disturbare</string>
+    <string name="dbmanagementactivity_error_exporting_shared">Errore durante l\'export delle preferenze: %1$s</string>
+    <string name="dbmanagementactivity_error_importing_shared">Errore durante l\'importazione delle preferenze: %1$s</string>
+    <string name="mi2_enable_text_notifications_summary">"Devono essere installati un firmware &gt;= 1.0.1.28 e  Mili_pro.ft*."</string>
+    </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 39f384787..281652d35 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -401,4 +401,12 @@
   <string name="discovery_pair_question">お使いのデバイスとペアにする相手を選択します。 これに失敗した場合は、ペア設定をせずに再試行してください。</string>
   <string name="discovery_yes_pair">ペア</string>
   <string name="discovery_dont_pair">ペアにしない</string>
-</resources>
+<string name="fw_upgrade_notice_amazfitbip">Amazfit Bip の現在の代わりに %s のファームウェアをインストールしようとしています。
+\n
+\n.gps ファームウェア、その後 .res ファイル、そして最終的に .fw ファイルをインストールすることを確認してください。お使いのウォッチは、.fw ファイルをインストールした後に再起動します。
+\n
+\n注: これらのファイルが以前インストールされているのものと完全に同じ場合、.res と .gps をインストールする必要はありません。
+\n
+\n実験的です。あなた自身の責任で行ってください</string>
+    <string name="amazfitbip_firmware">Amazfit Bip ファームウェア%1$s</string>
+    </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a06d707a0..68d808fbb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="app_name">Gadgetbridge</string>
 
@@ -92,7 +92,7 @@
     <string name="pref_title_notifications_generic">Generic notification support</string>
     <string name="pref_title_whenscreenon">…also when screen is on</string>
     <string name="pref_title_notification_filter">Do Not Disturb</string>
-    <string name="pref_summary_notification_filter">Stop unwanted Notifications from being sent based on the Do Not Disturb mode.</string>
+    <string name="pref_summary_notification_filter">Stop unwanted Notifications from being sent based on the Do Not Disturb mode</string>
     <string name="pref_title_transliteration">Transliteration</string>
     <string name="pref_summary_transliteration">Enable this if your device has no support for your language\'s font</string>
 
@@ -351,6 +351,19 @@
     <string name="miband2_prefs_dateformat">Mi2: Date format</string>
     <string name="dateformat_time">Time</string>
     <string name="dateformat_date_time"><![CDATA[Time & date]]></string>
+    <string name="mi2_prefs_button_actions">Button actions</string>
+    <string name="mi2_prefs_button_actions_summary">Specify actions on Mi Band 2 button press</string>
+    <string name="mi2_prefs_button_press_count">Button press count</string>
+    <string name="mi2_prefs_button_press_count_summary">Number of button presses to trigger message broadcast</string>
+    <string name="mi2_prefs_button_press_broadcast">Broadcast message to send</string>
+    <string name="mi2_prefs_button_press_broadcast_summary">Broadcast message on defined number of button presses reached</string>
+    <string name="mi2_prefs_button_press_broadcast_default_value">nodomain.freeyourgadget.gadgetbridge.mibandButtonPressed</string>
+    <string name="mi2_prefs_button_action">Enable button action</string>
+    <string name="mi2_prefs_button_action_summary">Enable action on specified number of button presses</string>
+    <string name="mi2_prefs_button_action_vibrate">Enable band vibration</string>
+    <string name="mi2_prefs_button_action_vibrate_summary">Enable band vibration on button action triggered</string>
+    <string name="mi2_prefs_button_press_count_max_delay">Maximum delay between presses</string>
+    <string name="mi2_prefs_button_press_count_max_delay_summary">Maximum delay between button presses in milliseconds</string>
     <string name="mi2_prefs_goal_notification">Goal notification</string>
     <string name="mi2_prefs_goal_notification_summary">The band will vibrate when the daily steps goal is reached</string>
     <string name="mi2_prefs_display_items">Display items</string>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index c3230dd1e..a6d9f3501 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.21.0" versioncode="101">
+        <change>Initial NO.1 F1 support</change>
+        <change>Initial Teclast H30 support</change>
+        <change>Amazfit Bip: Display GPS firmware version</change>
+        <change>Amazfit Bip: Fix E-Mail notifications</change>
+        <change>Amazfit Bip: Fix call notification with unknown caller</change>
+        <change>Amazfit Bip: Fix crash when weather is updated and device reconnecting</change>
+        <change>Mi2/Bip: Fix crash when synchronizing calendar to alarms</change>
+        <change>Pebble: Fix crash when takeing screenshots on Android 8.0 (Oreo)</change>
+        <change>Pebble: Support some google app icons</change>
+        <change>Pebble: try to support spotify</change>
+        <change>Mi Band 2: Support configurable button actions</change>
+        <change>Fix language being reset to system default</change>
+    </release>
     <release version="0.20.2" versioncode="100">
         <change>Amazfit Bip: Various fixes regarding weather, add condition string support for FW 0.0.8.74</change>
         <change>Amazfit Bip: enable caller display in later firmwares</change>
diff --git a/app/src/main/res/xml/miband_preferences.xml b/app/src/main/res/xml/miband_preferences.xml
index 8419ab9ff..0dcc54924 100644
--- a/app/src/main/res/xml/miband_preferences.xml
+++ b/app/src/main/res/xml/miband_preferences.xml
@@ -30,6 +30,50 @@
             android:summary="@string/mi2_prefs_goal_notification_summary"
             android:title="@string/mi2_prefs_goal_notification" />
 
+        <PreferenceScreen
+            android:key="mi2_button_actions_key"
+            android:summary="@string/mi2_prefs_button_actions_summary"
+            android:title="@string/mi2_prefs_button_actions"
+            android:persistent="false">
+
+            <!-- workaround for missing toolbar -->
+            <PreferenceCategory
+                android:title="@string/mi2_prefs_button_action"
+                />
+
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="mi2_enable_button_action"
+                android:summary="@string/mi2_prefs_button_action_summary"
+                android:title="@string/mi2_prefs_button_action" />
+
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="mi2_button_action_vibrate"
+                android:summary="@string/mi2_prefs_button_action_vibrate_summary"
+                android:title="@string/mi2_prefs_button_action_vibrate" />
+
+            <EditTextPreference
+                android:defaultValue="6"
+                android:inputType="number"
+                android:key="mi_button_press_count"
+                android:summary="@string/mi2_prefs_button_press_count_summary"
+                android:title="@string/mi2_prefs_button_press_count" />
+
+            <EditTextPreference
+                android:defaultValue="@string/mi2_prefs_button_press_broadcast_default_value"
+                android:key="mi_button_press_broadcast"
+                android:summary="@string/mi2_prefs_button_press_broadcast_summary"
+                android:title="@string/mi2_prefs_button_press_broadcast" />
+
+            <EditTextPreference
+                android:defaultValue="2000"
+                android:inputType="number"
+                android:key="mi_button_press_count_max_delay"
+                android:summary="@string/mi2_prefs_button_press_count_max_delay_summary"
+                android:title="@string/mi2_prefs_button_press_count_max_delay" />
+        </PreferenceScreen>
+
         <EditTextPreference
             android:defaultValue="0"
             android:inputType="number"
diff --git a/fastlane/metadata/android/en-US/changelogs/101.txt b/fastlane/metadata/android/en-US/changelogs/101.txt
new file mode 100644
index 000000000..56e1a4f49
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/101.txt
@@ -0,0 +1,12 @@
+* Initial NO.1 F1 support
+* Initial Teclast H30 support
+* Amazfit Bip: Display GPS firmware version
+* Amazfit Bip: Fix E-Mail notifications
+* Amazfit Bip: Fix call notification with unknown caller
+* Amazfit Bip: Fix crash when weather is updated and device reconnecting
+* Mi2/Bip: Fix crash when synchronizing calendar to alarms
+* Pebble: Fix crash when takeing screenshots on Android 8.0 (Oreo)
+* Pebble: Support some google app icons
+* Pebble: try to support spotify
+* Mi Band 2: Support configurable button actions
+* Fix language being reset to system default