Merge branch 'master' of https://github.com/osmandapp/Osmand

2014-06-16 17:53:29 +03:00 · 2014-06-16 17:53:29 +03:00 · d1eff5431f
commit d1eff5431f
parent b0625fbeab e5e729f7d3
39 changed files with 243 additions and 110 deletions
--- a/AUTHORS.MIT
+++ b/AUTHORS.MIT
@ -1,4 +1,3 @@
-Authors of patches and pull requests:
-
-Hardy Mueller
-Robin `ypid` Schneider
+(C) All authors of translations and pull requests could be found in commits history :
+ - Translations are under special "contributor" name 'weblate'
+ - Pull requests have 2 committers, first is original contributor and second is project maintainer
--- a/CREDITS.md
+++ b/CREDITS.md
@ -8,3 +8,4 @@
 * Alexey Pelykh - C++ developer, created native library and made application much snappier.
 * Max (Zahnstocher) - Java contributor, active forum participant.
 * Harry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant.
+ * Robin `ypid` Schneider - opening hours contributor
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@ -1856,4 +1856,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="save_as_favorites_points">Захаваць як групу упадабаных</string>
    <string name="select_destination_and_intermediate_points">Абраць кропкі шляху</string>
    <string name="layer_amenity_label">Назвы кропак</string>
+    <string name="show_zoom_buttons_navigation">Паказваць кнопкі маштабаваньня</string>
    </resources>
--- a/OsmAnd/res/values-bs/strings.xml
+++ b/OsmAnd/res/values-bs/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="tip_recent_changes_0_8_1_t">"Promjene u 0.8.1 : "</string>
  <string name="asap">Što prije</string>
  <string name="save_route_as_gpx">Sačuvajte put kao GPX datoteku</string>
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@ -855,8 +855,8 @@
 \n\n\'OsmAnd també suporta fonts personalitzades.
 	</string>
 <string name="tip_map_context_menu_t">El menú contextual \'Usa posició\' inclou totes les opcions relatives al punt (posició).
-	\n\nEstà disponible prement i aguantant a qualsevol punt en el mapa (i llavors seleccionant el seu marcador) o prement el boto de la bola de desplaçament o seleccionant \'Menú\'→ \Usa posició\' (en les dues darreres opcions s'agafa el centre del mapa com referència).
-	\n\nLa caixa de diàleg s'amaga altre cop prement i aguantant dins seu.
+	\n\nEstà disponible prement i aguantant a qualsevol punt en el mapa (i llavors seleccionant el seu marcador) o prement el boto de la bola de desplaçament o seleccionant \'Menú\'→ \Usa posició\' (en les dues darreres opcions s\'agafa el centre del mapa com referència).
+	\n\nLa caixa de diàleg s\'amaga altre cop prement i aguantant dins seu.
 	</string>
 <string name="tip_initial_t">OsmAnd és una aplicació de navegació amb moltes funcionalitats.
 		\n\nCom a introducció bàsica, s\'enllacen alguns consells i dreceres via \'Menú\'→ \'Concells\' de la pantalla del mapa.
@ -1858,5 +1858,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
    <string name="gpx_available_current_track">Traça actual en gravació</string>
    <string name="save_as_favorites_points">Guarda com grup de preferits</string>
    <string name="select_destination_and_intermediate_points">Selecciona punts de pas</string>
-    <string name="layer_amenity_label">Etiquetes dels punts</string>
+    <string name="layer_amenity_label">Etiquetes puntuals</string>
+    <string name="show_zoom_buttons_navigation_descr">Mostra els botons de zoom mentre la navegació</string>
+    <string name="show_zoom_buttons_navigation">Mostra els botons de zoom</string>
    </resources>
--- 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í
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -1895,4 +1895,6 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
    <string name="select_destination_and_intermediate_points">Vælg rutepunkter</string>
    <string name="layer_amenity_label">Punktetiketter</string>
    <string name="create_poi_link_to_osm_doc"><u>Online OSM</u> kort klassificering med billeder</string>
+	<string name="show_zoom_buttons_navigation_descr">Vis zoom-knapperne under navigation</string>
+    <string name="show_zoom_buttons_navigation">Vis zoom-knapperne</string>
    </resources>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="route_is_too_long">Die Route ist wahrscheinlich zu lang um vom OsmAnd-Offline-Router berechnet zu werden. Offline-Routing ist bis ungefähr 200 km Abstand zwischen einzelnen Punkten möglich. Bitte einen oder mehrere Zwischenpunkte setzen um die Route berechnen zu können.</string>
 	<string name="auto_zoom_none">Kein Auto-Zoom</string>
 	<string name="auto_zoom_close">Auf Nahbereich</string>
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@ -949,7 +949,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
  <string name="map_widget_top_text">Nombre de calle</string>
  <string name="map_widget_config">Configuración</string>
  
-  <string name="map_widget_back_to_loc">¿Dónde estoy?</string>
+  <string name="map_widget_back_to_loc">Dónde estoy</string>
  <string name="map_widget_lock_screen">Bloquear pantalla</string>
  <string name="map_widget_compass">Brújula</string>
  <string name="map_widget_top_stack">Barra de estado:</string>
@ -1398,7 +1398,7 @@ La lista de países incluídos (¡básicamente todo el mundo!): Afganistán, Alb
 	<string name="driving_region_canada">Canadá</string>
 	<string name="driving_region_europe_asia">Europa y Asia</string>
 	<string name="driving_region_uk">Reino Unido, India, Australia y Otros</string>
