Merge branch 'master' of ssh://github.com/osmandapp/Osmand into measurement_tools

OsmAnd/res/values-ar/strings.xml

@@ -2716,4 +2716,6 @@
     <string name="quick_action_start_stop_navigation_descr">اضغط على هذا الزر لبدء الملاحة، أو لوقفها إذا ما كانت قد بدأت مسبقا.</string>
     <string name="live_monitoring_max_interval_to_send">الوقت الإضافي المخزن المؤقت للتتبع على الإنترنت</string>
     <string name="live_monitoring_max_interval_to_send_desrc">تحديد الوقت الإضافي المخزن للحفاظ على المواقع وإرسالها دون اتصال</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">أنت بحاجة إلى إنترنت لعرض الصور من Mapillary</string>
+    <string name="retry">اعد المحاولة</string>
+</resources>

OsmAnd/res/values-az/strings.xml

@@ -922,10 +922,10 @@
     <string name="lang_en_gb">İngiliscə (Birləşmiş Krallıq)</string>
     <string name="lang_af">Afrikanca</string>
     <string name="lang_al">Albanca</string>
-    <string name="lang_eu">Bask dili</string>
+    <string name="lang_eu">Baskca</string>
     <string name="lang_hu_formal">Macarca (rəsmi)</string>
-    <string name="lang_id">İndoneziya dili</string>
+    <string name="lang_id">İndonezcə</string>
-    <string name="lang_ko">Koreya dili</string>
+    <string name="lang_ko">Koreyaca</string>
     <string name="route_descr_select_destination">Təyinat nöqtəsi seçin</string>
     <string name="routing_attr_avoid_toll_description">Pullu yollardan yayın</string>
     <string name="routing_attr_avoid_unpaved_name">Asfaltsız yollardan yayın</string>
@@ -983,7 +983,7 @@
     <string name="routing_attr_relief_smoothness_factor_hills_name">Dağlıq</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">Az dağlıq</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">Düzənlik</string>
-    <string name="routing_attr_driving_style_safety_name">Təhlükəsiz</string>
+    <string name="routing_attr_driving_style_safety_name">Yolları üstün tut</string>
     <string name="relief_smoothness_factor_descr">Üstün tutulan relyef: düzənlik və ya dağlıq</string>
     <string name="shared_string_slope">Yamac</string>
     <string name="points_delete_multiple_succesful">Nöqtə(lər) uğurla silindi.</string>
@@ -1641,7 +1641,57 @@
     <string name="old_poi_file_should_be_deleted">POI məlumat faylı “%1$s” lazımsızdır və silinə bilər.</string>
     <string name="favorite_delete_multiple">%1$d favoriti və %2$d favorit qrupu silmək üzrəsiniz. Əminsiniz?</string>
     <string name="downloads_left_template">%1$s endirmə qalıb</string>
-    <string name="quick_action_resume_pause_navigation">Naviqasiyaya Davam et/Fasilə ver</string>
+    <string name="quick_action_resume_pause_navigation">Naviqasiyaya davam/fasilə</string>
-    <string name="quick_action_resume_pause_navigation_descr"/>
+    <string name="quick_action_resume_pause_navigation_descr">Naviqasiyaya fasilə vermək üçün və ya fasilə verilibsə, davam etmək üçün bu düyməni basın.</string>
-    <string name="quick_action_show_navigation_finish_dialog"/>
+    <string name="quick_action_show_navigation_finish_dialog">Naviqasiyanın bitmə dialoqunu göstər</string>
+    <string name="quick_action_start_stop_navigation">Naviqasiyanı başlat/bitir</string>
+    <string name="quick_action_start_stop_navigation_descr">Naviqasiyanı başlatmaq üçün və ya artıq başladılıbsa, dayandırmaq üçün bu düyməni basın.</string>
+    <string name="mappilary_no_internet_desc">Mapillary-dən şəkillərə baxmaq üçün internetiniz olmalıdır</string>
+    <string name="retry">Təkrar cəhd</string>
+<string name="osm_edit_modified_poi">Dəyişdirilmiş OSM POI</string>
+    <string name="osm_edit_deleted_poi">Silinmiş OSM POI</string>
+    <string name="osm_edit_reopened_note">Yenidən açılmış OSM qeydi</string>
+    <string name="osm_edit_commented_note">Rəy yazılmış OSM qeydi</string>
+    <string name="osm_edit_removed_note">Silinmiş OSM qeydi</string>
+    <string name="osm_edit_created_note">Yaradılmış OSM qeydi</string>
+    <string name="shared_string_commit">Təsdiq et</string>
+    <string name="osm_edit_created_poi">Yaradılmış OSM POI</string>
+    <string name="rendering_value_translucent_pink_name">Şəffaf çəhrayı</string>
+    <string name="confirm_usage_speed_cameras">Bir çox ölkələrdə (Almaniya, Fransa, İtaliya və s.) sürət kamerası xəbərdarlıqlarının istifadə edilməsinə qanunla icazə verilmir. Qanunu pozarsanız, OsmAnd heç bir məsuliyyət daşımır. Yalnız bu xüsusiyyətdən istifadəyə icazə varsa, Bəli düyməsinə toxunun.</string>
+    <string name="lang_ml">Malayalamca</string>
+    <string name="lang_sw">Suahilicə</string>
+    <string name="lang_bs">Boşnakca</string>
+    <string name="lang_bg">Bolqarca</string>
+    <string name="lang_ca">Katalanca</string>
+    <string name="lang_hr">Xorvatca</string>
+    <string name="lang_da">Danimarkaca</string>
+    <string name="lang_kn">Kannadaca</string>
+    <string name="lang_lv">Latışca</string>
+    <string name="lang_lt">Litvaca</string>
+    <string name="lang_mr">Marathicə</string>
+    <string name="lang_no">Norveçcə</string>
+    <string name="lang_pl">Polyakca</string>
+    <string name="lang_sr">Serbcə</string>
+    <string name="lang_sr_latn">Serbcə (Latın)</string>
+    <string name="lang_sk">Slovakca</string>
+    <string name="lang_sl">Slovencə</string>
+    <string name="use_high_res_maps">Yüksək dəqiqlikli ekran</string>
+    <string name="transport_searching_transport">Nəqliyyat nəticələri (təyinat nöqtəsi yoxdur):</string>
+    <string name="transport_searching_route">Nəqliyyat nəticələri (təyinat nöqtəsinə {0}):</string>
+    <string name="transport_search_again">Nəqliyyat axtarışını sıfırla</string>
+    <string name="voice">Qeyd edilən səs</string>
+    <string name="no_vector_map_loaded">Vektor xəritələr yüklənməyib</string>
+    <string name="vector_data">Offlayn vektor xəritələr</string>
+    <string name="transport_context_menu">Dayanacaqda nəqliyyat axtar</string>
+    <string name="show_route">Marşrut detalları</string>
+    <string name="no_fav_to_save">Yadda saxlanacaq favorit nöqtələr yoxdur</string>
+    <string name="share_fav_subject">Favoritlər OsmAnd ilə paylaşılıb</string>
+    <string name="error_occurred_loading_gpx">GPX yüklənərkən səhv baş verdi</string>
+    <string name="thanks_yandex_traffic">Trafik məlumatları üçün Yandex-ə təşəkkürlər.</string>
+    <string name="layer_yandex_traffic">Yandex trafik</string>
+    <string name="layer_route">Marşrut</string>
+    <string name="layer_osm_bugs">OSM qeydlər (onlayn)</string>
+    <string name="search_near_map">Hazırki xəritə mərkəzinin yaxınında axtar</string>
+    <string name="transport_Routes">Marşrutlar</string>
+    <string name="transport_Stop">Dayanacaq</string>
     </resources>

