From 584c55f0dd3b68b9cb93c20c538a9be9d2b1fb6a Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Sun, 13 Nov 2011 19:36:35 +0100
Subject: [PATCH] corrected auto follow strings meaning (en, de) (moved all 6
 auto_follow lines to top in all language files. All but en and de may need
 check if old translations are correct.)

---
 OsmAnd/res/values-cs/strings.xml | 12 ++++++------
 OsmAnd/res/values-de/strings.xml | 15 ++++++++-------
 OsmAnd/res/values-fr/strings.xml |  9 ++++++---
 OsmAnd/res/values-hu/strings.xml | 13 +++++++------
 OsmAnd/res/values-it/strings.xml | 11 ++++++-----
 OsmAnd/res/values-pl/strings.xml | 13 +++++++------
 OsmAnd/res/values-ru/strings.xml | 10 +++++++---
 OsmAnd/res/values-sk/strings.xml | 13 +++++++------
 OsmAnd/res/values-vi/strings.xml | 13 +++++++------
 OsmAnd/res/values/strings.xml    | 13 +++++++------
 OsmAnd/res/xml/settings_pref.xml |  4 ++--
 11 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 7787c54293..7999750e35 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+	<string name="choose_auto_follow_route">Nastavení automatického sledování</string>
+	<string name="choose_auto_follow_route_descr">Zadejte interval pro automatické vrácení mapy na vaši pozici</string>
+	<string name="auto_follow_route_never">Nikdy</string>
+	<string name="auto_follow_route_navigation">Automatické sledování pozice</string>
+	<string name="auto_follow_route_navigation_descr">Zapnout automatické sledování pozice pouze v režimu navigace.</string>
+	<string name="auto_follow_location_enabled">Automatické sledování pozice je zapnuto.</string>
 
 	<string name="pref_vector_rendering">Nastavení vektorového vykreslovače</string>
 	<string name="pref_overlay">Překryvná/podkresová vrstva</string>
@@ -13,9 +19,6 @@
 	<string name="city_type_town">Malé město</string>
 	<string name="city_type_city">Velké město</string>
 	<string name="layer_poi_label">POI popisky</string>
-	<string name="auto_follow_route_navigation_descr">Zapnout automatické sledování pozice pouze v režimu navigace.</string>
-	<string name="auto_follow_route_navigation">Automatické sledování pozice</string>
-	<string name="auto_follow_location_enabled">Automatické sledování pozice je zapnuto.</string>
 	<string name="animate_route_off">Animaci vypnuta</string>
 	<string name="animate_route">Animace zapnuta</string>
 	
@@ -45,9 +48,6 @@
 	<string name="local_index_mi_rename">Přejmenovat</string>
 	<string name="show_gpx_route">Zobrazit na mapě</string>
 	<string name="poi_filter_nominatim">Online Nominatim</string>
-	<string name="auto_follow_route_never">Nikdy</string>
-	<string name="choose_auto_follow_route">Nastavení automatického sledování</string>
-	<string name="choose_auto_follow_route_descr">Zadejte interval pro automatické vrácení mapy na vaši pozici</string>
 
 <string name="search_select_point">Vybrat</string>
 <string name="local_index_description">Stahnout nová, zálohovat nebo smazat existující data. \nOffline data na zařízení (%1$s dostupné)</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index ef0410078f..e2cfc1163b 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="choose_auto_follow_route">Kartenanzeige nachführen</string>
+	<string name="choose_auto_follow_route_descr">Zeitintervall für Rückkehr zur Kartennachführung mit Position</string>
+	<string name="auto_follow_route_never">Nie</string>
+	<string name="auto_follow_route_navigation">Nachführung nur bei Nav</string>
+	<string name="auto_follow_route_navigation_descr">Kartennachführung mit Position erfolgt nur während Navigation (Routing)</string>
+	<string name="auto_follow_location_enabled">Kartennachführung aktviert.</string>
+
 	<string name="pref_vector_rendering">Vector Renderer spezif. Optionen</string>
 	<string name="pref_overlay">Overlay / underlay</string>
 	<string name="pref_raster_map">Einstellungen Kachel-Karten</string>