-	<string name="driving_region_descr">Selecciona la región de conducción: EEUU, Europa, Reino Unido, Asia y otras</string>
+	<string name="driving_region_descr">Selecciona la región de conducción: EEUU, Europa, Reino Unido, Asia y Otras</string>
 	<string name="driving_region">Región de conducción</string>
 	<string name="edit_tilesource_minzoom">Zoom mínimo</string>
    <string name="edit_tilesource_expiration_time">Expirar (minutos)</string>
@ -1548,7 +1548,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    
    <string name="routing_attr_prefer_motorway_name">Preferir autopistas</string>
 	<string name="routing_attr_prefer_motorway_description">Prefierir autopistas en el ruteo</string>
-	<string name="routing_attr_short_way_name">Camino corto</string>
+	<string name="routing_attr_short_way_name">Camino más corto</string>
 	<string name="routing_attr_short_way_description">Usar el camino corto</string>
 	<string name="routing_attr_avoid_toll_name">Evitar peajes</string>
 	<string name="routing_attr_avoid_toll_description">Evita las carreteras con peaje</string>
@ -1785,6 +1785,9 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    <string name="map_widget_plain_time">Tiempo actual</string>
    <string name="gpx_wpt">Punto de ruta</string>
    <string name="select_destination_and_intermediate_points">Seleccionar puntos de ruta</string>
-    <string name="layer_amenity_label">Etiquetas de texto</string>
+    <string name="layer_amenity_label">Etiquetas de punto</string>
    <string name="save_as_favorites_points">Guardar como grupo de favoritos</string>
+    <string name="show_zoom_buttons_navigation_descr">Mostrar botones de zoom durante navegación</string>
+    <string name="show_zoom_buttons_navigation">Mostrar botones de zoom</string>
+    <string name="route_descr_destination"/>
    </resources>
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="local_osm_changes_backup_failed">پشتیبان‌گیری از تغییرات OsmAnd ناموفق بود</string>
    <string name="plugin_distance_point_time">زمان</string>
    <string name="plugin_distance_point_hdop">دقت</string>
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="offline_edition">Modifications hors-ligne</string>
  <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
  <string name="tip_recent_changes_0_7_1_t">"Changements en 0.7.1 :
@ -350,7 +350,7 @@
  <string name="amenity_type_natural">Nature</string>
  <string name="amenity_type_office">Service</string>
  <string name="amenity_type_other">Autre</string>
-  <string name="amenity_type_shop">Magasin</string>
+  <string name="amenity_type_shop">Commerce</string>
  <string name="amenity_type_sport">Sport</string>
  <string name="amenity_type_sustenance">Restauration</string>
  <string name="amenity_type_tourism">Tourisme</string>
@ -365,7 +365,7 @@
  <string name="m">m</string>
  <string name="old_map_index_is_not_supported">Le format obsolète de la carte \'\'{0}\'\' n\'\'est pas supporté</string>
  <string name="poi_filter_car_aid">Pour conducteurs</string>
-  <string name="poi_filter_closest_poi">PI le plus proche</string>
+  <string name="poi_filter_closest_poi">PI les plus proches</string>
  <string name="poi_filter_custom_filter">Filtre personnalisé</string>
  <string name="poi_filter_food_shop">Alimentation</string>
  <string name="poi_filter_for_tourists">Pour voyageurs</string>
@ -376,7 +376,7 @@
  <string name="version_index_is_not_supported">La version de l\'\'index \'\'{0}\'\' n\'\'est pas supporté</string>
  <string name="use_osmand_routing_service">Navigation hors-ligne OsmAnd &gt;20km</string>
  <string name="use_osmand_routing_service_descr">Utiliser la navigation hors-ligne pour les longues distances (expérimental)</string>
-  <string name="osmand_routing_experimental">La navigation hors-ligne OsmAnd est une fonction expérimentale ne fonctionnant pas pour une distance de plus de 20 km.\n\nLe service utilise alors automatiquement le service en-ligne CloudMade.</string>
+  <string name="osmand_routing_experimental">La navigation hors-ligne OsmAnd est une fonction expérimentale ne fonctionnant pas pour une distance de plus de 20 km.\n\nLe service utilise alors automatiquement le service en ligne CloudMade.</string>
  <string name="specified_dir_doesnt_exist">Le répertoire spécifié est introuvable.</string>
  <string name="application_dir">Répertoire de stockage</string>
  
@ -388,7 +388,7 @@
  <string name="loading_builds">Chargement des versions disponibles…</string>
  <string name="select_build_to_install">Sélectionnez la version d\'OsmAnd à installer</string>
  <string name="contribution_activity">Fonction spéciale pour la version des contributeurs</string>
-  <string name="gps_status_app_not_found">L\'application \'GPS Status\' n\'est pas installée. La chercher dans Market ?</string>
+  <string name="gps_status_app_not_found">L\'application \'GPS Status\' n\'est pas installée. Voulez-vous la chercher dans la boutique d\'application ?</string>
  <string name="voice_is_not_available_msg">Guidage vocal indisponible. Veuillez aller dans les paramètres et choisir les voix à télécharger.</string>
  <string name="voice_is_not_available_title">Aucune donnée vocale n\'est spécifiée</string>
  <string name="daynight_mode_day">Jour</string>
@ -555,7 +555,7 @@
  <string name="context_menu_item_update_map_confirm">Mettre à jour les données locales depuis internet ?</string>
  <string name="search_history_city">Ville :\n{0}</string>
  <string name="search_history_street">Rue :\n{0}\n{1}</string>