OsmAnd/res/values-cs/strings.xml

@@ -2554,7 +2554,7 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
     <string name="routing_attr_relief_smoothness_factor_hills_name">Kopcovitý</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">Méně kopcovitý</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">Rovinatý</string>
-    <string name="routing_attr_driving_style_speed_name">Preferovat hlavní silnice</string>
+    <string name="routing_attr_driving_style_speed_name">Kratší trasy</string>
     <string name="routing_attr_driving_style_balance_name">Vyvážený</string>
     <string name="routing_attr_driving_style_safety_name">Preferovat vedlejší silnice</string>
     <string name="relief_smoothness_factor_descr">Priorita terénu: rovinatý nebo kopcovitý</string>
@@ -2676,4 +2676,19 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
     <string name="max_min">Max/Min</string>
     
     <string name="min_max">Min/Max</string>
+    <string name="quick_action_resume_pause_navigation">Pokračovat/Pozastavit navigaci</string>
+    <string name="quick_action_resume_pause_navigation_descr">Stiskněte toto tlačítko na pozastavení navigace, nebo pokračování pokud je pozastavená.</string>
+    <string name="quick_action_show_navigation_finish_dialog">Zobrazit zprávu o ukončení navigace</string>
+    <string name="quick_action_start_stop_navigation">Spustit/Ukončit navigaci</string>
+    <string name="quick_action_start_stop_navigation_descr">Stiskněte toto tlačítko pro spuštění navigace, nebo zastavení, pokud již byla spuštěna.</string>
+    <string name="release_2_7">"\\022 Modul Mapillary se snímky ulic
+\n
+\n • Pravítko pro měření vzdálenosti
+\n
+\n • Intervaly rozdělení GPX  s detailními informacemi o trase
+\n
+\n • další vylepšení a opravy chyb
+\n
+\n"</string>
+    <string name="rendering_value_translucent_pink_name">Průhledná růžová</string>
     </resources>

OsmAnd/res/values-da/strings.xml

@@ -705,7 +705,7 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
 
     <string name="amenity_type_landuse">Arealanvendelse</string>
     <string name="amenity_type_sustenance">Mad og drikke</string>
-    <string name="voice_is_not_available_msg">Talevejledning er ikke tilgængelig. Gå til \'Indstillinger\' → \'Generelt\' → \'Talevejledning\' og vælg eller hent en talevejledning.</string>
+    <string name="voice_is_not_available_msg">Talevejledning er ikke tilgængelig. Gå til \'Indstillinger\' → \'Navigation\' → \'Talevejledning\' og vælg eller hent en talevejledning.</string>
     <string name="items_were_selected">{0} emner valgt</string>
     <string name="filter_existing_indexes">Hentet</string>
     <string name="fast_route_mode">Hurtigste rute</string>
@@ -2449,7 +2449,7 @@ Hvis du  ønsker at støtte OsmAnd og OSM, er dette en god måde at gøre det p
     <string name="christmas_desc_q">Vis jule-interessepunkter (IP)?</string>
     <string name="save_track_min_speed">Minimumshastighed for logning</string>
     <string name="save_track_min_speed_descr">Filter: Angiv minimumshastighed før et punkt logges</string>
-    <string name="save_track_min_distance">Logning ved minimum bevægelse</string>
+    <string name="save_track_min_distance">Logning ved minimum forskydning</string>
     <string name="save_track_min_distance_descr">Filter: Indstil minimumsafstand fra sidste position før et punkt logges</string>
     <string name="save_track_precision">Mindste nøjagtighed for logning</string>
     <string name="save_track_precision_descr">Filter: Indstil minimum nøjagtighed før et punkt logges</string>
@@ -2757,7 +2757,7 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
     <string name="mapillary_descr">Online fotos for alle på gadenivea. Oplev steder, samarbejd, indfang verden.</string>
     <string name="shared_string_add_photos">Tilføj fotos</string>
     <string name="mapillary_action_descr">Bidrag med visninger af placeringen på gadeniveau via Mapillary.</string>
-    <string name="plugin_mapillary_descr">Billeder på gadeniveau for alle. Opdag steder, samarbejd, indfang verden.</string>
+    <string name="plugin_mapillary_descr">Fotos på gadeniveau for alle. Opdag steder, samarbejd, indfang verden.</string>
     <string name="online_photos">Online fotos</string>
     <string name="no_photos_descr">Ingen fotos til denne placering</string>
     <string name="shared_string_install">Installer</string>
@@ -2779,7 +2779,7 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
     <string name="mapillary_menu_edit_text_hint">Indtast brugernavn</string>
     <string name="mapillary_menu_descr_username">Se billeder tilføjet af en bestemt bruger.</string>
     <string name="mapillary_menu_title_username">Brugernavn</string>
-    <string name="mapillary_menu_filter_description">Filtrer billeder efter indsender eller dato. Filter gælder kun for højere zoom.</string>
+    <string name="mapillary_menu_filter_description">Filtrer billeder efter indsender eller dato. Filter gælder kun for højere zoomniveauer.</string>
     <string name="mapillary_menu_descr_dates">Se billeder tilføjet i en bestemt periode.</string>
     <string name="shared_string_reload">Genindlæs</string>
     <string name="mapillary_menu_descr_tile_cache">Genindlæs kortbrikker for at se opdaterede data.</string>
@@ -2813,5 +2813,5 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
     <string name="live_monitoring_max_interval_to_send">Tidsbuffer til online sporing</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Angiv en tidsbuffer til at opbevare steder, når der ingen forbindelse er</string>
     <string name="retry">Prøv igen</string>
