Announcements: can be triggered by time and distance (instead of either).

Fixes #921.

src/main/res/values-ar/strings.xml

@@ -177,7 +177,6 @@ limitations under the License.
     <string name="menu_show_on_map">إظهار على الخريطة</string>
     <string name="menu_start_gps">بدء GPS</string>
     <string name="menu_stop_gps">إيقاف GPS</string>
-    <string name="menu_voice_frequency">معدل الصوت</string>
     <!-- OpenTracks -->
     <string name="recording_service">خدمة التسجيل</string>
     <!-- Search -->

src/main/res/values-b+en+001/strings.xml

@@ -144,7 +144,6 @@
     <string name="menu_show_on_map">Show on map</string>
     <string name="menu_start_gps">Start GPS</string>
     <string name="menu_stop_gps">Stop GPS</string>
-    <string name="menu_voice_frequency">Voice frequency</string>
     <string name="recording_service">Recording service</string>
     <string name="sensor_state_battery">Battery level</string>
     <string name="sensor_state_cadence">Cadence</string>

src/main/res/values-b+es+419/strings.xml

@@ -145,7 +145,6 @@
     <string name="menu_show_on_map">Mostrar en el mapa</string>
     <string name="menu_start_gps">Iniciar GPS</string>
     <string name="menu_stop_gps">Detener GPS</string>
-    <string name="menu_voice_frequency">Frecuencia de voz</string>
     <string name="menu_resume_track">Reanudar ruta</string>
     <string name="recording_service">Servicio de grabación</string>
     <string name="sensor_state_battery">Nivel de la batería</string>

src/main/res/values-bg/strings.xml

@@ -173,7 +173,6 @@ limitations under the License.
     <string name="menu_show_on_map">Показване на картата</string>
     <string name="menu_start_gps">Стартиране на GPS</string>
     <string name="menu_stop_gps">Спиране на GPS</string>
-    <string name="menu_voice_frequency">Честота на гласа</string>
     <!-- OpenTracks -->
     <string name="recording_service">Услуга за запис</string>
     <!-- Search -->

src/main/res/values-ca/strings.xml

@@ -173,7 +173,6 @@ limitations under the License.
     <string name="menu_show_on_map">Mostra-ho al mapa</string>
     <string name="menu_start_gps">Activa el GPS</string>
     <string name="menu_stop_gps">Desactiva el GPS</string>
-    <string name="menu_voice_frequency">Freqüència de veu</string>
     <!-- OpenTracks -->
     <string name="recording_service">Servei d\'enregistrament</string>
     <!-- Search -->

src/main/res/values-cs/strings.xml