-  <string name="search_history_int_streets">Intersection :\n{0} x {1} dans {2}</string>
+  <string name="search_history_int_streets">Intersection :\n{0} x {1} à {2}</string>
  <string name="search_history_building">Bâtiment :\n{0} {1}\n{2}</string>
  <string name="favorite">Favori </string>
  <string name="clear_all">Effacer tout</string>
@ -677,14 +677,14 @@
  <string name="exit_Button">Quitter</string>
  <string name="map_Button">Carte</string>
  <string name="settings_Button">Paramètres</string>
-  <string name="favorites_Button">Favoris</string>
+  <string name="favorites_Button">Mes lieux</string>
  <string name="search_button">Rechercher</string>
  <string name="search_activity">Rechercher</string>
-  <string name="searchpoi_activity">Choisir PI</string>
+  <string name="searchpoi_activity">Choix de points d\'intérêt</string>
  <string name="search_POI_level_btn">Étendre la recherche</string>
-  <string name="incremental_search_city">Recherche progressive de ville</string>
-  <string name="incremental_search_street">Recherche progressive des rues</string>
-  <string name="incremental_search_building">Recherche progressive des numéros de bâtiment</string>
+  <string name="incremental_search_city">Choisir une ville</string>
+  <string name="incremental_search_street">Choisir une rue</string>
+  <string name="incremental_search_building">Choisir un numéro ou un bâtiment</string>
  <string name="choose_available_region">Choisir une région dans la liste</string>
  <string name="choose_intersected_street">Choisir une intersection</string>
  <string name="Closest_Amenities">Équipements à proximité</string>
@ -886,10 +886,10 @@
  <string name="transport_search_desc">Recherche de transports en commun</string>
  <string name="favourites_search_desc">Recherche parmi les favoris</string>
  <string name="history_search_desc">Historique des recherches</string>
-  <string name="route_roundabout">Rond-point : prendre la %1$d sortie et continuez pendant</string>
-  <string name="route_kl">Serrez à gauche et continuez pendant</string>
-  <string name="route_kr">Serrez à droite et continuez pendant</string>
-  <string name="rendering_attr_noPolygons_description">Rendre toutes les zones transparentes sur la carte</string>
+  <string name="route_roundabout">Rond-point : prendre la %1$d sortie et continuez</string>
+  <string name="route_kl">Serrez à gauche et continuez</string>
+  <string name="route_kr">Serrez à droite et continuez</string>
+  <string name="rendering_attr_noPolygons_description">Rendre invisibles les surfaces représentant des éléments de terrain</string>
  <string name="rendering_attr_noPolygons_name">Pas de polygones</string>
  <string name="rendering_attr_appMode_name">Profil pour le rendu</string>
  <string name="rendering_attr_appMode_description">Optimisation de la carte selon le profil d\'utilisation</string>
@ -1608,6 +1608,12 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 <string name="navigation_intent_invalid">Format invalide : %s</string>
 <string name="arrival_distance">Annonce de l\'arrivée</string>
 <string name="arrival_distance_descr">Choisir à quel moment est annoncée l\'arrivée à destination</string>
+<string-array name="arrival_distance_factors">
+<item>Précoce</item>
+<item>Normale</item>
+<item>Tardive</item>
+<item>Dans les derniers mètres</item>
+</string-array>
 <string name="share_fav">Partager</string>
 <string name="share_fav_subject">Favoris partagés via OsmAnd</string>
 <string name="use_points_as_intermediates">Calculer un intinéraire entre des points</string>
@ -1673,9 +1679,9 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
    <string name="osmo_edit_color">Afficher la couleur</string>
    <string name="osmo_follow">Suivre</string>
    <string name="osmo_sign_in">Se connecter</string>
-    <string name="osmo_create_groups_confirm">Pour créer des groupes que vous devez être un utilisateur enregistré d\'OsMo.</string>
+    <string name="osmo_create_groups_confirm">Pour créer des groupes, vous devez être un utilisateur enregistré d\'OsMo.</string>
    <string name="osmo_credentials_not_valid">Vos identifiants OsMo sont incorrects.</string>
-    <string name="osmo_regenerate_login_ids_confirm">Êtes-vous sûr de régénérer les identifiants personnels ? Tous les appareils connectés à vous ne seront plus capables de vous suivre.</string>
+    <string name="osmo_regenerate_login_ids_confirm">Êtes-vous sûr de souhaiter régénérer vos identifiants personnels ? Les appareils qui vous sont connectés ne seront plus capables de vous suivre.</string>
    <string name="osmo_regenerate_login_ids">Régénérer l\'identifiant de l\'utilisateur</string>
    <string name="osmo_cancel_moving_target">Annuler la cible mobile</string>
    <string name="osmo_center_location">Centrer sur l\'écran</string>
@ -1691,7 +1697,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
    <string name="gpx_file_is_empty">La trace GPX est vide</string>
    <string name="selected_track">Traces sélectionnées</string>
    <string name="my_tracks">Toutes les\ntraces</string>
-    <string name="my_favorites">Mes\nfavoris</string>
+    <string name="my_favorites">Mes favoris</string>
    <string name="my_data_Button">Mes lieux</string>
    <string name="my_data_activity">Mes lieux</string>
    <string name="selected_gpx_info_show">\n\nAppui long pour visualiser sur la carte</string>
@ -1701,14 +1707,14 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
    <string name="local_index_gpx_info_show">\n\nAppui long pour afficher les options</string>
 <string name="gpx_info_subtracks">Sections : %1$s </string>
 <string name="gpx_info_waypoints">Points de cheminement : %1$s </string>
