diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 34f5846b87..ca60739258 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1124,15 +1124,15 @@
 <string name="poi_filter_restaurants">Restaurants</string>
 <string name="poi_filter_sightseeing">Sehenswürdigkeiten</string>
 <string name="arrived_at_intermediate_point">Sie sind an Ihrem Zwischen punkt angekommen</string>
-<string name="context_menu_item_intermediate_point">Wegpunkt einfügen</string>
+<string name="context_menu_item_intermediate_point">Als Wegpunkt einfügen</string>
 <string name="map_widget_intermediate_distance">Wegpunkt</string>
 <string name="ending_point_too_far">Endpunkt zu weit von der nächsten Straße entfernt.</string>
 <string name="intermediate_point_too_far">Wegpunkt %1$s zu weit von der nächsten Straße entfernt.</string>
 <string name="tip_recent_changes_0_8_4_t">Änderungen in 0.8.4 : 
 	\n\t* Aktualisiert
 </string>
-<string name="context_menu_item_last_intermediate_point">Letzten Wegpunkt setzen</string>
-<string name="context_menu_item_first_intermediate_point">Ersten Wegpunkt setzen</string>
+<string name="context_menu_item_last_intermediate_point">Als letzten Wegpunkt setzen</string>
+<string name="context_menu_item_first_intermediate_point">Als ersten Wegpunkt setzen</string>
 <string name="target_point">Wegpunkt %1$s</string>
 <string name="target_points">Wegpunkte</string>
 <string name="add_as_first_destination_point">Als ersten Wegpunkt einfügen</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 4575cca5e4..85cc3f937c 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -40,7 +40,7 @@
     <string name="target_points">Targets</string>
     <string name="intermediate_point_too_far">Waypoint %1$s too far from nearest road.</string>
     <string name="arrived_at_intermediate_point">You have arrived at your waypoint</string>
-    <string name="context_menu_item_intermediate_point">Add way point</string>
+    <string name="context_menu_item_intermediate_point">Add as waypoint</string>
     <string name="map_widget_intermediate_distance">Waypoint</string>
     <string name="ending_point_too_far">Ending point too far from nearest road.</string>
     <string name="btn_add_tag">Add Tag</string>
@@ -588,7 +588,7 @@
 	<string name="local_index_gpx_info_show">\n\nPress and hold for options</string>
 	<string name="local_index_gpx_info_speed">\nAverage speed : %1$s \nMaximum speed : %2$s</string>
 	<string name="local_index_gpx_info_elevation">\nAverage altitude : %1$.0f m\nMinimum altitude : %2$.0f m\nMaximum altitude : %3$.0f m\nAscents : %4$.0f m\nDescents : %5$.0f m</string>
-	<string name="local_index_gpx_info">Subtracks : %1$d\nTotal points : %2$d\nWay points : %3$d\nTotal distance : %4$s\nStart time : %5$tF,  %5$tR\nEnd time : %6$tF,  %6$tR</string>
+	<string name="local_index_gpx_info">Subtracks : %1$d\nTotal points : %2$d\nWaypoints : %3$d\nTotal distance : %4$s\nStart time : %5$tF,  %5$tR\nEnd time : %6$tF,  %6$tR</string>
 	<string name="local_index_installed">Edition</string>
 	<string name="local_index_items_backuped">%1$d of %2$d item(s) successfully deactivated.</string>
 	<string name="local_index_items_deleted">%1$d of %2$d item(s) successfully deleted.</string>