diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 56edf43d45..b0094305f5 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -33,7 +33,7 @@
     <string name="recording_context_menu_delete">Slet optagelse</string>
     <string name="recording_context_menu_play">Afspil</string>
     <string name="recording_description">Optagelse %1$s %3$s %2$s</string>
-    <string name="recording_default_name">optager</string>
+    <string name="recording_default_name">Optager</string>
     <string name="av_control_start">Start</string>
     <string name="map_widget_av_notes">Audio-/videonoter</string>
     <string name="osmand_srtm_short_description_80_chars">OsmAnd udvidelse for offline højdekurver</string>
@@ -1878,4 +1878,6 @@
     <string name="speak_pedestrian">Fodgængerovergange</string>
     <string name="rendering_value__name">Standard</string>
 	<string name="save_track_to_gpx_globally_headline">On demand sporingslogning</string>
-	</resources>
+	<string name="navigation_over_track">Start navigation over spor?</string>
+	<string name="avoid_roads_msg">Du kan ændre ruten ved at vælge veje der skal undgås</string>
+    </resources>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index f1cb544913..a2c301fb4e 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1142,7 +1142,7 @@
     <string name="recording_context_menu_delete">Supprimer l\'enregistrement</string>
     <string name="recording_context_menu_play">Lire</string>
     <string name="recording_description">Enregistrement %1$s %3$s %2$s</string>
-    <string name="recording_default_name">enregistrement</string>
+    <string name="recording_default_name">Enregistrement en cours</string>
     <string name="av_control_stop">Arrêter</string>
     <string name="map_widget_av_notes">Notes audio/vidéo</string>
     <string name="tip_recent_changes_1_1_0_t">"Changements pour 1.1.0 :
@@ -1895,4 +1895,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="routing_attr_no_new_routing_name">Ne pas utiliser la version 1.9 des calculs de route</string>
     <string name="speak_pedestrian">Annoncer les passages piéton</string>
     <string name="rendering_value__name">Par défaut</string>
+	<string name="avoid_roads_msg">Vous pouvez modifier l\'itinéraire en sélectionnant les routes à éviter.</string>
+    <string name="navigation_over_track">Démarrer la navigation sur les pistes ?</string>
+	<string name="save_track_to_gpx_globally_headline">Enregistrement de traces à la demande</string>
 	</resources>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 61452daf95..1473467ab2 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -1812,4 +1812,5 @@
     <string name="routing_attr_no_new_routing_description">Ne használja az 1.9-es verzióban bevezetett útvonalszabályokat</string>
     <string name="speak_pedestrian">Gyalogátkelőhelyek bejelentése</string>
     <string name="rendering_value__name">Alapértelmezett</string>
+	<string name="save_track_to_gpx_globally_headline">Nyomvonalrögzítés igény szerint</string>
 	</resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 6530476065..545ca335fc 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -94,7 +94,7 @@
   <string name="init_native_library">Inizializzazione libreria nativa…</string>
   <string name="choose_auto_follow_route">Centra automaticamente la mappa</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_never">Mai (tap sulla freccia blu per avviare la navigazione manualmente)</string>
   <string name="auto_follow_route_navigation">Centra automaticamente solo in navigazione</string>
   <string name="auto_follow_route_navigation_descr">Centra automaticamente la visione della mappa solo durante la navigazione.</string>
   <string name="auto_follow_location_enabled">Visualizzazione mappa centrata automaticamente.</string>
@@ -751,7 +751,7 @@
   <string name="poi_dialog_comment_default">Cambio PDI</string>
   <string name="poi_dialog_other_tags_message">Tutte le altre etichette sono conservate</string>
   <string name="default_buttons_commit">Esegui</string>
-  <string name="default_buttons_reset">Ripristina</string>
+  <string name="default_buttons_reset">Cancella</string>
   <string name="filter_current_poiButton">Filtro</string>
   <string name="edit_filter_delete_menu_item">Elimina</string>
   <string name="edit_filter_save_as_menu_item">Salva come</string>
@@ -1212,7 +1212,7 @@
     <string name="recording_context_menu_delete">Elimina la registrazione</string>
     <string name="recording_context_menu_play">Riproduci</string>
     <string name="recording_description">Registrazione %1$s %3$s %2$s</string>
-    <string name="recording_default_name">registrazione</string>
+    <string name="recording_default_name">Registrazione in corso</string>
     <string name="av_control_stop">Ferma</string>
     <string name="av_control_start">Avvia</string>
     <string name="map_widget_av_notes">Note audio/video</string>
@@ -1723,7 +1723,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="osmo_plugin_description">"OpenStreetMap monitoraggio avanzato in diretta, vedi http://osmo.mobi. Fornisce la possibilità di tracciare altri dispositivi e di essere tracciati. Crea gruppo anonimi, condivide reciprocamente la posizione e comunica. Sono disponibili varie impostazioni di monitoraggio, per la sessione in corso o permanenti. I gruppi anonimi sono limitati a un numero di giorni e alcune funzioni es. non c\'è il controllo remoto e l\'amministratore del gruppo. Gruppi con tutte le funzionalità possono essere creati dal sito e solo gli utenti registrati possono accedervi. "</string>
     <string name="osmo_plugin_name">OsMo (Monitoraggio avanzato in tempo reale)</string>
     <string name="osmo_settings">Monitoraggio OpenStreetMap</string>