-<string name="gpx_info_distance">Distance : %1$s (%2$s points)… </string>
+<string name="gpx_info_distance">Distance : %1$s (%2$s points) </string>
 <string name="gpx_info_start_time">Heure de départ : %1$tF,  %1$tT </string>
-<string name="gpx_info_end_time">Heure d'arrivée : %1$tF,  %1$tT </string>
+<string name="gpx_info_end_time">Heure d\'arrivée : %1$tF,  %1$tT </string>
 <string name="gpx_info_average_speed">Vitesse moyenne : %1$s </string>
 <string name="gpx_info_maximum_speed">Vitesse maximale : %1$s </string>
 <string name="gpx_info_avg_altitude">Altitude moyenne : %1$s</string>
 <string name="gpx_info_diff_altitude">Amplitude altimétrique : %1$s</string>
-<string name="gpx_info_asc_altitude">Dénivellation : %1$s</string>
+<string name="gpx_info_asc_altitude">Dénivelées : %1$s</string>
    <string name="gpx_timespan">Durée : %1$s</string>
 <string name="gpx_timemoving">Temps en déplacement : %1$s</string>
    <string name="gpx_selection_segment_title">Segment</string>
@ -1723,7 +1729,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
    <string name="map_widget_plain_time">Heure</string>
    <string name="loading_smth">Chargement de %1$s …</string>
    <string name="save_as_favorites_points">Enregistrer comme groupe de favoris</string>
-    <string name="select_destination_and_intermediate_points">Sélectionner les points du chemin</string>
-    <string name="layer_amenity_label">Étiquettes textuelles</string>
-    <string name="route_descr_destination">Description</string>
+    <string name="select_destination_and_intermediate_points">Sélectionner les points de cheminement</string>
+    <string name="layer_amenity_label">Étiquette des points</string>
+    <string name="route_descr_destination">Destination</string>
    </resources>
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="download_hillshade_item">Տարածքի ռելիեֆ</string>
    <string name="download_hillshade_maps">Տարածքի մգեցված ռելիեֆով քարտեզներ</string>
    <string name="dist_control_start">Սկիզբ</string>
--- a/OsmAnd/res/values-id/strings.xml
+++ b/OsmAnd/res/values-id/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="address_search_desc">Mencari alamat</string>
  <string name="navpoint_search_desc">Koordinat</string>
  <string name="transport_search_desc">Mencari transportasi</string>
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@ -1146,7 +1146,7 @@ Dati attualmente nel dispositivo (%1$s liberi):</string>
    <string name="add_as_last_destination_point">Aggiungi come ultimo punto intermedio</string>
    <string name="add_as_first_destination_point">Aggiungi come primo punto intermedio</string>
    <string name="replace_destination_point">Sostituisci la destinazione</string>
-    <string name="new_destination_point_dialog">Hai già una destinazione impostata.</string>
+    <string name="new_destination_point_dialog">Hai già impostato la destinazione.</string>
    <string name="target_point">Punto intermedio %1$s</string>
    <string name="target_points">Punti intermedi</string>
    <string name="map_widget_monitoring_services">Servizi di registrazione</string>
@ -1873,7 +1873,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="gpx_info_distance">Distanza: %1$s (%2$s punti) </string>
 	<string name="gpx_info_end_time">Orario di arrivo: %1$tF, %1$tT </string>
 	<string name="gpx_info_diff_altitude">Dislivello: %1$s</string>
-	<string name="gpx_info_asc_altitude">Salite: %1$s</string>
+	<string name="gpx_info_asc_altitude">Discesa/salita: %1$s</string>
    <string name="gpx_timespan">Intervallo di tempo: %1$s</string>
 	<string name="gpx_timemoving">Tempo in movimento: %1$s</string>
    <string name="gpx_selection_segment_title">Segmento</string>
@ -1894,4 +1894,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
    <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="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>
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
 	
 	<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
  <string name="shared_location">Bendrinta vieta</string>
  <string name="osmand_parking_warning">Dėmesio</string>
  <string name="osmand_parking_warning_text">Perspėjimas pasiimti automobilį jau buvo įtrauktas į jūsų kalendorių. Perspėjimas ten liks tol, kol jo nepanaikinsite.</string>
@ -1839,4 +1840,12 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
    <string name="hours_ago">valandų senumo</string>
    <string name="minutes_ago">minučių senumo</string>
    <string name="seconds_ago">sekundžių senumo</string>
+    <string name="gpx_info_subtracks">Maršruto dalys: %1$s </string>
+	<string name="gpx_info_waypoints">Tarpiniai taškai: %1$s </string>
+	<string name="gpx_info_distance">Atstumas: %1$s (%2$s taškai/-ų) </string>
+	<string name="gpx_info_start_time">Pradžios laikas: %1$tF,  %1$tT </string>
+	<string name="gpx_info_end_time">Pabaigos laikas: %1$tF,  %1$tT </string>
+	<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>
    </resources>
--- 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>
--- 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>
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="tip_recent_changes_0_6_9_t">"Zmiany w 0.6.9: \n\t- poprawiono renderowanie map offline \n\t- szybkie renderowanie natywne (wersja eksperymentalna - może nie działać na niektórych urządzeniach) \n\t- poprawki w interfejsie \n\t- dodano wyświetlanie informacji o wysokości (altitude) \n\t- nowe tłumaczenia (polskie, wietnamskie) \n\t- inne, mniejsze poprawki "</string>
  
  <string name="use_transparent_map_theme">Przezroczysty styl</string>
