diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 8f661f3883..581f68d68c 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -2854,7 +2854,7 @@
     <string name="by_type">حسب النوع</string>
     <string name="shared_string_more_without_dots">المزيد</string>
     <string name="appearance_on_the_map">المظهر على الخريطة</string>
-    <string name="track_waypoints">نقاط المسار</string>
+    <string name="shared_string_gpx_waypoints">نقاط المسار</string>
     <string name="add_group">إضافة مجموعة</string>
     <string name="empty_state_markers_active">قم بإنشاء علامات على الخريطة !</string>
     <string name="empty_state_markers_groups">إستيراد مجموعات</string>
diff --git a/OsmAnd/res/values-b+ast/strings.xml b/OsmAnd/res/values-b+ast/strings.xml
index 69716847d5..8769801dda 100644
--- a/OsmAnd/res/values-b+ast/strings.xml
+++ b/OsmAnd/res/values-b+ast/strings.xml
@@ -1076,7 +1076,7 @@ Puntos</string>
     <string name="appearance_on_the_map">Apariencia nel mapa</string>
     <string name="add_track_to_markers_descr">Los puntos de ruta pueden añadise a los marcadores seleicionando una de les traces que los tengan.</string>
     <string name="add_favourites_group_to_markers_descr">Seleiciona una categoría favorita p\\\'amestala a los marcadores.</string>
-    <string name="track_waypoints">Puntos de ruta de la traza</string>
+    <string name="shared_string_gpx_waypoints">Puntos de ruta de la traza</string>
     <string name="favourites_group">Categoría de favoritos</string>
     <string name="add_group">Amestar un grupu</string>
     <string name="add_group_descr">Importar grupos dende favoritos o de puntos de ruta de la traza.</string>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 717606ea5b..f434864997 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -2876,7 +2876,7 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     
     <string name="mark_passed">Adznačyć prajdzienyja</string>
     <string name="add_favourites_group_to_markers_descr">Abiarycie katehoryju ŭlubionych, kab dadać da markieraŭ.</string>
-    <string name="track_waypoints">Šliachavyja kropki</string>
+    <string name="shared_string_gpx_waypoints">Šliachavyja kropki</string>
     <string name="favourites_group">Katehoryja ŭlubionych</string>
     <string name="add_group">Dadać hrupu</string>
     <string name="add_group_descr">Vy možacie impartavać hrupy z ulubionych ci šlachavych kropak.</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 902c2b05a9..74ea895900 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2971,7 +2971,7 @@
     <string name="shared_string_two">Два</string>
     <string name="shared_string_one">Адзін</string>
     <string name="add_favourites_group_to_markers_descr">Абярыце катэгорыю ўлюбёных, каб дадаць да маркераў.</string>
-    <string name="track_waypoints">Шляхавыя кропкі</string>
+    <string name="shared_string_gpx_waypoints">Шляхавыя кропкі</string>
     <string name="favourites_group">Катэгорыя ўлюбёных</string>
     <string name="add_group">Дадаць групу</string>
     <string name="add_group_descr">Вы можаце імпартаваць групы з улюбёных ці шляхавых кропак.</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 0deef5d6e6..93b60a79f4 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -2694,7 +2694,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="appearance_on_the_map">Aparença al mapa</string>
     <string name="add_track_to_markers_descr">Les fites es poden desar com marcadors si seleccioneu alguna de les traces que les continguin.</string>
     <string name="add_favourites_group_to_markers_descr">Seleccioneu una categoria preferida per afegir-la als marcadors.</string>
-    <string name="track_waypoints">Fites de la traça</string>
+    <string name="shared_string_gpx_waypoints">Fites de la traça</string>
     <string name="favourites_group">Categoria de preferits</string>
     <string name="add_group">Afegeix un grup</string>
     <string name="add_group_descr">Importa grups des de preferits o des de fites d\'una traça.</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 855a63ef65..8cf2cead3c 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -2684,7 +2684,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="appearance_on_the_map">Vzhled na mapě</string>
     <string name="add_track_to_markers_descr">Trasové body lze přidat jako značky tím, že vyberete trasu, která je obsahuje.</string>
     <string name="add_favourites_group_to_markers_descr">Vyberte kategorii oblíbených, kterou chcete přidat k značkám.</string>