-   	<string name="keep_informing_never">Mai</string>
+   	<string name="keep_informing_never">Solo manualmente (tap sulla freccia)</string>
     <string name="keep_informing_descr">Annuncia nuovamente a intervalli regolari le indicazioni di navigazione</string>
     <string name="keep_informing">Ripeti le istruzioni di navigazione</string>
 	<string name="arrival_distance">Annuncio arrivo</string>
@@ -2000,7 +2000,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="impassable_road">Evita strade …</string>
     <string name="rendering_category_hide">Nascondi</string>
     <string name="wake_on_voice">Accendi lo schermo</string>
-    <string name="wake_on_voice_descr">Accendi lo schermo all\'approssimarsi di una svolta</string>
+    <string name="wake_on_voice_descr">Accendi lo schermo (se spento) all\'approssimarsi di una svolta</string>
     <string name="wake_on_voice_never">Mai</string>
     <string name="lock_screen_request_explanation">%1$s necessita di questa autorizzazione per spegnere lo schermo per la funzionalità di risparmio energetico.</string>
     <string name="advanced_settings">Avanzato</string>
@@ -2044,4 +2044,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="show_pedestrian_warnings">Mostra gli attraversamenti pedonali</string>
     <string name="speak_pedestrian">Annuncia gli attraversamenti pedonali</string>
     <string name="rendering_value__name">Preimpostato</string>
+	<string name="navigation_over_track">Iniziare la navigazione sulla traccia?</string>
+	<string name="avoid_roads_msg">Puoi modificare il percorso selezionando le strade da evitare</string>
+    <string name="save_track_to_gpx_globally_headline">Registrazione della traccia su richiesta</string>
 	</resources>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 802d03b9c6..aaaeec9b75 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -10,7 +10,7 @@
   <string name="pref_vector_map">Ustawienia mapy wektorowej</string>
   <string name="choose_auto_follow_route">Autocentrowanie mapy</string>
   <string name="choose_auto_follow_route_descr">Opóźnienie, po którym mapa zacznie podążać za aktualną pozycją GPS</string>
-  <string name="auto_follow_route_never">Nigdy</string>
+  <string name="auto_follow_route_never">Nigdy (dotknij niebieskiej strzałki, aby rozpocząć ręcznie)</string>
   <string name="auto_follow_route_navigation">Auto-podążanie za pozycją</string>
   <string name="auto_follow_route_navigation_descr">Włącz podążanie za pozycją tylko w trybie nawigacji.</string>
   <string name="auto_follow_location_enabled">Podążanie za pozycją jest włączone.</string>
@@ -668,7 +668,7 @@
   <string name="poi_dialog_comment_default">Zmiana POI</string>
   <string name="poi_dialog_other_tags_message">Wszystkie pozostałe tagi pozostają bez zmian</string>
   <string name="default_buttons_commit">Wyślij</string>
-  <string name="default_buttons_reset">Resetuj</string>
+  <string name="default_buttons_reset">Wyczyść</string>
   <string name="filter_current_poiButton">Filtr</string>
   <string name="edit_filter_delete_menu_item">Usuń</string>
   <string name="edit_filter_save_as_menu_item">Zapisz jako</string>
@@ -1137,7 +1137,7 @@
     <string name="recording_context_menu_delete">Usuń nagranie</string>
     <string name="recording_context_menu_play">Odtwórz</string>
     <string name="recording_description">Nagranie %1$s %3$s %2$s</string>
-    <string name="recording_default_name">nagranie</string>
+    <string name="recording_default_name">Nagranie</string>
     <string name="av_control_stop">Stop</string>
     <string name="av_control_start">Start</string>
     <string name="map_widget_av_notes">Notatki audio/video</string>
@@ -1661,7 +1661,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="osmo_plugin_description">"OpenStreetMap zaawansowany monitoring na żywo, zobacz http://osmo.mobi. Daje możliwość śledzenia innych urządzeń i vice versa. Twórz anonimowe grupy, dziel się lokalizacją i prowadź komunikację. System ma wiele ustawień dla śledzenia w sesji lub stałego śledzenia. Grupy anonimowe mają ograniczenia czasowe i funkcjonalne, np. nie ma zdalnej kontroli i administratora grupy. W pełni funkcjonalne grupy powinny być tworzone przez witrynę, a dostęp zarezerwowany tylko dla zarejestrowanych użytkowników. "</string>
     <string name="osmo_plugin_name">OsMo (Zaawansowany Monitoring na Żywo)</string>
     <string name="osmo_settings">Monitoring OpenStreetMap</string>
-   	<string name="keep_informing_never">Nigdy</string>
+   	<string name="keep_informing_never">Tylko ręcznie (naciśnij strzałkę)</string>
     <string name="keep_informing_descr">Podawaj instrukcje nawigacji w regularnych odstępach czasu</string>
     <string name="keep_informing">Powtarzaj instrukcje nawigacji</string>
 	<string name="arrival_distance">Informacja o odległości do celu</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index b3653b5072..73f0b4a9a9 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -639,7 +639,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			if (info.gpx != null && info.gpx.showCurrentTrack) {
 				catName = info.name;
 			} else {
-				catName = app.getString(R.string.local_indexes_cat_gpx) + " " + info.subfolder;
+				//local_indexes_cat_gpx now obsolete in new UI screen which shows only GPX data
+				//catName = app.getString(R.string.local_indexes_cat_gpx) + " " + info.subfolder;
+				catName = "" + info.subfolder;
 			}
 			int found = -1;
 			// search from end