@@ -12,9 +19,6 @@
 	<string name="city_type_town">OSM-Town</string>
 	<string name="city_type_city">OSM-City</string>
 	<string name="layer_poi_label">POI Namen</string>
-	<string name="auto_follow_route_navigation_descr">Kartenanzeige bei Navigation mit Position nachführen</string>
-	<string name="auto_follow_route_navigation">Kartenanzeige nachführen</string>
-	<string name="auto_follow_location_enabled">Kartennachführung aktviert.</string>
 	<string name="animate_route_off">Animation aus</string>
 	<string name="animate_route">Animation an</string>
 	
@@ -44,9 +48,6 @@
 	<string name="local_index_mi_rename">Umbenennen</string>
 	<string name="show_gpx_route">Auf Karte anzeigen</string>
 	<string name="poi_filter_nominatim">Online Nominatim</string>
-	<string name="auto_follow_route_never">Nie</string>
-	<string name="choose_auto_follow_route">Rückkehr zur Nachführung</string>
-	<string name="choose_auto_follow_route_descr">Zeitintervall für Rückkehr zur Kartennachführung</string>
 	<string name="search_select_point">Select</string>
 	<string name="search_position_current_location_search">Suche Position...</string>
 	<string name="search_position_current_location_found">Position (gefunden)</string>
@@ -618,7 +619,7 @@
     <string name="data_settings">Daten</string>
     <string name="map_preferences_descr">Karteneinstellungen festlegen: Kartenquelle, Ausrichtung, Markerposition, Bildschirmausrichtung</string>
     <string name="osm_settings">OSM</string>
-    <string name="auto_zoom_map_descr">Kartenvergrößerung (Zoomlevel) automatisch der Geschwindigkeit anpassen</string>
+    <string name="auto_zoom_map_descr">Kartenvergrößerung automatisch der Geschwindigkeit anpassen</string>
     <string name="auto_zoom_map">Automatischer Zoom</string>
     <string name="additional_settings">Weitere Einstellungen</string>
     <string name="settings_preset_descr">Anwendungsprofil wählen. (Viele Einstellungen unten werden für jedes Profil separat gespeichert.)</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 170e29a69f..94b0568fce 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="choose_auto_follow_route">Choisir les paramètres de suivi automatique</string>
+  <string name="choose_auto_follow_route_descr">Choisir le temps pendant lequel l\'application extrapole la position en mouvement</string>
+  <string name="auto_follow_route_never">Jamais</string>
+	<string name="auto_follow_route_navigation">Auto follow nav only</string>
+	<string name="auto_follow_route_navigation_descr">Use map view auto follow only while navigating.</string>
+	<string name="auto_follow_location_enabled">Map view auto follow in use.</string>
  <string name="animate_route_off">Arrêt animation</string>
  <string name="animate_route">Démarrage animation</string>
         <string name="tip_recent_changes_0_6_8_t">Changements en 0.6.8 :
@@ -27,9 +33,6 @@
   <string name="local_index_mi_rename">Renommer</string>
   <string name="show_gpx_route">Afficher sur la carte</string>
   <string name="poi_filter_nominatim">Nominatim en ligne</string>
-  <string name="auto_follow_route_never">Jamais</string>
-  <string name="choose_auto_follow_route">Choisir les paramètres de suivi automatique</string>
-  <string name="choose_auto_follow_route_descr">Choisir le temps pendant lequel l\'application extrapole la position en mouvement</string>
   <string name="search_select_point">Sélectionner</string>
   <string name="search_position_current_location_search">Recherche dans emplacement...</string>
   <string name="search_position_current_location_found">Emplacement[Trouvé]</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 24b006e19d..9cfa965a29 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+<string name="choose_auto_follow_route">Automatikus követés beállításai </string>
+<string name="choose_auto_follow_route_descr">Időintervallum beállítása az automatikus követéshez</string>
+<string name="auto_follow_route_never">Soha</string>
+<string name="auto_follow_route_navigation">Automatikus követés navigáláskor</string>
+<string name="auto_follow_route_navigation_descr">Csak navigáció közben követi automatikusan a pozíciódat.</string>
+<string name="auto_follow_location_enabled">Automatikus követés engedélyezve.</string>
+
 <string name="pref_vector_rendering">Beállítások vektoros megjelenítéshez</string>
 <string name="pref_overlay">Rátét / alátét</string>
 <string name="pref_raster_map">Raszter térkép beállítások</string>
@@ -12,9 +19,6 @@
 <string name="city_type_town">város</string>
 <string name="city_type_city">város</string>
 <string name="layer_poi_label">POI feliratok</string>
-<string name="auto_follow_route_navigation_descr">Csak navigáció közben követi automatikusan a pozíciódat.</string>
-<string name="auto_follow_route_navigation">Automatikus követés navigáláskor</string>
-<string name="auto_follow_location_enabled">Automatikus követés engedélyezve.</string>
 <string name="animate_route_off">Szimuláció ki</string>
 <string name="animate_route">Szimuláció be</string>
 	
@@ -44,9 +48,6 @@
 <string name="local_index_mi_rename">Átnevezés</string>
 <string name="show_gpx_route">Mutasd a térképen</string>
 <string name="poi_filter_nominatim">Online Nominatim</string>
-<string name="auto_follow_route_never">Soha</string>
-<string name="choose_auto_follow_route">Automatikus követés beállításai </string>
-<string name="choose_auto_follow_route_descr">Időintervallum beállítása az automatikus követéshez</string>
 <string name="search_select_point">Választás</string>
 <string name="search_position_current_location_search">Hely keresése...</string>
 <string name="search_position_current_location_found">Hely [Megtalálva]</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index ed804dbd11..5d6ec75bbe 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="layer_poi_label">POI labels</string>
-	<string name="auto_follow_route_navigation_descr">Abilita l\'auto-follow solo durante la navigazione.</string>
+	<string name="choose_auto_follow_route">Impostazioni auto-follow</string>
+	<string name="choose_auto_follow_route_descr">Scegli intervallo di tempo per seguire automaticamente la posizione attuale</string>
+	<string name="auto_follow_route_never">Mai</string>
 	<string name="auto_follow_route_navigation">Navigazione auto-follow</string>
+	<string name="auto_follow_route_navigation_descr">Abilita l\'auto-follow solo durante la navigazione.</string>
 	<string name="auto_follow_location_enabled">Auto follow e\' attivo.</string>
+
+	<string name="layer_poi_label">POI labels</string>
 	<string name="animate_route_off">Animazione off</string>
 	<string name="animate_route">Animazione on</string>
 
@@ -33,9 +37,6 @@
 	<string name="local_index_mi_rename">Rinomina</string>
 	<string name="show_gpx_route">Visualizza</string>
 	<string name="poi_filter_nominatim">Online Nominatim</string>
-	<string name="auto_follow_route_never">Mai</string>
-	<string name="choose_auto_follow_route">Impostazioni auto-follow</string>
-	<string name="choose_auto_follow_route_descr">Scegli intervallo di tempo per seguire automaticamente la posizione attuale</string>
 	<string name="search_select_point">Seleziona</string>
 	<string name="local_index_description">Scarica nuovi dati, sposta, salva o cancella dati esistenti. \nDati attualmente nel dispositivo (%1$s disponibile):</string>
 	<string name="search_position_current_location_search">Cerca posizione...</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index fe4332f055..1e624eeda8 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+<string name="choose_auto_follow_route">Autostart nawigatora</string>
+<string name="choose_auto_follow_route_descr">Ustaw czas, po którym nastąpi automatyczne uruchomienie nawigatora</string>
+<string name="auto_follow_route_never">Nigdy</string>
+<string name="auto_follow_route_navigation">Autostart nawigatora</string>
+<string name="auto_follow_route_navigation_descr">Włącz autostart nawigatora tylko w trybie nawigacji.</string>
+<string name="auto_follow_location_enabled">Autostart nawigatora jest włączony.</string>
+
 <!-- string name="delete_confirmation_title">Usuwanie</string -->
 <string name="delete_confirmation_msg">Czy na pewno usunąć %1$s?</string>
 <string name="city_type_suburb">Dzielnica</string>
@@ -9,9 +16,6 @@
 <string name="city_type_city">Miasto</string>
 
 <string name="layer_poi_label">Etykiety POI</string>
-<string name="auto_follow_route_navigation_descr">Włącz autostart nawigatora tylko w trybie nawigacji.</string>
-<string name="auto_follow_route_navigation">Autostart nawigatora</string>
-<string name="auto_follow_location_enabled">Autostart nawigatora jest włączony.</string>
 <string name="animate_route_off">Wył. animacje</string>
 <string name="animate_route">Wł. animacje</string>
 <string name="tip_recent_changes_0_6_8_t">Zmiany w wersji 0.6.8:
@@ -37,9 +41,6 @@
 <string name="local_index_mi_rename">Zmień nazwę</string>
 <string name="show_gpx_route">Pokaż na mapie</string>
 <string name="poi_filter_nominatim">Online Nominatim</string>
-<string name="auto_follow_route_never">Nigdy</string>
-<string name="choose_auto_follow_route">Autostart nawigatora</string>
-<string name="choose_auto_follow_route_descr">Ustaw czas, po którym nastąpi automatyczne uruchomienie nawigatora</string>
 <string name="search_select_point">Wybierz</string>
 <string name="local_index_description">Pobierz nowe, zarchiwizuj lub usuń istniejące dane. \nIstniejące dane offline na urządzeniu (%1$s jest dostępne):</string>
 <string name="search_position_current_location_search">Ustal pozycję GPS...</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 3cd5de62b8..fe7897ffbd 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="choose_auto_follow_route">Настройки автовозрата карты</string>
+	<string name="choose_auto_follow_route_descr">Выберите время, через которое карта вернется к текущей позиции</string>
+	<string name="auto_follow_route_never">Никогда</string>
+	<string name="auto_follow_route_navigation">Auto follow nav only</string>
+	<string name="auto_follow_route_navigation_descr">Use map view auto follow only while navigating.</string>
+	<string name="auto_follow_location_enabled">Map view auto follow in use.</string>
+
    <string name="tip_recent_changes_0_6_8_t">Изменения в 0.6.8 :
 \n\t- Полностью обновленный поиск (POI, Адрес)! Поиск по адресу более отзывчивый и быстрый. Единственная кнопка поиска с множественными вкладками.
 \n\t- Поиск POI по имени на больших территориях (страна)  в новых картах  
@@ -24,9 +31,6 @@
 	<string name="local_index_mi_rename">Переименовать</string>
 	<string name="show_gpx_route">Показать на карте</string>
 	<string name="poi_filter_nominatim">Nominatim (интернет)</string>
-    <string name="auto_follow_route_never">Никогда</string>
-	<string name="choose_auto_follow_route">Настройки автовозрата карты</string>
-	<string name="choose_auto_follow_route_descr">Выберите время, через которое карта вернется к текущей позиции</string>
 	<string name="search_select_point">Выбрать</string>
 	<string name="local_index_description">Офлайн данные доступные на SD карточке. Вы можете загрузить новые, архивировать и удалить данные. Доступно %1$s.</string>
 	<string name="search_position_current_location_search">Поиск позиции...</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index fb8df93b2c..84c2f74d90 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
+	<string name="choose_auto_follow_route">Nastavenia autom. nasledovania</string>
+	<string name="choose_auto_follow_route_descr">Výber časového intervalu pre nasledovanie pozície na mape</string>
+	<string name="auto_follow_route_never">Nikdy</string>
+	<string name="auto_follow_route_navigation">Autom. nasledovanie pri navigácii</string>
+	<string name="auto_follow_route_navigation_descr">Povoliť autom. nasledovanie pozície iba v režime navigácie.</string>
+	<string name="auto_follow_location_enabled">Automatické nasledovanie je povolené.</string>
+
 	<string name="sendtoOSM_confirmation_msg">Odoslať do OSM: %1$s?</string>
 	<string name="pref_vector_rendering">Vektorové vykresľovanie</string>
 	<string name="pref_overlay">Prekrývacia/podkladová</string>