-    <string name="track_waypoints">Body trasy</string>
+    <string name="shared_string_gpx_waypoints">Body trasy</string>
     <string name="favourites_group">Kategorie oblíbených</string>
     <string name="add_group">Přidat skupinu</string>
     <string name="add_group_descr">Můžete importovat skupinu z oblíbených nebo body trasy.</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 853be96fff..dccabeb1e9 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -3037,7 +3037,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="active_markers_descr">Vælg antallet af aktive markører der vises.</string>
     <string name="add_track_to_markers_descr">Rutepunkter kan føjes til markører ved at vælge et af disse spor som indeholder dem.</string>
     <string name="add_favourites_group_to_markers_descr">Vælg en favoritkategori, der skal tilføjes markørerne.</string>
-    <string name="track_waypoints">Sporets rutepunkter</string>
+    <string name="shared_string_gpx_waypoints">Sporets rutepunkter</string>
     <string name="favourites_group">Favoritkategori</string>
     <string name="add_group">Tilføj en gruppe</string>
     <string name="add_group_descr">Importer grupper fra favoritter eller et spor af rutepunkter.</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 2ea47e1953..beb2b86b18 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2958,7 +2958,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="go_to_next_field">Nächstes Feld</string>
     <string name="rename_marker">Markierung umbenennen</string>
     <string name="mark_passed">Markierung passiert</string>
-    <string name="track_waypoints">GPX-Wegpunkte</string>
+    <string name="shared_string_gpx_waypoints">GPX-Wegpunkte</string>
     <string name="modify_the_search_query">Suchanfrage verändern.</string>
     <string name="empty_state_osm_edits">Erstellen oder ändern von OSM-Objekten</string>
     <string name="empty_state_osm_edits_descr">OSM-POI erstellen oder verändern, OSM-Notizen eröffnen oder bearbeiten, und aufgezeichnete GPX-Dateien hinzufügen.</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index a5d313d7f0..366a81482e 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1899,7 +1899,7 @@
     <string name="appearance_on_the_map">Εμφάνιση στον χάρτη</string>
     <string name="add_track_to_markers_descr">Τα σημεία διαδρομής μπορούν να προστεθούν σε δείκτες επιλέγοντας ένα από αυτά τα ίχνη που τα έχει.</string>
     <string name="add_favourites_group_to_markers_descr">Επιλέξτε μια αγαπημένη κατηγορία για να προσθέσετε στους δείκτες.</string>
-    <string name="track_waypoints">Σημεία διαδρομής ίχνους</string>
+    <string name="shared_string_gpx_waypoints">Σημεία διαδρομής ίχνους</string>
     <string name="favourites_group">Κατηγορία αγαπημένων</string>
     <string name="add_group">Προσθήκη ομάδας</string>
     <string name="add_group_descr">Εισάγετε ομάδες από αγαπημένα ή σημεία διαδρομής ίχνους.</string>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 02804733e3..f392a9ea33 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -2801,7 +2801,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="appearance_on_the_map">Aspekto sur la mapo</string>
     <string name="add_track_to_markers_descr">Oni povas aldoni navigadpunktojn al map-markoj per elekti iun kurson enhavantan ilin.</string>
     <string name="add_favourites_group_to_markers_descr">Elektu grupon de ŝatataj por aldoni al map-markoj.</string>
-    <string name="track_waypoints">Navigadpunktoj de kurso</string>
+    <string name="shared_string_gpx_waypoints">Navigadpunktoj de kurso</string>
     <string name="favourites_group">Kategorio de ŝatataj</string>
     <string name="add_group">Aldoni grupon</string>
     <string name="add_group_descr">Enportu grupon el ŝatataj aŭ navigadpunktojn de kurso.</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 8683b191db..980cfebfc4 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2840,7 +2840,7 @@ Lon %2$s</string>
     <string name="go_to_next_field">Siguiente campo</string>
     <string name="add_track_to_markers_descr">Los puntos de referencia pueden añadirse a los marcadores eligiendo una de estas trazas.</string>
     <string name="add_favourites_group_to_markers_descr">Elige una categoría de favoritos para añadir a los marcadores.</string>