-<string name="mappilary_no_internet_desc">Du skal have internet adgang, for at se fotos fra Mapillary</string>
+<string name="mappilary_no_internet_desc">Internetforbindelse er nødvendig for at se fotos fra Mapillary</string>
     </resources>

OsmAnd/res/values-es-rAR/strings.xml

@@ -2694,8 +2694,8 @@ Proporciona un código completo</string>
     <string name="quick_action_show_navigation_finish_dialog">Mostrar diálogo de Finalizar navegación</string>
     <string name="quick_action_start_stop_navigation">Iniciar/Parar navegación</string>
     <string name="quick_action_start_stop_navigation_descr">Pulsa este botón para iniciar la navegación, o para finalizarla si ya se había iniciado.</string>
-    <string name="live_monitoring_max_interval_to_send">Tiempo del búfer para la seguimiento en línea</string>
+    <string name="live_monitoring_max_interval_to_send">Tiempo del búfer para el seguimiento en línea</string>
-    <string name="live_monitoring_max_interval_to_send_desrc">Especifica el tiempo del búfer para mantener lugares para enviar sin conexión</string>
+    <string name="live_monitoring_max_interval_to_send_desrc">Especifica el tiempo que el búfer mantendrá los lugares para enviar sin conexión</string>
     <string name="mappilary_no_internet_desc">Debes tener conexión a Internet para ver fotos de Mapillary</string>
     <string name="retry">Reintentar</string>
 </resources>

OsmAnd/res/values-es-rUS/strings.xml

@@ -2696,7 +2696,7 @@ Proporciona un código completo</string>
     <string name="quick_action_start_stop_navigation">Iniciar/Parar navegación</string>
     <string name="quick_action_start_stop_navigation_descr">Pulsa este botón para iniciar la navegación, o para finalizarla si ya se había iniciado.</string>
     <string name="live_monitoring_max_interval_to_send">Tiempo del búfer para el seguimiento en línea</string>
-    <string name="live_monitoring_max_interval_to_send_desrc">Especifica el tiempo del búfer para mantener lugares para enviar sin conexión</string>
+    <string name="live_monitoring_max_interval_to_send_desrc">Especifica el tiempo que el búfer mantendrá los lugares para enviar sin conexión</string>
     <string name="mappilary_no_internet_desc">Debes tener conexión a Internet para ver fotos de Mapillary</string>
     <string name="retry">Reintentar</string>
 </resources>

OsmAnd/res/values-eu/phrases.xml

@@ -2198,4 +2198,7 @@
 	<string name="poi_lock_basin">Esklusako atea</string>
 	<string name="poi_notice">Itsas oharra</string>
 	<string name="poi_pile">Pilote</string>
+	<string name="poi_wiki_lang_bs">Wikia bosnieraz</string>
+	<string name="poi_bicycle_parking_wall_loops">Hormako begiztak</string>
+	<string name="poi_capacity">Ahalmena</string>
 	</resources>

OsmAnd/res/values-eu/strings.xml

@@ -2746,4 +2746,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="quick_action_start_stop_navigation_descr">Sakatu boti hau nabigazioa hasteko, edo gelditzeko hasita bazegoen.</string>
     <string name="live_monitoring_max_interval_to_send">Lineako jarraipenaren denbora-bufferra</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Zehaztu bidaltzeke dauden kokalekuak gordetzeko denbora-buffer bat</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">Internet behar duzu Mapillary-ko argazkiak ikusteko</string>
+    <string name="retry">Saiatu berriro</string>
+</resources>

OsmAnd/res/values-fr/strings.xml

@@ -2854,4 +2854,6 @@ Fonctionnalités principales :
     <string name="quick_action_show_navigation_finish_dialog">Afficher la fenêtre de fin de navigation</string>
     <string name="quick_action_start_stop_navigation">Démarrer / Arrêter la Navigation</string>
     <string name="quick_action_start_stop_navigation_descr">Appuyez sur ce bouton pour démarrer la navigation ou l\'arrêter lorsqu\'elle est en cours.</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">Vous devez être connecté à Internet pour afficher les photos Mapillary</string>
+    <string name="retry">Essayer à nouveau</string>
+</resources>

OsmAnd/res/values-gl/phrases.xml

@@ -1428,4 +1428,6 @@
 	<string name="poi_payment_sms_yes">Pagamentos por SMS</string>
 	<string name="poi_payment_sms_no">Non acepta pagamentos por SMS</string>
 	<string name="poi_payment_ov_chipkaart_yes">OV-Chipkaart</string>
+	<string name="poi_cafeteria">Cafetaría</string>
+	<string name="poi_zoo_type">Tipo</string>
 	</resources>

OsmAnd/res/values-gl/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="fav_point_dublicate_message">O nome do punto favorito xa está usado; foi cambiado a %1$s para evitar os duplicados.</string>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="fav_point_dublicate_message">O nome do punto favorito xa está usado; foi cambiado a %1$s para evitar os duplicados.</string>
     <string name="text_size_descr">Configurar o tamaño da letra no mapa.</string>
     <string name="text_size">Tamaño da letra</string>
     <string name="traffic_warning_speed_limit">Límite de velocidade</string>
@@ -2494,7 +2495,7 @@ Pódese pechar esta vista desactivándoa aquí ou cambiando o «Estilo de mapa»
     <string name="total_distance">Distancia total</string>
     <string name="routing_attr_height_obstacles_name">Empregar datos de elevación</string>
     <string name="shared_string_plugin">Engadido</string>
-    <string name="srtm_purchase_header">Para ver as liñas de nivel no mapa hai que comprar e instalar un engadido</string>
+    <string name="srtm_purchase_header">Para ver as liñas de nivel no mapa hai que comprar e instalar o engadido Liñas de Nivel</string>
     <string name="srtm_color_scheme">Esquema de cores</string>
     <string name="routing_attr_allow_private_name">Permitir acceso privado</string>
     <string name="routing_attr_allow_private_description">Permitir acceso a zonas privadas</string>
@@ -2505,10 +2506,45 @@ Pódese pechar esta vista desactivándoa aquí ou cambiando o «Estilo de mapa»
     <string name="lang_ber">Bérber</string>
     <string name="lang_kn">Kannada</string>
     <string name="shared_string_install">Instalar</string>
-    <string name="improve_coverage_mapillary">Mellorar a cobertura con Mapillary</string>
+    <string name="improve_coverage_mapillary">Mellorar a cobertura de fotos con Mapillary</string>
     <string name="open_mapillary">Abrir Mapillary</string>