--- 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>
--- 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>
@ -86,8 +86,8 @@
    <string name="close_changeset">Закрыть changeset</string>
 	<string name="zxing_barcode_scanner_not_found">Приложение \'Сканнер штрих-кодов\' не найдено. Искать на Маркете?</string>
    <string name="non_optimal_route_calculation">Быстрое построение маршрута (возможно неоптимально)</string>
-    <string name="download_link_and_local_description">Загрузите или обновите локальные данные. \nЧтобы получить дополнительную информацию о карте, выделите её в списке. Удерживайте карту, если вы хотите удалить или деактивировать.
-Данные на устройстве (%1$s свободно):</string>
+    <string name="download_link_and_local_description">Загрузите или обновите локальные файлы карт.
+\nЧтобы получить дополнительную информацию о карте, выделите её в списке. Удерживайте карту, если вы хотите удалить или деактивировать. Данные на устройстве (%1$s свободно):</string>
 <string name="tip_recent_changes_0_8_3_t">Изменения в 0.8.3:
 	\n\t* Промежуточные точки
 	\n\t* Улучшенное сопровождение по маршруту
@ -124,7 +124,7 @@
  <string name="local_indexes_cat_tile">Онлайн карты (растровые)</string>
  <string name="local_indexes_cat_map">Локальные карты (векторные)</string>
  
-  <string name="index_settings_descr">Загрузка и управление локальными картами</string>
+  <string name="index_settings_descr">Загрузка и управление локальными файлами карт на вашем устройстве</string>
  <string name="map_online_plugin_is_not_installed">Активируйте плагин онлайн карт, чтобы выбирать различные источники карт</string>
  <string name="map_online_data">Онлайн карты</string>
  <string name="map_online_data_descr">Использовать онлайн карты (кэшируются на SD-носителе)</string>
@ -329,7 +329,7 @@
  <string name="local_index_items_restored">%1$d из %2$d объектов успешно активированы.</string>
  <string name="local_index_no_items_to_do">Нет объектов, чтобы %1$s</string>
  <string name="local_index_action_do">Вы собираетесь %1$s %2$s объектов. Вы уверены?</string>
-  <string name="local_index_descr_title">Менеджер локальных данных</string>
+  <string name="local_index_descr_title">Управление файлами карт</string>
  <string name="local_index_mi_restore">Активировать</string>
  <string name="local_index_mi_backup">Архив</string>
  <string name="local_index_mi_delete">Удалить</string>
@ -517,7 +517,7 @@
  <string name="reload">Перезагрузить</string>
  <string name="general_settings_descr">Настройки экрана, локализации, единиц измерения и другие</string>
  <string name="general_settings">Общие</string>
-  <string name="index_settings">Данные</string>
+  <string name="index_settings">Управление файлами карт</string>
  <string name="osmand_service">Фоновый режим</string>
  <string name="osmand_service_descr">Запустить OsmAnd в фоновом режиме для записи трека и навигации</string>
  <string name="fast_route_mode">Скоростной маршрут</string>
@ -802,7 +802,7 @@
  <string name="exit_Button">Выход</string>
  <string name="map_Button">Карта</string>
  <string name="settings_Button">Настройки</string>
-  <string name="favorites_Button">Избранное</string>
+  <string name="favorites_Button">Мои места</string>
  <string name="search_button">Поиск</string>
  <string name="search_activity">Поиск</string>
  <string name="searchpoi_activity">Выберите POI</string>
@ -1414,8 +1414,8 @@
 	<string name="routing_attr_avoid_motorway_name">Избегать автомагистралей</string>
 	<string name="routing_attr_prefer_motorway_name">Предпочитать автомагистрали</string>
 	<string name="routing_attr_prefer_motorway_description">Предпочитать автомагистрали</string>
-	<string name="routing_attr_short_way_name">Короткий путь</string>
-	<string name="routing_attr_short_way_description">Использовать короткий путь</string>
+	<string name="routing_attr_short_way_name">Кратчайший путь</string>
+	<string name="routing_attr_short_way_description">Использовать кратчайший путь</string>
 	<string name="routing_attr_avoid_toll_name">Избегать платных дорог</string>
 	<string name="routing_attr_avoid_toll_description">Избегать платных дорог</string>
 	<string name="routing_attr_avoid_unpaved_name">Избегать грунтовые дороги</string>
@ -1423,7 +1423,7 @@
 	<string name="routing_attr_avoid_ferries_name">Избегать паромов</string>
 	<string name="routing_attr_avoid_ferries_description">Избегать паромов</string>
 	<string name="routing_attr_weight_name">Максимальный вес</string>
-	<string name="routing_attr_weight_description">Уточнить ограничение веса</string>
+	<string name="routing_attr_weight_description">Уточнить ограничение веса машины</string>
    
    <string name="map_widget_map_rendering">Отображение карты:</string>
    <string name="amenity_type_seamark">Навигационный знак</string>
--- 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>
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="search_button">Iskanje</string>
 	<string name="search_activity">Iskanje</string>
 	<string name="settings_Button">Nastavitve</string>
--- 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>
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@ -1878,4 +1878,7 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告
 	<string name="save_as_favorites_points">另存為我的最愛群組</string>
    <string name="select_destination_and_intermediate_points">選擇中途點</string>
    <string name="layer_amenity_label">標點標籤</string>
+    <string name="show_zoom_buttons_navigation_descr">在導航期間顯示縮放按鈕</string>
+    <string name="show_zoom_buttons_navigation">顯示縮放按鈕</string>
+    <string name="create_poi_link_to_osm_doc"><u>線上 OSM</u> 地圖的分類與影像</string>
 	</resources>
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@ -9,6 +9,9 @@
         3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
    PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
    -->
+    
+    <string name="show_zoom_buttons_navigation_descr">Show zoom buttons during navigation</string>
+    <string name="show_zoom_buttons_navigation">Show zoom buttons</string>
    <string name="save_as_favorites_points">Save as group of favorites</string>
    <string name="select_destination_and_intermediate_points">Select waypoints</string>
    <string name="layer_amenity_label">Point labels</string>
--- a/OsmAnd/res/xml/navigation_settings.xml
+++ b/OsmAnd/res/xml/navigation_settings.xml
@ -19,5 +19,7 @@
                    android:key="keep_informing"
                    android:title="@string/keep_informing"
                    android:summary="@string/keep_informing_descr" />
+            <CheckBoxPreference android:title="@string/show_zoom_buttons_navigation" android:summary="@string/show_zoom_buttons_navigation_descr" android:key="show_zoom_buttons_navigation" />
+            
        </PreferenceCategory>
 </PreferenceScreen>
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@ -849,6 +849,11 @@ public class OsmandSettings {
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> SHOW_FAVORITES = new BooleanPreference("show_favorites", false).makeGlobal();
 	
+	public final CommonPreference<Boolean> SHOW_ZOOM_BUTTONS_NAVIGATION = new BooleanPreference("show_zoom_buttons_navigation", false).makeProfile().cache();
+	{
+		SHOW_ZOOM_BUTTONS_NAVIGATION.setModeDefaultValue(ApplicationMode.PEDESTRIAN, true);
+	}
+	
 	// Json 
 	public final OsmandPreference<String> SELECTED_GPX = new StringPreference("selected_gpx", "").makeGlobal();
 	
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
@ -89,6 +89,8 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
        }
        registerListPreference(settings.KEEP_INFORMING, screen, keepInformingNames, keepInformingValues);
        
+        registerBooleanPreference(settings.SHOW_ZOOM_BUTTONS_NAVIGATION, screen);
+
 		autoZoomMapPreference = (ListPreference) screen.findPreference(settings.AUTO_ZOOM_MAP.getId());
 		autoZoomMapPreference.setOnPreferenceChangeListener(this);

--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;

 import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
@ -23,6 +24,7 @@ import android.graphics.Color;
 import android.graphics.PointF;
 import android.os.Handler;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
@ -39,6 +41,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private int shadowColor = -1;
 	
 	private MapZoomControls zoomControls;
+	private MapZoomControls zoomSideControls;
 	private MapMenuControls mapMenuControls;
 	private RulerControl rulerControl;
 	
@ -55,9 +58,11 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private SeekBar transparencyBar;
 	private LinearLayout transparencyBarLayout;
 	private static CommonPreference<Integer> settingsToTransparency;
+	private OsmandSettings settings;

 	public MapControlsLayer(MapActivity activity){
 		this.mapActivity = activity;
+		settings = activity.getMyApplication().getSettings();
 	}
 	
 	@Override