-    <string name="track_waypoints">Puntos de referencia de la traza</string>
+    <string name="shared_string_gpx_waypoints">Puntos de referencia de la traza</string>
     <string name="favourites_group">Categoría de favoritos</string>
     <string name="add_group">Añadir un grupo</string>
     <string name="add_group_descr">Importar grupos de favoritos o puntos de referencia de la traza.</string>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index b60421a010..3bb93654f0 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -2842,7 +2842,7 @@ Lon %2$s</string>
     <string name="rename_marker">Renombrar marcador</string>
     <string name="add_track_to_markers_descr">Los puntos de referencia pueden añadirse a los marcadores eligiendo una de estas trazas.</string>
     <string name="add_favourites_group_to_markers_descr">Elige una categoría de favoritos para añadir a los marcadores.</string>
-    <string name="track_waypoints">Puntos de referencia de la traza</string>
+    <string name="shared_string_gpx_waypoints">Puntos de referencia de la traza</string>
     <string name="favourites_group">Categoría de favoritos</string>
     <string name="add_group">Añadir un grupo</string>
     <string name="add_group_descr">Importar grupos de favoritos o puntos de referencia de la traza.</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 268cf3f782..129afe7ce6 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -2835,7 +2835,7 @@
     <string name="appearance_on_the_map">Apariencia en el mapa</string>
     <string name="add_track_to_markers_descr">Los puntos de ruta pueden añadirse a los marcadores seleccionando una de estas trazas.</string>
     <string name="add_favourites_group_to_markers_descr">Selecciona una categoría de favoritos para añadir a los marcadores.</string>
-    <string name="track_waypoints">Puntos de ruta de la traza</string>
+    <string name="shared_string_gpx_waypoints">Puntos de ruta de la traza</string>
     <string name="favourites_group">Categoría de favoritos</string>
     <string name="add_group">Añadir un grupo</string>
     <string name="add_group_descr">Importar grupos de favoritos o puntos de ruta de la traza.</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index b89f7f7a58..5621c3feb4 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -2966,7 +2966,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="appearance_on_the_map">Maparen itxura</string>
     <string name="add_track_to_markers_descr">Bide-puntuak markatzaileetara gehitu ahal dira, bide-puntuak dituzten lorratz hauetako bat hautatuz.</string>
     <string name="add_favourites_group_to_markers_descr">Hautatu gogoko kategoria bat markatzaileetara gehitzeko.</string>
-    <string name="track_waypoints">Lorratzaren bide-puntuak</string>
+    <string name="shared_string_gpx_waypoints">Lorratzaren bide-puntuak</string>
     <string name="favourites_group">Gogokoak kategoria</string>
     <string name="add_group">Gehitu talde bat</string>
     <string name="add_group_descr">"Inportatu taldeak  gogokoetatik eta lorratzaren bide-puntuetatik."</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 6ebae29677..c0b3f57004 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -3026,7 +3026,7 @@
     <string name="appearance_on_the_map">تنظیمات ظاهری</string>
     <string name="add_track_to_markers_descr">مسیری را انتخاب کنید تا نقاط بین‌راهیِ آن به نشانه‌ها اضافه شود.</string>
     <string name="add_favourites_group_to_markers_descr">یک گروه از نقاط برگزیده را انتخاب کنید تا به نشانه‌ها اضافه شود.</string>
-    <string name="track_waypoints">نقاط بین‌راهی مسیر</string>
+    <string name="shared_string_gpx_waypoints">نقاط بین‌راهی مسیر</string>
     <string name="favourites_group">گروه نقاط برگزیده</string>
     <string name="add_group">افزودن گروه</string>
     <string name="add_group_descr">گروهی از نقاط برگزیده یا نقاط بین‌راهی را وارد کنید.</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 9d65b4b55d..aaa939bc37 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -3007,7 +3007,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="appearance_on_the_map">Apparence sur la carte</string>
     <string name="add_track_to_markers_descr">Les étapes peuvent être ajoutées comme marques en sélectionnant l\'une des traces possédant des étapes.</string>
     <string name="add_favourites_group_to_markers_descr">Sélectionnez une catégorie de favoris à ajouter aux marques.</string>
