diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb5dc66af..b5a608e7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,13 @@
 
 ###Version 0.18.0 (next)
 * Add Portuguese pt_PT and pt_BR translations
+* Add Czech translation
 * Add Hebrew translation and transliteration
 * Consistently display device specific icons already during discovery
 * Add sleep chart diplaying the last week of sleep
 * Huge speedup for weekly charts when changing days
 * Drop support for pre Gadgetbride 0.12.0 database
+* Pebble: allow configuration webpages (clay) to access device location
 
 ####Version 0.17.5
 * Automatically start the service on boot (can be turned off)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
index cd62c9f17..b97e2ae7a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
@@ -54,6 +54,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_HEIGHT_CM;
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_SLEEP_DURATION;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_STEPS_GOAL;
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_WEIGHT_KG;
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_YEAR_OF_BIRTH;
 
@@ -283,6 +284,7 @@ public class SettingsActivity extends AbstractSettingsActivity {
                 PREF_USER_HEIGHT_CM,
                 PREF_USER_WEIGHT_KG,
                 PREF_USER_SLEEP_DURATION,
+                PREF_USER_STEPS_GOAL,
         };
     }
 
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 b0e4c625e..8e6e5623d 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
@@ -24,10 +24,12 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
 
 import java.util.concurrent.TimeUnit;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityAmount;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityAmounts;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
 
 public class WeekSleepChartFragment extends AbstractWeekChartFragment {
@@ -43,7 +45,7 @@ public class WeekSleepChartFragment extends AbstractWeekChartFragment {
 
     @Override
     int getGoal() {
-        return 8 * 60; // FIXME
+        return GBApplication.getPrefs().getInt(ActivityUser.PREF_USER_SLEEP_DURATION, 8) * 60;
     }
 
     @Override
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 901736c5b..143ad9cfa 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
@@ -20,11 +20,11 @@ package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 import com.github.mikephil.charting.formatter.IAxisValueFormatter;
 import com.github.mikephil.charting.formatter.IValueFormatter;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityAmount;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityAmounts;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
 
 public class WeekStepsChartFragment extends AbstractWeekChartFragment {
     @Override
@@ -39,11 +39,7 @@ public class WeekStepsChartFragment extends AbstractWeekChartFragment {
 
     @Override
     int getGoal() {
-        GBDevice device = getChartsHost().getDevice();
-        if (device != null) {
-            return MiBandCoordinator.getFitnessGoal(device.getAddress());
-        }
-        return -1;
+        return GBApplication.getPrefs().getInt(ActivityUser.PREF_USER_STEPS_GOAL, 10000);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
index 98076b371..44ae13039 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
@@ -29,7 +29,6 @@ public final class MiBandConst {
     public static final String PREF_MIBAND_WEARSIDE = "mi_wearside";
     public static final String PREF_MIBAND_ADDRESS = "development_miaddr";  // FIXME: should be prefixed mi_
     public static final String PREF_MIBAND_ALARMS = "mi_alarms";
-    public static final String PREF_MIBAND_FITNESS_GOAL = "mi_fitness_goal";
     public static final String PREF_MIBAND_DONT_ACK_TRANSFER = "mi_dont_ack_transfer";
     public static final String PREF_MIBAND_RESERVE_ALARM_FOR_CALENDAR = "mi_reserve_alarm_calendar";
     public static final String PREF_MIBAND_USE_HR_FOR_SLEEP_DETECTION = "mi_hr_sleep_detection";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
index a9276fd9f..e9cd706c9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
@@ -237,11 +237,6 @@ public class MiBandCoordinator extends AbstractDeviceCoordinator {
         return prefs.getBoolean(MiBandConst.PREF_MIBAND_USE_HR_FOR_SLEEP_DETECTION, false);
     }
 
-    public static int getFitnessGoal(String miBandAddress) throws IllegalArgumentException {
-        Prefs prefs = GBApplication.getPrefs();
-        return prefs.getInt(MiBandConst.PREF_MIBAND_FITNESS_GOAL, 10000);
-    }
-
     public static int getReservedAlarmSlots(String miBandAddress) throws IllegalArgumentException {
         Prefs prefs = GBApplication.getPrefs();
         return prefs.getInt(MiBandConst.PREF_MIBAND_RESERVE_ALARM_FOR_CALENDAR, 0);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
index 7802c9bc7..f9cb2439d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
@@ -30,6 +30,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.AbstractSettingsActivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
@@ -40,7 +41,6 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PR
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DATEFORMAT;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_ADDRESS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_DEVICE_TIME_OFFSET_HOURS;
-import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_FITNESS_GOAL;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_RESERVE_ALARM_FOR_CALENDAR;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_USE_HR_FOR_SLEEP_DETECTION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_USER_ALIAS;
@@ -93,14 +93,14 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity {
             }
         });
 
-        final Preference fitnessGoal = findPreference(PREF_MIBAND_FITNESS_GOAL);
+        final Preference fitnessGoal = findPreference(ActivityUser.PREF_USER_STEPS_GOAL);
         fitnessGoal.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newVal) {
                 invokeLater(new Runnable() {
                     @Override
                     public void run() {
-                        GBApplication.deviceService().onSendConfiguration(PREF_MIBAND_FITNESS_GOAL);
+                        GBApplication.deviceService().onSendConfiguration(ActivityUser.PREF_USER_STEPS_GOAL);
                     }
                 });
                 return true;
@@ -160,7 +160,7 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity {
         Set<String> prefKeys = new HashSet<>();
         prefKeys.add(PREF_USER_ALIAS);
         prefKeys.add(PREF_MIBAND_ADDRESS);
-        prefKeys.add(PREF_MIBAND_FITNESS_GOAL);
+        prefKeys.add(ActivityUser.PREF_USER_STEPS_GOAL);
         prefKeys.add(PREF_MIBAND_RESERVE_ALARM_FOR_CALENDAR);
         prefKeys.add(PREF_MIBAND_DEVICE_TIME_OFFSET_HOURS);
         prefKeys.add(getNotificationPrefKey(VIBRATION_COUNT, ORIGIN_ALARM_CLOCK));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
index 134e0b70f..3a886d371 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
@@ -22,7 +22,6 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
-import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
@@ -58,7 +57,7 @@ public class ActivityUser {
     public static final String PREF_USER_HEIGHT_CM = "activity_user_height_cm";
     public static final String PREF_USER_WEIGHT_KG = "activity_user_weight_kg";
     public static final String PREF_USER_SLEEP_DURATION = "activity_user_sleep_duration";
-    public static final String PREF_USER_STEPS_GOAL = MiBandConst.PREF_MIBAND_FITNESS_GOAL;
+    public static final String PREF_USER_STEPS_GOAL = "mi_fitness_goal"; // FIXME: for compatibility
 
     public ActivityUser() {
         fetchPreferences();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
index 23e457b17..7f78dc80e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
@@ -33,6 +33,7 @@ public class AppNotificationType extends HashMap<String, NotificationType> {
     private AppNotificationType() {
         // Generic Email
         put("com.fsck.k9", NotificationType.GENERIC_EMAIL);
+        put("com.imaeses.squeaky", NotificationType.GENERIC_EMAIL);
         put("com.android.email", NotificationType.GENERIC_EMAIL);
 
         // Generic SMS
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
index 732c4cc1b..fcb5e0092 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
@@ -59,6 +59,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBAlarm;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice.State;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEvents;
@@ -386,7 +387,7 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
         LOG.info("Attempting to set Fitness Goal...");
         BluetoothGattCharacteristic characteristic = getCharacteristic(MiBandService.UUID_CHARACTERISTIC_CONTROL_POINT);
         if (characteristic != null) {
-            int fitnessGoal = MiBandCoordinator.getFitnessGoal(getDevice().getAddress());
+            int fitnessGoal = GBApplication.getPrefs().getInt(ActivityUser.PREF_USER_STEPS_GOAL, 10000);
             transaction.write(characteristic, new byte[]{
                     MiBandService.COMMAND_SET_FITNESS_GOAL,
                     0,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java
index 31e6f44dc..8b8a04ce3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java
@@ -63,6 +63,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.User;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBAlarm;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice.State;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEvents;
@@ -332,7 +333,7 @@ public class MiBand2Support extends AbstractBTLEDeviceSupport {
         LOG.info("Attempting to set Fitness Goal...");
         BluetoothGattCharacteristic characteristic = getCharacteristic(MiBand2Service.UUID_UNKNOWN_CHARACTERISTIC8);
         if (characteristic != null) {
-            int fitnessGoal = MiBandCoordinator.getFitnessGoal(getDevice().getAddress());
+            int fitnessGoal = GBApplication.getPrefs().getInt(ActivityUser.PREF_USER_STEPS_GOAL, 10000);
             byte[] bytes = ArrayUtils.addAll(
                     MiBand2Service.COMMAND_SET_FITNESS_GOAL_START,
                     BLETypeConversions.fromUint16(fitnessGoal));
@@ -1030,7 +1031,7 @@ public class MiBand2Support extends AbstractBTLEDeviceSupport {
                 case MiBandConst.PREF_MI2_ACTIVATE_DISPLAY_ON_LIFT:
                     setActivateDisplayOnLiftWrist(builder);
                     break;
-                case MiBandConst.PREF_MIBAND_FITNESS_GOAL:
+                case ActivityUser.PREF_USER_STEPS_GOAL:
                     setFitnessGoal(builder);
                     break;
             }
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
new file mode 100644
index 000000000..3a75afb43
--- /dev/null
+++ b/app/src/main/res/values-cs/strings.xml
@@ -0,0 +1,325 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="action_settings">Nastavení</string>
+  <string name="action_quit">Ukončit</string>
+  <string name="controlcenter_fetch_activity_data">Načíst data</string>
+  <string name="controlcenter_start_sleepmonitor">Monitor spánku (alfa)</string>
+  <string name="controlcenter_find_device">Najít zařízení...</string>
+  <string name="controlcenter_take_screenshot">Pořídit snímek displeje</string>
+  <string name="controlcenter_disconnect">Odpojit</string>
+  <string name="controlcenter_delete_device">Odstranit zařízení</string>
+  <string name="controlcenter_delete_device_name">Odstranit %1$s</string>
+  <string name="controlcenter_delete_device_dialogmessage">Odstraní zařízení a vymaže všechna data!</string>
+  <!--Strings related to AppManager-->
+  <string name="title_activity_appmanager">Manažer aplikací</string>
+  <string name="appmanager_cached_watchapps_watchfaces">Aplikace v cache</string>
+  <string name="appmanager_installed_watchapps">Instalované aplikace</string>
+  <string name="appmanager_installed_watchfaces">Instalované ciferníky</string>
+  <string name="appmananger_app_delete">Odstranit</string>
+  <string name="appmananger_app_delete_cache">Odstranit z cache</string>
+  <string name="appmananger_app_reinstall">Naintalovat znovu</string>
+  <string name="appmanager_app_openinstore">Hledat v Pebble Appstore</string>
+  <string name="appmanager_health_activate">Aktivovat</string>
+  <string name="appmanager_health_deactivate">Deaktivovat</string>
+  <string name="appmanager_hrm_activate">Zapnout měření pulzu</string>
+  <string name="appmanager_hrm_deactivate">Vypnout měření pulzu</string>
+  <string name="appmanager_weather_activate">Aktivovat systémovou aplikaci pro počasí</string>
+  <string name="appmanager_weather_deactivate">Deaktivovat systémovou aplikaci pro počasí</string>
+  <string name="appmanager_weather_install_provider">Instalovat notifikaci pro počasí</string>
+  <string name="app_configure">Nastavit</string>
+  <string name="app_move_to_top">Posunout nahoru</string>
+  <!--Strings related to AppBlacklist-->
+  <string name="title_activity_appblacklist">Zakázané notifikace</string>
+  <!--Strings related to FwAppInstaller-->
+  <string name="title_activity_fw_app_insaller">Instalátor FW/App</string>
+  <string name="fw_upgrade_notice">Instaluje firmware %s do Mi Band místo stávajícího.</string>
+  <string name="fw_multi_upgrade_notice">Instaluje firmwary %1$s a %2$s do Mi Band místo stávajícího.</string>
+  <string name="miband_firmware_known">Tento firmware byl testován a je kompatibilní s Gadgetbridge.</string>
+  <string name="miband_firmware_unknown_warning">Tento firmware nebyl testován a nemusí být kompatibilní s Gadgetbridge.\n\nNedoporučujeme jej nahrávat do Mi Band!</string>
+  <string name="miband_firmware_suggest_whitelist">Pokud budete prokračovat a vše bude fungovat běžně i potom, upozorněte vývojáře Gadgetbridge, aby označili tento firmware: %s jako vyzkoušený.</string>
+  <!--Strings related to Settings-->
+  <string name="title_activity_settings">Nastavení</string>
+  <string name="pref_header_general">Základní nastavení</string>
+  <string name="pref_title_general_autoconnectonbluetooth">Připojit zařízení pokud je zapnutý BT</string>
+  <string name="pref_title_general_autostartonboot">Spouštět automaticky</string>
+  <string name="pref_title_general_autocreonnect">Automatické znovupřipojení</string>
+  <string name="pref_title_audo_player">Preferovaný přehrávač zvuků</string>
+  <string name="pref_default">Výchozí</string>
+  <string name="pref_header_datetime">Datum a čas</string>
+  <string name="pref_title_datetime_syctimeonconnect">Nastavit čas</string>
+  <string name="pref_summary_datetime_syctimeonconnect">Nastavit čas během připojení a při změně času v Androidu</string>
+  <string name="pref_title_theme">Téma</string>
+  <string name="pref_theme_light">Světlé</string>
+  <string name="pref_theme_dark">Tmavé</string>
+  <string name="pref_title_language">Jazyk</string>
+  <string name="pref_title_minimize_priority">Skrýt notifikace Gadgetbridge</string>
+  <string name="pref_header_notifications">Notifikace</string>
+  <string name="pref_title_notifications_repetitions">Opakování</string>
+  <string name="pref_title_notifications_call">Volání</string>
+  <string name="pref_title_notifications_pebblemsg">Zpráva Pebble</string>
+  <string name="pref_summary_notifications_pebblemsg">Podpora pro aplikace, které posílají notifikace do Pebble via PebbleKit.</string>
+  <string name="pref_title_notifications_generic">Obecná podpora notifikací</string>
+  <string name="pref_title_whenscreenon">... také pokud je displej zapnutý</string>
+  <string name="pref_title_notification_filter">Nerušit</string>
+  <string name="pref_summary_notification_filter">Neposílat nechtěné notifikace podle režimu Nerušit.</string>
+  <string name="pref_title_transliteration">Přepsání</string>
+  <string name="pref_summary_transliteration">Toto zapněte, pokud vaše zařízeníí nepodporuje písma pro vás jazyk (nyní Cyrilice).</string>
+  <string name="always">vždy</string>
+  <string name="when_screen_off">pokud je zapnutý displej</string>
+  <string name="never">nikdy</string>
+  <string name="pref_header_privacy">Soukromí</string>
+  <string name="pref_title_call_privacy_mode">Režim soukromého volání</string>
+  <string name="pref_call_privacy_mode_off">Zobrazit jméno a číslo</string>
+  <string name="pref_call_privacy_mode_name">Skrýt jméno, ale zobrazit číslo</string>
+  <string name="pref_call_privacy_mode_complete">Skrýt jméno i číslo</string>
+  <string name="pref_blacklist">Zakázané aplikace</string>
+  <string name="pref_header_cannned_messages">Potlačené zprávy</string>
+  <string name="pref_title_canned_replies">Odpovědi</string>
+  <string name="pref_title_canned_reply_suffix">Běžná přípona</string>
+  <string name="pref_title_canned_messages_dismisscall">Zamítnutí volání</string>
+  <string name="pref_title_canned_messages_set">Aktualizovat na Pebble</string>
+  <string name="pref_header_development">Vývojářská nastavení</string>
+  <string name="pref_title_development_miaddr">Adresa Mi Band</string>
+  <string name="pref_title_pebble_settings">Nastaveni Pebble</string>
+  <string name="pref_header_activitytrackers">Sledovače aktivity</string>
+  <string name="pref_title_pebble_activitytracker">Preferovaný sledovač aktivity</string>
+  <string name="pref_title_pebble_sync_health">Synchronizovat Pebble Health</string>
+  <string name="pref_title_pebble_sync_misfit">Synchronizovat Misfit</string>
+  <string name="pref_title_pebble_sync_morpheuz">Synchronizovat  Morpheuz</string>
+  <string name="pref_title_enable_outgoing_call">Podpora odchozích volání</string>
+  <string name="pref_summary_enable_outgoing_call">Vypnutím také přestane Pebble 2/LE vibrovat při odchozích voláních</string>
+  <string name="pref_title_enable_pebblekit">Povolit přístup aplikacím 3. stran z Androidu</string>
+  <string name="pref_summary_enable_pebblekit">Povolot experimentální podporu pro aplikace Androidu přes PebbleKit</string>
+  <string name="pref_title_sunrise_sunset">Východ a západ slunce</string>
+  <string name="pref_summary_sunrise_sunset">Zasílat časy východu a západu slunce podle umístění do pebble timeline</string>
+  <string name="pref_title_autoremove_notifications">Odstraňovat skryté notifikace automaticky</string>
+  <string name="pref_summary_autoremove_notifications">Notifikace budou z Pebble odstraněny automaticky, pokud byly skryty na zařízení s Androidem</string>
+  <string name="pref_title_pebble_privacy_mode">Soukromý režim</string>
+  <string name="pref_pebble_privacy_mode_off">Běžné notifikace</string>
+  <string name="pref_pebble_privacy_mode_content">Posunout text notifikace mimo displej</string>
+  <string name="pref_pebble_privacy_mode_complete">Zobrazit pouze ikonu notifikace</string>
+  <string name="pref_header_location">Poloha</string>
+  <string name="pref_title_location_aquire">Zjistit polohu</string>
+  <string name="pref_title_location_latitude">Z. šířka</string>
+  <string name="pref_title_location_longitude">Z. délka</string>
+  <string name="pref_title_location_keep_uptodate">Aktualizovat polohu</string>
+  <string name="pref_summary_location_keep_uptodate">Zjistit polohu při spuštění, uloženou polohu použít jako záložní</string>
+  <string name="toast_enable_networklocationprovider">Povolte zjištění polohy v síti</string>
+  <string name="toast_aqurired_networklocation">poloha zjištěna</string>
+  <string name="pref_title_pebble_forceprotocol">Vnutit protokol notifikací</string>
+  <string name="pref_summary_pebble_forceprotocol">Tato volba vnutí použití posledního protokolu notifikací podle verze firmware. POVOLTE, JEN POKUD VÍTE, CO DĚLÁTE!</string>
+  <string name="pref_title_pebble_forceuntested">Povolit netestované funkce</string>
+  <string name="pref_summary_pebble_forceuntested">Povolí funkce, které nebyl testovány. POVOLTE, JEN POKUD VÍTE, CO DĚLÁTE!</string>
+  <string name="pref_title_pebble_forcele">Vždy preferovat BLE</string>
+  <string name="pref_summary_pebble_forcele">Použít experimentální podporu Pebble LE pro všechny Pebble místo BT classic, vyžaduje spárování \"Pebble LE\" po připojení bez LE</string>
+  <string name="pref_summary_pebble_mtu_limit">Pokud vaše Pebble 2/Pebble LE nepracuje jak má, zkuste toto nastavení pro omezení MTU (povolený rozsah 20-512)</string>
+  <string name="pref_title_pebble_enable_applogs">Zapnout logování Watch App</string>
+  <string name="pref_summary_pebble_enable_applogs">Logy od watch app budou logovány v Gadgetbridge (vyžaduje znovupřipojení)</string>
+  <string name="pref_title_pebble_always_ack_pebblekit">Předčasné potvrzení (ACK) pro PebbleKit</string>
+  <string name="pref_summary_pebble_always_ack_pebblekit">Způsobí, že zprávy zaslané externím aplikacím 3. stran budou potvrzeny vždy a okamžitě.</string>
+  <string name="pref_title_pebble_reconnect_attempts">Pokusů o znovupřipojení</string>
+  <string name="pref_title_unit_system">Jednotky</string>
+  <string name="pref_title_timeformat">Formát času</string>
+  <string name="pref_title_screentime">Doba zapnutí displeje</string>
+  <string name="prefs_title_all_day_heart_rate">Celodenní měření tepu</string>
+  <string name="preferences_hplus_settings">Nastavení HPlus/Makibes</string>
+  <string name="not_connected">nepřipojeno</string>
+  <string name="connecting">připojování</string>
+  <string name="connected">připojeno</string>
+  <string name="unknown_state">neznámý stav</string>
+  <string name="_unknown_">(neznámé)</string>
+  <string name="test_notification">Test notifikací</string>
+  <string name="this_is_a_test_notification_from_gadgetbridge">Toto je notifikace z Gadgetbridge</string>
+  <string name="bluetooth_is_not_supported_">BT není podporován.</string>
+  <string name="bluetooth_is_disabled_">BT je vypnutý.</string>
+  <string name="tap_connected_device_for_app_mananger">Dotkněte se zařízení pro App Manager</string>
+  <string name="tap_connected_device_for_activity">Dotkněte se zařízení pro Aktivity</string>
+  <string name="tap_connected_device_for_vibration">Dotkněte se zařízení pro Vibrace</string>
+  <string name="tap_a_device_to_connect">Dotkněte se zařízení pro připojení</string>
+  <string name="cannot_connect_bt_address_invalid_">Nelze připojit. Je BT adresa v pořádku?</string>
+  <string name="gadgetbridge_running">Gadgetbridge běží</string>
+  <string name="installing_binary_d_d">Instaluji binární %1$d/%2$d</string>
+  <string name="installation_failed_">Instalace selhala!</string>
+  <string name="installation_successful">Instalace úspěšná</string>
+  <string name="firmware_install_warning">CHCETE INSTALOVAT FIRMWARE, POKRAČUJTE NA SVÉ RIZIKO. \n\n\n Tento firmware je pro revizi HW: %s</string>
+  <string name="app_install_info">Instalujete aplikaci:\n\n\n%1$s Verze %2$s od %3$s\n</string>
+  <string name="n_a">nedostupné</string>
+  <string name="initialized">Spuštěno</string>
+  <string name="appversion_by_creator">%1$s od %2$s</string>
+  <string name="title_activity_discovery">Hledání zařízení</string>
+  <string name="discovery_stop_scanning">Zastavit hledání</string>
+  <string name="discovery_start_scanning">Spustit hledání</string>
+  <string name="action_discover">Připojit nové zařízení</string>
+  <string name="title_activity_android_pairing">Párovat zařízení</string>
+  <string name="android_pairing_hint">Použijte párování BT Androidu pro spárování se zařízením. </string>
+  <string name="title_activity_mi_band_pairing">Párovat Mi Band</string>
+  <string name="pairing">Páruji s %s...</string>
+  <string name="pairing_creating_bond_with">Vytvářím vazbu s %1$s (%2$s)</string>
+  <string name="pairing_unable_to_pair_with">Nelze spárovat s %1$s (%2$s)</string>
+  <string name="pairing_in_progress">Vytvářím vazbu: %1$s (%2$s)</string>
+  <string name="pairing_already_bonded">Vazba s %1$s (%2$s) již existuje, propojuji...</string>
+  <string name="message_cannot_pair_no_mac">Adresa MAC nepřišla, nemohu párovat.</string>
+  <string name="preferences_category_device_specific_settings">Nastavení zařízení</string>
+  <string name="preferences_miband_settings">Nastavení Mi Band</string>
+  <string name="male">muž</string>
+  <string name="female">žena</string>
+  <string name="other">jiný</string>
+  <string name="left">vlevo</string>
+  <string name="right">vpravo</string>
+  <string name="miband_pairing_using_dummy_userdata">Data uživatele nejsou platná, nyní používám vzorová.</string>
+  <string name="miband_pairing_tap_hint">Když Mi Band zavibruje a blikne, dotkněte se jej několikrát po sobě.</string>
+  <string name="appinstaller_install">Instalovat</string>
+  <string name="discovery_note">Poznámka:</string>
+  <string name="candidate_item_device_image">Obraz zařízení</string>
+  <string name="miband_prefs_alias">Jméno/přezdívka</string>
+  <string name="pref_header_vibration_count">Počet vibrací</string>
+  <string name="title_activity_sleepmonitor">Sledování spánku</string>
+  <string name="pref_write_logfiles">Zapsat logy</string>
+  <string name="initializing">spouštím</string>
+  <string name="busy_task_fetch_activity_data">Stahuji data o aktivitě</string>
+  <string name="sleep_activity_date_range">Z %1$s do %2$s</string>
+  <string name="miband_prefs_wearside">Nosíte vlevo nebo vpravo?</string>
+  <string name="pref_screen_vibration_profile">Profil vibrací</string>
+  <string name="vibration_profile_short">Krátké</string>
+  <string name="vibration_profile_medium">Střední</string>
+  <string name="vibration_profile_long">Dlouhé</string>
+  <string name="vibration_profile_waterdrop">Kapka</string>
+  <string name="vibration_profile_ring">Zvonění</string>
+  <string name="vibration_profile_alarm_clock">Budík</string>
+  <string name="miband_prefs_vibration">Vibrace</string>
+  <string name="vibration_try">Zkusit</string>
+  <string name="pref_screen_notification_profile_sms">Notifikace SMS</string>
+  <string name="pref_header_vibration_settings">Nastavení vibrací</string>
+  <string name="pref_screen_notification_profile_generic">Obecné notifikace</string>
+  <string name="pref_screen_notification_profile_email">Notifikace emailu</string>
+  <string name="pref_screen_notification_profile_incoming_call">Notifikace volání</string>
+  <string name="pref_screen_notification_profile_generic_chat">Konverzace</string>
+  <string name="pref_screen_notification_profile_generic_navigation">Navigace</string>
+  <string name="pref_screen_notification_profile_generic_social">Sociální sítě</string>
+  <string name="control_center_find_lost_device">Najit ztracené zařízení</string>
+  <string name="control_center_cancel_to_stop_vibration">Zrušit pro zastavení vibrací</string>
+  <string name="title_activity_charts">Vaše aktivita</string>
+  <string name="title_activity_set_alarm">Nastavit buzení</string>
+  <string name="controlcenter_start_configure_alarms">Nastavit buzení</string>
+  <string name="title_activity_alarm_details">Detail buzení</string>
+  <string name="alarm_sun_short">Ne</string>
+  <string name="alarm_mon_short">Po</string>
+  <string name="alarm_tue_short">Út</string>
+  <string name="alarm_wed_short">St</string>
+  <string name="alarm_thu_short">Čt</string>
+  <string name="alarm_fri_short">Pá</string>
+  <string name="alarm_sat_short">So</string>
+  <string name="alarm_smart_wakeup">chytré buzení</string>
+  <string name="user_feedback_miband_set_alarms_failed">Nepodařilo se nastavit budík, zkuste to znovu!</string>
+  <string name="user_feedback_miband_set_alarms_ok">Budík zaslán do zařízení!</string>
+  <string name="chart_no_data_synchronize">Chybí data, provést stažení?</string>
+  <string name="user_feedback_miband_activity_data_transfer">Stahnout data %1$s od %2$s</string>
+  <string name="miband_prefs_fitness_goal">Cílový počet kroků na den</string>
+  <string name="dbaccess_error_executing">Chyba spouštění \'%1$s\'</string>
+  <string name="controlcenter_start_activitymonitor">Vaše aktivita (zkušební)</string>
+  <string name="cannot_connect">Nelze se připojit k: %1$s</string>
+  <string name="installer_activity_unable_to_find_handler">Nemohu najít program k instalaci tohoto souboru.</string>
+  <string name="pbw_install_handler_unable_to_install">Nelze nainstalovat vybraný soubor: %1$s</string>
+  <string name="pbw_install_handler_hw_revision_mismatch">Nelze nainstalovat vybraný firmware: neshoduje s HW revizí vašeho Pebble.</string>
+  <string name="installer_activity_wait_while_determining_status">Vyčkejte na zjištění stavu instalace...</string>
+  <string name="notif_battery_low_title">Nízká úroveň nabití baterie v zařízení!</string>
+  <string name="notif_battery_low_percent">%1$s zbývá v baterii: %2$s%%</string>
+  <string name="notif_battery_low_bigtext_last_charge_time">Poslední nabití: %s \n</string>
+  <string name="notif_battery_low_bigtext_number_of_charges">Počet nabití: %s</string>
+  <string name="sleepchart_your_sleep">Váš spánek</string>
+  <string name="weeksleepchart_sleep_a_week">Spánek za týden</string>
+  <string name="weekstepschart_steps_a_week">Kroky za týden</string>
+  <string name="activity_sleepchart_activity_and_sleep">Vaše aktivita a spánek</string>
+  <string name="updating_firmware">Nahrávám firmware...</string>
+  <string name="fwapp_install_device_not_ready">Soubor nelze nainstalovat, zařízení není připraveno.</string>
+  <string name="miband_fwinstaller_compatible_version">Kompatibilní verze</string>
+  <string name="miband_fwinstaller_untested_version">Netestovaná verze!</string>
+  <string name="fwappinstaller_connection_state">Připojení k zařízení: %1$s</string>
+  <string name="pbwinstallhandler_correct_hw_revision">Správná revize HW</string>
+  <string name="pbwinstallhandler_incorrect_hw_revision">Revize HW není správná!</string>
+  <string name="updatefirmwareoperation_updateproblem_do_not_reboot">Při přenosu firmwaru nastaly potíže. Nerestartujte svůj Mi Band!</string>
+  <string name="updatefirmwareoperation_metadata_updateproblem">Problém při přenosu matadat firmware</string>
+  <string name="updatefirmwareoperation_update_complete">Instalace firmware je kompletní</string>
+  <string name="updatefirmwareoperation_update_complete_rebooting">Instalace firmware je kompletní, restartuji zařízení...</string>
+  <string name="updatefirmwareoperation_write_failed">Zápis firmware selhal</string>
+  <string name="chart_steps">Kroky</string>
+  <string name="liveactivity_live_activity">Současná aktivita</string>
+  <string name="weeksteps_today_steps_description">Kroky dnes, cíl: %1$s</string>
+  <string name="pref_title_dont_ack_transfer">Nepotvrzovat přenos dat o aktivitě</string>
+  <string name="pref_summary_dont_ack_transfers">Pokud není přenos dat potvrzen náramku, potom nebudou smazána. Užitečné pokud je GB používán dohromady s jinou aplikací.</string>
+  <string name="pref_summary_keep_data_on_device">Zachová data o aktivitě v Mi Band i po synchronizaci. Užitečné pokud je GB používán dohromady s jinou aplikací.</string>
+  <string name="pref_title_low_latency_fw_update">Použít režim z nízkým zpožděním pro aktualizace firmwaru.</string>
+  <string name="pref_summary_low_latency_fw_update">Může to pomoci u zařízení, kde aktualizace firmwaru selhala.</string>
+  <string name="live_activity_steps_history">Historie kroků</string>
+  <string name="live_activity_current_steps_per_minute">Aktuálně kroků/min</string>
+  <string name="live_activity_total_steps">Celkem kroků</string>
+  <string name="live_activity_steps_per_minute_history">Historie kroků za minutu</string>
+  <string name="live_activity_start_your_activity">Začít aktivitu</string>
+  <string name="abstract_chart_fragment_kind_activity">Aktivita</string>
+  <string name="abstract_chart_fragment_kind_light_sleep">Lehký spánek</string>
+  <string name="abstract_chart_fragment_kind_deep_sleep">Hluboký spánek</string>
+  <string name="abstract_chart_fragment_kind_not_worn">Nenošeno</string>
+  <string name="device_not_connected">Nepřipojeno.</string>
+  <string name="user_feedback_all_alarms_disabled">Všechny budíky vypnuty</string>
+  <string name="pref_title_keep_data_on_device">Zachovat data o aktivitě v zařízení</string>
+  <string name="miband_fwinstaller_incompatible_version">Nekompatibilní firmware</string>
+  <string name="fwinstaller_firmware_not_compatible_to_device">Tento firmware není kompatibilní s tímto zařízením</string>
+  <string name="miband_prefs_reserve_alarm_calendar">Budíky pro nadcházející události</string>
+  <string name="miband_prefs_hr_sleep_detection">Použít sledování tepu pro zlepšení detekce spánku</string>
+  <string name="miband_prefs_device_time_offset_hours">Časový posun zařízení v hodinách (pro zjišťování spánku směnařů)</string>
+  <string name="miband2_prefs_dateformat">Mi2: formát data</string>
+  <string name="dateformat_time">Čas</string>
+  <string name="mi2_prefs_activate_display_on_lift">Zapnout displej při zvednutí</string>
+  <string name="FetchActivityOperation_about_to_transfer_since">Přenáším data od %1$s</string>
+  <string name="waiting_for_reconnect">čekání na znovupřipojení</string>
+  <string name="activity_prefs_about_you">O vás</string>
+  <string name="activity_prefs_year_birth">Rok narození</string>
+  <string name="activity_prefs_gender">Pohlaví</string>
+  <string name="activity_prefs_height_cm">Výška v cm</string>
+  <string name="activity_prefs_weight_kg">Váha v kg</string>
+  <string name="authenticating">ověřování</string>
+  <string name="authentication_required">ověřování vyžadováno</string>
+  <string name="add_widget">Přidat widget</string>
+  <string name="activity_prefs_sleep_duration">Preferovaná doba spánku v hodinách</string>
+  <string name="appwidget_alarms_set">Budík nastaven na %1$02d:%2$02d</string>
+  <string name="error_creating_directory_for_logfiles">Chyba při vytváření adresáře pro logy: %1$s</string>
+  <string name="updatefirmwareoperation_update_in_progress">Probíhá aktualizace firmware</string>
+  <string name="updatefirmwareoperation_firmware_not_sent">Firmware neodeslán</string>
+  <string name="charts_legend_heartrate">Srdeční tep</string>
+  <string name="live_activity_heart_rate">Srdeční tep</string>
+  <string name="pref_title_pebble_health_store_raw">Uložit hrubý záznam do databáze</string>
+  <string name="pref_summary_pebble_health_store_raw">Pokud je zatrženo, tak jsou data uložena v původní podobě pro pozdější vyhodnocení. Databáze bude v tom případě větší!</string>
+  <string name="action_db_management">Správa databáze</string>
+  <string name="title_activity_db_management">Správa databáze</string>
+  <string name="activity_db_management_import_export_explanation">Operace s databází použití následující cestu v zařízení. \nTato cesta je dostupní pro ostatní aplikace Androidu a váš počítač. \nExportovanou databázi (nebo místo pro importovanou databázi) naleznete tady:</string>
+  <string name="activity_db_management_merge_old_title">Smazat původní databázi</string>
+  <string name="dbmanagementactivvity_cannot_access_export_path">Nelze přistoupit na zadanou cestu. Kontaktujte vývojáře.</string>
+  <string name="dbmanagementactivity_exported_to">Exportováno do: %1$s</string>
+  <string name="dbmanagementactivity_error_exporting_db">Chyba při exportu DB: %1$s</string>
+  <string name="dbmanagementactivity_import_data_title">Importovat data?</string>
+  <string name="dbmanagementactivity_overwrite_database_confirmation">Opravdu chcete přepsat aktuální databázi? Všechna uložená data o aktivitě se ztratí.</string>
+  <string name="dbmanagementactivity_import_successful">Import byl úspěšný.</string>
+  <string name="dbmanagementactivity_error_importing_db">Chyba při importu DB: %1$s</string>
+  <string name="dbmanagementactivity_delete_activity_data_title">Smazat data o aktivitách?</string>
+  <string name="dbmanagementactivity_really_delete_entire_db">Opravdu chcete smazat celou databázi? Všechna data o aktivitách a informace o zařízeních se ztratí.</string>
+  <string name="dbmanagementactivity_database_successfully_deleted">Data úspěšně smazána.</string>
+  <string name="dbmanagementactivity_db_deletion_failed">Mazání dat se nezdařilo.</string>
+  <string name="dbmanagementactivity_delete_old_activity_db">Smazat původní databázi?</string>
+  <string name="dbmanagementactivity_delete_old_activitydb_confirmation">Opravdu chcete smazat původní databázi? Data o aktivitách, která nebyla importována budou ztracena.</string>
+  <string name="dbmanagementactivity_old_activity_db_successfully_deleted">Původní databáze byla vymazána.</string>
+  <string name="dbmanagementactivity_old_activity_db_deletion_failed">Mazání původní databáze selhalo.</string>
+  <string name="dbmanagementactivity_overwrite">Přepsat</string>
+  <string name="Cancel">Zrušit</string>
+  <string name="Delete">Odstranit</string>
+  <!--Strings related to Vibration Activity-->
+  <string name="title_activity_vibration">Vibrace</string>
+  <!--Strings related to Pebble Pairing Activity-->
+  <string name="title_activity_pebble_pairing">Párování Pebble</string>
+  <string name="pebble_pairing_hint">Dialog párování by se měl objevit na vašem zařízení s Androidem. Pokud se to nestane, zkontrolujte panel notifikací a potvrďte párování. Potom potvrďte párování na Pebble.</string>
+  <string name="weather_notification_label">Ujistěte se, že tento skin je povolen v aplikaci pro oznámení počasí pro získávání informací v Pebble.\n\nNení třeba nic nastavovat.\n\nAplikaci pro počasí Pebble je možné povolit ve správě aplikací.\n\nPodporované ciferníky ukáží počasí automaticky.</string>
+  <string name="pref_title_setup_bt_pairing">Zapnout párování BT</string>
+  <string name="pref_summary_setup_bt_pairing">Toto vypněte v případě problémů s připojením</string>
+  <string name="unit_metric">Metrické</string>
+  <string name="unit_imperial">Imperiální</string>
+  <string name="pref_screen_notification_profile_alarm_clock">Budík</string>
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7af08db3d..242ce8ccf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -181,8 +181,6 @@
   <string name="miband_pairing_using_dummy_userdata">Keine gültigen Benutzerinformationen angegeben, verwende Dummy-Daten für\'s Erste.</string>
   <string name="miband_pairing_tap_hint">Wenn Dein Mi Band vibriert und blinkt, tippe ein paar Mal schnell hintereinander darauf.</string>
   <string name="appinstaller_install">Installieren</string>
-  <string name="discovery_connected_devices_hint">Mach Dein Gerät auffindbar. Derzeit verbundene Geräte sind in der Regel nicht auffindbar. Android 6 oder neuer braucht dafür Standortbestimmung (z.B. GPS). Wenn Dein Gerät nach zwei Minuten nicht
- angezeigt wird, versuche es nach einem Neustart Deines Telefons noch einmal.</string>
   <string name="discovery_note">Tipp:</string>
   <string name="candidate_item_device_image">Bild des Geräts</string>
   <string name="miband_prefs_alias">Name/Alias</string>
@@ -243,6 +241,7 @@
   <string name="notif_battery_low_bigtext_number_of_charges">Anzahl Ladungen: %s</string>
   <string name="sleepchart_your_sleep">Dein Schlaf</string>
   <string name="weeksleepchart_sleep_a_week">Schlaf pro Woche</string>
+  <string name="weeksleepchart_today_sleep_description">Heutiger Schlaf, Ziel: %1$s</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>
@@ -339,6 +338,7 @@
   <!--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="weather_notification_label">Stelle sicher, dass dieses Skin in der Wetter-App aktiviert ist, damit du Wetterdaten auf deine Pebble erhältst. \n\nKeine Konfiguration nötig. \n\nDu kannst die System-Wetter-App deiner Pebble im App-Management aktivieren. \n\nUnterstützte Watchfaces werden die Wetterdaten automatisch anzeigen.</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>
@@ -346,4 +346,7 @@
   <string name="timeformat_24h">24h</string>
   <string name="timeformat_am_pm">AM/PM</string>
   <string name="pref_screen_notification_profile_alarm_clock">Wecker</string>
+  <string name="StringUtils_sender"> (%1$s)</string>
+  <string name="find_device_you_found_it">Gefunden!</string>
+  <string name="miband2_prefs_timeformat">Mi2: Uhrzeit-Format</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 60730fe18..6e4405ba3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -181,7 +181,7 @@
   <string name="miband_pairing_using_dummy_userdata">No se han proporcionado datos de usuario válidos, se usarán datos de usuario por defecto.</string>
   <string name="miband_pairing_tap_hint">Cuando tu MiBand vibre y parpadee, púlsala repetidas veces.</string>
   <string name="appinstaller_install">Instalar</string>
-  <string name="discovery_connected_devices_hint">Haga su dispositivo detectable. Los dispositivos conectados no serán detectables. En Android 6 o superior, necesita activar la localización (ej. GPS). Si su dispositivo no aparece en dos minutos, vuelva a intentarlo tras reiniciar su teléfono.</string>
+  <string name="discovery_connected_devices_hint">Haga su dispositivo detectable. Los dispositivos conectados no serán detectables. En Android 6 o superior, necesita activar la localización (ej. GPS). Desactive Privacy Guard para Gadgetbridge, debido a que podría detener y reiniciar su teléfono. Si su dispositivo no aparece en dos minutos, vuelva a intentarlo tras reiniciar su teléfono.</string>
   <string name="discovery_note">Nota:</string>
   <string name="candidate_item_device_image">Imagen del dispositivo</string>
   <string name="miband_prefs_alias">Nombre/Apodo</string>
@@ -242,6 +242,7 @@
   <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="weeksleepchart_today_sleep_description">Sueño hoy, objetivo: %1$s</string>
   <string name="weekstepschart_steps_a_week">Pasos por semana</string>
   <string name="activity_sleepchart_activity_and_sleep">Tu actividad y sueño</string>
   <string name="updating_firmware">Actualizando firmware...</string>
@@ -346,4 +347,7 @@
   <string name="timeformat_24h">24H</string>
   <string name="timeformat_am_pm">AM/PM</string>
   <string name="pref_screen_notification_profile_alarm_clock">Despertador</string>
+  <string name="StringUtils_sender">(%1$s)</string>
+  <string name="find_device_you_found_it">¡Lo ha encontrado!</string>
+  <string name="miband2_prefs_timeformat">Mi2: formato de hora</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2e5207597..84992fdc2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -181,7 +181,7 @@
   <string name="miband_pairing_using_dummy_userdata">Aucune donnée utilisateur valide fournie,  utilisation de données fictives pour le moment</string>
   <string name="miband_pairing_tap_hint">Quand votre Mi Band vibre et clignote, appuyez dessus plusieurs fois d\'affilée.</string>
   <string name="appinstaller_install">Installer</string>
-  <string name="discovery_connected_devices_hint">Mettez votre appareil en mode visible. Les appareils déjà connectés ne sont pas visibles. Sur Android 6 ou supérieur, vous devez activer la localisation (ex. GPS). Si votre appareil n\'est pas visible après 2 minutes, réessayez après avoir redémarré votre téléphone.</string>
+  <string name="discovery_connected_devices_hint">Mettez votre appareil en mode visible. Les appareils déjà connectés ne seront pas visibles. Sur Android 6 ou supérieur, vous devez activer la localisation (ex. GPS). Désactivez Privacy Guard pour Gadgetbridge, il pourrait stopper et redémarrer votre téléphone. Si votre appareil n\'est pas visible après 2 minutes, réessayez après avoir redémarré votre téléphone.</string>
   <string name="discovery_note">Note:</string>
   <string name="candidate_item_device_image">Image de l\'appareil</string>
   <string name="miband_prefs_alias">Nom/Pseudo</string>
@@ -242,6 +242,7 @@
   <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="weeksleepchart_today_sleep_description">Sommeil aujourd\'hui, objectif: %1$s</string>
   <string name="weekstepschart_steps_a_week">Pas de la semaine</string>
   <string name="activity_sleepchart_activity_and_sleep">Votre activité et sommeil</string>
   <string name="updating_firmware">Mise à jour du micrologiciel...</string>
@@ -347,4 +348,7 @@ NOTE: la base de données sera bien évidement plus grande !</string>
   <string name="timeformat_24h">24H</string>
   <string name="timeformat_am_pm">AM/PM</string>
   <string name="pref_screen_notification_profile_alarm_clock">Réveil</string>
+  <string name="StringUtils_sender">(%1$s)</string>
+  <string name="find_device_you_found_it">Vous l\'avez trouvé!</string>
+  <string name="miband2_prefs_timeformat">Mi2: format de l\'heure</string>
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 7804c1345..a04c9706c 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -25,8 +25,8 @@
   <string name="appmanager_app_openinstore">חיפוש בחנות היישומונים של Pebble</string>
   <string name="appmanager_health_activate">הפעלה</string>
   <string name="appmanager_health_deactivate">נטרול</string>
-  <string name="appmanager_hrm_activate">הפעלת </string>
-  <string name="appmanager_hrm_deactivate">נטרול </string>
+  <string name="appmanager_hrm_activate">הפעלת מעקב דופק</string>
+  <string name="appmanager_hrm_deactivate">נטרול מעקב דופק</string>
   <string name="appmanager_weather_activate">הפעלת יישומון מזג האוויר של המערכת</string>
   <string name="appmanager_weather_deactivate">נטרול יישומון מזג האוויר של המערכת</string>
   <string name="appmanager_weather_install_provider">התקנת יישומון דיווח מזג האוויר</string>
@@ -63,7 +63,7 @@
   <string name="pref_title_notifications_repetitions">חזרות</string>
   <string name="pref_title_notifications_call">שיחות טלפון</string>
   <string name="pref_title_notifications_sms">מסרונים</string>
-  <string name="pref_title_notifications_pebblemsg">הודעות </string>
+  <string name="pref_title_notifications_pebblemsg">הודעות Pebble</string>
   <string name="pref_summary_notifications_pebblemsg">תמיכה ביישומונים ששולחים דיווחים ל־Pebble באמצעות PebbleKit.</string>
   <string name="pref_title_notifications_generic">תמיכה בדיווחים גנריים</string>
   <string name="pref_title_whenscreenon">…גם כאשר המסך פעיל</string>
@@ -176,12 +176,11 @@
   <string name="male">זכר</string>
   <string name="female">נקבה</string>
   <string name="other">אחר</string>
-  <string name="left">שמא</string>
+  <string name="left">שמאל</string>
   <string name="right">ימין</string>
   <string name="miband_pairing_using_dummy_userdata">לא ניתנו נתוני משתמש, נעשה שימוש בנתוני דמה לבינתיים.</string>
   <string name="miband_pairing_tap_hint">כאשר ה־Mi Band שלך רוטט ומהבהב, יש לגעת בו מספר פעמים ברצף.</string>
   <string name="appinstaller_install">התקנה</string>
-  <string name="discovery_connected_devices_hint">נא לוודא שההתקן שלך פתוח לגילוי. התקנים שכבר חוברו לא יופיעו ברשימה. באנדרואיד 6 ומעלה, עליך להפעיל את המיקום (למשל GPS). אם ההתקן שלך לא מופיע לאחר למעלה משתי דקות, יש לנסות שוב לאחר הפעלה מחדש של הטלפון שלך.</string>
   <string name="discovery_note">לתשומת לבך:</string>
   <string name="candidate_item_device_image">תמונת ההתקן</string>
   <string name="miband_prefs_alias">שם/כינוי</string>
@@ -242,6 +241,7 @@
   <string name="notif_battery_low_bigtext_number_of_charges">מספר טעינות: %s</string>
   <string name="sleepchart_your_sleep">השינה שלך</string>
   <string name="weeksleepchart_sleep_a_week">שינה של שבוע</string>
+  <string name="weeksleepchart_today_sleep_description">שינה היום, יעד: %1$s</string>
   <string name="weekstepschart_steps_a_week">צעדים של שבוע</string>
   <string name="activity_sleepchart_activity_and_sleep">הפעילות והשינה שלך</string>
   <string name="updating_firmware">הקושחה מתעדכנת…</string>
@@ -346,4 +346,7 @@
   <string name="timeformat_24h">24ש׳</string>
   <string name="timeformat_am_pm">AM/PM</string>
   <string name="pref_screen_notification_profile_alarm_clock">שעון מעורר</string>
+  <string name="StringUtils_sender"> (%1$s)</string>
+  <string name="find_device_you_found_it">מצאת את זה!</string>
+  <string name="miband2_prefs_timeformat">Mi2: תבנית זמן</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 7a3e39eae..49723068b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -150,7 +150,6 @@
   <string name="miband_pairing_using_dummy_userdata">Nem helyes felhasználói adatok vannak megadva, alapértelmezett adatokat fogok használni.</string>
   <string name="miband_pairing_tap_hint">Amikor vibrálni kezd a Mi Band-ed, érintsd meg párszor egymás után.</string>
   <string name="appinstaller_install">Telepítés</string>
-  <string name="discovery_connected_devices_hint">Tedd felfedezhetővé az eszközöd. A jelenleg csatlakoztatott eszközök valóüszínűleg nem fognak megjelenni. 6-os és frissebb Androidon engedélyezni kell a helymeghatározást (GPS). Ha az eszköz két perc után sem jelenik meg, próbáld újra a mobileszközöd újraindítása után.</string>
   <string name="discovery_note">Megjegyzés:</string>
   <string name="candidate_item_device_image">Eszköz kép</string>
   <string name="miband_prefs_alias">Név/Alias</string>
@@ -277,17 +276,11 @@
   <string name="updatefirmwareoperation_firmware_not_sent">Nem küldött Firmware </string>
   <string name="charts_legend_heartrate">Pulzus</string>
   <string name="live_activity_heart_rate">Pulzus</string>
-  <!--Strings related to Onboading Activity-->
-  <string name="title_activity_onboarding">Adatbázis importálása</string>
-  <string name="import_old_db_buttonlabel">Régi aktivitásadatok importálása</string>
-  <string name="import_old_db_information">A Gadgetbridge 0.12.0 verziója óta új adatbázis-formátumot használ.          Lehetőség van a régi adatok importálására és azok párosítására a jelenleg csatlakozott eszközödhöz (%1$s)            Kérlek, vedd figyelembe, hogy tudsz importálni a Mi Band, Pebble Health és Morpheuz eszközökből, de NEM tudsz a Pebble Misfit-ből.       </string>
   <string name="pref_title_pebble_health_store_raw">Nyers adatok tárolása az adatbázisban</string>
   <string name="pref_summary_pebble_health_store_raw">Ha bejelölöd, az adatok eredeti formában lesznek tárolva későbbi értelmezéshez. Megj.: az adatbázis ebben az esetben nagyobb lesz!</string>
   <string name="action_db_management">Adatbáziskezelés</string>
   <string name="title_activity_db_management">Adatbáziskezelés</string>
   <string name="activity_db_management_import_export_explanation">Az adatbázisművelet ezt a helyet fogja használni. Ez a hely elérhető másik Android-alkalmazások és a számítógép számára. Itt keresd az exportált adatbázist is, illetve ide rakd az importálni kívánt adatbázist is.</string>
-  <string name="activity_db_management_merge_old_explanation">Az aktivitásadatok egy régebbi Gadgetbridge verzióval készültek, muszáj átkonvertálni az új formátumba. Ezt megteheted az alábbi gombbal. Tartsd figyelembe, hogy csatlakoztatva kell lennie a készülékednek, amihez szeretnéd párosítani az adatokat. Ha már importáltad azadataid és boldog vagy az eredménnyel, letörölheted a régi adatbázist. </string>
-  <string name="activity_db_management_merge_old_title">Régi/hagyaték adatok importálása / törlése</string>
   <string name="dbmanagementactivvity_cannot_access_export_path">Nem elérhető az elérési út. Kérlek vedd fel a kapcsolatot a fejlesztőkkel.</string>
   <string name="dbmanagementactivity_exported_to">%1$s exportálva</string>
   <string name="dbmanagementactivity_error_exporting_db">Hiba az exportálás során: %1$s</string>
@@ -295,12 +288,6 @@
   <string name="dbmanagementactivity_overwrite_database_confirmation">Biztosan felül akarod írni a jelenlegi adatbázist? Az összes jelenlegi aktivitás adatod (ha van) elfog veszni.</string>
   <string name="dbmanagementactivity_import_successful">Sikeres importálás.</string>
   <string name="dbmanagementactivity_error_importing_db">Hiba az importálás során: %1$s</string>
-  <string name="dbmanagementactivity_no_old_activitydatabase_found">Nem található régi aktivitás-adatbázis, nincs mit importálni.</string>
-  <string name="dbmanagementactivity_no_connected_device">Nincs csatlakoztatva az adatokhoz rendelt eszköz.</string>
-  <string name="dbmanagementactivity_merging_activity_data_title">Aktivitásadatok összefésülése</string>
-  <string name="dbmanagementactivity_please_wait_while_merging">Kérlek várj, aktivitásadatok összefésülése…</string>
-  <string name="dbmanagementactivity_error_importing_old_activity_data">Hiba a régi aktivitásadatok importálása során az új adatbázisba.</string>
-  <string name="dbmanagementactivity_associate_old_data_with_device">Régi adatok összecsatolása az eszközzel</string>
   <string name="dbmanagementactivity_delete_activity_data_title">Törlöd az aktivitásadatokat?</string>
   <string name="dbmanagementactivity_really_delete_entire_db">Tényleg törölni akarod az egész adatbázist? Minden aktivitásadatod és rólad tárolt információ elfog veszni.</string>
   <string name="dbmanagementactivity_database_successfully_deleted">Az adatok sikeresen törölve lettek.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 17d93a81e..da70600dc 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -277,22 +277,11 @@
   <string name="updatefirmwareoperation_firmware_not_sent">Firmware non inviato</string>
   <string name="charts_legend_heartrate">Battito cardiaco</string>
   <string name="live_activity_heart_rate">Battito cardiaco</string>
-  <!--Strings related to Onboading Activity-->
-  <string name="title_activity_onboarding">Import del database</string>
-  <string name="import_old_db_buttonlabel">Import dei dati nel formato vecchio</string>
-  <string name="import_old_db_information">A partire dalla versione 0.12.0 viene usato un nuovo formato per i dati.
-Puoi importare i tuoi vecchi dati e associarli con il dispositivo attualmente connesso (%1$s).\n
-\n
-Se non desideri farlo adesso, lo potrai fare in seguito utilizzando il tasto \"Importa i dati delle attività\" nella finestra di gestione del database\n
-\n
-Si possono importare i dati da Mi Band, Pebble Health e Morpheuz, NON quelli di Pebble Misfit.</string>
   <string name="pref_title_pebble_health_store_raw">Memorizza i record grezzi nel database</string>
   <string name="pref_summary_pebble_health_store_raw">Se selezionato, i dati vengono memorizzati come trasmessi dal Pebble, in modo da avere più dati in futuro. NB: Il database sarà più grande</string>
   <string name="action_db_management">Gestione del database</string>
   <string name="title_activity_db_management">Gestione del database</string>
   <string name="activity_db_management_import_export_explanation">Le operazioni sul database utilizzano il percorso qui sotto. \nQuesto percorso è accessibile ad altre applicazioni ed al tuo computer. \nDopo l\'esportazione il database si troverà qui (oppure copia qui il database che desideri importare):</string>
-  <string name="activity_db_management_merge_old_explanation">I dati delle attività memorizzati  con Gadgetbridge prima della versione 0.12 devono essere convertiti ad un nuovo formato. \nPuoi farlo utilizzando il bottone qui sotto. Attenzione: devi essere collegato al dispositivo per cui desideri importare i dati! \nSe hai già importato i dati e sei soddisfatto del risultato, puoi cancellare il vecchio database.</string>
-  <string name="activity_db_management_merge_old_title">Importa o cancella il database nel vecchio formato</string>
   <string name="dbmanagementactivvity_cannot_access_export_path">Impossibile accedere al path esterno. Per cortesia contatta gli sviluppatori del progetto.</string>
   <string name="dbmanagementactivity_exported_to">Esportato su: %1$s</string>
   <string name="dbmanagementactivity_error_exporting_db">Errore esportando il DB: %1$s</string>
@@ -300,12 +289,6 @@ Si possono importare i dati da Mi Band, Pebble Health e Morpheuz, NON quelli di
   <string name="dbmanagementactivity_overwrite_database_confirmation">Vuoi davvero sovrascrivere il database attuale? Tutte le tue attività saranno perse.</string>
   <string name="dbmanagementactivity_import_successful">L\'importazione ha avuto successo.</string>
   <string name="dbmanagementactivity_error_importing_db">Errore importando il DB: %1$s</string>
-  <string name="dbmanagementactivity_no_old_activitydatabase_found">Nessun database trovato con il vecchio formato, non c\'è niente da importare.</string>
-  <string name="dbmanagementactivity_no_connected_device">Nessun dispositivo connesso per poter importare i dati.</string>
-  <string name="dbmanagementactivity_merging_activity_data_title">Import dati attività in corso</string>
-  <string name="dbmanagementactivity_please_wait_while_merging">Attendere mentre i dati delle attività vengono importati...</string>
-  <string name="dbmanagementactivity_error_importing_old_activity_data">Errore nell\'importazione dei dati delle attività nel nuovo database.</string>
-  <string name="dbmanagementactivity_associate_old_data_with_device">Associa i dati con un dispositivo</string>
   <string name="dbmanagementactivity_delete_activity_data_title">Cancella i dati delle attività?</string>
   <string name="dbmanagementactivity_really_delete_entire_db">Vuoi davvero cancellare il database? Tutte le informazioni sulle tue attività e sui tuoi dispositivi saranno perse.</string>
   <string name="dbmanagementactivity_database_successfully_deleted">Dati cancellati con successo.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 967a79651..3bc4b752f 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -181,7 +181,7 @@
   <string name="miband_pairing_using_dummy_userdata">有効なユーザーデータはありません。今のところ、ダミーのユーザーデータを使用します。</string>
   <string name="miband_pairing_tap_hint">お使いのMi Bandが振動と点滅したとき、それを連続して数回タップしてください。</string>
   <string name="appinstaller_install">インストール</string>
-  <string name="discovery_connected_devices_hint">お使いのデバイスを検出可能にしてください。現在、接続されたデバイスは、おそらく検出されません。Android 6 以降では位置情報を有効にする必要があります (例 GPS)。お使いのデバイスが 2 分しても表示されない場合は、モバイルデバイスを再起動した後にもう一度試してください。</string>
+  <string name="discovery_connected_devices_hint">お使いのデバイスを検出可能にしてください。現在、接続されたデバイスは、おそらく検出されません。Android 6 以降では位置情報 (例 GPS) を有効にする必要があります。クラッシュや再起動を引き起こすため、ガジェットブリッジに対してプライバシーガードを無効にしてください。お使いのデバイスが数分しても表示されない場合は、お使いのモバイルデバイスを再起動した後にもう一度試してください。</string>
   <string name="discovery_note">注:</string>
   <string name="candidate_item_device_image">デバイスイメージ</string>
   <string name="miband_prefs_alias">名前/別名</string>
@@ -241,6 +241,8 @@
   <string name="notif_battery_low_bigtext_last_charge_time">最後の充電: %s \n</string>
   <string name="notif_battery_low_bigtext_number_of_charges">充電回数: %s</string>
   <string name="sleepchart_your_sleep">あなたの睡眠</string>
+  <string name="weeksleepchart_sleep_a_week">週の睡眠</string>
+  <string name="weeksleepchart_today_sleep_description">今日の睡眠、目標: %1$s</string>
   <string name="weekstepschart_steps_a_week">週あたり歩数</string>
   <string name="activity_sleepchart_activity_and_sleep">あなたの活動と睡眠</string>
   <string name="updating_firmware">ファームウェアの更新中…</string>
@@ -308,22 +310,12 @@
   <string name="updatefirmwareoperation_firmware_not_sent">ファームウェアを送信しませんでした</string>
   <string name="charts_legend_heartrate">心拍数</string>
   <string name="live_activity_heart_rate">心拍数</string>
-  <!--Strings related to Onboading Activity-->
-  <string name="title_activity_onboarding">データベースのインポート</string>
-  <string name="import_old_db_buttonlabel">古い活動データをインポート</string>
-  <string name="import_old_db_information">ガジェットブリッジ 0.12.0 以降、新しいデータベース形式を使用しています。
-古い活動データをインポートして、(%1$s) に接続しているデバイスと関連付けすることができます。\n
-\n
-今、古い活動データをインポートしない場合でも、データベース管理で「古い活動データをマージ」ボタンをタップして、後で行うことができます\n
-\n
-Mi Band、Pebble Health、Morpheuz からデータをインポートすることはできますが、Pebble Misfit からはできませんのでご注意ください。</string>
   <string name="pref_title_pebble_health_store_raw">データベースに生のレコードを格納する</string>
   <string name="pref_summary_pebble_health_store_raw">チェックした場合、データを「そのまま」格納し、後で翻訳して利用することができます。注意: この場合データベースは大きくなります!</string>
   <string name="action_db_management">データベース管理</string>
   <string name="title_activity_db_management">データベース管理</string>
   <string name="activity_db_management_import_export_explanation">データベース操作は、お使いのデバイスで次のパスを使用します。 \nこのパスは、他の Android アプリケーションやお使いのコンピュータがアクセス可能です。\nエクスポートされたデータベースが見つかります (またはインポートしたいデータベースを配置します):</string>
-  <string name="activity_db_management_merge_old_explanation">ガジェットブリッジの 0.12 より前のバージョンで記録された活動データを新しい形式に変換する必要があります。 \n下のボタンを使用してこれを行うことができます。古い活動データと関連付けたいデバイスに接続する必要があることに注意してください! \n既にデータをインポートし、その結果に満足している場合は、古いデータベースを削除することができます。</string>
-  <string name="activity_db_management_merge_old_title">レガシー データベースのインポート / 削除</string>
+  <string name="activity_db_management_merge_old_title">レガシー データベースの削除</string>
   <string name="dbmanagementactivvity_cannot_access_export_path">エクスポート パスにアクセスできません。開発者にご連絡ください。</string>
   <string name="dbmanagementactivity_exported_to">エクスポートしました: %1$s</string>
   <string name="dbmanagementactivity_error_exporting_db">DB のエクスポート時にエラー: %1$s</string>
@@ -331,12 +323,6 @@ Mi Band、Pebble Health、Morpheuz からデータをインポートすること
   <string name="dbmanagementactivity_overwrite_database_confirmation">現在のデータベースを上書きしてもよろしいですか? 現在の活動データは (もしあれば) すべて失われます。</string>
   <string name="dbmanagementactivity_import_successful">インポートに成功しました。</string>
   <string name="dbmanagementactivity_error_importing_db">DB のインポート時にエラー: %1$s</string>
-  <string name="dbmanagementactivity_no_old_activitydatabase_found">古い活動データベースが見つかりません。インポートするものはありません。</string>
-  <string name="dbmanagementactivity_no_connected_device">古い活動データに関連付ける接続されたデバイスがありません。</string>
-  <string name="dbmanagementactivity_merging_activity_data_title">活動データのマージ中</string>
-  <string name="dbmanagementactivity_please_wait_while_merging">活動データのマージ中。しばらくお待ちください…</string>
-  <string name="dbmanagementactivity_error_importing_old_activity_data">古い活動データを新しいデータベースにインポート中にエラー。</string>
-  <string name="dbmanagementactivity_associate_old_data_with_device">古いデータをデバイスに関連付け</string>
   <string name="dbmanagementactivity_delete_activity_data_title">活動データを削除しますか?</string>
   <string name="dbmanagementactivity_really_delete_entire_db">データベース全体を削除してもよろしいですか? 活動データとお使いのデバイスに関する情報がすべて失われます。</string>
   <string name="dbmanagementactivity_database_successfully_deleted">データを正常に削除しました。</string>
@@ -361,4 +347,7 @@ Mi Band、Pebble Health、Morpheuz からデータをインポートすること
   <string name="timeformat_24h">24時間</string>
   <string name="timeformat_am_pm">AM/PM</string>
   <string name="pref_screen_notification_profile_alarm_clock">アラームクロック</string>
+  <string name="StringUtils_sender"> (%1$s)</string>
+  <string name="find_device_you_found_it">見つかりました!</string>
+  <string name="miband2_prefs_timeformat">Mi2: 時刻形式</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 5873f5b27..da53ea2d7 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -220,7 +220,6 @@
   <string name="updatefirmwareoperation_firmware_not_sent">펌웨어가 전송되지 않음</string>
   <string name="charts_legend_heartrate">심박수</string>
   <string name="live_activity_heart_rate">심박수</string>
-  <!--Strings related to Onboading Activity-->
   <string name="Delete">삭제</string>
   <!--Strings related to Vibration Activity-->
   <!--Strings related to Pebble Pairing Activity-->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5364165ae..1b52a2f5c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -249,18 +249,13 @@
   <string name="updatefirmwareoperation_update_in_progress">Trwa aktualizacja firmware</string>
   <string name="charts_legend_heartrate">Puls</string>
   <string name="live_activity_heart_rate">Puls</string>
-  <!--Strings related to Onboading Activity-->
-  <string name="title_activity_onboarding">Import bazydanych</string>
-  <string name="import_old_db_buttonlabel">Import starszych danych aktywności</string>
   <string name="action_db_management">Zarządzanie bazą danych</string>
   <string name="title_activity_db_management">Zarządzanie bazą danych</string>
-  <string name="activity_db_management_merge_old_title">Importuj / Usuń starą bazę danych</string>
   <string name="dbmanagementactivity_exported_to">Wyeksportowano do: %1$s</string>
   <string name="dbmanagementactivity_error_exporting_db">Błąd eksportu bazy: %1$s</string>
   <string name="dbmanagementactivity_import_data_title">Zaimportować?</string>
   <string name="dbmanagementactivity_overwrite_database_confirmation">Naprawdę chcesz napisać bazę? Wszystkie Twoje dane zostaną zastąpione.</string>
   <string name="dbmanagementactivity_error_importing_db">Błąd importu bazy: %1$s</string>
-  <string name="dbmanagementactivity_no_old_activitydatabase_found">Nie znaleziono aktywności, nic do importu.</string>
   <string name="dbmanagementactivity_overwrite">Nadpisz</string>
   <string name="Cancel">Anuluj</string>
   <string name="Delete">Usuń</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 23bab4486..2e451f1cf 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -181,7 +181,6 @@
   <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>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index fe2315c57..d0ff2761f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -219,7 +219,6 @@
   <string name="device_fw"> Версия ПО: %1$s</string>
   <string name="error_creating_directory_for_logfiles">Ошибка создания каталога для лог-файлов: %1$s</string>
   <string name="updatefirmwareoperation_update_in_progress">Обновление прошивки в процессе</string>
-  <!--Strings related to Onboading Activity-->
   <string name="Delete">Удалить</string>
   <!--Strings related to Vibration Activity-->
   <!--Strings related to Pebble Pairing Activity-->
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 4578fa778..30d16c40a 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -2,11 +2,13 @@
 <changelog>
     <release version="0.18.0" versioncode="87">
         <change>Add Portuguese pt_PT and pt_BR translations</change>
+        <change>Add Czech translation</change>
         <change>Add Hebrew translation and transliteration</change>
         <change>Consistently display device specific icons already during discovery</change>
         <change>Add sleep chart diplaying the last week of sleep</change>
         <change>Huge speedup for weekly charts when changing days</change>
         <change>Drop support for pre Gadgetbride 0.12.0 database</change>
+        <change>Pebble: allow configuration webpages (clay) to access device location</change>
     </release>
     <release version="0.17.5" versioncode="86">
         <change>Automatically start the service on boot (can be turned off)</change>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index df84c17c5..a41a0ba4d 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -72,6 +72,13 @@
                 android:maxLength="3"
                 android:title="@string/activity_prefs_weight_kg" />
 
+            <EditTextPreference
+                android:defaultValue="10000"
+                android:inputType="number"
+                android:key="mi_fitness_goal"
+                android:maxLength="5"
+                android:title="@string/miband_prefs_fitness_goal" />
+
             <EditTextPreference
                 android:inputType="number"
                 android:key="activity_user_sleep_duration"