Rename beacons to locations on triangulate tool

#1966
kylecorry31 · Oct 12, 2023 · e447b05 · e447b05
1 parent 88de8a7
commit e447b05
Show file tree

Hide file tree

Showing 28 changed files with 3 additions and 55 deletions.
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/triangulate/ui/FragmentToolTriangulate.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/triangulate/ui/FragmentToolTriangulate.kt
@@ -188,7 +188,7 @@ class FragmentToolTriangulate : BoundFragment<FragmentToolTriangulateBinding>()
             formatService.formatDistance(it, Units.getDecimalPlaces(it.units))
         }
         return buildSpannedString {
-            append(getString(if (locationIdx == 1) R.string.beacon_1 else R.string.beacon_2))
+            append(getString(R.string.location_number, locationIdx))
             if (distance != null) {
                 appendLine()
                 scale(0.75f) {

diff --git a/app/src/main/res/layout/fragment_tool_triangulate.xml b/app/src/main/res/layout/fragment_tool_triangulate.xml
@@ -88,7 +88,6 @@
                     android:layout_weight="1"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
-                    android:text="@string/beacon_1"
                     app:drawableStartCompat="@drawable/ic_info"
                     app:drawableTint="?android:textColorSecondary" />
 
@@ -154,7 +153,6 @@
                     android:layout_weight="1"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
-                    android:text="@string/beacon_2"
                     app:drawableStartCompat="@drawable/ic_info"
                     app:drawableTint="?android:textColorSecondary" />
 

diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
@@ -371,8 +371,6 @@
     <string name="notification_channel_clock_sync">Sinkronizacija Sata</string>
     <string name="pip_notification_scheduled">Obavijest zakazana za %s</string>
     <string name="pip_button">Ažurirajte Sistemsko Vrijeme</string>
-    <string name="beacon_2">Svjetionik 2</string>
-    <string name="beacon_1">Svjetionik 1</string>
     <string name="could_not_triangulate">Nije moguće trouglirati</string>
     <string name="tool_triangulate_summary">Odredite svoju lokaciju bez GPS-a</string>
     <string name="tool_triangulate_title">Trouglite Svoju Poziciju</string>

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
@@ -275,11 +275,9 @@
     <string name="tool_category_angles">Angles</string>
     <string name="tool_category_signaling">Senyalització</string>
     <string name="tool_triangulate_summary">Determineu la vostra ubicació sense GPS</string>
-    <string name="beacon_2">Balisa 2</string>
     <string name="could_not_triangulate">No s\'ha pogut triangular</string>
     <string name="clock_sync_instructions">Establiu l\'hora a %s quan arribi la notificació</string>
     <string name="threshold">Llindar</string>
-    <string name="beacon_1">Balisa 1</string>
     <string name="unit_kilometers">Quilòmetres</string>
     <string name="tool_solar_panel_summary">Col·loqueu plaques solars per una producció òptima d’energia</string>
     <string name="unit_inches">Polzades</string>

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -424,8 +424,6 @@
     <string name="one">1</string>
     <string name="tool_battery_title">Baterie</string>
     <string name="battery_health_cold">Chladná</string>
-    <string name="beacon_1">Maják 1</string>
-    <string name="beacon_2">Maják 2</string>
     <string name="magnetic_field_format_precise">%s uT</string>
     <string name="could_not_triangulate">Nepodařilo se triangulovat</string>
     <string name="tool_category_signaling">Signalizace</string>

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
@@ -681,8 +681,6 @@
     <string name="create_at_distance">Opret på afstand</string>
     <string name="guide_location_no_gps_title">Bestem placering uden GPS</string>
     <string name="pref_backtrack_enabled_summary">Noter placeringshistorik</string>
-    <string name="beacon_1">Beacon 1</string>
-    <string name="beacon_2">Beacon 2</string>
     <string name="map_fractional_separator">:</string>
     <string name="map_scale_verbal">Verbal</string>
     <string name="waypoint_time_format">%1$s, %2$s</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -296,8 +296,6 @@
     <string name="threshold">Schwellenwert</string>
     <string name="clock_sync_time_settings">Einstellungen zur Zeit öffnen\?</string>
     <string name="notification_channel_clock_sync_description">Eine Benachrichtigung, um die Uhr mit der GPS-Zeit zu synchronisieren</string>
-    <string name="beacon_2">Wegpunkt 2</string>
-    <string name="beacon_1">Wegpunkt 1</string>
     <string name="tool_triangulate_title">Standort mittels Triangulation bestimmen</string>
     <string name="tool_category_signaling">Signalisieren</string>
     <string name="power">Energie</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -566,8 +566,6 @@
     <string name="tool_triangulate_title">Triangular Ubicación</string>
     <string name="tool_triangulate_summary">Determinar tu ubicación sin GPS</string>
     <string name="could_not_triangulate">No se pudo triangular</string>
-    <string name="beacon_1">Baliza 1</string>
-    <string name="beacon_2">Baliza 2</string>
     <string name="pip_button">Actualizar el reloj del sistema</string>
     <string name="pip_notification_scheduled">Notificacion programada para las %s</string>
     <string name="notification_channel_clock_sync">Sincronización del Reloj</string>

diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
@@ -245,8 +245,6 @@
     <string name="delete_note_title">Oharra ezabatu\?</string>
     <string name="notes_empty_text">Oharrik ez</string>
     <string name="tool_metal_detector_title">Metal-detektagailua</string>
-    <string name="beacon_2">2 baliza</string>
-    <string name="beacon_1">1 baliza</string>
     <string name="tool_triangulate_title">Kokapena triangulatu</string>
     <string name="battery_health">Osasuna: %s</string>
     <string name="precise_inches_format">%s in</string>

diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
@@ -503,7 +503,6 @@
     <string name="dialog_leave">Lähde</string>
     <string name="allow_schedule_exact_alarms">Salli %s asettaa hälytyksiä ja muistutuksia</string>
     <string name="max_temp_uncalibrated">Puhelimen maksimilämpötila (kalibroimaton)</string>
-    <string name="beacon_1">Majakka 1</string>
     <string name="daylight">Päivänvalo</string>
     <string name="qr_code">QR koodi</string>
     <string name="us_ounces_volume">Yhdysvaltain unssia</string>
@@ -515,7 +514,6 @@
     <string name="qr_code_scanner">QR-koodinlukija</string>
     <string name="notifications_channel">Ilmoitukset (%s)</string>
     <string name="unit_feet">Jalat</string>
-    <string name="beacon_2">Majakka 2</string>
     <string name="peak_time">Huippu</string>
     <string name="base_temperature">Peruslämpötila</string>
     <string name="square">Neliö</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -310,8 +310,6 @@
     <string name="notification_channel_clock_sync">Synchronisation de l\'horloge</string>
     <string name="pip_notification_scheduled">Notification planifiée pour %s</string>
     <string name="pip_button">Mettre à jour l\'horloge du téléphone</string>
-    <string name="beacon_2">Marqueur №2</string>
-    <string name="beacon_1">Marqueur №1</string>
     <string name="could_not_triangulate">Impossible d\'effectuer la triangulation</string>
     <string name="tool_triangulate_title">Triangulation</string>
     <string name="tool_category_signaling">Signalisation</string>

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
@@ -697,7 +697,6 @@
     <string name="pip_button">Rendszer Órájának Frissítése</string>
     <string name="notification_channel_clock_sync_description">Egy értesítés az órád GPS-hez való szinkronizálásához</string>
     <string name="clock_sync_notification">Óra Szinkronizálás - %s</string>
-    <string name="beacon_1">1. Jelzőpont</string>
     <string name="clock_sync_time_settings">Megnyitod az óra beállításokat\?</string>
     <string name="magnetic_field_format_precise">%s uT</string>
     <string name="clock_sync_instructions">Állítsd az órát %s időpontra, mikor megkapod az értesítést</string>
@@ -830,7 +829,6 @@
     <string name="turn_off">Kikapcsolás</string>
     <string name="units_mmhg">mmHg</string>
     <string name="beacon_qr_import_instructions">Olvass be egy QR kódot az importáláshoz</string>
-    <string name="beacon_2">2. Jelzőpont</string>
     <string name="pref_max_beacon_distance_title">Közeli jelzőpontok hatósugara</string>
     <string name="beacon_export_error">Nem lehet exportálni a jelzőpontokat</string>
     <string name="navigation_guide_description">Jelzőpontok és ösvények használatával</string>

diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
@@ -497,8 +497,6 @@
     <string name="pref_privacy_policy_title">Kebijakan privasi</string>
     <string name="water_boil_timer_done_content">Air Anda sekarang dapat diminum</string>
     <string name="could_not_triangulate">Tidak bisa melakukan triangulasi</string>
-    <string name="beacon_1">Suar 1</string>
-    <string name="beacon_2">Suar 2</string>
     <string name="how">Bagaimana</string>
     <string name="privacy_and_location">Privasi dan Lokasi</string>
     <string name="export">Ekspor</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -223,8 +223,6 @@
     <string name="notification_channel_clock_sync">Sincronizzazione orologio</string>
     <string name="pip_notification_scheduled">Notifica schedulata per %s</string>
     <string name="pip_button">Aggiorna l’orologio di sistema</string>
-    <string name="beacon_2">Segnaposto 2</string>
-    <string name="beacon_1">Segnaposto 1</string>
     <string name="could_not_triangulate">Triangolazione non possibile</string>
     <string name="tool_triangulate_summary">Determina la posizione senza GPS</string>
     <string name="tool_triangulate_title">Triangolazione della posizione</string>

diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
@@ -283,7 +283,6 @@
         <item quantity="many">%d נקודות ציון נמחקו</item>
         <item quantity="other">%d נקודות ציון נמחקו</item>
     </plurals>
-    <string name="beacon_2">משואה 2</string>
     <plurals name="paths_imported">
         <item quantity="one">נתיב אחד יובא</item>
         <item quantity="two">%d נתבים יובאו</item>
@@ -925,7 +924,6 @@
         <item quantity="other">%d גאויות ושפל</item>
     </plurals>
     <string name="elevation_from_pressure">הגדרת עקיפה מברומטר</string>
-    <string name="beacon_1">משואה 1</string>
     <string name="pref_require_satellites_description">דורש לפחות 4 לוויינים, משפר את הדיוק</string>
     <string name="cirrus">ענן נוצות</string>
     <string name="place_beacon_at">למקם משואה ב-%s\?</string>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -162,8 +162,6 @@
     <string name="miles_per_hour_format">%.1f mph</string>
     <string name="kilometers_per_hour_format">%.1f km/h</string>
     <string name="update_30_minutes">30分</string>
-    <string name="beacon_2">ビーコン2</string>
-    <string name="beacon_1">ビーコン1</string>
     <string name="network_3g">3G</string>
     <string name="network_2g">2G</string>
     <string name="network_4g">4G</string>

diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
@@ -535,8 +535,6 @@
     </plurals>
     <string name="create_beacon">Opprett navigeringsmarkør</string>
     <string name="pref_map_url_source_title">Posisjonsdelingskart</string>
-    <string name="beacon_2">Markør 2</string>
-    <string name="beacon_1">Markør 1</string>
     <string name="delete_beacon_group_message">%s og alle tilhørende navigeringsmarkører blir slettet.</string>
     <string name="pref_max_beacon_distance_title">Radius for navigeringsmarkører i nærheten</string>
     <string name="pref_display_multi_beacons_summary">Vis nærmeste navigeringsmarkører på kompasset</string>

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -315,8 +315,6 @@
     <string name="notification_channel_clock_sync">Kloksynchronisatie</string>
     <string name="pip_notification_scheduled">Melding gepland voor %s</string>
     <string name="pip_button">Systeemtijd bijwerken</string>
-    <string name="beacon_2">Baken 2</string>
-    <string name="beacon_1">Baken 1</string>
     <string name="could_not_triangulate">Driehoeksmeting mislukt</string>
     <string name="tool_triangulate_summary">Zonder gps je locatie bepalen</string>
     <string name="tool_triangulate_title">Driehoeksmeting</string>

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -267,8 +267,6 @@
     <string name="precise_centimeters_format">%s cm</string>
     <string name="guide_recommended_apps_description">Przydatne aplikacje w sytuacjach surwiwalowych</string>
     <string name="guide_weather_prediction_title">Przewidywanie pogody</string>
-    <string name="beacon_2">Punkt 2</string>
-    <string name="beacon_1">Punkt 1</string>
     <string name="tool_battery_title">Bateria</string>
     <string name="discharging_fast">Szybkie rozładowywanie (%s)</string>
     <string name="discharging_slow">Powolne rozładowywanie (%s)</string>

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -301,8 +301,6 @@
     <string name="notification_channel_clock_sync">Sincronização do relógio</string>
     <string name="pip_notification_scheduled">Notificação programada para %s</string>
     <string name="pip_button">Atualizar o tempo do sistema</string>
-    <string name="beacon_2">Ponto de orientação 2</string>
-    <string name="beacon_1">Ponto de orientação 1</string>
     <string name="could_not_triangulate">Não foi possível triangular</string>
     <string name="tool_triangulate_summary">Determinar sua localização sem GPS</string>
     <string name="tool_triangulate_title">Triangular localização</string>

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -115,8 +115,6 @@
     <string name="notification_channel_clock_sync">Sincronização do relógio</string>
     <string name="pip_notification_scheduled">Notificação programada para %s</string>
     <string name="pip_button">Atualizar o relógio do sistema</string>
-    <string name="beacon_2">Alfinete 2</string>
-    <string name="beacon_1">Alfinete 1</string>
     <string name="could_not_triangulate">Não foi possível triangular</string>
     <string name="tool_triangulate_summary">Determina a sua localização sem sinal GPS</string>
     <string name="tool_triangulate_title">Triangular localização</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -298,8 +298,6 @@
     <string name="notification_channel_clock_sync">Синхронизация часов</string>
     <string name="pip_notification_scheduled">Уведомление запланировано на %s</string>
     <string name="pip_button">Обновить системное время</string>
-    <string name="beacon_2">Маячок 2</string>
-    <string name="beacon_1">Маячок 1</string>
     <string name="could_not_triangulate">Не удалось выполнить триангуляцию</string>
     <string name="tool_triangulate_summary">Определите свое местоположение без GPS</string>
     <string name="tool_triangulate_title">Триангуляция местоположения</string>

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -162,8 +162,6 @@
     <string name="notification_channel_clock_sync_description">Saatinizi GPS zamanına senkronize etmek için bildirim</string>
     <string name="pip_notification_scheduled">Bildirimler %s için planlandı</string>
     <string name="pip_button">Sistem Zamanını Güncelle</string>
-    <string name="beacon_2">İşaret 2</string>
-    <string name="beacon_1">İşaret 1</string>
     <string name="could_not_triangulate">Triangülasyon başarısız</string>
     <string name="tool_triangulate_summary">Konumunu GPS olmadan belirle</string>
     <string name="tool_triangulate_title">Konumu triangülasyon yöntemiyle belirle</string>

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -420,8 +420,6 @@
     <string name="notification_channel_clock_sync">Синхронізація годинника</string>
     <string name="pip_notification_scheduled">Сповіщення заплановано на %s</string>
     <string name="pip_button">Оновити системний час</string>
-    <string name="beacon_2">Маячок 2</string>
-    <string name="beacon_1">Маячок 1</string>
     <string name="could_not_triangulate">Не вдалося виконати тріангуляцію</string>
     <string name="tool_triangulate_summary">Визначення вашого місця без GPS</string>
     <string name="tool_triangulate_title">Тріангуляція місцеперебування</string>

diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml
@@ -437,12 +437,10 @@
     <string name="tool_category_angles">角度</string>
     <string name="battery_health_over_voltage">電壓過高</string>
     <string name="battery_health">狀況：%s</string>
-    <string name="beacon_1">地標 1</string>
     <string name="power">電源</string>
     <string name="tool_triangulate_title">三角定位</string>
     <string name="tool_triangulate_summary">唔用 GPS 之下斷定您嘅位置</string>
     <string name="could_not_triangulate">三角定位唔到</string>
-    <string name="beacon_2">地標 2</string>
     <string name="clock_sync_time_settings">係咪要開啟時間設定？</string>
     <string name="notification_channel_clock_sync_description">將您嘅時鐘同 GPS 時間同步嘅通知</string>
     <string name="clock_sync_notification">時鐘同步 - %s</string>

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -208,8 +208,6 @@
     <string name="clock_sync_time_settings">開啟時間設定？</string>
     <string name="clock_sync_notification">時鐘同步 - %s</string>
     <string name="pip_button">更新系統時間</string>
-    <string name="beacon_2">地標 2</string>
-    <string name="beacon_1">地標 1</string>
     <string name="clock_waiting_for_gps">自GPS更新時間…</string>
     <string name="water_purification_step_3">開始計時器</string>
     <string name="tool_lightning_title">閃電雷聲測距</string>

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -156,8 +156,6 @@
     <string name="notification_channel_clock_sync">时钟同步</string>
     <string name="pip_notification_scheduled">已经安排了对 %s 的通知</string>
     <string name="pip_button">更新系统时间</string>
-    <string name="beacon_2">信标 2</string>
-    <string name="beacon_1">信标 1</string>
     <string name="could_not_triangulate">无法进行三角定位</string>
     <string name="tool_triangulate_summary">在没有GPS的情况下确定你的位置</string>
     <string name="tool_triangulate_title">三角定位</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -450,8 +450,6 @@
     <string name="tool_triangulate_title">Triangulate Location</string>
     <string name="tool_triangulate_summary">Determine your location without GPS</string>
     <string name="could_not_triangulate">Could not triangulate</string>
-    <string name="beacon_1">Beacon 1</string>
-    <string name="beacon_2">Beacon 2</string>
     <string name="pip_button">Update System Time</string>
     <string name="pip_notification_scheduled">Notification scheduled for %s</string>
     <string name="notification_channel_clock_sync">Clock Sync</string>
@@ -1347,6 +1345,8 @@
     <string name="distance_away_from_self">%s away</string>
     <!--The distance away from the destination. Ex. 30 m from destination-->
     <string name="distance_away_from_destination">%s from destination</string>
+    <!--A numerically named location. Ex. Location 1-->
+    <string name="location_number">Location %d</string>
     <plurals name="map_group_summary">
         <item quantity="one">%d map</item>
         <item quantity="other">%d maps</item>