-    <string name="track_waypoints">Points de passage</string>
+    <string name="shared_string_gpx_waypoints">Points de passage</string>
     <string name="favourites_group">Catégorie de favoris</string>
     <string name="add_group">Ajouter un groupe</string>
     <string name="add_group_descr">Importez des groupes depuis des favoris ou des points de passage.</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 80e1e96101..0c9fe45295 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -1534,7 +1534,7 @@
     <string name="appearance_on_the_map">הופעה על המפה</string>
     <string name="add_track_to_markers_descr">ניתן להוסיף נקודות דרך לסמנים על ידי בחירת אחד המסלולים שבו יש אותם.</string>
     <string name="add_favourites_group_to_markers_descr">נא לבחור קטגוריה מועדפת להוספה לסמנים.</string>
-    <string name="track_waypoints">נקודות דרך במסלול</string>
+    <string name="shared_string_gpx_waypoints">נקודות דרך במסלול</string>
     <string name="favourites_group">קטגוריית מועדפים</string>
     <string name="add_group">הוספת קבוצה</string>
     <string name="add_group_descr">ניתן לייבא קבוצות ממועדפים או נקודות דרך של מסלול.</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 14033a9da6..b49fe0cb23 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -2840,7 +2840,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="appearance_on_the_map">Megjelenítés a térképen</string>
     <string name="add_track_to_markers_descr">Útpontokat adhatsz a térképjelölőkhöz, kiválasztva egy őket tartalmazó nyomvonalat.</string>
     <string name="add_favourites_group_to_markers_descr">Válassz egy kedvencek kategóriát, amikből jelölőt készítenél.</string>
-    <string name="track_waypoints">Nyomvonal útpontok</string>
+    <string name="shared_string_gpx_waypoints">Nyomvonal útpontok</string>
     <string name="favourites_group">Kedvencek kategória</string>
     <string name="add_group">Csoport hozzáadása</string>
     <string name="add_group_descr">Csoportok importálása kedvencekből vagy nyomvonal útpontból.</string>
diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml
index aadc9076f1..e540161e23 100644
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@@ -2580,7 +2580,7 @@
     <string name="shared_string_action_name">Գործողության անունը</string>
     <string name="mappilary_no_internet_desc">Mapillary-ից լուսանկարներ դիտելու համար Ձեզ անհրաժեշտ է ինտերնետ:</string>
     <string name="retry">Կրկնել</string>
-    <string name="track_waypoints">Տրեկի (track) կետերը</string>
+    <string name="shared_string_gpx_waypoints">Տրեկի (track) կետերը</string>
     <string name="add_group">Ավելացնել խումբ</string>
     <string name="add_group_descr">Ներմուծել խումբեր «Սիրված»-ներից կամ տրեկի կետերից:</string>
     <string name="empty_state_markers_groups">Ներմուծել խմբերը</string>
diff --git a/OsmAnd/res/values-id/strings.xml b/OsmAnd/res/values-id/strings.xml
index 9d0bae3a78..669ea4dd45 100644
--- a/OsmAnd/res/values-id/strings.xml
+++ b/OsmAnd/res/values-id/strings.xml
@@ -99,7 +99,7 @@
     <string name="appearance_on_the_map">Tampilan pada peta</string>
     <string name="add_track_to_markers_descr">Pilih satu trek untuk ditambahkannya trek tanda arah ke penanda. (Hanya trek dengan penanda arah saja yang terdaftar)</string>
     <string name="add_favourites_group_to_markers_descr">Pilih satu kategori favorit untuk menambahkan ke penanda.</string>
-    <string name="track_waypoints">Melacak titik arah</string>
+    <string name="shared_string_gpx_waypoints">Melacak titik arah</string>
     <string name="favourites_group">Kategori Favorit</string>
     <string name="add_group">Tambahkan sebuah grup</string>
     <string name="add_group_descr">Anda bisa mengimpor grup dari favorit atau lacak titik arah.</string>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index 381dd6f3a4..9e8d318935 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -2300,7 +2300,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="looking_for_tracks_with_waypoints">Leita að ferlum með ferilpunktum</string>
     <string name="shared_string_more_without_dots">Meira</string>
     <string name="appearance_on_the_map">Framsetning á korti</string>
-    <string name="track_waypoints">Ferilpunktar í ferli</string>
+    <string name="shared_string_gpx_waypoints">Ferilpunktar í ferli</string>
     <string name="favourites_group">Flokkur eftirlæta</string>
     <string name="add_group">Bæta við hópi</string>
     <string name="empty_state_markers_active">Búa til kortamerki!</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index ce1a00e958..50f793629c 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2941,7 +2941,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="appearance_on_the_map">Visualizzazione nella mappa</string>
     <string name="add_track_to_markers_descr">I punti intermedi possono essere aggiunti ai marcatori selezionando una traccia che ne contiene.</string>
     <string name="add_favourites_group_to_markers_descr">Scegli una categoria di luoghi preferiti da aggiungere ai marcatori.</string>
