From 003486d7fc57b6450f40f4e6f1d452ee15df5c6e Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Fri, 30 Dec 2011 09:54:11 +0100
Subject: [PATCH] replace messageFormatter in NavigatePointActivity as well +
 some string consistency

---
 OsmAnd/res/values-cs/strings.xml              |  4 ++--
 OsmAnd/res/values-de/strings.xml              | 24 +++++++++----------
 OsmAnd/res/values-es/strings.xml              |  4 ++--
 OsmAnd/res/values-fr/strings.xml              |  4 ++--
 OsmAnd/res/values-hu/strings.xml              |  6 ++---
 OsmAnd/res/values-it/strings.xml              |  4 ++--
 OsmAnd/res/values-jp/strings.xml              |  2 +-
 OsmAnd/res/values-pl/strings.xml              |  4 ++--
 OsmAnd/res/values-pt/strings.xml              |  4 ++--
 OsmAnd/res/values-ru/strings.xml              |  4 ++--
 OsmAnd/res/values-sk/strings.xml              |  4 ++--
 OsmAnd/res/values-vi/strings.xml              |  4 ++--
 OsmAnd/res/values/strings.xml                 |  8 +++----
 .../activities/NavigatePointActivity.java     |  4 ++--
 14 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index cd8a450d74..82270bc1b6 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -670,7 +670,7 @@
 
   <string name="vector_data">Vektorové mapy OSM</string>
   <string name="transport_context_menu">Hledat dopravu ze zastávky</string>
-  <string name="point_on_map">Bod na mapě\n Šíř. %1$.5f Dél. %2$.5f</string>
+  <string name="point_on_map">Poloha:\n Šíř. %1$.5f Dél. %2$.5f</string>
   <string name="osb_bug_name">Chyba</string>
   <string name="poi_context_menu_modify">Upravit POI</string>
   <string name="poi_context_menu_delete">Smazat POI</string>
@@ -798,7 +798,7 @@
   <string name="search_history_street">Ulice: {0}, {1}</string>
   <string name="search_history_int_streets">Křižovatka ulic: {0} x {1} v {2}</string>
   <string name="search_history_building">Budova: {0}, {1}, {2}</string>
