diff --git a/.travis.yml b/.travis.yml
index 522f9194d..55d4a63cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-23.0.3
+    - build-tools-25.0.2
 
     # The SDK version used to compile your project
     - android-23
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4aa956f79..8d5e09b98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ###Changelog
 
+###Version 0.18.0 (next)
+* Added Portuguese pt_PT and pt_BR translations
+* Consistently display device specific icons already during discovery
+* Add sleep chart diplaying the last week of sleep
+
 ####Version 0.17.5
 * Automatically start the service on boot (can be turned off)
 * Pebble: PebbleKit compatibility improvements (Datalogging)
diff --git a/app/build.gradle b/app/build.gradle
index efd0ed855..882c65f56 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,7 +18,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
     compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         applicationId "nodomain.freeyourgadget.gadgetbridge"
@@ -26,8 +26,8 @@ android {
         targetSdkVersion 23
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.17.5"
-        versionCode 86
+        versionName "0.18.0"
+        versionCode 87
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java
index b33d14cdb..0cd9a83af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java
@@ -19,6 +19,7 @@ import com.github.mikephil.charting.data.BarEntry;
 import com.github.mikephil.charting.data.PieData;
 import com.github.mikephil.charting.data.PieDataSet;
 import com.github.mikephil.charting.data.PieEntry;
+import com.github.mikephil.charting.formatter.IAxisValueFormatter;
 import com.github.mikephil.charting.formatter.IValueFormatter;
 
 import org.slf4j.Logger;
@@ -93,7 +94,7 @@ public abstract class AbstractWeekChartFragment extends AbstractChartFragment {
 
         BarDataSet set = new BarDataSet(entries, "");
         set.setColors(getColors());
-        set.setValueFormatter(getFormatter());
+        set.setValueFormatter(getBarValueFormatter());
 
         BarData barData = new BarData(set);
         barData.setValueTextColor(Color.GRAY); //prevent tearing other graph elements with the black text. Another approach would be to hide the values cmpletely with data.setDrawValues(false);
@@ -119,7 +120,7 @@ public abstract class AbstractWeekChartFragment extends AbstractChartFragment {
             entries.add(new PieEntry(value));
         }
 
-        set.setValueFormatter(getFormatter());
+        set.setValueFormatter(getPieValueFormatter());
         set.setColors(getColors());
 
         if (totalValue < mTargetValue) {
@@ -134,8 +135,6 @@ public abstract class AbstractWeekChartFragment extends AbstractChartFragment {
         return new DayData(data, formatPieValue((int) totalValue));
     }
 
-    protected abstract String formatPieValue(int value);
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -163,7 +162,7 @@ public abstract class AbstractWeekChartFragment extends AbstractChartFragment {
     private void setupTodayPieChart() {
         mTodayPieChart.setBackgroundColor(BACKGROUND_COLOR);
         mTodayPieChart.getDescription().setTextColor(DESCRIPTION_COLOR);
-        mTodayPieChart.getDescription().setText(getContext().getString(R.string.weeksteps_today_steps_description, String.valueOf(mTargetValue)));
+        mTodayPieChart.getDescription().setText(getPieDescription(mTargetValue));
 //        mTodayPieChart.setNoDataTextDescription("");
         mTodayPieChart.setNoDataText("");
         mTodayPieChart.getLegend().setEnabled(false);
@@ -193,7 +192,7 @@ public abstract class AbstractWeekChartFragment extends AbstractChartFragment {
         y.setDrawZeroLine(true);
         y.setSpaceBottom(0);
         y.setAxisMinimum(0);
-
+        y.setValueFormatter(getYAxisFormatter());
         y.setEnabled(true);
 
         YAxis yAxisRight = mWeekChart.getAxisRight();
@@ -291,7 +290,15 @@ public abstract class AbstractWeekChartFragment extends AbstractChartFragment {
 
     abstract float[] getTotalsForActivityAmounts(ActivityAmounts activityAmounts);
 
-    abstract IValueFormatter getFormatter();
+    abstract String formatPieValue(int value);
+
+    abstract IValueFormatter getPieValueFormatter();
+
+    abstract IValueFormatter getBarValueFormatter();
+
+    abstract IAxisValueFormatter getYAxisFormatter();
 
     abstract int[] getColors();
+
+    abstract String getPieDescription(int targetValue);
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java
index 30e1c4b55..bf237cb94 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java
@@ -1,6 +1,8 @@
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
+import com.github.mikephil.charting.components.AxisBase;
 import com.github.mikephil.charting.data.Entry;
+import com.github.mikephil.charting.formatter.IAxisValueFormatter;
 import com.github.mikephil.charting.formatter.IValueFormatter;
 import com.github.mikephil.charting.utils.ViewPortHandler;
 
@@ -18,6 +20,11 @@ public class WeekSleepChartFragment extends AbstractWeekChartFragment {
         return getString(R.string.weeksleepchart_sleep_a_week);
     }
 
+    @Override
+    String getPieDescription(int targetValue) {
+        return getString(R.string.weeksleepchart_today_sleep_description, DateTimeUtils.minutesToHHMM(targetValue));
+    }
+
     @Override
     int getGoal() {
         return 8 * 60; // FIXME
@@ -43,7 +50,7 @@ public class WeekSleepChartFragment extends AbstractWeekChartFragment {
     }
 
     @Override
-    IValueFormatter getFormatter() {
+    IValueFormatter getPieValueFormatter() {
         return new IValueFormatter() {
             @Override
             public String getFormattedValue(float value, Entry entry, int dataSetIndex, ViewPortHandler viewPortHandler) {
@@ -52,6 +59,26 @@ public class WeekSleepChartFragment extends AbstractWeekChartFragment {
         };
     }
 
+    @Override
+    IValueFormatter getBarValueFormatter() {
+        return new IValueFormatter() {
+            @Override
+            public String getFormattedValue(float value, Entry entry, int dataSetIndex, ViewPortHandler viewPortHandler) {
+                return DateTimeUtils.minutesToHHMM((int) value);
+            }
+        };
+    }
+
+    @Override
+    IAxisValueFormatter getYAxisFormatter() {
+        return new IAxisValueFormatter() {
+            @Override
+            public String getFormattedValue(float value, AxisBase axis) {
+                return DateTimeUtils.minutesToHHMM((int) value);
+            }
+        };
+    }
+
     @Override
     int[] getColors() {
         return new int[]{akDeepSleep.color, akLightSleep.color};
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java
index ee843f7bb..ea6019f6f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java
@@ -1,5 +1,6 @@
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
+import com.github.mikephil.charting.formatter.IAxisValueFormatter;
 import com.github.mikephil.charting.formatter.IValueFormatter;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -14,6 +15,11 @@ public class WeekStepsChartFragment extends AbstractWeekChartFragment {
         return getString(R.string.weekstepschart_steps_a_week);
     }
 
+    @Override
+    String getPieDescription(int targetValue) {
+        return getString(R.string.weeksteps_today_steps_description, String.valueOf(targetValue));
+    }
+
     @Override
     int getGoal() {
         GBDevice device = getChartsHost().getDevice();
@@ -39,7 +45,17 @@ public class WeekStepsChartFragment extends AbstractWeekChartFragment {
     }
 
     @Override
-    IValueFormatter getFormatter() {
+    IValueFormatter getPieValueFormatter() {
+        return null;
+    }
+
+    @Override
+    IValueFormatter getBarValueFormatter() {
+        return null;
+    }
+
+    @Override
+    IAxisValueFormatter getYAxisFormatter() {
         return null;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java
index 6781bcb07..6dbdf994c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java
@@ -78,4 +78,8 @@ public class DateTimeUtils {
     public static Calendar getCalendarUTC() {
         return GregorianCalendar.getInstance(TimeZone.getTimeZone("UTC"));
     }
+
+    public static String minutesToHHMM(int minutes) {
+        return String.format(Locale.US, "%d:%02d", minutes / 60, minutes % 60); // no I do not want to use durationformatter :P
+    }
 }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e458991e4..7af08db3d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -6,13 +6,13 @@
   <string name="action_debug">Debug</string>
   <string name="action_quit">Beenden</string>
   <string name="controlcenter_fetch_activity_data">Synchronisieren</string>
-  <string name="controlcenter_start_sleepmonitor">Schlafmonitor (ALPHA)</string>
+  <string name="controlcenter_start_sleepmonitor">Schlafaufzeichnung (ALPHA)</string>
   <string name="controlcenter_find_device">Suche verlegtes Gerät…</string>
-  <string name="controlcenter_take_screenshot">Bildschirmfoto</string>
+  <string name="controlcenter_take_screenshot">Bildschirmfoto machen</string>
   <string name="controlcenter_disconnect">Trennen</string>
-  <string name="controlcenter_delete_device">Gerät Löschen</string>
-  <string name="controlcenter_delete_device_name">%1$s Löschen</string>
-  <string name="controlcenter_delete_device_dialogmessage">Das wird das Gerät und die dazugehörigen Daten löschen!</string>
+  <string name="controlcenter_delete_device">Gerät löschen</string>
+  <string name="controlcenter_delete_device_name">%1$s löschen</string>
+  <string name="controlcenter_delete_device_dialogmessage">Das wird das Gerät und alle zugehörigen Daten löschen!</string>
   <string name="title_activity_debug">Debug</string>
   <!--Strings related to AppManager-->
   <string name="title_activity_appmanager">App Manager</string>
@@ -27,6 +27,9 @@
   <string name="appmanager_health_deactivate">deaktivieren</string>
   <string name="appmanager_hrm_activate">HRM aktivieren</string>
   <string name="appmanager_hrm_deactivate">HRM deaktivieren</string>
+  <string name="appmanager_weather_activate">System Wetter-App aktivieren</string>
+  <string name="appmanager_weather_deactivate">System Wetter-App deaktivieren</string>
+  <string name="appmanager_weather_install_provider">Installiere die Wetter-Benachrichtigungs-App</string>
   <string name="app_configure">Konfigurieren</string>
   <string name="app_move_to_top">Nach oben</string>
   <!--Strings related to AppBlacklist-->
@@ -43,27 +46,31 @@
   <string name="pref_header_general">Allgemeine Einstellungen</string>
   <string name="pref_title_general_autoconnectonbluetooth">Verbinde, wenn Bluetooth eingeschaltet wird</string>
   <string name="pref_title_general_autostartonboot">Automatisch starten</string>
-  <string name="pref_title_general_autocreonnect">Verbindungen automatisch wiederherstellen</string>
+  <string name="pref_title_general_autocreonnect">Verbindung automatisch wiederherstellen</string>
   <string name="pref_title_audo_player">Bevorzugter Audioplayer</string>
   <string name="pref_default">Standard</string>
   <string name="pref_header_datetime">Datum und Zeit</string>
   <string name="pref_title_datetime_syctimeonconnect">Uhrzeit synchronisieren</string>
-  <string name="pref_summary_datetime_syctimeonconnect">Synchronisiere die Urzeit mit dem Gerät (bei Verbindingsaufbau und wenn die Zeit oder Zeitzone auf dem Android Gerät eingestellt wird)</string>
-  <string name="pref_title_theme">Thema</string>
+  <string name="pref_summary_datetime_syctimeonconnect">Synchronisiere die Uhrzeit mit dem Gerät bei Verbindungsaufbau und wenn die Zeit oder Zeitzone auf dem Android Gerät geändert wird</string>
+  <string name="pref_title_theme">Theme</string>
   <string name="pref_theme_light">Hell</string>
   <string name="pref_theme_dark">Dunkel</string>
   <string name="pref_title_language">Sprache</string>
+  <string name="pref_title_minimize_priority">Gadgetbridge-Benachrichtigung ausblenden</string>
+  <string name="pref_summary_minimize_priority_off">Das Symbol in der Statusleiste und die Benachrichtigung auf dem Sperrbildschirm werden angezeigt</string>
+  <string name="pref_summary_minimize_priority_on">Das Symbol in der Statusleiste und die Benachrichtigung auf dem Sperrbildschirm werden nicht angezeigt</string>
   <string name="pref_header_notifications">Benachrichtigungen</string>
   <string name="pref_title_notifications_repetitions">Wiederholungen</string>
   <string name="pref_title_notifications_call">Anrufe</string>
   <string name="pref_title_notifications_sms">SMS</string>
   <string name="pref_title_notifications_pebblemsg">Pebble Nachrichten</string>
-  <string name="pref_summary_notifications_pebblemsg">Unterstützung für Anwendungen die Benachrichtigungen an die Pebble via PebbleKit senden.</string>
+  <string name="pref_summary_notifications_pebblemsg">Unterstützung für Anwendungen, die Benachrichtigungen an die Pebble via PebbleKit senden.</string>
   <string name="pref_title_notifications_generic">Andere Benachrichtigungen</string>
   <string name="pref_title_whenscreenon">… auch wenn der Bildschirm an ist</string>
   <string name="pref_title_notification_filter">Bitte nicht stören</string>
-  <string name="pref_summary_notification_filter">Stoppe unerwünschte Nachrichten, wenn im \"Nicht Stören\"-Modus</string>
-  <string name="pref_title_transliteration">Transliteration</string>
+  <string name="pref_summary_notification_filter">Benachrichtigungen nicht senden, wenn im \"Nicht Stören\"-Modus</string>
+  <string name="pref_title_transliteration">Transkription</string>
+  <string name="pref_summary_transliteration">Aktiviere dies, falls dein Gerät keine Unterstützung für den Zeichensatz deiner Sprache hat (momentan nur Kyrillisch)</string>
   <string name="always">immer</string>
   <string name="when_screen_off">wenn der Bildschirm aus ist</string>
   <string name="never">niemals</string>
@@ -72,7 +79,7 @@
   <string name="pref_call_privacy_mode_off">Zeige Name und Telefonnumer</string>
   <string name="pref_call_privacy_mode_name">Verstecke den Namen aber zeige die Telefonnummer an</string>
   <string name="pref_call_privacy_mode_complete">Verstecke Name und Telefonnummer</string>
-  <string name="pref_blacklist">Sperre für Apps</string>
+  <string name="pref_blacklist">App-Benachrichtigungen blockieren</string>
   <string name="pref_header_cannned_messages">Vorgefertigte Nachrichten</string>
   <string name="pref_title_canned_replies">Antworten</string>
   <string name="pref_title_canned_reply_suffix">Gemeinsame Endung</string>
@@ -87,35 +94,43 @@
   <string name="pref_title_pebble_sync_misfit">Misfit synchronisieren</string>
   <string name="pref_title_pebble_sync_morpheuz">Morpheuz synchronisieren</string>
   <string name="pref_title_enable_outgoing_call">Unterstützung für ausgehende Anrufe</string>
+  <string name="pref_summary_enable_outgoing_call">Falls dies deaktiviert wird, vibriert die Pebble 2/LE nicht bei ausgehenden Anrufen</string>
   <string name="pref_title_enable_pebblekit">Erlaube Zugriff von anderen Android Apps</string>
   <string name="pref_summary_enable_pebblekit">Experimentelle Unterstützung für Android Apps, die PebbleKit benutzen</string>
   <string name="pref_title_sunrise_sunset">Sonnenauf- und -untergang </string>
   <string name="pref_summary_sunrise_sunset">Sende Sonnenauf- und -untergangszeiten abhänging vom Standort auf die Pebble Timeline</string>
+  <string name="pref_title_autoremove_notifications">Verworfene Benachrichtigungen automatisch entfernen</string>
+  <string name="pref_summary_autoremove_notifications">Benachrichtigungen werden automatisch von der Pebble entfernt, wenn sie auf dem Android-Gerät verworfen werden</string>
   <string name="pref_title_pebble_privacy_mode">Privatsphäre-Modus</string>
   <string name="pref_pebble_privacy_mode_off">Normale Benachrichtigungen</string>
-  <string name="pref_pebble_privacy_mode_content">Verschiebe den Benachrichttigungstext außerhalb des Bildschirms</string>
+  <string name="pref_pebble_privacy_mode_content">Verschiebe den Benachrichtigungstext außerhalb des Bildschirms</string>
   <string name="pref_pebble_privacy_mode_complete">Zeige nur das Benachrichtigungs-Symbol</string>
   <string name="pref_header_location">Standort</string>
-  <string name="pref_title_location_aquire">Standort Bestimmen</string>
+  <string name="pref_title_location_aquire">Standort bestimmen</string>
   <string name="pref_title_location_latitude">Breitengrad</string>
   <string name="pref_title_location_longitude">Längengrad</string>
   <string name="pref_title_location_keep_uptodate">Automatisch Standort aktualisieren</string>
-  <string name="pref_summary_location_keep_uptodate">Versuche den aktuellen Standort zur Laufzeit abzufragen und nutze die gespeicherten Standort falls das fehlschlägt</string>
-  <string name="toast_enable_networklocationprovider">Bitte ungefähre Standortbestimmung einschalten</string>
+  <string name="pref_summary_location_keep_uptodate">Versuche, den aktuellen Standort abzufragen und nutze den gespeicherten Standort, falls das fehlschlägt</string>
+  <string name="toast_enable_networklocationprovider">Bitte netzwerkbasierte Standortbestimmung einschalten</string>
   <string name="toast_aqurired_networklocation">Standort wurde bestimmt</string>
   <string name="pref_title_pebble_forceprotocol">Benachrichtigungsprotokoll erzwingen</string>
-  <string name="pref_summary_pebble_forceprotocol">Diese Option erzwingt das neuste Benachrichtigungsprotokoll abhängig von der Firmwareversion. NUR EINSCHALTEN, WENN DU WEISST WAS DU TUST!</string>
+  <string name="pref_summary_pebble_forceprotocol">Diese Option erzwingt das neuste Benachrichtigungsprotokoll abhängig von der Firmwareversion. NUR EINSCHALTEN, WENN DU WEISST, WAS DU TUST!</string>
   <string name="pref_title_pebble_forceuntested">Ungetestete Features freischalten</string>
-  <string name="pref_summary_pebble_forceuntested">Schaltet ungetetestete Features frei. TU DIES NUR, WENN DU WEIßT, WAS DU TUST!</string>
+  <string name="pref_summary_pebble_forceuntested">Schaltet ungetetestete Features frei. NUR EINSCHALTEN WENN DU WEISST WAS DU TUST!</string>
   <string name="pref_title_pebble_forcele">BLE immer bevorzugen</string>
-  <string name="pref_summary_pebble_forcele">Nutze den experimentellen LE support für alle Pebbles anstelle von BT classic. Setzt voraus, dass die \"Pebble LE\" gepaart wird, nachdem die nicht-LE Pebble einmal verbunden war.</string>
+  <string name="pref_summary_pebble_forcele">Nutze den experimentellen LE support für alle Pebbles anstelle von klassischem BT. Setzt voraus, dass die \"Pebble LE\" gekoppelt wird nachdem die nicht-LE Pebble einmal verbunden war.</string>
   <string name="pref_title_pebble_mtu_limit">Pebble 2/LE GATT MTU Limit</string>
-  <string name="pref_summary_pebble_mtu_limit">Wenn deine Pebble 2/Pebble LE nicht so wie erwartet funktioniert, versuche die MTU zu begrenzen (erlaubte Werte zwischen 20–512)</string>
+  <string name="pref_summary_pebble_mtu_limit">Wenn deine Pebble 2/Pebble LE nicht so wie erwartet funktioniert, versuche die MTU zu begrenzen (erlaubte Werte 20 bis 512)</string>
   <string name="pref_title_pebble_enable_applogs">Watch App Logging einschalten</string>
-  <string name="pref_summary_pebble_enable_applogs">Schreibt logs von Watch Apps in Gadgetbridge logs (Pebble muss nach Ändern der Option erneut verbunden werden)</string>
-  <string name="pref_title_pebble_reconnect_attempts">Neuverbindungsversuche</string>
+  <string name="pref_summary_pebble_enable_applogs">Schreibt Logs von Watch Apps in Gadgetbridge-Logs (Pebble muss nach Ändern der Option erneut verbunden werden)</string>
+  <string name="pref_title_pebble_always_ack_pebblekit">nicht ausgereiftes PebbleKit ACKen</string>
+  <string name="pref_summary_pebble_always_ack_pebblekit">Nachrichten, die an externe Drittanbieter-Apps geschickt werden, werden immer und sofort bestätigt</string>
+  <string name="pref_title_pebble_reconnect_attempts">Wiederverbindungsversuche</string>
   <string name="pref_title_unit_system">Einheiten</string>
   <string name="pref_title_timeformat">Zeitformat</string>
+  <string name="pref_title_screentime">Bildschirm-An-Dauer</string>
+  <string name="prefs_title_all_day_heart_rate">Den ganzen Tag Herzfrequenz messen</string>
+  <string name="preferences_hplus_settings">HPlus/Makibes Einstellungen</string>
   <string name="not_connected">nicht verbunden</string>
   <string name="connecting">verbinde</string>
   <string name="connected">verbunden</string>
@@ -128,10 +143,10 @@
   <string name="this_is_a_test_notification_from_gadgetbridge">Dies ist eine Test Benachrichtigung von Gadgetbridge</string>
   <string name="bluetooth_is_not_supported_">Bluetooth wird nicht unterstützt.</string>
   <string name="bluetooth_is_disabled_">Bluetooth ist abgeschaltet.</string>
-  <string name="tap_connected_device_for_app_mananger">berühre das verbundene Gerät, um den App Manager zu starten</string>
-  <string name="tap_connected_device_for_activity">Tippe auf das verbundene Gerät um die Aktivitätsdaten anzuzeigen</string>
-  <string name="tap_connected_device_for_vibration">Tippe auf das verbundene Gerät um zu vibrieren</string>
-  <string name="tap_a_device_to_connect">berühre ein Gerät zum Verbinden</string>
+  <string name="tap_connected_device_for_app_mananger">Tippe auf das verbundene Gerät, um den App Manager zu starten</string>
+  <string name="tap_connected_device_for_activity">Tippe auf das verbundene Gerät, um die Aktivitätsdaten anzuzeigen</string>
+  <string name="tap_connected_device_for_vibration">Tippe auf das verbundene Gerät, um zu vibrieren</string>
+  <string name="tap_a_device_to_connect">Tippe zum Verbinden auf das gewünschte Gerät</string>
   <string name="cannot_connect_bt_address_invalid_">Verbindung kann nicht aufgebaut werden. BT Adresse ungültig?</string>
   <string name="gadgetbridge_running">Gadgetbridge läuft</string>
   <string name="installing_binary_d_d">installiere Datei %1$d/%2$d</string>
@@ -147,11 +162,15 @@
   <string name="discovery_start_scanning">Suche starten</string>
   <string name="action_discover">Neues Gerät verbinden</string>
   <string name="device_with_rssi">%1$s (%2$s)</string>
-  <string name="title_activity_android_pairing">Gerät paaren</string>
-  <string name="android_pairing_hint">Verwende den Android Bluetooth Paaren-Dialog um Dein Gerät zu paaren.</string>
-  <string name="title_activity_mi_band_pairing">Paare Dein Mi Band</string>
-  <string name="pairing">Pairing mit %s…</string>
-  <string name="message_cannot_pair_no_mac">Kein MAC Adresse bekommen, kann nicht paaren.</string>
+  <string name="title_activity_android_pairing">Gerät koppeln</string>
+  <string name="android_pairing_hint">Verwende den Android Bluetooth Kopplungsdialog um Dein Gerät zu koppeln.</string>
+  <string name="title_activity_mi_band_pairing">Kopple Dein Mi Band</string>
+  <string name="pairing">Koppeln mit %s…</string>
+  <string name="pairing_creating_bond_with">Bindung mit %1$s (%2$s) herstellen</string>
+  <string name="pairing_unable_to_pair_with">Kann nicht mit %1$s (%2$s) koppeln</string>
+  <string name="pairing_in_progress">Bindung findet statt: %1$s (%2$s)</string>
+  <string name="pairing_already_bonded">Bereits mit %1$s (%2$s) gebunden, stelle Verbindung her......</string>
+  <string name="message_cannot_pair_no_mac">Keine MAC Adresse erhalten, kann nicht koppeln.</string>
   <string name="preferences_category_device_specific_settings">Gerätespezifische Einstellungen</string>
   <string name="preferences_miband_settings">Mi Band Einstellungen</string>
   <string name="male">männlich</string>
@@ -169,18 +188,18 @@
   <string name="miband_prefs_alias">Name/Alias</string>
   <string name="pref_header_vibration_count">Anzahl der Vibrationen</string>
   <string name="title_activity_sleepmonitor">Schlafmonitor</string>
-  <string name="pref_write_logfiles">Log-Dateien schreiben</string>
+  <string name="pref_write_logfiles">Logdateien schreiben</string>
   <string name="initializing">initialisiere</string>
-  <string name="busy_task_fetch_activity_data">Hole Aktivitätsdaten</string>
+  <string name="busy_task_fetch_activity_data">Rufe Aktivitätsdaten ab</string>
   <string name="sleep_activity_date_range">Von %1$s bis %2$s</string>
-  <string name="miband_prefs_wearside">Links- oder Rechtsträger?</string>
+  <string name="miband_prefs_wearside">Linker oder rechter Arm?</string>
   <string name="pref_screen_vibration_profile">Vibrationsprofile</string>
   <string name="vibration_profile_staccato">Stakkato</string>
   <string name="vibration_profile_short">Kurz</string>
   <string name="vibration_profile_medium">Mittel</string>
   <string name="vibration_profile_long">Lang</string>
   <string name="vibration_profile_waterdrop">Wassertropfen</string>
-  <string name="vibration_profile_ring">Ring</string>
+  <string name="vibration_profile_ring">Klingel</string>
   <string name="vibration_profile_alarm_clock">Wecker</string>
   <string name="miband_prefs_vibration">Vibration</string>
   <string name="vibration_try">Test</string>
@@ -193,7 +212,7 @@
   <string name="pref_screen_notification_profile_generic_navigation">Navigation</string>
   <string name="pref_screen_notification_profile_generic_social">Soziales Netzwerk</string>
   <string name="control_center_find_lost_device">Verlegtes Gerät suchen</string>
-  <string name="control_center_cancel_to_stop_vibration">Abbrechen um die Vibration zu stoppen.</string>
+  <string name="control_center_cancel_to_stop_vibration">Abbrechen, um die Vibration zu stoppen.</string>
   <string name="title_activity_charts">Deine Aktivität</string>
   <string name="title_activity_set_alarm">Wecker stellen</string>
   <string name="controlcenter_start_configure_alarms">Wecker stellen</string>
@@ -207,7 +226,7 @@
   <string name="alarm_sat_short">Sa</string>
   <string name="alarm_smart_wakeup">Intelligenter Wecker </string>
   <string name="user_feedback_miband_set_alarms_failed">Beim Stellen der Wecker ist ein Fehler aufgetreten. Bitte erneut versuchen!</string>
-  <string name="user_feedback_miband_set_alarms_ok">Wecker wurden auf dem Gerät gestellt!</string>
+  <string name="user_feedback_miband_set_alarms_ok">Wecker wurden an das Gerät gesendet!</string>
   <string name="chart_no_data_synchronize">Keine Daten. Gerät synchronisieren?</string>
   <string name="user_feedback_miband_activity_data_transfer">%1$s an Daten werden übertragen, beginnend mit %2$s</string>
   <string name="miband_prefs_fitness_goal">Ziel Anzahl Schritte pro Tag</string>
@@ -216,14 +235,15 @@
   <string name="cannot_connect">Kann keine Verbindung herstellen: %1$s</string>
   <string name="installer_activity_unable_to_find_handler">Kann keinen Handler für die Installation dieser Datei finden.</string>
   <string name="pbw_install_handler_unable_to_install">Konnte folgende Datei nicht installieren: %1$s</string>
-  <string name="pbw_install_handler_hw_revision_mismatch">Kann die gegebene Firmware nicht installieren. Sie passt nicht zur Hardware Revision der Pebble.</string>
-  <string name="installer_activity_wait_while_determining_status">Bitte warten während der Installationsoption festgestellt wird…</string>
+  <string name="pbw_install_handler_hw_revision_mismatch">Kann die gegebene Firmware nicht installieren. Sie passt nicht zur Hardware-Revision der Pebble.</string>
+  <string name="installer_activity_wait_while_determining_status">Bitte warten, Installationsstatus wird festgestellt...</string>
   <string name="notif_battery_low_title">Gadget Akkustand niedrig!</string>
   <string name="notif_battery_low_percent">%1$s Akku übrig: %2$s%%</string>
   <string name="notif_battery_low_bigtext_last_charge_time">Zuletzt aufgeladen: %s\n</string>
   <string name="notif_battery_low_bigtext_number_of_charges">Anzahl Ladungen: %s</string>
   <string name="sleepchart_your_sleep">Dein Schlaf</string>
-  <string name="weekstepschart_steps_a_week">Schritte der Woche</string>
+  <string name="weeksleepchart_sleep_a_week">Schlaf pro Woche</string>
+  <string name="weekstepschart_steps_a_week">Schritte pro Woche</string>
   <string name="activity_sleepchart_activity_and_sleep">Deine Aktivität und Schlaf</string>
   <string name="updating_firmware">Firmware wird aktualisiert…</string>
   <string name="fwapp_install_device_not_ready">Datei kann nicht installiert werden, Gerät nicht bereit.</string>
@@ -232,20 +252,20 @@
   <string name="miband_fwinstaller_untested_version">Ungetestete Version!</string>
   <string name="fwappinstaller_connection_state">Verbindung zum Gerät: %1$s</string>
   <string name="pbw_installhandler_pebble_firmware">Pebble Firmware %1$s</string>
-  <string name="pbwinstallhandler_correct_hw_revision">Korrekte Hardware Revision</string>
-  <string name="pbwinstallhandler_incorrect_hw_revision">Falsche Hardware Revision!</string>
+  <string name="pbwinstallhandler_correct_hw_revision">Korrekte Hardware-Revision</string>
+  <string name="pbwinstallhandler_incorrect_hw_revision">Falsche Hardware-Revision!</string>
   <string name="pbwinstallhandler_app_item">%1$s (%2$s)</string>
-  <string name="updatefirmwareoperation_updateproblem_do_not_reboot">Problem mit der Firmwareübertragung: NICHT das Mi Band neu starten!</string>
+  <string name="updatefirmwareoperation_updateproblem_do_not_reboot">Problem mit der Firmwareübertragung. NICHT das Mi Band neu starten!</string>
   <string name="updatefirmwareoperation_metadata_updateproblem">Problem bei der Firmware Metadatenübertragung</string>
-  <string name="updatefirmwareoperation_update_complete">Firmware Installation erfolgreich beendet</string>
-  <string name="updatefirmwareoperation_update_complete_rebooting">Firmware Installation erfolgreich beendet, Gerät wird neu gestartet…</string>
+  <string name="updatefirmwareoperation_update_complete">Firmware-Installation erfolgreich beendet</string>
+  <string name="updatefirmwareoperation_update_complete_rebooting">Firmware-Installation erfolgreich beendet, Gerät wird neu gestartet…</string>
   <string name="updatefirmwareoperation_write_failed">Schreiben der Firmware fehlgeschlagen</string>
   <string name="chart_steps">Schritte</string>
   <string name="liveactivity_live_activity">Live Aktivität</string>
   <string name="weeksteps_today_steps_description">Schritte heute, Ziel: %1$s</string>
   <string name="pref_title_dont_ack_transfer">Transfer von Aktivitätsdaten nicht bestätigen</string>
-  <string name="pref_summary_dont_ack_transfers">Wenn der Transfer der Aktivitätsdaten nicht bestätigt wird, werden die Daten nicht auf dem Mi Band gelöscht. Das ist Sinnvoll, wenn neben Gadgetbridge noch andere Apps auf das Mi Band zugreifen.</string>
-  <string name="pref_summary_keep_data_on_device">Aktivitätsdaten verbleiben auf dem Mi Band, auch nach der Synchronisierung. Hilfreich wenn das Mi Band mit weiteren Apps verwendet wird.</string>
+  <string name="pref_summary_dont_ack_transfers">Wenn der Transfer der Aktivitätsdaten nicht bestätigt wird, werden die Daten nicht auf dem Mi Band gelöscht. Das ist sinnvoll, wenn neben Gadgetbridge noch andere Apps auf das Mi Band zugreifen.</string>
+  <string name="pref_summary_keep_data_on_device">Aktivitätsdaten verbleiben auf dem Mi Band, auch nach der Synchronisierung. Hilfreich, wenn das Mi Band mit weiteren Apps verwendet wird.</string>
   <string name="pref_title_low_latency_fw_update">Benutze Modus mit niedriger Latenz für FW-Updates</string>
   <string name="pref_summary_low_latency_fw_update">Dies kann bei Geräten helfen, bei denen Firmwareupdates fehlschlagen</string>
   <string name="live_activity_steps_history">Verlauf Schritte</string>
@@ -257,14 +277,19 @@
   <string name="abstract_chart_fragment_kind_light_sleep">Leichter Schlaf</string>
   <string name="abstract_chart_fragment_kind_deep_sleep">Tiefschlaf</string>
   <string name="abstract_chart_fragment_kind_not_worn">Nicht getragen</string>
-  <string name="device_not_connected">Nicht verbunden</string>
+  <string name="device_not_connected">Nicht verbunden.</string>
   <string name="user_feedback_all_alarms_disabled">Alle Alarme deaktiviert</string>
   <string name="pref_title_keep_data_on_device">Aktivitätsdaten auf dem Gerät lassen</string>
   <string name="miband_fwinstaller_incompatible_version">Inkompatible Firmware</string>
   <string name="fwinstaller_firmware_not_compatible_to_device">Diese Firmware ist nicht mit dem Gerät kompatibel</string>
   <string name="miband_prefs_reserve_alarm_calendar">Wecker für zukünftige Ereignisse vormerken</string>
-  <string name="miband_prefs_hr_sleep_detection">Verwende den Herzfrequenzsensor um die Schlaferkennung zu verbessern</string>
+  <string name="miband_prefs_hr_sleep_detection">Verwende den Herzfrequenzsensor, um die Schlaferkennung zu verbessern</string>
   <string name="miband_prefs_device_time_offset_hours">Zeitausgleich in Stunden (um den Schlaf von Schichtarbeitern zu erkennen)</string>
+  <string name="miband2_prefs_dateformat">Mi2: Datumsformat</string>
+  <string name="dateformat_time">Zeit</string>
+  <string name="dateformat_date_time"><![CDATA[Time & Date]]></string>
+  <string name="mi2_prefs_activate_display_on_lift">Display beim Anheben aktivieren</string>
+  <string name="FetchActivityOperation_about_to_transfer_since">Werde Daten ab %1$s übertragen.</string>
   <string name="waiting_for_reconnect">warte auf Verbindung</string>
   <string name="activity_prefs_about_you">Über Dich</string>
   <string name="activity_prefs_year_birth">Geburtsjahr</string>
@@ -285,31 +310,21 @@
   <string name="updatefirmwareoperation_firmware_not_sent">Firmware wurde nicht gesendet</string>
   <string name="charts_legend_heartrate">Herzfrequenz</string>
   <string name="live_activity_heart_rate">Herzfrequenz</string>
-  <!--Strings related to Onboading Activity-->
-  <string name="title_activity_onboarding">Datenbankimport</string>
-  <string name="import_old_db_buttonlabel">Alte Aktivitätsdaten importieren</string>
-  <string name="import_old_db_information">Seit Gadgetbridge 0.12.0 benutzen wir ein neues Datenbankformat.
-Du kannst alte Aktivitätsdaten dem zu verbindenden Gerär (%1$s.)  zuordnen\n
-\n
-Wenn Du jetzt keine alten Aktivitätsdaten importierst, kannst Du das immer noch später in dem Datenbankverwaltung Bildschirm machen, indem Du dort den \"MERGE OLD ACTIVITY DATA\" Knopf drückst.\n
-\n
-Bitte beachte, dass Du Daten vom Mi Band, Pebble Health und Morpheuz importieren kannst - aber nicht von Pebble Misfit.
-</string>
   <string name="pref_title_pebble_health_store_raw">Rohdaten in der Datenbank speichern</string>
-  <string name="pref_summary_pebble_health_store_raw">Wenn eingeschaltet, werden Daten so wie sie eingehen gespeichrt, um später noch interpretiert werden zu können. Achtung: Die Datenbank wird dadurch größer!</string>
-  <string name="action_db_management">Datenbankmanagement</string>
-  <string name="title_activity_db_management">Datenbankmanagement</string>
-  <string name="activity_db_management_merge_old_explanation">Die Aktivitätsdaten, die mit Gadgetbridge Versionen vor 0.12.0 aufgezeichnet wurden, müssen in ein neues Format umgewandelt werden.\n
-Du kannst das tun, indem du den Knopf unten drückst. Bitte beachte, dass Du mit dem  Gerät verbunden sein musst, für das Du alten Aktivitätsdaten importieren willst.\n
-Wenn Du schon deine Daten importiert hast und mit dem Ergebnis zufrieden bist, kannst du die alte Datenbank löschen.</string>
+  <string name="pref_summary_pebble_health_store_raw">Wenn eingeschaltet, werden Daten so wie sie eingehen für eine spätere analyse gespeichert. Achtung: Die Datenbank wird dadurch größer!</string>
+  <string name="action_db_management">Datenbankverwaltung</string>
+  <string name="title_activity_db_management">Datenbankverwaltung</string>
+  <string name="activity_db_management_import_export_explanation">Die Datenbankoperationen verwenden den folgenden Pfad auf dem Gerät. \nDieser Pfad ist von anderen Android-Apps und ihrem Computer aus zugreifbar. \nSie finden die exportierte Datenbank hier (bzw. legen die zu importierende dort ab):</string>
+  <string name="activity_db_management_merge_old_title">Legacy-Datenbank löschen</string>
+  <string name="dbmanagementactivvity_cannot_access_export_path">Kann nicht auf den Exportpfad zugreifen. Bitte die Entwickler kontaktieren.</string>
   <string name="dbmanagementactivity_exported_to">Exportiert nach: %1$s</string>
   <string name="dbmanagementactivity_error_exporting_db">Fehler beim Exportieren der DB: %1$s</string>
   <string name="dbmanagementactivity_import_data_title">Daten importieren?</string>
+  <string name="dbmanagementactivity_overwrite_database_confirmation">Wirklich die aktuelle Datenbank überschreiben? Alle aktuellen Aktivitätsdaten (sofern vorhanden) gehen verloren!</string>
   <string name="dbmanagementactivity_import_successful">Import erfolgreich.</string>
   <string name="dbmanagementactivity_error_importing_db">Fehler beim Importieren der DB: %1$s</string>
-  <string name="dbmanagementactivity_merging_activity_data_title">Führe Aktivitätsdaten zusammen</string>
-  <string name="dbmanagementactivity_error_importing_old_activity_data">Beim Importieren der alten Aktivitätsdaten ist ein Fehler aufgetreten! </string>
-  <string name="dbmanagementactivity_delete_activity_data_title">Alte Daten löschen?</string>
+  <string name="dbmanagementactivity_delete_activity_data_title">Aktivitätsdaten löschen?</string>
+  <string name="dbmanagementactivity_really_delete_entire_db">Wirklich die komplette Datenbank löschen? Alle Aktivitätsdaten und Informationen über Deine Geräte gehen verloren!</string>
   <string name="dbmanagementactivity_database_successfully_deleted">Daten erfolgreich gelöscht.</string>
   <string name="dbmanagementactivity_db_deletion_failed">Löschen der Datenbank fehlgeschlagen.</string>
   <string name="dbmanagementactivity_delete_old_activity_db">Alte Aktivitätsdatenbank löschen?</string>
@@ -322,5 +337,13 @@ Wenn Du schon deine Daten importiert hast und mit dem Ergebnis zufrieden bist, k
   <!--Strings related to Vibration Activity-->
   <string name="title_activity_vibration">Vibration</string>
   <!--Strings related to Pebble Pairing Activity-->
+  <string name="title_activity_pebble_pairing">Pebble-Kopplung</string>
+  <string name="pebble_pairing_hint">Ein Kopplungsdialog sollte auf dem Android-Gerät aufpoppen. Falls das nicht passiert, schau in die Benachrichtigungen und akzeptiere die Kopplungsanfrage. Akzeptiere danach die Kopplungsanfrage auf Deiner Pebble.</string>
+  <string name="pref_title_setup_bt_pairing">Bluetooth-Kopplung aktivieren</string>
+  <string name="pref_summary_setup_bt_pairing">Deaktiviere dies falls Du Probleme beim verbinden hast</string>
+  <string name="unit_metric">Metrisch</string>
+  <string name="unit_imperial">Imperial (US/UK)</string>
+  <string name="timeformat_24h">24h</string>
+  <string name="timeformat_am_pm">AM/PM</string>
   <string name="pref_screen_notification_profile_alarm_clock">Wecker</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index aa21fdae5..60730fe18 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -163,7 +163,7 @@
   <string name="action_discover">Conectar un nuevo dispositivo</string>
   <string name="device_with_rssi">%1$s (%2$s)</string>
   <string name="title_activity_android_pairing">Emparejar dispositivo</string>
-  <string name="android_pairing_hint">Usar el menú de emparejar Bluetooth de Android para emparejar el dispositivo.</string>
+  <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_creating_bond_with">Creando emparejamiento con %1$s (%2$s)</string>
@@ -241,6 +241,7 @@
   <string name="notif_battery_low_bigtext_last_charge_time">Última carga: %s \n</string>
   <string name="notif_battery_low_bigtext_number_of_charges">Número de cargas: %s</string>
   <string name="sleepchart_your_sleep">Tu sueño</string>
+  <string name="weeksleepchart_sleep_a_week">Dormir una semana</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>
@@ -308,22 +309,12 @@
   <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>
-  <!--Strings related to Onboading Activity-->
-  <string name="title_activity_onboarding">Importar Base de Datos</string>
-  <string name="import_old_db_buttonlabel">Importar datos de actividad antiguos</string>
-  <string name="import_old_db_information">Desde Gadgetbridge 0.12.0 usamos un nuevo formato de base de datos.
-Se pueden importar los antiguos datos de actividad y asociarlos con el dispositivo al que se está conectando (%1$s).\n
-\n
-Si no importas los antiguos datos de actividad ahora, siempre lo podrás hacer después seleccionando \"MERGE OLD ACTIVITY DATA\" en el apartado de gestión de base de datos de actividad.\n
-\n
-Por favor, ten en cuenta que puedes importar datos desde Mi Band, Pebble Health y Morpheuz pero NO desde Pebble Misfit.</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="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_explanation">Los datos de actividad grabados con versiones anteriores de Gadgetbridge a 0.12 deben ser convertidos a un nuevo formato. \nPuede hacerlo utilizando el botón de abajo. ¡Tenga en cuenta que debe estar conectado con el dispositivo al que desea asociar los antiguos datos de la actividad! \nSi ya importó sus datos y está satisfecho con el resultado, es posible eliminar la base de datos antigua.</string>
-  <string name="activity_db_management_merge_old_title">Importar/Borrar Base de Datos Antigua</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>
   <string name="dbmanagementactivity_exported_to">Exportado a: %1$s</string>
   <string name="dbmanagementactivity_error_exporting_db">Error exportando DB: %1$s</string>
@@ -331,12 +322,6 @@ Por favor, ten en cuenta que puedes importar datos desde Mi Band, Pebble Health
   <string name="dbmanagementactivity_overwrite_database_confirmation">¿Quiere sobreescribir la base de datos actual? Todos sus datos actuales (si los hay) se borrarán.</string>
   <string name="dbmanagementactivity_import_successful">Importado con éxito.</string>
   <string name="dbmanagementactivity_error_importing_db">Error importando DB: %1$s</string>
-  <string name="dbmanagementactivity_no_old_activitydatabase_found">No se ha encontrado una base de datos con actividad antigua, no se importará nada.</string>
-  <string name="dbmanagementactivity_no_connected_device">No hay ningún dispositivo conectado al que asociar la base de datos antigua.</string>
-  <string name="dbmanagementactivity_merging_activity_data_title">Fusionando los datos de actividad</string>
-  <string name="dbmanagementactivity_please_wait_while_merging">Por favor, espere mientras se unen las bases de datos.</string>
-  <string name="dbmanagementactivity_error_importing_old_activity_data">Error importando los datos antiguos a la nueva base de datos.</string>
-  <string name="dbmanagementactivity_associate_old_data_with_device">Asociar los datos antiguos al dispositivo</string>
   <string name="dbmanagementactivity_delete_activity_data_title">¿Quieres borrar los datos de actividad?</string>
   <string name="dbmanagementactivity_really_delete_entire_db">¿Quieres borrar la base de datos? Todos tus datos de actividad y la información sobre tus dispositivos se borrarán.</string>
   <string name="dbmanagementactivity_database_successfully_deleted">Datos borrados.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2ab027771..2e5207597 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -241,6 +241,7 @@
   <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>
   <string name="sleepchart_your_sleep">Votre sommeil</string>
+  <string name="weeksleepchart_sleep_a_week">Dormir une semaine</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>
@@ -308,25 +309,13 @@
   <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>
-  <!--Strings related to Onboading Activity-->
-  <string name="title_activity_onboarding">Importer la base de donnée</string>
-  <string name="import_old_db_buttonlabel">Importer des données d\'activité anciennes</string>
-  <string name="import_old_db_information">Depuis Gadgetbridge 0.12.0, nous utilisons un nouveau format de base de données.
-Vous êtes en mesure d\'importer des données d\'activité anciennes et de les associer à l\'appareil auquel vous vous connectez (%1$s).\n
-\n
-Si vous ne voulez pas importer les anciennes données maintenant, vous pouvez toujours le faire plus tard en appuyant sur le bouton \"FUSIONNER LES ANCIENNES DONNÉES D’ACTIVITÉ\" dans le gestionnaire de base de données\n
-\n
-Notez que vous pouvez importer des données de Mi Band, Pebble Health et Morpheuz mais PAS de Pebble Misfit.</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.\n Ce 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_explanation">Les données d\'activité enregistrées avec les versions antérieures à la 0.12 de Gadgetbridge doivent être converties en un nouveau format.\n
-Vous pouvez le faire en utilisant le bouton ci-dessous. Soyez conscient que vous devez être connecté à l\'appareil que vous souhaitez associer avec les anciennes données d\'activité !\n
-Si vous avez déjà importé vos données et êtes satisfait du résultat, vous pouvez supprimer l\'ancienne base de données.</string>
-  <string name="activity_db_management_merge_old_title">Import / Suppression des anciennes bases de données.</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>
   <string name="dbmanagementactivity_error_exporting_db">Erreur  d\'exportation BD: %1$s</string>
@@ -334,12 +323,6 @@ Si vous avez déjà importé vos données et êtes satisfait du résultat, vous
   <string name="dbmanagementactivity_overwrite_database_confirmation">Voulez-vous vraiment effacer la base de données actuelle ? Toutes vos données (si vous en avez) seront perdues.</string>
   <string name="dbmanagementactivity_import_successful">Importation réussie.</string>
   <string name="dbmanagementactivity_error_importing_db">Erreur lors de l\'importation BD: %1$s</string>
-  <string name="dbmanagementactivity_no_old_activitydatabase_found">Aucune ancienne base de données trouvée, rien à importer.</string>
-  <string name="dbmanagementactivity_no_connected_device">Pas d\'appareil connecté à associer avec l\'ancienne base de données.</string>
-  <string name="dbmanagementactivity_merging_activity_data_title">Fusion des données d\'activité</string>
-  <string name="dbmanagementactivity_please_wait_while_merging">Merci d\'attendre pendant la fusion de vos données.</string>
-  <string name="dbmanagementactivity_error_importing_old_activity_data">Échec de l\'import des anciennes données d\'activité dans la nouvelle base de données.</string>
-  <string name="dbmanagementactivity_associate_old_data_with_device">Association des anciennes données avec le nouvel appareil.</string>
   <string name="dbmanagementactivity_delete_activity_data_title">Détruire les anciennes données ?</string>
   <string name="dbmanagementactivity_really_delete_entire_db">Voulez-vous vraiment détruire entièrement la base de données ? Toutes vos données d\'activité et vos informations issues de vos appareils seront perdues.</string>
   <string name="dbmanagementactivity_database_successfully_deleted">Les données ont été effacées.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 000000000..23bab4486
--- /dev/null
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,347 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Gadgetbridge</string>
+  <string name="title_activity_controlcenter">Gadgetbridge</string>
+  <string name="action_settings">Configurações</string>
+  <string name="action_debug">Depurar</string>
+  <string name="action_quit">Sair</string>
+  <string name="controlcenter_fetch_activity_data">Sincronizar</string>
+  <string name="controlcenter_start_sleepmonitor">Monitor de sono (ALPHA)</string>
+  <string name="controlcenter_find_device">Buscando dispositivo perdido...</string>
+  <string name="controlcenter_take_screenshot">Print da tela</string>
+  <string name="controlcenter_disconnect">Desconectar</string>
+  <string name="controlcenter_delete_device">Apagar dispositivo</string>
+  <string name="controlcenter_delete_device_name">Apagar %1$s</string>
+  <string name="controlcenter_delete_device_dialogmessage">Isto irá apagar o dispositivo e apagar os dados associados!</string>
+  <string name="title_activity_debug">Depurar</string>
+  <!--Strings related to AppManager-->
+  <string name="title_activity_appmanager">Administrador de App</string>
+  <string name="appmanager_cached_watchapps_watchfaces">Apps em cache</string>
+  <string name="appmanager_installed_watchapps">Apps instalados</string>
+  <string name="appmanager_installed_watchfaces">Visores instalados</string>
+  <string name="appmananger_app_delete">Apagar</string>
+  <string name="appmananger_app_delete_cache">Apagar e remover do cache</string>
+  <string name="appmananger_app_reinstall">Reinstalar</string>
+  <string name="appmanager_app_openinstore">Buscar na loja Pebble</string>
+  <string name="appmanager_health_activate">Ativar</string>
+  <string name="appmanager_health_deactivate">Desativar</string>
+  <string name="appmanager_hrm_activate">Ativar HRM</string>
+  <string name="appmanager_hrm_deactivate">Desativar HRM</string>
+  <string name="appmanager_weather_activate">Ativas app de clima do sistema</string>
+  <string name="appmanager_weather_deactivate">Desativar app de clima do sistema</string>
+  <string name="appmanager_weather_install_provider">Instalar notificações do app de clima</string>
+  <string name="app_configure">Configurar</string>
+  <string name="app_move_to_top">Mover para o topo</string>
+  <!--Strings related to AppBlacklist-->
+  <string name="title_activity_appblacklist">Blacklist de notificações</string>
+  <!--Strings related to FwAppInstaller-->
+  <string name="title_activity_fw_app_insaller">Instalador FW/App</string>
+  <string name="fw_upgrade_notice">Você está prestes a instalar o firmware %s no lugar do atual em sua Mi Band.</string>
+  <string name="fw_multi_upgrade_notice">Você está prestes a instalar os firmwares %1$s e %2$s no lugar dos que estão atualmente na sua Mi Band.</string>
+  <string name="miband_firmware_known">O firmware foi testado e é compatível com Gadgetbridge.</string>
+  <string name="miband_firmware_unknown_warning">Este firmware não foi testado e pode não ser compatível com o Gadgetbridge..\n\nNÃO recomendamos que instale em seu Mi Band!</string>
+  <string name="miband_firmware_suggest_whitelist">Se você ainda quiser continuar e as coisas continuarem a funcionar corretamente depois, informe os desenvolvedores do Gadgetbridge para autorizar a versão do firmware: %s</string>
+  <!--Strings related to Settings-->
+  <string name="title_activity_settings">Configurações</string>
+  <string name="pref_header_general">Configurações Gerais</string>
+  <string name="pref_title_general_autoconnectonbluetooth">Conecte o dispositivo com o ligar o Bluetooth</string>
+  <string name="pref_title_general_autostartonboot">Iniciar automaticamente</string>
+  <string name="pref_title_general_autocreonnect">Reconectar automaticamente</string>
+  <string name="pref_title_audo_player">Player de música preferencial</string>
+  <string name="pref_default">Padrão</string>
+  <string name="pref_header_datetime">Data e Hora</string>
+  <string name="pref_title_datetime_syctimeonconnect">Sincronizar hora</string>
+  <string name="pref_summary_datetime_syctimeonconnect">Sincronizar horário quando o dispositivo estiver conectando ou quando o fuso horário mudar no android</string>
+  <string name="pref_title_theme">Tema</string>
+  <string name="pref_theme_light">Claro</string>
+  <string name="pref_theme_dark">Escuro</string>
+  <string name="pref_title_language">Idioma</string>
+  <string name="pref_title_minimize_priority">Ocultar notificações do Gadgetbridge</string>
+  <string name="pref_summary_minimize_priority_off">Exibir ícone na barra de status e nas notificações na tela inicial</string>
+  <string name="pref_summary_minimize_priority_on">Ocultar ícone na barra de status e nas notificações na tela inicial</string>
+  <string name="pref_header_notifications">Notificações</string>
+  <string name="pref_title_notifications_repetitions">Repetições</string>
+  <string name="pref_title_notifications_call">Chamadas de telefone</string>
+  <string name="pref_title_notifications_sms">SMS</string>
+  <string name="pref_title_notifications_pebblemsg">Mensagens do Pebble</string>
+  <string name="pref_summary_notifications_pebblemsg">Suportar notificações de aplicações que enviam notificações pelo PebbleKit.</string>
+  <string name="pref_title_notifications_generic">Suportar notificações genéricas</string>
+  <string name="pref_title_whenscreenon">... e quando a tela estiver ligada</string>
+  <string name="pref_title_notification_filter">Não perturbe</string>
+  <string name="pref_summary_notification_filter">Parar com notificações indesejadas enquanto estiver no modo Não Perturbe.</string>
+  <string name="pref_title_transliteration">Representação</string>
+  <string name="pref_summary_transliteration">Ativar isso se o dispositivo não tiver suporte para seu idioma (Atualmente Cirílico apenas)</string>
+  <string name="always">sempre</string>
+  <string name="when_screen_off">quando a tela estiver desligada</string>
+  <string name="never">nunca</string>
+  <string name="pref_header_privacy">Privacidade</string>
+  <string name="pref_title_call_privacy_mode">Modo de chamada privada</string>
+  <string name="pref_call_privacy_mode_off">Exibir nome e número</string>
+  <string name="pref_call_privacy_mode_name">Ocultar nome e exibir número</string>
+  <string name="pref_call_privacy_mode_complete">Ocultar nome e número</string>
+  <string name="pref_blacklist">Apps em Blacklist</string>
+  <string name="pref_header_cannned_messages">Histórico de mensagens</string>
+  <string name="pref_title_canned_replies">Respostas</string>
+  <string name="pref_title_canned_reply_suffix">Sufixo comum</string>
+  <string name="pref_title_canned_messages_dismisscall">Chamadas recusadas</string>
+  <string name="pref_title_canned_messages_set">Atualizar no Pebble</string>
+  <string name="pref_header_development">Opções do desenvolvedor</string>
+  <string name="pref_title_development_miaddr">Endereço do Mi Band</string>
+  <string name="pref_title_pebble_settings">Configurações Pebble</string>
+  <string name="pref_header_activitytrackers">Ativar monitores</string>
+  <string name="pref_title_pebble_activitytracker">Monitor de atividades preferido</string>
+  <string name="pref_title_pebble_sync_health">Sincronizar com Pebble Health</string>
+  <string name="pref_title_pebble_sync_misfit">Sincronizar com Misfit</string>
+  <string name="pref_title_pebble_sync_morpheuz">Sincronizar com Morpheuz</string>
+  <string name="pref_title_enable_outgoing_call">Suporta originar chamadas</string>
+  <string name="pref_summary_enable_outgoing_call">Desabilitar isso também irá impedir o Pebble 2/LE vibrar ao originar chamadas</string>
+  <string name="pref_title_enable_pebblekit">Permitir acesso a APPs Android de terceiros</string>
+  <string name="pref_summary_enable_pebblekit">Habilitar suporte experimental ao App Android que use PebbleKit</string>
+  <string name="pref_title_sunrise_sunset">Despertar e pôr do sol</string>
+  <string name="pref_summary_sunrise_sunset">Enviar despertar e pôr do sol baseado na localização do pebble</string>
+  <string name="pref_title_autoremove_notifications">Auto remover notificações rejeitadas</string>
+  <string name="pref_summary_autoremove_notifications">Notificações são automaticamente removidas quando rejeitadas no Android</string>
+  <string name="pref_title_pebble_privacy_mode">Modo de privacidade</string>
+  <string name="pref_pebble_privacy_mode_off">Notificações</string>
+  <string name="pref_pebble_privacy_mode_content">Deslocar texto de notificações que extrapolar a tela </string>
+  <string name="pref_pebble_privacy_mode_complete">Apenas mostrar ícone de notificações</string>
+  <string name="pref_header_location">Localização</string>
+  <string name="pref_title_location_aquire">Obter localização</string>
+  <string name="pref_title_location_latitude">Latitude</string>
+  <string name="pref_title_location_longitude">Longitude</string>
+  <string name="pref_title_location_keep_uptodate">Mantenha a localização atualizada</string>
+  <string name="pref_summary_location_keep_uptodate">Tente obter a localização online, use dados armazenados como fallback</string>
+  <string name="toast_enable_networklocationprovider">Por favor, habilite localização de rede</string>
+  <string name="toast_aqurired_networklocation">localização obtida</string>
+  <string name="pref_title_pebble_forceprotocol">Forçar o protocolo de notificação</string>
+  <string name="pref_summary_pebble_forceprotocol">Esta opção força o uso do protocolo de notificação mais recente. HABILITE APENAS SE SABE O QUE ESTÁ FAZENDO!</string>
+  <string name="pref_title_pebble_forceuntested">Habilitar recursos não certificados</string>
+  <string name="pref_summary_pebble_forceuntested">Habilitar recursos não certificados. FAÇA ISSO SE SOUBER O QUE REALMENTE ESTÁ FAZENDO!</string>
+  <string name="pref_title_pebble_forcele">Sempre preferir BLE</string>
+  <string name="pref_summary_pebble_forcele">Use suporte experimental do Pebble LE em vez do Bluetooth clássico, requer parear  um \"Pebble LE\" depois de que nenhum LE tenha sido conectado</string>
+  <string name="pref_title_pebble_mtu_limit">Pebble 2/LE GATT MTU limite</string>
+  <string name="pref_summary_pebble_mtu_limit">Se seu Pebble 2/Pebble LE não funciona como esperado, tente esta configuração para limitar o MTU (faixa válida 20–512)</string>
+  <string name="pref_title_pebble_enable_applogs">Ativas registro de Log do App do Relógio</string>
+  <string name="pref_summary_pebble_enable_applogs">Faz com que os logs de aplicativos de monitoramento sejam registrados por Gadgetbridge (exige reconectar)</string>
+  <string name="pref_title_pebble_always_ack_pebblekit">Prematuramente ACK PebbleKit</string>
+  <string name="pref_summary_pebble_always_ack_pebblekit">Isso fará com que as mensagens enviadas para aplicativos de terceiros sejam reconhecidas sempre e imediatamente</string>
+  <string name="pref_title_pebble_reconnect_attempts">Tentativas de Reconexão</string>
+  <string name="pref_title_unit_system">Unidades</string>
+  <string name="pref_title_timeformat">Formato da hora</string>
+  <string name="pref_title_screentime">Duração de tela</string>
+  <string name="prefs_title_all_day_heart_rate">Medição da frequência cardíaca durante todo o dia</string>
+  <string name="preferences_hplus_settings">Configurações do HPlus/Makibes</string>
+  <string name="not_connected">desconectado</string>
+  <string name="connecting">conectando</string>
+  <string name="connected">conectado</string>
+  <string name="unknown_state">estado desconhecido</string>
+  <string name="connectionstate_hw_fw">HW: %1$s FW: %2$s</string>
+  <string name="connectionstate_fw">FW: %1$s</string>
+  <string name="_unknown_">(desconhecido)</string>
+  <string name="test">Teste</string>
+  <string name="test_notification">Teste de notificação</string>
+  <string name="this_is_a_test_notification_from_gadgetbridge">Esta é uma Notificação de Teste de Gadgetbridge</string>
+  <string name="bluetooth_is_not_supported_">Bluetooth não suportado</string>
+  <string name="bluetooth_is_disabled_">Bluetooth desabilitado</string>
+  <string name="tap_connected_device_for_app_mananger">Toque no dispositivo conectado</string>
+  <string name="tap_connected_device_for_activity">Toque no dispositivo conectado</string>
+  <string name="tap_connected_device_for_vibration">Toque no dispositivo conectado para Vibração</string>
+  <string name="tap_a_device_to_connect">Toque num dispositivo para ligar</string>
+  <string name="cannot_connect_bt_address_invalid_">Não pode conectar. Endereço BT inválido?</string>
+  <string name="gadgetbridge_running">Gadgetbridge em execução</string>
+  <string name="installing_binary_d_d">Instalação binária %1$d/%2$d</string>
+  <string name="installation_failed_">falha na instalação!</string>
+  <string name="installation_successful">instalação bem sucedida</string>
+  <string name="firmware_install_warning">VOCÊ ESTÁ TENTANDO INSTALAR UM FIRMWARE, A SEU PRÓPRIO RISCO. \n\n\nEste firmware é para HW Revisão: %s</string>
+  <string name="app_install_info">Você está prestes a instalar o seguinte aplicativo: \n\n\n %1$s Versão %2$s por %3$s\n</string>
+  <string name="n_a">N/A</string>
+  <string name="initialized">inicializado</string>
+  <string name="appversion_by_creator">%1$s de %2$s</string>
+  <string name="title_activity_discovery">Dispositivo encontrado</string>
+  <string name="discovery_stop_scanning">Parar com a busca</string>
+  <string name="discovery_start_scanning">Iniciar busca</string>
+  <string name="action_discover">Conecte novo dispositivo</string>
+  <string name="device_with_rssi">%1$s (%2$s)</string>
+  <string name="title_activity_android_pairing">Parear dispositivo</string>
+  <string name="android_pairing_hint">Use a caixa de diálogo Android Bluetooth para emparelhar o dispositivo.</string>
+  <string name="title_activity_mi_band_pairing">Parear sua Mi Band</string>
+  <string name="pairing">Pareando com %s...</string>
+  <string name="pairing_creating_bond_with">Criar vínculo com %1$s (%2$s)</string>
+  <string name="pairing_unable_to_pair_with">Não é possível emparelhar com %1$s (%2$s)</string>
+  <string name="pairing_in_progress">Vinculação em andamento: %1$s (%2$s)</string>
+  <string name="pairing_already_bonded">Já ligado com %1$s (%2$s), conectando ...</string>
+  <string name="message_cannot_pair_no_mac">Nenhum endereço do mac passou, não pode emparelhar.</string>
+  <string name="preferences_category_device_specific_settings">Configurações Específicas do Dispositivo</string>
+  <string name="preferences_miband_settings">Configurações da Mi Band</string>
+  <string name="male">masculino</string>
+  <string name="female">feminino</string>
+  <string name="other">outro</string>
+  <string name="left">esquerda</string>
+  <string name="right">direita</string>
+  <string name="miband_pairing_using_dummy_userdata">Nenhum dado válido informado, usando dados fictícios por enquanto.</string>
+  <string name="miband_pairing_tap_hint">Quando a sua Mi Band vibra e pisca, toque nele algumas vezes seguidas.</string>
+  <string name="appinstaller_install">Instalar</string>
+  <string name="discovery_connected_devices_hint">Torne o dispositivo detectável. Os dispositivos atualmente conectados provavelmente não serão descobertos. No Android 6 ou posterior, é necessário ativar o local (por exemplo, GPS). Se o dispositivo não aparecer após dois minutos, tente novamente após reiniciar o dispositivo móvel.</string>
+  <string name="discovery_note">Nota:</string>
+  <string name="candidate_item_device_image">Imagem do Dispositivo</string>
+  <string name="miband_prefs_alias">Nome/Apelido</string>
+  <string name="pref_header_vibration_count">Quantidade de vibrações</string>
+  <string name="title_activity_sleepmonitor">Monitor de sono</string>
+  <string name="pref_write_logfiles">Escrever arquivos de Log</string>
+  <string name="initializing">Inicializando</string>
+  <string name="busy_task_fetch_activity_data">Adquirindo Dados de Atividades</string>
+  <string name="sleep_activity_date_range">De %1$s a %2$s</string>
+  <string name="miband_prefs_wearside">Dispositivo na esquerda ou direita?</string>
+  <string name="pref_screen_vibration_profile">Prefil de Vibração</string>
+  <string name="vibration_profile_staccato">Destacado</string>
+  <string name="vibration_profile_short">Pequeno</string>
+  <string name="vibration_profile_medium">Médio</string>
+  <string name="vibration_profile_long">Longo</string>
+  <string name="vibration_profile_waterdrop">Pingo D\'água</string>
+  <string name="vibration_profile_ring">Anel</string>
+  <string name="vibration_profile_alarm_clock">Alarme</string>
+  <string name="miband_prefs_vibration">Vibração</string>
+  <string name="vibration_try">Tente</string>
+  <string name="pref_screen_notification_profile_sms">Notificações SMS</string>
+  <string name="pref_header_vibration_settings">Configurações de vibrações</string>
+  <string name="pref_screen_notification_profile_generic">Notificação genérica</string>
+  <string name="pref_screen_notification_profile_email">Notificação de email</string>
+  <string name="pref_screen_notification_profile_incoming_call">Notificações de chamadas</string>
+  <string name="pref_screen_notification_profile_generic_chat">Bate papo</string>
+  <string name="pref_screen_notification_profile_generic_navigation">Navegação</string>
+  <string name="pref_screen_notification_profile_generic_social">Rede social</string>
+  <string name="control_center_find_lost_device">Busca Dispositivo Perdido</string>
+  <string name="control_center_cancel_to_stop_vibration">Cancele para parar a vibração</string>
+  <string name="title_activity_charts">Sua atividade</string>
+  <string name="title_activity_set_alarm">Configurar Alarmes</string>
+  <string name="controlcenter_start_configure_alarms">Configurar alarmes</string>
+  <string name="title_activity_alarm_details">Detalhes do alarme</string>
+  <string name="alarm_sun_short">Dom</string>
+  <string name="alarm_mon_short">Seg</string>
+  <string name="alarm_tue_short">Ter</string>
+  <string name="alarm_wed_short">Qua</string>
+  <string name="alarm_thu_short">Qui</string>
+  <string name="alarm_fri_short">Sex</string>
+  <string name="alarm_sat_short">Sab</string>
+  <string name="alarm_smart_wakeup">despertar inteligente</string>
+  <string name="user_feedback_miband_set_alarms_failed">Tem algum erro ao definir o alarme, tente novamente!</string>
+  <string name="user_feedback_miband_set_alarms_ok">Alarme enviado para o dispositivo!</string>
+  <string name="chart_no_data_synchronize">Sem data. Sincronizar com dispositivo?</string>
+  <string name="user_feedback_miband_activity_data_transfer">Transferir %1$s dados a partir de %2$s</string>
+  <string name="miband_prefs_fitness_goal">Objetivo de passos por dia</string>
+  <string name="dbaccess_error_executing">Erro executando \'%1$s\'</string>
+  <string name="controlcenter_start_activitymonitor">Sua Atividade (ALPHA)</string>
+  <string name="cannot_connect">Impossível conectar: %1$s</string>
+  <string name="installer_activity_unable_to_find_handler">Não foi possível encontrar um manipulador para instalar o arquivo.</string>
+  <string name="pbw_install_handler_unable_to_install">Impossível instalar o arquivo fornecido: %1$s</string>
+  <string name="pbw_install_handler_hw_revision_mismatch">Não é possível instalar o firmware fornecido: ele não corresponde à revisão do hardware do seu Pebble.</string>
+  <string name="installer_activity_wait_while_determining_status">Aguarde enquanto é determinado o status da instalação ...</string>
+  <string name="notif_battery_low_title">Gadget com bateria baixa!</string>
+  <string name="notif_battery_low_percent">%1$s bateria a: %2$s%%</string>
+  <string name="notif_battery_low_bigtext_last_charge_time">Última carga: %s \n</string>
+  <string name="notif_battery_low_bigtext_number_of_charges">Número de cargas: %s</string>
+  <string name="sleepchart_your_sleep">Seu Sono</string>
+  <string name="weekstepschart_steps_a_week">Passos na semana</string>
+  <string name="activity_sleepchart_activity_and_sleep">Sua Atividade e Sono</string>
+  <string name="updating_firmware">Atualizando Firmware...</string>
+  <string name="fwapp_install_device_not_ready">Arquivo não pode ser instalado, o dispositivo não está pronto.</string>
+  <string name="miband_installhandler_miband_firmware">Mi Band Firmware %1$s</string>
+  <string name="miband_fwinstaller_compatible_version">Versão compatível</string>
+  <string name="miband_fwinstaller_untested_version">Versão não testada!</string>
+  <string name="fwappinstaller_connection_state">Conexão com o dispositivo: %1$s</string>
+  <string name="pbw_installhandler_pebble_firmware">Pebble Firmware %1$s</string>
+  <string name="pbwinstallhandler_correct_hw_revision">Corrigir a revisão do hardware</string>
+  <string name="pbwinstallhandler_incorrect_hw_revision">Incompatibilidade de revisão de hardware!</string>
+  <string name="pbwinstallhandler_app_item">%1$s (%2$s)</string>
+  <string name="updatefirmwareoperation_updateproblem_do_not_reboot">Problema com a transferência do firmware. NÃO REBOTAR sua Mi Band!</string>
+  <string name="updatefirmwareoperation_metadata_updateproblem">Problemas ao transferir os metadados do firmware</string>
+  <string name="updatefirmwareoperation_update_complete">Instalação do Firmware completa</string>
+  <string name="updatefirmwareoperation_update_complete_rebooting">Instalação do Firmware completa, reiniciando o dispositivo...</string>
+  <string name="updatefirmwareoperation_write_failed">Falha ao instalar o Firmware</string>
+  <string name="chart_steps">Passos</string>
+  <string name="liveactivity_live_activity">Atividade ao vivo</string>
+  <string name="weeksteps_today_steps_description">Etapas de hoje, meta: %1$s</string>
+  <string name="pref_title_dont_ack_transfer">Não transferir dados da atividade ack</string>
+  <string name="pref_summary_dont_ack_transfers">Se os dados da atividade não forem chamados para a pulseira, eles não serão apagados. Útil se GB for usado em conjunto com outros aplicativos.</string>
+  <string name="pref_summary_keep_data_on_device">Manterão os dados da atividade no Mi Band mesmo após a sincronização. Útil se GB for usado em conjunto com outros aplicativos.</string>
+  <string name="pref_title_low_latency_fw_update">Use o modo de baixa latência para atualizações FW</string>
+  <string name="pref_summary_low_latency_fw_update">Isso pode ajudar em dispositivos nos quais as atualizações de firmware falham</string>
+  <string name="live_activity_steps_history">Histórico de passos</string>
+  <string name="live_activity_current_steps_per_minute">Passos/min atuais</string>
+  <string name="live_activity_total_steps">Total de passos</string>
+  <string name="live_activity_steps_per_minute_history">Histórico de passos por minuto</string>
+  <string name="live_activity_start_your_activity">Iniciar sua atividade</string>
+  <string name="abstract_chart_fragment_kind_activity">Atividade</string>
+  <string name="abstract_chart_fragment_kind_light_sleep">Sono leve</string>
+  <string name="abstract_chart_fragment_kind_deep_sleep">Sono pesado</string>
+  <string name="abstract_chart_fragment_kind_not_worn">Não utilizado</string>
+  <string name="device_not_connected">Desconectado.</string>
+  <string name="user_feedback_all_alarms_disabled">Todos os alarmes desabilitados</string>
+  <string name="pref_title_keep_data_on_device">Manter dados de atividade no dispositivo</string>
+  <string name="miband_fwinstaller_incompatible_version">Firmware incompatível</string>
+  <string name="fwinstaller_firmware_not_compatible_to_device">Este firmware não é compatível com seu dispositivo</string>
+  <string name="miband_prefs_reserve_alarm_calendar">Alarmes reservados para eventos próximos</string>
+  <string name="miband_prefs_hr_sleep_detection">Use o sensor de freqüência cardíaca para melhorar a detecção do sono</string>
+  <string name="miband_prefs_device_time_offset_hours">Desvio do tempo do dispositivo em horas (para detectar o sono dos trabalhadores por turnos)</string>
+  <string name="miband2_prefs_dateformat">Mi2: Formato de data</string>
+  <string name="dateformat_time">Hora</string>
+  <string name="dateformat_date_time"><![CDATA[Time & Date]]></string>
+  <string name="mi2_prefs_activate_display_on_lift">Ativar exibição ao levantar</string>
+  <string name="FetchActivityOperation_about_to_transfer_since">Sobre para transferir dados desde %1$s</string>
+  <string name="waiting_for_reconnect">aguarde para reconectar</string>
+  <string name="activity_prefs_about_you">Sobre você</string>
+  <string name="activity_prefs_year_birth">Ano de anoversário</string>
+  <string name="activity_prefs_gender">Gênero</string>
+  <string name="activity_prefs_height_cm">Altura em cm</string>
+  <string name="activity_prefs_weight_kg">Peso em kg</string>
+  <string name="authenticating">autenticando</string>
+  <string name="authentication_required">autenticação requerida</string>
+  <string name="appwidget_text">Zzz</string>
+  <string name="add_widget">Adicionar widget</string>
+  <string name="activity_prefs_sleep_duration">Preferir duração de sono em horas</string>
+  <string name="appwidget_alarms_set">Um alarme foi definido para %1$02d:%2$02d</string>
+  <string name="device_hw">HW: %1$s</string>
+  <string name="device_fw">FW: %1$s</string>
+  <string name="error_creating_directory_for_logfiles">Erro ao criar o diretório para arquivos de log: %1$s</string>
+  <string name="DEVINFO_HR_VER">FC:</string>
+  <string name="updatefirmwareoperation_update_in_progress">Atualização de Firmware em progresso</string>
+  <string name="updatefirmwareoperation_firmware_not_sent">Firmware não enviado</string>
+  <string name="charts_legend_heartrate">Frequência cardíaca</string>
+  <string name="live_activity_heart_rate">Frequência cardíaca</string>
+  <string name="pref_title_pebble_health_store_raw">Armazenar registro bruto no banco de dados</string>
+  <string name="pref_summary_pebble_health_store_raw">Se marcado, os dados são armazenados \"como\" e estão disponíveis para interpretação posterior. NB: a base de dados será maior neste caso!</string>
+  <string name="action_db_management">Gerenciamento de banco de dados</string>
+  <string name="title_activity_db_management">Gerenciamento de banco de dados</string>
+  <string name="activity_db_management_import_export_explanation">As operações do banco de dados usam o seguinte caminho no dispositivo.\nEste caminho está acessível a outras aplicações Android e ao seu computador.\nApós encontrar o banco de dados exportado (ou colocar o banco de dados que você deseja importar):</string>
+  <string name="dbmanagementactivvity_cannot_access_export_path">Não é possível acessar o caminho de exportação. Entre em contato com os desenvolvedores.</string>
+  <string name="dbmanagementactivity_exported_to">Exportado para: %1$s</string>
+  <string name="dbmanagementactivity_error_exporting_db">Erro ao exportar BD: %1$s</string>
+  <string name="dbmanagementactivity_import_data_title">Importar dados?</string>
+  <string name="dbmanagementactivity_overwrite_database_confirmation">Realmente sobrescrever o banco de dados atual? Todos os seus dados atuais de atividade (se houver) serão perdidos.</string>
+  <string name="dbmanagementactivity_import_successful">Sucesso ao importar.</string>
+  <string name="dbmanagementactivity_error_importing_db">Erro ao importar BD: %1$s</string>
+  <string name="dbmanagementactivity_delete_activity_data_title">Excluir Dados de Atividade?</string>
+  <string name="dbmanagementactivity_really_delete_entire_db">Excluir realmente o banco de dados inteiro? Todos os seus dados de atividade e informações sobre seus dispositivos serão perdidos.</string>
+  <string name="dbmanagementactivity_database_successfully_deleted">Dados eliminados com êxito.</string>
+  <string name="dbmanagementactivity_db_deletion_failed">Falha na eliminação do banco de dados.</string>
+  <string name="dbmanagementactivity_delete_old_activity_db">Excluir antigo banco de dados de atividades?</string>
+  <string name="dbmanagementactivity_delete_old_activitydb_confirmation">Excluir realmente o banco de dados de atividade antigo? Os dados da atividade que não foram importados serão perdidos.</string>
+  <string name="dbmanagementactivity_old_activity_db_successfully_deleted">Dados de atividade antiga excluídos com êxito.</string>
+  <string name="dbmanagementactivity_old_activity_db_deletion_failed">Falha na eliminação da base de dados da Actividade Antiga.</string>
+  <string name="dbmanagementactivity_overwrite">Sobrepor</string>
+  <string name="Cancel">Cancelar</string>
+  <string name="Delete">Apagar</string>
+  <!--Strings related to Vibration Activity-->
+  <string name="title_activity_vibration">Vibração</string>
+  <!--Strings related to Pebble Pairing Activity-->
+  <string name="title_activity_pebble_pairing">Pareando Pebble</string>
+  <string name="pebble_pairing_hint">Espera-se que um diálogo de emparelhamento apareça no seu dispositivo Android. Se isso não acontecer, procure na gaveta de notificação e aceite o pedido de emparelhamento. Depois que aceitar o pedido de emparelhamento em seu Pebble</string>
+  <string name="weather_notification_label">Certifique-se de que esta capa está ativada no aplicativo Notificação de Tempo para obter informações sobre o tempo em seu Pebble.\n\nNão é necessário configurar aqui.\n\nVocê pode ativar o aplicativo de tempo do sistema de seu Pebble do gerenciamento de aplicativos.\n\nOs relógios assistidos mostrarão o tempo automaticamente.</string>
+  <string name="pref_title_setup_bt_pairing">Ativar o emparelhamento Bluetooth</string>
+  <string name="pref_summary_setup_bt_pairing">Desactive esta opção se tiver problemas para</string>
+  <string name="unit_metric">Métrico</string>
+  <string name="unit_imperial">Imperial</string>
+  <string name="timeformat_24h">24H</string>
+  <string name="timeformat_am_pm">AM/PM</string>
+  <string name="pref_screen_notification_profile_alarm_clock">Alarme</string>
+</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 000000000..a4752e630
--- /dev/null
+++ b/app/src/main/res/values-pt/strings.xml
@@ -0,0 +1,228 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="action_settings">Configurações</string>
+  <string name="action_debug">Depurar</string>
+  <string name="action_quit">Sair</string>
+  <string name="controlcenter_fetch_activity_data">Sincronizar</string>
+  <string name="controlcenter_start_sleepmonitor">Monitor de sono (ALPHA)</string>
+  <string name="controlcenter_find_device">Buscando dispositivo perdido...</string>
+  <string name="controlcenter_take_screenshot">Print da tela</string>
+  <string name="controlcenter_disconnect">Desconectar</string>
+  <string name="controlcenter_delete_device">Apagar dispositivo</string>
+  <string name="controlcenter_delete_device_name">Apagar %1$s</string>
+  <string name="controlcenter_delete_device_dialogmessage">Isto irá apagar o dispositivo e apagar os dados associados!</string>
+  <string name="title_activity_debug">Depurar</string>
+  <!--Strings related to AppManager-->
+  <string name="title_activity_appmanager">Administrador de App</string>
+  <string name="appmanager_cached_watchapps_watchfaces">Apps em cache</string>
+  <string name="appmanager_installed_watchapps">Apps instalados</string>
+  <string name="appmanager_installed_watchfaces">Visores instalados</string>
+  <string name="appmananger_app_delete">Apagar</string>
+  <string name="appmananger_app_delete_cache">Apagar e remover do cache</string>
+  <string name="appmananger_app_reinstall">Reinstalar</string>
+  <string name="appmanager_app_openinstore">Buscar na loja Pebble</string>
+  <string name="appmanager_health_activate">Ativar</string>
+  <string name="appmanager_health_deactivate">Desativar</string>
+  <string name="appmanager_hrm_activate">Ativar HRM</string>
+  <string name="appmanager_hrm_deactivate">Desativar HRM</string>
+  <string name="appmanager_weather_activate">Ativas app de clima do sistema</string>
+  <string name="appmanager_weather_deactivate">Desativar app de clima do sistema</string>
+  <string name="appmanager_weather_install_provider">Instalar notificações do app de clima</string>
+  <string name="app_configure">Configurar</string>
+  <string name="app_move_to_top">Mover para o topo</string>
+  <!--Strings related to AppBlacklist-->
+  <string name="title_activity_appblacklist">Blacklist de notificações</string>
+  <!--Strings related to FwAppInstaller-->
+  <string name="title_activity_fw_app_insaller">Instalador FW/App</string>
+  <string name="fw_upgrade_notice">Você está prestes a instalar o firmware %s no lugar do atual em sua Mi Band.</string>
+  <string name="miband_firmware_known">O firmware foi testado e é compatível com Gadgetbridge.</string>
+  <!--Strings related to Settings-->
+  <string name="title_activity_settings">Configurações</string>
+  <string name="pref_header_general">Configurações Gerais</string>
+  <string name="pref_title_general_autoconnectonbluetooth">Conecte o dispositivo com o ligar o Bluetooth</string>
+  <string name="pref_title_general_autostartonboot">Iniciar automaticamente</string>
+  <string name="pref_title_general_autocreonnect">Reconectar automaticamente</string>
+  <string name="pref_title_audo_player">Player de música preferencial</string>
+  <string name="pref_default">Padrão</string>
+  <string name="pref_header_datetime">Data e Hora</string>
+  <string name="pref_title_datetime_syctimeonconnect">Sincronizar hora</string>
+  <string name="pref_title_theme">Tema</string>
+  <string name="pref_theme_light">Claro</string>
+  <string name="pref_theme_dark">Escuro</string>
+  <string name="pref_title_language">Idioma</string>
+  <string name="pref_title_minimize_priority">Ocultar notificações do Gadgetbridge</string>
+  <string name="pref_summary_minimize_priority_off">Exibir ícone na barra de status e nas notificações na tela inicial</string>
+  <string name="pref_summary_minimize_priority_on">Ocultar ícone na barra de status e nas notificações na tela inicial</string>
+  <string name="pref_header_notifications">Notificações</string>
+  <string name="pref_title_notifications_repetitions">Repetições</string>
+  <string name="pref_title_notifications_call">Chamadas de telefone</string>
+  <string name="pref_title_notifications_sms">SMS</string>
+  <string name="pref_title_notifications_pebblemsg">Mensagens do Pebble</string>
+  <string name="pref_summary_notifications_pebblemsg">Suportar notificações de aplicações que enviam notificações pelo PebbleKit.</string>
+  <string name="pref_title_notifications_generic">Suportar notificações genéricas</string>
+  <string name="pref_title_whenscreenon">... e quando a tela estiver ligada</string>
+  <string name="pref_title_notification_filter">Não perturbe</string>
+  <string name="pref_summary_notification_filter">Parar com notificações indesejadas enquanto estiver no modo Não Perturbe.</string>
+  <string name="always">sempre</string>
+  <string name="when_screen_off">quando a tela estiver desligada</string>
+  <string name="never">nunca</string>
+  <string name="pref_header_privacy">Privacidade</string>
+  <string name="pref_title_call_privacy_mode">Modo de chamada privada</string>
+  <string name="pref_call_privacy_mode_off">Exibir nome e número</string>
+  <string name="pref_call_privacy_mode_name">Ocultar nome e exibir número</string>
+  <string name="pref_call_privacy_mode_complete">Ocultar nome e número</string>
+  <string name="pref_blacklist">Apps em Blacklist</string>
+  <string name="pref_header_cannned_messages">Histórico de mensagens</string>
+  <string name="pref_title_canned_replies">Respostas</string>
+  <string name="pref_title_canned_reply_suffix">Sufixo comum</string>
+  <string name="pref_title_canned_messages_dismisscall">Chamadas recusadas</string>
+  <string name="pref_title_canned_messages_set">Atualizar no Pebble</string>
+  <string name="pref_header_development">Opções do desenvolvedor</string>
+  <string name="pref_title_development_miaddr">Endereço do Mi Band</string>
+  <string name="pref_title_pebble_settings">Configurações Pebble</string>
+  <string name="pref_header_activitytrackers">Ativar monitores</string>
+  <string name="pref_title_pebble_activitytracker">Monitor de atividades preferido</string>
+  <string name="pref_title_pebble_sync_health">Sincronizar com Pebble Health</string>
+  <string name="pref_title_pebble_sync_misfit">Sincronizar com Misfit</string>
+  <string name="pref_title_pebble_sync_morpheuz">Sincronizar com Morpheuz</string>
+  <string name="pref_summary_enable_pebblekit">Habilitar suporte experimental ao App Android que use PebbleKit</string>
+  <string name="pref_title_sunrise_sunset">Despertar e pôr do sol</string>
+  <string name="pref_summary_sunrise_sunset">Enviar despertar e pôr do sol baseado na localização do pebble</string>
+  <string name="pref_title_autoremove_notifications">Auto remover notificações rejeitadas</string>
+  <string name="pref_summary_autoremove_notifications">Notificações são automaticamente removidas quando rejeitadas no Android</string>
+  <string name="pref_title_pebble_privacy_mode">Modo de privacidade</string>
+  <string name="pref_pebble_privacy_mode_off">Notificações</string>
+  <string name="pref_pebble_privacy_mode_content">Deslocar texto de notificações que extrapolar a tela </string>
+  <string name="pref_pebble_privacy_mode_complete">Apenas mostrar ícone de notificações</string>
+  <string name="pref_header_location">Localização</string>
+  <string name="pref_title_location_aquire">Obter localização</string>
+  <string name="pref_title_location_latitude">Latitude</string>
+  <string name="pref_title_location_longitude">Longitude</string>
+  <string name="pref_title_location_keep_uptodate">Mantenha a localização atualizada</string>
+  <string name="pref_summary_location_keep_uptodate">Tente obter a localização online, use dados armazenados como fallback</string>
+  <string name="toast_enable_networklocationprovider">Por favor, habilite localização de rede</string>
+  <string name="toast_aqurired_networklocation">localização obtida</string>
+  <string name="pref_title_pebble_forceprotocol">Forçar o protocolo de notificação</string>
+  <string name="pref_summary_pebble_forceprotocol">Esta opção força o uso do protocolo de notificação mais recente. HABILITE APENAS SE SABE O QUE ESTÁ FAZENDO!</string>
+  <string name="pref_title_pebble_forceuntested">Habilitar recursos não certificados</string>
+  <string name="pref_summary_pebble_forceuntested">Habilitar recursos não certificados. FAÇA ISSO SE SOUBER O QUE REALMENTE ESTÁ FAZENDO!</string>
+  <string name="pref_title_pebble_forcele">Sempre preferir BLE</string>
+  <string name="pref_title_unit_system">Unidades</string>
+  <string name="pref_title_timeformat">Formato da hora</string>
+  <string name="pref_title_screentime">Duração de tela</string>
+  <string name="not_connected">desconectado</string>
+  <string name="connecting">conectando</string>
+  <string name="connected">conectado</string>
+  <string name="unknown_state">estado desconhecido</string>
+  <string name="test">Teste</string>
+  <string name="test_notification">Teste de notificação</string>
+  <string name="bluetooth_is_not_supported_">Bluetooth não suportado</string>
+  <string name="bluetooth_is_disabled_">Bluetooth desabilitado</string>
+  <string name="installation_failed_">falha na instalação!</string>
+  <string name="installation_successful">instalação bem sucedida</string>
+  <string name="initialized">inicializado</string>
+  <string name="title_activity_discovery">Dispositivo encontrado</string>
+  <string name="discovery_stop_scanning">Parar com a busca</string>
+  <string name="discovery_start_scanning">Iniciar busca</string>
+  <string name="action_discover">Conecte novo dispositivo</string>
+  <string name="title_activity_android_pairing">Parear dispositivo</string>
+  <string name="pairing">Pareando com %s...</string>
+  <string name="male">masculino</string>
+  <string name="female">feminino</string>
+  <string name="other">outro</string>
+  <string name="left">esquerda</string>
+  <string name="right">direita</string>
+  <string name="appinstaller_install">Instalar</string>
+  <string name="discovery_note">Nota:</string>
+  <string name="miband_prefs_alias">Nome/Apelido</string>
+  <string name="pref_header_vibration_count">Quantidade de vibrações</string>
+  <string name="title_activity_sleepmonitor">Monitor de sono</string>
+  <string name="pref_write_logfiles">Escrever arquivos de Log</string>
+  <string name="initializing">Inicializando</string>
+  <string name="vibration_profile_short">Pequeno</string>
+  <string name="vibration_profile_medium">Médio</string>
+  <string name="vibration_profile_long">Longo</string>
+  <string name="vibration_profile_alarm_clock">Alarme</string>
+  <string name="miband_prefs_vibration">Vibração</string>
+  <string name="vibration_try">Tente</string>
+  <string name="pref_screen_notification_profile_sms">Notificações SMS</string>
+  <string name="pref_header_vibration_settings">Configurações de vibrações</string>
+  <string name="pref_screen_notification_profile_generic">Notificação genérica</string>
+  <string name="pref_screen_notification_profile_email">Notificação de email</string>
+  <string name="pref_screen_notification_profile_incoming_call">Notificações de chamadas</string>
+  <string name="pref_screen_notification_profile_generic_chat">Bate papo</string>
+  <string name="pref_screen_notification_profile_generic_navigation">Navegação</string>
+  <string name="pref_screen_notification_profile_generic_social">Rede social</string>
+  <string name="title_activity_charts">Sua atividade</string>
+  <string name="title_activity_set_alarm">Configurar Alarmes</string>
+  <string name="controlcenter_start_configure_alarms">Configurar alarmes</string>
+  <string name="title_activity_alarm_details">Detalhes do alarme</string>
+  <string name="alarm_sun_short">Dom</string>
+  <string name="alarm_mon_short">Seg</string>
+  <string name="alarm_tue_short">Ter</string>
+  <string name="alarm_wed_short">Qua</string>
+  <string name="alarm_thu_short">Qui</string>
+  <string name="alarm_fri_short">Sex</string>
+  <string name="alarm_sat_short">Sab</string>
+  <string name="alarm_smart_wakeup">despertar inteligente</string>
+  <string name="user_feedback_miband_set_alarms_failed">Tem algum erro ao definir o alarme, tente novamente!</string>
+  <string name="user_feedback_miband_set_alarms_ok">Alarme enviado para o dispositivo!</string>
+  <string name="chart_no_data_synchronize">Sem data. Sincronizar com dispositivo?</string>
+  <string name="miband_prefs_fitness_goal">Objetivo de passos por dia</string>
+  <string name="controlcenter_start_activitymonitor">Sua Atividade (ALPHA)</string>
+  <string name="installer_activity_unable_to_find_handler">Não foi possível encontrar um manipulador para instalar o arquivo.</string>
+  <string name="notif_battery_low_title">Gadget com bateria baixa!</string>
+  <string name="sleepchart_your_sleep">Seu Sono</string>
+  <string name="weekstepschart_steps_a_week">Passos na semana</string>
+  <string name="activity_sleepchart_activity_and_sleep">Sua Atividade e Sono</string>
+  <string name="updating_firmware">Atualizando Firmware...</string>
+  <string name="fwapp_install_device_not_ready">Arquivo não pode ser instalado, o dispositivo não está pronto.</string>
+  <string name="miband_fwinstaller_compatible_version">Versão compatível</string>
+  <string name="miband_fwinstaller_untested_version">Versão não testada!</string>
+  <string name="updatefirmwareoperation_metadata_updateproblem">Problemas ao transferir os metadados do firmware</string>
+  <string name="updatefirmwareoperation_update_complete">Instalação do Firmware completa</string>
+  <string name="updatefirmwareoperation_update_complete_rebooting">Instalação do Firmware completa, reiniciando o dispositivo...</string>
+  <string name="updatefirmwareoperation_write_failed">Falha ao instalar o Firmware</string>
+  <string name="chart_steps">Passos</string>
+  <string name="liveactivity_live_activity">Atividade ao vivo</string>
+  <string name="live_activity_steps_history">Histórico de passos</string>
+  <string name="live_activity_current_steps_per_minute">Passos/min atuais</string>
+  <string name="live_activity_total_steps">Total de passos</string>
+  <string name="live_activity_steps_per_minute_history">Histórico de passos por minuto</string>
+  <string name="live_activity_start_your_activity">Iniciar sua atividade</string>
+  <string name="abstract_chart_fragment_kind_activity">Atividade</string>
+  <string name="abstract_chart_fragment_kind_light_sleep">Sono leve</string>
+  <string name="abstract_chart_fragment_kind_deep_sleep">Sono pesado</string>
+  <string name="abstract_chart_fragment_kind_not_worn">Não utilizado</string>
+  <string name="device_not_connected">Desconectado.</string>
+  <string name="user_feedback_all_alarms_disabled">Todos os alarmes desabilitados</string>
+  <string name="pref_title_keep_data_on_device">Manter dados de atividade no dispositivo</string>
+  <string name="miband_fwinstaller_incompatible_version">Firmware incompatível</string>
+  <string name="fwinstaller_firmware_not_compatible_to_device">Este firmware não é compatível com seu dispositivo</string>
+  <string name="miband_prefs_reserve_alarm_calendar">Alarmes reservados para eventos próximos</string>
+  <string name="dateformat_time">Hora</string>
+  <string name="waiting_for_reconnect">aguarde para reconectar</string>
+  <string name="activity_prefs_about_you">Sobre você</string>
+  <string name="activity_prefs_year_birth">Ano de anoversário</string>
+  <string name="activity_prefs_gender">Gênero</string>
+  <string name="activity_prefs_height_cm">Altura em cm</string>
+  <string name="activity_prefs_weight_kg">Peso em kg</string>
+  <string name="authenticating">autenticando</string>
+  <string name="authentication_required">autenticação requerida</string>
+  <string name="add_widget">Adicionar widget</string>
+  <string name="activity_prefs_sleep_duration">Preferir duração de sono em horas</string>
+  <string name="updatefirmwareoperation_update_in_progress">Atualização de Firmware em progresso</string>
+  <string name="updatefirmwareoperation_firmware_not_sent">Firmware não enviado</string>
+  <string name="dbmanagementactivity_import_data_title">Importar dados?</string>
+  <string name="dbmanagementactivity_import_successful">Sucesso ao importar.</string>
+  <string name="dbmanagementactivity_overwrite">Sobrepor</string>
+  <string name="Cancel">Cancelar</string>
+  <string name="Delete">Apagar</string>
+  <!--Strings related to Vibration Activity-->
+  <string name="title_activity_vibration">Vibração</string>
+  <!--Strings related to Pebble Pairing Activity-->
+  <string name="title_activity_pebble_pairing">Pareando Pebble</string>
+  <string name="unit_metric">Métrico</string>
+  <string name="unit_imperial">Imperial</string>
+  <string name="pref_screen_notification_profile_alarm_clock">Alarme</string>
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 57f1da2e4..254e7ad16 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -10,19 +10,28 @@
   <string name="controlcenter_find_device">Знайти загублений пристрій…</string>
   <string name="controlcenter_take_screenshot">Зробити знімок екрану</string>
   <string name="controlcenter_disconnect">Від\'єднатися</string>
+  <string name="controlcenter_delete_device">Вилучити пристрій</string>
+  <string name="controlcenter_delete_device_name">Вилучити %1$s</string>
+  <string name="controlcenter_delete_device_dialogmessage">Це вилучить пристрій та всі пов\'язані з ним дані!</string>
   <string name="title_activity_debug">Зневадження</string>
   <!--Strings related to AppManager-->
   <string name="title_activity_appmanager">App Manager</string>
+  <string name="appmanager_installed_watchapps">Встановлені додатки</string>
   <string name="appmananger_app_delete">Вилучити</string>
+  <string name="appmananger_app_delete_cache">Вилучити та очистити з кешу</string>
   <string name="appmananger_app_reinstall">Перевстановити</string>
+  <string name="appmanager_app_openinstore">Пошук в Pebble Appstore</string>
   <string name="appmanager_health_activate">Увімкнути</string>
   <string name="appmanager_health_deactivate">Вимкнути</string>
+  <string name="appmanager_hrm_activate">Увімкнути HRM</string>
+  <string name="appmanager_hrm_deactivate">Вимкнути HRM</string>
   <string name="app_configure">Конфігурація</string>
   <!--Strings related to AppBlacklist-->
   <string name="title_activity_appblacklist">Перелік заблокованих сповіщень</string>
   <!--Strings related to FwAppInstaller-->
   <string name="title_activity_fw_app_insaller">Встановлення мікропрограми</string>
   <string name="fw_upgrade_notice">Ви збираєтесь встановити мікропрограму %s на заміну поточній Вашого Mi–Band</string>
+  <string name="fw_multi_upgrade_notice">Ви збираєтесь встановити мікропрограми %1$s та %2$s на заміну поточній Вашого Mi–Band</string>
   <string name="miband_firmware_known">Ця мікропрограма була перевірена на сумісність із Gadgetbridge</string>
   <string name="miband_firmware_unknown_warning">Ця мікропрограма не перевірялася і може бути не сумісною із Gadgetbridge.\n\nНе рекомендується встановлювати її на Ваш Mi–Band</string>
   <string name="miband_firmware_suggest_whitelist">Якщо ж Ви вирішили продовжити та все працює, будь ласка, повідомте про це розробникам, аби відмітити цю версію мікропрограми сумісною: %s</string>
@@ -30,6 +39,7 @@
   <string name="title_activity_settings">Параметри</string>
   <string name="pref_header_general">Загальні параметри</string>
   <string name="pref_title_general_autoconnectonbluetooth">З\'єднання із пристроєм при активації Bluetooth</string>
+  <string name="pref_title_general_autostartonboot">Запускатися автоматично</string>
   <string name="pref_title_general_autocreonnect">Перепід\'єднуватись автоматично</string>
   <string name="pref_title_audo_player">Переважний музичний програвач</string>
   <string name="pref_default">Типовий</string>
@@ -51,6 +61,7 @@
   <string name="always">завжди</string>
   <string name="when_screen_off">коли екран вимкнуто</string>
   <string name="never">ніколи</string>
+  <string name="pref_header_privacy">Приавтність</string>
   <string name="pref_blacklist">Перелік заблокованих додатків</string>
   <string name="pref_title_canned_replies">Відповіді</string>
   <string name="pref_title_canned_reply_suffix">Загальний суфікс</string>
@@ -74,6 +85,7 @@
   <string name="pref_title_pebble_forceuntested">Увімкнути не перевірені можливості</string>
   <string name="pref_summary_pebble_forceuntested">Увімкнути функції, які ще не перевірені. ВМИКАЙТЕ НА СВІЙ СТРАХ ТА РИЗИК!</string>
   <string name="pref_title_pebble_reconnect_attempts">Спроби повторного з\'єднання</string>
+  <string name="pref_title_timeformat">Формат часу</string>
   <string name="not_connected">немає з\'єднання</string>
   <string name="connecting">з\'єднання…</string>
   <string name="connected">з\'єднано</string>
@@ -137,6 +149,9 @@
   <string name="pref_header_vibration_settings">Параметри вібро</string>
   <string name="pref_screen_notification_profile_generic">Загальні сповіщення</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>
   <string name="control_center_find_lost_device">Знайти загублений пристрій</string>
   <string name="control_center_cancel_to_stop_vibration">Скасуйте, аби зупинити вібро</string>
   <string name="title_activity_charts">Ваша активність</string>
@@ -214,8 +229,11 @@
   <string name="add_widget">Додати віджет</string>
   <string name="device_hw">Пристрій: %1$s</string>
   <string name="device_fw">ПЗ: %1$s</string>
-  <!--Strings related to Onboading Activity-->
+  <string name="Cancel">Скасувати</string>
   <string name="Delete">Вилучити</string>
   <!--Strings related to Vibration Activity-->
+  <string name="title_activity_vibration">Вібрація</string>
   <!--Strings related to Pebble Pairing Activity-->
+  <string name="timeformat_24h">24г</string>
+  <string name="timeformat_am_pm">ДП/ПП</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fbbe82e27..b00ed98d4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -278,6 +278,7 @@
     <string name="notif_battery_low_bigtext_number_of_charges">Number of charges: %s</string>
     <string name="sleepchart_your_sleep">Your Sleep</string>
     <string name="weeksleepchart_sleep_a_week">Sleep a week</string>
+    <string name="weeksleepchart_today_sleep_description">Sleep today, target: %1$s</string>
     <string name="weekstepschart_steps_a_week">Steps a week</string>
     <string name="activity_sleepchart_activity_and_sleep">Your Activity and Sleep</string>
     <string name="updating_firmware">Updating Firmware…</string>
diff --git a/build.gradle b/build.gradle
index 7a65513e1..ebd0dcb63 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d1128303b..a36803658 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 16 21:39:39 CEST 2016
+#Fri Mar 03 09:26:56 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip