From af298c7e0acd49383e496fdc4db818b553daf0ea Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Thu, 17 May 2018 13:48:21 +0200
Subject: [PATCH] shared_string_waypoint

---
 OsmAnd/res/values-ar/strings.xml                              | 2 +-
 OsmAnd/res/values-az/strings.xml                              | 2 +-
 OsmAnd/res/values-be-rBY/strings.xml                          | 2 +-
 OsmAnd/res/values-be/strings.xml                              | 2 +-
 OsmAnd/res/values-bg/strings.xml                              | 2 +-
 OsmAnd/res/values-ca/strings.xml                              | 2 +-
 OsmAnd/res/values-cs/strings.xml                              | 2 +-
 OsmAnd/res/values-da/strings.xml                              | 2 +-
 OsmAnd/res/values-de/strings.xml                              | 2 +-
 OsmAnd/res/values-el/strings.xml                              | 2 +-
 OsmAnd/res/values-eo/strings.xml                              | 2 +-
 OsmAnd/res/values-es-rAR/strings.xml                          | 2 +-
 OsmAnd/res/values-es-rUS/strings.xml                          | 2 +-
 OsmAnd/res/values-es/strings.xml                              | 2 +-
 OsmAnd/res/values-eu/strings.xml                              | 2 +-
 OsmAnd/res/values-fa/strings.xml                              | 2 +-
 OsmAnd/res/values-fi/strings.xml                              | 2 +-
 OsmAnd/res/values-fr/strings.xml                              | 2 +-
 OsmAnd/res/values-gl/strings.xml                              | 2 +-
 OsmAnd/res/values-he/strings.xml                              | 2 +-
 OsmAnd/res/values-hr/strings.xml                              | 2 +-
 OsmAnd/res/values-hu/strings.xml                              | 2 +-
 OsmAnd/res/values-hy/strings.xml                              | 2 +-
 OsmAnd/res/values-is/strings.xml                              | 2 +-
 OsmAnd/res/values-it/strings.xml                              | 2 +-
 OsmAnd/res/values-ja/strings.xml                              | 2 +-
 OsmAnd/res/values-ko/strings.xml                              | 2 +-
 OsmAnd/res/values-lt/strings.xml                              | 2 +-
 OsmAnd/res/values-lv/strings.xml                              | 2 +-
 OsmAnd/res/values-ml/strings.xml                              | 2 +-
 OsmAnd/res/values-nb/strings.xml                              | 2 +-
 OsmAnd/res/values-nl/strings.xml                              | 2 +-
 OsmAnd/res/values-nn/strings.xml                              | 2 +-
 OsmAnd/res/values-pl/strings.xml                              | 2 +-
 OsmAnd/res/values-pt-rBR/strings.xml                          | 2 +-
 OsmAnd/res/values-pt/strings.xml                              | 2 +-
 OsmAnd/res/values-ro/strings.xml                              | 2 +-
 OsmAnd/res/values-ru/strings.xml                              | 2 +-
 OsmAnd/res/values-sc/strings.xml                              | 2 +-
 OsmAnd/res/values-sk/strings.xml                              | 2 +-
 OsmAnd/res/values-sl/strings.xml                              | 2 +-
 OsmAnd/res/values-sr/strings.xml                              | 2 +-
 OsmAnd/res/values-sv/strings.xml                              | 2 +-
 OsmAnd/res/values-tr/strings.xml                              | 2 +-
 OsmAnd/res/values-uk/strings.xml                              | 2 +-
 OsmAnd/res/values-zh-rCN/strings.xml                          | 2 +-
 OsmAnd/res/values-zh-rTW/strings.xml                          | 2 +-
 OsmAnd/res/values/strings.xml                                 | 2 +-
 OsmAnd/src/net/osmand/data/PointDescription.java              | 2 +-
 .../plus/mapcontextmenu/controllers/WptPtMenuController.java  | 4 ++--
 .../plus/mapcontextmenu/editors/WptPtEditorFragment.java      | 2 +-
 51 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index f44d444846..c95bd65907 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -1297,7 +1297,7 @@
     <string name="sort_by_name">ترتيب حسب الاسم</string>
     <string name="show_zoom_buttons_navigation_descr">"عرض  أزرار التقريب أثناء الملاحة."</string>
     <string name="select_destination_and_intermediate_points">حدد الوجهات</string>
-    <string name="gpx_wpt">إحداثية</string>
+    <string name="shared_string_waypoint">إحداثية</string>
     <string name="rendering_attr_hideHouseNumbers_name">أرقام المنازل</string>
     <string name="confirm_usage_speed_cameras">غير مسموح استخدام تحذيرات كاميرا السرعة بالقانون في العديد من البلدان (ألمانيا وفرنسا، وإيطاليا، وغيرها). أوسماند لا تتحمل أي مسؤولية إذا كنت تنتهك القانون. الرجاء انقر نعم فقط إذا كنت مؤهلاً استخدام هذه الميزة.</string>
 	<string name="osm_changes_added_to_local_edits">تم إضافة تعديلات OSM إلى التغييرات المحلية</string>
diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml
index cd61ab5fa6..65ba54fe86 100644
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@@ -884,7 +884,7 @@
     <string name="gpx_split_interval">Bölünmə intervalı</string>
     <string name="save_as_favorites_points">Favorit qrup olaraq saxla</string>
     <string name="select_destination_and_intermediate_points">Təyinat nöqtələrini seçin</string>
-    <string name="gpx_wpt">Yol nöqtəsi</string>
+    <string name="shared_string_waypoint">Yol nöqtəsi</string>
     <string name="gpx_info_waypoints">Yol nöqtələri: %1$s</string>
     <string name="gpx_info_distance">Məsafə: %1$s (%2$s nöqtə)</string>
     <string name="gpx_info_average_speed">Ortalama sürət: %1$s</string>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 4afb8d8545..4646714591 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -200,7 +200,7 @@
     <string name="layer_amenity_label">Nazvy POI-nakladki</string>
     <string name="loading_smth">Čytańnie %1$s…</string>
     <string name="map_widget_plain_time">Ciapierašni čas</string>
-    <string name="gpx_wpt">Punkt šlachu</string>
+    <string name="shared_string_waypoint">Punkt šlachu</string>
     <string name="selected_gpx_info_show">"
 \n
 \nDoŭha ŭtrymlivajcie, kab ubačyć na mapie"</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 1386841bfa..df5611a580 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -1432,7 +1432,7 @@
     <string name="gpx_info_asc_altitude">Пад’ём/спад: %1$s</string>
     <string name="loading_smth">Чытаньне %1$s…</string>
     <string name="map_widget_plain_time">Цяперашні час</string>
-    <string name="gpx_wpt">Пункт шляху</string>
+    <string name="shared_string_waypoint">Пункт шляху</string>
     <string name="selected_gpx_info_show">"
 \n
 \nДоўга ўтрымлівайце, каб убачыць на мапе"</string>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index 070822af40..222ef6293c 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -1295,7 +1295,7 @@
     <string name="layer_amenity_label">Етикети на точките</string>
     <string name="loading_smth">Зареждане %1$s …</string>
     <string name="map_widget_plain_time">Текущо време</string>
-    <string name="gpx_wpt">Точка</string>
+    <string name="shared_string_waypoint">Точка</string>
     <string name="selected_gpx_info_show">\n\nНатиснете и задръжте за показване на картата</string>
     <string name="text_size_descr">Въведете размер на текста върху картата.</string>
     <string name="text_size">Размер на текста</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 45f53e3140..879e6030dd 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1285,7 +1285,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
     <string name="gpx_info_avg_altitude">Alçada mitjana: %1$s</string>
     <string name="loading_smth">S\'està carregant %1$s…</string>
     <string name="map_widget_plain_time">Hora actual</string>
-    <string name="gpx_wpt">Fita</string>
+    <string name="shared_string_waypoint">Fita</string>
     <string name="selected_gpx_info_show">"
 \n
 \nPremeu contínuament per veure al mapa"</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index a85735e896..8fa020fbf5 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1316,7 +1316,7 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
     <string name="gpx_selection_route_points">%1$s \nBody trasy %2$s</string>
     <string name="gpx_selection_points">%1$s \nBody</string>
     <string name="gpx_selection_track">%1$s \nTrasa %2$s</string>
-    <string name="gpx_wpt">Bod na trase</string>
+    <string name="shared_string_waypoint">Bod na trase</string>
     <string name="selected_gpx_info_show">"
 \n
 \nStiskněte a podržte pro zobrazení na mapě"</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 8ab88f2b57..8160b89c99 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1433,7 +1433,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
 
     <string name="gpx_info_subtracks">Underspor: %1$s </string>
     <string name="map_widget_plain_time">Aktuel tid</string>
-    <string name="gpx_wpt">Rutepunkt</string>
+    <string name="shared_string_waypoint">Rutepunkt</string>
     <string name="selected_gpx_info_show">"
 \n
 \nLangt tryk for at se på kortet"</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index f939b27b3d..7f13e4bbe9 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1522,7 +1522,7 @@ Proportionaler Speicher %4$s MB (Android Limit %5$s MB, Dalvik %6$s MB).</string
 	<string name="gpx_monitoring_start">GPX-Aufzeichnung starten</string>
 	<string name="gpx_monitoring_stop">GPX-Aufzeichnung beenden</string>
 	<string name="gpx_start_new_segment">Neues Segment starten</string>
-	<string name="gpx_wpt">Wegpunkt</string>
+	<string name="shared_string_waypoint">Wegpunkt</string>
 	<string name="gpx_visibility_txt">Sichtbarkeit</string>
 	<string name="gpx_tags_txt">Tags</string>
 	<string name="gpx_description_txt">Beschreibung</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 69add721fc..a45ea588d6 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1292,7 +1292,7 @@
     
     <string name="gpx_split_interval">Διάστημα διαχωρισμού</string>
     <string name="select_destination_and_intermediate_points">Επιλέξτε προορισμούς</string>
-    <string name="gpx_wpt">Σημείο διαδρομής</string>
+    <string name="shared_string_waypoint">Σημείο διαδρομής</string>
     <string name="gpx_info_subtracks">"Υποΐχνη: %1$s "</string>
 	<string name="gpx_info_waypoints">"Σημεία διαδρομής: %1$s "</string>
 	<string name="gpx_timespan">Χρονική διάρκεια: %1$s</string>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 48ecc18965..dacbc93cb5 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -784,7 +784,7 @@ Lon: %2$s</string>
     <string name="layer_amenity_label">Etikedoj de interesejoj</string>
     <string name="loading_smth">Ŝargado de %1$s…</string>
     <string name="map_widget_plain_time">Nuna tempo</string>
-    <string name="gpx_wpt">Navigadpunkto</string>
+    <string name="shared_string_waypoint">Navigadpunkto</string>
     <string name="selected_gpx_info_show">"
 \n
 \nPremtenu por vidigi sur la mapo"</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 2a82cda22f..10adcf74fc 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -271,7 +271,7 @@ Lon %2$s</string>
     <string name="layer_amenity_label">Nombres de PDI superpuestos</string>
     <string name="loading_smth">Cargando %1$s…</string>
     <string name="map_widget_plain_time">Tiempo actual</string>
-    <string name="gpx_wpt">Punto de referencia</string>
+    <string name="shared_string_waypoint">Punto de referencia</string>
     <string name="selected_gpx_info_show">"
 \n
 \nMantén pulsado para ver en el mapa"</string>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 0323db78ee..370d382d55 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -271,7 +271,7 @@ Lon %2$s</string>
     <string name="layer_amenity_label">Nombres de PDI superpuestos</string>
     <string name="loading_smth">Cargando %1$s…</string>
     <string name="map_widget_plain_time">Tiempo actual</string>
-    <string name="gpx_wpt">Punto de referencia</string>
+    <string name="shared_string_waypoint">Punto de referencia</string>
     <string name="selected_gpx_info_show">"
 \n
 \nMantén pulsado para ver en el mapa"</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index fc763146a0..8d529618c0 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1339,7 +1339,7 @@
     <string name="gpx_info_diff_altitude">Rango de altitud: %1$s</string>
     <string name="gpx_info_asc_altitude">Descendido/ascendido: %1$s</string>
     <string name="map_widget_plain_time">Tiempo actual</string>
-    <string name="gpx_wpt">Punto de ruta</string>
+    <string name="shared_string_waypoint">Punto de ruta</string>
     <string name="select_destination_and_intermediate_points">Marque los destinos</string>
     <string name="layer_amenity_label">Nombres de PDI superpuestos</string>
     <string name="save_as_favorites_points">Guardar como grupo de favoritos</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 677d005d10..7c276e0f85 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -1736,7 +1736,7 @@ Lorratza %2$s</string>
     <string name="access_collapsed_list">Tolestutako zerrenda</string>
     <string name="access_expanded_list">Zabaldutako zerrenda</string>
     <string name="waypoints">Bide-puntuak</string>
-    <string name="gpx_wpt">Bide-puntua</string>
+    <string name="shared_string_waypoint">Bide-puntua</string>
     <string name="gpx_info_waypoints">Bide-puntuak: %1$s</string>
     <string name="configure_map">Konfiguratu mapa</string>
     
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 8160598b22..146ffb470a 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -1500,7 +1500,7 @@
     
     <string name="loading_smth">بارگیری %1$s…</string>
     <string name="map_widget_plain_time">زمان جاری</string>
-    <string name="gpx_wpt">نقطهٔ بین‌راهی</string>
+    <string name="shared_string_waypoint">نقطهٔ بین‌راهی</string>
     <string name="selected_gpx_info_show">"
 \n
 \nبرای نمایش بر روی نقشه انگشت خود را چند لحظه بر روی صفحه نگه دارید"</string>
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index 13682ffc60..91e2ed5f3f 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -1833,7 +1833,7 @@ Jälki %2$s</string>
     <string name="select_destination_and_intermediate_points">Valitse päämäärät</string>
     <string name="loading_smth">Ladataan %1$s…</string>
     <string name="map_widget_plain_time">Aika nyt</string>
-    <string name="gpx_wpt">Väyläpiste</string>
+    <string name="shared_string_waypoint">Väyläpiste</string>
     <string name="gpx_info_waypoints">"Väyläpisteet: %1$s "</string>
     <string name="gpx_info_distance">"Etäisyys: %1$s (%2$s pistettä) "</string>
     <string name="gpx_info_start_time">"Lähtöaika: %1$tF, %1$tT "</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 1d93b2f417..15ebcfb0e4 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1480,7 +1480,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="gpx_selection_points">%1$s \nPoints</string>
     <string name="gpx_selection_track">%1$s \nTrace %2$s</string>
 
-    <string name="gpx_wpt">Itinéraire</string>
+    <string name="shared_string_waypoint">Itinéraire</string>
     <string name="map_widget_plain_time">Heure actuelle</string>
     <string name="loading_smth">Chargement de %1$s…</string>
     <string name="save_as_favorites_points">Enregistrer comme groupe de favoris</string>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 46c69b8d98..7629e0b4d5 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -128,7 +128,7 @@ As pistas gravadas pódense compartir ou empregar colaborando con OSM. Os atleta
     <string name="layer_amenity_label">Nomes dos puntos</string>
     <string name="loading_smth">A cargar %1$s…</string>
     <string name="map_widget_plain_time">Hora actual</string>
-    <string name="gpx_wpt">Punto de pasaxe</string>
+    <string name="shared_string_waypoint">Punto de pasaxe</string>
     <string name="selected_gpx_info_show">\n\nManteña premido para ver no mapa</string>
     <string name="delay_navigation_start">Iniciar a orientación paso a paso automaticamente</string>
     <string name="shared_string_selected_lowercase">seleccionado</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index b1a5e42d40..e08aef6a77 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -2778,7 +2778,7 @@
     <string name="fav_point_emoticons_message">שם הנקודה המועדפת השתנה לביטוי %1$s כדי להתאים כראוי לשמירת המחרוזת עם הרגשונים לקובץ.</string>
     <string name="save_track_interval_globally">הפרשי רישום</string>
     <string name="rendering_attr_hideWoodScrubs_name">עצים וצמחיה נמוכה</string>
-    <string name="gpx_wpt">נקודת דרך</string>
+    <string name="shared_string_waypoint">נקודת דרך</string>
     <string name="delay_navigation_start">התחלת הנחייה לפי פניות אוטומטית</string>
     <string name="gpx_timespan">טווח זמן: %1$s</string>
     <string name="index_item_world_seamarks">נקודות ציון ימיות</string>
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index d3ac7de887..7c25498e59 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -1208,7 +1208,7 @@
     <string name="rendering_attr_subwayMode_name">Podzemna željeznica</string>
  	
     
-    <string name="gpx_wpt">Međutočke</string>
+    <string name="shared_string_waypoint">Međutočke</string>
     <string name="gpx_info_subtracks">"Pod tragovi: %1$s "</string>
 	<string name="gpx_info_waypoints">"Međutočke: %1$s "</string>
 	<string name="gpx_info_end_time">"Završetak puta: %1$tF, %1$tT "</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 2b5bf27984..e5b41334cd 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -1351,7 +1351,7 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
     <string name="select_destination_and_intermediate_points">Célpontok kijelölése</string>
     <string name="layer_amenity_label">POI-rátétréteg feliratai</string>
     <string name="map_widget_plain_time">Jelenlegi idő</string>
-    <string name="gpx_wpt">Útpont</string>
+    <string name="shared_string_waypoint">Útpont</string>
     <string name="selected_gpx_info_show">\n\nTérképen megtekintéshez nyomd meg hosszan</string>
     <string name="delay_navigation_start">Navigáció indítása automatikusan</string>
     <string name="shared_string_selected_lowercase">kijelölve</string>
diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml
index 265fd3c0dd..5d0f7518b3 100644
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@@ -1269,7 +1269,7 @@
     <string name="layer_amenity_label">"POI  կետերի պիտակները"</string>
     <string name="loading_smth">Բեռնում %1$s…</string>
     <string name="map_widget_plain_time">Ընթացիկ ժամը</string>
-    <string name="gpx_wpt">Կետ</string>
+    <string name="shared_string_waypoint">Կետ</string>
     <string name="selected_gpx_info_show">"
 \n
 \nՍեխմեք և պահեք քարտեզի վրա տեսնելու համար"</string>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index b0fe5603fc..20333028ab 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -320,7 +320,7 @@
     <string name="select_destination_and_intermediate_points">Velja áfangastaði</string>
     <string name="loading_smth">Hleð inn %1$s…</string>
     <string name="map_widget_plain_time">Núverandi tími</string>
-    <string name="gpx_wpt">Ferilpunktur</string>
+    <string name="shared_string_waypoint">Ferilpunktur</string>
     <string name="gpx_info_waypoints">Ferilpunktar: %1$s</string>
     <string name="gpx_selection_segment_title">Bútur</string>
     <string name="gpx_selection_number_of_points">%1$s punktar</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 7402f1f82b..88a26b990d 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1419,7 +1419,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
 
     <string name="gpx_split_interval">Intervallo suddivisione</string>
     <string name="loading_smth">Caricamento di %1$s…</string>
-    <string name="gpx_wpt">Tappa</string>
+    <string name="shared_string_waypoint">Tappa</string>
     <string name="selected_gpx_info_show">\n\nTieni premuto per vederlo sulla mappa</string>
     <string name="delay_navigation_start">Avvia la navigazione passo per passo automaticamente</string>
     <string name="map_widget_plain_time">Orario attuale</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 61d64140cb..e6a3912c72 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -1438,7 +1438,7 @@ POIの更新は利用できません</string>
     <string name="layer_amenity_label">施設の名称</string>
     <string name="loading_smth">ロード中 %1$s …</string>
     <string name="map_widget_plain_time">現在時刻</string>
-    <string name="gpx_wpt">経由地点</string>
+    <string name="shared_string_waypoint">経由地点</string>
     <string name="selected_gpx_info_show">"
 \n
 \nマップ上に表示するにはロングタップしてください"</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index b9c6b5d096..588e5c5966 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -1501,7 +1501,7 @@
     
     <string name="loading_smth">%1$s 불러오는 중…</string>
     <string name="map_widget_plain_time">현재 시간</string>
-    <string name="gpx_wpt">경유지</string>
+    <string name="shared_string_waypoint">경유지</string>
     <string name="selected_gpx_info_show">\n\n지도를 보려면 누르고 계십시요</string>
     <string name="delay_navigation_start">순차적인 안내를 시작합니다</string>
     <string name="gpx_split_interval">분할 간격</string>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 5611e1e5c9..f1067bdd98 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1422,7 +1422,7 @@ Tam prireiks {1} MB pastoviam saugojimui.
     <string name="layer_amenity_label">LV sluoksnių pavadinimai</string>
     <string name="loading_smth">Įkeliama %1$s …</string>
     <string name="map_widget_plain_time">Dabartinis laikas</string>
-    <string name="gpx_wpt">Kelionės taškas</string>
+    <string name="shared_string_waypoint">Kelionės taškas</string>
     <string name="selected_gpx_info_show">\n\nPaspauskite ir laikykite kad pamatytumėte žemėlapyje</string>
     <string name="delay_navigation_start">Pradėti navigaciją automatiškai</string>
     <string name="shared_string_selected_lowercase">pasirinkti</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 974b822add..d436db0ae3 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -1453,7 +1453,7 @@ OsmAnd ir atvērtā koda navigācijas aplikācija ar piekļuvi vispusīgiem Open
     <string name="gpx_file_is_empty">Gpx treks ir tukšs</string>
     <string name="loading_smth">Ielādē %1$s…</string>
     <string name="map_widget_plain_time">Tekošais laiks</string>
-    <string name="gpx_wpt">Ceļapunkts</string>
+    <string name="shared_string_waypoint">Ceļapunkts</string>
     <string name="selected_gpx_info_show">\n\nTuriet nospiestu, lai rādītu uz kartes</string>
     <string name="delay_navigation_start">Automātiski uzsākt navigācijas vadību</string>
     <string name="shared_string_selected_lowercase">Izvēlēts</string>
diff --git a/OsmAnd/res/values-ml/strings.xml b/OsmAnd/res/values-ml/strings.xml
index 0588396a29..5b40315ee4 100644
--- a/OsmAnd/res/values-ml/strings.xml
+++ b/OsmAnd/res/values-ml/strings.xml
@@ -1627,7 +1627,7 @@
     <string name="map_preferred_locale_descr">"മേല്‍ക്കുറിപ്പുകളുടെ ഭാക്ഷ തെരഞ്ഞെടുക്കുക( ഈ ഭാക്ഷ ലഭ്യമല്ലെങ്കില്‍ ഇംഗ്ളീഷ്/പ്രാദേശിക ഭാക്ഷയിലേക്ക് മാറും) "</string>
     <string name="rendering_attr_moreDetailed_name">കൂടുതല്‍ വിവരങ്ങള്‍</string>
     <string name="rendering_attr_lessDetailed_name">കുറച്ച് വിവരങ്ങള്‍</string>
-    <string name="gpx_wpt">പാതബിന്ദു(വേപോയിന്റ്)</string>
+    <string name="shared_string_waypoint">പാതബിന്ദു(വേപോയിന്റ്)</string>
     <string name="gpx_file_is_empty">ജിപിഎക്സ് പാത ശൂന്യമാണ്</string>
     
     
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 6a58063260..e98d4a0da0 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -788,7 +788,7 @@
     <string name="rendering_attr_showSurfaces_name">Vis veidekke</string>
     <string name="select_destination_and_intermediate_points">Velg reisemål</string>
     <string name="layer_amenity_label">Overleggspåskrifter for interessepunkter</string>
-    <string name="gpx_wpt">Rutepunkt</string>
+    <string name="shared_string_waypoint">Rutepunkt</string>
     <string name="voice_pref_title">Tale</string>
     <string name="misc_pref_title">Diverse</string>
     <string name="localization_pref_title">Lokaltilpasning</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 971515e9c5..2c319164da 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1461,7 +1461,7 @@ Wil je een nieuwe map maken op de toegestane locatie en de OsmAnd-bestanden daar
     <string name="map_widget_plain_time">Huidige tijd</string>
     <string name="select_destination_and_intermediate_points">Bestemmingen kiezen</string>
     <string name="layer_amenity_label">Namen van interessepunten</string>
-    <string name="gpx_wpt">Routepunt</string>
+    <string name="shared_string_waypoint">Routepunt</string>
     <string name="selected_gpx_info_show">\n\nLang drukken om op de kaart te bekijken</string>
     <string name="delay_navigation_start">Start navigatie automatisch</string>
     <string name="gpx_split_interval">Splits om de</string>
diff --git a/OsmAnd/res/values-nn/strings.xml b/OsmAnd/res/values-nn/strings.xml
index 090b5183d3..e957d9587f 100644
--- a/OsmAnd/res/values-nn/strings.xml
+++ b/OsmAnd/res/values-nn/strings.xml
@@ -42,7 +42,7 @@
     <string name="save_as_favorites_points">Lagra som favorittgruppe</string>
     <string name="loading_smth">Lastar %1$s …</string>
     <string name="map_widget_plain_time">Gjeldande klokkeslett</string>
-    <string name="gpx_wpt">Vegpunkt</string>
+    <string name="shared_string_waypoint">Vegpunkt</string>
     <string name="selected_gpx_info_show">\n\nHald inne for å sjå på kartet</string>
     <string name="shared_string_selected_lowercase">valt</string>
     <string name="local_index_gpx_info_show">\n\nHald inne for å sjå val</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index a0a1d79680..3abb565d2b 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1494,7 +1494,7 @@
     <string name="gpx_split_interval">Interwał podziału</string>
     <string name="loading_smth">Wczytywanie %1$s…</string>
     <string name="map_widget_plain_time">Aktualny czas</string>
-    <string name="gpx_wpt">Punkt trasy</string>
+    <string name="shared_string_waypoint">Punkt trasy</string>
     <string name="save_as_favorites_points">Zapisz jako grupę ulubionych</string>
     <string name="select_destination_and_intermediate_points">Wybierz cele docelowe</string>
     <string name="layer_amenity_label">Etykiety punktów</string>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index ce8a7529a3..c3e11b861c 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -448,7 +448,7 @@
     <string name="gpx_file_is_empty">A trilha GPX está vazia</string>
     
     
-    <string name="gpx_wpt">Marco de trajeto</string>
+    <string name="shared_string_waypoint">Marco de trajeto</string>
     <string name="gpx_selection_segment_title">Segmento</string>
     
     
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index eecdc4616f..7f0fbe623a 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -1464,7 +1464,7 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="layer_amenity_label">Rótulos de pontos</string>
     <string name="loading_smth">Carregando %1$s …</string>
     <string name="map_widget_plain_time">Tempo atual</string>
-    <string name="gpx_wpt">Ponto</string>
+    <string name="shared_string_waypoint">Ponto</string>
     <string name="selected_gpx_info_show">\n\nPressione e segure para ver no mapa</string>
     <string name="delay_navigation_start">Iniciar navegação com atraso</string>
     <string name="shared_string_selected_lowercase">seleccionado</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index b503b94061..dca41567a9 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -1271,7 +1271,7 @@
     <string name="layer_amenity_label">Etichete puncte</string>
     <string name="loading_smth">Încărcare %1$s…</string>
     <string name="map_widget_plain_time">Ora curentă</string>
-    <string name="gpx_wpt">Punct de reper</string>
+    <string name="shared_string_waypoint">Punct de reper</string>
     <string name="none_selected_gpx">Niciun fișier GPX selectat. Pentru a selecta țineți apăsat pe un track disponibil.</string>
     <string name="selected_gpx_info_show">\n\nȚineți apăsat pentru a vedea pe hartă</string>
     <string name="shared_string_selected">Selectat</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 4de8a81ea7..b65fd66ff8 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1582,7 +1582,7 @@
     <string name="gpx_selection_track">%1$s \nТрек %2$s</string>
     <string name="loading_smth">Загрузка %1$s…</string>
     <string name="map_widget_plain_time">Текущее время</string>
-    <string name="gpx_wpt">Путевая точка</string>
+    <string name="shared_string_waypoint">Путевая точка</string>
     <string name="gpx_split_interval">Интервал разбиения</string>
     <string name="delay_navigation_start">Старт навигации автоматически</string>
     <string name="save_as_favorites_points">Сохранить как группу избранных</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 51908c7c47..6d6e8f6fae 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -476,7 +476,7 @@
     <string name="layer_amenity_label">Etichetas de s\'istratu de sos PDI</string>
     <string name="loading_smth">Carrigamentu de %1$s…</string>
     <string name="map_widget_plain_time">Oràriu atuale</string>
-    <string name="gpx_wpt">Puntu de coladòrgiu</string>
+    <string name="shared_string_waypoint">Puntu de coladòrgiu</string>
     <string name="selected_gpx_info_show">"
 \n
 \nMantene incarcadu pro l\'ammustrare in sa mapa"</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 7d9db5e428..2bf5619375 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -1265,7 +1265,7 @@ Proporčná pamäť %4$s MB (Limit Androidu %5$s MB, Dalvik %6$s MB).</string>
     
     <string name="loading_smth">Načítava sa %1$s…</string>
     <string name="map_widget_plain_time">Aktuálny čas</string>
-    <string name="gpx_wpt">Prechodný bod</string>
+    <string name="shared_string_waypoint">Prechodný bod</string>
     <string name="selected_gpx_info_show">\n\nStlačte a podržte pre zobrazenie na mape</string>
     <string name="delay_navigation_start">Spustiť navigačné povely automaticky</string>
     <string name="gpx_split_interval">Interval rozdelenia</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 1c75d500d2..ba1346f6c2 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -1406,7 +1406,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="save_as_favorites_points">Shrani kot skupino priljubljenih</string>
     <string name="select_destination_and_intermediate_points">Izbor ciljev</string>
     <string name="layer_amenity_label">Izpiši oznake točk POI</string>
-    <string name="gpx_wpt">Vmesna točka</string>
+    <string name="shared_string_waypoint">Vmesna točka</string>
     <string name="selected_gpx_info_show">\n\nPritisnite in zadržite za prikaz na zemljevidu</string>
     <string name="delay_navigation_start">Samodejno začni vodenje od zavoja do zavoja</string>
     <string name="gpx_info_subtracks">Podsledi: %1$s</string>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 80e2cc3b82..b8c3f2adb8 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -712,7 +712,7 @@
     
     
     
-    <string name="gpx_wpt">Пролазна тачка</string>
+    <string name="shared_string_waypoint">Пролазна тачка</string>
     <string name="available_maps">Доступне карте</string>
     <string name="select_voice_provider">Изаберите гласовно навођење</string>
     <string name="select_voice_provider_descr">Изаберите или преузмите гласовно навођење свог језика.</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index d4094d79bb..927c96a401 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1365,7 +1365,7 @@ Nyttjat utrymme är {1} MB.
     <string name="gpx_file_is_empty">GPX-spåret är tomt</string>
     <string name="loading_smth">Laddar %1$s …</string>
     <string name="map_widget_plain_time">Aktuell tid</string>
-    <string name="gpx_wpt">Waypoint</string>
+    <string name="shared_string_waypoint">Waypoint</string>
     <string name="selected_gpx_info_show">"
 \n
 \nTryck och håll för att visa på kartan"</string>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 0e04d16e59..723c057883 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -1764,7 +1764,7 @@
     <string name="layer_amenity_label"/>
     <string name="loading_smth">%1$s yükleniyor …</string>
     <string name="map_widget_plain_time">Şimdiki zaman</string>
