From aecd417722699414e7b8f6c4b55d1dcaab4f5051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 4 Jun 2026 13:56:25 +0100
Subject: [PATCH] Improve steps and calories number formatting

---
 .../activities/charts/StepsDailyFragment.java            | 3 ++-
 .../activities/charts/StepsPeriodFragment.java           | 9 +++++----
 .../dashboard/DashboardCaloriesActiveGoalWidget.java     | 4 +++-
 .../dashboard/DashboardCaloriesTotalSegmentedWidget.java | 4 +++-
 .../activities/dashboard/DashboardStepsWidget.java       | 4 +++-
 .../gadgetbridge/activities/dashboard/GaugeDrawer.java   | 6 ++++--
 .../gadgetbridge/adapter/GBDeviceAdapterv2.java          | 3 ++-
 app/src/main/res/values-ar/strings.xml                   | 4 ++--
 app/src/main/res/values-bg/strings.xml                   | 4 ++--
 app/src/main/res/values-ca/strings.xml                   | 4 ++--
 app/src/main/res/values-cs/strings.xml                   | 4 ++--
 app/src/main/res/values-de/strings.xml                   | 4 ++--
 app/src/main/res/values-el/strings.xml                   | 4 ++--
 app/src/main/res/values-en-rGB/strings.xml               | 4 ++--
 app/src/main/res/values-es/strings.xml                   | 4 ++--
 app/src/main/res/values-et/strings.xml                   | 4 ++--
 app/src/main/res/values-fr-rCA/strings.xml               | 4 ++--
 app/src/main/res/values-fr/strings.xml                   | 4 ++--
 app/src/main/res/values-he/strings.xml                   | 4 ++--
 app/src/main/res/values-hi/strings.xml                   | 4 ++--
 app/src/main/res/values-hr/strings.xml                   | 4 ++--
 app/src/main/res/values-hu/strings.xml                   | 4 ++--
 app/src/main/res/values-id/strings.xml                   | 4 ++--
 app/src/main/res/values-it/strings.xml                   | 4 ++--
 app/src/main/res/values-ja/strings.xml                   | 4 ++--
 app/src/main/res/values-ko/strings.xml                   | 4 ++--
 app/src/main/res/values-nb-rNO/strings.xml               | 4 ++--
 app/src/main/res/values-nl/strings.xml                   | 4 ++--
 app/src/main/res/values-pl/strings.xml                   | 4 ++--
 app/src/main/res/values-pt-rBR/strings.xml               | 4 ++--
 app/src/main/res/values-pt-rPT/strings.xml               | 4 ++--
 app/src/main/res/values-pt/strings.xml                   | 4 ++--
 app/src/main/res/values-ro/strings.xml                   | 4 ++--
 app/src/main/res/values-ru/strings.xml                   | 4 ++--
 app/src/main/res/values-sr/strings.xml                   | 4 ++--
 app/src/main/res/values-ta/strings.xml                   | 4 ++--
 app/src/main/res/values-tr/strings.xml                   | 4 ++--
 app/src/main/res/values-uk/strings.xml                   | 4 ++--
 app/src/main/res/values-zh-rCN/strings.xml               | 4 ++--
 app/src/main/res/values-zh-rTW/strings.xml               | 4 ++--
 app/src/main/res/values/strings.xml                      | 4 ++--
 41 files changed, 90 insertions(+), 79 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsDailyFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsDailyFragment.java
index 93f11f286c..2273ed9844 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsDailyFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsDailyFragment.java
@@ -24,6 +24,7 @@ import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -127,7 +128,7 @@ public class StepsDailyFragment extends StepsFragment<StepsDailyFragment.StepsDa
                 getContext()
         ));
 
-        steps.setText(String.format(String.valueOf(stepsData.todayStepsDay.steps)));
+        steps.setText(NumberFormat.getInstance().format(stepsData.todayStepsDay.steps));
 
         final WorkoutValueFormatter valueFormatter = new WorkoutValueFormatter();
         distance.setText(valueFormatter.formatValue(stepsData.todayStepsDay.distance, "km"));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsPeriodFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsPeriodFragment.java
index 4e9868b9c2..b768fb7b7e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsPeriodFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsPeriodFragment.java
@@ -20,6 +20,7 @@ import com.github.mikephil.charting.formatter.ValueFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -188,10 +189,10 @@ public class StepsPeriodFragment extends StepsFragment<StepsPeriodFragment.Steps
             stepsChart.setRenderer(new AngledLabelsChartRenderer(stepsChart, stepsChart.getAnimator(), stepsChart.getViewPortHandler()));
         }
         stepsChart.setData(barData);
-        stepsAvg.setText(String.format(String.valueOf(stepsData.stepsDailyAvg)));
+        stepsAvg.setText(NumberFormat.getInstance().format(stepsData.stepsDailyAvg));
         final WorkoutValueFormatter valueFormatter = new WorkoutValueFormatter();
         distanceAvg.setText(valueFormatter.formatValue(stepsData.distanceDailyAvg, "km"));
-        stepsTotal.setText(String.format(String.valueOf(stepsData.totalSteps)));
+        stepsTotal.setText(NumberFormat.getInstance().format(stepsData.totalSteps));
         distanceTotal.setText(valueFormatter.formatValue(stepsData.totalDistance, "km"));
 
         mBalanceView.setText(stepsData.getBalanceMessage(getContext(), STEPS_GOAL));
@@ -250,9 +251,9 @@ public class StepsPeriodFragment extends StepsFragment<StepsPeriodFragment.Steps
 
             final long totalBalance = totalSteps - ((long) targetValue * days.size());
             if (totalBalance > 0) {
-                return context.getString(R.string.overstep, Math.abs(totalBalance));
+                return context.getString(R.string.overstep, NumberFormat.getInstance().format(Math.abs(totalBalance)));
             } else {
-                return context.getString(R.string.lack_of_step, Math.abs(totalBalance));
+                return context.getString(R.string.lack_of_step, NumberFormat.getInstance().format(Math.abs(totalBalance)));
 
             }
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardCaloriesActiveGoalWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardCaloriesActiveGoalWidget.java
index 9bda060ca8..a2b29fe970 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardCaloriesActiveGoalWidget.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardCaloriesActiveGoalWidget.java
@@ -20,6 +20,8 @@ import android.os.Bundle;
 
 import androidx.core.content.ContextCompat;
 