@@ -13,9 +20,6 @@
 	<string name="city_type_town">Mesto</string>
 	<string name="city_type_city">Veľkomesto</string>
 	<string name="layer_poi_label">POI popisy</string>
-	<string name="auto_follow_route_navigation_descr">Povoliť autom. nasledovanie pozície iba v režime navigácie.</string>
-	<string name="auto_follow_route_navigation">Autom. nasledovanie pri navigácii</string>
-	<string name="auto_follow_location_enabled">Automatické nasledovanie je povolené.</string>
 	<string name="animate_route_off">Vypnúť animáciu</string>
 	<string name="animate_route">Zapnúť animáciu</string>
 	
@@ -45,9 +49,6 @@
 	<string name="show_gpx_route">Zobraziť na mape</string>
 	
 	<string name="poi_filter_nominatim">Online Nominatim</string>
-	<string name="auto_follow_route_never">Nikdy</string>
-	<string name="choose_auto_follow_route">Nastavenia autom. nasledovania</string>
-	<string name="choose_auto_follow_route_descr">Výber časového intervalu pre nasledovanie pozície na mape</string>
 	<string name="search_select_point">Vybrať</string>
 	<string name="local_index_description">Stiahnite nové, zálohujte alebo zmažte existujúce údaje. \nAktuálne offline údaje v zariadení (%1$s dostupných):</string>
 	<string name="search_position_current_location_search">Hľadám umiestnenie...</string>
diff --git a/OsmAnd/res/values-vi/strings.xml b/OsmAnd/res/values-vi/strings.xml
index 159fbf537e..8801d0e3a8 100644
--- a/OsmAnd/res/values-vi/strings.xml
+++ b/OsmAnd/res/values-vi/strings.xml
@@ -2,6 +2,13 @@
 <!-- Language: Vietnamese; Language code: vi
 Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 <resources>
+	<string name="choose_auto_follow_route">Auto follow return time</string>
+	<string name="choose_auto_follow_route_descr">Chọn thời gian chờ hiển thị bản đồ để quay lại vị trí vừa xong</string>
+	<string name="auto_follow_route_never">Không bao giờ</string>
+	<string name="auto_follow_route_navigation">Tự động bám theo trên bản đồ</string>
+	<string name="auto_follow_route_navigation_descr">Bản đồ tự động di chuyển theo vị trí khi định vị.</string>
+	<string name="auto_follow_location_enabled">Đã kích hoạt thiết lập tự động bám theo.</string>
+
 	<string name="pref_vector_rendering">Thiết lập hiển thị Vector</string>
 	<string name="pref_overlay">Overlay / Underlay</string>
 	<string name="pref_raster_map">Thiết lập bản đồ Tile</string>
@@ -14,9 +21,6 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 	<string name="city_type_town">Thị xã</string>
 	<string name="city_type_city">Thành phố</string>
 	<string name="layer_poi_label">nhãn POI</string>
-	<string name="auto_follow_route_navigation_descr">Bản đồ tự động di chuyển theo vị trí khi định vị.</string>
-	<string name="auto_follow_route_navigation">Tự động bám theo trên bản đồ</string>
-	<string name="auto_follow_location_enabled">Đã kích hoạt thiết lập tự động bám theo.</string>
 	<string name="animate_route_off">Dừng mô phỏng</string>
 	<string name="animate_route">Bắt đầu mô phỏng</string>
 	
@@ -46,9 +50,6 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 	<string name="local_index_mi_rename">Đổi tên</string>
 	<string name="show_gpx_route">Hiển thị trên bản đồ</string>
 	<string name="poi_filter_nominatim">Online Nominatim</string>