-    <string name="gpx_wpt">Mevki</string>
+    <string name="shared_string_waypoint">Mevki</string>
     <string name="selected_gpx_info_show">"
 \n
 \nGörmek için harita üzerinde basılı tutun"</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index f9cd14518a..d5a82494d2 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1382,7 +1382,7 @@
     <string name="layer_amenity_label">Підписи до цікавих точок</string>
     <string name="loading_smth">Звантажується %1$s…</string>
     <string name="map_widget_plain_time">Поточний час</string>
-    <string name="gpx_wpt">Маршрутна точка</string>
+    <string name="shared_string_waypoint">Маршрутна точка</string>
     <string name="selected_gpx_info_show">"
 \n
 \nДовго утримуйте, щоб побачити на мапі"</string>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index 541f5edc41..c61b1d667f 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -2010,7 +2010,7 @@
     <string name="save_as_favorites_points">另存为收藏夹组</string>
     <string name="layer_amenity_label">点标签</string>
     <string name="loading_smth">正在加载 %1$s…</string>
-    <string name="gpx_wpt">航点</string>
+    <string name="shared_string_waypoint">航点</string>
     <string name="selected_gpx_info_show">"
 \n
 \n长按在地图上查看"</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 8da8eeb7a1..1220cca17f 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1414,7 +1414,7 @@
     <string name="gpx_info_maximum_speed">最高速度：%1$s</string>
     <string name="gpx_info_avg_altitude">平均海拔：%1$s</string>
     <string name="gpx_info_diff_altitude">海拔高度範圍：%1$s</string>
-    <string name="gpx_wpt">航點</string>
+    <string name="shared_string_waypoint">航點</string>
     <string name="gpx_info_waypoints">航點：%1$s</string>
     <string name="save_as_favorites_points">另存群組為我的收藏</string>
     <string name="select_destination_and_intermediate_points">選擇目的地</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index ad5f617cea..0e63ffb735 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1355,7 +1355,7 @@
     <string name="layer_amenity_label">POI overlay labels</string>
     <string name="loading_smth">Loading %1$s…</string>
     <string name="map_widget_plain_time">Current time</string>
-    <string name="gpx_wpt">Waypoint</string>
+    <string name="shared_string_waypoint">Waypoint</string>
     <string name="selected_gpx_info_show">\n\nLong-tap to view on the map</string>
     <string name="delay_navigation_start">Start turn-by-turn guidance automatically</string>
     <string name="local_index_gpx_info_show">\n\nLong-tap for options</string>
diff --git a/OsmAnd/src/net/osmand/data/PointDescription.java b/OsmAnd/src/net/osmand/data/PointDescription.java
index a6dba0c26a..285171cce5 100644
--- a/OsmAnd/src/net/osmand/data/PointDescription.java
+++ b/OsmAnd/src/net/osmand/data/PointDescription.java
@@ -131,7 +131,7 @@ public class PointDescription {
 			} else if (isPoi()) {
 				typeName = ctx.getString(R.string.poi);
 			} else if (isWpt()) {
-				return ctx.getString(R.string.gpx_wpt);
+				return ctx.getString(R.string.shared_string_waypoint);
 			}
 			if (!Algorithms.isEmpty(typeName)) {
 				if (Algorithms.isEmpty(name)) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java
index 6290b45571..34a6844ce5 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java
@@ -100,7 +100,7 @@ public class WptPtMenuController extends MenuController {
 		GpxSelectionHelper helper = getMapActivity().getMyApplication().getSelectedGpxHelper();
 		SelectedGpxFile selectedGpxFile = helper.getSelectedGPXFile(wpt);
 		StringBuilder sb = new StringBuilder();
-		sb.append(getMapActivity().getString(R.string.gpx_wpt));
+		sb.append(getMapActivity().getString(R.string.shared_string_waypoint));
 		sb.append(", ");
 		if (selectedGpxFile != null) {
 			File file = new File(selectedGpxFile.getGpxFile().path);
@@ -117,6 +117,6 @@ public class WptPtMenuController extends MenuController {
 
 	@Override
 	public String getCommonTypeStr() {
-		return getMapActivity().getString(R.string.gpx_wpt);
+		return getMapActivity().getString(R.string.shared_string_waypoint);
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
index 704ff116fc..72f4850f74 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
@@ -279,7 +279,7 @@ public class WptPtEditorFragment extends PointEditorFragment {
 
 	@Override
 	public String getHeaderCaption() {
-		return getMapActivity().getResources().getString(R.string.gpx_wpt);
+		return getMapActivity().getResources().getString(R.string.shared_string_waypoint);
 	}
 
 	@Override