-    <string name="track_waypoints">Punti intermedi della traccia</string>
+    <string name="shared_string_gpx_waypoints">Punti intermedi della traccia</string>
     <string name="favourites_group">Categoria di luoghi preferiti</string>
     <string name="add_group">Aggiungi un gruppo</string>
     <string name="add_group_descr">Puoi importare un gruppo dai preferiti o i punti intermedi di una traccia.</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index ede2fc7186..63fdcc7b9c 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -3056,7 +3056,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="active_markers_descr">マーカーの方向と距離に関する情報の表示数を選択してください。</string>
     <string name="favourites_group">お気に入り地点のカテゴリ</string>
     <string name="empty_state_markers_active_desc">任意の場所をロングまたはショートタップで指定後、旗のボタンでマーカーを作成します。</string>
-    <string name="track_waypoints">経路データ内の経由地点</string>
+    <string name="shared_string_gpx_waypoints">経路データ内の経由地点</string>
     <string name="show_passed">通過済みも表示</string>
     <string name="hide_passed">通過済みは非表示</string>
     <string name="import_track_desc">ファイル %1$s は経由地点を含んでいません、それでも経路としてインポートしますか？</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 8c21521d36..abd6f848f8 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -2596,7 +2596,7 @@
     <string name="rendering_value_translucent_pink_name">Gjennomskinnelig rosa</string>
     <string name="modify_the_search_query">Endre søkeord.</string>
     <string name="looking_for_tracks_with_waypoints">Ser etter spor med rutepunkter</string>
-    <string name="track_waypoints">Spor-rutepunkter</string>
+    <string name="shared_string_gpx_waypoints">Spor-rutepunkter</string>
     <string name="add_group_descr">Importer grupper fra favoritter eller spor-rutepunkter.</string>
     <string name="empty_state_markers_groups_desc">Importer favorittgrupper eller spor-rutepunkter som markører.</string>
     <string name="show_guide_line_descr">Vis veivisningslinjer fra din posisjon til de aktive markørplasseringene.</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index b25f92bc68..6cc1cf0c01 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -2890,7 +2890,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
 	<string name="shared_string_back">Wróć</string>
 	<string name="view">Wyświetl</string>
 	<string name="waypoints_added_to_map_markers">Dodano punkty pośrednie do znaczników mapy</string>
-	<string name="track_waypoints">Punkty śladu</string>
+	<string name="shared_string_gpx_waypoints">Punkty śladu</string>
     <string name="favourites_group">Kategoria ulubionych</string>
     <string name="add_group">"Dodaj grupę "</string>
     <string name="add_group_descr">Możesz importować grupy z ulubionych lub tras punktów.</string>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 2bd25be0de..1e63c45a59 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -2303,7 +2303,7 @@ Pôr do Sol: %2$s</string>
     <string name="appearance_on_the_map">Aparência no mapa</string>
     <string name="add_track_to_markers_descr">Pontos de passagem podem ser adicionados a marcadores selecionando uma dessas trilhas que os tem.</string>
     <string name="add_favourites_group_to_markers_descr">Selecione uma categoria favorita para adicionar aos marcadores.</string>
-    <string name="track_waypoints">Pontos de passagem de trilhas</string>
+    <string name="shared_string_gpx_waypoints">Pontos de passagem de trilhas</string>
     <string name="favourites_group">Categoria favoritos</string>
     <string name="add_group">Adicionar um grupo</string>
     <string name="add_group_descr">Você pode importar grupos dos favoritos ou pontos de passagem de trilhas.</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index d291ab9bc0..516c4fb244 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -1933,7 +1933,7 @@
     <string name="appearance_on_the_map">Apariția pe hartă</string>
     <string name="add_track_to_markers_descr">Selectează un track pentru a-i adăuga un punct intermediar la marcaje. (Numai trackurile cu puncte intermediare sunt listate.)</string>
     <string name="add_favourites_group_to_markers_descr">Selectează o categorie de favorite pentru a fi adaugată la marcaje.</string>
