From 95d5581e028b33f7d14f1fd3256143ccd09578ad Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Mon, 31 Jul 2023 19:40:05 -0300
Subject: [PATCH] refactor: update resource string parameters

---
 app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt | 6 +++---
 app/src/main/res/values-bg/strings.xml                      | 6 +++---
 app/src/main/res/values-cs/strings.xml                      | 6 +++---
 app/src/main/res/values-de/strings.xml                      | 6 +++---
 app/src/main/res/values-el/strings.xml                      | 6 +++---
 app/src/main/res/values-fr/strings.xml                      | 6 +++---
 app/src/main/res/values-hu/strings.xml                      | 6 +++---
 app/src/main/res/values-is/strings.xml                      | 6 +++---
 app/src/main/res/values-it/strings.xml                      | 6 +++---
 app/src/main/res/values-ja/strings.xml                      | 6 +++---
 app/src/main/res/values-ko/strings.xml                      | 6 +++---
 app/src/main/res/values-nb/strings.xml                      | 6 +++---
 app/src/main/res/values-pl/strings.xml                      | 6 +++---
 app/src/main/res/values-pt-rBR/strings.xml                  | 6 +++---
 app/src/main/res/values-pt/strings.xml                      | 6 +++---
 app/src/main/res/values-ru/strings.xml                      | 6 +++---
 app/src/main/res/values-uk/strings.xml                      | 6 +++---
 app/src/main/res/values-zh/strings.xml                      | 6 +++---
 app/src/main/res/values/strings.xml                         | 6 +++---
 19 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