-  <string name="search_history_navigate_to">Navigovat na\n šíř. {0,number,#.#####}\n dél. {1,number,#.#####}</string>
+  <string name="search_history_navigate_to">Poloha:\n šíř. {0,number,#.#####}\n dél. {1,number,#.#####}</string>
   <string name="favorite">Oblíbené</string>
   <string name="clear_all">Vymazat vše</string>
   <string name="history">Minulé</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index d1e453e214..e23bb94f6c 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -186,8 +186,8 @@
 	\n\t\'Nach Kompass\' - Die Karte wird gemäß Kompass ausgerichtet und nachgeführt
 	\n\tTipp: Um schnell zwischen der Kompassnachführung und der in den Einstellungen gewählten Option zu wechseln, einfach auf die Kompassnadel in der Kartenansicht drücken.</string>
 
-	<string name="switch_to_raster_map_to_see">Keine Offline-Vektor-Karte für diese Position vorhanden.\n\t\n\tBitte Vektor-Karte laden via \'Einstellungen\' -> \'Offline-Daten\', oder Online-Karte verwenden via \'Einstellungen\' -> \'Landkarten\'.</string>
-	<string name="switch_to_vector_map_to_see">Offline-Vektor-Karte für diese Position vorhanden.\n\t\n\tFür Verwendung aktivieren: \'Menu\' -> \'Darstellung\' -> \'Kartenquelle...\' -> \'Offline-Vektor-Karten\'.</string>
+	<string name="switch_to_raster_map_to_see">Keine Offline-Vektor-Karte für diese Lokation vorhanden.\n\t\n\tBitte Vektor-Karte laden via \'Einstellungen\' -> \'Offline-Daten\', oder Online-Karte verwenden via \'Einstellungen\' -> \'Landkarten\'.</string>
+	<string name="switch_to_vector_map_to_see">Offline-Vektor-Karte für diese Lokation vorhanden.\n\t\n\tFür Verwendung aktivieren: \'Menu\' -> \'Darstellung\' -> \'Kartenquelle...\' -> \'Offline-Vektor-Karten\'.</string>
 	<string name="binary_map_download_success">Download erfolgreich.\n\t\n\tFür Verwendung aktivieren: \'Einstellungen\' -> \'Landkarten\' -> \'Offline-Vektor-Karten\'.</string>
 	<string name="choose_audio_stream">Navi-Sprachausgabe</string>
 	<string name="choose_audio_stream_descr">Ausgabemodus für Sprachansagen wählen (System-abhängig)</string>
@@ -235,10 +235,10 @@
 	\n\t\'Tag\' - permanente Tagesansicht
 	\n\t\'Nacht\' - permanente Nachtansicht 
 	\n\t\'Umgebungslicht-Sensor\' - automatischer Modus gemäß Umgebungslichtsensor des Gerätes (nur wenn Sensor vorhanden)</string>	
-	<string name="tip_location_sharing">Position mitteilen</string>
-	<string name="tip_location_sharing_t">\tWollen Sie eine interessante Position Freunden oder Familie mitteilen?
+	<string name="tip_location_sharing">Lokation mitteilen</string>
+	<string name="tip_location_sharing_t">\tWollen Sie eine interessante Lokation Freunden oder Familie mitteilen?
 	\n\tMit OsmAnd kann man jeden Aufenthaltsort leicht mit Anderen teilen.
-	\n\tDies geschieht im \'Karten-Kontextmenü\' via \'Position mitteilen\'.
+	\n\tDies geschieht im \'Karten-Kontextmenü\' via \'Lokation mitteilen\'.
 	\n\tDann wählt man einen Übertragungsweg, zur Wahl stehen: E-Mail, SMS, oder man kann einfach die Lokationskoordinaten in die Ablage (Clipboard) kopieren.</string>
 
 	<string name="tip_favorites">Favoriten</string>
@@ -299,11 +299,11 @@
 	<string name="foot">ft</string>
 	<string name="mile_per_hour">mph</string>
 	<string name="mile">mi</string>
-	<string name="send_location_way_choose_title">Position mitteilen mittels</string>
+	<string name="send_location_way_choose_title">Lokation mitteilen mittels</string>
 	<string name="send_location_sms_pattern">Ich bin hier: %1$s, %2$s</string>
-	<string name="send_location_email_pattern">Um die Position zu sehen, folge dem Web-Link %1$s oder Android Intent Link %2$s</string>
-	<string name="send_location">Position senden</string>
-	<string name="context_menu_item_share_location">Position mitteilen</string>
+	<string name="send_location_email_pattern">Um die Lokation zu sehen, folge dem Web-Link %1$s oder Android Intent Link %2$s</string>
+	<string name="send_location">Lokation senden</string>
+	<string name="context_menu_item_share_location">Lokation mitteilen</string>
 	<string name="add_waypoint_dialog_added">Wegpunkt \'\'{0}\'\' erfolgreich hinzugefügt</string>
 	<string name="add_waypoint_dialog_title">GPX Wegpunkt an gespeicherten GPX Track anfügen</string>
 	<string name="context_menu_item_add_waypoint">GPX Wegpunkt anfügen</string>
@@ -515,7 +515,7 @@
 	<string name="first_time_download">Offline-Daten herunterladen</string>
 	<string name="first_time_msg">Danke, dass Sie OsmAnd verwenden. \nUm alle Funktionen verwenden zu können, sind Offline-Daten erforderlich, die Sie in den Einstellungen unter Offline-Daten herunterladen oder selbst erstellen können. Danach können Sie Adressen, POI und ÖPNV finden.</string>
 	<string name="search_poi_location">Suche Signal...</string>
-	<string name="search_near_map">Suche um Kartenposition</string>
+	<string name="search_near_map">Suche um Lokation</string>
 	<string name="search_nearby">Suche um Aufenthaltsort</string>
 	<string name="map_orientation_default">je nach Geräteorientierung</string>
 	<string name="map_orientation_portrait">Hochformat</string>
@@ -613,7 +613,7 @@
 	<string name="empty_route_calculated">Es wurde keine Route berechnet</string>
 	<string name="new_route_calculated_dist">Neue Route wird berechnet</string>
 	<string name="arrived_at_destination">Sie haben Ihr Ziel erreicht</string>
-	<string name="invalid_locations">Position ist ungültig</string>
+	<string name="invalid_locations">Koordinaten sind ungültig!</string>
 	<string name="go_back_to_osmand">zurück zu OsmAnd</string>
 	<string name="close">Schließen</string>
 	<string name="loading_data">Daten werden geladen...</string>
@@ -732,7 +732,7 @@
 <string name="search_address_building_option">Hausnr.</string>
 <string name="search_address_street_option">Querstraße</string>
 
-<string name="search_tabs_location">Position</string>
+<string name="search_tabs_location">Lokation</string>
 
 <string name="context_menu_item_navigate_point">Als Ziel wählen</string>
 <string name="context_menu_item_add_favorite">Als Favorit speichern</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 0e6e8c4ee1..2fbc22ba47 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -281,7 +281,7 @@
 	<string name="poi_remove_confirm_template">Borrar {0} (añadir comentario) ?</string>
 	<string name="poi_remove_success">se eliminó el POI</string>
 	<string name="poi_remove_title">Borrar POI</string>
-	<string name="point_on_map">Punto en el mapa\n Lat %1$.5f Lon %2$.5f</string>
+	<string name="point_on_map">Localización:\n Lat %1$.5f Lon %2$.5f</string>
 	<string name="position_on_map">Posición en el mapa</string>
 	<string name="position_on_map_bottom">Fondo</string>
 	<string name="position_on_map_center">Centro</string>
@@ -345,7 +345,7 @@
 	<string name="search_history_building">Edificio : {0}, {1}, {2}</string>
 	<string name="search_history_city">Ciudad : {0}</string>
 	<string name="search_history_int_streets">Calles de intersección : {0} x {1} en {2}</string>
-	<string name="search_history_navigate_to">Navegar a\n lat {0,number,#.#####}\n lon {1,number,#.#####}</string>
+	<string name="search_history_navigate_to">Localización:\n lat {0,number,#.#####}\n lon {1,number,#.#####}</string>
 	<string name="search_history_street">Calle : {0}, {1}</string>
 	<string name="search_near_map">Buscar cerca a la última localización</string>
 	<string name="search_nearby">Sitios cercanos</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index f255d8779b..6bd31bd8f3 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -406,7 +406,7 @@
 <string name="error_reading_gpx">Erreur de lecteur des données GPX</string>
 <string name="vector_data">Cartes vectorielles OSM</string>
 <string name="transport_context_menu">Chercher transport à l\'arrivée</string>
-<string name="point_on_map">Point sur la carte\n Lat %1$.5f Long %2$.5f</string>
+<string name="point_on_map">Emplacement:\n Lat %1$.5f Long %2$.5f</string>
 <string name="osb_bug_name">Bogue</string>
 <string name="poi_context_menu_modify">Modifier PI</string>
 <string name="poi_context_menu_delete">Supprimer PI</string>
@@ -523,7 +523,7 @@
 <string name="search_history_street">Rue : {0}, {1}</string>
 <string name="search_history_int_streets">Intersections : {0} x {1} dans {2}</string>
 <string name="search_history_building">Édifice : {0}, {1}, {2}</string>
-<string name="search_history_navigate_to">Se diriger vers\n lat {0,number,#.#####}\n long {1,number,#.#####}</string>
+<string name="search_history_navigate_to">Emplacement:\n lat {0,number,#.#####}\n long {1,number,#.#####}</string>
 <string name="favorite">Favoris</string>
 <string name="clear_all">Supprimer tout</string>
 <string name="history">Historique</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 9e85015375..de5391a105 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -411,7 +411,7 @@
 
 	<string name="vector_data">Vektoros OSM térkép</string>
 	<string name="transport_context_menu">Közlekedés keresése a célnál</string>
-	<string name="point_on_map">Pont a térképen\n szélesség %1$.5f, hosszúság %2$.5f</string>
+	<string name="point_on_map">Hely:\n szélesség %1$.5f, hosszúság %2$.5f</string>
 	<string name="osb_bug_name">Hiba</string>
 	<string name="poi_context_menu_modify">POI módosítás</string>
 	<string name="poi_context_menu_delete">POI törlés</string>
@@ -531,7 +531,7 @@
 	<string name="search_history_street">Utca: {0}, {1}</string>
 	<string name="search_history_int_streets">Kereszteződés: {0} és {1}, {2}</string>
 	<string name="search_history_building">Épület: {0}, {1}, {2}</string>
-	<string name="search_history_navigate_to">Célpont:\n szélesség {0,number,#.#####}\n hosszúság {1,number,#.#####}</string>
+	<string name="search_history_navigate_to">Hely:\n szélesség {0,number,#.#####}\n hosszúság {1,number,#.#####}</string>
 	<string name="favorite">Kedvenc</string>
 	<string name="clear_all">Mindent töröl</string>
 	<string name="history">Előzmény</string>
@@ -592,7 +592,7 @@
 	<string name="empty_route_calculated">Üres útvonal lett tervezve</string>									
 	<string name="new_route_calculated_dist">Új útvonal tervezve, távolság</string>
 	<string name="arrived_at_destination">Megérkeztél a célponthoz</string>
-	<string name="invalid_locations">Érvénytelen hely</string>
+	<string name="invalid_locations">Érvénytelen koordináta</string>
 	<string name="go_back_to_osmand">Vissza az OsmAnd térképhez</string>
 	<string name="close">Bezár</string>
 	<string name="loading_data">Adatok betöltése</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index a6db8ce570..b85fb767ad 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -405,7 +405,7 @@
 
 	<string name="vector_data">Mappe vettoriali offline</string>
 	<string name="transport_context_menu">Cercare un trasporto pubblico all\'arrivo</string>
-	<string name="point_on_map">Punto sulla mappa\n Lat %1$.5f Lon %2$.5f</string>
+	<string name="point_on_map">Luogo:\n Lat %1$.5f Lon %2$.5f</string>
 	<string name="osb_bug_name">Bug</string>
 	<string name="poi_context_menu_modify">Modificare PDI</string>
 	<string name="poi_context_menu_delete">Eliminare PDI</string>
@@ -524,7 +524,7 @@
 	<string name="search_history_street">Strada: {0}, {1}</string>
 	<string name="search_history_int_streets">Incrocio: {0} x {1} in {2}</string>
 	<string name="search_history_building">Naviga verso lat = {0}, lon = {1}</string>
-	<string name="search_history_navigate_to">Naviga verso\n lat {0,number,#.#####}\n lon {1,number,#.#####}</string>
+	<string name="search_history_navigate_to">Luogo:\n lat {0,number,#.#####}\n lon {1,number,#.#####}</string>
 	<string name="favorite">Favorito</string>
 	<string name="clear_all">Eliminare tutto</string>
 	<string name="history">Recenti</string>
diff --git a/OsmAnd/res/values-jp/strings.xml b/OsmAnd/res/values-jp/strings.xml
index 2b4bd013c4..c18f0cefd7 100644
--- a/OsmAnd/res/values-jp/strings.xml
+++ b/OsmAnd/res/values-jp/strings.xml
@@ -361,7 +361,7 @@ name="maps_could_not_be_downloaded">このマップはダウンロードでき
 
      <string name="vector_data">オフラインベクターマップ</string>
      <string name="transport_context_menu">交通機関を乗り場で探す</string>
-     <string name="point_on_map">マップ上の地点:\n 緯度
+     <string name="point_on_map">位置:\n 緯度
 %1$.5f\n 経度 %2$.5f</string>
      <string name="osb_bug_name">バグ</string>
      <string name="poi_context_menu_modify">POIを変更</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index e675a17522..b8ebfbb09f 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -419,7 +419,7 @@
 
 <string name="vector_data">Mapy wektorowe offline</string>
 <string name="transport_context_menu">Search transport at stop</string>
-<string name="point_on_map">Punkt na mapie:\n Szer. %1$.5f\n Dł. %2$.5f</string>
+<string name="point_on_map">Pozycja:\n Szer. %1$.5f\n Dł. %2$.5f</string>
 <string name="osb_bug_name">Błąd</string>
 <string name="poi_context_menu_modify">Modyfikuj POI</string>
 <string name="poi_context_menu_delete">Usuń POI</string>
@@ -538,7 +538,7 @@
 <string name="search_history_street">Ulica: {0}, {1}</string>
 <string name="search_history_int_streets">Przecięcie: {0} x {1} in {2}</string>
 <string name="search_history_building">Budynek: {0}, {1}, {2}</string>
-<string name="search_history_navigate_to">Naviguj do\n szer. {0,number,#.#####}\n dł. {1,number,#.#####}</string>
+<string name="search_history_navigate_to">Pozycja:\n szer. {0,number,#.#####}\n dł. {1,number,#.#####}</string>
 <string name="favorite">Ulubione</string>
 <string name="clear_all">Wyczyść wszystko</string>
 <string name="history">Historia</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 53d45d217a..7c247a568c 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -104,7 +104,7 @@
 	<string name="error_reading_gpx">Erro na leitura de dados GPX</string>
 	<string name="vector_data">Mapas vetoriais offline</string>
 	<string name="transport_context_menu">Procurar transporte na parada</string>
-	<string name="point_on_map">Ponto no mapa\n Lat %1$.5f Long %2$.5f</string>
+	<string name="point_on_map">Localização:\n Lat %1$.5f Long %2$.5f</string>
 	<string name="osb_bug_name">Bug</string>
 	<string name="poi_context_menu_modify">Modificar POI</string>
 	<string name="poi_context_menu_delete">Apagar POI</string>
@@ -223,7 +223,7 @@
 	<string name="search_history_street">Rua : {0}, {1}</string>
 	<string name="search_history_int_streets">Interseção : {0} x {1} dans {2}</string>
 	<string name="search_history_building">Edifício : {0}, {1}, {2}</string>
-	<string name="search_history_navigate_to">Se mover para\n lat {0,number,#.#####}\n long {1,number,#.#####}</string>
+	<string name="search_history_navigate_to">Localização:\n lat {0,number,#.#####}\n long {1,number,#.#####}</string>
 	<string name="favorite">Favoritos</string>
 	<string name="clear_all">Apagar tudo</string>
 	<string name="history">Histórico</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index aaa820770c..66271816c5 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -364,7 +364,7 @@
 	<string name="error_reading_gpx">Ошибка при чтении gpx файла</string>
 	<string name="vector_data">Векторные osm карты</string>
 	
-	<string name="point_on_map">Точка на карте\n Ш %1$.5f Д %2$.5f</string>
+	<string name="point_on_map">Координаты\n Ш %1$.5f Д %2$.5f</string>
 	<string name="osb_bug_name">Bug</string>
 	<string name="poi_context_menu_modify">Редактировать POI</string>
 	<string name="poi_context_menu_delete">Удалить POI</string>
@@ -483,7 +483,7 @@
 	<string name="search_history_street">Улица : {0}, {1}</string>
 	<string name="search_history_int_streets">Пересечение улиц : {0} x {1} в {2}</string>
 	<string name="search_history_building">Здание : {0}, {1}, {2}</string>
-	<string name="search_history_navigate_to">Переместиться в\n широта {0,number,#.#####}\n долгота {1,number,#.#####}</string>
+	<string name="search_history_navigate_to">Координаты\n широта {0,number,#.#####}\n долгота {1,number,#.#####}</string>
 	<string name="favorite">Избранное</string>
 	<string name="clear_all">Очистить все</string>
 	<string name="history">История</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 60fb695802..c8fe422386 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -418,7 +418,7 @@
 
 <string name="vector_data">Vektorové OSM mapy</string>
 <string name="transport_context_menu">Hľadať prepravu po zastavení</string>
-<string name="point_on_map">Bod na mape:\n Zem. šírka %1$.5f\n Zem. dĺžka %2$.5f</string>
+<string name="point_on_map">Pozícia:\n Zem. šírka %1$.5f\n Zem. dĺžka %2$.5f</string>
 <string name="osb_bug_name">Chyba</string>
 <string name="poi_context_menu_modify">Upraviť bod záujmu (POI)</string>
 <string name="poi_context_menu_delete">Vymazať bod záujmu (POI)</string>
@@ -537,7 +537,7 @@
 <string name="search_history_street">Ulica: {0}, {1}</string>
 <string name="search_history_int_streets">Pretínajúce ulice: {0} x {1} v {2}</string>
 <string name="search_history_building">Adresa: {0}, {1}, {2}</string>
-<string name="search_history_navigate_to">Navigovať do:\n šírka {0,number,#.#####}\n dĺžka {1,number,#.#####}</string>
+<string name="search_history_navigate_to">Pozícia:\n šírka {0,number,#.#####}\n dĺžka {1,number,#.#####}</string>
 <string name="favorite">Obľúbené</string>
 <string name="clear_all">Zmazať všetko</string>
 <string name="history">História</string>
diff --git a/OsmAnd/res/values-vi/strings.xml b/OsmAnd/res/values-vi/strings.xml
index 770f77fb33..c356368e99 100644
--- a/OsmAnd/res/values-vi/strings.xml
+++ b/OsmAnd/res/values-vi/strings.xml
@@ -415,7 +415,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 
 	<string name="vector_data">Bản đồ vector Offline</string>
 	<string name="transport_context_menu">Search transport at stop</string>
-	<string name="point_on_map">Điểm trên bản đồ:\n VĐ %1$.5f\n KĐ %2$.5f</string>
+	<string name="point_on_map">Khu vực:\n VĐ %1$.5f\n KĐ %2$.5f</string>
 	<string name="osb_bug_name">Bug</string>
 	<string name="poi_context_menu_modify">Sửa POI</string>
 	<string name="poi_context_menu_delete">Xóa POI</string>
@@ -534,7 +534,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 	<string name="search_history_street">Đường phố: {0}, {1}</string>
 	<string name="search_history_int_streets">Điểm giao cắt: {0} x {1} in {2}</string>
 	<string name="search_history_building">Tòa nhà: {0}, {1}, {2}</string>
-	<string name="search_history_navigate_to">Dẫn đường đến\n Vĩ độ {0,number,#.#####}\n Kinh độ {1,number,#.#####}</string>
+	<string name="search_history_navigate_to">Khu vực:\n Vĩ độ {0,number,#.#####}\n Kinh độ {1,number,#.#####}</string>
 	<string name="favorite">Ưa thích</string>
 	<string name="clear_all">Xóa hết</string>
 	<string name="history">Lịch sử</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 6685cd0c50..5a4a14f7ff 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -92,7 +92,7 @@
 \n\t- GPX Explorer in application (view track detail, distance, average speed, elevation, etc.)
 \n\t- GPX navigation (more options, continue navigation after crash, support roundabouts)
 \n\t- Function to save route as GPX track for offline use
-\n\t- Improve GPX monitoring  (filter some inaccurate location and save accuracy/elevation/speed)
+\n\t- Improve GPX monitoring  (filter some inaccurate position and save accuracy/elevation/speed)
 \n\t- Upload GPX to OSM community (http://download.osmand.net/gpx/)
 \n\t- Improve vector rendering
 \n\t- Improvement of TTS engine (announce exact distance, enable miles)
@@ -434,7 +434,7 @@
 
 	<string name="vector_data">Offline vector maps</string>
 	<string name="transport_context_menu">Search transport at stop</string>
-	<string name="point_on_map">Point on map:\n Lat %1$.5f\n Lon %2$.5f</string>
+	<string name="point_on_map">Location:\n Lat %1$.5f\n Lon %2$.5f</string>
 	<string name="osb_bug_name">Bug</string>
 	<string name="poi_context_menu_modify">Modify POI</string>
 	<string name="poi_context_menu_delete">Delete POI</string>
@@ -553,7 +553,7 @@
 	<string name="search_history_street">Street: {0}, {1}</string>
 	<string name="search_history_int_streets">Intersection: {0} x {1} in {2}</string>
 	<string name="search_history_building">Building: {0}, {1}, {2}</string>
-	<string name="search_history_navigate_to">Destination:\n Lat {0,number,#.#####}\n Lon {1,number,#.#####}</string>
+	<string name="search_history_navigate_to">Location:\n Lat {0,number,#.#####}\n Lon {1,number,#.#####}</string>
 	<string name="favorite">Favorite</string>
 	<string name="clear_all">Clear all</string>
 	<string name="history">History</string>
@@ -614,7 +614,7 @@
 	<string name="empty_route_calculated">Empty route is calculated</string>					
 	<string name="new_route_calculated_dist">New route is calculated, distance</string>
 	<string name="arrived_at_destination">You have arrived at your destination</string>
-	<string name="invalid_locations">Locations are invalid</string>
+	<string name="invalid_locations">Coordinates are invalid!</string>
 	<string name="go_back_to_osmand">Go back to OsmAnd map</string>
 	<string name="close">Close</string>
 	<string name="loading_data">Loading data...</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointActivity.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointActivity.java
index c162b3ff3b..088247cf4e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointActivity.java
@@ -238,7 +238,7 @@ public class NavigatePointActivity extends Activity implements SearchActivityChi
 			double lon = convert(((TextView) findViewById(R.id.LongitudeEdit)).getText().toString());
 			
 			if(navigate){
-				OsmandSettings.getOsmandSettings(this).setPointToNavigate(lat, lon, MessageFormat.format(getString(R.string.search_history_navigate_to), lat, lon));
+				OsmandSettings.getOsmandSettings(this).setPointToNavigate(lat, lon, getString(R.string.point_on_map, lat, lon));
 			} else {
 				// in case when it is dialog
 				if(activity != null) {
@@ -247,7 +247,7 @@ public class NavigatePointActivity extends Activity implements SearchActivityChi
 				} else {
 					OsmandSettings settings = OsmandSettings.getOsmandSettings(this);
 					settings.setMapLocationToShow(lat, lon, Math.max(12, settings.getLastKnownMapZoom()), 
-							MessageFormat.format(getString(R.string.search_history_navigate_to), lat, lon));
+							getString(R.string.point_on_map, lat, lon));
 				}
 			}
 			close();