@ -72,10 +77,13 @@ public class MapControlsLayer extends OsmandMapLayer {
 		Handler showUIHandler = new Handler();
 		int rightGravity = Gravity.RIGHT | Gravity.BOTTOM;
 		int leftGravity = Gravity.LEFT | Gravity.BOTTOM;
+		int rightCenterGravity = Gravity.RIGHT | Gravity.CENTER;
 		
 		// default buttons
 		zoomControls = init(new MapZoomControls(mapActivity, showUIHandler, scaleCoefficient), parent,
 				rightGravity);
+		zoomSideControls = init(new MapZoomControls(mapActivity, showUIHandler, scaleCoefficient), parent,
+				rightCenterGravity);
 		mapMenuControls = init(new MapMenuControls(mapActivity, showUIHandler, scaleCoefficient), parent, 
 				leftGravity);
 		mapRoutePlanControl = init(new MapRoutePlanControl(mapActivity, showUIHandler, scaleCoefficient), parent,
@ -104,13 +112,26 @@ public class MapControlsLayer extends OsmandMapLayer {
 	}


-	private <T extends MapControls> T init(T c, FrameLayout parent, int gravity) {
-		c.init(parent);
+	private <T extends MapControls> T init(final T c, FrameLayout parent, int gravity) {
 		c.setGravity(gravity);
+		c.init(parent);
 		allControls.add(c);
+		c.setNotifyClick(new Runnable() {
+			
+			@Override
+			public void run() {
+				notifyClicked(c);
+			}
+		});
 		return c;
 	}

+	protected void notifyClicked(MapControls m) {
+		if(mapNavigationControl != null) {
+			mapNavigationControl.stopCounter();
+		}
+	}
+
 	@Override
 	public void destroyLayer() {
 	}
@ -134,7 +155,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 			routePlanningMode = true;
 		}
 		boolean routeFollowingMode = !routePlanningMode && rh.isFollowingMode();
-		boolean showDefaultButtons = !routeFollowingMode && !routePlanningMode;
+		boolean showDefaultButtons = !routePlanningMode && (!routeFollowingMode || settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get());
 		if(routePlanningMode) {
 			forceHideView(zoomControls);
 			forceHideView(mapMenuControls);
@ -152,6 +173,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		checkVisibilityAndDraw(showRouteCalculationControls, mapInfoNavigationControl, canvas, tileBox, nightMode);
 		checkVisibilityAndDraw(showRouteCalculationControls, mapAppModeControl, canvas, tileBox, nightMode);
 		checkVisibilityAndDraw(showRouteCalculationControls, mapNavigationControl, canvas, tileBox, nightMode);
+		checkVisibilityAndDraw(showRouteCalculationControls, zoomSideControls, canvas, tileBox, nightMode);
 		
 		// the last one to check other controls visibility
 		int vmargin = mapNavigationControl.isVisible() || zoomControls.isVisible() ? zoomControls.getHeight() : 0;
@ -188,13 +210,25 @@ public class MapControlsLayer extends OsmandMapLayer {

 	@Override
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
+		for(MapControls m : allControls) {
+			if(m.isVisible() && m.onSingleTap(point, tileBox)){
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) {
 		if(!mapActivity.getRoutingHelper().isRoutePlanningMode() && mapActivity.getRoutingHelper().isFollowingMode()) {
+			if(!settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get()) {
 				zoomControls.showWithDelay((FrameLayout) mapActivity.getMapView().getParent(), TIMEOUT_TO_SHOW_BUTTONS);
 				mapMenuControls.showWithDelay((FrameLayout) mapActivity.getMapView().getParent(), TIMEOUT_TO_SHOW_BUTTONS);
+			}
 			mapRoutePlanControl.showWithDelay((FrameLayout) mapActivity.getMapView().getParent(), TIMEOUT_TO_SHOW_BUTTONS);
 		}
 		for(MapControls m : allControls) {
-			if(m.isVisible() && m.onSingleTap(point, tileBox)){
+			if(m.isVisible() && m.onTouchEvent(event, tileBox)){
 				return true;
 			}
 		}
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapCancelControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapCancelControl.java
@ -25,6 +25,7 @@ public class MapCancelControl extends MapControls {
 		cancelButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
+				notifyClicked();
 				if(mapActivity.getRoutingHelper().isFollowingMode()) {
 					mapActivity.getMapActions().stopNavigationActionConfirm(mapActivity.getMapView());
 				} else {
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapControls.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapControls.java
@ -9,6 +9,7 @@ import android.graphics.PointF;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
@ -29,6 +30,7 @@ public abstract class MapControls {
 	protected int vmargin;
 	protected int width;
 	protected int height;
+	protected Runnable notifyClick;
 	
 	public MapControls(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
 		this.mapActivity = mapActivity;
@ -66,6 +68,16 @@ public abstract class MapControls {
 		return button;
 	}
 	
+	public void setNotifyClick(Runnable notifyClick) {
+		this.notifyClick = notifyClick;
+	}
+	
+	protected void notifyClicked() {
+		if(notifyClick != null) {
+			notifyClick.run();
+		}
+	}
+	

 	private void applyAttributes(Context ctx, FrameLayout parent, View button, int stringId, int resourceId,
 			int extraMargin) {
@ -154,6 +166,14 @@ public abstract class MapControls {
 		return visible;
 	}
 	
+	protected boolean isLeft() {
+		return (Gravity.LEFT & gravity) == Gravity.LEFT;
+	}
+
+	protected boolean isBottom() {
+		return (Gravity.BOTTOM & gravity) == Gravity.BOTTOM;
+	}
+	
 	
 	protected void initControls(FrameLayout layout) {
 	}
@ -165,6 +185,11 @@ public abstract class MapControls {

 	public abstract void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode);
 	
+	
+	public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) {
+		return false;
+	}
+	
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
 		return false;
 	}
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java
@ -40,6 +40,7 @@ public class MapMenuControls extends MapControls {
 				// double lon = activity.getMapView().getLongitude();
 				// MainMenuActivity.backToMainMenuDialog(activity, new LatLon(lat, lon));
 				mapActivity.getMapActions().openOptionsMenuAsList();
+				notifyClicked();
 			}
 		});
 	}
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapNavigateControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapNavigateControl.java
@ -4,7 +4,6 @@ import gnu.trove.list.array.TIntArrayList;

 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;

 import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.OsmandApplication;
@ -12,8 +11,8 @@ import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.views.ShadowText;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
+import net.osmand.plus.views.ShadowText;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.content.DialogInterface;
@ -26,6 +25,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.text.TextPaint;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
@ -38,7 +38,7 @@ public class MapNavigateControl extends MapControls {
 	private Bitmap mapMagnifier;
 	private TextPaint counterTextPaint;
 	private Paint bitmapPaint;
-	private static AtomicInteger startCounter = new AtomicInteger(); 
+	private static long startCounter = 0; 
 	
 	
 	public MapNavigateControl(MapRouteInfoControl ri,  MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
@ -53,25 +53,30 @@ public class MapNavigateControl extends MapControls {
 	
 	public void startCounter() {
 		OsmandSettings settings = mapActivity.getMyApplication().getSettings();
-		startCounter.set(settings.DELAY_TO_START_NAVIGATION.get());
+		if (startCounter <= 0) {
+			startCounter = System.currentTimeMillis() + settings.DELAY_TO_START_NAVIGATION.get() * 1000;
 			delayStart = new Runnable() {
 				@Override
 				public void run() {
-				int cnt = startCounter.decrementAndGet();
-				if (cnt == 0) {
+					if (startCounter > 0) {
+						if (System.currentTimeMillis() > startCounter) {
+							startCounter = 0;
 							startNavigation();
-				} else if (cnt > 0)
+						} else {
 							mapActivity.refreshMap();
 							showUIHandler.postDelayed(delayStart, 1000);
 						}
+					}
+				}
 			};
-		if(startCounter.get() > 0) {
 			delayStart.run();
 		}
+		
 	}
 	
+	
 	private void startNavigation() {
-		startCounter.set(-1);
+		stopCounter();
 		OsmandApplication app = mapActivity.getMyApplication();
 		RoutingHelper routingHelper = app.getRoutingHelper();
 		if(routingHelper.isFollowingMode()) {
@ -99,6 +104,7 @@ public class MapNavigateControl extends MapControls {
 		navigateButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
+				notifyClicked();
 				startNavigation();
 			}
 		});
@ -117,7 +123,7 @@ public class MapNavigateControl extends MapControls {
 	@Override
 	public void hideControls(FrameLayout layout) {
 		removeButton(layout, navigateButton);
-		startCounter.set(-1);
+		stopCounter();
 	}

 	@Override
@ -127,10 +133,15 @@ public class MapNavigateControl extends MapControls {
 		}
 	}
 	
+
+	public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) {
+		stopCounter();
+		return false;
+	}
+	
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-		startCounter.set(-1);
+		stopCounter();
 		if (navigateShadow.getBounds().contains((int) point.x, (int) point.y)) {
-			startCounter.set(-1);
 			openDialog();
 			return true;
 		}
@ -155,10 +166,10 @@ public class MapNavigateControl extends MapControls {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
+				notifyClicked();
 				dialog.dismiss();
 				mapActivity.getMyApplication().getSettings().DELAY_TO_START_NAVIGATION.set(opt.get(which));
 				startCounter();
-				
 			}
 		});
 		bld.show();
@ -186,8 +197,8 @@ public class MapNavigateControl extends MapControls {
 		if(navigateShadow.getBounds().width() > 0) {
 			navigateShadow.draw(canvas);
 		}
-		int get = startCounter.get();
-		if (get > 0) {
+		if (startCounter > 0) {
+			int get = (int) ((startCounter -System.currentTimeMillis())  / 1000l);
 			final String text = get + "";
 			float length = counterTextPaint.measureText(text);
 			ShadowText.draw(text, canvas, navigateButton.getLeft() + (navigateButton.getWidth() - length - 2) / 2,
@ -208,4 +219,9 @@ public class MapNavigateControl extends MapControls {
 		}
 		return width ;
 	}
+
+
+	public void stopCounter() {
+		startCounter = 0;
+	}
 }
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
@ -90,6 +90,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 		infoButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
+				notifyClicked();
 				if(dialog != null) {
 					hideDialog();
 				} else {
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePlanControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePlanControl.java
@ -25,6 +25,7 @@ public class MapRoutePlanControl extends MapControls {
 		routePlanButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
+				notifyClicked();
 				mapActivity.getRoutingHelper().setRoutePlanningMode(true);
 				mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
 				mapActivity.refreshMap();
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java
@ -119,6 +119,7 @@ public class MapRoutePreferencesControl extends MapControls {
 			
 			@Override
 			public void onClick(View v) {
+				notifyClicked();
 				if(dialog != null) {
 					dialog.hide();
 					dialog = null;
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapZoomControls.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapZoomControls.java
@ -68,11 +68,19 @@ public class MapZoomControls extends MapControls {
 	@Override
 	protected void showControls(FrameLayout parent) {
 		int minimumWidth = view.getResources().getDrawable(R.drawable.map_zoom_in).getMinimumWidth();
+		int minimumHeight = view.getResources().getDrawable(R.drawable.map_zoom_in).getMinimumWidth();
+		vmargin = 0;
 		zoomInButton = addButton(parent, R.string.zoomIn, R.drawable.map_zoom_in);
+		if(isBottom()) {
 			zoomOutButton = addButton(parent, R.string.zoomOut, R.drawable.map_zoom_out, minimumWidth);
+		} else {
+			vmargin = minimumHeight;
+			zoomOutButton = addButton(parent, R.string.zoomOut, R.drawable.map_zoom_out);
+		}
 		zoomInButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
+				notifyClicked();
 				if (view.isZooming()) {
 					mapActivity.changeZoom(2);
 				} else {
@ -86,6 +94,7 @@ public class MapZoomControls extends MapControls {
 		zoomOutButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
+				notifyClicked();
 				mapActivity.changeZoom(-1);
 			}
 		});
@ -94,7 +103,9 @@ public class MapZoomControls extends MapControls {

 	@Override
 	public void initControls(FrameLayout parent) {
+		if(isBottom()) {
 			zoomShadow = view.getResources().getDrawable(R.drawable.zoom_background).mutate();
+		}
 		mapMagnifier = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_magnifier);
 		bitmapPaint = new Paint();
 	}
@ -147,7 +158,7 @@ public class MapZoomControls extends MapControls {
 		if (zoomOutButton.isEnabled() != zoomOutEnabled) {
 			zoomOutButton.setEnabled(zoomOutEnabled);
 		}
-
+		if (isBottom()) {
 			if (view.isZooming()) {
 				showZoomLevel = true;
 				showZoomLevelButton = false;
@ -163,6 +174,7 @@ public class MapZoomControls extends MapControls {
 				drawZoomLevel(canvas, tileBox, !showZoomLevelButton);
 			}
 		}
+	}

 	private void sendMessageToShowZoomLevel() {
 		Message msg = Message.obtain(showUIHandler, new Runnable() {
--- a/OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java
@ -25,6 +25,7 @@ public class SmallMapMenuControls extends MapControls {
 		backToMenuButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
+				notifyClicked();
 				mapActivity.getMapActions().openOptionsMenuAsList();
 			}
 		});