-	<string name="auto_follow_route_never">Không bao giờ</string>
-	<string name="choose_auto_follow_route">Auto follow return time</string>
-	<string name="choose_auto_follow_route_descr">Chọn thời gian chờ hiển thị bản đồ để quay lại vị trí vừa xong</string>
 	<string name="search_select_point">Chọn</string>
 	<string name="local_index_description">Tải mới hoặc di chuyển để sao lưu hoặc xóa dữ liệu hiện tại.\nDữ liệu offline hiện có trên máy (%1$s không gian trống):</string>
 	<string name="search_position_current_location_search">Đang tìm vị trí...</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 3afca2b040..d7756b762b 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+	<string name="choose_auto_follow_route">Map view auto follow</string>
+	<string name="choose_auto_follow_route_descr">Time until map view returns to being synchronized with position</string>
+	<string name="auto_follow_route_never">Never</string>
+	<string name="auto_follow_route_navigation">Auto follow nav only</string>
+	<string name="auto_follow_route_navigation_descr">Use map view auto follow only while navigating.</string>
+	<string name="auto_follow_location_enabled">Map view auto follow in use.</string>
+
 	<string name="sendtoOSM_confirmation_msg">Send to OSM: %1$s?</string>
 	<string name="pref_vector_rendering">Vector renderer specific options</string>
 	<string name="pref_overlay">Overlay / underlay</string>
@@ -13,9 +20,6 @@
 	<string name="city_type_town">Town</string>
 	<string name="city_type_city">City</string>
 	<string name="layer_poi_label">POI labels</string>
-	<string name="auto_follow_route_navigation_descr">Map display automatically follows position while navigating</string>
-	<string name="auto_follow_route_navigation">Auto follow on map</string>
-	<string name="auto_follow_location_enabled">Auto follow setting is enabled.</string>
 	<string name="animate_route_off">Stop animation</string>
 	<string name="animate_route">Start animation</string>
 	
@@ -45,9 +49,6 @@
 	<string name="local_index_mi_rename">Rename</string>
 	<string name="show_gpx_route">Show on map</string>
 	<string name="poi_filter_nominatim">Online Nominatim</string>
-	<string name="auto_follow_route_never">Never</string>
-	<string name="choose_auto_follow_route">Auto follow return time</string>
-	<string name="choose_auto_follow_route_descr">Choose wait time for map display to return to current position again</string>
 	<string name="search_select_point">Select</string>
 	<string name="local_index_description">Download new, or move to backup or delete existing data. \nCurrent offline data on device (%1$s free space):</string>
 	<string name="search_position_current_location_search">Searching position...</string>
diff --git a/OsmAnd/res/xml/settings_pref.xml b/OsmAnd/res/xml/settings_pref.xml
index baee152e27..f28cc257c8 100644
--- a/OsmAnd/res/xml/settings_pref.xml
+++ b/OsmAnd/res/xml/settings_pref.xml
@@ -63,10 +63,10 @@
 		<ListPreference android:title="@string/voice_provider" android:key="voice_provider" android:summary="@string/voice_provider_descr"></ListPreference>
 		<ListPreference android:key="audio_stream" android:title="@string/choose_audio_stream"
 			android:summary="@string/choose_audio_stream_descr"></ListPreference>
-		<CheckBoxPreference android:summary="@string/auto_follow_route_navigation_descr" android:title="@string/auto_follow_route_navigation"
-			android:key="auto_follow_route_navigation"></CheckBoxPreference>
 		<ListPreference android:key="auto_follow_route" android:title="@string/choose_auto_follow_route"
 			android:summary="@string/choose_auto_follow_route_descr"></ListPreference>
+		<CheckBoxPreference android:summary="@string/auto_follow_route_navigation_descr" android:title="@string/auto_follow_route_navigation"
+			android:key="auto_follow_route_navigation"></CheckBoxPreference>
 		<CheckBoxPreference android:summary="@string/use_osmand_routing_service_descr" android:title="@string/use_osmand_routing_service"
 			android:key="use_osmand_routing_service"></CheckBoxPreference>	
 	</PreferenceScreen>