From 887c24cbb03963582575d02ebdf9084febc5084e Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Fri, 1 Mar 2024 23:52:02 +0100 Subject: [PATCH] Settings: separate recording settings (move GPS to sensors). --- ...nt.java => RecordingSettingsFragment.java} | 30 ++------------ .../settings/SensorsSettingsFragment.java | 40 +++++++++++++++++++ .../opentracks/settings/SettingsActivity.java | 2 +- src/main/res/values-b+es+419/strings.xml | 4 +- src/main/res/values-cs/strings.xml | 4 +- src/main/res/values-da/strings.xml | 4 +- src/main/res/values-de/strings.xml | 4 +- src/main/res/values-es/strings.xml | 4 +- src/main/res/values-et/strings.xml | 4 +- src/main/res/values-eu/strings.xml | 3 +- src/main/res/values-fi/strings.xml | 4 +- src/main/res/values-fr/strings.xml | 4 +- src/main/res/values-ga/strings.xml | 4 +- src/main/res/values-gl/strings.xml | 4 +- src/main/res/values-hr/strings.xml | 4 +- src/main/res/values-hu/strings.xml | 4 +- src/main/res/values-in/strings.xml | 4 +- src/main/res/values-it/strings.xml | 4 +- src/main/res/values-kn/strings.xml | 2 +- src/main/res/values-nb/strings.xml | 4 +- src/main/res/values-nl/strings.xml | 4 +- src/main/res/values-pl/strings.xml | 4 +- src/main/res/values-pt-rBR/strings.xml | 4 +- src/main/res/values-pt-rPT/strings.xml | 4 +- src/main/res/values-pt/strings.xml | 4 +- src/main/res/values-ru/strings.xml | 4 +- src/main/res/values-sk/strings.xml | 4 +- src/main/res/values-sl/strings.xml | 2 +- src/main/res/values-tr/strings.xml | 4 +- src/main/res/values-uk/strings.xml | 4 +- src/main/res/values-vi/strings.xml | 4 +- src/main/res/values-zh-rTW/strings.xml | 2 +- src/main/res/values-zh/strings.xml | 2 +- src/main/res/values/strings.xml | 4 +- src/main/res/xml/settings.xml | 2 +- ...ettings_gps.xml => settings_recording.xml} | 14 +------ src/main/res/xml/settings_sensors.xml | 14 +++++++ 37 files changed, 117 insertions(+), 100 deletions(-) rename src/main/java/de/dennisguse/opentracks/settings/{GpsSettingsFragment.java => RecordingSettingsFragment.java} (61%) rename src/main/res/xml/{settings_gps.xml => settings_recording.xml} (63%) diff --git a/src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/RecordingSettingsFragment.java similarity index 61% rename from src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java rename to src/main/java/de/dennisguse/opentracks/settings/RecordingSettingsFragment.java index bcf0d1394..83fc5aac0 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/settings/RecordingSettingsFragment.java @@ -5,17 +5,15 @@ import android.os.Bundle; import androidx.preference.ListPreference; import androidx.preference.PreferenceFragmentCompat; -import java.time.Duration; - import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.DistanceFormatter; -public class GpsSettingsFragment extends PreferenceFragmentCompat { +public class RecordingSettingsFragment extends PreferenceFragmentCompat { @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - addPreferencesFromResource(R.xml.settings_gps); + addPreferencesFromResource(R.xml.settings_recording); UnitSystem unitSystem = PreferencesUtils.getUnitSystem(); @@ -39,46 +37,24 @@ public class GpsSettingsFragment extends PreferenceFragmentCompat { return getString(R.string.settings_recording_max_recording_distance_summary, formatter.formatDistance(distance)); } ); - - findPreference(getString(R.string.recording_gps_accuracy_key)) - .setSummaryProvider( - preference -> { - Distance distance = PreferencesUtils.getThresholdHorizontalAccuracy(); - return getString(R.string.settings_recording_min_required_accuracy_summary, formatter.formatDistance(distance)); - } - ); - - findPreference(getString(R.string.min_sampling_interval_key)) - .setSummaryProvider( - preference -> { - Duration interval = PreferencesUtils.getMinSamplingInterval(); - return getString(R.string.settings_recording_location_frequency_summary, getString(R.string.value_integer_second, interval.getSeconds())); - } - ); } @Override public void onStart() { super.onStart(); - ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_gps_title); + ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_recording_title); } @Override public void onResume() { super.onResume(); - ListPreference minSamplingInterval = findPreference(getString(R.string.min_sampling_interval_key)); - minSamplingInterval.setEntries(PreferencesUtils.getMinSamplingIntervalEntries()); - ListPreference recordingDistanceInterval = findPreference(getString(R.string.recording_distance_interval_key)); recordingDistanceInterval.setEntries(PreferencesUtils.getRecordingDistanceIntervalEntries()); ListPreference maxRecordingDistance = findPreference(getString(R.string.max_recording_distance_key)); maxRecordingDistance.setEntries(PreferencesUtils.getMaxRecordingDistanceEntries()); - ListPreference recordingGpsAccuracy = findPreference(getString(R.string.recording_gps_accuracy_key)); - recordingGpsAccuracy.setEntries(PreferencesUtils.getThresholdHorizontalAccuracyEntries()); - ListPreference idleDuration = findPreference(getString(R.string.idle_duration_key)); idleDuration.setEntries(PreferencesUtils.getIdleDurationEntries()); } diff --git a/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java index 22629c6e2..8a04fd3bc 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java @@ -7,10 +7,15 @@ import android.widget.Toast; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentActivity; import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; +import java.time.Duration; + import de.dennisguse.opentracks.R; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.DistanceFormatter; import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeSensorPreference; import de.dennisguse.opentracks.util.PermissionRequester; @@ -22,6 +27,29 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat { public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.settings_sensors); setWheelCircumferenceInputFilter(); + + UnitSystem unitSystem = PreferencesUtils.getUnitSystem(); + + final DistanceFormatter formatter = DistanceFormatter.Builder() + .setDecimalCount(0) + .setUnit(unitSystem) + .build(getContext()); + + findPreference(getString(R.string.recording_gps_accuracy_key)) + .setSummaryProvider( + preference -> { + Distance distance = PreferencesUtils.getThresholdHorizontalAccuracy(); + return getString(R.string.settings_recording_min_required_accuracy_summary, formatter.formatDistance(distance)); + } + ); + + findPreference(getString(R.string.min_sampling_interval_key)) + .setSummaryProvider( + preference -> { + Duration interval = PreferencesUtils.getMinSamplingInterval(); + return getString(R.string.settings_recording_location_frequency_summary, getString(R.string.value_integer_second, interval.getSeconds())); + } + ); } @Override @@ -30,6 +58,18 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat { ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_sensors_title); } + + @Override + public void onResume() { + super.onResume(); + + ListPreference minSamplingInterval = findPreference(getString(R.string.min_sampling_interval_key)); + minSamplingInterval.setEntries(PreferencesUtils.getMinSamplingIntervalEntries()); + + ListPreference recordingGpsAccuracy = findPreference(getString(R.string.recording_gps_accuracy_key)); + recordingGpsAccuracy.setEntries(PreferencesUtils.getThresholdHorizontalAccuracyEntries()); + } + @Override public void onDisplayPreferenceDialog(Preference preference) { if (preference instanceof BluetoothLeSensorPreference) { diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java index 2f22e0d45..4d2ddbdd5 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java @@ -85,7 +85,7 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity } else if (key.equals(getString(R.string.settings_ui_key))) { fragment = new UserInterfaceSettingsFragment(); } else if (key.equals(getString(R.string.settings_gps_key))) { - fragment = new GpsSettingsFragment(); + fragment = new RecordingSettingsFragment(); } else if (key.equals(getString(R.string.settings_sensors_key))) { fragment = new SensorsSettingsFragment(); } else if (key.equals(getString(R.string.settings_announcements_key))) { diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml index f90e83ec1..7bbe9c904 100644 --- a/src/main/res/values-b+es+419/strings.xml +++ b/src/main/res/values-b+es+419/strings.xml @@ -431,9 +431,9 @@ Ayer Filtrar Apariencia, Diseño de grabación, Tema - GPS + GPS Intervalo de tiempo, Intervalo de distancia, Distancia máxima, Precisión - Sensores Bluetooth + Sensores Sensores de ciclismo, Circunferencia de la rueda, Sensores de carrera Exportar Natación diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 246020f8a..9569384ad 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -482,13 +482,13 @@ limitations under the License. Import/Export Čas, vzdálenost, rychlost hlasu Hlasová oznámení - Bluetooth senzory + Senzory Časový interval, Interval vzdálenosti, Maximální vzdálenost, Přesnost Vzhled, Rozložení záznamu, Téma Vše o projektu OpenTracks Výchozí jednotky a aktivity Uživatelské rozhraní - GPS + GPS Zrušit Vyberte rozvržení Rozložení diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index 3cb751426..92aad2c7d 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -470,7 +470,7 @@ limitations under the License. Kan ikke skrive til eksportmappen. " (ikke skrivbar!)" Nyt layout - Bluetooth-sensorer + Sensorer Standardlayout Vælg layout Kører @@ -482,7 +482,7 @@ limitations under the License. Til Fra Brugergrænseflade - GPS + GPS Aktivitetens standardværdier Enheder Alle opsætningsindstillinger er blevet tilbageført til standardværdierne diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 635921ebf..3e38978cb 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -489,9 +489,9 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka GPS Wähle Layout Wähle eine Option - GPS + GPS Import/Export - Bluetooth Sensoren + Sensoren Fahrradsensoren, Radumfang und Lauf-Sensoren Sprachansagen Rückgängig diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 4f2a0de03..1572f9a5f 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -513,11 +513,11 @@ limitations under the License. Ayer Nuevo diseño Sensores de ciclismo, Circunferencia de la rueda, Sensores de carrera - Sensores Bluetooth + Sensores Intervalo de tiempo, Intervalo de distancia, Distancia máxima, Precisión Interfaz de usuario Apariencia, Diseño de grabación, Tema - GPS + GPS Avisos de voz Unidades Importar/Exportar diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml index ecb2c954b..cbfdbfb68 100644 --- a/src/main/res/values-et/strings.xml +++ b/src/main/res/values-et/strings.xml @@ -460,13 +460,13 @@ limitations under the License. Kasutajaliides Välimus, Salvestamise Paigutus, Teema Ajavahemik, vahemaa intervall, maksimaalne kaugus, täpsus - Bluetooth Andurid + Andurid Häälteated Aeg, Kaugus, Hääle Kiirus Ühikud Import, Eksport, Automaatne Eksport Import/Eksport - GPS + GPS Kõik OpenTracks Projekti Kohta Lähtestage Seaded vaikeväärtustele Kohandage oma salvestuspaigutust diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 6c9e6b5a1..590dc8df5 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -468,7 +468,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O Erlojua %1$.1f mi/h %1$.1f mi/h (gomendatua) - Bluetooth Denbora-tartea, Distantzia-tartea, Gehienezko Distantzia, Zehaztasuna Ahots Iragarkiak Denbora, Distantzia, Ahotsaren Abiadura @@ -492,7 +491,7 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O Sistema-ezarpenetan Gertuko Gailuetarako Opentestrak sarbidea eskuz eman behar duzu. Diseinuaren ezarpen guztiak balio lehenetsietara itzuliko dira. Honek ez du gailuko pistarik ezabatuko. Eskatutako zerbitzuak iragartzen dituzten Bluetooth gailuak soilik erakutsi - GPS + GPS Guztiak Options Proiektuaren Unitate eta Jarduera lehenetsiak Unitate Hobetsia, Jarduera Lehenetsia, Pistaren Izen Lehenetsia diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 9c9e9f282..ae37475e1 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -462,8 +462,8 @@ limitations under the License. Poista Uusi asettelu Ulkonäkö, asettelu, teema - GPS - Bluetooth-anturit + GPS + Anturit Tuonti/Vienti Nimeä luotava asettelu Samanniminen asettelu on jo olemassa diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 28129daa4..60676a924 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -520,9 +520,9 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio Importez/Exportez Temps, distance, vitesse de la voix Annonces vocales - Capteurs Bluetooth + Capteurs Intervalle de temps, Intervalle de distance, Distance maximale, Précision - GPS + GPS Interface utilisateur Unités préférées, Activité par défaut, Suivi du nom par défaut Unités et activité par défaut diff --git a/src/main/res/values-ga/strings.xml b/src/main/res/values-ga/strings.xml index 495dfc18f..d44871b85 100644 --- a/src/main/res/values-ga/strings.xml +++ b/src/main/res/values-ga/strings.xml @@ -205,7 +205,7 @@ Gach Maidir Tionscadal OpenTracks Aonaid agus Gníomhaíocht Réamhshocraithe Comhéadan Úsáideora - Braiteoirí Bluetooth + Braiteoirí Am, Fad, Luas Gutha Iompórtáil/Easpórtáil Iompórtáil, Easpórtáil, Uathoibríoch @@ -385,7 +385,7 @@ Mál (rpm ) GPS Stad - GPS + GPS API Poiblí Ainm an phacáiste don API Poiblí API Poiblí diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 1bf387fe6..34963c454 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -481,9 +481,9 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele Unidades e Actividade por defecto Interface da app Aparencia, Gravación, Deseño, Tema - GPS + GPS Intervalo de tempo, Distancia intervalo, Max Distancia, Precisión - Sensores Bluetooth + Sensores Sensores de ciclismo, Circunferencia da roda, Sensores de carreira Indicacións por Voz Importación/Exportación diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml index 448d55c52..811d925d1 100644 --- a/src/main/res/values-hr/strings.xml +++ b/src/main/res/values-hr/strings.xml @@ -320,7 +320,7 @@ limitations under the License. OpenTracks zahtijeva dozvolu za korištenje Bluetootha. OpenTracksu moraš ručno dozvoliti pristup obližnjim uređajima u postavkama sustava. Novi raspored - Bluetooth senzori + Senzori Filtar Tijekom snimanja ostavi ekran uključenim. Uvoz, Izvoz, Automatski izvoz @@ -330,7 +330,7 @@ limitations under the License. Maks. ritam Jedinice Sve o projektu OpenTracks - GPS + GPS Vrijeme, udaljenost, brzina glasa Nastavi rutu Izgled, raspored snimanja, tema diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index d67c2183b..ad73e2988 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -456,7 +456,7 @@ limitations under the License. Felhasználói felület Megjelenés, felvétel elrendezése, téma Időintervallum, távolságintervallum, max. távolság, pontosság - Bluetooth érzékelők + érzékelők Elvetés Kerékpáros érzékelők, kerékkörfogat, futásérzékelők Statisztikai közlemények @@ -568,7 +568,7 @@ limitations under the License. Elrendezés kiválasztása Kör hossza Körsebesség/tempó - GPS + GPS {n,number,#.0} tengeri mérföld Nincs kompatibilis képgaléria alkalmazás telepítve GPS diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml index 6ab21cece..7d0053667 100644 --- a/src/main/res/values-in/strings.xml +++ b/src/main/res/values-in/strings.xml @@ -302,8 +302,8 @@ Impor, Ekspor, Ekspor Otomatis Tenaga Maks Antarmuka Pengguna - Sensor Bluetooth - GPS + Sensor + GPS Default Aktivitas Penampilan, Tata letak perekaman, Tema Pengumuman Statistik diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index e0b6d6813..3fd5265e8 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -478,9 +478,9 @@ Infatti, un\'applicazione deve supportare ACTION_VIEW con MIME applica Tutto a proposito del progetto OpenTracks Interfaccia Utente Aspetto, Layout durante la registrazione, Tema - GPS + GPS Intervallo di tempo, Intervallo di distanza, Massima Distanza, Precisione - Sensori Bluetooth + Sensori Annunci Vocali Tempo, Distanza, Velocità della Voce Importa/Esporta diff --git a/src/main/res/values-kn/strings.xml b/src/main/res/values-kn/strings.xml index 157b9aa55..251790cee 100644 --- a/src/main/res/values-kn/strings.xml +++ b/src/main/res/values-kn/strings.xml @@ -255,7 +255,7 @@ ಆದ್ಯತೆಯ ಘಟಕಗಳು, ಡೀಫಾಲ್ಟ್ ಚಟುವಟಿಕೆ, ಡೀಫಾಲ್ಟ್ ಟ್ರ್ಯಾಕ್ ಹೆಸರು ಬಳಕೆದಾರರ ಇಂಟರ್ಫೇಸ್ ಗೋಚರತೆ, ರೆಕಾರ್ಡಿಂಗ್ ಲೇಔಟ್, ಥೀಮ್ - GPS + GPS ಸಮಯದ ಮಧ್ಯಂತರ, ದೂರದ ಮಧ್ಯಂತರ, ಗರಿಷ್ಠ ದೂರ, ನಿಖರತೆ ಬ್ಲೂಟೂತ್ ಸಂವೇದಕಗಳು ಸೈಕ್ಲಿಂಗ್ ಸಂವೇದಕಗಳು, ಚಕ್ರದ ಸುತ್ತಳತೆ, ಓಟದ ಸಂವೇದಕಗಳು diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index 14e7ed618..4644f28ba 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -474,9 +474,9 @@ limitations under the License. Forvalgsenheter og aktivitet Brukerflate Utseende, opptakstilpasning, drakt - GPS + GPS Tidsintervall, distanseintervall, maks, distanse, nøyaktighet - Blåtannssensorer + Sensorer Statistikkmeldinger Tid, distanse, talehastighet Import/eksport diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index c24f92f5b..0949f738a 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -490,7 +490,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid %1$s° %1$s, %2$s %1$.1f km/u (aanbevolen) - GPS + GPS Geen schrijfrecht in export map. Maak een keuze OpenTracks heeft toestemming nodig om Bluetooth te gebruiken. @@ -522,7 +522,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid Standaard Eenheden en Activiteit Voorkeurslengtemaat, standaardactiviteit, standaardroutenaam Tijdsinterval, afstandsinterval, maximale afstand, nauwkeurigheid - Bluetooth sensoren + Sensoren Fiets sensoren, wielomtrek, loop sensoren Gesproken berichten Lay-outs diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index c52e7627b..8e44ba505 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -464,8 +464,8 @@ limitations under the License. Należy manualnie zezwolić OpenTracks na dostęp do Najbliższych Urządzeń w ustawieniach. %1$.1f km/h Wygląd, Układ ekranu śledzenia, Motyw - GPS - Czujnik Bluetooth + GPS + Czujnik Czujniki rowerowe, Obwód koła, Czujniki biegowe Wiadomości głosowe Czas, Dystans, Głos prędkości diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 200c87e14..6e112cf0c 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -423,13 +423,13 @@ Relógio Anúncios de voz Voice announcements - Sensores Bluetooth + Sensores Intervalo de tempo, Intervalo de distância, Distância máxima, Precisão Aparência, Layout de gravação, Tema Interface do usuário Unidades e Atividade Default Unidades Preferidas, Atividade Padrão, Nome Padrão da Pista - GPS + GPS Redefinir configurações para valores padrão Defaults da atividade Unidades diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml index 159a3c6ca..9b48d4465 100644 --- a/src/main/res/values-pt-rPT/strings.xml +++ b/src/main/res/values-pt-rPT/strings.xml @@ -417,9 +417,9 @@ Unidades Preferidas, Atividade Padrão, Nome Padrão da Pista Interface do utilizador Aparência, Layout de gravação, Tema - GPS + GPS Intervalo de tempo, Intervalo de distância, Distância máxima, Precisão - Sensores Bluetooth + Sensores Voice announcements Anúncios de voz Tempo, distância, velocidade da voz diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 3437b7d31..58b288c4c 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -449,10 +449,10 @@ limitations under the License. Tudo sobre o Projeto OpenTracks Unidades e Atividade Default Intervalo de tempo, Intervalo de distância, Distância máxima, Precisão - Sensores Bluetooth + Sensores Voice announcements Aparência, Layout de gravação, Tema - GPS + GPS Anúncios de voz Tempo, distância, velocidade da voz Importar/Exportar diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index a39eaec58..1cdbf815c 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -449,9 +449,9 @@ limitations under the License. Фильтр OpenTracks требуется разрешение на использование Bluetooth. Вам нужно вручную разрешить OpenTracks доступ к информации об устройствах поблизости в настройках системы. - GPS + GPS Интервал времени, интервал расстояния, макс. расстояние, точность - Bluetooth-датчики + датчики Велосипедные датчики, окружность колеса, датчики для бега Голосовые подсказки статистические Импорт/экспорт diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 50ee71661..168177656 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -477,8 +477,8 @@ limitations under the License. Používateľské rozhranie Vzhľad, Rozloženie nahrávania, Téma Hlasové oznámenia - GPS - Senzory Bluetooth + GPS + Senzory Cyklistické snímače, obvod kolies, snímače behu Viac o projekte OpenTracks Interval času, interval vzdialenosti, Max. vzdialenosť, Presnosť diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml index ee23db737..a183548da 100644 --- a/src/main/res/values-sl/strings.xml +++ b/src/main/res/values-sl/strings.xml @@ -404,7 +404,7 @@ limitations under the License. Ohranite zaslon vklopljen Časovni interval, Interval razdalje, Največja razdalja, Točnost Kolesarski senzorji, Obod kolesa, Tekaški senzorji - Bluetooth senzorji + Senzorji Prikaži statistiko na zaklenjenem zaslonu O OpenTracks brez fotografij diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 9fb8c2bf5..e3cf03545 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -358,7 +358,7 @@ limitations under the License. Ort. Kadans Maks. Kadans Görünüm, Kayıt Düzeni, Tema - GPS + GPS Tercih Edilen Birimler, Varsayılan Etkinlik, Varsayılan Parça Adı Zaman aralığı, Mesafe aralığı, Maks. Mesafe, Hassasiyet Sesli Anonslar @@ -379,7 +379,7 @@ limitations under the License. bütün çatışmalar için bunu uygula Geri al Galeri resmi ekle - Bluetooth Sensörleri + Sensörleri Bisiklet Sensörleri, Tekerlek Çevresi, Koşu Sensörleri Bir hatayla tamamlandı diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index ac280862b..05605a69c 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -480,7 +480,7 @@ limitations under the License. Одиниці виміру і дії за замовчуванням Інтерфейс користувача Зовнішній вигляд, Макет запису, Тема - Датчики Bluetooth + Датчики Голосові оголошення Інтервал часу, інтервал відстані, Максимальна відстань, точність Датчики Їзди На Велосипеді, Окружність Колеса, Датчики Ходу @@ -504,7 +504,7 @@ limitations under the License. %1$.1f km/h GPS %1$.1f km/h - GPS + GPS Не встановлено сумісний файловий менеджер Ні тренування diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index e46e9f7f8..45cfeba6e 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -477,8 +477,8 @@ limitations under the License. Đơn vị ưu tiên, Hoạt động mặc định, Tên mặc định tuyến đường Giao diện người dùng Vẻ ngoài, Bố cục ghi, Chủ đề - GPS - Cảm Biến Bluetooth + GPS + Cảm Biến Đi Xe Đạp Cảm Biến, Bánh Vòng, Chạy Bộ Cảm Biến Thông báo thống kê Thời Gian, Khoảng Cách, Tốc Độ Giọng Nói diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index cbc23dcf9..fd23e5611 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -306,7 +306,7 @@ limitations under the License. 首選單位、預設活動、蹤跡預設名稱 使用者介面 外觀、紀錄布局、主題 - GPS + GPS 時間間隔、距離間隔、最大距離、精度 藍芽感測器 自行車感測器、輪周、跑步感測器 diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml index 393f39236..f972efbde 100644 --- a/src/main/res/values-zh/strings.xml +++ b/src/main/res/values-zh/strings.xml @@ -480,7 +480,7 @@ limitations under the License. 偏好的单位，默认活动类型，路线默认名称 用户界面 外观，记录中布局，主题 - GPS + GPS 导入/导出 活动默认 时间间隔 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index b77e93ae9..298737c8d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -347,10 +347,10 @@ limitations under the License. User Interface Appearance, Recording Layout, Theme - GPS + GPS Time interval, Distance interval, Max Distance, Accuracy - Bluetooth Sensors + Sensors Cycling Sensors, Wheel Circumference, Running Sensors diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml index c4698bd73..4a74ea582 100644 --- a/src/main/res/xml/settings.xml +++ b/src/main/res/xml/settings.xml @@ -19,7 +19,7 @@ android:icon="@drawable/ic_baseline_satellite_alt_24" android:key="@string/settings_gps_key" android:summary="@string/settings_gps_summary" - android:title="@string/settings_gps_title" /> + android:title="@string/settings_recording_title" /> - - + android:title="@string/settings_recording_title"> - - + + + + + +