From e439afee7c1ebbc3d6fd0419d6068a0e09d18775 Mon Sep 17 00:00:00 2001
From: Ludek M <ludek.m@gmail.com>
Date: Mon, 16 Jun 2014 14:11:22 +0200
Subject: [PATCH 01/35] Translated using Weblate (Czech)

Currently translated at 99.7% (1421 of 1424 strings)
---
 OsmAnd/res/values-cs/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index d4aa1a6c00..493847798a 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Offline data), nebo se přepněte na online mapy.</string>
   <string name="tip_recent_changes_0_7_2_t">"Změny ve verzi 0.7.2 :
 \n\t- Native rendering pro všechna zařízení
@@ -1626,4 +1626,6 @@ s často kladenými otázkami.</string>
     <string name="select_destination_and_intermediate_points">Vybrat body na trase</string>
     <string name="layer_amenity_label">Textové popisky</string>
     <string name="create_poi_link_to_osm_doc"><u>Online OSM</u> mapová klasifikace s obrázky</string>
-	</resources>
+	<string name="show_zoom_buttons_navigation_descr">Zobrazit tlačítka lupy během navigace</string>
+    <string name="show_zoom_buttons_navigation">Zobrazit tlačítka lupy</string>
+    </resources>

From 089d3a4285744bafb79c9ac8e98e52a795d38f2e Mon Sep 17 00:00:00 2001
From: Ludek M <ludek.m@gmail.com>
Date: Mon, 16 Jun 2014 13:34:44 +0200
Subject: [PATCH 02/35] Translated using Weblate.

---
 OsmAnd/res/values-cs/strings.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index d4aa1a6c00..74515985bb 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Offline data), nebo se přepněte na online mapy.</string>
   <string name="tip_recent_changes_0_7_2_t">"Změny ve verzi 0.7.2 :
 \n\t- Native rendering pro všechna zařízení
@@ -1625,5 +1625,6 @@ s často kladenými otázkami.</string>
     <string name="save_as_favorites_points">Uložit jako skupinu oblíbených</string>
     <string name="select_destination_and_intermediate_points">Vybrat body na trase</string>
     <string name="layer_amenity_label">Textové popisky</string>
-    <string name="create_poi_link_to_osm_doc"><u>Online OSM</u> mapová klasifikace s obrázky</string>
-	</resources>
+    <string name="show_zoom_buttons_navigation_descr">Zobrazit tlačítka lupy během navigace</string>
+    <string name="show_zoom_buttons_navigation">Zobrazit tlačítka lupy</string>
+    </resources>

From 9bf5e687d88fd75b669700c5725aa2ae466799be Mon Sep 17 00:00:00 2001
From: Rodolfo de Vries <rododevr@gmail.com>
Date: Mon, 16 Jun 2014 15:11:25 +0200
Subject: [PATCH 03/35] Translated using Weblate.

---
 OsmAnd/res/values-nl/strings.xml | 55 +++++++++++++++++---------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 5f93b9eabe..ef51f5336e 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="live_monitoring_mode_off">Start\n online tracking</string>
   <string name="live_monitoring_mode_on">Stop\n online tracking</string>
   <string name="layer_map_appearance">Configureer scherm</string>
@@ -25,7 +25,7 @@
   <string name="native_rendering">Interne kaartgeneratie</string>
   
   <string name="test_voice_prompts">Test stem-instructies</string>
-  <string name="switch_to_raster_map_to_see">Geen offline vectorkaart aanwezig voor deze locatie. Je kan deze downloaden via Instellingen (Offline gegevens), of overschakelen naar online kaarten.</string>
+  <string name="switch_to_raster_map_to_see">Geen offline vectorkaart aanwezig voor deze locatie. Je kan deze downloaden via Instellingen (Kaartbeheer), of overschakelen naar online kaarten; activeer hiervoor de "online maps" plugin.</string>
   <string name="tip_recent_changes_0_7_2_t">Wijzigingen in 0.7.2:
 	\n\t- Interne kaartgeneratie op alle apparaten
 	\n\t- Offline interessepunt-bewerking
@@ -163,8 +163,8 @@
   <string name="routing_settings">Navigatie</string>
   <string name="routing_settings_descr">Opties voor navigatie</string>
   <string name="global_settings">Algemene instellingen</string>
-  <string name="index_settings">Offline gegevens</string>
-  <string name="index_settings_descr">Download kaarten en stemmen, en beheer en bekijk GPX-tracks</string>
+  <string name="index_settings">Kaartbeheer</string>
+  <string name="index_settings_descr">Download en beheer kaarten, stemmen en GPX-tracks</string>
   <string name="general_settings">Algemene instellingen</string>
   <string name="general_settings_descr">Kaartweergave en algemene instellingen</string>
   <string name="global_app_settings">Algemene app instellingen</string>
@@ -283,7 +283,7 @@
   <string name="local_index_items_restored">%1$d van %2$d gegevens succesvol geactiveerd.</string>
   <string name="local_index_no_items_to_do">Voor %1$s: geen bestanden</string>
   <string name="local_index_action_do">%1$s: %2$s bestanden. Doorgaan?</string>
-  <string name="local_index_descr_title">Offline gegevensbeheer</string>
+  <string name="local_index_descr_title">Kaartbeheer</string>
   <string name="local_index_mi_restore">Activeer</string>
   <string name="local_index_mi_backup">Deactiveer</string>
   <string name="local_index_mi_delete">Verwijder</string>
@@ -352,8 +352,8 @@
   <string name="internet_not_available">De benodigde internetverbinding voor deze actie is niet beschikbaar</string>
   <string name="install_more">Installeer meer…</string>
   <string name="tip_update_index">Bijwerken van offline kaarten</string>
-  <string name="tip_update_index_t">Het is belangrijk dat de kaartgegevens up-to-date zijn voor zoeken op interessepunt/adres en voor offline navigatie. De downloadmanager kan deze offline kaarten (en enkele andere gegevens) downloaden en aangeven of er updates beschikbaar zijn.
-		\n\nOm kaarten te downloaden, ga naar \'Instellingen\' -&gt; \'Offline gegevens\' -&gt; \'Download of update offline gegevens\'.
+  <string name="tip_update_index_t">Het is belangrijk dat de kaartgegevens up-to-date zijn voor zoeken op interessepunt/adres en voor offline navigatie. De kaartmanager kan deze offline kaarten (en enkele andere gegevens) downloaden en aangeven of er updates beschikbaar zijn.
+		\n\nOm kaarten te downloaden, ga naar \'Instellingen\' -&gt; \'Kaartbeheer\' -&gt; \'Download of update offline gegevens\'.
 		\n\nNadat de regiolijst van het internet is opgehaald, druk op een item om deze te downloaden of te updaten.
 		\n\nJe kan de lijst doorzoeken door letters te typen, of gebruik de optie \'Instellingen\' -&gt; \'Toon gedownloade\' om alleen de gegevens te zien die al op je apparaat aanwezig zijn.
 		\n\n\t* Groen: deze gegevens zijn up-to-date
@@ -369,7 +369,7 @@
   <string name="tip_favorites">Favorieten</string>
   <string name="tip_favorites_t">Veelgebruikte punten kunnen als volgt worden bewaard als favorieten:
 		\n\nIn het kaartcontextmenu van een punt, kies de optie \'Voeg toe aan favorieten\' en geef het dan een naam.
-		\n\nNa opslaan zijn favorieten toegankelijk via \'Hoofdmenu\' → \'Favorieten\'. Druk op een favoriet in het menu \'Favorieten\' om deze als als bestemming te kiezen, te bewerken of te verwijderen.
+		\n\nNa opslaan zijn favorieten toegankelijk via \'Hoofdmenu\' → \'Favorieten\'. Druk op een favoriet in het menu \'Mijn plaatsen\' om deze als als bestemming te kiezen, te bewerken of te verwijderen.
 		\n\nJe kan alle favorieten tegelijk op de kaart weergeven door de laag \'Favorieten\' aan te zetten op het kaartscherm in \'Menu\' → \'Kaartlagen\'.
 	</string>
   <string name="create_poi_link_to_osm_doc">" <u>Online OSM</u> kaart classificatie met foto\'s"</string>
@@ -608,7 +608,7 @@ Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de f
   <string name="route_head">Koers</string>
   <string name="first_time_continue">Ga door</string>
   <string name="first_time_download">Download regio\'s</string>
-  <string name="first_time_msg">Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Offline gegevens\') of zelf aanmaken. Daarna kan je de kaart bekijken en adressen, interessepunten en openbaar vervoer opzoeken.</string>
+  <string name="first_time_msg">Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Kaartbeheer\') of zelf aanmaken. Daarna kan je de kaart bekijken en adressen, interessepunten en openbaar vervoer opzoeken.</string>
   <string name="search_poi_location">Naar signaal zoeken…</string>
   <string name="search_near_map">Zoek dichtbij de laatste kaartlocatie</string>
   <string name="search_nearby">Zoek dichtbij</string>
@@ -769,7 +769,7 @@ Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de f
   <string name="exit_Button">Afsluiten</string>
   <string name="map_Button">Kaart</string>
   <string name="settings_Button">Instellingen</string>
-  <string name="favorites_Button">Favorieten</string>
+  <string name="favorites_Button">Mijn plaatsen</string>
   <string name="search_button">Zoeken</string>
   <string name="search_activity">Zoeken</string>
   <string name="searchpoi_activity">Kies interessepunt</string>
@@ -864,7 +864,7 @@ Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de f
   <string name="offline_navigation_not_available">OsmAnd offline navigatie is tijdelijk niet beschikbaar.</string>
   <string name="left_side_navigation">Linksrijdend verkeer</string>
   <string name="left_side_navigation_descr">Activeer in een land waar men links rijdt</string>
-  <string name="download_link_and_local_description">Download of update offline gegevens.\nKlik op een item om meer details te zien, druk lang om te deactiveren, te hernoemen of te verwijderen. Huidige data op apparaat (%1$s vrij):</string>
+  <string name="download_link_and_local_description">Download of actualiseer offline kaarten.\nKlik op een item om meer details te zien, druk lang om te deactiveren, te hernoemen of te verwijderen. Huidige data op apparaat (%1$s vrij):</string>
   <string name="unknown_from_location">Startlocatie is nog niet bepaald</string>
   <string name="confirm_interrupt_download">Wil je het downloaden afbreken?</string>
   <string name="basemap_was_selected_to_download">De basiskaart is nodig voor OsmAnd en is al geselecteerd om te downloaden.</string>
@@ -1164,7 +1164,7 @@ Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de f
     <string name="tip_altitude_offset">Hoogtecorrectie</string>
 	<string name="tip_altitude_offset_t">De meeste GPS ontvangers geven hoogtemetingen in het WGS84-systeem. De conversie naar lokale systemen vereist een positie-afhankelijke correctie.
 		\n\nEen nauwkeuriger benadering voor deze systemen is het EGM96-systeem (geoid).
-		\n\nOsmAnd kan de hoogte ook weergeven in het EGM96-systeem. Download hiervoor de gegevens voor World Altitude Correction (WW15MGH.DAC) via \'Instellingen\' -&gt; \'Offline gegevens\' (het origineel staat op http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/binary/WW15MGH.DAC).
+		\n\nOsmAnd kan de hoogte ook weergeven in het EGM96-systeem. Download hiervoor de gegevens voor World Altitude Correction (WW15MGH.DAC) via \'Instellingen\' -&gt; \'Kaartbeheer\' (het origineel staat op http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/binary/WW15MGH.DAC).
 	</string>
     <string name="monitoring_control_start">GPX</string>
     <string name="rendering_attr_noAdminboundaries_name">Verberg grenzen</string>