+import java.text.NumberFormat;
+
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.DashboardFragment;
@@ -64,7 +66,7 @@ public class DashboardCaloriesActiveGoalWidget extends AbstractGaugeWidget {
 
     @Override
     protected void draw(final DashboardFragment.DashboardData dashboardData) {
-        setText(String.valueOf(dashboardData.getActiveCaloriesTotal()));
+        setText(NumberFormat.getInstance().format(dashboardData.getActiveCaloriesTotal()));
         final int colorCalories = ContextCompat.getColor(GBApplication.getContext(), R.color.calories_color);
         drawSimpleGauge(
                 colorCalories,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardCaloriesTotalSegmentedWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardCaloriesTotalSegmentedWidget.java
index f7c92eb2af..ea27dcdef2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardCaloriesTotalSegmentedWidget.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardCaloriesTotalSegmentedWidget.java
@@ -21,6 +21,8 @@ import android.os.Bundle;
 
 import androidx.core.content.ContextCompat;
 
+import java.text.NumberFormat;
+
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.DashboardFragment;
@@ -68,7 +70,7 @@ public class DashboardCaloriesTotalSegmentedWidget extends AbstractGaugeWidget {
         int activeCalories = dashboardData.getActiveCaloriesTotal();
         int restingCalories = dashboardData.getRestingCaloriesTotal();
         int totalCalories = activeCalories + restingCalories;
-        setText(String.valueOf(totalCalories));
+        setText(NumberFormat.getInstance().format(totalCalories));
         final int[] colors;
         final float[] segments;
         if (totalCalories != 0) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardStepsWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardStepsWidget.java
index 12ae26a0bb..43ae786f56 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardStepsWidget.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardStepsWidget.java
@@ -18,6 +18,8 @@ package nodomain.freeyourgadget.gadgetbridge.activities.dashboard;
 
 import android.os.Bundle;
 
+import java.text.NumberFormat;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.DashboardFragment;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
@@ -60,7 +62,7 @@ public class DashboardStepsWidget extends AbstractGaugeWidget {
 
     @Override
     protected void draw(final DashboardFragment.DashboardData dashboardData) {
-        setText(String.valueOf(dashboardData.getStepsTotal()));
+        setText(NumberFormat.getInstance().format(dashboardData.getStepsTotal()));
         drawSimpleGauge(
                 color_activity,
                 dashboardData.getStepsGoalFactor()
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/GaugeDrawer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/GaugeDrawer.java
index ef020babc1..7b6b444aac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/GaugeDrawer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/GaugeDrawer.java
@@ -15,6 +15,8 @@ import androidx.annotation.ColorInt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.text.NumberFormat;
+
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 
@@ -359,14 +361,14 @@ public class GaugeDrawer {
         textPaint.setTextSize(textPixels);
         textPaint.setTextAlign(Paint.Align.CENTER);
         int yPos = (int) ((float) height / 2 - ((textPaint.descent() + textPaint.ascent()) / 2)) ;
-        canvas.drawText(String.valueOf(value), width / 2f, yPos, textPaint);
+        canvas.drawText(NumberFormat.getInstance().format(value), width / 2f, yPos, textPaint);
         Paint textLowerPaint = new Paint();
         textLowerPaint.setColor(SUB_TEXT_COLOR);
         textLowerPaint.setTextAlign(Paint.Align.CENTER);
         float textLowerPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, width * 0.025f, context.getResources().getDisplayMetrics());
         textLowerPaint.setTextSize(textLowerPixels);
         int yPosLowerText = (int) ((float) height / 2 - textPaint.ascent()) ;
-        canvas.drawText(String.valueOf(maxValue), width / 2f, yPosLowerText, textLowerPaint);
+        canvas.drawText(NumberFormat.getInstance().format(maxValue), width / 2f, yPosLowerText, textLowerPaint);
 
         return bitmap;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
index 74e1726a02..e7f6d4b75a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -87,6 +87,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -1468,7 +1469,7 @@ public class GBDeviceAdapterv2 extends ListAdapter<GBDevice, GBDeviceAdapterv2.V
         String distanceFormatted = FormatUtils.getFormattedDistanceLabel(distanceMeters);
 
         setUpChart(holder.TotalStepsChart);
-        setChartsData(holder.TotalStepsChart, steps, stepGoal, context.getString(R.string.steps), String.valueOf(steps), context);
+        setChartsData(holder.TotalStepsChart, steps, stepGoal, context.getString(R.string.steps), NumberFormat.getInstance().format(steps), context);
 
         setUpChart(holder.TotalDistanceChart);
         setChartsData(holder.TotalDistanceChart, steps * stepLength, distanceGoal, context.getString(R.string.distance), distanceFormatted, context);
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 73d0213aec..65ee8f9aa3 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1746,7 +1746,7 @@
     <string name="miband_fwinstaller_compatible_version">نسخة متوافقة</string>
     <string name="miband_fwinstaller_untested_version">نسخة غير مختبرة!</string>
     <string name="pbwinstallhandler_app_item">%1$s (%2$s)</string>
-    <string name="overstep">تجاوز: %1$d</string>
+    <string name="overstep">تجاوز: %1$s</string>
     <string name="weeksteps_today_steps_description">خطوات اليوم ، الهدف: %1$s</string>
     <string name="miband2_prefs_dateformat">تنسيق التاريخ</string>
     <string name="mi2_dnd_automatic">تلقائي (كشف النوم)</string>
@@ -2039,7 +2039,7 @@
     <string name="activity_prefs_discovery_pairing">خيارات الاكتشاف والاقتران</string>
     <string name="minutes_10">10 دقائق</string>
     <string name="activity_type_jump_roping">القفز على الحبل</string>
-    <string name="lack_of_step">الافتقار إلى الخطوات: %1$d</string>
+    <string name="lack_of_step">الافتقار إلى الخطوات: %1$s</string>
     <string name="device_fw">إصدار البرنامج الثابت: %1$s</string>
     <string name="activity_type_outdoor_cycling">ركوب الدراجات في الهواء الطلق</string>
     <string name="activity_type_elliptical">بيضاوي الشكل</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 66830e1228..34abbf2fd8 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -458,8 +458,8 @@
     <string name="minutes_30">30 минути</string>
     <string name="liveactivity_live_activity">Активност в реално време</string>
     <string name="weeksteps_today_steps_description">Крачки днес, цел: %1$s</string>
-    <string name="lack_of_step">Недостиг на крачки: %1$d</string>
-    <string name="overstep">Крачки в повече: %1$d</string>
+    <string name="lack_of_step">Недостиг на крачки: %1$s</string>
+    <string name="overstep">Крачки в повече: %1$s</string>
     <string name="pref_summary_dont_ack_transfers">Ако данните за активност не са потвърени от устройството, те няма да се изчистят. Полезно е, когато GB се използва заедно с други приложения.</string>
     <string name="pref_summary_keep_data_on_device">Данните за активност ще се пазят на Mi Band дори след синхронизация. Полезно е, когато GB се използва заедно с други приложения.</string>
     <string name="weeksleepchart_sleep_a_week">Седмичен сън</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 5f09b94b36..587d972c23 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -582,8 +582,8 @@
     <string name="language_and_region_prefs">Configuració de llengua i regió</string>
     <string name="lack_of_sleep">Manca de son: %1$s</string>
     <string name="overslept">Son de més: %1$s</string>
-    <string name="lack_of_step">Manca de passes: %1$d</string>
-    <string name="overstep">Passes de més: %1$d</string>
+    <string name="lack_of_step">Manca de passes: %1$s</string>
+    <string name="overstep">Passes de més: %1$s</string>
     <string name="no_data">No hi ha dades</string>
     <string name="live_activity_max_heart_rate">Ritme cardíac actual / màxim: %1$d / %2$d</string>
     <string name="title_activity_notification_filter">Filtre de notificacions</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 8e4b081798..1e03d116f1 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -526,8 +526,8 @@
     <string name="minutes_5">5 minut</string>
     <string name="minutes_10">10 minut</string>
     <string name="minutes_30">30 minut</string>
-    <string name="lack_of_step">Příliš málo kroků: %1$d</string>
-    <string name="overstep">Kroků nad plán: %1$d</string>
+    <string name="lack_of_step">Příliš málo kroků: %1$s</string>
+    <string name="overstep">Kroků nad plán: %1$s</string>
     <string name="live_activity_max_heart_rate">Aktuální / Maximální tepová frekvence: %1$d / %2$d</string>
     <string name="you_slept">%1$s – %2$s</string>
     <string name="you_did_not_sleep">Bez spánku</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 60b53d1c68..8a2be11ce8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -532,8 +532,8 @@
     <string name="minutes_5">5 Minuten</string>
     <string name="minutes_10">10 Minuten</string>
     <string name="minutes_30">30 Minuten</string>
-    <string name="lack_of_step">Zu wenig Schritte: %1$d</string>
-    <string name="overstep">Schritte über Ziel: %1$d</string>
+    <string name="lack_of_step">Zu wenig Schritte: %1$s</string>
+    <string name="overstep">Schritte über Ziel: %1$s</string>
     <string name="live_activity_max_heart_rate">Aktueller / Maximaler Puls: %1$d / %2$d</string>
     <string name="mi3_prefs_band_screen_unlock">Smartwatch-Bildschirm entsperren</string>
     <string name="mi3_prefs_band_screen_unlock_summary">Nach oben wischen, um den Geräte-Bildschirm zu entsperren</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 8897046303..85d5024f2b 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -557,8 +557,8 @@
     <string name="notif_battery_low_extended">%1$s χαμηλή μπαταρία: %2$s</string>
     <string name="lack_of_sleep">Έλλειψη ύπνου: %1$s</string>
     <string name="overslept">Παραπάνω ύπνος: %1$s</string>
-    <string name="lack_of_step">Λιγότερα βήματα: %1$d</string>
-    <string name="overstep">Περισσότερα βήματα: %1$d</string>
+    <string name="lack_of_step">Λιγότερα βήματα: %1$s</string>
+    <string name="overstep">Περισσότερα βήματα: %1$s</string>
     <string name="live_activity_max_heart_rate">Τωρινοί / Μέγιστοι παλμοί: %1$d / %2$d</string>
     <string name="activity_prefs_charts">Ρυθμίσεις γραφήματος</string>
     <string name="pref_title_contextual_arabic">Συμφραζόμενα Αραβικά</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 9968c51038..10ee6309c7 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -500,8 +500,8 @@
     <string name="debugactivity_really_factoryreset_title">Really factory reset\?</string>
     <string name="live_activity_max_heart_rate">Current / Max heart rate: %1$d / %2$d</string>
     <string name="no_data">No data</string>
-    <string name="overstep">Overstep: %1$d</string>
-    <string name="lack_of_step">Lack of steps: %1$d</string>
+    <string name="overstep">Overstep: %1$s</string>
+    <string name="lack_of_step">Lack of steps: %1$s</string>
     <string name="overslept">Overslept: %1$s</string>
     <string name="lack_of_sleep">Lack of sleep: %1$s</string>
     <string name="language_and_region_prefs">Language and region settings</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b19d05f3f9..0fc34d8ec4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -497,8 +497,8 @@
     <string name="minutes_5">5 minutos</string>
     <string name="minutes_10">10 minutos</string>
     <string name="minutes_30">30 minutos</string>
-    <string name="lack_of_step">Pasos restantes: %1$d</string>
-    <string name="overstep">Excedido: %1$d</string>
+    <string name="lack_of_step">Pasos restantes: %1$s</string>
+    <string name="overstep">Excedido: %1$s</string>
     <string name="live_activity_max_heart_rate">Frecuencia cardíaca Actual / máxima: %1$d / %2$d</string>
     <string name="you_slept">%1$s – %2$s</string>
     <string name="you_did_not_sleep">No durmió</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index fa848c4b40..42e8072091 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -638,8 +638,8 @@
     <string name="pref_summary_low_latency_fw_update">See võib aidata seadmetega, millega püsivara paigaldamine ebaõnnestub.</string>
     <string name="pref_title_low_latency_fw_update">Kasuta madala latentsiga režiimi püsivara paigaldamiseks</string>
     <string name="pref_title_dont_ack_transfer">Ära ACK-i aktiivsusinfo sünkroonimist</string>
-    <string name="overstep">Samme üle: %1$d</string>
-    <string name="lack_of_step">Puudujäävaid samme: %1$d</string>
+    <string name="overstep">Samme üle: %1$s</string>
+    <string name="lack_of_step">Puudujäävaid samme: %1$s</string>
     <string name="weeksteps_today_steps_description">Tänaseid samme, sihtmärk: %1$s</string>
     <string name="liveactivity_live_activity">Tegevus reaalajas</string>
     <string name="weeksleepchart_today_sleep_description">Tänaöine magamine, eesmärk: %1$s</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 3a0f547ca4..0ebafd1f81 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -78,8 +78,8 @@
     <string name="watch9_time_minutes">Minutes :</string>
     <string name="activity_db_management_empty_db_warning">Attention! En cliquant sur ce bouton, vous supprimerez toutes vos données et recommencerez à zéro.</string>
     <string name="live_activity_max_heart_rate">Mesure cardiaque actuelle / maximum : %1$d / %2$d</string>
-    <string name="overstep">Trop d\'activité : %1$d</string>
-    <string name="lack_of_step">Manque d\'activité : %1$d</string>
+    <string name="overstep">Trop d\'activité : %1$s</string>
+    <string name="lack_of_step">Manque d\'activité : %1$s</string>
     <string name="overslept">Excès de sommeil : %1$s</string>
     <string name="lack_of_sleep">Manque de sommeil : %1$s</string>
     <string name="zetime_activity_tracking_summary">Activer le suivi des activités : comptera vos pas, etc.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e4da2290d2..294bd10606 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -536,8 +536,8 @@
     <string name="minutes_5">5 minutes</string>
     <string name="minutes_10">10 minutes</string>
     <string name="minutes_30">30 minutes</string>
-    <string name="lack_of_step">Manque d\'activité : %1$d</string>
-    <string name="overstep">Trop d\'activité : %1$d</string>
+    <string name="lack_of_step">Manque d\'activité : %1$s</string>
+    <string name="overstep">Trop d\'activité : %1$s</string>
     <string name="live_activity_max_heart_rate">Fréquence cardiaque actuelle / maximum : %1$d / %2$d</string>
     <string name="you_slept">%1$s – %2$s</string>
     <string name="you_did_not_sleep">Vous n\'avez pas dormi</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 53efbf87ad..0d70232e26 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -571,8 +571,8 @@
     <string name="language_and_region_prefs">הגדרות שפה ואיזור</string>
     <string name="lack_of_sleep">מחסור בשינה: %1$s</string>
     <string name="overslept">עודף שינה: %1$s</string>
-    <string name="lack_of_step">מחסור בצעדים: %1$d</string>
-    <string name="overstep">עודף צעדים: %1$d</string>
+    <string name="lack_of_step">מחסור בצעדים: %1$s</string>
+    <string name="overstep">עודף צעדים: %1$s</string>
     <string name="no_data">אין נתונים</string>
     <string name="live_activity_max_heart_rate">דופק נוכחי / מרבי: %1$d ‏/ %2$d</string>
     <string name="debugactivity_really_factoryreset_title">לאפס להגדרות יצרן\?</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index b5a1cd65dc..1311f66f86 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -129,8 +129,8 @@
     <string name="pref_summary_dont_ack_transfers">यदि बैंड पर सुनिश्चित न हो, तो गतिविधि डेटा साफ़ नहीं किया जाता है। उपयोगी अगर GB अन्य एप्लिकेशन के साथ प्रयोग किया जाए।</string>
     <string name="pref_title_dont_ack_transfer">गतिविधि डेटा स्थानांतरण सुनिश्चित न करें</string>
     <string name="average">औसत: %1$s</string>
-    <string name="overstep">अधिक कदम: %1$d</string>
-    <string name="lack_of_step">चरणों की कमी: %1$d</string>
+    <string name="overstep">अधिक कदम: %1$s</string>
+    <string name="lack_of_step">चरणों की कमी: %1$s</string>
     <string name="weeksteps_today_steps_description">आज के कदम, लक्ष्य: %1$s</string>
     <string name="live_activity_max_heart_rate">वर्तमान / अधिकतम हृदय गति: %1$d / %2$d</string>
     <string name="live_activity_start_your_activity">अपनी गतिविधि शुरू करें</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 9c4bb2c6b2..c1318dd877 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -799,7 +799,7 @@
     <string name="minutes_10">10 minuta</string>
     <string name="liveactivity_live_activity">Aktivnost uživo</string>
     <string name="weeksteps_today_steps_description">Koraci danas, cilj: %1$s</string>
-    <string name="lack_of_step">Nedostatak koraka: %1$d</string>
+    <string name="lack_of_step">Nedostatak koraka: %1$s</string>
     <string name="average">Prosjek: %1$s</string>
     <string name="pref_title_dont_ack_transfer">Ne dozvoli ACK prijenos podataka aktivnosti</string>
     <string name="pref_summary_dont_ack_transfers">Ako nije ACK na bend, podaci o aktivnostima se ne brišu. Korisno ako se GB koristi zajedno s drugim aplikacijama.</string>
@@ -1225,7 +1225,7 @@
     <string name="activity_type_swimming_openwater">Plivanje (otvorena voda)</string>
     <string name="abstract_chart_fragment_kind_not_worn">Nije nošeno</string>
     <string name="abstract_chart_fragment_kind_activity">Aktivnost</string>
-    <string name="overstep">Prekorak: %1$d</string>
+    <string name="overstep">Prekorak: %1$s</string>
     <string name="minutes_30">30 minuta</string>
     <string name="seconds_20">20 sekundi</string>
     <string name="seconds_30">30 sekundi</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 04d542469a..fbc0a193cc 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1070,7 +1070,7 @@
     <string name="widget_settings_select_device_title">Eszköz kiválasztása</string>
     <string name="menuitem_mutephone">Telefon némítása</string>
     <string name="movement_intensity">Mozgásintenzitás</string>
-    <string name="overstep">Többlet lépés: %1$d</string>
+    <string name="overstep">Többlet lépés: %1$s</string>
     <string name="stress_high">Magas</string>
     <string name="menuitem_wifi">Wi-Fi</string>
     <string name="pref_media_volumeup">Hangerő növelése</string>
@@ -1741,7 +1741,7 @@
     <string name="prefs_activity_monitoring_title">Tevékenységfigyelés</string>
     <string name="num_min">%d perc</string>
     <string name="seconds_25">25 másodperc</string>
-    <string name="lack_of_step">Hiányzó lépések: %1$d</string>
+    <string name="lack_of_step">Hiányzó lépések: %1$s</string>
     <string name="pref_huami_truncate_fetch_operation_timestamps_summary">A lekérdezési műveletek időbélyegeinek percekre történő csökkentése. Ha a nagyon rövid edzések lekérdezésekor problémák merülnek fel, tiltsa le ezt a beállítást, hogy az időbélyegek másodpercben maradjanak.</string>
     <string name="mi2_prefs_button_press_count_max_delay_summary">Legnagyobb késleltetés a gombnyomások között ezredmásodpercben</string>
     <string name="activity_db_management_autoexport_scheduled_yes">Az automatikus exportálás (eredetileg) %1$s-ra lett ütemezve</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 0650e5e1d3..636eebadaa 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -1616,7 +1616,7 @@
     <string name="seconds_25">25 detik</string>
     <string name="seconds_30">30 detik</string>
     <string name="minutes_1">1 menit</string>
-    <string name="lack_of_step">Kekuarangan langkah: %1$d</string>
+    <string name="lack_of_step">Kekuarangan langkah: %1$s</string>
     <string name="pref_title_low_latency_fw_update">Gunakan mode latensi rendah untuk flash perangkat tegar</string>
     <string name="pref_summary_low_latency_fw_update">Ini mungkin membantu pada perangkat di mana flash perangkat tegar gagal.</string>
     <string name="live_activity_steps_history">Riwayat langkah</string>
@@ -1839,7 +1839,7 @@
     <string name="user_feedback_miband_activity_data_transfer">Akan mentransfer data %1$s dimulai dari %2$s</string>
     <string name="reminder_no_free_slots_description">Perangkat ini tidak memiliki tempat kosong untuk pengingat (jumlah tempat: %1$s)</string>
     <string name="prefs_heartrate_alert_experimental_description">Getar gelang ketika detak jantung melebihi ambang, tanpa aktivitas fisik apa pun yang ada dalam 10 menit terakhir. Fitur ini eksperimental, dan tidak dicoba secara lebih dalam.</string>
-    <string name="overstep">Terlalu banyak langkah: %1$d</string>
+    <string name="overstep">Terlalu banyak langkah: %1$s</string>
     <string name="average">Rata-rata: %1$s</string>
     <string name="error_background_service_reason_truncated">Pemulaian layanan latar belakang gagal karena…</string>
     <string name="pref_check_permission_status_summary">Periksa dan tanya untuk izin yang belum ada bahkan ketika mereka belum dibutuhkan secara langsung. Hanya nonaktifkan ini jika perangkat Anda sebenarnya mendukung fitur apa pun. Tidak memberikan izin mungkin akan mengalami masalah!</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 28251294c7..ff5b091ce4 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -578,8 +578,8 @@
     <string name="pref_summary_contextual_arabic">Abilita questo per supportare l\'arabo contestuale</string>
     <string name="share_log_warning">Tieni presente che i file di log di Gadgetbridge possono contenere molte informazioni personali, inclusi, a titolo esemplificativo, dati sulla salute, identificatori univoci (come l\'indirizzo MAC del dispositivo), preferenze musicali, ecc. Modifica il file per rimuovere queste informazioni prima di inviare il file in una segnalazione di errore visibile pubblicamente.</string>
     <string name="overslept">Sonno extra: %1$s</string>
-    <string name="lack_of_step">Passi mancanti: %1$d</string>
-    <string name="overstep">Passi eccedenti: %1$d</string>
+    <string name="lack_of_step">Passi mancanti: %1$s</string>
+    <string name="overstep">Passi eccedenti: %1$s</string>
     <string name="debugactivity_really_factoryreset_title">Vuoi veramente ripristinare le impostazioni di fabbrica\?</string>
     <string name="debugactivity_really_factoryreset">Effettuare il ripristino delle impostazioni di fabbrica cancellerà tutti i dati presenti sul dispositivo connesso (se supportato). I dispositivi Xiaomi/Huami cambiano anche MAC Address Bluetooth, e in modo risultano dispositivi nuovi per Gadgetbrige.</string>
     <string name="title_activity_notification_filter">Filtro Notifiche</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f1ad055d12..ad403e64e7 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -534,8 +534,8 @@
     <string name="minutes_5">5 分</string>
     <string name="minutes_10">10 分</string>
     <string name="minutes_30">30 分</string>
-    <string name="lack_of_step">歩数不足: %1$d</string>
-    <string name="overstep">歩数過剰: %1$d</string>
+    <string name="lack_of_step">歩数不足: %1$s</string>
+    <string name="overstep">歩数過剰: %1$s</string>
     <string name="live_activity_max_heart_rate">現在 / 最大心拍数: %1$d / %2$d</string>
     <string name="you_slept">%1$s から %2$s の間、眠っていました</string>
     <string name="you_did_not_sleep">睡眠しませんでした</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index bb2e8df0e6..74b74f0866 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -500,8 +500,8 @@
     <string name="minutes_5">5분</string>
     <string name="minutes_10">10분</string>
     <string name="minutes_30">30분</string>
-    <string name="lack_of_step">걸음 수 부족: %1$d</string>
-    <string name="overstep">걸음 수 초과: %1$d</string>
+    <string name="lack_of_step">걸음 수 부족: %1$s</string>
+    <string name="overstep">걸음 수 초과: %1$s</string>
     <string name="live_activity_max_heart_rate">현재/최대 심박수: %1$d / %2$d</string>
     <string name="you_slept">%1$s – %2$s</string>
     <string name="you_did_not_sleep">수면 기록 없음</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 385880284c..132017bdd1 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -529,8 +529,8 @@
     <string name="notif_battery_low_extended">%1$s batteri lavt: %2$s</string>
     <string name="lack_of_sleep">Mangel på søvn: %1$s</string>
     <string name="overslept">Oversovet: %1$s</string>
-    <string name="lack_of_step">Mangler trinn: %1$d</string>
-    <string name="overstep">Overskritt: %1$d</string>
+    <string name="lack_of_step">Mangler trinn: %1$s</string>
+    <string name="overstep">Overskritt: %1$s</string>
     <string name="live_activity_max_heart_rate">Nåværende / Maks hjertefrekvens: %1$d / %2$d</string>
     <string name="activity_prefs_charts">Diagraminnstillinger</string>
     <string name="pref_title_contextual_arabic">Kontekstuell arabisk</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 03bdfe9474..a06d49bbc3 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -546,8 +546,8 @@
     <string name="minutes_5">5 minuten</string>
     <string name="minutes_10">10 minuten</string>
     <string name="minutes_30">30 minuten</string>
-    <string name="lack_of_step">Tekort aan stappen: %1$d</string>
-    <string name="overstep">Overschrijding aantal stappen: %1$d</string>
+    <string name="lack_of_step">Tekort aan stappen: %1$s</string>
+    <string name="overstep">Overschrijding aantal stappen: %1$s</string>
     <string name="live_activity_max_heart_rate">Huidige / Max hartslag: %1$d / %2$d</string>
     <string name="mi3_prefs_night_mode">Nacht modus</string>
     <string name="mi3_prefs_night_mode_summary">Verlaag \'s nachts automatisch de scherm helderheid</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index fb6f25afa5..692361f085 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -418,7 +418,7 @@
     <string name="minutes_5">5 minut</string>
     <string name="minutes_10">10 minut</string>
     <string name="minutes_30">30 minut</string>
-    <string name="lack_of_step">Pozostało kroków: %1$d</string>
+    <string name="lack_of_step">Pozostało kroków: %1$s</string>
     <string name="pref_title_low_latency_fw_update">Użyj trybu o niskiej latencji przy aktualizacji firmware</string>
     <string name="live_activity_max_heart_rate">Aktualny / Maks. tętno: %1$d / %2$d</string>
     <string name="you_slept">%1$s – %2$s</string>
@@ -526,7 +526,7 @@
     <string name="debugactivity_really_factoryreset_title">Przywrócić do ustawień fabrycznych\?</string>
     <string name="debugactivity_really_factoryreset">Powrót do ustawień fabrycznych spowoduje usunięcie wszystkich danych z podłączonego urządzenia (jeśli jest obsługiwane). Urządzenia Xiaomi/Huami zmienią również adres MAC Bluetooth, więc pojawią się dla Gadgetbridge jako nowe urządzenia.</string>
     <string name="overslept">Nadmiar snu: %1$s</string>
-    <string name="overstep">Przekroczenie: %1$d</string>
+    <string name="overstep">Przekroczenie: %1$s</string>
     <string name="you_did_not_sleep">Nie spałeś(-aś)</string>
     <string name="mi2_prefs_button_press_broadcast">Wiadomość do rozgłoszenia</string>
     <string name="mi2_prefs_button_press_broadcast_summary">Wiadomość rozgłoszeniowa wysłana ze zdarzeniem. Parametr „button_id” jest dodawany do każdej wiadomości automatycznie.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1549e42401..1c6cd14ee2 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -568,8 +568,8 @@
     <string name="language_and_region_prefs">Configurações de idioma e região</string>
     <string name="lack_of_sleep">Carência de sono: %1$s</string>
     <string name="overslept">Dormiu demais: %1$s</string>
-    <string name="lack_of_step">Carência de passos: %1$d</string>
-    <string name="overstep">Passos excedentes: %1$d</string>
+    <string name="lack_of_step">Carência de passos: %1$s</string>
+    <string name="overstep">Passos excedentes: %1$s</string>
     <string name="no_data">Nenhum dado</string>
     <string name="live_activity_max_heart_rate">Frequência cardíaca atual/máx.: %1$d / %2$d</string>
     <string name="debugactivity_really_factoryreset">Restaurar as configurações de fábrica vai excluir todos os dados do dispositivo conectado (se houver suporte). Dispositivos Xiami/Huami também mudam o endereço MAC do Bluetooth, então eles aparecem como novos dispositivos no Gadgetbridge.</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 19c6f4ed28..dcc03b09e8 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -813,8 +813,8 @@
     <string name="minutes_255">255 minutos</string>
     <string name="liveactivity_live_activity">Atividade em direto</string>
     <string name="weeksteps_today_steps_description">Passos hoje, meta: %1$s</string>
-    <string name="lack_of_step">Carência de passos: %1$d</string>
-    <string name="overstep">Passos excedentes: %1$d</string>
+    <string name="lack_of_step">Carência de passos: %1$s</string>
+    <string name="overstep">Passos excedentes: %1$s</string>
     <string name="average">Média: %1$s</string>
     <string name="pref_title_dont_ack_transfer">Não reconhecer transferência de dados da atividade</string>
     <string name="pref_summary_dont_ack_transfers">Se não reconhecido para a pulseira, dados de atividade não serão apagados. Útil se GB for usado em conjunto com outras apps.</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 8590ae5353..60f5b60c6e 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -811,8 +811,8 @@
     <string name="title_activity_notification_filter">Filtro de notificação</string>
     <string name="live_activity_max_heart_rate">Frequência cardíaca atual / máx: %1$d / %2$d</string>
     <string name="no_data">Nenhuns dados</string>
-    <string name="overstep">Passos excedentes: %1$d</string>
-    <string name="lack_of_step">Carência de passos: %1$d</string>
+    <string name="overstep">Passos excedentes: %1$s</string>
+    <string name="lack_of_step">Carência de passos: %1$s</string>
     <string name="overslept">Dormiu demais: %1$s</string>
     <string name="lack_of_sleep">Carência de sono: %1$s</string>
     <string name="language_and_region_prefs">Configurações de idioma e região</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 05434b9e43..ad71eec49c 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1027,7 +1027,7 @@
     <string name="watchface_setting_wrist_flick_move_relative">Mișcarea acelor în raport cu timpul</string>
     <string name="watchface_setting_wrist_flick_hour">Ac oră (de la -360 la 360)</string>
     <string name="weeksteps_today_steps_description">Pași astăzi, obiectiv: %1$s</string>
-    <string name="overstep">Depășire: %1$d</string>
+    <string name="overstep">Depășire: %1$s</string>
     <string name="app_install_info">Ești pe cale să instalezi următoarea aplicație:
 \n
 \n%1$s
@@ -1128,7 +1128,7 @@
 \nNotă: Nu trebuie să instalezi .res dacă este exact același cu cel instalat anterior.
 \n
 \nACȚIONEZI PE PROPRIU RISC!</string>
-    <string name="lack_of_step">Lipsa pașilor: %1$d</string>
+    <string name="lack_of_step">Lipsa pașilor: %1$s</string>
     <string name="fw_upgrade_notice_amazfitbip3pro">Ești pe cale să instalezi firmware-ul %s pe Amazfit Bip 3 Pro.
 \n
 \nAsigură-te că instalezi fișierul .fw, iar după aceea fișierul .res. Ceasul se va reporni după instalarea fișierului .fw.
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7bb3cfb8e8..2dcd6de160 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -275,8 +275,8 @@
     <string name="distance">Расстояние</string>
     <string name="liveactivity_live_activity">Текущая активность</string>
     <string name="weeksteps_today_steps_description">Шагов сегодня, цель: %1$s</string>
-    <string name="lack_of_step">Не хватает: %1$d шагов</string>
-    <string name="overstep">Пройдено на %1$d шагов больше</string>
+    <string name="lack_of_step">Не хватает: %1$s шагов</string>
+    <string name="overstep">Пройдено на %1$s шагов больше</string>
     <string name="pref_title_dont_ack_transfer">Не подтверждать передачу данных об активности</string>
     <string name="pref_summary_dont_ack_transfers">Если данные об активности не будут переданы на устройство, оно не будет очищено. Полезно, если GB используется с другими приложениями.</string>
     <string name="pref_summary_keep_data_on_device">Сохранять данные об активности на устройстве даже после синхронизации. Полезно, если GB используется совместно с другими приложениями. Это может привести к тому, что на часах закончится место и/или они перестанут синхронизироваться должным образом.</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 01c1f445da..da53a8eea9 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -764,7 +764,7 @@
     <string name="blood_pressure">Крвни притисак</string>
     <string name="getting_heart_rate">Мерење</string>
     <string name="seconds_8">8 секунди</string>
-    <string name="overstep">Прекорачење: %1$d</string>
+    <string name="overstep">Прекорачење: %1$s</string>
     <string name="pref_enable_unsupported_settings_title">Омогући неподржане поставке</string>
     <string name="pref_title_third_party_app_device_settings">Омогући програмима трећих страна да мењају поставке</string>
     <string name="abstract_chart_fragment_kind_light_sleep">Дремање</string>
@@ -871,7 +871,7 @@
     <string name="heart_rate">Откуцаји срца</string>
     <string name="liveactivity_live_activity">Дејства уживо</string>
     <string name="weeksteps_today_steps_description">Корака данас, циљ: %1$s</string>
-    <string name="lack_of_step">Недостатак корака: %1$d</string>
+    <string name="lack_of_step">Недостатак корака: %1$s</string>
     <string name="pref_summary_third_party_app_device_settings">Омогући осталим уграђеним програмима трећих страна да мењају поставке уређаја.</string>
     <string name="mi2_prefs_do_not_disturb">Не узнемиравај</string>
     <string name="prefs_screen_timeout">Време укључености заслона</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 729211f3af..7ccc2930f9 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -501,7 +501,7 @@
     <string name="minutes_10">10 நிமிடங்கள்</string>
     <string name="minutes_45">45 நிமிடங்கள்</string>
     <string name="weeksteps_today_steps_description">இன்று படிகள், இலக்கு: %1$s</string>
-    <string name="lack_of_step">படிகளின் பற்றாக்குறை: %1$d</string>
+    <string name="lack_of_step">படிகளின் பற்றாக்குறை: %1$s</string>
     <string name="live_activity_current_steps_per_minute">தற்போதைய படிகள்/நிமிடம்</string>
     <string name="you_slept">%1$s - %2$s</string>
     <string name="you_did_not_sleep">நீங்கள் தூங்கவில்லை</string>
@@ -2497,7 +2497,7 @@
     <string name="minutes_120">120 நிமிடங்கள்</string>
     <string name="minutes_255">255 நிமிடங்கள்</string>
     <string name="liveactivity_live_activity">நேரடி செயல்பாடு</string>
-    <string name="overstep">ஓவர்ச்டெப்: %1$d</string>
+    <string name="overstep">ஓவர்ச்டெப்: %1$s</string>
     <string name="stress_average">சராசரி</string>
     <string name="pref_huami_truncate_fetch_operation_timestamps_summary">ஃபெட்ச் ஆபரேசன் நேர முத்திரைகளை நிமிடங்களுக்கு துண்டிக்கவும். மிகக் குறுகிய உடற்பயிற்சிகளைப் பெறும்போது சிக்கல்களை எதிர்கொண்டால், நேர முத்திரைகளை நொடிகளில் வைத்திருக்க இந்த அமைப்பை முடக்கு.</string>
     <string name="pref_title_dont_ack_transfer">செயல்பாட்டு தரவு பரிமாற்றத்தை ACK வேண்டாம்</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1dc9cc29ea..ecdcdd1931 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -306,7 +306,7 @@
     <string name="kind_watchface">Saat Arayüzü</string>
     <string name="korean">Korece</string>
     <string name="lack_of_sleep">Eksik uyku: %1$s</string>
-    <string name="lack_of_step">Eksik adım sayısı: %1$d</string>
+    <string name="lack_of_step">Eksik adım sayısı: %1$s</string>
     <string name="language_and_region_prefs">Dil ve bölge ayarları</string>
     <string name="left">Sol</string>
     <string name="live_activity_current_steps_per_minute">Şu anki adım sayısı/dk</string>
@@ -414,7 +414,7 @@
     <string name="on">Açık</string>
     <string name="other">Diğer</string>
     <string name="overslept">Fazla uyku: %1$s</string>
-    <string name="overstep">Fazla adım: %1$d</string>
+    <string name="overstep">Fazla adım: %1$s</string>
     <string name="pairing">%s ile eşleştiriliyor…</string>
     <string name="pairing_already_bonded">%1$s (%2$s) ile zaten etkileşimde, bağlanıyor…</string>
     <string name="pairing_creating_bond_with">%1$s (%2$s) ile etkileşim başlıyor</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 388aecc581..2514f08dd8 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -489,7 +489,7 @@
     <string name="pref_rtl_max_line_length_summary">Збільшувати або зменшувати кількість символів у рядках, на які розділяється текст, написаний «справа наліво»</string>
     <string name="lack_of_sleep">Недосипання: %1$s</string>
     <string name="overslept">Пересипання: %1$s</string>
-    <string name="lack_of_step">Недостатня кількість кроків: %1$d</string>
+    <string name="lack_of_step">Недостатня кількість кроків: %1$s</string>
     <string name="live_activity_max_heart_rate">Поточний / найвищий пульс: %1$d / %2$d</string>
     <string name="debugactivity_really_factoryreset">Скидання налаштувань призведе до видалення всіх даних із підʼєднаного пристрою (якщо це підтримується). Пристрої Xiaomi/Huami також змінять свою Bluetooth MAC-адресу, тому вони зʼявляться як нові пристрої для Gadgetbridge.</string>
     <string name="prefs_disconnect_notification">Сповіщення про відʼєднання</string>
@@ -632,7 +632,7 @@
     <string name="pref_title_contextual_arabic">Контекстна арабська</string>
     <string name="pref_summary_contextual_arabic">Увімкніть для підтримки контекстної арабської мови</string>
     <string name="preferences_rtl_settings">Підтримка тексту справа наліво</string>
-    <string name="overstep">Надлишкова кількість кроків: %1$d</string>
+    <string name="overstep">Надлишкова кількість кроків: %1$s</string>
     <string name="appwidget_setting_alarm">Будильник установлено на %1$02d:%2$02d</string>
     <string name="edittext_notification_filter_words_hint">Укажіть необхідні слова, кожне з нового рядка</string>
     <string name="toast_notification_filter_saved_successfully">Фільтр сповіщень збережено</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1e2b04e71f..28c228a7c0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -502,8 +502,8 @@
     <string name="minutes_5">5 分钟</string>
     <string name="minutes_10">10 分钟</string>
     <string name="minutes_30">30 分钟</string>
-    <string name="lack_of_step">缺少步数：%1$d</string>
-    <string name="overstep">超过步数：%1$d</string>
+    <string name="lack_of_step">缺少步数：%1$s</string>
+    <string name="overstep">超过步数：%1$s</string>
     <string name="live_activity_max_heart_rate">当前／最大心率：%1$d / %2$d</string>
     <string name="you_slept">%1$s – %2$s</string>
     <string name="you_did_not_sleep">您没有睡觉</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e0b2401644..662a029fac 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -204,8 +204,8 @@
     <string name="minutes_10">10 分鐘</string>
     <string name="minutes_30">30 分鐘</string>
     <string name="weeksteps_today_steps_description">今日步數，目標：%1$s</string>
-    <string name="lack_of_step">步數不足：%1$d</string>
-    <string name="overstep">步數過剩：%1$d</string>
+    <string name="lack_of_step">步數不足：%1$s</string>
+    <string name="overstep">步數過剩：%1$s</string>
     <string name="average">平均：%1$s</string>
     <string name="abstract_chart_fragment_kind_activity">活動</string>
     <string name="abstract_chart_fragment_kind_not_worn">未佩戴</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 243bcf316b..6a0c62973e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1128,8 +1128,8 @@
     <string name="minutes_255">255 minutes</string>
     <string name="liveactivity_live_activity">Live activity</string>
     <string name="weeksteps_today_steps_description">Steps today, target: %1$s</string>
-    <string name="lack_of_step">Lack of steps: %1$d</string>
-    <string name="overstep">Overstep: %1$d</string>
+    <string name="lack_of_step">Lack of steps: %1$s</string>
+    <string name="overstep">Overstep: %1$s</string>
     <string name="average">Average: %1$s</string>
     <string name="stress_average">Average</string>
     <string name="pref_huami_truncate_fetch_operation_timestamps_title">Truncate fetch operation timestamps</string>