-    <string name="improve_coverage_install_mapillary_desc">Podes facer as túas propias fotos ou serie de fotos e engadilas a esta localización do mapa.
+    <string name="improve_coverage_install_mapillary_desc">Podes facer as túas propias fotos ou serie de fotos e engadilas a este lugar do mapa. 
 \n 
-\nPara facer isto, tes que instalar a aplicación Mapillary dende Google Play.</string>
+\nPara facer isto, hai que instalar a aplicación Mapillary dende Google Play.</string>
-    <string name="online_photos">Fotos en liña</string>
+    <string name="online_photos">Fotos da rede</string>
+    <string name="quick_action_resume_pause_navigation">Retomar/Deter a navegación</string>
+    <string name="quick_action_resume_pause_navigation_descr">Prema neste botón para deter a navegación, ou para retomala se xa estaba detida.</string>
+    <string name="quick_action_start_stop_navigation">Iniciar/Rematar a navegación</string>
+    <string name="quick_action_start_stop_navigation_descr">Prema neste botón para iniciar a navegación, ou para detela se xa estaba iniciada.</string>
+    <string name="store_tracks_in_monthly_directories">Almacenar as pistas gravadas en cartafoles mensuais</string>
+    <string name="store_tracks_in_monthly_directories_descrp">Almacenar as pistas gravadas en sub-cartafoles segundo o mes de gravación (como 2017-01).</string>
+    <string name="shared_string_reset">Restaurar</string>
+    <string name="shared_string_reload">Recargar</string>
+    <string name="mapillary_menu_descr_tile_cache">Recargar as teselas para ver datos actualizados.</string>
+    <string name="mapillary_menu_title_tile_cache">Caché de teselas</string>
+    <string name="wrong_user_name">O nome de usuario é incorrecto!</string>
+    <string name="shared_string_to">A</string>
+    <string name="mapillary_menu_date_from">Desde</string>
+    <string name="mapillary_menu_descr_dates">Ver as imaxes engadidas nun período determinado.</string>
+    <string name="mapillary_menu_title_dates">Datas</string>
+    <string name="mapillary_menu_edit_text_hint">Escriba o nome de usuario</string>
+    <string name="mapillary_menu_descr_username">Ver as imaxes engadidas por un usuario determinado.</string>
+    <string name="mapillary_menu_title_username">Nome de usuario</string>
+    <string name="mapillary_menu_filter_description">Pode filtrar as imaxes por quen as enviou ou pola data. Os filtros só se aplican na ampliación próxima.</string>
+    <string name="shared_string_permissions">Permisos</string>
+    <string name="import_gpx_failed_descr">O OsmAnd non pode importar o ficheiro. Comprobe se o OsmAnd ten permiso para ler o ficheiro neste sitio.</string>
+    <string name="distance_moving">Distancia corrixida</string>
+    <string name="mapillary_image">Imaxe de Mapillary</string>
+    <string name="shared_string_add_photos">Engadir fotos</string>
+    <string name="no_photos_descr">Non dispomos de fotos deste lugar</string>
+    <string name="mapillary_widget">Trebello de Mapillary</string>
+    <string name="mapillary">Mapillary</string>
+    <string name="restart_search">Reiniciar a busca</string>
+    <string name="increase_search_radius">Aumentar o radio de busca</string>
+    <string name="nothing_found">Non se atopou nada :(</string>
+    <string name="quick_action_showhide_osmbugs_title">Mostrar/Agochar as notas de OSM</string>
+    <string name="quick_action_osmbugs_show">Mostrar as notas de OSM</string>
+    <string name="quick_action_osmbugs_hide">Agochar as notas de OSM</string>
+    <string name="sorted_by_distance">Ordenado por distancia</string>
+    <string name="search_favorites">Buscar nos favoritos</string>
     </resources>

OsmAnd/res/values-lv/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
   
   <string name="prefs_plugins_descr">Spraudņi papildina aplikācijas iespējas un piešķir tai papildus funkcionalitāti</string>
   <string name="prefs_plugins">Spraudņi</string>
@@ -2399,13 +2400,13 @@ failu(s)?
     <string name="skip_map_downloading_desc">Jums nav instalētas nevienas bezsaistes kartes. Izvēlieties kartes no saraksta vai lejuielādējiet tās caur izvēlni - %1$s.</string>
     <string name="search_another_country">Izvēlieties citu reģionu</string>
     <string name="search_map">Meklē karti…</string>
-    <string name="first_usage_wizard_desc">Nosakot jūsu atrašanās vietu, OsmAnd piedāvā sekojošas kartes lejupielādei.</string>
+    <string name="first_usage_wizard_desc">OsmAnd noteiks jūsu atrašanos un piedāvās lejupielādēt šī reģiona karti.</string>
     <string name="location_not_found">Atrašanās vieta nav zināma</string>
     <string name="no_inet_connection">Nav interneta savienojuma</string>
     <string name="no_inet_connection_desc_map">Nepieciešams lejupielādēt kartes.</string>
     <string name="search_location">Meklē atrašanās vietu…</string>
     <string name="storage_free_space">Brīvā vieta</string>
-    <string name="storage_place_description">OsmAnd datu glabātuve (kartēm, trekiem, u.t.t.): %1$s.</string>
+    <string name="storage_place_description">OsmAnd datu uzglabāšanas vieta (kartēm, maršrutiem u.c.): %1$s.</string>
     <string name="give_permission">Dot atļauju</string>
     <string name="allow_access_location">Atļaut noteikt vietu</string>
     <string name="first_usage_greeting">Veidojiet maršrutus un atklājiet jaunas vietas bez interneta savienojuma</string>

OsmAnd/res/values-nl/strings.xml

@@ -2234,7 +2234,7 @@ Lengtegraad:\t\t%2$s</string>
     <string name="clear_updates_proposition_message">Je kan gedownloade updates verwijderen en terugkeren naar de originele kaart</string>
     <string name="add_time_span">Periode toevoegen</string>
     <string name="road_blocked">Weg geblokkeerd</string>
-    <string name="shared_string_select">Selekteer</string>
+    <string name="shared_string_select">Selecteer</string>
     <string name="reports_for">Verslag voor:</string>
 <string name="data_is_not_available">Gegevens niet beschikbaar</string>
     <string name="rendering_attr_hideUnderground_name">Ondergrondse objecten</string>

OsmAnd/res/values-ru/strings.xml

@@ -12,7 +12,7 @@
     <string name="quick_action_showhide_osmbugs_descr">Нажатие на кнопку действия отобразит/скроет заметки OSM с карты.</string>
     <string name="sorted_by_distance">Отсортировано по расстоянию</string>
     <string name="search_favorites">Поиск в избранном</string>
-    <string name="hillshade_menu_download_descr">Для того, чтобы отобразить затенение рельефа, вам нужно загрузить специальную карту для этой области</string>
+    <string name="hillshade_menu_download_descr">Для того, чтобы отобразить затенение рельефа, вам нужно загрузить специальную карту для этой области.</string>
     <string name="hillshade_purchase_header">Для того, чтобы отобразить затенение рельефа, вам нужно купить и установить плагин</string>
     <string name="srtm_menu_download_descr">Для того, чтобы отобразить линии контуров рельефа, вам нужно загрузить специальную карту для этой области.</string>
     <string name="shared_string_plugin">Плагин</string>
@@ -33,7 +33,7 @@
     <string name="shared_string_in_name">в %1$s</string>
     <string name="type_address">Введите адрес</string>
     <string name="type_city_town">Введите город</string>
-    <string name="type_postcode">Введите почтовый код</string>
+    <string name="type_postcode">Введите почтовый индекс</string>
     <string name="nearest_cities">Ближайшие города</string>
     <string name="select_city">Выберите город</string>
     <string name="select_postcode">Выберите почтовый код</string>

OsmAnd/res/values-sk/strings.xml

@@ -2815,4 +2815,6 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="min_max">Min/Max</string>
     <string name="live_monitoring_max_interval_to_send">Časový zásobník pre online sledovanie</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Zadajte čas pokiaľ budú udržované pozície na odoslanie kým nie je pripojenie</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">Na zobrazovanie fotografií z Mapillary potrebujete pripojenie na Internet</string>
+    <string name="retry">Skúsiť znova</string>
+</resources>

OsmAnd/res/values-uk/strings.xml

@@ -45,7 +45,7 @@
   
   <string name="osmand_rastermaps_plugin_description">"Цей втулок надає можливість отримати доступ до багатьох типів онлайн (так званих растрових) мап, від попередньо створених квадратів OpenStreetMap (на кшталт стилю Mapnik) до супутникових знімків та спеціальних шарів, таких як погодні, кліматичні та геологічні мапи, шари рельєфу й т.і. 
 \n
-\nБудь яка з цих мап може використовуватись як основна мапа в OsmAnd, або як покриття чи підкладка до іншої основної мапи (наприклад стандартна оффлайнова мапа OsmAnd). Для того, щоб зробити більш помітною будь-яку мапу-підкладку, певні елементи векторної мапи OsmAnd можна легко сховати через меню \'Налаштування Мапи\'. 
+\nБудь яка з цих мап може використовуватись як основна мапа в OsmAnd, або як покриття чи підкладка до іншої основної мапи (наприклад стандартна оффлайнова мапа OsmAnd). Для того, щоб зробити більш помітною будь-яку мапу-підкладку, певні елементи векторної мапи OsmAnd можна легко сховати через меню „Налаштування Мапи“. 
 \n
 \nКвадрати мап можна отримувати безпосередньо з онлайн-джерел або підготувати їх для оффлайнового використання (та вручну скопіювати в теку даних  OsmAnd) у вигляді бази даних SQLite, яку можна створити за допомогою різноманітних сторонніх інструментів підготовки мап."</string>
   <string name="osmand_background_plugin_description">Показує налаштування для активації навігації та запису маршрутів в фоновому режимі (екран вимкнено), періодично активуючи GPS.</string>
@@ -665,7 +665,7 @@
   <string name="shared_string_close">Закрити</string>
   <string name="loading_data">Дані завантажуються…</string>
   <string name="reading_indexes">Зчитування даних…</string>
-  <string name="previous_run_crashed">Помилка у роботі програми. Лог-файл знаходиться тут {0}. Будь ласка, напишіть розробнику про помилку (з вкладеним лог-файлом).</string>
+  <string name="previous_run_crashed">Помилка у роботі програми. Файл журналу знаходиться тут {0}. Будь ласка, напишіть розробнику про помилку (з вкладеним журнальним файлом).</string>
   <string name="saving_gpx_tracks">Збереження GPX треків на SD…</string>
   <string name="finished_task">Закінчено</string>
   
@@ -2934,7 +2934,7 @@
     <string name="max_min">Макс./мін.</string>
     
     <string name="min_max">Мін/макс</string>
-    <string name="release_2_7">\\022 Втулок Mapillary з вуличними зображеннями
+    <string name="release_2_7">• Втулок Mapillary з вуличними зображеннями 
 \n 
 \n • Віджет-лінійка для вимірювання дистанцій 
 \n 
@@ -2951,4 +2951,6 @@
     <string name="quick_action_start_stop_navigation_descr">Натисніть цю кнопку, щоб запустити навігацію або зупинити її, якщо вона вже була запущена.</string>
     <string name="live_monitoring_max_interval_to_send">Час буферизації для онлайн-стеження</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Задає час буферизації для збереження місць для відправки в автономному режимі</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">Вам потрібен Інтернет для перегляду фотографій від Mapillary</string>
+    <string name="retry">Повторити</string>
+</resources>

OsmAnd/res/values-zh-rCN/strings.xml

@@ -1099,7 +1099,7 @@
     <string name="gps_wake_up_timer">GPS 唤醒间隔</string>
     <string name="favourites_edit_dialog_title">我的最爱信息</string>
     <string name="simulate_your_location_stop_descr">停止模拟您的位置</string>
-    <string name="simulate_your_location_descr">使用模拟计算一个路线或记录为 GPX</string>
+    <string name="simulate_your_location_descr">使用计算得到的路线或者一条 GPX 记录模拟您的位置</string>
     <string name="looking_up_address">查询地址</string>
     <string name="av_locations_descr">GPS 文件附位置注解</string>
     <string name="av_locations">位置</string>
@@ -1540,9 +1540,9 @@
     <string name="routing_attr_relief_smoothness_factor_hills_name">丘陵</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">低丘陵</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">平地</string>
-    <string name="routing_attr_driving_style_speed_name">速度</string>
+    <string name="routing_attr_driving_style_speed_name">更短的路径</string>
     <string name="routing_attr_driving_style_balance_name">平衡</string>
-    <string name="routing_attr_driving_style_safety_name">安全</string>
+    <string name="routing_attr_driving_style_safety_name">偏好背街小路</string>
     <string name="relief_smoothness_factor_descr">首选的地形︰ 平坦或丘陵</string>
     <string name="shared_string_slope">坡度</string>
     <string name="add_new_folder">添加新文件夹</string>
@@ -1587,7 +1587,7 @@
     <string name="shared_string_recorded">已录制</string>
     <string name="shared_string_record">记录</string>
     <string name="rendering_attr_contourColorScheme_description">等高线的色彩调配</string>
-    <string name="save_track_min_distance">记录运动检测</string>
+    <string name="save_track_min_distance">最低位移记录阈值</string>
     <string name="save_track_min_distance_descr">过滤器：从最后位置的一个点设置最短距离用以记录</string>
     <string name="save_track_precision">记录最小的精确度</string>
     <string name="save_track_precision_descr">过滤器：设置记录一个点的最小精度</string>
@@ -1671,9 +1671,9 @@
     <string name="map_widget_magnetic_bearing">磁方位</string>
     <string name="map_widget_bearing">相对方位</string>
     <string name="access_disable_offroute_recalc">当您离开道路时不重新计算路线</string>
-    <string name="access_disable_offroute_recalc_descr">当您离正确的道路很远，阻止自动路线重新估算</string>
+    <string name="access_disable_offroute_recalc_descr">当您偏离预设路线时，阻止自动路线重新估算</string>
-    <string name="access_disable_wrong_direction_recalc">不要改变错误方向的路线</string>
+    <string name="access_disable_wrong_direction_recalc">向反方向行驶时不要重新计算路线</string>
-    <string name="access_disable_wrong_direction_recalc_descr">当你正朝着错误的方向行进，防止自动路线重新计算</string>
+    <string name="access_disable_wrong_direction_recalc_descr">当你朝着反方向行驶时，防止自动路线重新计算</string>
     <string name="access_smart_autoannounce">智能自动播报</string>
     <string name="access_smart_autoannounce_descr">只在指引到目标点已被改变了才通知</string>
     <string name="access_autoannounce_period">自动播报周期</string>
@@ -1888,7 +1888,7 @@
     <string name="watch">观看</string>
     <string name="notes">注解</string>
     <string name="rendering_attr_pisteRoutes_name">滑雪场</string>
-    <string name="free">"%1$s 可用 "</string>
+    <string name="free">%1$s 可用</string>
     <string name="rendering_attr_pisteGrooming_name">滑雪道修整</string>
     <string name="world_ski_missing">为了显示滑雪地图，需要下载特别的离线地图</string>
     <string name="nautical_maps_missing">为了显示航海地图，需要下载特别的离线地图</string>
@@ -2036,20 +2036,20 @@
 \n
 \n长按在地图上查看"</string>
     <string name="delay_navigation_start">自动启动转弯指引</string>
-    <string name="gpx_info_subtracks">"子轨迹：%1$s "</string>
+    <string name="gpx_info_subtracks">子轨迹：%1$s</string>
-    <string name="gpx_info_waypoints">"路标：%1$s "</string>
+    <string name="gpx_info_waypoints">航点：%1$s</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_start_time">开始时间：%1$tF，%1$tT</string>
-    <string name="gpx_info_end_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>
+    <string name="gpx_info_average_speed">平均速度：%1$s</string>
-    <string name="gpx_info_maximum_speed">"最大速度：%1$s "</string>
+    <string name="gpx_info_maximum_speed">最大速度：%1$s</string>
     <string name="gpx_info_avg_altitude">平均海拔高度：%1$s</string>
     <string name="gpx_info_diff_altitude">高度范围：%1$s</string>
     <string name="gpx_info_asc_altitude">下坡/上坡：%1$s</string>
     <string name="gpx_timespan">时间跨度：%1$s</string>
     <string name="gpx_timemoving">时间移动：%1$s</string>
     <string name="gpx_selection_segment_title">区段</string>
-    <string name="gpx_selection_number_of_points">" %1$s 的标点"</string>
+    <string name="gpx_selection_number_of_points">%1$s 的标点</string>
     <string name="gpx_selection_point">标点 %1$s</string>
     <string name="gpx_selection_route_points">%1$s 
 \n路线标点 %2$s</string>
@@ -2105,9 +2105,9 @@
     <string name="osmo_connected_devices">已连接的设备</string>
     <string name="osmo_session_token">会话令牌: %1$s</string>
     <string name="osmo_auth_pending">正在等待授权…</string>
-    <string name="osmo_locations_sent">"位置已发送 %1$d（缓冲区 %2$d） "</string>
+    <string name="osmo_locations_sent">位置已发送 %1$d（缓冲区 %2$d）</string>
-    <string name="osmo_conn_successfull">"建立的连接: %1$s "</string>
+    <string name="osmo_conn_successfull">连接已建立: %1$s</string>
-    <string name="osmo_io_error">"OsMo 连接问题： "</string>
+    <string name="osmo_io_error">OsMo 连接问题：</string>
     <string name="osmo_settings_uuid">独特的设备 id</string>
     <string name="use_points_as_intermediates">计算两点之间的路线</string>
     <string name="osmo_mode_restart">重新启动 OsMo 会话</string>
@@ -2212,7 +2212,7 @@
     <string name="app_mode_aircraft">航空器</string>
     <string name="local_osm_changes_delete_all_confirm">要删除 %1$d 个 OSM 更新。是否确定？</string>
     <string name="animate_routing_route_not_calculated">请先计算路线</string>
-    <string name="animate_routing_route">"模拟使用计算的路线 "</string>
+    <string name="animate_routing_route">使用计算的路线进行模拟</string>
     <string name="animate_routing_gpx">模拟使用 GPX 轨迹</string>
     <string name="route_is_too_long_v2">这条路线可能太长，无法推算。如果在10分钟内没有结果，请添加中继节点。</string>
     <string name="auto_zoom_none">不自动缩放</string>
@@ -2620,7 +2620,7 @@
     <string name="mapillary_menu_title_dates">日期</string>
     <string name="mapillary_menu_descr_username">查看特定用户添加的图像。</string>
     <string name="mapillary_menu_descr_dates">查看特定时期内添加的图像。</string>
-    <string name="mapillary_menu_filter_description">您可以根据用户名或日期过滤图像。</string>
+    <string name="mapillary_menu_filter_description">您可以根据提交者或日期过滤图像。过滤器仅在高比例尺放大时产生作用。</string>
     <string name="shared_string_reload">重新载入</string>
     <string name="shared_string_reset">重置</string>
     <string name="store_tracks_in_monthly_directories">按月将记录的轨迹存放在文件夹中</string>
@@ -2633,4 +2633,19 @@
     <string name="of">%2$d 中的 %1$d</string>
     <string name="moving_time">移动时间</string>
     <string name="min_max">最小/最大</string>
+    <string name="quick_action_resume_pause_navigation">继续/暂停导航</string>
+    <string name="quick_action_resume_pause_navigation_descr">点击该按钮以暂停导航，或者在已暂停时恢复导航。</string>
+    <string name="quick_action_show_navigation_finish_dialog">显示导航完成对话框</string>
+    <string name="quick_action_start_stop_navigation">开始/结束导航</string>
+    <string name="quick_action_start_stop_navigation_descr">点击该按钮以开始导航，或者在导航已经开始的情况下结束导航。</string>
+    <string name="release_2_7">\\022 带有街道等级图像的 Mapillary 插件
+\n
+\n• 用于距离测量的量尺小部件
+\n
+\n • GPX 切分间隔，带有您的路径的详细信息
+\n
+\n • 其它改进和问题修复
+\n
+\n</string>
+    <string name="rendering_value_translucent_pink_name">半透明粉红色</string>
     </resources>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -1494,7 +1494,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
 
     <string name="rendering_attr_showCycleRoutes_name">顯示自行車路線</string>
     <string name="map_preferred_locale">地圖上優先的語言</string>
-    <string name="local_map_names">本地名稱</string>
+    <string name="local_map_names">當地的名稱</string>
     <string name="lang_sw">斯瓦希里</string>
     <string name="lang_he">希伯來</string>
     <string name="forward">往前</string>
@@ -1506,7 +1506,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="gpx_monitoring_stop">停止 GPX 記錄</string>
     <string name="gpx_start_new_segment">開始新區段</string>
     <string name="lang_fa">波斯</string>
-    <string name="map_preferred_locale_descr">在地圖標簽上優先的語言(如果優先的語言無法使用，將會切換成英文或本地名稱)</string>
+    <string name="map_preferred_locale_descr">在地圖標簽上優先的語言(如果優先的語言無法使用，將會切換成英文或當地名稱)</string>
     <string name="live_monitoring_m_descr">如果已啟用了 GPX 記錄，傳送軌跡資料到指定的 web 服務。</string>
     <string name="keep_navigation_service">保持</string>
     <string name="stop_navigation_service">中止</string>
@@ -2804,4 +2804,6 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="quick_action_start_stop_navigation_descr">按此按鈕開始導航如果已經開始，則停止導航。</string>
     <string name="live_monitoring_max_interval_to_send">用於線上追蹤的緩衝時間</string>
     <string name="live_monitoring_max_interval_to_send_desrc">指定一段緩衝時間以保持位置，而無需連接發送</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">您需要網際網路才能從 Mapillary 檢視照片</string>
+    <string name="retry">重試</string>
+</resources>

OsmAnd/src/net/osmand/plus/Version.java

@@ -31,7 +31,7 @@ public class Version {
 		if (isAmazonEnabled(ctx)) {
 			return "amzn://apps/android?p=";
 		} else if (isGooglePlayEnabled(ctx)) {
-			return "market://search?q=pname:";
+			return "market://details?id=";
 		} 
 		return "https://osmand.net/apps?id=";
 	}

OsmAnd/src/net/osmand/plus/activities/MapActivity.java

@@ -752,7 +752,11 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 	}
 
 	public void dismissCardDialog() {
-		getSupportFragmentManager().popBackStack(ContextMenuCardDialogFragment.TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+		try {
+			getSupportFragmentManager().popBackStack(ContextMenuCardDialogFragment.TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java

@@ -1,6 +1,7 @@
 package net.osmand.plus.base;
 
 import android.content.Context;
+import android.os.AsyncTask;
 import android.support.v4.util.Pair;
 import android.view.WindowManager;
 
@@ -150,28 +151,45 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 		return movingToMyLocation;
 	}
 
+	private void detectDrivingRegion(final LatLon latLon) {
+
+		new AsyncTask<LatLon, Void, BinaryMapDataObject>() {
+
+			@Override
+			protected BinaryMapDataObject doInBackground(LatLon... latLons) {
+				try {
+					if (latLons != null && latLons.length > 0) {
+						return app.getRegions().findBinaryMapDataObject(latLons[0]);
+					}
+				} catch (IOException e) {
+					// ignore
+				}
+				return null;
+			}
+
+			@Override
+			protected void onPostExecute(BinaryMapDataObject o) {
+				if (o != null) {
+					String fullName = app.getRegions().getFullName(o);
+					WorldRegion worldRegion = app.getRegions().getRegionData(fullName);
+					if (worldRegion != null) {
+						app.setupDrivingRegion(worldRegion);
+					}
+				}
+			}
+
+		}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, latLon);
+	}
+
 	@Override
 	public void updateLocation(Location location) {
 		myLocation = location;
 		showViewAngle = false;
 		if (location != null) {
 			locationProvider = location.getProvider();
-			if (settings.DRIVING_REGION_AUTOMATIC.get() && !drivingRegionUpdated) {
+			if (settings.DRIVING_REGION_AUTOMATIC.get() && !drivingRegionUpdated && !app.isApplicationInitializing()) {
-				try {
+				drivingRegionUpdated = true;
-					BinaryMapDataObject o = app.getRegions().findBinaryMapDataObject(
+				detectDrivingRegion(new LatLon(location.getLatitude(), location.getLongitude()));
-							new LatLon(location.getLatitude(), location.getLongitude()));
-					if (o != null) {
-						String fullName = app.getRegions().getFullName(o);
-						WorldRegion worldRegion = app.getRegions().getRegionData(fullName);
-						if (worldRegion != null) {
-							app.setupDrivingRegion(worldRegion);
-						}
-					}
-					drivingRegionUpdated = true;
-
-				} catch (IOException e) {
-					// ignore
-				}
 			}
 		}
 		if (mapView != null) {

OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java

@@ -381,7 +381,7 @@ public class DownloadIndexesThread {
 			builder.setPositiveButton(R.string.button_upgrade_osmandplus, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
-					Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:net.osmand.plus"));
+					Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=net.osmand.plus"));
 					try {
 						ctx.startActivity(intent);
 					} catch (ActivityNotFoundException e) {

OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialogFragment.java

@@ -109,7 +109,7 @@ public class ContextMenuCardDialogFragment extends Fragment {
 		fragment.dialog = menu;
 		menu.getMapActivity().getSupportFragmentManager().beginTransaction()
 				.replace(R.id.topFragmentContainer, fragment, TAG)
-				.addToBackStack(TAG).commit();
+				.addToBackStack(TAG).commitAllowingStateLoss();
 	}
 
 	public void dismiss() {

OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java

@@ -236,7 +236,7 @@ public class MapillaryPlugin extends OsmandPlugin {
 	}
 
 	public static boolean installMapillary(OsmandApplication app) {
-		boolean success = execInstall(app, "market://search?q=pname:" + MAPILLARY_PACKAGE_ID);
+		boolean success = execInstall(app, "market://details?id=" + MAPILLARY_PACKAGE_ID);
 		if (!success) {
 			success = execInstall(app, "https://play.google.com/store/apps/details?id=" + MAPILLARY_PACKAGE_ID);
 		}

OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java

@@ -576,7 +576,12 @@ public class SplitSegmentFragment extends OsmAndListFragment {
 
                         String maxSpeed = OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app);
                         String minSpeed = OsmAndFormatter.getFormattedSpeed(analysis.minSpeed, app);
-                        String maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed);
+                        String maxMinSpeed;
+                        if (maxSpeed.contains(" ")) {
+                            maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed);
+                        } else {
+                            maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf("-")).concat("/").concat(minSpeed);
+                        }
 
                         if (minMaxSpeedLayoutWidth == 0) {
                             DisplayMetrics metrics = new DisplayMetrics();
@@ -591,7 +596,7 @@ public class SplitSegmentFragment extends OsmAndListFragment {
                         minMaxSpeedPaint.getTextBounds(maxMinSpeed, 0, maxMinSpeed.length(), minMaxSpeedTextBounds);
                         int minMaxStringWidth = minMaxSpeedTextBounds.width();
 
-                        if (minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0") || minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0.0")) {
+                        if (analysis.minSpeed == 0) {
                             (convertView.findViewById(R.id.max_speed_value))
                                     .setVisibility(View.VISIBLE);
                             (convertView.findViewById(R.id.min_speed_value))

OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java

@@ -578,14 +578,19 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
 
 	private void putAllAcceptedTypes(Map<PoiCategory, LinkedHashSet<String>> types) {
 		for (PoiCategory category : types.keySet()) {
+			LinkedHashSet<String> typesSet = types.get(category);
 			if (acceptedTypes.containsKey(category)) {
-				if (acceptedTypes.get(category) != null && types.get(category) != null) {
+				if (acceptedTypes.get(category) != null && typesSet != null) {
-					acceptedTypes.get(category).addAll(types.get(category));
+					acceptedTypes.get(category).addAll(typesSet);
 				} else {
 					acceptedTypes.put(category, null);
 				}
 			} else {
-				acceptedTypes.put(category, new LinkedHashSet<>(types.get(category)));
+				if (typesSet != null) {
+					acceptedTypes.put(category, new LinkedHashSet<>(typesSet));
+				} else {
+					acceptedTypes.put(category, null);
+				}
 			}
 		}
 	}

OsmAndCore-sample/build.gradle

@@ -110,8 +110,8 @@ repositories {
 
 dependencies {
     compile project(path: ':OsmAnd-java', configuration: 'android')
-    compile 'com.android.support:appcompat-v7:23.3.0'
+    compile 'com.android.support:appcompat-v7:25.+'
-    compile 'com.android.support:design:23.3.0'
+    compile 'com.android.support:design:25.+'
     compile fileTree(dir: "libs", include: ["*.jar"])
     compile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
     debugCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"

OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/InstallOsmandAppDialog.java

@@ -39,7 +39,7 @@ public class InstallOsmandAppDialog extends AppCompatDialogFragment {
 		view.findViewById(R.id.install_osmand_btn).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				boolean success = execOsmAndInstall("market://search?q=pname:");
+				boolean success = execOsmAndInstall("market://details?id=");
 				if (!success) {
 					success = execOsmAndInstall("https://play.google.com/store/apps/details?id=");
 				}

OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/ContextMenuHelper.java

@@ -62,7 +62,7 @@ public class ContextMenuHelper {
 
 		final Toolbar topBar = new Toolbar(ctx);
 		topBar.setClickable(true);
-		Drawable back = app.getIconsCache().getIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
+		Drawable back = app.getIconsCache().getIcon(R.drawable.ic_arrow_back);
 		topBar.setNavigationIcon(back);
 		topBar.setNavigationContentDescription(app.getString("access_shared_string_navigate_up"));
 		topBar.setTitle(title);
@@ -220,7 +220,7 @@ public class ContextMenuHelper {
 
 		final Toolbar topBar = new Toolbar(ctx);
 		topBar.setClickable(true);
-		Drawable back = app.getIconsCache().getIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
+		Drawable back = app.getIconsCache().getIcon(R.drawable.ic_arrow_back);
 		topBar.setNavigationIcon(back);
 		topBar.setNavigationContentDescription(app.getString("access_shared_string_navigate_up"));
 		topBar.setTitle(title);

OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchDialogFragment.java

@@ -203,7 +203,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements SampleC
 		);
 
 		toolbar = (Toolbar) view.findViewById(R.id.toolbar);
-		toolbar.setNavigationIcon(app.getIconsCache().getThemedIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha));
+		toolbar.setNavigationIcon(app.getIconsCache().getThemedIcon(R.drawable.ic_arrow_back));
 		toolbar.setNavigationContentDescription(app.getString("access_shared_string_navigate_up"));
 		toolbar.setNavigationOnClickListener(
 				new OnClickListener() {

plugins/Osmand-Nautical/src/net/osmand/nautical/NauticalActivity.java

@@ -57,7 +57,7 @@ public class NauticalActivity extends Activity {
 					public void onClick(View v) {
 						String appName = OSMAND_COMPONENT;
 						logEvent(NauticalActivity.this, "open_play_store_" + appName);
-						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + appName));
+						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appName));
 						try {
 							//stopService(intent);
 							startActivity(intent);

plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java

@@ -56,7 +56,7 @@ public class ParkingPluginActivity extends Activity {
 					public void onClick(View v) {
 						String appName = OSMAND_COMPONENT;
 						logEvent(ParkingPluginActivity.this, "open_play_store_" + appName);
-						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + appName));
+						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appName));
 						try {
 							//stopService(intent);
 							startActivity(intent);

plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java

@@ -58,7 +58,7 @@ public class SRTMPluginActivity extends Activity {
 					public void onClick(View v) {
 						String appName = OSMAND_COMPONENT;
 						logEvent(SRTMPluginActivity.this, "open_play_store_" + appName);
-						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + appName));
+						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appName));
 						try {
 							//stopService(intent);
 							startActivity(intent);

plugins/Osmand-Skimaps/src/net/osmand/skimaps/SkiMapsActivity.java

@@ -59,7 +59,7 @@ public class SkiMapsActivity extends Activity {
 					public void onClick(View v) {
 						String appName = OSMAND_COMPONENT;
 						logEvent(SkiMapsActivity.this, "open_play_store_" + appName);
-						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + appName));
+						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appName));
 						try {
 							//stopService(intent);
 							startActivity(intent);