-    <string name="track_waypoints">Puncte intermediare pentru track</string>
+    <string name="shared_string_gpx_waypoints">Puncte intermediare pentru track</string>
     <string name="favourites_group">Categorie favorite</string>
     <string name="add_group">Adaugă un grup</string>
     <string name="add_group_descr">Puteți importa grupuri din favorite sau puncte intermediare de trackuri</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 299f615e34..1203f5ef6e 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -2712,7 +2712,7 @@
     <string name="mark_passed">Отметить пройденным</string>
     <string name="import_track_desc">Файл %1$s не содержит путевых точек, импортировать его как трек?</string>
     <string name="add_track_to_markers_descr">Путевые точки можно добавить к маркерам выбрав один из этих треков, содержащих их.</string>
-    <string name="track_waypoints">Трек путевых точек</string>
+    <string name="shared_string_gpx_waypoints">Трек путевых точек</string>
     <string name="shared_string_right">Направо</string>
     <string name="shared_string_left">Налево</string>
     <string name="show_number_pad">Показать цифровую панель</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 2920255e9c..f69f6dc26a 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2986,7 +2986,7 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="appearance_on_the_map">Visualizatzione in sa mapa</string>
     <string name="add_track_to_markers_descr">Sos puntos de coladòrgiu podent èssere annantos a sos marcadores ischertende una de sas rastas chi los tenet.</string>
     <string name="add_favourites_group_to_markers_descr">Issèbera una categoria de preferidos pro l\'annànghere a sos marcadores.</string>
-    <string name="track_waypoints">Puntos de coladòrgiu</string>
+    <string name="shared_string_gpx_waypoints">Puntos de coladòrgiu</string>
     <string name="favourites_group">Categoria de preferidos</string>
     <string name="add_group">Annanghe unu grupu</string>
     <string name="add_group_descr">Importa unu grupu de preferidos o puntos de coladòrgiu de una rasta.</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 18e76d2bc8..0b2bb678a0 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2828,7 +2828,7 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="appearance_on_the_map">Vzhľad na mape</string>
     <string name="add_track_to_markers_descr">Waypointy môžu byť pridané k značkám zvolením jednej stopy, ktorá ich obsahuje.</string>
     <string name="add_favourites_group_to_markers_descr">Zvoľte kategóriu obľúbených bodov, ktoré majú byť pridané k značkám.</string>
-    <string name="track_waypoints">Body stopy</string>
+    <string name="shared_string_gpx_waypoints">Body stopy</string>
     <string name="favourites_group">Kategória obľúbených bodov</string>
     <string name="add_group">Pridať skupinu</string>
     <string name="add_group_descr">Importovať skupiny z obľúbených bodov alebo waypointov stopy.</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 0bc86e0252..c96bf241bc 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -2859,7 +2859,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="marker_save_as_track_descr">Izvozi oznake v datoteko:</string>
     <string name="make_active">Označi kot dejavno</string>
     <string name="appearance_on_the_map">Prikaz na zemljevidu</string>
-    <string name="track_waypoints">Vmesne točke sledi</string>
+    <string name="shared_string_gpx_waypoints">Vmesne točke sledi</string>
     <string name="favourites_group">Kategorija priljubljenih</string>
     <string name="add_group">Dodaj skupino</string>
     <string name="empty_state_markers_groups">Uvoz skupin</string>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 90acc6f8ad..e039085e52 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -1554,7 +1554,7 @@
     <string name="shared_string_more_without_dots">Још</string>
     <string name="add_track_to_markers_descr">Пролазне тачке се могу додати на маркере тако што се означе оне путање које их садрже.</string>
     <string name="add_favourites_group_to_markers_descr">Изаберите омиљену категорију за додавање ознакама.</string>
-    <string name="track_waypoints">Пролазне тачке путање</string>
+    <string name="shared_string_gpx_waypoints">Пролазне тачке путање</string>
     <string name="favourites_group">Омиљена категорија</string>
     <string name="add_group">Додај скуп</string>
     <string name="add_group_descr">Увозите групе из омиљених или пролазних тачака путање.</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 98d5b0a64c..c257398286 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2736,7 +2736,7 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="empty_state_av_notes_desc">Lägg till ljud-, video- eller fotonotering för varje punkt på kartan, med hjälp av widgeten eller menyn.</string>
     <string name="add_track_to_markers_descr">Välj ett spår att lägga till sina waypoints till markörer. (Endast spår med waypoints visas.)</string>
     <string name="add_favourites_group_to_markers_descr">Välj en favoritkategori för att lägga till markörer.</string>