index 37175a48a..8b2c1e14a 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
@@ -159,8 +159,8 @@ fun MapView(model: UIViewModel = viewModel()) {
                 title = "${u.longName} ${node.batteryStr}"
                 snippet = model.gpsString(p)
                 ourNode?.distanceStr(node, model.config.display.units.number)?.let { dist ->
-                    val string = context.getString(R.string.map_subDescription)
-                    subDescription = string.format(ourNode.bearing(node), dist)
+                    subDescription =
+                        context.getString(R.string.map_subDescription, ourNode.bearing(node), dist)
                 }
                 setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
                 position = GeoPoint(p.latitude, p.longitude)
@@ -486,7 +486,7 @@ fun MapView(model: UIViewModel = viewModel()) {
             zoomLevelMin.toInt(),
             zoomLevelMax.toInt()
         )
-        cacheEstimate = context.getString(R.string.map_cache_tiles).format(tileCount)
+        cacheEstimate = context.getString(R.string.map_cache_tiles, tileCount)
     }
 
     fun startDownload() {
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 40c3ad25b..556e74a28 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -158,9 +158,9 @@
     <string name="map_purge_fail">Неуспешно изчистване на свалените SQL данни, вижте регистъра на приложението за повече информация</string>
     <string name="map_cache_manager">Управление на свалените данни</string>
     <string name="map_download_complete">Свалянето приключи!</string>
-    <string name="map_download_errors">Свалянето приключи с %s грешки</string>
-    <string name="map_cache_tiles">%s картинки</string>
-    <string name="map_subDescription">посока: %1$s° разстояние: %2$s</string>
+    <string name="map_download_errors">Свалянето приключи с %d грешки</string>
+    <string name="map_cache_tiles">%d картинки</string>
+    <string name="map_subDescription">посока: %1$d° разстояние: %2$s</string>
     <string name="waypoint_edit">Редакция на точка</string>
     <string name="waypoint_delete">Изтриване на точка?</string>
     <string name="waypoint_new">Нова точка</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 06f18cf27..9fbebbf27 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -161,9 +161,9 @@
     <string name="map_purge_fail">SQL Cache purge failed, see logcat for details</string>
     <string name="map_cache_manager">Cache Manager</string>
     <string name="map_download_complete">Stahování dokončeno!</string>
-    <string name="map_download_errors">Stahování dokončeno s %s chybami</string>
-    <string name="map_cache_tiles">%s dlaždic</string>
-    <string name="map_subDescription">rychlost %1$s° vzdálenost: %2$s</string>
+    <string name="map_download_errors">Stahování dokončeno s %d chybami</string>
+    <string name="map_cache_tiles">%d dlaždic</string>
+    <string name="map_subDescription">rychlost %1$d° vzdálenost: %2$s</string>
     <string name="waypoint_edit">Edit waypoint</string>
     <string name="waypoint_delete">Delete waypoint?</string>
     <string name="waypoint_new">New waypoint</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 79a391a1b..5c1a67c54 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -159,9 +159,9 @@
     <string name="map_purge_fail">Das Säubern des SQL-Zwischenspeichers ist fehlgeschlagen, siehe Logcat für Details</string>
     <string name="map_cache_manager">Zwischenspeicher-Verwaltung</string>
     <string name="map_download_complete">Herunterladen abgeschlossen!</string>
-    <string name="map_download_errors">Herunterladen abgeschlossen mit %s Fehlern</string>
-    <string name="map_cache_tiles">%s Kacheln</string>
-    <string name="map_subDescription">Richtung: %1$s° Entfernung: %2$s</string>
+    <string name="map_download_errors">Herunterladen abgeschlossen mit %d Fehlern</string>
+    <string name="map_cache_tiles">%d Kacheln</string>
+    <string name="map_subDescription">Richtung: %1$d° Entfernung: %2$s</string>
     <string name="waypoint_edit">Wegpunkt bearbeiten</string>
     <string name="waypoint_delete">Wegpunkt löschen?</string>
     <string name="waypoint_new">Wegpunkt hinzufügen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 8f882f8e9..aa1143827 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -160,9 +160,9 @@
     <string name="map_purge_fail">SQL Cache purge failed, see logcat for details</string>
     <string name="map_cache_manager">Διαχείριση Προσωρινής Αποθήκευσης</string>
     <string name="map_download_complete">Η λήψη ολοκληρώθηκε!</string>
-    <string name="map_download_errors">Λήψη ολοκληρώθηκε με %s σφάλματα</string>
-    <string name="map_cache_tiles">%s tiles</string>
-    <string name="map_subDescription">bearing: %1$s° distance: %2$s</string>
+    <string name="map_download_errors">Λήψη ολοκληρώθηκε με %d σφάλματα</string>
+    <string name="map_cache_tiles">%d tiles</string>
+    <string name="map_subDescription">bearing: %1$d° distance: %2$s</string>
     <string name="waypoint_edit">Επεξεργασία σημείου διαδρομής</string>
     <string name="waypoint_delete">Διαγραφή σημείου πορείας;</string>
     <string name="waypoint_new">Νέο σημείο πορείας</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 282b6da16..a0078ae03 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -157,9 +157,9 @@
     <string name="map_purge_fail">La purge du cache SQL a échoué, consultez « logcat » pour plus de détails</string>
     <string name="map_cache_manager">Gestionnaire du cache</string>
     <string name="map_download_complete">Téléchargement terminé !</string>
-    <string name="map_download_errors">Téléchargement terminé avec %s erreurs</string>
-    <string name="map_cache_tiles">Vignettes de %s</string>
-    <string name="map_subDescription">échelle : %1$s° distance : %2$s</string>
+    <string name="map_download_errors">Téléchargement terminé avec %d erreurs</string>
+    <string name="map_cache_tiles">Vignettes de %d</string>
+    <string name="map_subDescription">échelle : %1$d° distance : %2$s</string>
     <string name="waypoint_edit">Modifier le repère</string>
     <string name="waypoint_delete">Supprimer le repère ?</string>
     <string name="waypoint_new">Nouveau point de repère</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 8e6a16ccc..ead227aa1 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -159,9 +159,9 @@
     <string name="map_purge_fail">SQL gyorsítótár kiürítése sikertelen, a részleteket lásd a logcat-ben</string>
     <string name="map_cache_manager">Gyorsítótár kezelő</string>
     <string name="map_download_complete">A letöltés befejeződött!</string>
-    <string name="map_download_errors">A letöltés %s hibával fejeződött be</string>
-    <string name="map_cache_tiles">%s csempe</string>
-    <string name="map_subDescription">irányszög: %1$s° távolság: %2$s</string>
+    <string name="map_download_errors">A letöltés %d hibával fejeződött be</string>
+    <string name="map_cache_tiles">%d csempe</string>
+    <string name="map_subDescription">irányszög: %1$d° távolság: %2$s</string>
     <string name="waypoint_edit">Útpont szerkesztés</string>
     <string name="waypoint_delete">Útpont törlés?</string>
     <string name="waypoint_new">Új útpont</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 212fecca1..e0990ee91 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -157,9 +157,9 @@
     <string name="map_purge_fail">Hreinsun SQL skyndiminnis mistókts, sjá upplýsingar í logcat</string>
     <string name="map_cache_manager">Sýsla með skyndiminni</string>
     <string name="map_download_complete">Niðurhali lokið!</string>
-    <string name="map_download_errors">Niðurhali lauk með %s villum</string>
-    <string name="map_cache_tiles">%s reitar</string>
-    <string name="map_subDescription">miðun: %1$s° fjarlægð: %2$s</string>
+    <string name="map_download_errors">Niðurhali lauk með %d villum</string>
+    <string name="map_cache_tiles">%d reitar</string>
+    <string name="map_subDescription">miðun: %1$d° fjarlægð: %2$s</string>
     <string name="waypoint_edit">Breyta leiðarpunkti</string>
     <string name="waypoint_delete">Eyða leiðarpunkti?</string>
     <string name="waypoint_new">Nýr leiðarpunktur</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c105842d9..1560cb452 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -157,9 +157,9 @@
     <string name="map_purge_fail">Eliminazione della cache SQL non riuscita, vedere logcat per i dettagli</string>
     <string name="map_cache_manager">Gestione della cache</string>
     <string name="map_download_complete">Scaricamento completato!</string>
-    <string name="map_download_errors">Download completo con %s errori</string>
-    <string name="map_cache_tiles">%s tiles</string>
-    <string name="map_subDescription">bearing: %1$s° distance: %2$s</string>
+    <string name="map_download_errors">Download completo con %d errori</string>
+    <string name="map_cache_tiles">%d tiles</string>
+    <string name="map_subDescription">bearing: %1$d° distance: %2$s</string>
     <string name="waypoint_edit">Modifica waypoint</string>
     <string name="waypoint_delete">Elimina waypoint?</string>
     <string name="waypoint_new">Nuovo waypoint</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d3a59955c..2aee8992d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -156,9 +156,9 @@
     <string name="map_purge_fail">SQL キャッシュの削除が失敗しました。詳細は logcat を参照してください。</string>
     <string name="map_cache_manager">キャッシュ管理</string>
     <string name="map_download_complete">ダウンロード完了！</string>
-    <string name="map_download_errors">ダウンロード完了、%sのエラーがあります。</string>
-    <string name="map_cache_tiles">%s タイル</string>
-    <string name="map_subDescription">方位: %1$s°距離: %2$s</string>
+    <string name="map_download_errors">ダウンロード完了、%dのエラーがあります。</string>
+    <string name="map_cache_tiles">%d タイル</string>
+    <string name="map_subDescription">方位: %1$d°距離: %2$s</string>
     <string name="waypoint_edit">ウェイポイントを編集</string>
     <string name="waypoint_delete">ウェイポイントを削除しますか？</string>
     <string name="waypoint_new">新規ウェイポイント</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 283545271..0c33c76c4 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -150,7 +150,7 @@
     <string name="map_purge_fail">SQL 캐시 제거 실패, 자세한 내용은 logcat 참조</string>
     <string name="map_cache_manager">캐시 관리자</string>
     <string name="map_download_complete">다운로드 완료!</string>
-    <string name="map_download_errors">%s 에러로 다운로드 완료되지 않았습니다.</string>
-    <string name="map_cache_tiles">%s 타일</string>
-    <string name="map_subDescription">방위: %1$s° 거리: %2$s</string>
+    <string name="map_download_errors">%d 에러로 다운로드 완료되지 않았습니다.</string>
+    <string name="map_cache_tiles">%d 타일</string>
+    <string name="map_subDescription">방위: %1$d° 거리: %2$s</string>
 </resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index ed3338090..2c5a21fb4 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -151,7 +151,7 @@
     <string name="map_purge_fail">SQL Cache purge failed, see logcat for details</string>
     <string name="map_cache_manager">Cache Manager</string>
     <string name="map_download_complete">Download complete!</string>
-    <string name="map_download_errors">Download complete with %s errors</string>
-    <string name="map_cache_tiles">%s tiles</string>
-    <string name="map_subDescription">bearing: %1$s° distance: %2$s</string>
+    <string name="map_download_errors">Download complete with %d errors</string>
+    <string name="map_cache_tiles">%d tiles</string>
+    <string name="map_subDescription">bearing: %1$d° distance: %2$s</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 28c3fe753..23a652f62 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -161,9 +161,9 @@
     <string name="map_purge_fail">Usuwanie pamięci podręcznej nie powiodło się, zobacz logcat</string>
     <string name="map_cache_manager">Zarządzanie pamięcią podręczną</string>
     <string name="map_download_complete">Pobieranie ukończone!</string>
-    <string name="map_download_errors">Pobieranie zakończone z %s błędami</string>
-    <string name="map_cache_tiles">%s mapy</string>
-    <string name="map_subDescription">kierunek: %1$s° odległość: %2$s</string>
+    <string name="map_download_errors">Pobieranie zakończone z %d błędami</string>
+    <string name="map_cache_tiles">%d mapy</string>
+    <string name="map_subDescription">kierunek: %1$d° odległość: %2$s</string>
     <string name="waypoint_edit">Edytuj punkt nawigacji</string>
     <string name="waypoint_delete">Usuń punkt nawigacji?</string>
     <string name="waypoint_new">Nowy punkt nawigacyjny</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 7bdb3a366..623a80a6d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -157,9 +157,9 @@
     <string name="map_purge_fail">Falha na remoção do cache SQL, consulte logcat para obter detalhes</string>
     <string name="map_cache_manager">Gerenciador de cache</string>
     <string name="map_download_complete">Download concluído!</string>
-    <string name="map_download_errors">Download concluído com %s erros</string>
-    <string name="map_cache_tiles">%s blocos</string>
-    <string name="map_subDescription">direção: %1$s° distância: %2$s</string>
+    <string name="map_download_errors">Download concluído com %d erros</string>
+    <string name="map_cache_tiles">%d blocos</string>
+    <string name="map_subDescription">direção: %1$d° distância: %2$s</string>
     <string name="waypoint_edit">Editar ponto de referência</string>
     <string name="waypoint_delete">Excluir ponto de referência?</string>
     <string name="waypoint_new">Novo ponto de referência</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0b4fcd9c5..6415eb29e 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -157,9 +157,9 @@
     <string name="map_purge_fail">Falha na remoção do cache SQL, consulte logcat para obter detalhes</string>
     <string name="map_cache_manager">Gerenciador de cache</string>
     <string name="map_download_complete">Download concluído!</string>
-    <string name="map_download_errors">Download concluído com %s erros</string>
-    <string name="map_cache_tiles">%s blocos</string>
-    <string name="map_subDescription">direção: %1$s° distância: %2$s</string>
+    <string name="map_download_errors">Download concluído com %d erros</string>
+    <string name="map_cache_tiles">%d blocos</string>
+    <string name="map_subDescription">direção: %1$d° distância: %2$s</string>
     <string name="waypoint_edit">Editar ponto de referência</string>
     <string name="waypoint_delete">Apagar o ponto de referência?</string>
     <string name="waypoint_new">Novo ponto de referência</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 67d195af6..ed52876cc 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -161,9 +161,9 @@
     <string name="map_purge_fail">Ошибка очистки кэша SQL, подробности в logcat</string>
     <string name="map_cache_manager">Менеджер кэша</string>
     <string name="map_download_complete">Загрузка завершена!</string>
-    <string name="map_download_errors">Скачивание завершено с %s ошибок</string>
-    <string name="map_cache_tiles">%s файла</string>
-    <string name="map_subDescription">курс: %1$s° расстояние: %2$s</string>
+    <string name="map_download_errors">Скачивание завершено с %d ошибок</string>
+    <string name="map_cache_tiles">%d файла</string>
+    <string name="map_subDescription">курс: %1$d° расстояние: %2$s</string>
     <string name="waypoint_edit">Редактировать путевую точку</string>
     <string name="waypoint_delete">Удалить путевую точку?</string>
     <string name="waypoint_new">Установить путевую точку</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a9d93fb5a..f42a1e612 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -159,9 +159,9 @@
     <string name="map_purge_fail">Помилка очищення кешу SQL, перегляньте logcat для деталей</string>
     <string name="map_cache_manager">Керування кешем</string>
     <string name="map_download_complete">Звантаження завершено!</string>
-    <string name="map_download_errors">Завантаження завершено з %s помилками</string>
-    <string name="map_cache_tiles">%s плиток</string>
-    <string name="map_subDescription">прийом: %1$s° відстань: %2$s</string>
+    <string name="map_download_errors">Завантаження завершено з %d помилками</string>
+    <string name="map_cache_tiles">%d плиток</string>
+    <string name="map_subDescription">прийом: %1$d° відстань: %2$s</string>
     <string name="waypoint_edit">Редагувати точку</string>
     <string name="waypoint_delete">Видалити мітку?</string>
     <string name="waypoint_new">Новий мітка</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 9f0a6e116..36b7b924d 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -156,9 +156,9 @@
     <string name="map_purge_fail">清除 SQL 快取失败，请查看 logcat 纪录</string>
     <string name="map_cache_manager">缓存管理员</string>
     <string name="map_download_complete">下载已完成！</string>
-    <string name="map_download_errors">下载完成，但有 %s 个错误</string>
-    <string name="map_cache_tiles">%s 图砖</string>
-    <string name="map_subDescription">方位：%1$s° 距离：%2$s</string>
+    <string name="map_download_errors">下载完成，但有 %d 个错误</string>
+    <string name="map_cache_tiles">%d 图砖</string>
+    <string name="map_subDescription">方位：%1$d° 距离：%2$s</string>
     <string name="waypoint_edit">编辑航点</string>
     <string name="waypoint_delete">删除航点?</string>
     <string name="waypoint_new">新建航点</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 409ca27e6..5448f4d41 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -171,9 +171,9 @@
     <string name="map_purge_fail">SQL Cache purge failed, see logcat for details</string>
     <string name="map_cache_manager">Cache Manager</string>
     <string name="map_download_complete">Download complete!</string>
-    <string name="map_download_errors">Download complete with %s errors</string>
-    <string name="map_cache_tiles">%s tiles</string>
-    <string name="map_subDescription">bearing: %1$s° distance: %2$s</string>
+    <string name="map_download_errors">Download complete with %d errors</string>
+    <string name="map_cache_tiles">%d tiles</string>
+    <string name="map_subDescription">bearing: %1$d° distance: %2$s</string>
     <string name="waypoint_edit">Edit waypoint</string>
     <string name="waypoint_delete">Delete waypoint?</string>
     <string name="waypoint_new">New waypoint</string>