@@ -1174,7 +1174,7 @@ Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de f
     <string name="osmodroid_plugin_name">OsMoDroid-plugin</string>
 	<string name="index_srtm_parts">gedeelten</string>
     <string name="index_srtm_ele">Hoogtelijnen</string>
-    <string name="srtm_plugin_description">Maakt het downloaden van offline hoogtelijnen en reliëfinformatie mogelijk (\'Instellingen\' → \'Offline gegevensbeheer\' → \'Download\' → Kies kaarttype).</string>
+    <string name="srtm_plugin_description">Maakt het downloaden van offline hoogtelijnen en reliëfinformatie mogelijk (\'Instellingen\' → \'Kaartbeheer\' → \'Download\' → Kies kaarttype).</string>
     <string name="srtm_plugin_name">Hoogtelijnen-plugin</string>
     <string name="download_select_map_types">Andere kaarten</string>
     <string name="download_srtm_maps">Hoogtelijnen</string>
@@ -1759,9 +1759,12 @@ De maximale afstand tussen start en bestemming is ongeveer 200 km. Maak één of
     <string name="osmo_locations_sent">%1$d verzonden locaties (in buffer %2$d) </string>
     <string name="osmo_conn_successfull">Verbinding gemaakt: %1$s </string>
     <string name="tip_recent_changes_1_8_alpha">Wijzigingen in versie 1.8:
-      * Routeberekening tussen punten op een GPX-spoor
-      * Kaarten op het downloadscherm zoeken met de plaatselijke naam
-      * GPX/KML import (converteer KML naar GPX)
+    * Routeberekening tussen punten op een GPX-spoor
+    * Kaarten op het downloadscherm zoeken met de plaatselijke naam
+    * GPX/KML import (converteer KML naar GPX)
+    * GPX sporen verplaatst naar "Mijn plaatsen"
+    * GPX spoor splitsen en controle van hoogteverschil / snelheid
+    * Start navigatie automatisch na vertraging
     </string>
     <string name="use_points_as_intermediates">Bereken route tussen punten</string>
     <string name="osmo_mode_restart">Herstart OsMo-sessie</string>
@@ -1824,35 +1827,35 @@ De maximale afstand tussen start en bestemming is ongeveer 200 km. Maak één of
     <string name="osmo_show_group_notifications">Toon groepsmeldingen</string>
     <string name="osmo_show_group_notifications_descr">Toon meldingen als een gebruiker bij een groep komt of deze verlaat</string>
     <string name="my_favorites">Mijn favorieten</string>
-    <string name="my_data_Button">Mijn gegevens</string>
-    <string name="my_data_activity">Mijn gegevens</string>
+    <string name="my_data_Button">Mijn plaatsen</string>
+    <string name="my_data_activity">Mijn plaatsen</string>
     <string name="selected_track">Gekozen track</string>
     <string name="my_tracks">Alle tracks</string>
     <string name="gpx_file_is_empty">Gpx track is leeg</string>
     <string name="gpx_info_subtracks">Subtracks: %1$s </string>
 	<string name="gpx_info_distance">Afstand: %1$s (%2$s punten) </string>
-	<string name="gpx_info_start_time">Starttijd: %1$tF,  %1$tR </string>
-	<string name="gpx_info_end_time">Eindtijd: %1$tF,  %1$tR </string>
+	<string name="gpx_info_start_time">Starttijd: %1$tF,  %1$tT </string>
+	<string name="gpx_info_end_time">Eindtijd: %1$tF,  %1$tT </string>
 	<string name="gpx_info_average_speed">Gemiddelde snelheid: %1$s </string>
 	<string name="gpx_info_maximum_speed">Maximum snelheid: %1$s </string>
 	<string name="gpx_info_avg_altitude">Gemiddelde hoogte: %1$s</string>
-	<string name="gpx_info_diff_altitude">Hoogteverschil: %1$s</string>
-	<string name="gpx_info_asc_altitude">Stijgingen: %1$s</string>
+	<string name="gpx_info_diff_altitude">Hoogtebereik: %1$s</string>
+	<string name="gpx_info_asc_altitude">Dalingen/Stijgingen: %1$s</string>
     <string name="gpx_timespan">Tijdsduur: %1$s</string>
 	<string name="gpx_timemoving">Tijdsduur verplaatsingen: %1$s</string>
     <string name="gpx_selection_segment_title">Segment</string>
     <string name="gpx_selection_number_of_points"> %1$s punten</string>
     <string name="gpx_selection_point">Punt %1$s</string>
     <string name="gpx_selection_current_track">geregistreerde track</string>
-    <string name="gpx_selection_route_points">%1$s \n Routepunten %2$s</string>
-    <string name="gpx_selection_points">%1$s\n punten</string>
-    <string name="gpx_selection_track">%1$s\n Track %2$s</string>
+    <string name="gpx_selection_route_points">%1$s \nRoutepunten %2$s</string>
+    <string name="gpx_selection_points">%1$s \npunten</string>
+    <string name="gpx_selection_track">%1$s \nTrack %2$s</string>
     <string name="gpx_available_current_track">Huidige geregistreerde track</string>
     <string name="save_as_favorites_points">Bewaar als groep van favorieten</string>
     <string name="loading_smth">Laad %1$s …</string>
     <string name="map_widget_plain_time">Huidige tijd</string>
     <string name="select_destination_and_intermediate_points">Kies routepunten</string>
-    <string name="layer_amenity_label">Tekstlabels</string>
+    <string name="layer_amenity_label">Punt-labels</string>
     <string name="gpx_wpt">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 met vertraging</string>

From c6bea2333a4f2caaee1d0f79374be1e1d4e019a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20B=C3=A1thory?= <bathory86p@gmail.com>
Date: Mon, 16 Jun 2014 23:50:16 +0200
Subject: [PATCH 04/35] Translated using Weblate.

---
 OsmAnd/res/values-hu/strings.xml | 87 +++++++++++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index dd418a68b9..59f8457565 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="tip_recent_changes_0_7_2_t">"A 0.7.2 kiadás változásai:
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="tip_recent_changes_0_7_2_t">"A 0.7.2 kiadás változásai:
 \n\t- Natív renderelő minden eszközre
 \n\t- Offline POI szerkesztés
 \n\t- Akadálymentesítés 
@@ -1552,4 +1553,86 @@
     <string name="osmo_session_not_available">Munkamenet nem elérhető, kérlek ellenőrizd, hogy a \'Hely küldése\' be van-e kapcsolva.</string>
     <string name="osmo_share_session">Munkamenet megosztása</string>
     <string name="osmo_session_id_share">Munkamenet URL az eszköz követéséhez (%1$s)</string>
-    </resources>
\ No newline at end of file
+    <string name="show_zoom_buttons_navigation_descr">Zoom gombok megjelenítése navigáció közben</string>
+    <string name="show_zoom_buttons_navigation">Zoom gombok megjelenítése</string>
+    <string name="save_as_favorites_points">Mentés kedvencek csoportként</string>
+    <string name="select_destination_and_intermediate_points">Útpontok kiválasztása</string>
+    <string name="layer_amenity_label">Pont nevek</string>
+    <string name="map_widget_plain_time">Pontos idő</string>
+    <string name="gpx_wpt">Ú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 késleltetéssel</string>
+    <string name="selected">kiválasztott</string>
+    <string name="gpx_split_interval">Felosztási intervallum kiválasztása</string>
+    <string name="gpx_info_subtracks">Résznyomvonalak: %1$s </string>
+	<string name="gpx_info_waypoints">Útpontok: %1$s </string>
+	<string name="gpx_info_distance">Távolság: %1$s (%2$s pont) </string>
+	<string name="gpx_info_start_time">Kezdés: %1$tF,  %1$tT </string>
+	<string name="gpx_info_end_time">Befejezés: %1$tF,  %1$tT </string>
+	<string name="gpx_info_average_speed">Átlagos sebesség: %1$s </string>
+	<string name="gpx_info_maximum_speed">Legnagyobb sebesség: %1$s </string>
+	<string name="gpx_info_avg_altitude">Átlagos magasság: %1$s</string>
+	<string name="gpx_info_diff_altitude">Magasság tartomány: %1$s</string>
+	<string name="gpx_info_asc_altitude">Le/fel: %1$s</string>
+    <string name="gpx_timespan">Eltelt idő: %1$s</string>
+	<string name="gpx_timemoving">Mozgási idő: %1$s</string>
+    <string name="gpx_selection_segment_title">Szakasz</string>
+    <string name="gpx_selection_number_of_points"> %1$s pont</string>
+    <string name="gpx_selection_point">%1$s. pont</string>
+    <string name="gpx_selection_current_track">felvétel</string>
+    <string name="gpx_selection_route_points">%1$s \n%2$s útpont</string>
+    <string name="gpx_selection_points">%1$s \nPontok</string>
+    <string name="gpx_selection_track">%1$s \nNyomvonal %2$s</string>
+    <string name="gpx_available_current_track">Aktív nyomvonal rögzítés</string>
+    <string name="gpx_file_is_empty">A gpx nyomvonal üres</string>
+    <string name="selected_track">Kiválasztott nyomvonalak</string>
+    <string name="my_tracks">Összes nyomvonal</string>
+    <string name="my_favorites">Kedvenceim</string>
+    <string name="my_data_Button">Saját helyek</string>
+    <string name="my_data_activity">Saját helyek</string>
+    <string name="osmo_user_joined">%1$s felhasználó csatlakozott a(z) %2$s csoporthoz</string>
+    <string name="osmo_user_left">%1$s felhasználó elhagyta a(z) %2$s csoportot</string>
+    <string name="osmo_show_group_notifications">Csoportértesítések megjelenítése</string>
+    <string name="osmo_show_group_notifications_descr">Értesítő popup megjelenítése, ha egy felhasználó csatlakozik a csoporthoz, vagy elhagyja</string>
+    <string name="osmo_follow">Követés</string>
+    <string name="osmo_sign_in">Bejelentkezés</string>
+    <string name="osmo_create_groups_confirm">Csoport létrehozásáshoz regisztrált OsMo felhasználó kell legyél.</string>
+    <string name="osmo_credentials_not_valid">Az OsMo hitelesítő adataid érvénytelenek.</string>
+    <string name="osmo_regenerate_login_ids_confirm">Biztosan újragenerálod a személyes azonosítód? A hozzád kapcsolt összes készülék képtelen lesz követni téged.</string>
+    <string name="osmo_regenerate_login_ids">Felhasználói azonosító újragenerálása</string>
+    <string name="osmo_cancel_moving_target">Cél mozgatásának visszavonása</string>
+    <string name="osmo_center_location">Képernyő közepére</string>
+    <string name="osmo_set_moving_target">Beállítás mozgó célpontnak</string>
+    <string name="osmo_use_server_name">Regisztrált név</string>
+    <string name="osmo_connect_to_my_nickname">Felhasználónevem</string>
+    <string name="osmo_user_name">Felhasználó</string>
+	<string name="color_green">zöld</string>
+	
+    <string name="osmo_track_interval">Rögzítési intervallum</string>
+	<string name="osmo_track_interval_descr">Válaszd ki a pozícióküldés gyakoriságát</string>
+    <string name="int_days">nap</string>
+    <string name="osmo_connect_menu">Kapcsolódás</string>
+    <string name="osmo_expire_group">Lejár</string>
+    <string name="osmo_group_description">Leírás</string>
+    <string name="osmo_group_policy">Irányelv</string>
+    <string name="osmo_connect_to_device_tracker_id">Követő ID</string>
+    <string name="osmo_connect_to_device_name">Felhasználónév</string>
+    <string name="osmo_connect_to_group_id">Csoport ID</string>
+    <string name="osmo_group_name">Csoportnév</string>
+    <string name="osmo_connect_to_device">Összekötés eszközzel</string>
+    <string name="osmo_connect_to_group">Összekötés csoporttal</string>
+    <string name="osmo_connect">Kapcsolódás ide</string>
+    <string name="osmo_create_group">Csoport létrehozása</string>
+    <string name="osmo_server_operation_failed">OsMo kiszolgáló művelet sikertelen</string>
+    <string name="osmo_activity">OpenStreetMap-Megfigyelés</string>
+    <string name="osmo_enable_tracker">Pozícióm küldése</string>
+    <string name="osmo_control">OsMo gyors elérés</string>
+    <string name="hours_ago">órával ezelőtt</string>
+    <string name="minutes_ago">perce</string>
+    <string name="seconds_ago">másodperce</string>
+    <string name="osmo_connected_devices">Összekapcsolt eszközök</string>
+    <string name="osmo_groups">OsMo Csoportok/Eszközök</string>
+    <string name="osmo_auto_send_locations_descr">A programindítás után a nyomkövető automatikus indítása és pozícióküldés</string>
+    <string name="osmo_auto_send_locations">Nyomkövető automatikus indítása</string>
+    <string name="osmo_tracker_id">Személyes nyomkövető ID</string>
+    </resources>

From 57103bd912f4edaf32c8b8dd10ecdb0b900f33fa Mon Sep 17 00:00:00 2001
From: Guntis Ozols <raivo_s@inbox.lv>
Date: Mon, 16 Jun 2014 13:21:37 +0200
Subject: [PATCH 05/35] Translated using Weblate.

---
 OsmAnd/res/values-lv/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 051a9d14da..a516ed38f9 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
   <string name="select_plugin_to_activate">Atzīmējiet spraudni, lai to aktivizētu vai deaktivizētu. (Iespējams OsmAnd vajadzēs restartēt.)</string>
   <string name="prefs_plugins_descr">Spraudņi iespējo aplikācijas papildus funkcijas un uzstādījumus kā piemēram sekošana, enerģijas taupīšana, pieejamība un daudzas citas</string>
@@ -1769,4 +1769,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="gpx_selection_points">%1$s \nPunkti</string>
     <string name="gpx_selection_track">%1$s \nTreks %2$s</string>
     <string name="gpx_available_current_track">Pašreizējais treka ieraksts</string>
+    <string name="save_as_favorites_points">Saglabāt kā izlases grupu</string>
+    <string name="select_destination_and_intermediate_points">Atlasīt ceļapunktus</string>
+    <string name="layer_amenity_label">Punktu nosaukumi</string>
     </resources>

From 254e158d9ec3fc2ecd8dc1b6c8d3967f808c08ba Mon Sep 17 00:00:00 2001
From: Nuno Abreu <webmonstro@hotmail.com>
Date: Mon, 16 Jun 2014 13:57:38 +0200
Subject: [PATCH 06/35] Translated using Weblate.

---
 OsmAnd/res/values-pt/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 70e11094c9..b7f122a6c0 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="amenity_type_administrative">Administrativo</string>
   <string name="amenity_type_barrier">Barreira</string>
   <string name="amenity_type_education">Educação</string>
@@ -1235,7 +1235,7 @@ Você pode ativar (on-line ou em cache) fontes azulejo mapa, configurações de
     <string name="context_menu_item_directions_to">Direções para</string>
     <string name="context_menu_item_directions_from">Direções desde</string>
     <string name="route_descr_map_location">Mapa: </string>
-    <string name="route_descr_lat_lon">Lat %1$.3f, Lon %2$.3f</string>
+    <string name="route_descr_lat_lon">Lat. %1$.3f, Lon. %2$.3f</string>
     <string name="route_to">Para:</string>
     <string name="route_via">Via:</string>
     <string name="route_from">Desde:</string>

From cc2d249aa6d290ff5eb5a690202cde12eea7b95c Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Mon, 16 Jun 2014 20:04:04 +0200
Subject: [PATCH 07/35] Translated using Weblate.

---
 OsmAnd/res/values-sk/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 5047a3299a..d9f237ca5a 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="recording_context_menu_show">Zobraziť</string>
   <string name="recording_photo_description">Fotografia %1$s zachytená dňa %2$s</string>
   <string name="av_def_action_picture">Zachytiť fotografiu</string>
@@ -1887,4 +1887,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="save_as_favorites_points">Uložiť ako skupinu obľúbených</string>
     <string name="select_destination_and_intermediate_points">Vybrať prechodné body</string>
     <string name="layer_amenity_label">Popisy bodov</string>
+    <string name="show_zoom_buttons_navigation_descr">Zobraziť tlačidlá priblíženia počas navigácie</string>
+    <string name="show_zoom_buttons_navigation">Zobraziť tlačidlá priblíženia</string>
     </resources>

From 7fca39d5e91cf606af55c8174ab2d8291bdc0de4 Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Mon, 16 Jun 2014 17:17:49 +0200
Subject: [PATCH 08/35] Translated using Weblate.

---
 OsmAnd/res/values-sv/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 10572b57e9..023987ef87 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
 <string name="ChooseCountry">Välj land</string>
 <string name="choose_city">Välj stad</string>
@@ -1586,4 +1586,6 @@ Aktuella data på enheten (%1$s ledigt):</string>
     <string name="save_as_favorites_points">Spara som grupp med favoriter</string>
     <string name="select_destination_and_intermediate_points">Välj waypoints</string>
     <string name="layer_amenity_label">Textetiketter</string>
+    <string name="show_zoom_buttons_navigation_descr">Visa zoom-knappar under navigering</string>
+    <string name="show_zoom_buttons_navigation">Visa zoom-knappar</string>
     </resources>

From f75bf5497b804d156ceae6b404a1162073419c90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20B=C3=A1thory?= <bathory86p@gmail.com>
Date: Tue, 17 Jun 2014 00:29:31 +0200
Subject: [PATCH 09/35] Translated using Weblate.

---
 OsmAnd/res/values-hu/strings.xml | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 59f8457565..22ca47bebf 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -129,7 +129,7 @@
   <string name="routing_settings">Navigáció</string>
   <string name="routing_settings_descr">Navigáció beállításai</string>
   <string name="global_settings">Globális beállítások</string>
-  <string name="index_settings">Offline adatok (Letöltés)</string>
+  <string name="index_settings">Térképek kezelése</string>
   <string name="index_settings_descr">Térképek és más, pl. GPX útvonalak, letöltése és kezelése</string>
   <string name="general_settings">Általános beállítások</string>
   <string name="general_settings_descr">Kijelző és más általános beállítások</string>
@@ -243,7 +243,7 @@
   <string name="local_index_items_restored">%2$d darabból %1$d sikeresen aktiválva.</string>
   <string name="local_index_no_items_to_do">Nincs elem a művelethez: %1$s</string>
   <string name="local_index_action_do">%2$s darab elemen végre lesz hajtva a %1$s. Folytatod?</string>
-  <string name="local_index_descr_title">Offline - kapcsolat nélküli adatkezelés</string>
+  <string name="local_index_descr_title">Térképek kezelése</string>
   <string name="local_index_mi_restore">Aktiválás</string>
   <string name="local_index_mi_backup">Deaktiválás</string>
   <string name="local_index_mi_delete">Törlés</string>
@@ -726,7 +726,7 @@
   <string name="exit_Button">Kilép</string>
   <string name="map_Button">Térkép</string>
   <string name="settings_Button">Beállítások</string>
-  <string name="favorites_Button">Kedvencek</string>
+  <string name="favorites_Button">Saját helyek</string>
   <string name="search_button">Keresés</string>
   <string name="search_activity">Keresés</string>
   <string name="searchpoi_activity">POI kiválasztás</string>
@@ -1434,8 +1434,8 @@
 	<string name="routing_attr_weight_name">Maximális súly</string>
 	<string name="routing_attr_weight_description">Jármű súlykorlátozásának megadása</string>
     <string name="android_19_location_disabled">Az Android 4.4 KitKat verzió óta nem lehet térképet letölteni és frissíteni a korábbi helyre (%s). Szeretnéd az összes fájlt egy engedélyezett helyre másolni?
-        \n Megjegyzés : a régi fájlok érintetlenül maradnak.
-        \n Megjegyzés : nem lehetséges az OsmAnd és OsmAnd+ között fájlokat megosztani. </string>
+        \n Megjegyzés: a régi fájlok érintetlenül maradnak.
+        \n Megjegyzés: nem lehetséges az OsmAnd és OsmAnd+ között fájlokat megosztani. </string>
     <string name="application_dir_change_warning2">Az OsmAnd megpróbálja az adatokat új helyre másolni. Szeretnéd?</string>
     <string name="copying_osmand_one_file_descr">%s fájl másolás új helyre…</string>
     <string name="copying_osmand_files_descr">OsmAnd fájlok másolása új helyre (%s)</string>
@@ -1512,8 +1512,8 @@
     <string name="osmo_settings_uuid">Egyedi eszközazonosító</string>
     <string name="osmo_settings_descr">Egyedi eszközregisztrációs kulcs megtekintése és egyéb monitoring beállítások </string>
     <string name="osmo_plugin_description">OpenStreetMap-Monitoring – Fejlett Live Monitoring sok funkcióval http://osmo.mobi távirányításhoz</string>
-    <string name="osmo_plugin_name">OSMo (Fejlett Live Monitoring)</string>
-    <string name="osmo_settings">OSMo</string>
+    <string name="osmo_plugin_name">OsMo (Fejlett Live Monitoring)</string>
+    <string name="osmo_settings">OsMo OpenStreetMap Megfigyelés (béta)</string>
    	<string name="always_center_position_on_map">Pozíció megjelenítése mindig középen</string>
     <string name="voice_pref_title">Hang</string>
     <string name="misc_pref_title">Egyebek</string>
@@ -1547,7 +1547,7 @@
     <string name="osmo_edit_color">Megjelenítési szín</string>
     <string name="osmo_group_info">Infó</string>
     <string name="osmo_group">OsMo csoport</string>
-    <string name="osmo_group_share">%2$s csoporthoz csatlakozáshoz add meg a csoportazonosítót (%1$s)</string>
+    <string name="osmo_group_share">%2$s csoporthoz csatlakozáshoz add meg a csoportazonosítót (%1$s).</string>
     <string name="osmo_share_connect_device">Eszköz állandó követésének engedélyezése</string>
     <string name="osmo_share_current_session">Aktuális munkamenet megosztása böngészőben</string>
     <string name="osmo_session_not_available">Munkamenet nem elérhető, kérlek ellenőrizd, hogy a \'Hely küldése\' be van-e kapcsolva.</string>
@@ -1635,4 +1635,18 @@
     <string name="osmo_auto_send_locations_descr">A programindítás után a nyomkövető automatikus indítása és pozícióküldés</string>
     <string name="osmo_auto_send_locations">Nyomkövető automatikus indítása</string>
     <string name="osmo_tracker_id">Személyes nyomkövető ID</string>
-    </resources>
+    <string name="tip_recent_changes_1_8_alpha">Az 1.8 kiadás újdonságai:
+        * Útvonaltervezés a GPX útvonalpontjai között
+        * Letöltésnél az országok nevei helyi nyelven jelennek meg
+        * GPX/KML import (konvertálás KML-ből GPX-be)
+        * Felvett GPX nyomvonalak a \'Saját helyek\' menüből érhetőek el
+        * Feldarabolhatod a GPX nyomvonalat távolságonként és ellenőrizheted a sebesség és magasság adatokat
+        * Navigáció automatikus indítása késleltetéssel
+    </string>
+    <string name="use_points_as_intermediates">Útvonal tervezése pontok között</string>
+    <string name="local_index_mi_export">Exportálás</string>
+	<string name="import_file_favourites">Mentés GPX fájlként, vagy importálás a kedvencekbe?</string>
+	<string name="import_save">Mentés</string>
+	<string name="share_fav">Megosztás</string>
+	<string name="share_fav_subject">OsmAndból megosztott kedvencek</string>
+	</resources>

From 8966025c6321dc87b6ba8e627eec47a78bab6bdc Mon Sep 17 00:00:00 2001
From: Andrius A <kaikaris.andrius@gmail.com>
Date: Tue, 17 Jun 2014 07:37:07 +0200
Subject: [PATCH 10/35] Translated using Weblate.

---
 OsmAnd/res/values-lt/strings.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 190671b582..8832477e51 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1848,4 +1848,16 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="gpx_info_average_speed">Vidutinis greitis: %1$s </string>
 	<string name="gpx_info_maximum_speed">Maksimalus greitis: %1$s </string>
 	<string name="gpx_selection_number_of_points"> %1$s taškai/-ų</string>
+    <string name="show_zoom_buttons_navigation_descr">Rodyti mąstelio mygtukus navigacijos metu</string>
+    <string name="show_zoom_buttons_navigation">Rodyti mąstelio mygtukus</string>
+    <string name="save_as_favorites_points">Išsaugoti kaip grupę įsimintų vietų</string>
+    <string name="select_destination_and_intermediate_points">Pasirinkti tarpinius kelionės taškus</string>
+    <string name="layer_amenity_label">Taškų 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="selected_gpx_info_show">\n\nPaspauskite ir laikykite kad pamatytumėte ant žemėlapio</string>
+    <string name="delay_navigation_start">Pradėti navigaciją su uždelsimu</string>
+    <string name="selected">pasirinkti</string>
+    <string name="gpx_split_interval">Pasirinkti padalinimo intervalą</string>
     </resources>

From 0fa9005a98c3cf030cf928d98d612c81a09dabf1 Mon Sep 17 00:00:00 2001
From: I&O none <day-19@yandex.ru>
Date: Tue, 17 Jun 2014 09:43:54 +0200
Subject: [PATCH 11/35] Translated using Weblate.

---
 OsmAnd/res/values-ru/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 322d27c066..afb9227122 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="srtm_plugin_description">Этот плагин позволяет загружать линии высот (Загрузка данных -&gt; Меню -&gt; "Другие карты") для использования оффлайн.</string>
     <string name="srtm_paid_version_msg">Рассмотрите пожалуйста покупку плагина \"Линии высот\" на Market, чтобы поддержать последующую разработку.</string>
     <string name="srtm_paid_version_title">Линии высот</string>
@@ -1720,4 +1720,6 @@ OsmAnd - открытый источник и активно развается.
     <string name="gpx_selection_point">Точка %1$s</string>
     <string name="gpx_selection_current_track">запись</string>
     <string name="gpx_selection_route_points">%1$s \nМаршрутных точек %2$s</string>
+    <string name="show_zoom_buttons_navigation_descr">Показывать кнопки изменения масштаба во время навигации</string>
+    <string name="show_zoom_buttons_navigation">Показывать кнопки изменения масштаба</string>
     </resources>

From 2cac2262cbb10a22f6f077cb22ffc68f06ce732e Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Tue, 17 Jun 2014 11:10:27 +0200
Subject: [PATCH 12/35] Translated using Weblate.

---
 OsmAnd/res/values-sv/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 023987ef87..c3fd98e1be 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1585,7 +1585,7 @@ Aktuella data på enheten (%1$s ledigt):</string>
     <string name="gpx_available_current_track">Aktuellt inspelningsspår</string>
     <string name="save_as_favorites_points">Spara som grupp med favoriter</string>
     <string name="select_destination_and_intermediate_points">Välj waypoints</string>
-    <string name="layer_amenity_label">Textetiketter</string>
+    <string name="layer_amenity_label">Punktetiketter</string>
     <string name="show_zoom_buttons_navigation_descr">Visa zoom-knappar under navigering</string>
     <string name="show_zoom_buttons_navigation">Visa zoom-knappar</string>
     </resources>

From c010954a845975095ed9b99fccce9ecafc16edb2 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Tue, 17 Jun 2014 20:34:44 +0200
Subject: [PATCH 13/35] Build sherpafy package

---
 OsmAnd/build.xml                              |  34 ++++++++++++------
 OsmAnd/res/drawable-hdpi/icon_sherpafy.png    | Bin 0 -> 2195 bytes
 OsmAnd/res/drawable-mdpi/icon_sherpafy.png    | Bin 0 -> 1413 bytes
 OsmAnd/res/drawable-xhdpi/icon_sherpafy.png   | Bin 0 -> 2930 bytes
 OsmAnd/res/drawable-xxhdpi/icon_sherpafy.png  | Bin 0 -> 4542 bytes
 OsmAnd/res/drawable-xxxhdpi/icon_sherpafy.png | Bin 0 -> 6321 bytes
 OsmAnd/src/net/osmand/plus/Version.java       |   9 +++++
 .../plus/activities/MainMenuActivity.java     |  18 +++++-----
 8 files changed, 41 insertions(+), 20 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/icon_sherpafy.png
 create mode 100644 OsmAnd/res/drawable-mdpi/icon_sherpafy.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/icon_sherpafy.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/icon_sherpafy.png
 create mode 100644 OsmAnd/res/drawable-xxxhdpi/icon_sherpafy.png

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 7d59807563..dac57cb25b 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -64,32 +64,44 @@
 				<replaceregexp file="res/values/no_translate.xml" match='versionFeatures"&gt;(.*)&lt;' replace='versionFeatures"&gt;${versionFeatures}&lt;' byline="true" />
 			</then>
 		</if>
+		<if>
+			<condition>
+				<isset property="net.osmand.sherpafy" />
+			</condition>
+			<then>
+				<replaceregexp file="AndroidManifest.xml" match='"@drawable/icon"' replace='"@drawable/icon_free"' byline="true" />
+				<property name="package.name" value="net.osmand.sherpafy" />
+				<property name="app.name" value="Sherpafy" />
+			</then>
+		</if>
 		<if>
 			<condition>
 				<isset property="net.osmand" />
 			</condition>
 			<then>
 				<replaceregexp file="AndroidManifest.xml" match='"@drawable/icon"' replace='"@drawable/icon_free"' byline="true" />
-				<replaceregexp file="AndroidManifest.xml" match='package="net.osmand.plus"' replace='package="net.osmand"' byline="true" />
-				<replaceregexp file="AndroidManifest.xml" match='android:process="net.osmand.plus"' replace='android:process="net.osmand"' byline="true" />
-				<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;OsmAnd&lt;' byline="true" />
-				<replaceregexp file="res/layout/search_address.xml" match='net.osmand.plus' replace='net.osmand' byline="true" />
-				<replaceregexp file="res/layout/navigate_point.xml" match='net.osmand.plus' replace='net.osmand' byline="true" />
+				<property name="package.name" value="net.osmand" />
+				<property name="app.name" value="OsmAnd" />
 			</then>
-			<else>
-				<replaceregexp file="AndroidManifest.xml" match='"@drawable/icon_free"' replace='"@drawable/icon"' byline="true" />
-				<replaceregexp file="AndroidManifest.xml" match='package="net.osmand"' replace='package="net.osmand.plus"' byline="true" />
-				<replaceregexp file="AndroidManifest.xml" match='android:process="net.osmand"' replace='android:process="net.osmand.plus"' byline="true" />
-			</else>
 		</if>
 		<if>
 			<condition>
 				<isset property="net.osmand.plus" />
 			</condition>
 			<then>
-				<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;OsmAnd+&lt;' byline="true" />
+			    <property name="package.name" value="net.osmand.plus" />
+			    <property name="app.name" value="OsmAnd+" />
+			    <replaceregexp file="AndroidManifest.xml" match='"@drawable/icon_free"' replace='"@drawable/icon"' byline="true" />
 			</then>
 		</if>
+		
+		<replaceregexp file="AndroidManifest.xml" match='package="(.*)"' replace='package="${package.name}"' byline="true" />
+		<replaceregexp file="AndroidManifest.xml" match='android:process="(.*)"' replace='android:process="${package.name}"' byline="true" />
+		<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;${app.name}&lt;' byline="true" />
+		<replaceregexp file="res/layout/search_address.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' 
+			    replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
+		<replaceregexp file="res/layout/navigate_point.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' 
+			    replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
 		<if>
 			<condition>
 				<isset property="build.version.code" />
diff --git a/OsmAnd/res/drawable-hdpi/icon_sherpafy.png b/OsmAnd/res/drawable-hdpi/icon_sherpafy.png
new file mode 100644
index 0000000000000000000000000000000000000000..702303d671f156e181e19212ed4f10899cfa42a8
GIT binary patch
literal 2195
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
Vk#=)f)q(&3002ovPDHLkV1hd9CZhlV

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/icon_sherpafy.png b/OsmAnd/res/drawable-mdpi/icon_sherpafy.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac21e6a7b3ce3e1d3ca93a605ccdcfa10a4c1969
GIT binary patch
literal 1413
zcmV;01$z34P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000F{Nkl<ZXhZFo
zX>3$g6vzK>_Gzcnb=pqbDYes*DqSS0Z8a`Mp*9+5D2YZ<6P5U-D1m4Uf(9ZO3~p)k
zi%LR5f<!@MsEJ}sp#}ri0@dzQrTao>hFQAJ`n>mz9hP?X*Vd9bpI+X(_rCw{oV%QJ
z8LV()R=9rLSpY1t6%Y}YVHm-j&RZf71z4K!MI*2@e)j#BXaw%$2(Yj@uEFLs5J(nc
zVLW7FH5f+7Cp5oPh-F<EHJ!$g@oVU<O|TR33?o8}L<5N^86u$)3RynlWCe(q7a>tm
z1_2|E1c*NXz4aVg2X?|b(@DIogeLhpWF*!gG4?(P1@d_!S-9bH&p;%IU2Xst-6Mz4
zHFAJV6gRR{UO-{idz{Cqb(x*`b=-z_lLLK|F3h@EC`1g@F+$|UiBOm*#@Zw?lBC`P
zH58!8BhWVZCVI!~$xj&+X%0i1R>ukWwtof(S}nM2bOaQ{kQ|^OUW|uQC8$(O@t9hM
zR9R3!;Q>t9{=u;EB!;h_f_eH+PGDa8PR{excDI;u=r3zP;l3IO2vBLV1W#&Y*rbu8
zgha?!rb%)k?<c>xki%sni}M={8jiy_d6C;$=1eZh!iJ(YvLL0nWN@JL^!QC*!{+dI
z%q3H8bG95?a^$E;k&uny#+U&CrtJgJjedXuBHZPkT2M_^($gr-J<5GMqMO3D^VcI+
z?PG)-g$UbL$6`-$9M>Ws!1<mhFkxx*D=00#3is!K&$VgR+fmkVZP5Vez^~q|Kz(^a
zZ~%0^pY3=M4wrAQ3ItMYDC~e-lEDpH+i1XdWDzfhDa8VG)uur$_Z)};BS0ICni_Di
z_bKw^yT(x`Y(jb72|6Uqb~mbj*5ks2op**$D-uvwpzw|x6aa1AIlK?uqwo6_v^xED
z+>`Y#*Jj$uV#n_$9O;?jZ9!LO%J9Sb6tY>|kP$Qh%erx)cMHbNKl+8pQN6^S2SPy%
z*RFBQhJBYUXd;JMB&LZK;*X7K^UjB$0qD=^R(h`U5lqhZ_|>A2<)I|I9xCNJZ#xP=
zK`2nDCKEC^TdhL5N;0o&NC33=<g5-&U6mwJGX~JXATy~JYcdZaM!L$|wqbA<yP8eV
zS)4&}(AjeA;UsL$^+fb`3mJe8Kr_wXdN#t%2418>fehNz?Z{WZ!6kXrW=KA?_mTyl
zbXdt4{yFxqRpOlzPe0xO=s<&puh4S!W%3l<?Tb{Lih_*2$VqvTOR=fZXl!jV!s2i*
zD2^UjpFfc3_rfZy2+aLWH}(<QhxP<D73LZ#<%KB9J`7b{CHJbuU`N#%J&d+nA!<nK
zaB>}~Ap%^tMFc<vv<<z5-m#BEf}m%`U8%32So0xQq0t4t{wF;g|IMdINk-a0wo5r#
zyn!rY06K-P^uLC_i7x~FYu@+#^j%n!b&z}iHrb(Q`dvYGnln`@#EAoor~P;Upa^bU
z>8nG({%A-Lw4AIe?&fM`i-SeYFM6CJ(<YSSh8F;;nnJYp?+7^(W!mGU^xVvWlfygU
zoWI>eya9LyX1PVJ3t>%^YfnH;YUgl`X8?~3T4J^j?&hN6&jgGFj~DAex7cuPQ2?kI
zdc8u=38%|<X{k-y&gD&!*rEYYQI?qwH2?i9th3$oG-jtfk9${r7U{hZKf91W4?10w
z=p5OPs}o<q?Y1FSn#-NYn&f99alE(hqDJ6mg$|dQTs2ORn>j6c9o!xt4B?Ui1S2M#
zHc^0ZyvAprXaxB5W;kO-Be1a7f~(RzeIwgaeMTUha4vVB$Xv19>LZTj{{Y}$dksWS
TNePcI00000NkvXXu0mjf=f;_Q

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/icon_sherpafy.png b/OsmAnd/res/drawable-xhdpi/icon_sherpafy.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c4beb81f17fa35a82af95944709c6a4de632537
GIT binary patch
literal 2930
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/icon_sherpafy.png b/OsmAnd/res/drawable-xxhdpi/icon_sherpafy.png
new file mode 100644
index 0000000000000000000000000000000000000000..d339f1d8422e3ccf62219445d1e1defe8d3ca892
GIT binary patch
literal 4542
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxxhdpi/icon_sherpafy.png b/OsmAnd/res/drawable-xxxhdpi/icon_sherpafy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a48bbf5bf71f5bb926639521bf9a80c8da941c9
GIT binary patch
literal 6321
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
F{XZG9#zFu9

literal 0
HcmV?d00001

diff --git a/OsmAnd/src/net/osmand/plus/Version.java b/OsmAnd/src/net/osmand/plus/Version.java
index c272cd8962..d3757f0953 100644
--- a/OsmAnd/src/net/osmand/plus/Version.java
+++ b/OsmAnd/src/net/osmand/plus/Version.java
@@ -9,6 +9,7 @@ public class Version {
 	private final String appVersion; 
 	private final String appName;
 	private final static String FREE_VERSION_NAME = "net.osmand";
+	private final static String SHERPAFY_VERSION_NAME = "net.osmand.sherpafy";
 	
 	
 	public static boolean isGpsStatusEnabled(OsmandApplication ctx) {
@@ -48,6 +49,14 @@ public class Version {
 		return ctx.getString(R.string.versionFeatures).contains("+parking_plugin");
 	}
 	
+	public static boolean isRouteNavPluginInlined(OsmandApplication ctx) {
+		return ctx.getString(R.string.versionFeatures).contains("+route_nav");
+	}
+	
+	public static boolean isSherpafy(OsmandApplication ctx) {
+		return ctx.getPackageName().equals(SHERPAFY_VERSION_NAME);
+	}
+	
 	private Version(OsmandApplication ctx) {
 		appVersion = ctx.getString(R.string.app_version);
 		appName = ctx.getString(R.string.app_name);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index 90aa5b9b36..324a721709 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -13,6 +13,7 @@ import net.osmand.plus.Version;
 import net.osmand.plus.activities.search.SearchActivity;
 import net.osmand.plus.render.MapRenderRepositories;
 import net.osmand.plus.sherpafy.SherpafyCustomization;
+import net.osmand.plus.sherpafy.TourViewActivity;
 import android.app.Activity;
 import android.app.AlertDialog.Builder;
 import android.app.Dialog;
@@ -184,11 +185,15 @@ public class MainMenuActivity extends Activity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		if(getIntent() != null) {
-			setupCustomization(getIntent());
-		}
-		((OsmandApplication) getApplication()).applyTheme(this);
+		getMyApplication().applyTheme(this);
 		super.onCreate(savedInstanceState);
+		if(Version.isSherpafy(getMyApplication())) {
+			final Intent mapIntent = new Intent(this, TourViewActivity.class);
+			getMyApplication().setAppCustomization(new SherpafyCustomization());
+			startActivity(mapIntent);
+			finish();
+		}
+		
 		boolean exit = false;
 		if(getIntent() != null){
 			Intent intent = getIntent();
@@ -309,11 +314,6 @@ public class MainMenuActivity extends Activity {
 		}
 	}
 
-	private void setupCustomization(Intent intent) {
-		if (intent.hasExtra("SHERPAFY")) {
-			((OsmandApplication) getApplication()).setAppCustomization(new SherpafyCustomization());
-		}
-	}
 
 	private void applicationInstalledFirstTime() {
 		boolean netOsmandWasInstalled = false;

From 8ce39d12f1f422144a56ba2483fd037f7f8ccf43 Mon Sep 17 00:00:00 2001
From: Aleksei Polkhirev <polkhirev@gmail.com>
Date: Tue, 17 Jun 2014 14:39:45 +0200
Subject: [PATCH 14/35] Translated using Weblate (Russian)

Currently translated at 99.5% (1417 of 1424 strings)
---
 OsmAnd/res/values-ru/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 322d27c066..08c104f4c0 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="srtm_plugin_description">Этот плагин позволяет загружать линии высот (Загрузка данных -&gt; Меню -&gt; "Другие карты") для использования оффлайн.</string>
     <string name="srtm_paid_version_msg">Рассмотрите пожалуйста покупку плагина \"Линии высот\" на Market, чтобы поддержать последующую разработку.</string>
     <string name="srtm_paid_version_title">Линии высот</string>
@@ -1720,4 +1720,6 @@ OsmAnd - открытый источник и активно развается.
     <string name="gpx_selection_point">Точка %1$s</string>
     <string name="gpx_selection_current_track">запись</string>
     <string name="gpx_selection_route_points">%1$s \nМаршрутных точек %2$s</string>
+    <string name="show_zoom_buttons_navigation_descr">Отображать кнопки масштабирования при навигации</string>
+    <string name="show_zoom_buttons_navigation">Отображать кнопки масштабирования</string>
     </resources>

From 6b0df5320ef725f0ac3cf1c7118f92c92aa048e5 Mon Sep 17 00:00:00 2001
From: Evgenii Martynenko <deathstallker@yandex.ru>
Date: Tue, 17 Jun 2014 14:59:12 +0200
Subject: [PATCH 15/35] Translated using Weblate.

---
 OsmAnd/res/values-ru/strings.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index afb9227122..6aa062279a 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -319,7 +319,7 @@
   <string name="vector_map_not_needed">Не нужно</string>
   <string name="basemap_missing">Отсутствует базовая карта, покрывающая весь мир на мелком масштабе. Пожалуйста загрузите World_basemap_x.obf для полноценный работы приложения.</string>
   <string name="vector_data_missing">Локальные данные отсутствуют на SD-носителе. Пожалуйста, загрузите их для того, чтобы использовать приложение без Интернета.</string>
-  <string name="local_index_gpx_info_show">\n\nДлинное нажатие для просмотра на карте</string>
+  <string name="local_index_gpx_info_show">\n\nНажать и удерживать для вызова меню</string>
   
   
   
@@ -1677,9 +1677,9 @@ OsmAnd - открытый источник и активно развается.
     <string name="osmo_follow">Следить</string>
     <string name="osmo_edit_device">Изменить пользовательские свойства</string>
     <string name="gpx_file_is_empty">Трек GPX пуст</string>
-    <string name="selected_track">Выбранный трек</string>
-    <string name="my_tracks">Все трэки</string>
-    <string name="my_favorites">Мои избранные</string>
+    <string name="selected_track">Выбранные треки</string>
+    <string name="my_tracks">Все треки</string>
+    <string name="my_favorites">Избранное</string>
     <string name="my_data_Button">Мои места</string>
     <string name="my_data_activity">Мои места</string>
     <string name="osmo_user_joined">Пользователь %1$s присоединился к группе %2$s</string>
@@ -1692,7 +1692,7 @@ OsmAnd - открытый источник и активно развается.
     <string name="osmo_set_moving_target">Установить как движущуюся цель</string>
     <string name="osmo_center_location">Центр на экране</string>
     <string name="gpx_selection_segment_title">Сегмент</string>
-    <string name="gpx_info_distance">Дистанция: %1$s (%2$s точек) </string>
+    <string name="gpx_info_distance">Расстояние: %1$s (%2$s точек) </string>
 	<string name="gpx_info_start_time">Время старта: %1$tF, %1$tT </string>
 	<string name="gpx_info_end_time">Время завершения: %1$tF, %1$tT </string>
 	<string name="gpx_info_average_speed">Средняя скорость: %1$s </string>
@@ -1700,10 +1700,10 @@ OsmAnd - открытый источник и активно развается.
 	<string name="gpx_info_avg_altitude">Средняя высота: %1$s</string>
 	<string name="gpx_info_diff_altitude">Диапазон высот: %1$s</string>
 	<string name="gpx_info_asc_altitude">Снижение/подъём: %1$s</string>
-    <string name="gpx_timespan">Отрезок времени: %1$s</string>
-	<string name="gpx_timemoving">Время передвижения: %1$s</string>
+    <string name="gpx_timespan">Общее время: %1$s</string>
+	<string name="gpx_timemoving">Время в движении: %1$s</string>
     <string name="gpx_selection_points">%1$s \nТочек</string>
-    <string name="gpx_selection_track">%1$s \nТрэк %2$s</string>
+    <string name="gpx_selection_track">%1$s \nТрек %2$s</string>
     <string name="gpx_available_current_track">Текущий пишущийся трек</string>
     <string name="loading_smth">Загрузка %1$s…</string>
     <string name="map_widget_plain_time">Текущее время</string>

From f5bd25ff392e1dd0d934bbbad20ecdd0cbf5509b Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Tue, 17 Jun 2014 18:49:25 +0200
Subject: [PATCH 16/35] Translated using Weblate.

---
 OsmAnd/res/values-sv/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index c3fd98e1be..8f82e079fd 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1548,7 +1548,7 @@ Aktuella data på enheten (%1$s ledigt):</string>
 	<string name="osmo_follow">Följ</string>
     <string name="osmo_user_joined">Användare %1$s anslöt till grupp %2$s</string>
     <string name="osmo_user_left">Användare %1$s lämnade grupp %2$s</string>
-    <string name="osmo_show_group_notifications">Visa gruppmeddelanden</string>
+    <string name="osmo_show_group_notifications">Visa gruppaviseringar</string>
     <string name="osmo_show_group_notifications_descr">Visa popup-meddelande när användare ansluter till eller lämnar gruppen</string>
     <string name="selected_track">Valda spår</string>
     <string name="my_tracks">Alla spår</string>
@@ -1588,4 +1588,6 @@ Aktuella data på enheten (%1$s ledigt):</string>
     <string name="layer_amenity_label">Punktetiketter</string>
     <string name="show_zoom_buttons_navigation_descr">Visa zoom-knappar under navigering</string>
     <string name="show_zoom_buttons_navigation">Visa zoom-knappar</string>
+    <string name="color_green">grön</string>
+	
     </resources>

From 67172ee3f869c590f5876224c42ad37550d3a6d5 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Tue, 17 Jun 2014 20:56:03 +0200
Subject: [PATCH 17/35] Update icon

---
 OsmAnd/build.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index dac57cb25b..3d0e668887 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -72,6 +72,7 @@
 				<replaceregexp file="AndroidManifest.xml" match='"@drawable/icon"' replace='"@drawable/icon_free"' byline="true" />
 				<property name="package.name" value="net.osmand.sherpafy" />
 				<property name="app.name" value="Sherpafy" />
+				<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_sherpafy"' byline="true" />
 			</then>
 		</if>
 		<if>
@@ -79,9 +80,9 @@
 				<isset property="net.osmand" />
 			</condition>
 			<then>
-				<replaceregexp file="AndroidManifest.xml" match='"@drawable/icon"' replace='"@drawable/icon_free"' byline="true" />
 				<property name="package.name" value="net.osmand" />
 				<property name="app.name" value="OsmAnd" />
+				<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_free"' byline="true" />
 			</then>
 		</if>
 		<if>
@@ -91,7 +92,7 @@
 			<then>
 			    <property name="package.name" value="net.osmand.plus" />
 			    <property name="app.name" value="OsmAnd+" />
-			    <replaceregexp file="AndroidManifest.xml" match='"@drawable/icon_free"' replace='"@drawable/icon"' byline="true" />
+			    <replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon"' byline="true" />
 			</then>
 		</if>
 		

From bfa19f10e30486e6330ae602ed383373990767b9 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Tue, 17 Jun 2014 20:59:30 +0200
Subject: [PATCH 18/35] Update icon

---
 OsmAnd/build.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 3d0e668887..7d02784320 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -69,7 +69,6 @@
 				<isset property="net.osmand.sherpafy" />
 			</condition>
 			<then>
-				<replaceregexp file="AndroidManifest.xml" match='"@drawable/icon"' replace='"@drawable/icon_free"' byline="true" />
 				<property name="package.name" value="net.osmand.sherpafy" />
 				<property name="app.name" value="Sherpafy" />
 				<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_sherpafy"' byline="true" />
@@ -132,8 +131,11 @@
 			<fileset dir="${gen.absolute.dir}/net/osmand">
 				<include name="R.java" />
 			</fileset>
+			<fileset dir="${gen.absolute.dir}/net/osmand/sherpafy">
+				<include name="R.java" />
+			</fileset>
 		</copy>
-		<replaceregexp file="${gen.absolute.dir}/net/osmand/plus/R.java" match='package net.osmand;' replace='package net.osmand.plus;' byline="true" />
+		<replaceregexp file="${gen.absolute.dir}/net/osmand/plus/R.java" match='package (.*);' replace='package net.osmand.plus;' byline="true" />
 		<!-- osmchange : Osmand plus support -->
 
 		<do-only-if-manifest-hasCode elseText="hasCode = false. Skipping...">

From 6e73e662c8056236156a639158c20c4ed671785f Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 18 Jun 2014 01:35:55 +0200
Subject: [PATCH 19/35] Fix build

---
 OsmAnd/build.xml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 7d02784320..960716ebb5 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -94,14 +94,20 @@
 			    <replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon"' byline="true" />
 			</then>
 		</if>
-		
-		<replaceregexp file="AndroidManifest.xml" match='package="(.*)"' replace='package="${package.name}"' byline="true" />
-		<replaceregexp file="AndroidManifest.xml" match='android:process="(.*)"' replace='android:process="${package.name}"' byline="true" />
-		<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;${app.name}&lt;' byline="true" />
-		<replaceregexp file="res/layout/search_address.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' 
-			    replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
-		<replaceregexp file="res/layout/navigate_point.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' 
-			    replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
+		<if>
+			<condition>
+				<isset property="package.name" />
+			</condition>
+			<then>
+				<replaceregexp file="AndroidManifest.xml" match='package="(.*)"' replace='package="${package.name}"' byline="true" />
+				<replaceregexp file="AndroidManifest.xml" match='android:process="(.*)"' replace='android:process="${package.name}"' byline="true" />
+				<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;${app.name}&lt;' byline="true" />
+				<replaceregexp file="res/layout/search_address.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' 
+			    	replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
+				<replaceregexp file="res/layout/navigate_point.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' 
+			    	replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
+			</then>
+			</if>
 		<if>
 			<condition>
 				<isset property="build.version.code" />

From 74cdbe5db91d00448170e1b9576af9a9aca51a40 Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Tue, 17 Jun 2014 22:40:35 +0200
Subject: [PATCH 20/35] Translated using Weblate (Slovak)

Currently translated at 99.9% (1422 of 1423 strings)
---
 OsmAnd/res/values-sk/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 5047a3299a..d62965622a 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="recording_context_menu_show">Zobraziť</string>
   <string name="recording_photo_description">Fotografia %1$s zachytená dňa %2$s</string>
   <string name="av_def_action_picture">Zachytiť fotografiu</string>
@@ -1887,4 +1887,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="save_as_favorites_points">Uložiť ako skupinu obľúbených</string>
     <string name="select_destination_and_intermediate_points">Vybrať prechodné body</string>
     <string name="layer_amenity_label">Popisy bodov</string>
+    <string name="show_zoom_buttons_navigation">Zobraziť tlačidlá priblíženia</string>
     </resources>

From e92b0d0476e2aaa3a7c98aa68dc15748adc86ffa Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 18 Jun 2014 01:38:52 +0200
Subject: [PATCH 21/35] Fix build

---
 OsmAnd/build.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 960716ebb5..b43fed3eaa 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -64,6 +64,8 @@
 				<replaceregexp file="res/values/no_translate.xml" match='versionFeatures"&gt;(.*)&lt;' replace='versionFeatures"&gt;${versionFeatures}&lt;' byline="true" />
 			</then>
 		</if>
+		<property name="package.name" value="net.osmand.plus" />
+		<property name="app.name" value="OsmAnd~" />
 		<if>
 			<condition>
 				<isset property="net.osmand.sherpafy" />

From b3e3c2ce022eeae487664d0a6284fb52186d7742 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 18 Jun 2014 01:45:13 +0200
Subject: [PATCH 22/35] Fix build

---
 OsmAnd/build.xml | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index b43fed3eaa..02deb430e6 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -135,14 +135,30 @@
 	<target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile">
 		<!-- osmchange : Osmand plus support -->
 		<mkdir dir="${gen.absolute.dir}/net/osmand/plus"/>
-		<copy todir="${gen.absolute.dir}/net/osmand/plus">
-			<fileset dir="${gen.absolute.dir}/net/osmand">
-				<include name="R.java" />
-			</fileset>
-			<fileset dir="${gen.absolute.dir}/net/osmand/sherpafy">
-				<include name="R.java" />
-			</fileset>
-		</copy>
+		<if>
+			<condition>
+				<isset property="net.osmand.sherpafy" />
+			</condition>
+			<then>
+			    <copy todir="${gen.absolute.dir}/net/osmand/plus">
+					<fileset dir="${gen.absolute.dir}/net/osmand/sherpafy">
+						<include name="R.java" />
+					</fileset>
+				</copy>
+			</then>
+		</if>
+		<if>
+			<condition>
+				<isset property="net.osmand" />
+			</condition>
+			<then>
+			    <copy todir="${gen.absolute.dir}/net/osmand/plus">
+					<fileset dir="${gen.absolute.dir}/net/osmand">
+						<include name="R.java" />
+					</fileset>
+				</copy>
+			</then>
+		</if>
 		<replaceregexp file="${gen.absolute.dir}/net/osmand/plus/R.java" match='package (.*);' replace='package net.osmand.plus;' byline="true" />
 		<!-- osmchange : Osmand plus support -->
 

From ad88e523b8b86b5957d549310cda79cc03eb3b0d Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 18 Jun 2014 01:54:15 +0200
Subject: [PATCH 23/35] Fix build

---
 OsmAnd/build.xml | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 02deb430e6..1de0b9bf8b 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -64,8 +64,7 @@
 				<replaceregexp file="res/values/no_translate.xml" match='versionFeatures"&gt;(.*)&lt;' replace='versionFeatures"&gt;${versionFeatures}&lt;' byline="true" />
 			</then>
 		</if>
-		<property name="package.name" value="net.osmand.plus" />
-		<property name="app.name" value="OsmAnd~" />
+		
 		<if>
 			<condition>
 				<isset property="net.osmand.sherpafy" />
@@ -75,26 +74,26 @@
 				<property name="app.name" value="Sherpafy" />
 				<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_sherpafy"' byline="true" />
 			</then>
-		</if>
-		<if>
-			<condition>
-				<isset property="net.osmand" />
-			</condition>
-			<then>
-				<property name="package.name" value="net.osmand" />
-				<property name="app.name" value="OsmAnd" />
-				<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_free"' byline="true" />
-			</then>
-		</if>
-		<if>
-			<condition>
-				<isset property="net.osmand.plus" />
-			</condition>
-			<then>
-			    <property name="package.name" value="net.osmand.plus" />
-			    <property name="app.name" value="OsmAnd+" />
-			    <replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon"' byline="true" />
-			</then>
+			<elseif>
+  				<isset property="net.osmand" />
+  				<then>
+  				    <property name="package.name" value="net.osmand" />
+					<property name="app.name" value="OsmAnd" />
+					<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_free"' byline="true" />
+  			    </then>
+  			</elseif>
+  			<elseif>
+  				<isset property="net.osmand.plus" />
+  				<then>
+  				    <property name="package.name" value="net.osmand.plus" />
+			    	<property name="app.name" value="OsmAnd+" />
+			    	<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon"' byline="true" />
+  			    </then>
+  			</elseif>
+  			<else>
+  			      <property name="package.name" value="net.osmand.plus" />
+				  <property name="app.name" value="OsmAnd~" />
+ 			</else>
 		</if>
 		<if>
 			<condition>

From ff3b4eca3476748a8248fcddf3e319b30239c35e Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 18 Jun 2014 02:01:02 +0200
Subject: [PATCH 24/35] Fix build

---
 OsmAnd/build.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 1de0b9bf8b..a73d7b4a7f 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -74,27 +74,27 @@
 				<property name="app.name" value="Sherpafy" />
 				<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_sherpafy"' byline="true" />
 			</then>
-			<elseif>
+		</if>
+		<if>
+			<condition>
   				<isset property="net.osmand" />
-  				<then>
-  				    <property name="package.name" value="net.osmand" />
-					<property name="app.name" value="OsmAnd" />
-					<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_free"' byline="true" />
-  			    </then>
-  			</elseif>
-  			<elseif>
+  			</condition>
+  			<then>
+  			    <property name="package.name" value="net.osmand" />
+				<property name="app.name" value="OsmAnd" />
+				<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_free"' byline="true" />
+  		    </then>
+  		</if>
+		<if>
+			<condition>
   				<isset property="net.osmand.plus" />
+  			</condition>
   				<then>
   				    <property name="package.name" value="net.osmand.plus" />
 			    	<property name="app.name" value="OsmAnd+" />
 			    	<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon"' byline="true" />
   			    </then>
-  			</elseif>
-  			<else>
-  			      <property name="package.name" value="net.osmand.plus" />
-				  <property name="app.name" value="OsmAnd~" />
- 			</else>
-		</if>
+  		</if>
 		<if>
 			<condition>
 				<isset property="package.name" />

From 9107f4f6d730580af9fd6dc8a4e7c1d79b481eff Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 18 Jun 2014 02:14:27 +0200
Subject: [PATCH 25/35] Fix build

---
 OsmAnd/AndroidManifest.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 3cce6bdbdb..897f7029a4 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -176,7 +176,9 @@
 		<activity android:name="net.osmand.plus.activities.LocalIndexesActivity" android:label="@string/local_index_descr_title"></activity>
 		<activity android:name="net.osmand.plus.osmedit.LocalOpenstreetmapActivity" android:label="@string/local_openstreetmap_act_title"></activity>
 
-		<service android:process="net.osmand.plus" android:label="@string/process_navigation_service" android:name="net.osmand.plus.NavigationService">
+		<!-- keep android:process on a separate line !! -->
+		<service android:process="net.osmand.plus" 
+		    android:label="@string/process_navigation_service" android:name="net.osmand.plus.NavigationService">
 			<intent-filter>
 				<action android:name="net.osmand.plus.NavigationService"></action>
 			</intent-filter>

From 3e9b7be35e77bedd04718358b7e472fdba6f61b1 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 18 Jun 2014 02:22:48 +0200
Subject: [PATCH 26/35] Fix build

---
 OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index 324a721709..b7df454932 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -192,6 +192,7 @@ public class MainMenuActivity extends Activity {
 			getMyApplication().setAppCustomization(new SherpafyCustomization());
 			startActivity(mapIntent);
 			finish();
+			return;
 		}
 		
 		boolean exit = false;

From 383ffec6a069f33721164605dd9a2b754717448e Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 18 Jun 2014 02:49:51 +0200
Subject: [PATCH 27/35] Fix tour selection

---
 .../plus/sherpafy/SherpafyCustomization.java  |  7 ++--
 .../plus/sherpafy/TourViewActivity.java       | 37 +++++++------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
index 432555d259..d3c6ebe8bd 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
@@ -22,7 +22,6 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.api.FileSettingsAPIImpl;
 import net.osmand.plus.download.DownloadActivityType;
 import net.osmand.plus.sherpafy.TourInformation.StageInformation;
-import net.osmand.plus.views.OsmandMapTileView;
 import android.app.Activity;
 import android.view.Window;
 import android.widget.TextView;
@@ -226,18 +225,18 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 
 
 	public void selectTour(TourInformation tour, IProgress progress) {
-		if(tour == null) {
+		if (tour == null) {
 			selectedTourPref.set(null);
 		} else {
 			selectedTourPref.set(tour.getName());
 		}
 		selectedTour = null;
 		selectedStage = null;
-		//to avoid null reference ecxeption if there's no selected tour yet.
+		// to avoid null reference ecxeption if there's no selected tour yet.
 		if (selectedStagePref != null) {
 			selectedStagePref.set(null);
 		}
-			app.getResourceManager().reloadIndexes(progress);
+		app.getResourceManager().reloadIndexes(progress);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
index ce622b051d..b0bb2328d6 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
@@ -1,8 +1,9 @@
 package net.osmand.plus.sherpafy;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import net.osmand.IProgress;
 import net.osmand.access.AccessibleAlertBuilder;
@@ -19,16 +20,11 @@ import android.app.AlertDialog.Builder;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.DialogInterface.OnClickListener;
 import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Matrix;
 import android.graphics.Point;
-import android.graphics.BitmapFactory.Options;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.Html;
@@ -43,7 +39,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
-import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
@@ -75,7 +70,7 @@ public class TourViewActivity extends SherlockFragmentActivity {
 	RadioGroup stages;
 	private ToggleButton collapser;
 	Point size;
-	private boolean afterDownload = false;
+	private Set<TourInformation> currentTourInformations  = new HashSet<TourInformation>();
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -147,23 +142,19 @@ public class TourViewActivity extends SherlockFragmentActivity {
 	protected void onResume() {
 		super.onResume();
 
-		//this flag needed to start indexing tours is user downloaded some and returned to activity
-		if (afterDownload){
-			if (customization.getTourInformations().isEmpty()){
-				customization.onIndexingFiles(IProgress.EMPTY_PROGRESS,new LinkedHashMap<String, String>());
-			}
-
-			if (!customization.getTourInformations().isEmpty()){
-				if (customization.getSelectedTour() == null){
-					setTourSelectionContentView();
-					state = STATE_SELECT_TOUR;
-				} else {
-					startTourView();
+		TourInformation selectedTour = customization.getSelectedTour();
+		if (selectedTour == null || currentTourInformations.contains(selectedTour)) {
+			for (TourInformation i : customization.getTourInformations()) {
+				if (!currentTourInformations.contains(i)) {
+					currentTourInformations.add(i);
+					selectedTour = i; 
 				}
-
+			}
+			if(selectedTour != null) {
+				selectTourAsync(selectedTour);
+				//startTourView();
 			}
 		}
-
 	}
 	
 	private void setTourInfoContent() {
@@ -374,6 +365,7 @@ public class TourViewActivity extends SherlockFragmentActivity {
 	private void goToMap() {
 		if (customization.getSelectedStage() != null) {
 			GPXFile gpx = customization.getSelectedStage().getGpx();
+			getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow();
 			if (gpx != null && gpx.findPointToShow() != null) {
 				WptPt p = gpx.findPointToShow();
 				getMyApplication().getSettings().setMapLocationToShow(p.lat, p.lon,
@@ -483,7 +475,6 @@ public class TourViewActivity extends SherlockFragmentActivity {
 	private void startDownloadActivity() {
 		final Intent download = new Intent(this, DownloadIndexActivity.class);
 		download.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-		afterDownload = true;
 		startActivity(download);
 	}
 	

From 50073a412c91b6c40de4900b5a370b683f0a0bb1 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 18 Jun 2014 08:54:48 +0200
Subject: [PATCH 28/35] Fix location

---
 .../plus/activities/MainMenuActivity.java     |  8 +---
 .../plus/sherpafy/TourViewActivity.java       | 39 +++++++++++++++----
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index b7df454932..b8e495ccc0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -195,11 +195,11 @@ public class MainMenuActivity extends Activity {
 			return;
 		}
 		
-		boolean exit = false;
 		if(getIntent() != null){
 			Intent intent = getIntent();
 			if(intent.getExtras() != null && intent.getExtras().containsKey(APP_EXIT_KEY)){
-				exit = true;
+				getMyApplication().closeApplication(this);
+				return;
 			}
 		}
 		
@@ -256,10 +256,6 @@ public class MainMenuActivity extends Activity {
 			}
 		});
 		appCustomization.customizeMainMenu(window, this);
-		if(exit){
-			getMyApplication().closeApplication(activity);
-			return;
-		}
 		OsmandApplication app = getMyApplication();
 		// restore follow route mode
 		if(app.getSettings().FOLLOW_THE_ROUTE.get() && !app.getRoutingHelper().isRouteCalculated()){
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
index b0bb2328d6..8057c2439e 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
@@ -9,6 +9,7 @@ import net.osmand.IProgress;
 import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.DownloadIndexActivity;
@@ -63,6 +64,9 @@ public class TourViewActivity extends SherlockFragmentActivity {
 	private static final int STATE_LOADING = 0;
 	private static final int STATE_SELECT_TOUR = -1;
 	private static int state = STATE_LOADING;
+	public static final int APP_EXIT_CODE = 4;
+	public static final String APP_EXIT_KEY = "APP_EXIT_KEY";
+	
 	private SherpafyCustomization customization;
 	ImageView img;
 	TextView description;
@@ -82,6 +86,13 @@ public class TourViewActivity extends SherlockFragmentActivity {
     	setTheme(R.style.OsmandLightTheme);
         ((OsmandApplication) getApplication()).setLanguage(this);
         super.onCreate(savedInstanceState);
+        if(getIntent() != null){
+			Intent intent = getIntent();
+			if(intent.getExtras() != null && intent.getExtras().containsKey(APP_EXIT_KEY)){
+				getMyApplication().closeApplication(this);
+				return;
+			}
+		}
         if(getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || 
         		getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT) {
         	getSherlock().setUiOptions(ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
@@ -137,6 +148,14 @@ public class TourViewActivity extends SherlockFragmentActivity {
 
 		};
 	}
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		if(resultCode == APP_EXIT_CODE){
+			getMyApplication().closeApplication(this);
+		}
+	}
 
 	@Override
 	protected void onResume() {
@@ -365,15 +384,21 @@ public class TourViewActivity extends SherlockFragmentActivity {
 	private void goToMap() {
 		if (customization.getSelectedStage() != null) {
 			GPXFile gpx = customization.getSelectedStage().getGpx();
-			getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow();
-			if (gpx != null && gpx.findPointToShow() != null) {
-				WptPt p = gpx.findPointToShow();
-				getMyApplication().getSettings().setMapLocationToShow(p.lat, p.lon,
-						getMyApplication().getSettings().getLastKnownMapZoom(), null);
-				getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(gpx);
+			List<SelectedGpxFile> sgpx = getMyApplication().getSelectedGpxHelper().getSelectedGPXFiles();
+			if(gpx == null && sgpx.size() > 0) {
+				getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow();
+			} else if (sgpx.size() != 1 || sgpx.get(0).getGpxFile() != gpx) {
+				getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow();
+				if (gpx != null && gpx.findPointToShow() != null) {
+					WptPt p = gpx.findPointToShow();
+					getMyApplication().getSettings().setMapLocationToShow(p.lat, p.lon, 16, null);
+					getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(gpx);
+				}
 			}
 		}
-		MapActivity.launchMapActivityMoveToTop(getActivity());
+		Intent newIntent = new Intent(this, customization.getMapActivity());
+		newIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+		this.startActivityForResult(newIntent, 0);
 	}
 
 	private void prepareBitmap(Bitmap imageBitmap) {

From 30a41f4f8b79c6b39e77ed4d26183bd30cc61379 Mon Sep 17 00:00:00 2001
From: Evgenii Martynenko <deathstallker@yandex.ru>
Date: Wed, 18 Jun 2014 07:41:40 +0200
Subject: [PATCH 29/35] Translated using Weblate.

---
 OsmAnd/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 6aa062279a..d43a15bc66 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1679,7 +1679,7 @@ OsmAnd - открытый источник и активно развается.
     <string name="gpx_file_is_empty">Трек GPX пуст</string>
     <string name="selected_track">Выбранные треки</string>
     <string name="my_tracks">Все треки</string>
-    <string name="my_favorites">Избранное</string>
+    <string name="my_favorites">Избранные</string>
     <string name="my_data_Button">Мои места</string>
     <string name="my_data_activity">Мои места</string>
     <string name="osmo_user_joined">Пользователь %1$s присоединился к группе %2$s</string>

From 30aca3053eb91b7cb2e900b3d1123b2835771dd2 Mon Sep 17 00:00:00 2001
From: Massimiliano Caniparoli <massic80@gmail.com>
Date: Wed, 18 Jun 2014 10:35:09 +0200
Subject: [PATCH 30/35] Translated using Weblate (Italian)

Currently translated at 99.9% (1423 of 1424 strings)
---
 OsmAnd/res/values-it/strings.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 246a7d9507..0bb448f099 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -51,8 +51,8 @@
   <string name="routing_settings">Navigazione</string>
   <string name="routing_settings_descr">Specifica le opzioni di navigazione</string>
   <string name="global_settings">Impostazioni globali</string>
-  <string name="index_settings">Gestione dati</string>
-  <string name="index_settings_descr">Scarica, visualizza i dettagli e gestisci le mappe offline</string>
+  <string name="index_settings">Gestisci file delle mappe</string>
+  <string name="index_settings_descr">Scarica e gestisci le mappe offline archiviate sul tuo dispositivo.</string>
   <string name="general_settings">Impostazioni generali</string>
   <string name="general_settings_descr">Configura le impostazioni globali</string>
   <string name="global_app_settings">Impostazioni globali dell\'applicazione</string>
@@ -772,8 +772,7 @@
   <string name="offline_navigation_not_available">La navigazione offline di OsmAnd è temporaneamente non disponibile.</string>
   <string name="left_side_navigation">Guida a sinistra</string>
   <string name="left_side_navigation_descr">Abilita nei paesi in cui si guida tenendo la sinistra</string>
-  <string name="download_link_and_local_description">Fai clic qui per scaricare o aggiornare i dati offline.\nPer maggiori dettagli fai clic sull\'elemento, per disabilitare o eliminare i dati offline tienilo premuto.
-Dati attualmente nel dispositivo (%1$s liberi):</string>
+  <string name="download_link_and_local_description">Fai clic qui per scaricare o aggiornare le mappe offline.\nPer maggiori dettagli fai clic sull\'elemento, per disabilitare o eliminare i dati offline tienilo premuto. Dati attualmente nel dispositivo (%1$s liberi):</string>
   <string name="unknown_from_location">La posizione di partenza non è ancora stata determinata</string>
   <string name="confirm_interrupt_download">Vuoi interrompere il download dei file?</string>
   <string name="basemap_was_selected_to_download">La mappa di base è richiesta per il funzionamento corretto dell\'applicazione ed è stata selezionata per il download.</string>
@@ -1035,7 +1034,7 @@ Dati attualmente nel dispositivo (%1$s liberi):</string>
 <string name="show_warnings_descr">Configura gli avvisi sul traffico (limiti velocità, stop forzati, dossi e rallentatori), avvisi autovelox e indicazioni di corsia</string>
 <string name="map_widget_fluorescent">Itinerari fluorescenti</string>
 <string name="map_widget_show_ruler">Scala grafica</string>
-<string name="map_widget_appearance">Varie:</string>
+<string name="map_widget_appearance">Altro:</string>
 <string name="map_widget_view_direction">Direzione della visuale</string>
 <string name="map_widget_transparent">Aspetto trasparente</string>
 <string name="monitoring_mode_off">Registra GPX</string>
@@ -1893,7 +1892,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="map_widget_plain_time">Orario attuale</string>
     <string name="save_as_favorites_points">Salva come gruppo di preferiti</string>
     <string name="select_destination_and_intermediate_points">Scegli le tappe</string>
-    <string name="layer_amenity_label">Etichette di testo</string>
+    <string name="layer_amenity_label">Etichette dei punti</string>
     <string name="show_zoom_buttons_navigation">Mostra i pulsanti dello zoom</string>
     <string name="show_zoom_buttons_navigation_descr">Mostra i pulsanti dello zoom durante la navigazione</string>
     </resources>

From b4faf9de26e279111691706079dc14c5d01d6ad6 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Wed, 18 Jun 2014 10:35:35 +0200
Subject: [PATCH 31/35] Translated using Weblate (Italian)

Currently translated at 99.9% (1423 of 1424 strings)
---
 OsmAnd/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 0bb448f099..20da36b2f0 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -51,7 +51,7 @@
   <string name="routing_settings">Navigazione</string>
   <string name="routing_settings_descr">Specifica le opzioni di navigazione</string>
   <string name="global_settings">Impostazioni globali</string>
-  <string name="index_settings">Gestisci file delle mappe</string>
+  <string name="index_settings">Gestisci i file delle mappe</string>
   <string name="index_settings_descr">Scarica e gestisci le mappe offline archiviate sul tuo dispositivo.</string>
   <string name="general_settings">Impostazioni generali</string>
   <string name="general_settings_descr">Configura le impostazioni globali</string>

From b793f34546cead67cc4339dbb7d3d846f90de0c9 Mon Sep 17 00:00:00 2001
From: Massimiliano Caniparoli <massic80@gmail.com>
Date: Wed, 18 Jun 2014 10:35:58 +0200
Subject: [PATCH 32/35] Translated using Weblate (Italian)

Currently translated at 99.9% (1423 of 1424 strings)
---
 OsmAnd/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 20da36b2f0..8c916e5fcb 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -187,7 +187,7 @@
   <string name="local_index_items_restored">%1$d su %2$d oggetto/i ripristinato/i.</string>
   <string name="local_index_no_items_to_do">Nessun oggetto da %1$s</string>
   <string name="local_index_action_do">Stai per %1$s %2$s oggetti/i. Continuare?</string>
-  <string name="local_index_descr_title">Gestore Dati</string>
+  <string name="local_index_descr_title">Gestisci file delle mappe</string>
   <string name="local_index_mi_restore">Attiva</string>
   <string name="local_index_mi_backup">Disattiva</string>
   <string name="local_index_mi_delete">Elimina</string>

From 6db19e5bda8698a16ed9fdd9222c537451dac048 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Wed, 18 Jun 2014 10:36:20 +0200
Subject: [PATCH 33/35] Translated using Weblate (Italian)

Currently translated at 99.9% (1423 of 1424 strings)
---
 OsmAnd/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 8c916e5fcb..71828fd60c 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -187,7 +187,7 @@
   <string name="local_index_items_restored">%1$d su %2$d oggetto/i ripristinato/i.</string>
   <string name="local_index_no_items_to_do">Nessun oggetto da %1$s</string>
   <string name="local_index_action_do">Stai per %1$s %2$s oggetti/i. Continuare?</string>
-  <string name="local_index_descr_title">Gestisci file delle mappe</string>
+  <string name="local_index_descr_title">Gestisci i file delle mappe</string>
   <string name="local_index_mi_restore">Attiva</string>
   <string name="local_index_mi_backup">Disattiva</string>
   <string name="local_index_mi_delete">Elimina</string>

From 4dcd63b6683fc67ea78f2ea51cc641082e4aef99 Mon Sep 17 00:00:00 2001
From: Massimiliano Caniparoli <massic80@gmail.com>
Date: Wed, 18 Jun 2014 10:36:46 +0200
Subject: [PATCH 34/35] Translated using Weblate (Italian)

Currently translated at 99.9% (1423 of 1424 strings)
---
 OsmAnd/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 71828fd60c..5454f14a65 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -678,7 +678,7 @@
   <string name="exit_Button">Uscita</string>
   <string name="map_Button">Mappa</string>
   <string name="settings_Button">Impostazioni</string>
-  <string name="favorites_Button">Preferiti</string>
+  <string name="favorites_Button">I miei luoghi</string>
   <string name="search_button">Ricerca</string>
   <string name="search_activity">Ricerca</string>
   <string name="searchpoi_activity">Scegli PDI</string>

From 9ef2d401c9fbccb602d2fbc418b27b24c8c608d6 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Wed, 18 Jun 2014 10:47:55 +0200
Subject: [PATCH 35/35] Translated using Weblate (Italian)

Currently translated at 99.9% (1423 of 1424 strings)
---
 OsmAnd/res/values-it/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 5454f14a65..e568072fe2 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -52,7 +52,7 @@
   <string name="routing_settings_descr">Specifica le opzioni di navigazione</string>
   <string name="global_settings">Impostazioni globali</string>
   <string name="index_settings">Gestisci i file delle mappe</string>
-  <string name="index_settings_descr">Scarica e gestisci le mappe offline archiviate sul tuo dispositivo.</string>
+  <string name="index_settings_descr">Scarica e gestisci le mappe offline archiviate sul tuo dispositivo</string>
   <string name="general_settings">Impostazioni generali</string>
   <string name="general_settings_descr">Configura le impostazioni globali</string>
   <string name="global_app_settings">Impostazioni globali dell\'applicazione</string>
@@ -1760,7 +1760,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="navigation_intent_invalid">Formato non valido: %s</string>
 <string name="osmo_settings_uuid">ID univoco del dispositivo</string>
     <string name="osmo_settings_descr">Configura le impostazioni di monitoraggio e imposta il canale di monitoraggio personale</string>
-    <string name="osmo_plugin_description">OpenStreetMap-Monitoraggio - Monitoraggio avanzato in diretta con molte funzioni per il controllo remoto http://osmo.mobi</string>
+    <string name="osmo_plugin_description">OpenStreetMap-Monitoraggio - Monitoraggio avanzato in diretta. Fornisce la possibilità di tracciare altri dispositivi e di essere tracciati. Creare gruppo anonimi, condividere reciprocamente la posizione e comunicare. Sono disponibili varie impostazioni di monitoraggio, per la sessione in corso o permanenti. I gruppi anonimi sono limitate per il numero di giorni e alcune funzioni es. non c\'è il controllo remoto e l\'amministratore del gruppo. Gruppi con tutte le funzionalità possono essere creati dal sito e solo gli utenti registrati possono accedervi. Maggiori informazioni su http://osmo.mobi.</string>
     <string name="osmo_plugin_name">OsMo (Monitoraggio avanzato in tempo reale)</string>
     <string name="osmo_settings">OsMo OpenStreetMap Monitoraggio (beta)</string>
    	<string name="keep_informing_never">Mai</string>