Merge branch 'TranslatableVariantsWithoutCode'

2024-08-02 20:13:36 +02:00 · 2022-04-26 16:10:54 +01:00 · 2022-04-26 16:10:54 +01:00 · d29f71255c
commit d29f71255c
parent 1c6014428e 8a2a03ecd3
53 changed files with 311 additions and 176 deletions
--- a/README.md
+++ b/README.md
@ -143,7 +143,7 @@ Translations can be contributed via https://hosted.weblate.org/projects/freeyour
 ## Community

 If you would like to get in touch with other Gadgetbridge users and developers outside of Codeberg, you can do so via:
-* Matrix: `#gadgetbridge:matrix.org` ([web access via Element.io](https://app.element.io/#/room/#gadgetbridge:matrix.org))
+* Matrix: [`#gadgetbridge:matrix.org`](https://matrix.to/#/#gadgetbridge:matrix.org)

 ## Do you have further questions or feedback?

--- a/app/build.gradle
+++ b/app/build.gradle
@ -62,6 +62,11 @@ android {
        buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\""
        buildConfigField "boolean", "INTERNET_ACCESS", "false"
        resValue "string", "pebble_content_provider", "com.getpebble.android.provider"
+        resValue "string", "app_name", "@string/application_name_generic"
+        resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_generic"
+        resValue "string", "about_activity_title", "@string/about_activity_title_generic"
+        resValue "string", "about_description", "@string/about_description_generic"
+        resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_generic"
    }
    signingConfigs {
        nightly {
@ -91,6 +96,11 @@ android {
            }
            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
            resValue "string", "pebble_content_provider", "com.getpebble.android.provider"
+            resValue "string", "app_name", "@string/application_name_main_nightly"
+            resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_main_nightly"
+            resValue "string", "about_activity_title", "@string/about_activity_title_main_nightly"
+            resValue "string", "about_description", "@string/about_description_main_nightly"
+            resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_main_nightly"
            debuggable true
        }
        nopebble {
@ -104,6 +114,11 @@ android {
            }
            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
            resValue "string", "pebble_content_provider", "com.getpebble.android.nopebble.provider"
+            resValue "string", "app_name", "@string/application_name_main_nopebble"
+            resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_main_nopebble"
+            resValue "string", "about_activity_title", "@string/about_activity_title_main_nopebble"
+            resValue "string", "about_description", "@string/about_description_main_nopebble"
+            resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_main_nopebble"
            debuggable true
        }

@ -140,6 +155,11 @@ android {
            buildConfigField "boolean", "INTERNET_ACCESS", "true"
            // Disable pebble provider to allow Bangle.js Gadgetbridge to coexist with Gadgetbridge
            resValue "string", "pebble_content_provider", "com.getpebble.android.nopebble.provider"
+            resValue "string", "app_name", "@string/application_name_banglejs_main"
+            resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_banglejs_main"
+            resValue "string", "about_activity_title", "@string/about_activity_title_banglejs_main"
+            resValue "string", "about_description", "@string/about_description_banglejs_main"
+            resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_banglejs_main"
        }
    }

--- a/app/src/banglejs/res/values/strings.xml
+++ b/app/src/banglejs/res/values/strings.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Bangle.js Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Bangle.js Gadgetbridge</string>
-    <string name="about_activity_title">About Bangle.js Gadgetbridge</string>
-    <string name="about_description">Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access.</string>
-    <string name="gadgetbridge_running">Bangle.js running</string>
-</resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -69,7 +69,8 @@
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:requestLegacyExternalStorage="true"
-        android:theme="@style/GadgetbridgeTheme">
+        android:theme="@style/GadgetbridgeTheme"
+        tools:replace="android:label">
        <activity
            android:name=".activities.ControlCenterv2"
            android:label="@string/title_activity_controlcenter"
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@ -178,6 +178,9 @@ public class DeviceSettingsPreferenceConst {
    public static final String PREFS_ACTIVITY_IN_DEVICE_CARD_DISTANCE = "prefs_activity_in_device_card_distance";
    public static final String PREFS_DEVICE_CHARTS_TABS = "charts_tabs";

+    public static final String PREF_UM25_SHOW_THRESHOLD_NOTIFICATION = "um25_current_threshold_notify";
+    public static final String PREF_UM25_SHOW_THRESHOLD = "um25_current_threshold";
+
    public static final String PREF_SOUNDS = "sounds";
    public static final String PREF_AUTH_KEY = "authkey";
    public static final String PREF_USER_FITNESS_GOAL = "fitness_goal";
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@ -456,6 +456,9 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
        addPreferenceHandlerFor(PREF_QC35_NOISE_CANCELLING_LEVEL);
        addPreferenceHandlerFor(PREF_USER_FITNESS_GOAL);

+        addPreferenceHandlerFor(PREF_UM25_SHOW_THRESHOLD_NOTIFICATION);
+        addPreferenceHandlerFor(PREF_UM25_SHOW_THRESHOLD);
+
        String sleepTimeState = prefs.getString(PREF_SLEEP_TIME, PREF_DO_NOT_DISTURB_OFF);
        boolean sleepTimeScheduled = sleepTimeState.equals(PREF_DO_NOT_DISTURB_SCHEDULED);

--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java
@ -56,6 +56,7 @@ public class DataActivity extends AbstractGBActivity {

        chargeDurationTextView = findViewById(R.id.um25_text_charge_duration);
        TextView wattHoursTextView = findViewById(R.id.um25_text_wattage_sum);
+        TextView currentAccumulatedTextView = findViewById(R.id.um25_text_current_sum);

        View.OnLongClickListener longClickListener = new View.OnLongClickListener() {
            @Override
@ -70,6 +71,7 @@ public class DataActivity extends AbstractGBActivity {

        chargeDurationTextView.setOnLongClickListener(longClickListener);
        wattHoursTextView.setOnLongClickListener(longClickListener);
+        currentAccumulatedTextView.setOnLongClickListener(longClickListener);
    }

    @Override
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java
@ -9,15 +9,12 @@ import android.os.ParcelUuid;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;

-import cyanogenmod.app.CustomTile;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.um25.Activity.DataActivity;
@ -55,6 +52,13 @@ public class UM25Coordinator extends AbstractDeviceCoordinator {
        return DeviceType.UNKNOWN;
    }

+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return new int[]{
+                R.xml.devicesettings_um25
+        };
+    }
+
    @Override
    public DeviceType getDeviceType() {
        return DeviceType.UM25;
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java
@ -1,12 +1,16 @@
 package nodomain.freeyourgadget.gadgetbridge.service.devices.um25.Support;

+import android.app.Notification;
+import android.app.PendingIntent;
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;

+import androidx.core.app.NotificationCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

 import org.slf4j.Logger;
@ -19,12 +23,17 @@ import java.util.UUID;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;

+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.um25.Activity.DataActivity;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEAction;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.um25.Data.CaptureGroup;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.um25.Data.MeasurementData;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;

 public class UM25Support extends UM25BaseSupport {
@ -44,6 +53,12 @@ public class UM25Support extends UM25BaseSupport {

    private static final  Logger logger = LoggerFactory.getLogger(UM25Support.class);

+    SharedPreferences preferences;
+
+    private boolean notifyOnCurrentThreshold;
+    private int notificationCurrentThreshold;
+    private boolean wasOverNotificationCurrent = false;
+    private long lastOverThresholdTimestamp = 0;

    public UM25Support() {
        super(logger);
@ -63,8 +78,22 @@ public class UM25Support extends UM25BaseSupport {
        }
    };

+    void readPreferences(){
+        notifyOnCurrentThreshold = preferences.getBoolean(DeviceSettingsPreferenceConst.PREF_UM25_SHOW_THRESHOLD_NOTIFICATION, false);
+        notificationCurrentThreshold = Integer.parseInt(preferences.getString(DeviceSettingsPreferenceConst.PREF_UM25_SHOW_THRESHOLD, "100"));
+    }
+
+    @Override
+    public void onSendConfiguration(String config) {
+        readPreferences();
+    }
+
    @Override
    protected TransactionBuilder initializeDevice(TransactionBuilder builder) {
+        preferences = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
+
+        readPreferences();
+
        return builder
                .add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()))
                .notify(getCharacteristic(UUID.fromString(UUID_CHAR)), true)
@ -132,6 +161,48 @@ public class UM25Support extends UM25BaseSupport {
        return true;
    }

+    private void handleCurrentNotification(int currentMa){
+        logger.debug("current: " + currentMa);
+
+        if(!notifyOnCurrentThreshold){
+            return;
+        }
+
+        boolean isOverNotificationCurrent = currentMa > notificationCurrentThreshold;
+
+        long now = System.currentTimeMillis();
+
+        if(isOverNotificationCurrent){
+            lastOverThresholdTimestamp = now;
+            wasOverNotificationCurrent = true;
+            return;
+        }
+        long deltaSinceOverThreshold = now - lastOverThresholdTimestamp;
+
+        if(deltaSinceOverThreshold < 5000){
+            // must be below threshold for over certain time before triggering notification
+            return;
+        }
+
+        if(wasOverNotificationCurrent){
+            // handle change from over threshold to below threshold
+            wasOverNotificationCurrent = false;
+            Intent activityIntent = new Intent(getContext(), DataActivity.class);
+            Notification notification = new NotificationCompat.Builder(getContext(), GB.NOTIFICATION_CHANNEL_HIGH_PRIORITY_ID)
+                    .setSmallIcon(R.drawable.ic_notification_low_battery)
+                    .setContentTitle("USB current")
+                    .setContentText("USB current below threshold")
+                    .setContentIntent(PendingIntent.getActivity(getContext(), 0, activityIntent, PendingIntent.FLAG_CANCEL_CURRENT))
+                    .build();
+
+            GB.notify(
+                    GB.NOTIFICATION_ID_LOW_BATTERY,
+                    notification,
+                    getContext()
+            );
+        }
+    }
+
    private void handlePayload(ByteBuffer payload){
        String payloadString = StringUtils.bytesToHex(payload.array());
        payloadString = payloadString.replaceAll("(..)", "$1 ");
@ -163,8 +234,6 @@ public class UM25Support extends UM25BaseSupport {
        int chargingSeconds = payload.getInt(112);
        int cableResistance = payload.getInt(122);

-        logger.debug("variable: " + chargedCurrent);
-
        MeasurementData data = new MeasurementData(
                voltage,
                current,
@ -185,6 +254,8 @@ public class UM25Support extends UM25BaseSupport {

        measurementIntent.putExtra(EXTRA_KEY_MEASUREMENT_DATA, data);

+        handleCurrentNotification(current / 10);
+
        LocalBroadcastManager.getInstance(getContext())
                .sendBroadcast(measurementIntent);
    }
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@ -44,7 +44,7 @@
                android:paddingRight="@dimen/about_margin">

                <TextView
-                    android:id="@+id/about_desc"
+                    android:id="@+id/about_description"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:text="@string/about_description" />
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -17,8 +17,8 @@
    <string name="pref_title_charts_range">Обхват на Графиката</string>
    <string name="pref_charts_range_on">Обхвата е Месец</string>
    <string name="pref_charts_range_off">Обхвата е Седмица</string>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Настройки</string>
    <string name="action_debug">Дебъгване</string>
    <string name="action_quit">Изход</string>
@ -228,7 +228,7 @@
    <string name="tap_connected_device_for_vibration">Докоснете свързаното устройство за вибрации</string>
    <string name="tap_a_device_to_connect">Докоснете устройство за свързване</string>
    <string name="cannot_connect_bt_address_invalid_">Не може да се установи връзка. Грешен Bluetooth адрес\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge работи</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge работи</string>
    <string name="installing_binary_d_d">Инсталиране на двоичен файл %1$d/%2$d</string>
    <string name="installation_failed_">Инсталацията пропадна</string>
    <string name="installation_successful">Инсталирано</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Configuració</string>
    <string name="action_debug">Depuració</string>
    <string name="action_quit">Surt</string>
@ -174,7 +174,7 @@
    <string name="tap_connected_device_for_vibration">Toca l\'aparell per fer-lo vibrar</string>
    <string name="tap_a_device_to_connect">Toca un aparell per connectar-hi</string>
    <string name="cannot_connect_bt_address_invalid_">No es pot connectar. Potser la direcció Bluetooth és incorrecta\?</string>
-    <string name="gadgetbridge_running">El Gadgetbridge està funcionant</string>
+    <string name="gadgetbridge_running_generic">El Gadgetbridge està funcionant</string>
    <string name="installing_binary_d_d">S\'està instal·lant el binari %1$d/%2$d</string>
    <string name="installation_failed_">La instal·lació ha fallat</string>
    <string name="installation_successful">Instal·lat</string>
@ -908,7 +908,7 @@
    <string name="about_additional_device_support">Support d\'aparell addicional</string>
    <string name="about_contributors">Col·laboradors</string>
    <string name="about_core_team_title">Equip principal (en ordre de primera contribució de codi)</string>
-    <string name="about_description">Substitut lliure, copyleft i sense núvol per a les aplicacions Android de codi tancat dels fabricants dels aparells.</string>
+    <string name="about_description_generic">Substitut lliure, copyleft i sense núvol per a les aplicacions Android de codi tancat dels fabricants dels aparells.</string>
    <string name="menuitem_dnd">No molestis</string>
    <string name="menuitem_spo2">SpO2</string>
    <string name="menuitem_pai">PAI</string>
@ -995,7 +995,7 @@
    <string name="device_requires_key">ES REQUEREIX CLAU</string>
    <string name="require_location_provider">La ubicació ha d\'estar activada</string>
    <string name="about_links">Enllaços</string>
-    <string name="about_activity_title">Quant a Gadgetbridge</string>
+    <string name="about_activity_title_generic">Quant a Gadgetbridge</string>
    <string name="about_version">Versió %s</string>
    <string name="about_title">Quant a</string>
    <string name="hr_widget_last_notification">Última notificació</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Nastavení</string>
    <string name="action_debug">Ladění</string>
    <string name="action_quit">Ukončit</string>
@ -154,7 +154,7 @@
    <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="gadgetbridge_running_generic">Gadgetbridge běží</string>
    <string name="installing_binary_d_d">Instaluji soubor %1$d/%2$d</string>
    <string name="installation_failed_">Instalace selhala</string>
    <string name="installation_successful">Instalace úspěšná</string>
@ -915,8 +915,8 @@
    <string name="about_additional_device_support">Podpora dalších zařízení</string>
    <string name="about_contributors">Přispěvatelé</string>
    <string name="about_core_team_title">Centrální tým (v pořadí příspěvku prvního kódu)</string>
-    <string name="about_description">Svobodná a lokální náhrada za uzavřenou aplikaci vašich hodinek/náramku.</string>
-    <string name="about_activity_title">O aplikaci Gadgetbridge</string>
+    <string name="about_description_generic">Svobodná a lokální náhrada za uzavřenou aplikaci vašich hodinek/náramku.</string>
+    <string name="about_activity_title_generic">O aplikaci Gadgetbridge</string>
    <string name="about_title">O aplikaci</string>
    <string name="menuitem_worldclock">Světový Čas</string>
    <string name="pref_title_weather_summary">Použito s poskytovatelem počasí LineageOS. Ostatní verze Androidu vyžadují \"Weather Notification\" app. Více informací naleznete na Gadgetbridge wiki.</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Einstellungen</string>
    <string name="action_debug">Debug</string>
    <string name="action_quit">Beenden</string>
@ -161,7 +161,7 @@
    <string name="tap_connected_device_for_vibration">Tippe auf das verbundene Gerät, um es vibrieren zu lassen</string>
    <string name="tap_a_device_to_connect">Tippe auf ein Gerät, um eine Verbindung herzustellen</string>
    <string name="cannot_connect_bt_address_invalid_">Keine Verbindung möglich. Bluetooth-Adresse ungültig\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge läuft</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge läuft</string>
    <string name="installing_binary_d_d">Binärdatei %1$d/%2$d wird installiert</string>
    <string name="installation_failed_">Installation fehlgeschlagen</string>
    <string name="installation_successful">Installiert</string>
@ -923,8 +923,8 @@
    <string name="about_additional_device_support">Unterstützung zusätzlicher Geräte</string>
    <string name="about_contributors">Beitragende</string>
    <string name="about_core_team_title">Kernteam (Reihenfolge der ersten Mitwirkung am Code)</string>
-    <string name="about_description">Cloudloser freier Ersatz für proprietäre Android-Gadget-Apps der Hersteller.</string>
-    <string name="about_activity_title">Über Gadgetbridge</string>
+    <string name="about_description_generic">Cloudloser freier Ersatz für proprietäre Android-Gadget-Apps der Hersteller.</string>
+    <string name="about_activity_title_generic">Über Gadgetbridge</string>
    <string name="about_title">Über</string>
    <string name="pref_title_weather_summary">Wird für den LineageOS Wetterdienst genutzt, andere Android-Versionen müssen eine Anwendung wie Weather notification nutzen. Mehr Informationen gibt es im Gadgetbride-Wiki.</string>
    <string name="menuitem_worldclock">Weltzeituhr</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Ρυθμίσεις</string>
    <string name="action_debug">Αποσφαλμάτωση</string>
    <string name="action_quit">Έξοδος</string>
@ -174,7 +174,7 @@
    <string name="tap_connected_device_for_vibration">Πατήστε τη συνδεδεμένη συσκευή για δόνηση</string>
    <string name="tap_a_device_to_connect">Πατήστε μία συσκευή για να συνδεθεί</string>
    <string name="cannot_connect_bt_address_invalid_">Δεν μπορεί να γίνει σύνδεση. Μήπως δεν είναι έγκυρη η διεύθυνση Bluetooth;</string>
-    <string name="gadgetbridge_running">Το Gadgetbridge εκτελείται</string>
+    <string name="gadgetbridge_running_generic">Το Gadgetbridge εκτελείται</string>
    <string name="installing_binary_d_d">Γίνεται εγκατάσταση των βιβλιοθηκών %1$d/%2$d</string>
    <string name="installation_failed_">Η εγκατάσταση απέτυχε</string>
    <string name="installation_successful">Εγκατεστημένο</string>
@ -901,8 +901,8 @@
    <string name="about_additional_device_support">Πρόσθετη υποστήριξη συσκευών</string>
    <string name="about_contributors">Συντελεστές</string>
    <string name="about_core_team_title">Βασική ομάδα (κατά σειρά μεγαλύτερης συνεισφοράς κώδικα)</string>
-    <string name="about_description">Μια δωρεάν, ελεύθερου κώδικα και χωρίς πρόσβαση στο διαδίκτυο εφαρμογή Android για να αντικαταστήσει τις υπάρχουσες εφαρμογές κλειστού κώδικα των κατασκευαστών του smartwatch σας.</string>
-    <string name="about_activity_title">Σχετικά με το Gadgetbridge</string>
+    <string name="about_description_generic">Μια δωρεάν, ελεύθερου κώδικα και χωρίς πρόσβαση στο διαδίκτυο εφαρμογή Android για να αντικαταστήσει τις υπάρχουσες εφαρμογές κλειστού κώδικα των κατασκευαστών του smartwatch σας.</string>
+    <string name="about_activity_title_generic">Σχετικά με το Gadgetbridge</string>
    <string name="about_title">Σχετικά</string>
    <string name="menuitem_worldclock">Παγκόσμιο Ρολόι</string>
    <string name="devicetype_amazfit_trex">Amazfit T-Rex</string>
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@ -684,7 +684,7 @@
    <string name="installation_successful">Installed</string>
    <string name="installation_failed_">Installation failed</string>
    <string name="installing_binary_d_d">Installing binary %1$d/%2$d</string>
-    <string name="gadgetbridge_running">Gadgetbridge running</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge running</string>
    <string name="cannot_connect_bt_address_invalid_">Cannot connect. Bluetooth address invalid\?</string>
    <string name="tap_a_device_to_connect">Tap a device to connect</string>
    <string name="tap_connected_device_for_vibration">Tap connected device for vibration</string>
@ -853,8 +853,8 @@
    <string name="action_quit">Quit</string>
    <string name="action_debug">Debug</string>
    <string name="action_settings">Settings</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
-    <string name="app_name">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
    <string name="pref_qhybrid_save_raw_activity_files">Save raw activity files</string>
    <string name="menuitem_workout">Workout</string>
    <string name="menuitem_eventreminder">Event Reminder</string>
@ -1124,7 +1124,7 @@
    <string name="activity_summaries_statistics">Statistics</string>
    <string name="pref_title_upper_button_function_short">Upper Button short</string>
    <string name="pref_title_upper_button_function_double">Upper Button double</string>
-    <string name="about_activity_title">About Gadgetbridge</string>
+    <string name="about_activity_title_generic">About Gadgetbridge</string>
    <string name="gpx_receiver_files_received">GPX file(s) received:</string>
    <string name="gpx_receiver_overwrite_some_files">Some file(s) already exist. Overwrite\?</string>
    <string name="about_additional_contributions">Many thanks to all unlisted contributors for contributing code, translations, support, ideas, motivation, bug reports, money… ✊</string>
@ -1276,7 +1276,7 @@
    <string name="menuitem_temperature">Temperature</string>
    <string name="about_version">Version %s</string>
    <string name="about_title">About</string>
-    <string name="about_description">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors.</string>
+    <string name="about_description_generic">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors.</string>
    <string name="sports_activity_quick_filter_30days">30 days</string>
    <string name="sports_activity_quick_filter_select">Time period</string>
    <string name="device_is_currently_bonded">Already bonded</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Configuración</string>
    <string name="action_debug">Depuración</string>
    <string name="action_quit">Salir</string>
@ -161,7 +161,7 @@
    <string name="tap_connected_device_for_vibration">Toque el dispositivo conectado para la vibración</string>
    <string name="tap_a_device_to_connect">Toca un dispositivo para conectarlo</string>
    <string name="cannot_connect_bt_address_invalid_">No se puede conectar. ¿Dirección BT incorrecta?</string>
-    <string name="gadgetbridge_running">Gadgetbridge funcionando</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge funcionando</string>
    <string name="installing_binary_d_d">Instalando binario %1$d/%2$d</string>
    <string name="installation_failed_">Instalación fallida</string>
    <string name="installation_successful">Instalado</string>
@ -1093,8 +1093,8 @@
    <string name="about_additional_device_support">Soporte de dispositivos adicionales</string>
    <string name="about_contributors">Colaboradores</string>
    <string name="about_core_team_title">Equipo principal (por orden de primera contribución de código)</string>
-    <string name="about_description">Sustitución sin nube y con copyleft de las aplicaciones de código cerrado para Android de los proveedores.</string>
-    <string name="about_activity_title">Acerca de Gadgetbridge</string>
+    <string name="about_description_generic">Sustitución sin nube y con copyleft de las aplicaciones de código cerrado para Android de los proveedores.</string>
+    <string name="about_activity_title_generic">Acerca de Gadgetbridge</string>
    <string name="about_version">Versión %s</string>
    <string name="about_title">Acerca de</string>
    <string name="hr_widget_last_notification">Última notificación</string>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Seaded</string>
    <string name="action_debug">Silumine</string>
    <string name="action_quit">Välju</string>
@ -243,7 +243,7 @@
    <string name="tap_connected_device_for_vibration">Puuduta ühendatud seadet värina tekitamiseks</string>
    <string name="tap_a_device_to_connect">Puuduta seadet, et ühendada</string>
    <string name="cannot_connect_bt_address_invalid_">Ei saa ühendust. Vigane bluetooth aadress\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge töötab</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge töötab</string>
    <string name="installing_binary_d_d">Binaarfaili %1$d/%2$d paigaldamine</string>
    <string name="installation_failed_">Paigaldamine nurjus</string>
    <string name="installation_successful">Paigaldatud</string>
@ -746,8 +746,8 @@
    <string name="about_additional_device_support">Täiendavate seadmete tugi</string>
    <string name="about_contributors">Kaasaaitajad</string>
    <string name="about_core_team_title">Tuumiktiim (järjestatud esimese koodirea kuupäeva järgi)</string>
-    <string name="about_description">Tasuta ja pilvevaba asendus teie kantavate nutiseadmete tootjate rakendustele.</string>
-    <string name="about_activity_title">Gadgetbridge\'ist</string>
+    <string name="about_description_generic">Tasuta ja pilvevaba asendus teie kantavate nutiseadmete tootjate rakendustele.</string>
+    <string name="about_activity_title_generic">Gadgetbridge\'ist</string>
    <string name="about_title">Rakendusest</string>
    <string name="pref_title_lower_button_function">Alumine nupp</string>
    <string name="pref_title_middle_button_function">Keskmine nupp</string>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">گجت‌بریج</string>
-    <string name="title_activity_controlcenter">گجت‌بریج</string>
+    <string name="application_name_generic">گجت‌بریج</string>
+    <string name="title_activity_controlcenter_generic">گجت‌بریج</string>
    <string name="action_settings">تنظیمات</string>
    <string name="action_debug">اشکال‌زدایی</string>
    <string name="action_quit">خروج</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -3,8 +3,8 @@
    <string name="action_settings">Asetukset</string>
    <string name="controlcenter_fetch_activity_data">Synkronoi</string>
    <string name="controlcenter_find_device">Löydä kadonnut laite</string>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_quit">Lopeta</string>
    <string name="action_donate">Lahjoita</string>
    <string name="controlcenter_take_screenshot">Ota ruutukaappaus</string>
@ -447,7 +447,7 @@
    <string name="live_activity_steps_history">Askeleiden historia</string>
    <string name="live_activity_total_steps">Kokonaisaskeleet</string>
    <string name="about_title">Tietoja</string>
-    <string name="about_activity_title">Tietoja Gadgetbridgestä</string>
+    <string name="about_activity_title_generic">Tietoja Gadgetbridgestä</string>
    <string name="activity_filter_date_from">Alkaen</string>
    <string name="activity_filter_date_to">Päättyen</string>
    <string name="pref_screen_notification_profile_missed_call">Vastaamatta jääneen puhelun ilmoitus</string>
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@ -129,8 +129,8 @@
    <string name="calories">Calories</string>
    <string name="miband_prefs_vibration">Vibration</string>
    <string name="vibration_profile_long">Long</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
-    <string name="app_name">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
    <plurals name="widget_alarm_target_hours">
        <item quantity="one">%d heure</item>
        <item quantity="other">%d heures</item>
@ -697,7 +697,7 @@
    <string name="installation_successful">Installé</string>
    <string name="installation_failed_">Échec de l\'installation</string>
    <string name="installing_binary_d_d">Installation du binaire %1$d/%2$d</string>
-    <string name="gadgetbridge_running">Gadgetbridge est en fonctionnement</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge est en fonctionnement</string>
    <string name="tap_a_device_to_connect">Tapez sur le périphérique pour le connecter</string>
    <string name="tap_connected_device_for_vibration">Cliquez sur connecter pour envoyer une vibration</string>
    <string name="tap_connected_device_for_activity">Cliquez sur l\'appareil pour ouvrir le gestionnaire d’activité</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Paramètres</string>
    <string name="action_debug">Déboguer</string>
    <string name="action_quit">Quitter</string>
@ -161,7 +161,7 @@
    <string name="tap_connected_device_for_vibration">Cliquez sur connecter pour envoyer une vibration</string>
    <string name="tap_a_device_to_connect">Tapez sur le périphérique pour le connecter</string>
    <string name="cannot_connect_bt_address_invalid_">Connexion impossible. L’adresse Bluetooth est-elle valide ?</string>
-    <string name="gadgetbridge_running">Gadgetbridge est en fonctionnement</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge est en fonctionnement</string>
    <string name="installing_binary_d_d">Installation du binaire %1$d/%2$d</string>
    <string name="installation_failed_">Échec de l\'installation</string>
    <string name="installation_successful">Installé</string>
@ -1017,8 +1017,8 @@ Temps de sommeil préféré en heures</string>
    <string name="about_additional_device_support">Support d\'appareil supplémentaire</string>
    <string name="about_contributors">Contributeurs</string>
    <string name="about_core_team_title">Équipe principal (dans l\'ordre de la première contribution au code)</string>
-    <string name="about_description">Un remplaçant libre et sans cloud aux applications Android propriétaires des fabricants de vos bracelets.</string>
-    <string name="about_activity_title">A propos de Gadgetbridge</string>
+    <string name="about_description_generic">Un remplaçant libre et sans cloud aux applications Android propriétaires des fabricants de vos bracelets.</string>
+    <string name="about_activity_title_generic">A propos de Gadgetbridge</string>
    <string name="about_title">A propos</string>
    <string name="menuitem_worldclock">Horloge mondiale</string>
    <string name="menuitem_stress">Stress</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Axustes</string>
    <string name="action_debug">Depuración</string>
    <string name="action_quit">Saír</string>
@ -143,7 +143,7 @@
    <string name="tap_connected_device_for_vibration">Toque nun dispositivo conectado para facelo Vibrar</string>
    <string name="tap_a_device_to_connect">Toque nun dispositivo para conectar</string>
    <string name="cannot_connect_bt_address_invalid_">Non foi posíbel conectar. Enderezo Bluetooth inválido?</string>
-    <string name="gadgetbridge_running">Gadgetbridge en execución</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge en execución</string>
    <string name="installing_binary_d_d">Instalando binario %1$d/%2$d</string>
    <string name="installation_failed_">Fallou a instalación</string>
    <string name="installation_successful">Instalado</string>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">הגדרות</string>
    <string name="action_debug">ניפוי שגיאות</string>
    <string name="action_quit">יציאה</string>
@ -147,7 +147,7 @@
    <string name="tap_connected_device_for_vibration">נקישה על ההתקן המחובר לרטט</string>
    <string name="tap_a_device_to_connect">יש לגעת בהתקן כדי להתחבר</string>
    <string name="cannot_connect_bt_address_invalid_">לא ניתן להתחבר. כתובת ה־Bluetooth שגויה?</string>
-    <string name="gadgetbridge_running">Gadgetbridge פעיל</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge פעיל</string>
    <string name="installing_binary_d_d">התקנת הבינרי %1$d/%2$d</string>
    <string name="installation_failed_">ההתקנה נכשלה</string>
    <string name="installation_successful">ההתקנה הצליחה</string>
@ -913,8 +913,8 @@
    <string name="about_additional_device_support">תמיכה במכשירים נוספים</string>
    <string name="about_contributors">תורמים</string>
    <string name="about_core_team_title">צוות הליבה (מסודרים לפי מועד תרומת הקוד הראשונה)</string>
-    <string name="about_description">חלופה חופשית ונטולת ענן ליישומוני ה־Android לחפיצים עם הקוד הסגור של היצרנים.</string>
-    <string name="about_activity_title">על אודות Gadgetbridge</string>
+    <string name="about_description_generic">חלופה חופשית ונטולת ענן ליישומוני ה־Android לחפיצים עם הקוד הסגור של היצרנים.</string>
+    <string name="about_activity_title_generic">על אודות Gadgetbridge</string>
    <string name="about_title">על אודות</string>
    <string name="pref_title_weather_summary">משמש לספק מזג האוויר של LineageOS, גרסאות אחרות של Android צריכות להשתמש ביישומונים כמו „התראות מזג אוויר”. אפשר למצוא מידע נוסף בוויקי של Gadgetbridge.</string>
    <string name="menuitem_worldclock">שעון עולמי</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
    <string name="male">Muško</string>
    <string name="female">Žensko</string>
    <string name="other">Ostalo</string>
@ -28,7 +28,7 @@
    <string name="controlcenter_set_alias">Postavi pseudonim</string>
    <string name="action_quit">Izlaz</string>
    <string name="action_debug">Debug</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="dbmanagementactivity_delete_old_activitydb_confirmation">Stvarno izbrisati staru bazu podataka aktivnosti\? Podaci aktivnosti koji nisu uvezeni će se izgubiti.</string>
    <string name="dbmanagementactivity_delete_old_activity_db">Izbrisati staru bazu podataka aktivnosti\?</string>
    <string name="dbmanagementactivity_database_successfully_deleted">Podaci izbrisani.</string>
@ -1268,8 +1268,8 @@
    <string name="add_widget">Dodaj widget</string>
    <string name="appwidget_setting_alarm">Postavljanje alarma za %1$02d:%2$02d</string>
    <string name="about_version">Verzija %s</string>
-    <string name="about_activity_title">O Gadgetbridge</string>
-    <string name="about_description">Zamjena za libre bez oblaka bez kopiranja za zatvorene aplikacije za Android gadgete od dobavljača.</string>
+    <string name="about_activity_title_generic">O Gadgetbridge</string>
+    <string name="about_description_generic">Zamjena za libre bez oblaka bez kopiranja za zatvorene aplikacije za Android gadgete od dobavljača.</string>
    <string name="about_core_team_title">Osnovni tim (po redoslijedu doprinosa prvog koda)</string>
    <string name="qhybrid_title_watchface">Konfiguracija izgleda sata</string>
    <string name="button_watchface_select_image">Promjena pozadinske slike</string>
@ -1358,7 +1358,7 @@
 \n
 \n
 \n Ovaj firmware je za HW reviziju: %s</string>
-    <string name="gadgetbridge_running">Gadgetbridge je pokrenut</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge je pokrenut</string>
    <string name="tap_a_device_to_connect">Dodirnite uređaj za povezivanje</string>
    <string name="test">Test</string>
    <string name="not_connected">Nije povezano</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge </string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge </string>
    <string name="action_settings">Beállítások</string>
    <string name="action_debug">Hibakeresés</string>
    <string name="action_quit">Kilépés</string>
@ -157,7 +157,7 @@
    <string name="tap_connected_device_for_vibration">Koppints az eszközre a rezgetéshez.</string>
    <string name="tap_a_device_to_connect">Koppints az eszközre a csatlakozáshoz</string>
    <string name="cannot_connect_bt_address_invalid_">Nem lehet csatlakozni. Rossz Bluetooth cím?</string>
-    <string name="gadgetbridge_running">A Gadgetbridge fut</string>
+    <string name="gadgetbridge_running_generic">A Gadgetbridge fut</string>
    <string name="installing_binary_d_d">%1$d/%2$d bináris telepítése</string>
    <string name="installation_failed_">Sikertelen telepítés</string>
    <string name="installation_successful">Telepítve</string>
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Pengaturan</string>
    <string name="action_quit">Keluar</string>
    <string name="action_donate">Donasi</string>
@ -175,7 +175,7 @@
    <string name="hr_widget_calories">Kalori</string>
    <string name="gpx_receiver_activity_title">Penerima GPX Gadgetbridge</string>
    <string name="require_location_provider">Lokasi harus diaktifkan</string>
-    <string name="about_activity_title">Tentang Gadgetbridge</string>
+    <string name="about_activity_title_generic">Tentang Gadgetbridge</string>
    <string name="about_version">Versi %s</string>
    <string name="about_title">Tentang</string>
    <string name="about_links">Tautan</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Impostazioni</string>
    <string name="action_debug">Debug</string>
    <string name="action_quit">Esci</string>
@ -158,7 +158,7 @@
    <string name="tap_connected_device_for_vibration">Tocca il dispositivo connesso per la vibrazione</string>
    <string name="tap_a_device_to_connect">tocca il dispositivo a cui connettersi</string>
    <string name="cannot_connect_bt_address_invalid_">Impossibile connettersi. Indirizzo Bluetooth non valido?</string>
-    <string name="gadgetbridge_running">Gadgetbridge in esecuzione</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge in esecuzione</string>
    <string name="installing_binary_d_d">Installazione del binario %1$d/%2$d</string>
    <string name="installation_failed_">Installazione fallita</string>
    <string name="installation_successful">Installazione conclusa con successo</string>
@ -884,8 +884,8 @@
    <string name="about_additional_device_support">Supporto a dispositivi aggiuntivi</string>
    <string name="about_contributors">Contributori</string>
    <string name="about_core_team_title">Team principale (ordinati in base al primo contributo di codice)</string>
-    <string name="about_description">Un\'alternativa gratuita, libera e senza cloud alle applicazioni Android a sorgente chiusa del tuo dispositivo.</string>
-    <string name="about_activity_title">Su Gadgetbridge</string>
+    <string name="about_description_generic">Un\'alternativa gratuita, libera e senza cloud alle applicazioni Android a sorgente chiusa del tuo dispositivo.</string>
+    <string name="about_activity_title_generic">Su Gadgetbridge</string>
    <string name="about_title">Informazioni</string>
    <string name="hr_widget_last_notification">Ultima notifica</string>
    <string name="pref_qhybrid_save_raw_activity_files">Salva i dati raw (grezzi) delle attività</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">ガジェットブリッジ</string>
-    <string name="title_activity_controlcenter">ガジェットブリッジ</string>
+    <string name="application_name_generic">ガジェットブリッジ</string>
+    <string name="title_activity_controlcenter_generic">ガジェットブリッジ</string>
    <string name="action_settings">設定</string>
    <string name="action_debug">デバッグ</string>
    <string name="action_quit">終了</string>
@ -161,7 +161,7 @@
    <string name="tap_connected_device_for_vibration">バイブレーションの接続されたデバイスをタップ</string>
    <string name="tap_a_device_to_connect">接続するデバイスをタップ</string>
    <string name="cannot_connect_bt_address_invalid_">接続できません。 Bluetoothアドレスが無効ですか\?</string>
-    <string name="gadgetbridge_running">ガジェットブリッジは実行中</string>
+    <string name="gadgetbridge_running_generic">ガジェットブリッジは実行中</string>
    <string name="installing_binary_d_d">バイナリーのインストール中 %1$d/%2$d</string>
    <string name="installation_failed_">インストールに失敗しました</string>
    <string name="installation_successful">インストールに成功しました</string>
@ -708,7 +708,7 @@
    <string name="distanceMeters">距離</string>
    <string name="device_requires_key">キーが必要です</string>
    <string name="about_contributors">貢献者</string>
-    <string name="about_activity_title">Gadgetbridgeについて</string>
+    <string name="about_activity_title_generic">Gadgetbridgeについて</string>
    <string name="about_title">について</string>
    <string name="hr_widget_last_notification">最終通知</string>
    <string name="hr_appname_commute">通勤</string>
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">პარამეტრები</string>
    <string name="action_quit">შეწყვეტა</string>
    <string name="action_donate">დონაცია</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">가젯브릿지</string>
-    <string name="title_activity_controlcenter">가젯브릿지</string>
+    <string name="application_name_generic">가젯브릿지</string>
+    <string name="title_activity_controlcenter_generic">가젯브릿지</string>
    <string name="action_settings">설정</string>
    <string name="action_debug">디버그</string>
    <string name="action_quit">종료</string>
@ -77,7 +77,7 @@
    <string name="tap_connected_device_for_app_mananger">연결된 기기를 선택해 앱 관리자 실행</string>
    <string name="tap_a_device_to_connect">기기를 선택해 연결</string>
    <string name="cannot_connect_bt_address_invalid_">연결할 수 없습니다. 블루투스 주소가 올바르지 않은 것 같습니다\?</string>
-    <string name="gadgetbridge_running">가젯브릿지 실행중</string>
+    <string name="gadgetbridge_running_generic">가젯브릿지 실행중</string>
    <string name="installing_binary_d_d">바이너리 설치중: %1$d/%2$d</string>
    <string name="installation_failed_">설치 실패</string>
    <string name="installation_successful">설치됨</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Nustatymai</string>
    <string name="action_debug">Šalinti riktus</string>
    <string name="action_quit">Išeiti</string>
@ -167,7 +167,7 @@
    <string name="bluetooth_is_not_supported_">Bluetooth nepalaikomas.</string>
    <string name="bluetooth_is_disabled_">Bluetooth išjungtas.</string>
    <string name="tap_a_device_to_connect">Bagstelėkite įrenginį, kad prisijungtumėte</string>
-    <string name="gadgetbridge_running">Gadgetbridge paleistas</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge paleistas</string>
    <string name="installation_successful">Instaluota</string>
    <string name="title_activity_discovery">Įrenginio paieška</string>
    <string name="discovery_stop_scanning">Stabdyti skenavimą</string>
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@ -78,8 +78,8 @@
    <string name="action_quit">പുറത്തു കടക്കുക</string>
    <string name="action_debug">തെറ്റുകൾ തിരുത്തുക</string>
    <string name="action_settings">ക്രമീകരണങ്ങൾ</string>
-    <string name="title_activity_controlcenter">ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ്</string>
-    <string name="app_name">ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ്</string>
+    <string name="title_activity_controlcenter_generic">ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ്</string>
+    <string name="application_name_generic">ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ്</string>
    <string name="sonyswr12_settings_low_vibration_summary">ബാൻഡിൽ വൈബ്രേഷന്റെ കുറഞ്ഞ തീവ്രത പ്രവർത്തനക്ഷമമാക്കുക</string>
    <string name="sonyswr12_settings_stamina_summary">പവർ സേവിംഗ് മോഡ് ഹൃദയമിടിപ്പിന്റെ ആനുകാലിക യാന്ത്രിക അളവ് ഓഫുചെയ്യുന്നത് പ്രവർത്തന സമയം വർദ്ധിപ്പിക്കുന്നു</string>
    <string name="sonyswr12_settings_alarm_interval_summary">ഇൻസ്റ്റാൾ ചെയ്ത അലാറത്തിന് മുമ്പുള്ള ഇടവേളയാണ് സ്മാർട്ട് അലാറം ഇടവേള. ഈ ഇടവേള ഉപകരണം ഉപയോക്താവിനെ ഉണർത്താൻ ഉറക്കത്തിന്റെ ഭാരം കുറഞ്ഞ ഘട്ടം കണ്ടെത്താൻ ശ്രമിക്കുന്നു</string>
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">ခ်ိန္ညွိရန္</string>
    <string name="action_debug">ျပစ္ခ်က္</string>
    <string name="action_quit">ထြက္မည္</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@ -39,8 +39,8 @@
    <string name="title_activity_calblacklist">Svartelistede kalendere</string>
    <string name="title_activity_fw_app_insaller">Fastvare-/program-installerer</string>
    <string name="fw_upgrade_notice">Du er i ferd med å installere %s.</string>
-    <string name="app_name">Gadgetbru</string>
-    <string name="title_activity_controlcenter">Gadgetbru</string>
+    <string name="application_name_generic">Gadgetbru</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbru</string>
    <string name="controlcenter_delete_device_dialogmessage">Dette vil slette enheten og all tilknyttet data!</string>
    <string name="fw_upgrade_notice_amazfitbip">Du er i ferd med å installere %s-fastvaren på din Amazfit Bip.
 \n
@ -165,7 +165,7 @@
    <string name="tap_connected_device_for_vibration">Trykk på tilkoblet enhet for vibrasjon</string>
    <string name="tap_a_device_to_connect">Trykk på en enhet for å koble til</string>
    <string name="cannot_connect_bt_address_invalid_">Kan ikke koble til. Ugyldig Blåtannsadresse?</string>
-    <string name="gadgetbridge_running">Gadgetbro kjører</string>
+    <string name="gadgetbridge_running_generic">Gadgetbro kjører</string>
    <string name="installing_binary_d_d">Installerer binærfil %1$d/%2$d</string>
    <string name="installation_failed_">Installasjon mislyktes</string>
    <string name="installation_successful">Installert</string>
@ -902,7 +902,7 @@
    <string name="error_background_service">Klarte ikke å starte bakgrunnstjeneste</string>
    <string name="about_additional_device_support">Ytterligere enhetsstøtte</string>
    <string name="about_contributors">Bidragsytere</string>
-    <string name="about_activity_title">Om Gadgetbridge</string>
+    <string name="about_activity_title_generic">Om Gadgetbridge</string>
    <string name="about_title">Om</string>
    <string name="menuitem_worldclock">Verdensklokke</string>
    <string name="menuitem_stress">Stress</string>
@ -1034,7 +1034,7 @@
    <string name="sonyswr12_settings_low_vibration_summary">Aktiver lav vibrasjonsintensitet på båndet</string>
    <string name="sonyswr12_settings_stamina_summary">Strømsparingsmodus slår av periodisk automatisk måling av hjertefrekvensen og øker dermed arbeidstiden</string>
    <string name="sonyswr12_settings_alarm_interval_summary">Smart alarmintervall er intervall før installert alarm. I dette intervallet prøver enheten å oppdage den letteste søvnfasen for å våkne brukeren</string>
-    <string name="about_description">Skyfri, gemenhetslig fri erstatning for den lukkede motsatsen for dine Android-slaveenheter.</string>
+    <string name="about_description_generic">Skyfri, gemenhetslig fri erstatning for den lukkede motsatsen for dine Android-slaveenheter.</string>
    <string name="pref_check_permission_status_summary">Sjekk og forespør tilganger selv om de ikke trengs umiddelbart. Skru av dette kun hvis enhetene dine ikke støtter noen av disse funksjonene. Å ikke innvilge tilganger kan forårsake problemer!</string>
    <string name="companiondevice_pairing_details">Skrur på slaveenhets-API (funker kun på Android 8 og høyere, og tilknytningen må settes opp på ny med Gadgetbro), noe som øker påliteligheten hvis tjenester må startes på ny i bakgrunnen</string>
    <string name="error_version_check_extreme_caution">Advarsel: Kunne ikke sjekke versjonsinfo! Du bør ikke fortsette og versjonsnavnet «%s» ble sett.</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Instellingen</string>
    <string name="action_debug">Debug</string>
    <string name="action_quit">Sluit af</string>
@ -185,7 +185,7 @@
    <string name="tap_connected_device_for_vibration">Tap op het verbonden apparaat voor vibratie</string>
    <string name="tap_a_device_to_connect">Tap op een apparaat om te verbinden</string>
    <string name="cannot_connect_bt_address_invalid_">Kan niet verbinden. Is het Bluetooth adres ongeldig?</string>
-    <string name="gadgetbridge_running">Gadgetbridge loopt</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge loopt</string>
    <string name="installing_binary_d_d">Binary installeren %1$d/%2$d</string>
    <string name="installation_failed_">Installatie gefaald</string>
    <string name="installation_successful">Geïnstalleerd</string>
@ -914,8 +914,8 @@
    <string name="about_additional_device_support">Extra apparaatondersteuning</string>
    <string name="about_contributors">Bijdragers</string>
    <string name="about_core_team_title">Kernteam (in volgorde van eerste codebijdrage)</string>
-    <string name="about_description">Cloudloze vrije vervanging voor de gesloten Android-applicaties van gadgetfabrikanten.</string>
-    <string name="about_activity_title">Over Gadgetbridge</string>
+    <string name="about_description_generic">Cloudloze vrije vervanging voor de gesloten Android-applicaties van gadgetfabrikanten.</string>
+    <string name="about_activity_title_generic">Over Gadgetbridge</string>
    <string name="about_title">Over</string>
    <string name="pref_title_weather_summary">Gebruikt voor de LineageOS-weeraanbieder, andere Android versies moeten een app zoals \"Weather notification\" gebruiken. Meer informatie is te vinden in de Gadgetbridge wiki.</string>
    <string name="menuitem_worldclock">Wereld Klok</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Ustawienia</string>
    <string name="action_debug">Debuguj</string>
    <string name="action_quit">Wyjdź</string>
@ -108,7 +108,7 @@
    <string name="tap_connected_device_for_app_mananger">Kliknij połączone urządzenie, aby uruchomić menadżer aplikacji</string>
    <string name="tap_a_device_to_connect">Dotknij urządzenie aby połączyć</string>
    <string name="cannot_connect_bt_address_invalid_">Nie można połączyć. Nieprawidłowy adres Bluetooth\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge działa</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge działa</string>
    <string name="installing_binary_d_d">Instalowanie binarki %1$d/%2$d</string>
    <string name="installation_failed_">Instalacja nie powiodła się</string>
    <string name="installation_successful">Zainstalowano</string>
@ -913,7 +913,7 @@
    <string name="hr_widget_last_notification">Ostatnie powiadomienie</string>
    <string name="controlcenter_set_alias">Ustaw własną nazwę</string>
    <string name="about_contributors">Współtwórcy</string>
-    <string name="about_activity_title">O Gadgetbridge</string>
+    <string name="about_activity_title_generic">O Gadgetbridge</string>
    <string name="devicetype_amazfit_trex">Amazfit T-Rex</string>
    <string name="backstroke">Styl grzbietowy</string>
    <string name="freestyle">Styl dowolny</string>
@ -1031,7 +1031,7 @@
    <string name="about_links">Linki</string>
    <string name="about_additional_contributions">Dziękujemy wszystkim nie notowanym na liście współtwórcom za udostępnienie kodu, tłumaczenia, wsparcie, pomysły, motywację, zgłoszenia błędów, pieniądze… ✊</string>
    <string name="about_core_team_title">Zespół główny (w kolejności od pierwszego wkładu w kod aplikacji)</string>
-    <string name="about_description">Wolny od chmury zamiennik dla aplikacji o zamkniętym kodzie źródłowym dostarczanych przez producentów gadżetów dla systemu Android.</string>
+    <string name="about_description_generic">Wolny od chmury zamiennik dla aplikacji o zamkniętym kodzie źródłowym dostarczanych przez producentów gadżetów dla systemu Android.</string>
    <string name="activity_summary_edit_name_title">Edytuj etykietę</string>
    <string name="activity_type_pingpong">Ping-pong</string>
    <string name="activity_type_cricket">Krykiet</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Configurações</string>
    <string name="action_debug">Depurar</string>
    <string name="action_quit">Sair</string>
@ -148,7 +148,7 @@
    <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 foi possível conectar. Endereço de Bluetooth inválido\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge em execução</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge em execução</string>
    <string name="installing_binary_d_d">Instalando binário %1$d/%2$d</string>
    <string name="installation_failed_">Instalação falhou</string>
    <string name="installation_successful">Instalado</string>
@ -920,8 +920,8 @@
    <string name="about_additional_device_support">Suporte a dispositivos adicionais</string>
    <string name="about_contributors">Contribuidores</string>
    <string name="about_core_team_title">Equipe Core (na ordem da primeira contribuição de código)</string>
-    <string name="about_description">Um substituto livre, protegido por copyleft, sem acesso a nuvem para os aplicativos Android de código fechado dos fornecedores de gadgets.</string>
-    <string name="about_activity_title">Sobre o Gadgetbridge</string>
+    <string name="about_description_generic">Um substituto livre, protegido por copyleft, sem acesso a nuvem para os aplicativos Android de código fechado dos fornecedores de gadgets.</string>
+    <string name="about_activity_title_generic">Sobre o Gadgetbridge</string>
    <string name="about_title">Sobre</string>
    <string name="pref_title_weather_summary">Usado para o provedor do clima do LineageOS, outras versões do Android precisam usar um aplicativo como o \"Notificação de clima\". Encontrará mais informações no wiki do Gadgetbridge.</string>
    <string name="menuitem_worldclock">Relógio mundial</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Definições</string>
    <string name="action_debug">Depurar</string>
    <string name="action_quit">Sair</string>
@ -156,7 +156,7 @@
    <string name="tap_connected_device_for_vibration">Toque no aparelho ligado para o fazer vibrar</string>
    <string name="tap_a_device_to_connect">Toque num aparelho para ligar</string>
    <string name="cannot_connect_bt_address_invalid_">Não foi possível conectar. Endereço de Bluetooth inválido\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge a executar</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge a executar</string>
    <string name="installing_binary_d_d">Instalando binário %1$d/%2$d</string>
    <string name="installation_failed_">A instalação falhou</string>
    <string name="installation_successful">Instalado</string>
@ -573,8 +573,8 @@
    <string name="about_additional_device_support">Suporte a aparelhos adicionais</string>
    <string name="about_contributors">Contribuidores</string>
    <string name="about_core_team_title">Equipa Core (na ordem da primeira contribuição de código)</string>
-    <string name="about_description">Um substituto livre, protegido por copyleft, sem acesso a nuvem para as apps Android de código fechado dos fornecedores de gadgets.</string>
-    <string name="about_activity_title">Sobre o Gadgetbridge</string>
+    <string name="about_description_generic">Um substituto livre, protegido por copyleft, sem acesso a nuvem para as apps Android de código fechado dos fornecedores de gadgets.</string>
+    <string name="about_activity_title_generic">Sobre o Gadgetbridge</string>
    <string name="about_title">Sobre</string>
    <string name="fw_upgrade_notice_amazfit_trex">Está prestes a instalar o firmware %s no seu Amazit T-Rex. 
 \n 
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Setari</string>
    <string name="action_debug">Depaneaza</string>
    <string name="action_quit">Iesire</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Настройки</string>
    <string name="action_debug">Отладка</string>
    <string name="action_quit">Выйти</string>
@ -157,7 +157,7 @@
    <string name="tap_connected_device_for_vibration">Коснитесь подключённого устройства для Вибрации</string>
    <string name="tap_a_device_to_connect">Коснитесь устройства для соединения</string>
    <string name="cannot_connect_bt_address_invalid_">Не удалось соединиться. Неверный адрес Bluetooth\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge запущен</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge запущен</string>
    <string name="installing_binary_d_d">установка бинарного файла %1$d/%2$d</string>
    <string name="installation_failed_">Установка не удалась</string>
    <string name="installation_successful">Установлено</string>
@ -848,8 +848,8 @@
    <string name="about_additional_device_support">Дополнительная поддержка устройств</string>
    <string name="about_contributors">Соавторы</string>
    <string name="about_core_team_title">Основная команда (в порядке поступления первого кода)</string>
-    <string name="about_description">\"Безоблачная\" свободная альтернатива закрытым приложениям от производителей гаджетов.</string>
-    <string name="about_activity_title">О Gadgetbridge</string>
+    <string name="about_description_generic">\"Безоблачная\" свободная альтернатива закрытым приложениям от производителей гаджетов.</string>
+    <string name="about_activity_title_generic">О Gadgetbridge</string>
    <string name="about_title">О программе</string>
    <string name="hr_widget_last_notification">Последнее уведомление</string>
    <string name="pref_qhybrid_save_raw_activity_files">Сохранять необработанные файлы активности</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Nastavenia</string>
    <string name="action_debug">Ladenie</string>
    <string name="action_quit">Ukončiť</string>
@ -180,7 +180,7 @@
    <string name="tap_connected_device_for_vibration">Dotknite sa pripojeného zariadenia pre vibrácie</string>
    <string name="tap_a_device_to_connect">Dotknite sa pripojeného zariadenia pre pripojenie</string>
    <string name="cannot_connect_bt_address_invalid_">Nie je možné pripojiť. Je BT adresa v poriadku?</string>
-    <string name="gadgetbridge_running">Gadgetbridge je spustený</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge je spustený</string>
    <string name="installing_binary_d_d">Instalujem binárny súbor %1$d/%2$d</string>
    <string name="installation_failed_">Inštalácia zlyhala</string>
    <string name="installation_successful">Inštalácia bola úspešná</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Inställningar</string>
    <string name="action_quit">Avsluta</string>
    <string name="action_donate">Donera</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -88,7 +88,7 @@
 \nSürüm %2$s, %3$s tarafından
 \n</string>
    <string name="app_move_to_top">Yukarı taşı</string>
-    <string name="app_name">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
    <string name="appinstaller_install">Kur</string>
    <string name="appmanager_app_openinstore">Pebble uygulama mağazasında ara</string>
    <string name="appmanager_cached_watchapps_watchfaces">Önbellekteki uygulamalar</string>
@ -314,7 +314,7 @@
    <string name="fwapp_install_device_not_ready">Dosya kurulamıyor, aygıt hazır değil.</string>
    <string name="fwappinstaller_connection_state">Aygıta bağlantı: %1$s</string>
    <string name="fwinstaller_firmware_not_compatible_to_device">Bu ürün yazılımı bu aygıtla uyumlu değil</string>
-    <string name="gadgetbridge_running">Gadgetbridge çalışıyor</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge çalışıyor</string>
    <string name="german">Almanca</string>
    <string name="heart_rate">Kalp ritmi</string>
    <string name="horizontal">Yatay</string>
@ -754,7 +754,7 @@
    <string name="title_activity_appmanager">Uygulama Yöneticisi</string>
    <string name="title_activity_calblacklist">Kara Listeye Alınan Takvimler</string>
    <string name="title_activity_charts">Etkinlik ve Uyku</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="title_activity_db_management">Veri yönetimi</string>
    <string name="title_activity_debug">Hata Ayıklama</string>
    <string name="title_activity_device_specific_settings">Aygıta özel ayarlar</string>
@ -937,8 +937,8 @@
    <string name="about_additional_device_support">Ek aygıt desteği</string>
    <string name="about_contributors">Katkıda bulunanlar</string>
    <string name="about_core_team_title">Çekirdek Ekip (ilk kod katkıda bulunma sırasına göre)</string>
-    <string name="about_description">Satıcıların kapalı kaynaklı Android aygıt uygulamalarının yerine bulut gerektirmeyen copyleft özgür alternatif.</string>
-    <string name="about_activity_title">Gadgetbridge hakkında</string>
+    <string name="about_description_generic">Satıcıların kapalı kaynaklı Android aygıt uygulamalarının yerine bulut gerektirmeyen copyleft özgür alternatif.</string>
+    <string name="about_activity_title_generic">Gadgetbridge hakkında</string>
    <string name="about_title">Hakkında</string>
    <string name="pref_title_weather_summary">LineageOS hava durumu sağlayıcısı için kullanılır, diğer Android sürümleri \"Weather notification\" gibi bir uygulama kullanmalıdır. Gadgetbridge wiki sayfasında daha fazla bilgi bulabilirsiniz.</string>
    <string name="menuitem_worldclock">Dünya Saati</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Налаштування</string>
    <string name="action_debug">Зневадження</string>
    <string name="action_quit">Вийти</string>
@ -98,7 +98,7 @@
    <string name="bluetooth_is_not_supported_">Bluetooth не підтримується.</string>
    <string name="bluetooth_is_disabled_">Bluetooth вимкнуто.</string>
    <string name="cannot_connect_bt_address_invalid_">Не вдалося з\'єднатися. Неправильна Bluetooth адреса\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge запущено</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge запущено</string>
    <string name="installing_binary_d_d">Встановлення двійкового файлу %1$d/%2$d</string>
    <string name="installation_failed_">Невдале встановлення</string>
    <string name="installation_successful">Встановлено</string>
@ -1022,8 +1022,8 @@
    <string name="about_additional_device_support">Підтримка додаткових пристроїв</string>
    <string name="about_contributors">Співавтори</string>
    <string name="about_core_team_title">Основна команда (впорядковано за датою допомоги)</string>
-    <string name="about_description">Незалежний від хмари, вільний замінник закритих застосунків від інших виробників.</string>
-    <string name="about_activity_title">Про Gadgetbridge</string>
+    <string name="about_description_generic">Незалежний від хмари, вільний замінник закритих застосунків від інших виробників.</string>
+    <string name="about_activity_title_generic">Про Gadgetbridge</string>
    <string name="about_title">Про застосунок</string>
    <string name="hr_widget_last_notification">Останнє сповіщення</string>
    <string name="menuitem_worldclock">Світовий час</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">Cài đặt</string>
    <string name="action_debug">Dò lỗi</string>
    <string name="action_quit">Thoát</string>
@ -49,7 +49,7 @@
    <string name="bluetooth_is_not_supported_">Không hỗ trợ Bluetooth.</string>
    <string name="bluetooth_is_disabled_">Đã tắt Bluetooth.</string>
    <string name="cannot_connect_bt_address_invalid_">Không thể kết nối. Địa chỉ Bluetooth không hợp lệ\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge đang chạy</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge đang chạy</string>
    <string name="installing_binary_d_d">Đang cài tệp nhị phân %1$d/%2$d</string>
    <string name="installation_failed_">Cài đặt thất bại</string>
    <string name="installation_successful">Đã cài đặt</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="action_settings">设置</string>
    <string name="action_debug">调试</string>
    <string name="action_quit">退出</string>
@ -166,7 +166,7 @@
    <string name="tap_connected_device_for_vibration">点按以震动已连接的设备</string>
    <string name="tap_a_device_to_connect">点按一个设备以连接</string>
    <string name="cannot_connect_bt_address_invalid_">无法连接。 蓝牙地址无效？</string>
-    <string name="gadgetbridge_running">Gadgetbridge 正在运行</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge 正在运行</string>
    <string name="installing_binary_d_d">正在安装二进制文件 %1$d/%2$d</string>
    <string name="installation_failed_">安装失败</string>
    <string name="installation_successful">安装成功</string>
@ -917,8 +917,8 @@
    <string name="about_additional_device_support">额外设备支持</string>
    <string name="about_contributors">贡献者</string>
    <string name="about_core_team_title">核心成员 （以第一次提交代码排序）</string>
-    <string name="about_description">用于替代原厂手环应用的脱机无版权自由应用。</string>
-    <string name="about_activity_title">关于 Gadgetbridge</string>
+    <string name="about_description_generic">用于替代原厂手环应用的脱机无版权自由应用。</string>
+    <string name="about_activity_title_generic">关于 Gadgetbridge</string>
    <string name="about_title">关于</string>
    <string name="pref_title_weather_summary">由LineageOS天气服务提供，其他版本的Android系统需要使用诸如“Weather notification”。更多信息请访问 Gadgetbridge 的Wiki。</string>
    <string name="menuitem_worldclock">世界时钟</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -26,8 +26,8 @@
    <string name="appmananger_app_delete_cache">刪除並清除緩存</string>
    <string name="appmananger_app_reinstall">重新安裝</string>
    <string name="mi2_prefs_button_press_broadcast_default_value" translatable="false">nodomain.freeyourgadget.gadgetbridge.ButtonPressed</string>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
    <string name="controlcenter_snackbar_connecting">連接中…</string>
    <string name="controlcenter_snackbar_requested_screenshot">截取設備的屏幕截圖</string>
    <string name="controlcenter_calibrate_device">校正設備</string>
@ -524,7 +524,7 @@
    <string name="title_activity_mi_band_pairing">配對您的小米手環</string>
    <string name="title_activity_android_pairing">配對裝置</string>
    <string name="initialized">初始化完成</string>
-    <string name="gadgetbridge_running">Gadgetbridge 正在執行</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge 正在執行</string>
    <string name="tap_a_device_to_connect">點擊一個裝置以進行連線</string>
    <string name="bluetooth_is_not_supported_">藍芽不支援。</string>
    <string name="zetime_calories_type_all">涵蓋活動與未活動時消耗的卡路里</string>
@ -583,8 +583,8 @@
    <string name="about_additional_device_support">額外裝置支援</string>
    <string name="about_contributors">貢獻者</string>
    <string name="about_core_team_title">核心團隊（按第一次程式碼貢獻順序排列）</string>
-    <string name="about_description">用來取代廠商提供的閉源 Android 小裝置應用程式的離線且版權自由的替代品。</string>
-    <string name="about_activity_title">關於 Gadgetbridge</string>
+    <string name="about_description_generic">用來取代廠商提供的閉源 Android 小裝置應用程式的離線且版權自由的替代品。</string>
+    <string name="about_activity_title_generic">關於 Gadgetbridge</string>
    <string name="about_title">關於</string>
    <string name="activity_summaries">運動活動</string>
    <string name="activity_type_swimming">游泳</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -1,7 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
+    <string name="about_activity_title_generic">About Gadgetbridge</string>
+    <string name="about_description_generic">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors.</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge running</string>
+
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">About Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_main">Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access.</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js running</string>
+
+    <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_nopebble">About Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_nopebble">Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access.</string>
+    <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js running</string>
+
+    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="about_activity_title_main_nightly">About Gadgetbridge Nightly</string>
+    <string name="about_description_main_nightly">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Nightly releases of Gadgetbridge. It cannot be installed if you already have either the Gadgetbridge or the Pebble app installed, due to a conflict in the Pebble provider.</string>
+    <string name="gadgetbridge_running_main_nightly">Nightly GB running</string>
+
+    <string name="application_name_main_nopebble">Gadgetbridge (Nightly, No Pebble provider)</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly No Pebble </string>
+    <string name="about_activity_title_main_nopebble">About Gadgetbridge Nightly No Pebble</string>
+    <string name="about_description_main_nopebble">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Nightly releases of Gadgetbridge. This version has the Pebble provider renamed to prevent conflicts, so some Pebble related integrations will not work, but it can be installed alongside existing Gadgetbridge installation.</string>
+    <string name="gadgetbridge_running_main_nopebble">Nightly NoPebble GB running</string>
+
    <string name="action_settings">Settings</string>
    <string name="action_debug">Debug</string>
    <string name="action_quit">Quit</string>
@ -368,7 +396,6 @@
    <string name="tap_connected_device_for_vibration">Tap connected device for vibration</string>
    <string name="tap_a_device_to_connect">Tap a device to connect</string>
    <string name="cannot_connect_bt_address_invalid_">Cannot connect. Bluetooth address invalid?</string>
-    <string name="gadgetbridge_running">Gadgetbridge running</string>
    <string name="installing_binary_d_d">Installing binary %1$d/%2$d</string>
    <string name="installation_failed_">Installation failed</string>
    <string name="installation_successful">Installed</string>
@ -1096,11 +1123,9 @@
    <string name="about_title">About</string>
    <string name="about_version">Version %s</string>
    <string name="about_hash">Commit %s</string>
-    <string name="about_activity_title">About Gadgetbridge</string>
    <string name="gpx_receiver_activity_title">GPX Receiver Gadgetbridge</string>
    <string name="gpx_receiver_files_received">GPX file(s) received:</string>
    <string name="gpx_receiver_overwrite_some_files">Some file(s) already exist. Overwrite?</string>
-    <string name="about_description">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors.</string>
    <string name="about_core_team_title">Core Team (in order of first code contribution)</string>
    <string name="about_contributors">Contributors</string>
    <string name="about_core_team_members" translatable="false">Andreas Shimokawa\nCarsten Pfeiffer\nDaniele Gobbetti</string>
--- a/app/src/main/res/xml/devicesettings_qc35.xml
+++ b/app/src/main/res/xml/devicesettings_qc35.xml
@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

    <SeekBarPreference
-        android:title="Noice cancelling level"
+        android:title="Noise cancelling level"
        android:max="2"
        android:key="qc35_noise_cancelling_level" />

--- a/app/src/main/res/xml/devicesettings_um25.xml
+++ b/app/src/main/res/xml/devicesettings_um25.xml
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <CheckBoxPreference
+        android:title="Notify if below current threshold"
+        android:key="um25_current_threshold_notify" />
+    <EditTextPreference
+        android:title="Current threshold im mA"
+        android:key="um25_current_threshold"
+        android:inputType="number"
+        android:defaultValue="100"
+        app:useSimpleSummaryProvider="true" />/>
+</PreferenceScreen>
--- a/app/src/nightly/res/values/strings.xml
+++ b/app/src/nightly/res/values/strings.xml
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Gadgetbridge (Nightly)</string>
+
 </resources>
--- a/app/src/nopebble/res/values/strings.xml
+++ b/app/src/nopebble/res/values/strings.xml
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Gadgetbridge (Nightly, No Pebble provider)</string>
+
 </resources>