Display the actual firmware kind instead of "Firmware"

i.e. "GPS Firmware", "Watchface", "Resources", ...
2025-02-23 16:01:13 +01:00 · 2017-12-11 23:36:39 +01:00 · 2017-12-11 23:36:39 +01:00 · fccd2ebb77
commit fccd2ebb77
parent 53398e019b
26 changed files with 130 additions and 60 deletions
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java
@ -18,12 +18,16 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami;

 import android.content.Context;
 import android.net.Uri;
+import android.support.annotation.NonNull;

 import java.io.IOException;

+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.AbstractMiBandFWHelper;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareInfo;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareType;

 public abstract class HuamiFWHelper extends AbstractMiBandFWHelper {
    protected HuamiFirmwareInfo firmwareInfo;
@ -37,6 +41,41 @@ public abstract class HuamiFWHelper extends AbstractMiBandFWHelper {
        return firmwareInfo.toVersion(version);
    }

+    @NonNull
+    @Override
+    public String getFirmwareKind() {
+        int resId = R.string.kind_invalid;
+        switch (getFirmwareInfo().getFirmwareType()) {
+            case FONT:
+                resId = R.string.kind_font;
+                break;
+            case GPS:
+                resId = R.string.kind_gps;
+                break;
+            case GPS_ALMANAC:
+                resId = R.string.kind_gps_almanac;
+                break;
+            case GPS_CEP:
+                resId = R.string.kind_gps_cep;
+                break;
+            case RES:
+                resId = R.string.kind_resources;
+                break;
+            case RES_NEW:
+                resId = R.string.kind_resources;
+                break;
+            case FIRMWARE:
+                resId = R.string.kind_firmware;
+                break;
+            case WATCHFACE:
+                resId = R.string.kind_watchface;
+                break;
+            case INVALID:
+                // fall through
+        }
+        return GBApplication.getContext().getString(resId);
+    }
+
    @Override
    public int getFirmwareVersion() {
        return firmwareInfo.getFirmwareVersion();
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWInstallHandler.java
@ -26,18 +26,12 @@ import nodomain.freeyourgadget.gadgetbridge.devices.miband.AbstractMiBandFWHelpe
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.AbstractMiBandFWInstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
-import nodomain.freeyourgadget.gadgetbridge.model.GenericItem;

 class AmazfitBipFWInstallHandler extends AbstractMiBandFWInstallHandler {
    AmazfitBipFWInstallHandler(Uri uri, Context context) {
        super(uri, context);
    }

-    @Override
-    protected GenericItem createInstallItem() {
-        return new GenericItem(mContext.getString(R.string.amazfitbip_firmware, helper.getHumanFirmwareVersion()));
-    }
-
    @Override
    protected String getFwUpgradeNotice() {
        return mContext.getString(R.string.fw_upgrade_notice_amazfitbip, helper.getHumanFirmwareVersion());
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWInstallHandler.java
@ -22,23 +22,16 @@ import android.net.Uri;
 import java.io.IOException;

 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip.AmazfitBipFWHelper;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.AbstractMiBandFWHelper;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.AbstractMiBandFWInstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
-import nodomain.freeyourgadget.gadgetbridge.model.GenericItem;

 class AmazfitCorFWInstallHandler extends AbstractMiBandFWInstallHandler {
    AmazfitCorFWInstallHandler(Uri uri, Context context) {
        super(uri, context);
    }

-    @Override
-    protected GenericItem createInstallItem() {
-        return new GenericItem(mContext.getString(R.string.amazfitcor_firmware, helper.getHumanFirmwareVersion()));
-    }
-
    @Override
    protected String getFwUpgradeNotice() {
        return mContext.getString(R.string.fw_upgrade_notice_amazfitcor, helper.getHumanFirmwareVersion());
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWHelper.java
@ -61,6 +61,12 @@ public abstract class AbstractMiBandFWHelper {
        }
    }

+    /**
+     * Returns a localized, user-visible representation of the kind of firmware to be installed.
+     */
+    @NonNull
+    public abstract String getFirmwareKind();
+
    public abstract int getFirmwareVersion();

    public abstract int getFirmware2Version();
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWInstallHandler.java
@ -58,8 +58,8 @@ public abstract class AbstractMiBandFWInstallHandler implements InstallHandler {

    protected abstract AbstractMiBandFWHelper createHelper(Uri uri, Context context) throws IOException;

-    protected GenericItem createInstallItem() {
-        return new GenericItem(mContext.getString(R.string.miband_installhandler_miband_firmware, helper.getHumanFirmwareVersion()));
+    protected GenericItem createInstallItem(GBDevice device) {
+        return new GenericItem(mContext.getString(R.string.installhandler_firmware_name, mContext.getString(device.getType().getName()), helper.getFirmwareKind(), helper.getHumanFirmwareVersion()));
    }

    protected String getFwUpgradeNotice() {
@ -88,7 +88,7 @@ public abstract class AbstractMiBandFWInstallHandler implements InstallHandler {
            return;
        }

-        GenericItem fwItem = createInstallItem();
+        GenericItem fwItem = createInstallItem(device);
        fwItem.setIcon(device.getType().getIcon());

        if (!helper.isFirmwareGenerallyCompatibleWith(device)) {
@ -112,7 +112,7 @@ public abstract class AbstractMiBandFWInstallHandler implements InstallHandler {
            // TODO: set a CHECK (OKAY) button
        } else {
            builder.append("  ").append(mContext.getString(R.string.miband_firmware_unknown_warning)).append(" \n\n")
-                    .append(mContext.getString(R.string.miband_firmware_suggest_whitelist, helper.getFirmwareVersion()));
+                    .append(mContext.getString(R.string.miband_firmware_suggest_whitelist, String.valueOf(helper.getFirmwareVersion())));
            fwItem.setDetails(mContext.getString(R.string.miband_fwinstaller_untested_version));
            // TODO: set a UNKNOWN (question mark) button
        }
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWHelper.java
@ -26,6 +26,8 @@ import org.slf4j.LoggerFactory;

 import java.io.IOException;

+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.miband.AbstractMiFirmwareInfo;

@ -67,6 +69,12 @@ public class MiBandFWHelper extends AbstractMiBandFWHelper {
        super(uri, context);
    }

+    @NonNull
+    @Override
+    public String getFirmwareKind() {
+        return GBApplication.getContext().getString(R.string.kind_firmware);
+    }
+
    @Override
    public int getFirmwareVersion() {
        // FIXME: UnsupportedOperationException!
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@ -18,6 +18,7 @@
 package nodomain.freeyourgadget.gadgetbridge.model;

 import android.support.annotation.DrawableRes;
+import android.support.annotation.StringRes;

 import nodomain.freeyourgadget.gadgetbridge.R;

@ -28,31 +29,34 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 * and may not be changed.
 */
 public enum DeviceType {
-    UNKNOWN(-1, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled),
-    PEBBLE(1, R.drawable.ic_device_pebble, R.drawable.ic_device_pebble_disabled),
-    MIBAND(10, R.drawable.ic_device_miband, R.drawable.ic_device_miband_disabled),
-    MIBAND2(11, R.drawable.ic_device_miband, R.drawable.ic_device_miband_disabled),
-    AMAZFITBIP(12, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled),
-    AMAZFITCOR(13, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled),
-    VIBRATISSIMO(20, R.drawable.ic_device_lovetoy, R.drawable.ic_device_lovetoy_disabled),
-    LIVEVIEW(30, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled),
-    HPLUS(40, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled),
-    MAKIBESF68(41, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled),
-    EXRIZUK8(42, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled),
-    NO1F1(50, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled),
-    TECLASTH30(60, R.drawable.ic_device_h30_h10, R.drawable.ic_device_h30_h10_disabled),
-    TEST(1000, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled);
+    UNKNOWN(-1, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_unknown),
+    PEBBLE(1, R.drawable.ic_device_pebble, R.drawable.ic_device_pebble_disabled, R.string.devicetype_pebble),
+    MIBAND(10, R.drawable.ic_device_miband, R.drawable.ic_device_miband_disabled, R.string.devicetype_miband),
+    MIBAND2(11, R.drawable.ic_device_miband, R.drawable.ic_device_miband_disabled, R.string.devicetype_miband2),
+    AMAZFITBIP(12, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_amazfit_bip),
+    AMAZFITCOR(13, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_amazfit_cor),
+    VIBRATISSIMO(20, R.drawable.ic_device_lovetoy, R.drawable.ic_device_lovetoy_disabled, R.string.devicetype_vibratissimo),
+    LIVEVIEW(30, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_liveview),
+    HPLUS(40, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_hplus),
+    MAKIBESF68(41, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_makibes_f68),
+    EXRIZUK8(42, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_exrizu_k8),
+    NO1F1(50, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_no1_f1),
+    TECLASTH30(60, R.drawable.ic_device_h30_h10, R.drawable.ic_device_h30_h10_disabled, R.string.devicetype_teclast_h30),
+    TEST(1000, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_test);

    private final int key;
    @DrawableRes
    private final int defaultIcon;
    @DrawableRes
    private final int disabledIcon;
+    @StringRes
+    private final int name;

-    DeviceType(int key, int defaultIcon, int disabledIcon) {
+    DeviceType(int key, int defaultIcon, int disabledIcon, int name) {
        this.key = key;
        this.defaultIcon = defaultIcon;
        this.disabledIcon = disabledIcon;
+        this.name = name;
    }

    public int getKey() {
@ -72,6 +76,11 @@ public enum DeviceType {
        return DeviceType.UNKNOWN;
    }

+    @StringRes
+    public int getName() {
+        return name;
+    }
+
    @DrawableRes
    public int getIcon() {
        return defaultIcon;
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipFirmwareInfo.java
@ -75,16 +75,16 @@ public class AmazfitBipFirmwareInfo extends HuamiFirmwareInfo {
        crcToVersion.put(26714, "0.1.0.11");

        // resources
-        crcToVersion.put(12586, "RES 0.0.8.74");
-        crcToVersion.put(34068, "RES 0.0.8.88");
-        crcToVersion.put(59839, "RES 0.0.8.96-98");
-        crcToVersion.put(50401, "RES 0.0.9.14-26");
-        crcToVersion.put(22051, "RES 0.0.9.40");
-        crcToVersion.put(46233, "RES 0.0.9.49-0.1.0.11");
+        crcToVersion.put(12586, "0.0.8.74");
+        crcToVersion.put(34068, "0.0.8.88");
+        crcToVersion.put(59839, "0.0.8.96-98");
+        crcToVersion.put(50401, "0.0.9.14-26");
+        crcToVersion.put(22051, "0.0.9.40");
+        crcToVersion.put(46233, "0.0.9.49-0.1.0.11");

        // gps
-        crcToVersion.put(61520, "GPS 9367,8f79a91,0,0,");
-        crcToVersion.put(8784, "GPS 9565,dfbd8fa,0,0,");
+        crcToVersion.put(61520, "9367,8f79a91,0,0,");
+        crcToVersion.put(8784,  "9565,dfbd8fa,0,0,");
    }

    public AmazfitBipFirmwareInfo(byte[] bytes) {
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -254,7 +254,7 @@
  <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_installhandler_miband_firmware">Mi Band Firmware %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</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>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -263,7 +263,7 @@
  <string name="activity_sleepchart_activity_and_sleep">Deine Aktivität und dein Schlaf</string>
  <string name="updating_firmware">Firmware wird aktualisiert…</string>
  <string name="fwapp_install_device_not_ready">Datei kann nicht installiert werden, Gerät nicht bereit.</string>
-  <string name="miband_installhandler_miband_firmware">Mi Band Firmware %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="miband_fwinstaller_compatible_version">Kompatible Version</string>
  <string name="miband_fwinstaller_untested_version">Ungetestete Version!</string>
  <string name="fwappinstaller_connection_state">Verbindung zum Gerät: %1$s</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -264,7 +264,7 @@
  <string name="activity_sleepchart_activity_and_sleep">Tu actividad y sueño</string>
  <string name="updating_firmware">Actualizando firmware…</string>
  <string name="fwapp_install_device_not_ready">El archivo no puede ser instalado, el dispositivo no está listo.</string>
-  <string name="miband_installhandler_miband_firmware">Miband firmware %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="miband_fwinstaller_compatible_version">Versión compatible</string>
  <string name="miband_fwinstaller_untested_version">¡Versión no probada!</string>
  <string name="fwappinstaller_connection_state">Conexión al dispositivo: %1$s</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -264,7 +264,7 @@
  <string name="activity_sleepchart_activity_and_sleep">Votre activité et sommeil</string>
  <string name="updating_firmware">Mise à jour du micrologiciel…</string>
  <string name="fwapp_install_device_not_ready">Le fichier ne peut pas être installé, l\'appareil n\'est pas prêt.</string>
-  <string name="miband_installhandler_miband_firmware">Micrologiciel Mi Band %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="miband_fwinstaller_compatible_version">Version compatible</string>
  <string name="miband_fwinstaller_untested_version">Version non-testée !</string>
  <string name="fwappinstaller_connection_state">Connexion  à l\'appareil: %1$s</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -302,7 +302,7 @@
    <string name="activity_sleepchart_activity_and_sleep">A túa actividade e sono</string>
    <string name="updating_firmware">Anovando Firmware…</string>
    <string name="fwapp_install_device_not_ready">O arquivo non pode ser instalado, o dispositivo non está preparado.</string>
-    <string name="miband_installhandler_miband_firmware">Firmware do Mi Band %1$s</string>
+    <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
    <string name="amazfitbip_firmware">Firmware do Amazfit Bip %1$s</string>
    <string name="miband_fwinstaller_compatible_version">Versión compatíbel</string>
    <string name="miband_fwinstaller_untested_version">Versión sen probar!</string>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -245,7 +245,7 @@
  <string name="activity_sleepchart_activity_and_sleep">הפעילות והשינה שלך</string>
  <string name="updating_firmware">הקושחה מתעדכנת…</string>
  <string name="fwapp_install_device_not_ready">לא ניתן להתקין את הקובץ, ההתקן לא מוכן.</string>
-  <string name="miband_installhandler_miband_firmware">הקושחה של ה־Mi Band‏ %1$s</string>
+  <string name="installhandler_firmware_name">%3$s %2$s :%1$s</string>
  <string name="miband_fwinstaller_compatible_version">גרסה תואמת</string>
  <string name="miband_fwinstaller_untested_version">גרסה שלא נבדקה!</string>
  <string name="fwappinstaller_connection_state">חיבור להתקן: %1$s</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -258,7 +258,7 @@
  <string name="activity_sleepchart_activity_and_sleep">Aktivitásod és alvásod</string>
  <string name="updating_firmware">Firmware frissítése…</string>
  <string name="fwapp_install_device_not_ready">A fájlt nem lehet telepíteni, a készülék nincs készen.</string>
-  <string name="miband_installhandler_miband_firmware">Mi Band Firmware %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="miband_fwinstaller_compatible_version">Kompatibilis verzió</string>
  <string name="miband_fwinstaller_untested_version">Nem tesztelt verzió!</string>
  <string name="fwappinstaller_connection_state">Csatlakozás az eszközhöz: %1$s</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -262,7 +262,7 @@
  <string name="activity_sleepchart_activity_and_sleep">Attività e sonno</string>
  <string name="updating_firmware">Aggiornamento del Firmware...</string>
  <string name="fwapp_install_device_not_ready">Il file non può essere installato, il dispositivo non è pronto.</string>
-  <string name="miband_installhandler_miband_firmware">Firmware Mi Band: %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="amazfitbip_firmware">Firmware Amazfit Bip %1$s</string>
  <string name="miband_fwinstaller_compatible_version">Versione compatibile</string>
  <string name="miband_fwinstaller_untested_version">Versione non testata!</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -262,7 +262,7 @@
  <string name="activity_sleepchart_activity_and_sleep">あなたの活動と睡眠</string>
  <string name="updating_firmware">ファームウェアの更新中…</string>
  <string name="fwapp_install_device_not_ready">ファイルをインストールできません。デバイスの準備ができていません。</string>
-  <string name="miband_installhandler_miband_firmware">Mi Band ファームウェア %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="miband_fwinstaller_compatible_version">互換性のバージョン</string>
  <string name="miband_fwinstaller_untested_version">テストされていないバージョン!</string>
  <string name="fwappinstaller_connection_state">デバイスへの接続: %1$s</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -165,7 +165,7 @@
  <string name="activity_sleepchart_activity_and_sleep">당신의 활동과 수면</string>
  <string name="updating_firmware">펌웨어 업데이트 중...</string>
  <string name="fwapp_install_device_not_ready">파일을 설치할 수 없습니다. 기기가 준비되어 있지 않습니다.</string>
-  <string name="miband_installhandler_miband_firmware">Mi Band 펌웨어 %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="miband_fwinstaller_compatible_version">호환 버전</string>
  <string name="miband_fwinstaller_untested_version">테스트를 거치지 않은 버전</string>
  <string name="fwappinstaller_connection_state">기기에 연결: %1$s</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@ -319,7 +319,7 @@
    <string name="activity_sleepchart_activity_and_sleep">Din aktivitet og søvn</string>
    <string name="updating_firmware">Oppgraderer fastvare…</string>
    <string name="fwapp_install_device_not_ready">Kan ikke installere fil, enheten er ikke klar.</string>
-    <string name="miband_installhandler_miband_firmware">Mi Band-fastvare %1$s</string>
+    <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
    <string name="amazfitbip_firmware">Amazfit Bip-fastvare %1$s</string>
    <string name="amazfitcor_firmware">Amazfit Cor-fastvare %1$s</string>
    <string name="miband_fwinstaller_compatible_version">Kompatibel versjon</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -158,4 +158,5 @@
    <string name="_pebble_watch_open_on_phone">Open op de telefoon</string>
    <string name="_pebble_watch_mute">Dempen</string>
    <string name="_pebble_watch_reply">Antwoord</string>
+    <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
 </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -201,7 +201,7 @@
  <string name="activity_sleepchart_activity_and_sleep">Twoja aktywność i sen</string>
  <string name="updating_firmware">Aktualizacja firmware\'u…</string>
  <string name="fwapp_install_device_not_ready">Plik nie może być zainstalowany, urządzenie nie gotowe.</string>
-  <string name="miband_installhandler_miband_firmware">Firmware Mi Band %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="miband_fwinstaller_compatible_version">Zgodna wersja</string>
  <string name="miband_fwinstaller_untested_version">Nietestowana wersja!</string>
  <string name="fwappinstaller_connection_state">Połączenie z urządzeniem: %1$s</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -243,7 +243,7 @@
  <string name="activity_sleepchart_activity_and_sleep">Sua Atividade e Sono</string>
  <string name="updating_firmware">Atualizando Firmware...</string>
  <string name="fwapp_install_device_not_ready">Arquivo não pode ser instalado, o dispositivo não está pronto.</string>
-  <string name="miband_installhandler_miband_firmware">Mi Band Firmware %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="miband_fwinstaller_compatible_version">Versão compatível</string>
  <string name="miband_fwinstaller_untested_version">Versão não testada!</string>
  <string name="fwappinstaller_connection_state">Conexão com o dispositivo: %1$s</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -252,7 +252,7 @@
  <string name="activity_sleepchart_activity_and_sleep">A Sua Atividade e Sono</string>
  <string name="updating_firmware">Atualizando Firmware...</string>
  <string name="fwapp_install_device_not_ready">Arquivo não pode ser instalado, o dispositivo não está pronto.</string>
-  <string name="miband_installhandler_miband_firmware">Firmware da Mi Band %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="miband_fwinstaller_compatible_version">Versão compatível</string>
  <string name="miband_fwinstaller_untested_version">Versão não testada!</string>
  <string name="fwappinstaller_connection_state">Ligação do Dispositivo: %1$s</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -255,7 +255,7 @@
  <string name="activity_sleepchart_activity_and_sleep">Ваши активность и сон</string>
  <string name="updating_firmware">Обновление прошивки…</string>
  <string name="fwapp_install_device_not_ready">Файл не может быть установлен, устройство не готово.</string>
-  <string name="miband_installhandler_miband_firmware">Версия прошивки Mi Band: %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="miband_fwinstaller_compatible_version">Совместимая версия</string>
  <string name="miband_fwinstaller_untested_version">Не протестированная версия!</string>
  <string name="fwappinstaller_connection_state">Подключение к устройству: %1$s</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -187,7 +187,7 @@
  <string name="activity_sleepchart_activity_and_sleep">Ваша активність і сон</string>
  <string name="updating_firmware">Оновлення мікропрограми…</string>
  <string name="fwapp_install_device_not_ready">Не можливо встановити файл, пристрій не готовий.</string>
-  <string name="miband_installhandler_miband_firmware">Мікропрограма Mi-Band %1$s</string>
+  <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
  <string name="miband_fwinstaller_compatible_version">Сумісна версія</string>
  <string name="miband_fwinstaller_untested_version">Неперевірена версія!</string>
  <string name="fwappinstaller_connection_state">Підключення до пристрою: %1$s</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -317,9 +317,7 @@
    <string name="activity_sleepchart_activity_and_sleep">Your activity and sleep</string>
    <string name="updating_firmware">Updating Firmware…</string>
    <string name="fwapp_install_device_not_ready">File cannot be installed, device not ready.</string>
-    <string name="miband_installhandler_miband_firmware">Mi Band Firmware %1$s</string>
-    <string name="amazfitbip_firmware">Amazfit Bip Firmware %1$s</string>
-    <string name="amazfitcor_firmware">Amazfit Cor Firmware %1$s</string>
+    <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
    <string name="miband_fwinstaller_compatible_version">Compatible version</string>
    <string name="miband_fwinstaller_untested_version">Untested version!</string>
    <string name="fwappinstaller_connection_state">Connection to device: %1$s</string>
@ -499,4 +497,26 @@
    <string name="_pebble_watch_open_on_phone">Open on phone</string>
    <string name="_pebble_watch_mute">Mute</string>
    <string name="_pebble_watch_reply">Reply</string>
+    <string name="kind_firmware">Firmware</string>
+    <string name="kind_invalid">Invalid data</string>
+    <string name="kind_font">Font</string>
+    <string name="kind_gps">GPS Firmware</string>
+    <string name="kind_gps_almanac">GPS Almanac</string>
+    <string name="kind_gps_cep">GPS Error Correction</string>
+    <string name="kind_resources">Resources</string>
+    <string name="kind_watchface">Watchface</string>
+    <string name="devicetype_unknown">Unknown Device</string>
+    <string name="devicetype_test">Test Device</string>
+    <string name="devicetype_pebble">Pebble</string>
+    <string name="devicetype_miband">Mi Band</string>
+    <string name="devicetype_miband2">Mi Band 2</string>
+    <string name="devicetype_amazfit_bip">Amazfit Bip</string>
+    <string name="devicetype_amazfit_cor">Amazfit Cor</string>
+    <string name="devicetype_vibratissimo">Vibratissimo</string>
+    <string name="devicetype_liveview">LiveView</string>
+    <string name="devicetype_hplus">HPlus</string>
+    <string name="devicetype_makibes_f68">Makibes F68</string>
+    <string name="devicetype_exrizu_k8">Exrizu K8</string>
+    <string name="devicetype_no1_f1">No.1 F1</string>
+    <string name="devicetype_teclast_h30">Teclast H30</string>
 </resources>