-    <string name="track_waypoints">Spåra waypoints</string>
+    <string name="shared_string_gpx_waypoints">Spåra waypoints</string>
     <string name="favourites_group">Kategorin Favoriter</string>
     <string name="add_group">Lägg till en grupp</string>
     <string name="add_group_descr">Du kan importera grupper från favoriter eller spår-waypoints.</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index f97ed65ccf..56277e8dbf 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -3062,7 +3062,7 @@
     <string name="appearance_on_the_map">Поява на мапі</string>
     <string name="add_track_to_markers_descr">Виберіть трек для додавання шляхових точок (показані лише треки з точками)</string>
     <string name="add_favourites_group_to_markers_descr">Виберіть категорію закладок для додавання до маркерів.</string>
-    <string name="track_waypoints">Шляхові точки треку</string>
+    <string name="shared_string_gpx_waypoints">Шляхові точки треку</string>
     <string name="favourites_group">Категорія закладок</string>
     <string name="add_group">Додати групу</string>
     <string name="add_group_descr">Ви можете імпортувати групу з закладок або шляхових точок.</string>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index af6009d009..e62e577971 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -2688,7 +2688,7 @@
     <string name="appearance_on_the_map">在地图上的外观</string>
     <string name="add_track_to_markers_descr">选择一个轨迹一遍添加它的航路点到标记。（只有有航路点的轨迹才会列举出来。）</string>
     <string name="add_favourites_group_to_markers_descr">选择一个收藏夹类别以便添加到标记。</string>
-    <string name="track_waypoints">轨迹航路点</string>
+    <string name="shared_string_gpx_waypoints">轨迹航路点</string>
     <string name="favourites_group">收藏夹类别</string>
     <string name="add_group">添加组</string>
     <string name="add_group_descr">您可以从收藏夹或轨道航点导入组。</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 9d58a919fc..7798d06537 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2988,7 +2988,7 @@
     <string name="appearance_on_the_map">顯現在地圖上</string>
     <string name="add_track_to_markers_descr">航點可以藉著選擇這些軌跡其中的一個增加到標記。</string>
     <string name="add_favourites_group_to_markers_descr">選擇您想增加標記的收藏類別。</string>
-    <string name="track_waypoints">軌跡航點</string>
+    <string name="shared_string_gpx_waypoints">軌跡航點</string>
     <string name="favourites_group">我的收藏類別</string>
     <string name="add_group">新增群組</string>
     <string name="add_group_descr">從我的收藏匯入群組或軌跡航點。</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 0ce94ec153..9646d4b459 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -178,7 +178,7 @@
     <string name="appearance_on_the_map">Appearance on the map</string>
     <string name="add_track_to_markers_descr">Select a GPX file to add its waypoints to the markers.</string>
     <string name="add_favourites_group_to_markers_descr">Select a favorite category to add to the markers.</string>
-    <string name="track_waypoints">GPX waypoints</string>
+    <string name="shared_string_gpx_waypoints">GPX waypoints</string>
     <string name="favourites_group">Favorites category</string>
     <string name="add_group">Add a group</string>
     <string name="add_group_descr">Import groups from favorites or GPX waypoints.</string>
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectionMarkersGroupBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectionMarkersGroupBottomSheetDialogFragment.java
index e6e3c27c8b..e06ec566c3 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectionMarkersGroupBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectionMarkersGroupBottomSheetDialogFragment.java
@@ -44,7 +44,7 @@ public class SelectionMarkersGroupBottomSheetDialogFragment extends MenuBottomSh
 
 		BaseBottomSheetItem waypointsItem = new SimpleBottomSheetItem.Builder()
 				.setIcon(getContentIcon(R.drawable.ic_action_polygom_dark))
-				.setTitle(getString(R.string.track_waypoints))
+				.setTitle(getString(R.string.shared_string_gpx_waypoints))
 				.setLayoutId(R.layout.bottom_sheet_item_simple)
 				.setOnClickListener(new View.OnClickListener() {
 					@Override