@@ -227,7 +227,6 @@ Pokud zařízení GPS hlásí nepřesná data (např. Polohu, rychlost, nadmořs
     <string name="menu_show_on_map">Zobrazit na mapě</string>
     <string name="menu_start_gps">Spustit GPS</string>
     <string name="menu_stop_gps">Ukončit GPS</string>
-    <string name="menu_voice_frequency">Frekvence hlasových oznámení</string>
     <string name="menu_resume_track">Obnovit měření</string>
     <!-- OpenTracks -->
     <string name="recording_service">Služba pro záznam</string>

src/main/res/values-da/strings.xml

@@ -229,7 +229,6 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj
     <string name="menu_show_on_map">Vis på kort</string>
     <string name="menu_start_gps">Start GPS</string>
     <string name="menu_stop_gps">Stop GPS</string>
-    <string name="menu_voice_frequency">Stemmefrekvens</string>
     <string name="menu_resume_track">Genoptag sporet</string>
     <!-- OpenTracks -->
     <string name="recording_service">Registreringstjeneste</string>

src/main/res/values-de/strings.xml

@@ -230,7 +230,6 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="menu_show_on_map">Auf Karte anzeigen</string>
     <string name="menu_start_gps">GPS aktivieren</string>
     <string name="menu_stop_gps">GPS deaktivieren</string>
-    <string name="menu_voice_frequency">Ansagehäufigkeit</string>
     <string name="menu_resume_track">Track fortsetzen</string>
     <!-- OpenTracks -->
     <string name="recording_service">Dienst für Aufzeichnung</string>

src/main/res/values-el/strings.xml

@@ -173,7 +173,6 @@ limitations under the License.
     <string name="menu_show_on_map">Εμφάνιση στον χάρτη</string>
     <string name="menu_start_gps">Έναρξη GPS</string>
     <string name="menu_stop_gps">Διακοπή GPS</string>
-    <string name="menu_voice_frequency">Συχνότητα ανακοινώσεων</string>
     <!-- OpenTracks -->
     <string name="recording_service">Υπηρεσία καταγραφής</string>
     <!-- Search -->

src/main/res/values-es/strings.xml

@@ -226,7 +226,6 @@ Si el dispositivo GPS reporta datos inexactos (por ejemplo, ubicación, velocida
     <string name="menu_show_on_map">Mostrar en el mapa</string>
     <string name="menu_start_gps">Iniciar GPS</string>
     <string name="menu_stop_gps">Detener GPS</string>
-    <string name="menu_voice_frequency">Frecuencia de voz</string>
     <string name="menu_resume_track">Reanudar ruta</string>
     <!-- OpenTracks -->
     <string name="recording_service">Servicio de grabación</string>

src/main/res/values-et/strings.xml

@@ -226,7 +226,6 @@ Kui GPS-seade teatab ebatäpsetest andmetest (nt asukoht, kiirus, kõrgus), ei s
     <string name="menu_show_on_map">Kuva kaardil</string>
     <string name="menu_start_gps">Käivita GPS</string>
     <string name="menu_stop_gps">Peata GPS</string>
-    <string name="menu_voice_frequency">Häälteadete sagedus</string>
     <string name="menu_resume_track">Jätka pala</string>
     <!-- OpenTracks -->
     <string name="recording_service">Salvestamisteenus</string>

src/main/res/values-eu/strings.xml

@@ -227,7 +227,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O
     <string name="menu_show_on_map">Erakutsi mapan</string>
     <string name="menu_start_gps">Hasi GPSa</string>
     <string name="menu_stop_gps">Gelditu GPSa</string>
-    <string name="menu_voice_frequency">Ahotsaren frekuentzia</string>
     <string name="menu_resume_track">Jarraitu pista</string>
     <!-- OpenTracks -->
     <string name="recording_service">Grabaketa-zerbitzua</string>

src/main/res/values-fa/strings.xml

@@ -173,7 +173,6 @@ limitations under the License.
     <string name="menu_show_on_map">نمایش روی نقشه</string>
     <string name="menu_start_gps">شروع GPS</string>
     <string name="menu_stop_gps">توقف GPS</string>
-    <string name="menu_voice_frequency">بسامد اعلان صوتی</string>
     <!-- OpenTracks -->
     <string name="recording_service">خدمات ضبط</string>
     <!-- Search -->

src/main/res/values-fi/strings.xml

@@ -230,7 +230,6 @@ limitations under the License.
     <string name="menu_show_on_map">Näytä kartalta</string>
     <string name="menu_start_gps">Käynnistä GPS</string>
     <string name="menu_stop_gps">Pysäytä GPS</string>
-    <string name="menu_voice_frequency">Ilmoitustiheys</string>
     <string name="menu_resume_track">Jatka reittiä</string>
     <!-- OpenTracks -->
     <string name="recording_service">Tallennuspalvelu</string>

src/main/res/values-fr-rCA/strings.xml

@@ -144,7 +144,6 @@
     <string name="menu_show_on_map">Afficher sur une carte</string>
     <string name="menu_start_gps">Démarrer le GPS</string>
     <string name="menu_stop_gps">Arrêter le GPS</string>
-    <string name="menu_voice_frequency">Fréquence vocale</string>
     <string name="recording_service">Service d\'enregistrement</string>
     <string name="sensor_state_battery">Niveau de charge de la pile</string>
     <string name="sensor_state_cadence">Cadence</string>

src/main/res/values-fr-rCH/strings.xml

@@ -144,7 +144,6 @@
     <string name="menu_show_on_map">Afficher sur la carte</string>
     <string name="menu_start_gps">Démarrer le GPS</string>
     <string name="menu_stop_gps">Arrêter le GPS</string>
-    <string name="menu_voice_frequency">Fréquence vocale</string>
     <string name="recording_service">Service enregistrement</string>
     <string name="sensor_state_battery">Niveau de la batterie</string>
     <string name="sensor_state_cadence">Cadence</string>

src/main/res/values-fr/strings.xml

@@ -226,7 +226,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="menu_show_on_map">Afficher sur la carte</string>
     <string name="menu_start_gps">Démarrer le GPS</string>
     <string name="menu_stop_gps">Arrêter le GPS</string>
-    <string name="menu_voice_frequency">Fréquence vocale</string>
     <string name="menu_resume_track">Reprendre la trace</string>
     <!-- OpenTracks -->
     <string name="recording_service">Service enregistrement</string>

src/main/res/values-gl/strings.xml

@@ -237,7 +237,6 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
     <string name="menu_show_on_map">Amosar no mapa</string>
     <string name="menu_start_gps">Iniciar GPS</string>
     <string name="menu_stop_gps">Desactivar GPS</string>
-    <string name="menu_voice_frequency">Frecuencia da voz</string>
     <string name="menu_resume_track">Retomar gravación</string>
     <!-- OpenTracks -->
     <string name="recording_service">Servizo de gravación</string>

src/main/res/values-hi/strings.xml

@@ -173,7 +173,6 @@ limitations under the License.
     <string name="menu_show_on_map">नक्शे पर दिखाएं</string>
     <string name="menu_start_gps">GPS प्रारंभ करें</string>
     <string name="menu_stop_gps">GPS बंद करें</string>
-    <string name="menu_voice_frequency">ध्वनि आवृत्ति</string>
     <!-- OpenTracks -->
     <string name="recording_service">रिकॉर्डिंग सेवा</string>
     <!-- Search -->

src/main/res/values-hr/strings.xml

@@ -174,7 +174,6 @@ limitations under the License.
     <string name="menu_show_on_map">Prikaži na karti</string>
     <string name="menu_start_gps">Pokreni GPS</string>
     <string name="menu_stop_gps">Zaustavi GPS</string>
-    <string name="menu_voice_frequency">Učest. glas. objava</string>
     <!-- OpenTracks -->
     <string name="recording_service">Usluga snimanja</string>
     <!-- Search -->

src/main/res/values-hu/strings.xml

@@ -173,7 +173,6 @@ limitations under the License.
     <string name="menu_show_on_map">Megjelenítés a térképen</string>
     <string name="menu_start_gps">GPS indítása</string>
     <string name="menu_stop_gps">GPS leállítása</string>
-    <string name="menu_voice_frequency">Utasítások gyakorisága</string>
     <!-- OpenTracks -->
     <string name="recording_service">Rögzítőszolgáltatás</string>
     <!-- Search -->

src/main/res/values-in/strings.xml

@@ -143,7 +143,6 @@
     <string name="menu_show_on_map">Tampilkan di peta</string>
     <string name="menu_start_gps">Nyalakan GPS</string>
     <string name="menu_stop_gps">Matikan GPS</string>
-    <string name="menu_voice_frequency">Kerapatan suara</string>
     <string name="recording_service">Layanan perekaman</string>
     <string name="sensor_state_battery">Level baterai</string>
     <string name="sensor_state_cadence">Tempo</string>

src/main/res/values-it/strings.xml

@@ -215,7 +215,6 @@ Infatti, un\'applicazione deve supportare <i>ACTION_VIEW</i> con MIME <i>applica
     <string name="menu_show_on_map">Visualizza su mappa</string>
     <string name="menu_start_gps">Accendi GPS</string>
     <string name="menu_stop_gps">Spegni GPS</string>
-    <string name="menu_voice_frequency">Frequenza voce</string>
     <!-- OpenTracks -->
     <string name="recording_service">Servizio di registrazione</string>
     <!-- Search -->

src/main/res/values-iw/strings.xml

@@ -146,7 +146,6 @@
     <string name="menu_show_on_map">הצג במפה</string>
     <string name="menu_start_gps">הפעל GPS</string>
     <string name="menu_stop_gps">עצור GPS</string>
-    <string name="menu_voice_frequency">תדירות הודעות קוליות</string>
     <string name="recording_service">שירות הקלטה</string>
     <string name="sensor_state_battery">טעינת סוללה</string>
     <string name="sensor_state_cadence">קצב</string>

src/main/res/values-ja/strings.xml

@@ -172,7 +172,6 @@ limitations under the License.
     <string name="menu_show_on_map">地図で見る</string>
     <string name="menu_start_gps">GPSを開始</string>
     <string name="menu_stop_gps">GPSを停止</string>
-    <string name="menu_voice_frequency">音声アナウンスの頻度</string>
     <!-- OpenTracks -->
     <string name="recording_service">記録サービス</string>
     <!-- Search -->

src/main/res/values-ko/strings.xml

@@ -172,7 +172,6 @@ limitations under the License.
     <string name="menu_show_on_map">지도에 표시</string>
     <string name="menu_start_gps">GPS 시작</string>
     <string name="menu_stop_gps">GPS 중지</string>
-    <string name="menu_voice_frequency">음성 안내 빈도</string>
     <!-- OpenTracks -->
     <string name="recording_service">기록 서비스</string>
     <!-- Search -->

src/main/res/values-lt/strings.xml

@@ -174,7 +174,6 @@ limitations under the License.
     <string name="menu_show_on_map">Rodyti žemėlapyje</string>
     <string name="menu_start_gps">Įjungti GPS</string>
     <string name="menu_stop_gps">Išjungti GPS</string>
-    <string name="menu_voice_frequency">Balso dažnumas</string>
     <!-- OpenTracks -->
     <string name="recording_service">Įrašymo paslauga</string>
     <!-- Search -->

src/main/res/values-lv/strings.xml

@@ -174,7 +174,6 @@ limitations under the License.
     <string name="menu_show_on_map">Rādīt kartē</string>
     <string name="menu_start_gps">Palaist GPS</string>
     <string name="menu_stop_gps">Apturēt GPS</string>
-    <string name="menu_voice_frequency">Balss ziņas</string>
     <!-- OpenTracks -->
     <string name="recording_service">Ierakstīšanas pakalpojums</string>
     <!-- Search -->

src/main/res/values-mo/strings.xml

@@ -145,7 +145,6 @@
     <string name="menu_show_on_map">Afișați pe hartă</string>
     <string name="menu_start_gps">Porniți GPS</string>
     <string name="menu_stop_gps">Opriți GPS</string>
-    <string name="menu_voice_frequency">Frecvența vocii</string>
     <string name="recording_service">Serviciu de înregistrare</string>
     <string name="sensor_state_battery">Nivelul bateriei</string>
     <string name="sensor_state_cadence">Cadenţă</string>

src/main/res/values-ms/strings.xml

@@ -172,7 +172,6 @@ limitations under the License.
     <string name="menu_show_on_map">Tunjukkan pada peta</string>
     <string name="menu_start_gps">Mulakan GPS</string>
     <string name="menu_stop_gps">Hentikan GPS</string>
-    <string name="menu_voice_frequency">Kekerapan suara</string>
     <!-- OpenTracks -->
     <string name="recording_service">Khidmat rakaman</string>
     <!-- Search -->

src/main/res/values-nb/strings.xml

@@ -173,7 +173,6 @@ limitations under the License.
     <string name="menu_show_on_map">Vis på kart</string>
     <string name="menu_start_gps">Start GPS</string>
     <string name="menu_stop_gps">Stopp GPS</string>
-    <string name="menu_voice_frequency">Talefrekvens</string>
     <!-- OpenTracks -->
     <string name="recording_service">Opptakstjeneste</string>
     <!-- Search -->

src/main/res/values-nl/strings.xml

@@ -226,7 +226,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="menu_show_on_map">Weergeven op kaart</string>
     <string name="menu_start_gps">GPS starten</string>
     <string name="menu_stop_gps">GPS stoppen</string>
-    <string name="menu_voice_frequency">Frequentie voor gesproken berichten</string>
     <string name="menu_resume_track">Hervat spoor</string>
     <!-- OpenTracks -->
     <string name="recording_service">Opnameservice</string>

src/main/res/values-pl/strings.xml

@@ -186,7 +186,6 @@ limitations under the License.
     <string name="menu_show_on_map">Pokaż na mapie</string>
     <string name="menu_start_gps">Uruchom GPS</string>
     <string name="menu_stop_gps">Zatrzymaj GPS</string>
-    <string name="menu_voice_frequency">Częstość powiadomień</string>
     <string name="menu_resume_track">Kontynuuj trasę</string>
     <!-- OpenTracks -->
     <string name="recording_service">Usługa rejestrowania</string>

src/main/res/values-pt-rBR/strings.xml

@@ -144,7 +144,6 @@
     <string name="menu_show_on_map">Mostrar no mapa</string>
     <string name="menu_start_gps">Iniciar GPS</string>
     <string name="menu_stop_gps">Parar GPS</string>
-    <string name="menu_voice_frequency">Frequência da voz</string>
     <string name="recording_service">Serviço de gravação</string>
     <string name="sensor_state_battery">Nível da bateria</string>
     <string name="sensor_state_cadence">Cadência</string>

src/main/res/values-pt-rPT/strings.xml

@@ -144,7 +144,6 @@
     <string name="menu_show_on_map">Mostrar no mapa</string>
     <string name="menu_start_gps">Ligar GPS</string>
     <string name="menu_stop_gps">Desligar GPS</string>
-    <string name="menu_voice_frequency">Frequência de voz</string>
     <string name="recording_service">Serviço de gravação</string>
     <string name="sensor_state_battery">Nível da bateria</string>
     <string name="sensor_state_cadence">Cadência</string>

src/main/res/values-pt/strings.xml

@@ -173,7 +173,6 @@ limitations under the License.
     <string name="menu_show_on_map">Mostrar no mapa</string>
     <string name="menu_start_gps">Iniciar GPS</string>
     <string name="menu_stop_gps">Parar GPS</string>
-    <string name="menu_voice_frequency">Frequência da voz</string>
     <!-- OpenTracks -->
     <string name="recording_service">Serviço de gravação</string>
     <!-- Search -->

src/main/res/values-ro/strings.xml

@@ -174,7 +174,6 @@ limitations under the License.
     <string name="menu_show_on_map">Afișați pe hartă</string>
     <string name="menu_start_gps">Porniți GPS</string>
     <string name="menu_stop_gps">Opriți GPS</string>
-    <string name="menu_voice_frequency">Frecvența vocii</string>
     <!-- OpenTracks -->
     <string name="recording_service">Serviciu de înregistrare</string>
     <!-- Search -->

src/main/res/values-ru/strings.xml

@@ -175,7 +175,6 @@ limitations under the License.
     <string name="menu_show_on_map">Показать на карте</string>
     <string name="menu_start_gps">Включить GPS</string>
     <string name="menu_stop_gps">Отключить GPS</string>
-    <string name="menu_voice_frequency">Голосовые оповещения</string>
     <!-- OpenTracks -->
     <string name="recording_service">Служба записи треков</string>
     <!-- Search -->

src/main/res/values-sk/strings.xml

@@ -174,7 +174,6 @@ limitations under the License.
     <string name="menu_show_on_map">Zobraziť na mape</string>
     <string name="menu_start_gps">Aktivovať GPS</string>
     <string name="menu_stop_gps">Deaktivovať GPS</string>
-    <string name="menu_voice_frequency">Hlasová frekvencia</string>
     <!-- OpenTracks -->
     <string name="recording_service">Služba na záznam</string>
     <!-- Search -->

src/main/res/values-sl/strings.xml

@@ -175,7 +175,6 @@ limitations under the License.
     <string name="menu_show_on_map">Pokaži na zemljevidu</string>
     <string name="menu_start_gps">Zaženi GPS</string>
     <string name="menu_stop_gps">Ustavi GPS</string>
-    <string name="menu_voice_frequency">Pogostost glas. obv.</string>
     <!-- OpenTracks -->
     <string name="recording_service">Storitev snemanja</string>
     <!-- Search -->

src/main/res/values-sr/strings.xml

@@ -174,7 +174,6 @@ limitations under the License.
     <string name="menu_show_on_map">Прикажи на мапи</string>
     <string name="menu_start_gps">Покрени GPS</string>
     <string name="menu_stop_gps">Заустави GPS</string>
-    <string name="menu_voice_frequency">Учесталост гласа</string>
     <!-- OpenTracks -->
     <string name="recording_service">Услуга бележења</string>
     <!-- Search -->

src/main/res/values-sv/strings.xml

@@ -173,7 +173,6 @@ limitations under the License.
     <string name="menu_show_on_map">Visa på karta</string>
     <string name="menu_start_gps">Starta GPS</string>
     <string name="menu_stop_gps">Stoppa GPS</string>
-    <string name="menu_voice_frequency">Röstfrekvens</string>
     <!-- OpenTracks -->
     <string name="recording_service">Inspelningstjänst</string>
     <!-- Search -->

src/main/res/values-th/strings.xml

@@ -172,7 +172,6 @@ limitations under the License.
     <string name="menu_show_on_map">แสดงบนแผนที่</string>
     <string name="menu_start_gps">เริ่ม GPS</string>
     <string name="menu_stop_gps">หยุด GPS</string>
-    <string name="menu_voice_frequency">ความถี่เสียง</string>
     <!-- OpenTracks -->
     <string name="recording_service">บริการการบันทึก</string>
     <!-- Search -->

src/main/res/values-tl/strings.xml

@@ -173,7 +173,6 @@ limitations under the License.
     <string name="menu_show_on_map">Ipakita sa mapa</string>
     <string name="menu_start_gps">Simulan ang GPS</string>
     <string name="menu_stop_gps">Itigil ang GPS</string>
-    <string name="menu_voice_frequency">Dalas ng voice</string>
     <!-- OpenTracks -->
     <string name="recording_service">Serbisyo ng pagrerekord</string>
     <!-- Search -->

src/main/res/values-tr/strings.xml

@@ -173,7 +173,6 @@ limitations under the License.
     <string name="menu_show_on_map">Haritada göster</string>
     <string name="menu_start_gps">GPS\'i aç</string>
     <string name="menu_stop_gps">GPS\'i kapat</string>
-    <string name="menu_voice_frequency">Ses sıklığı</string>
     <!-- OpenTracks -->
     <string name="recording_service">Kayıt hizmeti</string>
     <!-- Search -->

src/main/res/values-uk/strings.xml

@@ -175,7 +175,6 @@ limitations under the License.
     <string name="menu_show_on_map">Показати на карті</string>
     <string name="menu_start_gps">Увімкнути GPS</string>
     <string name="menu_stop_gps">Вимкнути GPS</string>
-    <string name="menu_voice_frequency">Голосові сповіщення</string>
     <!-- OpenTracks -->
     <string name="recording_service">Служба запису</string>
     <!-- Search -->

src/main/res/values-vi/strings.xml

@@ -172,7 +172,6 @@ limitations under the License.
     <string name="menu_show_on_map">Hiển thị trên bản đồ</string>
     <string name="menu_start_gps">Bắt đầu GPS</string>
     <string name="menu_stop_gps">Dừng GPS</string>
-    <string name="menu_voice_frequency">Tần suất giọng nói</string>
     <!-- OpenTracks -->
     <string name="recording_service">Dịch vụ ghi</string>
     <!-- Search -->

src/main/res/values-zh-rHK/strings.xml

@@ -143,7 +143,6 @@
     <string name="menu_show_on_map">在地圖上顯示</string>
     <string name="menu_start_gps">啟動 GPS</string>
     <string name="menu_stop_gps">關閉 GPS</string>
-    <string name="menu_voice_frequency">語音播報頻率</string>
     <string name="recording_service">記錄服務</string>
     <string name="sensor_state_battery">電池電量</string>
     <string name="sensor_state_cadence">轉速</string>

src/main/res/values-zh-rTW/strings.xml

@@ -143,7 +143,6 @@
     <string name="menu_show_on_map">在地圖上顯示</string>
     <string name="menu_start_gps">啟動 GPS</string>
     <string name="menu_stop_gps">關閉 GPS</string>
-    <string name="menu_voice_frequency">語音播報頻率</string>
     <string name="recording_service">記錄服務</string>
     <string name="sensor_state_battery">電池電量</string>
     <string name="sensor_state_cadence">轉速</string>

src/main/res/values-zh/strings.xml

@@ -172,7 +172,6 @@ limitations under the License.
     <string name="menu_show_on_map">在地图上显示</string>
     <string name="menu_start_gps">启动 GPS</string>
     <string name="menu_stop_gps">关闭 GPS</string>
-    <string name="menu_voice_frequency">语音提示频率</string>
     <string name="menu_voice_rate">语音提示速率</string>
     <string name="menu_resume_track">继续</string>
     <!-- OpenTracks -->

src/main/res/values/settings.xml

@@ -211,24 +211,29 @@
         <item>@string/settings_recording_track_name_number_option</item>
     </string-array>
 
-    <string name="voice_frequency_key" translatable="false">voiceFrequency</string>
-    <string name="voice_frequency_default" translatable="false">@string/frequency_off</string>
-    <string name="frequency_off" translatable="false">0</string>
-    <string-array name="frequency_values">
-        <item>@string/frequency_off</item>
+    <string name="announcement_off" translatable="false">0</string>
+    <string name="voice_announcement_frequency_key" translatable="false">voiceFrequencyV2</string>
+    <string name="voice_announcement_frequency_default" translatable="false">@string/announcement_off</string>
+    <string-array name="voice_announcement_frequency_values"> <!-- seconds -->
+        <item>@string/voice_announcement_frequency_default</item>
+        <item>60</item>
+        <item>120</item>
+        <item>300</item>
+        <item>600</item>
+        <item>900</item>
+        <item>1800</item>
+        <item>3600</item>
+    </string-array>
+    <string name="voice_announcement_distance_key" translatable="false">voiceDistance</string>
+    <string name="voice_announcement_distance_default" translatable="false">@string/announcement_off</string>
+    <string-array name="voice_announcement_distance_values">
+        <item>@string/voice_announcement_distance_default</item> <!-- km/miles -->
         <item>1</item>
-        <item>2</item>
         <item>5</item>
         <item>10</item>
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>-1</item>
-        <item>-5</item>
-        <item>-10</item>
-        <item>-25</item>
-        <item>-50</item>
-        <item>-100</item>
+        <item>25</item>
+        <item>50</item>
+        <item>100</item>
     </string-array>
     <string name="voice_speed_rate_key" translatable="false">voiceSpeedRate</string>
     <string name="voice_speed_rate_default" translatable="false">0.9</string>

src/main/res/values/settings_deprecated.xml

@@ -17,7 +17,6 @@
     </string-array>
 
     <string name="split_frequency_key" translatable="false" tools:keep="@string/split_frequency_key">splitFrequency</string>
-    <string name="split_frequency_default" translatable="false" tools:keep="@string/split_frequency_default">@string/frequency_off</string>
 
     <string name="chart_show_cadence_key" translatable="false" tools:keep="@string/chart_show_cadence_key">chartShowCadence</string>
     <bool name="chart_show_cadence_default" translatable="false" tools:keep="@bool/chart_show_cadence_default">

src/main/res/values/strings.xml

@@ -302,7 +302,6 @@ limitations under the License.
     <string name="menu_show_on_map">Show on map</string>
     <string name="menu_start_gps">Start GPS</string>
     <string name="menu_stop_gps">Stop GPS</string>
-    <string name="menu_voice_frequency">Voice frequency</string>
     <string name="menu_voice_rate">Voice speed</string>
     <string name="menu_resume_track">Resume track</string>
     <!-- OpenTracks -->
@@ -361,7 +360,10 @@ limitations under the License.
     <string name="settings_night_mode_option_day">Day</string>
     <string name="settings_night_mode_option_night">Night</string>
 
-    <!-- Reset -->
+    <string name="settings_announcements">Announcements</string>
+    <string name="settings_announcements_totaltime_frequency">Time interval</string>
+    <string name="settings_announcements_distance_frequency">Distance interval</string>
+
     <string name="settings_reset">Reset</string>
     <!-- Custom Layout Reset -->
     <string name="settings_layout_reset">Reset Custom Layout</string>

src/main/res/xml/settings.xml

@@ -74,19 +74,6 @@ limitations under the License.
             android:key="@string/stats_fullscreen_while_recording_key"
             android:summary="@string/settings_recording_fullscreen_on_while_recording_summary"
             android:title="@string/settings_recording_fullscreen_on_while_recording_title" />
-        <ListPreference
-            android:defaultValue="@string/voice_frequency_default"
-            android:entryValues="@array/frequency_values"
-            android:key="@string/voice_frequency_key"
-            android:title="@string/menu_voice_frequency"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:defaultValue="@string/voice_speed_rate_default"
-            android:entryValues="@array/voice_speed_rate_values"
-            android:entries="@array/voice_speed_rate_values"
-            android:key="@string/voice_speed_rate_key"
-            android:title="@string/menu_voice_rate"
-            app:useSimpleSummaryProvider="true" />
         <de.dennisguse.opentracks.settings.ActivityTypePreference
             android:defaultValue="@string/default_activity_default"
             android:key="@string/default_activity_key"
@@ -149,6 +136,29 @@ limitations under the License.
             app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:title="@string/settings_announcements">
+        <ListPreference
+            android:defaultValue="@string/voice_announcement_frequency_default"
+            android:entryValues="@array/voice_announcement_frequency_values"
+            android:key="@string/voice_announcement_frequency_key"
+            android:title="@string/settings_announcements_totaltime_frequency"
+            app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            android:defaultValue="@string/voice_announcement_distance_default"
+            android:entryValues="@array/voice_announcement_distance_values"
+            android:key="@string/voice_announcement_distance_key"
+            android:title="@string/settings_announcements_distance_frequency"
+            app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            android:defaultValue="@string/voice_speed_rate_default"
+            android:entryValues="@array/voice_speed_rate_values"
+            android:entries="@array/voice_speed_rate_values"
+            android:key="@string/voice_speed_rate_key"
+            android:title="@string/menu_voice_rate"
+            app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/generic_tracks">
         <Preference
             android:key="@string/settings_import"