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

2014-12-08 22:13:04 +01:00 · 2014-12-08 22:13:04 +01:00 · 86a8753559
commit 86a8753559
parent 27716b7acd bf28d175b9
27 changed files with 271 additions and 102 deletions
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@ -1252,7 +1252,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="route_general_information">Агульная адлегласць %1$s, час у дарозе %2$d г. %3$d хв.</string>
 	<string name="router_service_descr">Абраць сеціўны ці пазасеціўны сэрвіс навігацыі</string>
 	<string name="router_service">Сэрвіс навігацыі</string>
-	<string name="sd_dir_not_accessible">Каталог на SD-карце недаступны для захоўваньня</string>
+	<string name="sd_dir_not_accessible">Каталёг на SD-карце недаступны для захоўваньня!</string>
 	<string name="download_question">Download {0} - {1} ?</string>
 	<string name="download_question_exist">Лакальная карта для {0} ужо існуе ({1}). Хочаце яе абнавіць ({2})?</string>
 	<string name="address">Адрас</string>
@ -1591,7 +1591,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
    <string name="osmo_plugin_name">OsMo (Пашыранае адсочваньне ў рэальным часе)</string>
    <string name="osmo_settings">Маніторынг OpenStreetMap</string>
   	<string name="always_center_position_on_map">Паказваць становішча заўсёды ў цэнтры</string>
-    <string name="route_descr_destination"> </string>
+    <string name="route_descr_destination">Пункт прызначэньня</string>
    <string name="interrupt_music_descr">Перапыняць музыку робячы аб\'яву</string>
 	<string name="share_route_as_gpx">Падзяліцца маршрутам праз GPX файл</string>
 	<string name="share_route_subject">Маршрут апублікаваны з дапамогай OsmAnd</string>
@ -1965,10 +1965,12 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
    <string name="everything_up_to_date">Усё ў актуальным стане</string>
    <string name="dismiss">Скасаваць</string>
    <string name="no_internet_connection">Немагчыма спампаваць. Калі ласка, падлучыцеся да Wi-Fi, каб працягнуць.</string>
-    <string name="download_tab_downloads">Сьцягваньні</string>
+    <string name="download_tab_downloads">Усе загрузкі</string>
    <string name="download_tab_updates">Абнаўленьні</string>
    <string name="download_tab_local">Лякальны</string>
 	<string name="navigate_point_zone">Зона</string>
    <string name="navigate_point_northing">На поўнач</string>
    <string name="navigate_point_easting">На ўсход</string>
+    <string name="map_locale">Мова мапы</string>
+    <string name="rendering_attr_transportStops_name">Прыпынкі транспарту</string>
    </resources>
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@ -337,7 +337,7 @@
 <string name="search_osm_offline">Cerca l\'adreça utilitzant mapes fora de línia</string>
 <string name="system_locale">Sistema</string>
 <string name="tip_navigation">Navegació</string>
-<string name="tip_initial">Suport</string>
+<string name="tip_initial">Ajuda</string>
 <string name="next_button">Endavant</string>
 <string name="previous_button">Enrere</string>
 <string name="unit_of_length_descr">Canvieu les unitats de longitud i velocitat</string>
@ -466,7 +466,7 @@
 <string name="settings">Configuració</string>
 <string name="data_settings">Dades</string>
 <string name="close">Tanca</string>
-<string name="update_existing">Reemplaçar</string>
+<string name="update_existing">Reemplaça</string>
 <string name="follow">Inicia la navegació</string>
 <string name="address">Adreça</string>
 <string name="search_online_address">Internet</string>
@ -486,7 +486,7 @@
 <string name="clear_all">Neteja-ho tot</string>
 <string name="recalculate_route_to_your_location">Mitjà de transport:</string>
 <string name="use_short_object_names_descr">Utilitza el nom curt dels objectes en el mode d\'exploració tàctil</string>
-<string name="amenity_type_user_defined">Usuari definit</string>
+<string name="amenity_type_user_defined">Definit per l\'usuari</string>
 <string name="tip_osm_improve">Millora de les dades d\'OSM</string>

 <string name="choose_auto_follow_route">Visualització del mapa centrada automàticament</string>
@ -553,7 +553,7 @@
 <string name="search_offline_address">Fora de línia</string>
 <string name="download_index_success">Baixada amb èxit</string>

-<string name="show_poi_on_map">Mostrar al mapa</string>
+<string name="show_poi_on_map">Mostra al mapa</string>
 <string name="show_gps_status">Mostra l\'estat del GPS</string>
 <string name="opening_hours">Horari d\'obertura</string>
 <string name="poi">PDI</string>
@ -670,15 +670,15 @@
 <string name="error_calculating_route">S\'ha produït un error en calcular la ruta</string>
 <string name="loading_postcodes">S\'estan carregant els codis postals…</string>
 <string name="arrived_at_destination">Heu arribat a la vostra destinació</string>
-<string name="invalid_locations">Les coordenades no són vàlides !</string>
+<string name="invalid_locations">Les coordenades no són vàlides!</string>
 <string name="saving_gpx_tracks">S\'estan desant els seguiments GPX a la SD…</string>
-<string name="download_indexes">Baixar dades fora de linía</string>
+<string name="download_indexes">Baixa dades fora de línia</string>
 <string name="osm_settings">Edició d\'OSM</string>
 <string name="save_track_interval">Interval d\'enregistrament durant la navegació</string>
 <string name="additional_settings">Preferències addicionals</string>
-<string name="data_settings_descr">Especifiqueu la llengua, baixeu/recarregueu dades</string>
-<string name="use_online_routing">Usa navegació en linía</string>
-<string name="save_current_track_descr">Guardeu el seguiment actual a la SD en aquest moment</string>
+<string name="data_settings_descr">Especifiqueu la llengua, baixeu / torneu a carregar les dades</string>
+<string name="use_online_routing">Utilitza la navegació en línia</string>
+<string name="save_current_track_descr">Deseu la traça actual a la SD en aquest moment</string>
 <string name="add_to_favourite">Afegeix a Preferits</string>
 <string name="ChooseCountry">Trieu el país</string>
 <string name="choose_street">Trieu el carrer</string>
@ -906,12 +906,12 @@
 	<string name="download_question">Voleu baixar {0} - {1} ?</string>
 	<string name="download_question_exist">Ja existeixen dades fora de línia per {0} ({1}). Voleu actualitzar-les ({2}) ?</string>
 	<string name="fav_points_edited">S\'ha editat un punt preferit</string>
-	<string name="only_show">Només mostra</string>
+	<string name="only_show">Mostra la ruta</string>
 	<string name="mark_final_location_first">Primer de tot cal que seleccioneu una destinació</string>
 	<string name="auth_failed">Ha fallat l\'autorització</string>
 	<string name="loading_streets_buildings">S\'estan carregant els carrers/edificis…</string>
 	<string name="error_calculating_route_occured">S\'ha produït un error en calcular la ruta</string>
-	<string name="empty_route_calculated">Error: La ruta calculada és buida</string>					
+	<string name="empty_route_calculated">S\'ha produït un error: la ruta calculada és buida</string>					
 	<string name="go_back_to_osmand">Torna enrere al mapa de l\'OsmAnd</string>
 	<string name="reading_indexes">S\'estan llegint les dades locals…</string>
 	<string name="download_indexes_descr">Baixeu o actualitzeu dades des d\'Internet pel seu ús fora de línia</string>
@ -1147,7 +1147,7 @@
    <string name="support_new_features_descr">Feu un donatiu per veure noves funcionalitats implementades a l\'aplicació</string>
 	<string name="direction_style_sidewise">Lateral (8 sectors)</string>
 	<string name="direction_style_clockwise">Sentit horari (12 sectors)</string>
-	<string name="sd_dir_not_accessible">La carpeta d\'emmagatzematge a la targeta SD no és accessible</string>
+	<string name="sd_dir_not_accessible">La carpeta d\'emmagatzematge a la targeta SD no és accessible!</string>
 	<string name="please_select_address">Seleccioneu primer un municipi o carrer</string>
    <string name="search_street_in_neighborhood_cities">Cerca el carrer en els municipis propers</string>
    <string name="intermediate_items_sort_by_distance">Ordre (porta a porta)</string>
@ -1349,7 +1349,7 @@
    <string name="android_19_location_disabled">"Des de la versió 4.4 d\'Android (KitKat) no es pot descarregar i actualitzar després els  mapes a la mateixa carpeta (%s). Voleu canviar-la a un altre lloc permès i copiar-hi tots els arxius OsmAnd?
 \n Nota 1: Els vostres arxius obsolets  quedaran intactes (els podeu esborrar manualment).
 \n Nota 2: En el nou lloc d\'emmagatzemament no serà possible compartir arxius entre l\'OsmAnd i l\'OsmAnd+."</string>
-    <string name="application_dir_change_warning2">Voleu que l\'OsmAnd també copiï els seus arxius de dades a la nova destinació?</string>
+    <string name="application_dir_change_warning2">Voleu que l\'OsmAnd també copiï els seus arxius de dades a la nova destinació? Indiqueu «No» i l\'OsmAnd crearà i utilitzarà una carpeta nova.</string>
    <string name="copying_osmand_one_file_descr">S\'està copiant el fitxer (%s) a la nova destinació...</string>
    <string name="copying_osmand_files_descr">S\'estan copiant els fitxers de dades de l\'OsmAnd a la nova destinació (%s)</string>
    <string name="copying_osmand_files">S\'estan copiant fitxers de dades de l\'OsmAnd</string>
@ -1385,7 +1385,7 @@
 	<string name="poi_error_unexpected_template">S\'ha produït un error inesperat en fer l\'acció {0}.</string>
 	<string name="osb_close_dialog_error">S\'ha produït una excepció: no s\'ha tancat l\'error</string>
 	<string name="map_tile_source_descr">Trieu l\'origen de les tessel·les, en línia o de la memòria cau</string>
-	<string name="previous_run_crashed">La darrera execució d\'OsmAnd s\'ha estavellat. El fitxer log és a {0}. Si us plau informeu del problema i adjunteu el fitxer log.</string>
+	<string name="previous_run_crashed">La darrera execució de l\'OsmAnd ha fallat. El fitxer log és a {0}. Si us plau informeu del problema i adjunteu el fitxer log.</string>
 	<string name="transport_stop_to_go_out">Trieu aturada per sortir</string>
 	<string name="route_head">Endavant</string>
 	<string name="off_router_service_no_gps_available">El servei de navegació en segon pla necessita tenir un sistema d\'ubicació activat.</string>
@ -1614,8 +1614,7 @@ Mapa aproximat de la cobertura i qualitat:

 La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània, Alemanya, Antilles Holandeses, Algèria, Andorra, Angola, Anguila, Antigua i Barbados, Aràbia Saudita, Argentina, Armènia, Aruba, Austràlia, Àustria, Azerbaidjan, Bahames, Bahrain, Bangladesh, Barbados, Bèlgica, Belize, Benín, Bermuda, Bielorússia, Butà, Bolívia, Bonaire, Bòsnia i Hercegovina, Botswana, Brasil, Illes Verges Britàniques, Brunei, Bulgària, Burkina Faso, Burundi, Cambotja, Camerun, Canadà, Cap Vert, República Centreafricana, Txad, Xile, Xina, Xipre, Colòmbia, Comores, Congo, Costa de Marfil, Costa Rica, Croàcia, Cuba, Curaçao, Dinamarca, Djibouti, Dominica, Equador, Egipte, El Salvador, El Vaticà, Emirats Àrabs Units, Eritrea, Eslovàquia, Eslovènia, Espanya, Estats Units d\'Amèrica, Estònia, Etiòpia, Fiji, Filipines, Finlàndia, França, Guyana Francesa, Gabó, Gàmbia, Geòrgia, Geòrgia del Sud, Ghana, Gibraltar, Grècia, Granada, Groenlàndia, Guadalupe, Guam, Guatemala, Guernsey, Guinea, Guinea Ecuatorial, Guinea-Bissau, Guyana, Haití, Hondures, Hong Kong, Hongria, Índia, Indonèsia, Iran, Iraq, Irlanda, Illa de Man, Islàndia, Israel, Itàlia, Jamaica, Japó, Jersei, Jordània, Kazakhstan, Kenya, Kiribati, Corea del Nord i Corea del Sud, Kuwait, Kirguizistan, Laos, Letònia, Lesotho, Líban, Libèria, Líbia, Liechtenstein, Lituània, Luxemburg, Macau, Macedònia, Madagascar, Malaïsia, Malawi, Maldives, Mali, Malta, Marroc, Martinica, Maurici, Mauritània, Mayotte, Mèxic, Micronèsia, Moldàvia, Mònaco, Mongòlia, Montenegro, Montserrat, Moçambic, Myanmar, Namíbia, Nauru, Nepal, Nicaragua, Níger, Nigèria, Noruega, Nova Caledònia, Nova Zelanda, Oman, Països Baixos, Pakistan, Palau, Panamà, Papua Nova Guinea, Paraguai, Perú, Polinèsia Francesa, Polònia, Portugal, Puerto Rico, Qatar, Regne Unit, República Txeca, República Dominicana, Romania, Rússia, Ruanda, Sàhara Occidental, Saint-Barthelemy, Santa Helena, Saint Kitts i Nevis, Samoa, San Martí, San Pere i Miqueló, Sant Vicenç i les Granadines, San Marino, Santa Lucia, Senegal, Sèrbia, Seychelles, Serra Lleona, Singapur, Síria, Somàlia, Sud-àfrica, Sudan, Sudan del Sur, Surinam, Sri Lanka, Suècia, Suïssa, Swazilàndia, Tailàndia, Taiwan, Tanzània, Tadjikistan, Territori Palestí, Timor Oriental, Togo, Tokelau, Tonga, Trinitat i Tobago, Tunis, Turkmenistan, Turquia, Tuvalu, Ucraïna, Uganda, Uruguai, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis i Futuna, Iemen, Zàmbia, Zimbabwe.↵
 	</string>
-	<string name="route_descr_destination">
-</string>
+	<string name="route_descr_destination">Destí</string>
    <string name="share_fav">Compartir</string>
 	<string name="share_fav_subject">Favorits compartits via OsmAnd</string>
 	<string name="use_points_as_intermediates">Calcula la ruta entre punts</string>
@ -1746,7 +1745,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
    <string name="none_selected_gpx">Cap arxiu GPX seleccionat. Per seleccionar-ne un premeu i mantingueu sobre una traça disponible.</string>
    <string name="local_index_unselect_gpx_file">Desselecciona</string>
    <string name="local_index_select_gpx_file">Selecciona per mostrar</string>
-    <string name="no_index_file_to_download">No s\'ha trobat res per baixar, verifiqueu la connexió a internet.</string>
+    <string name="no_index_file_to_download">No s\'ha trobat res per baixar, verifiqueu la connexió a Internet.</string>
    <string name="osmo_gpx_points_downloaded">S\'han baixat %1$s punts OsMo.</string>
    <string name="osmo_auto_connect_descr">Connecta automàticament amb el servei desprès d\'iniciar l\'aplicació</string>
    <string name="osmo_auto_connect">Connexió automàtica</string>
@ -1827,7 +1826,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
    <string name="flat_list_waypoitns">Totes</string>
    <string name="waypoints">Fites</string>
    <string name="targets">Destinacions</string>
-    <string name="way_alarms">Notificacions de tràfic</string>
+    <string name="way_alarms">Notificacions de trànsit</string>
    <string name="speak_favorites">Indica els preferits propers</string>
    <string name="speak_poi">Indica els PDI propers</string>
    <string name="index_tours">Itineraris</string>
@ -1907,7 +1906,13 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
    <string name="everything_up_to_date">Tot està actualitzat</string>
    <string name="dismiss">Descarta</string>
    <string name="no_internet_connection">No s\'ha pogut baixar. Connecteu la Wi-Fi per continuar.</string>
-    <string name="download_tab_downloads">Baixades</string>
+    <string name="download_tab_downloads">Totes les baixades</string>
    <string name="download_tab_updates">Actualitzacions</string>
    <string name="download_tab_local">Local</string>
+	<string name="map_locale">Llengua del mapa</string>
+    <string name="rendering_attr_transportStops_name">Parades del transport</string>
+    <string name="navigate_point_zone">Àrea</string>
+    <string name="navigate_point_northing">Ordenada</string>
+    <string name="navigate_point_easting">Abscissa</string>
+    <string name="voices">Paquets de veu</string>
 	</resources>
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@ -14,11 +14,11 @@
 	<string name="poi_bicycle_shop"/>
 	<string name="poi_anime_shop"/>
 	<string name="poi_antiques_shop">Starožitnosti</string>
-	<string name="poi_art_shop"/>
+	<string name="poi_art_shop">Obchod uměním</string>
 	<string name="poi_baby_goods">Dětské zboží</string>
 	<string name="poi_bag_shop"/>
-	<string name="poi_bathroom_furnishing_shop"/>
-	<string name="poi_bed_shop"/>
+	<string name="poi_bathroom_furnishing_shop">Vybavení koupelen</string>
+	<string name="poi_bed_shop">Vybavení ložnic</string>
 	<string name="poi_boutique">Módní butik</string>
 	<string name="poi_carpet_shop"/>
 	<string name="poi_chemist_shop">Drogerie</string>
@ -212,4 +212,22 @@
 	<string name="poi_newsagent_shop">Zpravodajská agentura</string>
 	<string name="poi_stationery_shop">Kancelářské potřeby</string>
 	<string name="poi_trade_shop">Obchodní místo</string>
+	<string name="poi_palaeontological_site">Paleontologické naleziště</string>
+
+	<string name="poi_ice_cream">Zmrzlinářství</string>
+	<string name="poi_gas_shop">Obchod tekutým palivem</string>
+	<string name="poi_organic_shop">Organické potraviny</string>
+	<string name="poi_second_hand">Second hand</string>
+	<string name="poi_department_store">Obchodní dům</string>
+	<string name="poi_fire_hose">Požární hadice</string>
+	<string name="poi_fire_water_pond">Požární nádrž</string>
+	<string name="poi_emergency_access_point">Záchranný přístupový bod</string>
+
+	<string name="poi_city_wall">Městská hradba</string>
+	<string name="poi_lift_gate">Zvedací brána</string>
+	<string name="poi_traffic_calming_bump">Retardér</string>
+	<string name="poi_traffic_calming_hump">Retardér</string>
+	<string name="poi_vehicle_inspection">Kontrola vozidel</string>
+	<string name="poi_parking_entrance">Vjezd parkoviště</string>
+	<string name="poi_tram_stop">Zastávka tramvaje (zastaralé)</string>
 	</resources>
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@ -625,7 +625,7 @@
  <string name="route_general_information">Celková vzdálenost %1$s, doba cesty %2$d h %3$d m.</string>
  <string name="router_service_descr">Vyberte navigační službu</string>
  <string name="router_service">Navigace</string>
-  <string name="sd_dir_not_accessible">Datový adresář pro uložení na SD kartě není dostupný</string>
+  <string name="sd_dir_not_accessible">Úložný datový adresář na SD kartě není dostupný!</string>
  <string name="download_question">Stáhnout {0} - {1} ?</string>
  <string name="download_question_exist">Index pro {0} už existuje ({1}). Chcete ho aktualizovat ({2}) ?</string>
  <string name="address">Adresa</string>
@ -1383,7 +1383,7 @@ s často kladenými otázkami.</string>
 	<string name="routing_attr_weight_description">Zadejte hmotnost vozidla, která musí být povolená na cestách</string>
    <string name="android_19_location_disabled">Od verze Androidu 4.4 (KitKat) není možné stahovat a aktualizovat mapy v předchozím úložišti (%s). Chcete ho změnit na vhodné nové úložiště a zkopírovat do něj všechny soubory?\n Poznámka 1: Původní soubory zůstanou nedotčeny a mohou být smazány ručně.
 \n Poznámka 2: V novém úložišti nebude možné sdílet soubory mezi OsmAnd a OsmAnd+.</string>
-    <string name="application_dir_change_warning2">Chcete aby OsmAnd také zkopíroval jeho datové soubory do nového cíle?</string>
+    <string name="application_dir_change_warning2">Chcete aby OsmAnd také zkopíroval své datové soubory do nového cíle? Vybráním \'Ne\' OsmAnd pouze vytvoří a použije nový adresář.</string>
    <string name="copying_osmand_one_file_descr">Kopírování souboru (%s) do nového umístění...</string>
    <string name="copying_osmand_files_descr">Kopírování datových souborů OsmAnd do nového umístění (%s)</string>
    <string name="copying_osmand_files">Kopírování datových souborů OsmAnd</string>
@ -1785,4 +1785,12 @@ s často kladenými otázkami.</string>
    <string name="use_opengl_render_descr">Použít hardwarově akcelerované renderování pomocí OpenGL (nemusí fungovat na všech zařízeních)</string>
    <string name="error_avoid_specific_road">Nebyla nalezena nejbližší silnice</string>
    <string name="no_internet_connection">Není možné stáhnout. Prosím připojte se na Wi-Fi, aby bylo možné pokračovat.</string>
+    <string name="map_locale">Jazyk map</string>
+    <string name="rendering_attr_transportStops_name">Dopravní zastávky</string>
+    <string name="navigate_point_zone">Zóna</string>
+    <string name="download_tab_downloads">Všechna stahování</string>
+    <string name="download_tab_updates">Aktualizace</string>
+    <string name="download_tab_local">Lokální</string>
+	<string name="navigate_point_northing">Souřadnice Y</string>
+    <string name="navigate_point_easting">Souřadnice X</string>
    </resources>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -1113,7 +1113,7 @@
 	<string name="route_general_information">Total afstand %1$s, rejsetid %2$d t %3$d m.</string>
 	<string name="router_service_descr">Vælg en online eller offline navigationstjeneste</string>
 	<string name="router_service">Navigationstjeneste</string>
-	<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet er ikke tilgængelig</string>
+	<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet er ikke tilgængelig!</string>
 	<string name="download_question_exist">Offline-data for {0} eksisterer allerede ({1}). Opdater ({2})?</string>
 	<string name="download_question">Hent {0} - {1}?</string>
 	<string name="address">Adresse</string>
@ -1409,7 +1409,7 @@
 \n * \'Turvisning \' kortformat, indeholder de mest detaljerede oplysninger for rejser og rejsebrug, herunder optimering for erhvervschauffører (veje der er lette at skelne og med højere kontrast), mulighed for Alpine vandring (SAC-skalaen), cykelruter, symbolsupport for vandreture mv.
 \n * \'Veje med høj kontrast\' viser veje med meget forstærkede farver til lyse omgivelser
 \n * \'Vinter og ski\' giver en visning af et (snedækket) vinterlandskab og viser globale skiløjper og lifter (hent \'World ski\' kortet) "</string>
-    <string name="route_descr_destination"> </string>
+    <string name="route_descr_destination">Destination</string>
    <string name="base_world_map">Verdensgrundkort</string>
 	
    
@ -1862,4 +1862,6 @@
 	<string name="navigate_point_zone">Zone</string>
    <string name="navigate_point_northing">Nordlig</string>
    <string name="navigate_point_easting">Østlig</string>
+    <string name="map_locale">Sprog på kort</string>
+    <string name="rendering_attr_transportStops_name">Stoppesteder</string>
    </resources>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -820,7 +820,7 @@
 	<string name="select_build_to_install">Auswählen eines OsmAnd-Builds für die Installation</string>
 	<string name="contribution_activity">Installations Version</string>
 	<string name="gps_status_app_not_found">Anwendung \'GPS Status\' ist nicht installiert. Soll diese installiert werden?</string>
-	<string name="voice_is_not_available_msg">Keine Sprachansage verfügbar. Bitte unter Einstellungen ein Sprachpaket auswählen oder herunterladen.</string>
+	<string name="voice_is_not_available_msg">Keine Sprachansage verfügbar. Bitte in den Navigations-Einstellungen ein Sprachansage-Paket auswählen oder herunterladen.</string>
 	<string name="voice_is_not_available_title">Keine Sprachansage ausgewählt</string>
 	<string name="daynight_mode_day">Tag</string>
 	<string name="daynight_mode_night">Nacht</string>
@ -863,7 +863,8 @@
 	<string name="transport_search_none">kein</string>
 	<string name="transport_search_again">ÖPNV-Suche zurücksetzen</string>
 	<string name="map_index">Karte</string>
-	<string name="voice">Ansagen</string>
+	<string name="voices">Sprachansagen</string>
+	<string name="voice">Sprachansage</string>
 	<string name="no_vector_map_loaded">Offline-Daten wurden nicht geladen</string>
 	<string name="map_route_by_gpx">Navigation mittels GPX</string>
 	<string name="layer_gpx_layer">GPX-Track…</string>
@ -1368,7 +1369,7 @@
 	<string name="recording_can_not_be_played">Aufnahme kann nicht abgespielt werden</string>
 	<string name="recording_context_menu_delete">Aufnahme löschen</string>

-	<string name="layer_recordings">Aufnahme-Ebene</string>
+	<string name="layer_recordings">Audio/Video-Notizen</string>
 	<string name="map_widget_av_notes">Audio/Video-Notiz</string>
 	<string name="osmand_srtm_short_description_80_chars">OsmAnd-Plugin für Offline-Höhenlinien</string>
 	<string name="map_widget_distancemeasurement">Entfernungsmessung</string>
@ -1969,7 +1970,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
    <string name="targets">Ziele</string>
    <string name="way_alarms">Verkehrswarnungen</string>
    <string name="record_plugin_description">Speichern Sie Ihre Tracks mit einem Klick. Zeigt die Einstellung, wie Strecken aufgezeichnet werden – in lokale GPX-Dateien oder online via Web-Service.</string>
-    <string name="route_descr_destination"/>
+    <string name="route_descr_destination">Ziel</string>
    <string name="local_index_description">Ein Element antippen, um mehr Details zu erfahren oder antippen und halten zum Deaktivieren oder Löschen. Aktuell auf dem Gerät vorhandene Daten (%1$s frei):</string>
 	<string name="text_size_descr">Karten-Schriftgröße festlegen</string>
    <string name="text_size">Schriftgröße</string>
@ -1984,9 +1985,9 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
    <string name="anonymous_user">Anonymer Benutzer</string>
    <string name="logged_as">Angemeldet als %1$s</string>
 	<string name="anonymous_user_hint">Anonyme Benutzer können nicht:\n- Gruppen bilden;\n- Gruppen und Geräte mit dem Server synchronisieren;\n- Gruppen und Geräte im Privatbereich verwalten.</string>
-    <string name="rendering_category_routes">Routen</string>
+    <string name="rendering_category_routes">ÖPNV Linien</string>
    <string name="rendering_category_details">Details</string>
-    <string name="rendering_category_transport">Routen und ÖPNV</string>
+    <string name="rendering_category_transport">ÖPNV Linien</string>
    <string name="map_widget_appearance_rem">Verbleibende Elemente</string>
    <string name="map_widget_top">Statuszeile</string>
 	<string name="map_widget_right">Rechtes Panel</string>
@ -2004,13 +2005,13 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
    <string name="impassable_road">Straße blockieren…</string>
    <string name="rendering_attr_tramTrainRoutes_name">Straßen- und Eisenbahnlinien</string>
    <string name="rendering_attr_trainLightrailRoutes_name">Eisenbahn-Strecken</string>
-    <string name="rendering_attr_shareTaxiRoutes_name">Sammeltaxi-Routen</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">Sammeltaxi-Linien</string>
    <string name="rendering_attr_trolleybusRoutes_name">Oberleitungsbuslinien</string>
    <string name="rendering_attr_busRoutes_name">Buslinien</string>
    <string name="rendering_category_hide">Ausblenden</string>
    <string name="lock_screen_request_explanation">%1$s benötigt diese Berechtigung, um den Bildschirm auszuschalten (Energiesparfunktion).</string>
    <string name="advanced_settings">Erweitert</string>
-    <string name="home_button">Start</string>
+    <string name="home_button">Startbildschirm</string>
    <string name="osmo_use_https_descr">Sichere Server-Verbindung verwenden</string>
    <string name="osmo_use_https">Https nutzen</string>
    <string name="map_update">Karten</string>
@ -2024,9 +2025,14 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
    <string name="use_opengl_render">OpenGL-Renderung verwenden</string>
    <string name="use_opengl_render_descr">Hardware beschleunigte OpenGL-Renderung verwenden (Funktioniert nicht auf allen Geräten)</string>
    <string name="no_internet_connection">Herunterladen nicht möglich. Zum Fortsetzen mit WLAN verbinden!</string>
-    <string name="download_tab_downloads">Heruntergeladen</string>
+    <string name="download_tab_downloads">Alle&#160;Downloads</string>
    <string name="download_tab_updates">Aktualisierungen</string>
    <string name="download_tab_local">Lokal</string>
    <string name="wake_on_voice">Bildschirm aktivieren</string>
    <string name="wake_on_voice_descr">Bei Annäherung einer Richtungsänderung den Bildschirm einschalten</string>
+    <string name="map_locale">Beschriftungssprache</string>
+    <string name="rendering_attr_transportStops_name">ÖPNV Haltestellen</string>
+    <string name="navigate_point_zone">Zone</string>
+    <string name="navigate_point_northing">Nordwert</string>
+    <string name="navigate_point_easting">Ostwert</string>
    </resources>
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -320,7 +320,7 @@
  <string name="foot">ft</string>
  <string name="mile_per_hour">mph</string>
  <string name="mile">mi</string>
-  <string name="send_location_way_choose_title">Partager un point en utilisant</string>
+  <string name="send_location_way_choose_title">Partager ce point en utilisant</string>
  <string name="send_location_sms_pattern">Position : %1$s\n%2$s</string>
  <string name="send_location_email_pattern">Pour voir ce point, ouvrez le lien web %1$s ou Android %2$s</string>
  <string name="send_location">Envoyer le point</string>
@ -568,7 +568,7 @@
  <string name="route_general_information">Distance totale : %1$s, durée estimée : %2$d h %3$d m.</string>
  <string name="router_service_descr">Sélectionner un service de navigation, hors-ligne ou en ligne</string>
  <string name="router_service">Service de navigation</string>
-  <string name="sd_dir_not_accessible">Le dossier données de la carte SD est inaccessible</string>
+  <string name="sd_dir_not_accessible">Le dossier contenant les données sur la carte SD est inaccessible !</string>
  <string name="download_question">Voulez-vous télécharger {0} - {1} ?</string>
  <string name="download_question_exist">les données pour {0} existent déjà ({1}). Voulez-vous les mettre à jour ({2}) ?</string>
  <string name="address">Adresse</string>
@ -1872,10 +1872,12 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
    <string name="everything_up_to_date">Vous disposez de la dernière version</string>
    <string name="dismiss">Ignorer</string>
    <string name="no_internet_connection">Téléchargement impossible. Merci de vous connecter en Wifi.</string>
-    <string name="download_tab_downloads">Téléchargements</string>
+    <string name="download_tab_downloads">Tous les téléchargements</string>
    <string name="download_tab_updates">Mises à jour</string>
    <string name="navigate_point_zone">Zone</string>
    <string name="navigate_point_easting">Abscisse</string>
    <string name="navigate_point_northing">Ordonnée</string>
    <string name="download_tab_local">Local</string>
-	</resources>
+	<string name="map_locale">Langue pour la carte</string>
+    <string name="rendering_attr_transportStops_name">Arrêts de transports en commun</string>
+    </resources>
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@ -199,7 +199,7 @@
 	<string name="poi_baby_hatch">Culla per la vita</string>
 	<string name="poi_veterinary">Veterinario</string>
 	<string name="poi_healthcare_alternative">Medicina alternativa</string>
-	<string name="poi_audiologist"/>
+	<string name="poi_audiologist">Audiologo</string>
 	<string name="poi_blood_bank">Banca del sangue</string>
 	<string name="poi_healthcare_centre">Centro medico</string>
 	<string name="poi_midwife">Levatrice</string>
@ -506,4 +506,12 @@
 	<string name="poi_stream">Ruscello</string>
 	<string name="poi_islet">Isoletta</string>

+	<string name="poi_observatory">Osservatorio</string>
+	<string name="poi_astronomical_observatory">Osservatorio astronomico</string>
+	<string name="poi_place_farm">Fattoria</string>
+
+	<string name="poi_occupational_therapist">Terapista occupazionale</string>
+	<string name="poi_telecommunication_office">Ufficio telecomunicazioni</string>
+	<string name="poi_american_football">Football americano</string>
+	<string name="poi_bmx_sport">BMX</string>
 	</resources>
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@ -562,7 +562,7 @@
  <string name="route_general_information">Distanza totale = %1$s, durata del viaggio = %2$d h %3$d m.</string>
  <string name="router_service_descr">Scegli un servizio online oppure offline di navigazione</string>
  <string name="router_service">Servizio di navigazione</string>
-  <string name="sd_dir_not_accessible">La cartella di salvataggio su SD card non è accessibile</string>
+  <string name="sd_dir_not_accessible">La cartella di salvataggio sulla SD card non è accessibile!</string>
  <string name="download_question">Scaricare {0} - {1} ?</string>
  <string name="download_question_exist">I dati offline per {0} sono già presenti ({1}). Aggiornarli ({2}) ?</string>
  <string name="address">Indirizzo</string>
@ -1638,7 +1638,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
    <string name="android_19_location_disabled">Dalla versione KitKat non è più possibile scaricare e aggiornare le mappe nel precedente indirizzo di memorizzazione (%s). Vuoi sostituirlo con quello consentito e copiare lì tutti i file?
 \n Nota: i file precedenti non verranno modificati.
 \n Nota: non sarà possibile condividere i files fra OsmAnd and OsmAnd+.</string>
-    <string name="application_dir_change_warning2">Volete che OsmAnd sposti anche i propri dati nella nuova destinazione?</string>
+    <string name="application_dir_change_warning2">Vuoi che OsmAnd sposti anche i propri dati nella nuova destinazione? Scegli \'No\' perché OsmAnd crei e utilizzi una nuova cartella.</string>
    <string name="copying_osmand_one_file_descr">Copia in corso del file (%s) nella nuova destinazione...</string>
    <string name="copying_osmand_files_descr">Copia in corso dei file OsmAnd nella nuova destinazione (%s)</string>
    <string name="copying_osmand_files">Copia dei file di dati di OsmAnd</string>
@ -2037,7 +2037,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
    <string name="use_opengl_render">Utilizzare il rendering opengl</string>
    <string name="use_opengl_render_descr">Utilizzare il rendering opengl accelerato via hardware (potrebbe non funzionare in alcuni dispositivi)</string>
    <string name="everything_up_to_date">Tutto aggiornato</string>
-    <string name="dismiss">Abbandona</string>
+    <string name="dismiss">Tralascia</string>
    <string name="no_internet_connection">Non è possibile scaricare. Prego, connettersi al Wi-Fi per procedere.</string>
    <string name="download_tab_downloads">Download</string>
    <string name="download_tab_updates">Aggiornabili</string>
@ -2045,4 +2045,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="navigate_point_zone">Zona</string>
    <string name="navigate_point_northing">In direzione Nord</string>
    <string name="navigate_point_easting">In direzione Est</string>
+    <string name="map_locale">Lingua della mappa</string>
+    <string name="rendering_attr_transportStops_name">Fermate mezzi pubblici</string>
    </resources>
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@ -689,7 +689,7 @@
 	<string name="route_general_information">전체거리 %1$s, 여행시간 %2$d h %3$d m.</string>
 	<string name="router_service_descr">온라인 또는 오프라인 라우팅 서비스를 선택합니다</string>
 	<string name="router_service">라우터 선택</string>
-	<string name="sd_dir_not_accessible">데이터 저정 폴더인 SD 카드에 접근할 수 없습니다</string>
+	<string name="sd_dir_not_accessible">SD 카드에 있는 데이터 저장 폴더에 접근할 수 없습니다!</string>
 	<string name="download_question">{0} - {1} 을 다운로드할까요?</string>
 	<string name="download_question_exist">{0} 에 대한 오프라인 데이터가 이미 존재합니다({1}). 업데이트할까요({2}) ?</string>
 	<string name="address">주소</string>
@ -1926,7 +1926,7 @@
    <string name="sort_by_distance">거리로 정렬</string>
    <string name="sort_by_name">이름으로 정렬</string>
    <string name="visible_element">지도에서 보기</string>
-    <string name="route_descr_destination">\t</string>
+    <string name="route_descr_destination">목적지</string>
    <string name="no_index_file_to_download">아무것도 다운로드 되지 않았다면, 인터넷 연결을 확인 하십시오.</string>
    <string name="osmo_auth_error_short">인증 실패</string>
    <string name="osmo_auth_error">OsMo 인증 오류가 발생 했습니다: %1$s.\n임시로 서비스가 다운되었거나 또는 등록 만료가 되었습니다.\n신규 등록을 진행 하시겠습니까?</string>
@ -2098,7 +2098,9 @@
    <string name="navigate_point_zone">존(지역)</string>
    <string name="navigate_point_northing">북향</string>
    <string name="navigate_point_easting">동향</string>
-    <string name="download_tab_downloads">다운로드</string>
+    <string name="download_tab_downloads">모두 다운로드</string>
    <string name="download_tab_updates">업데이트</string>
    <string name="download_tab_local">로컬</string>
-	</resources>
+	<string name="map_locale">지도 언어</string>
+    <string name="rendering_attr_transportStops_name">대중교통 정류소</string>
+    </resources>
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@ -760,7 +760,7 @@
  <string name="route_general_information">Visas atstumas %1$s, kelionės trukmė %2$d h %3$d m.</string>
  <string name="router_service_descr">Pasirinkti navigacijos paslaugą internete arba įrenginyje</string>
  <string name="router_service">Navigacijos paslauga</string>
-  <string name="sd_dir_not_accessible">Duomenų išsaugojimo segtuvas SD kortelėje nepasiekiamas</string>
+  <string name="sd_dir_not_accessible">Duomenų išsaugojimo segtuvas SD kortelėje nepasiekiamas!</string>
  <string name="download_question">Parsiųsti {0} - {1} ?</string>
  <string name="download_question_exist">Parsiųsti duomenys {0} jau egzistuoja ({1}). Ar norite juos atnaujinti ({2}) ?</string>
  <string name="address">Adresas</string>
@ -1471,7 +1471,7 @@
    <string name="android_19_location_disabled">Pradedant Android 4.4 versija jūs nebegalėsite parsisųsti ir atnaujinti žemėlapių ankstesnėse saugojimo vietose (%s). Ar norite pakeisti saugyklos vietą ir į ją nukopijuoti visus failus?
 \n Pastaba: Seni failai išliks kur buvę (galima bus ištrinti rankiniu būdu).
 \n Pastaba: dalintis tais pačiais failais tarp OsmAnd ir OsmAnd+ nebus galima.</string>
-    <string name="application_dir_change_warning2">Ar norite, kad OsmAnd perkeltų duomenis ir į naują saugyklą?</string>
+    <string name="application_dir_change_warning2">Ar norite, kad OsmAnd perkeltų duomenis ir į naują saugyklą? Pasirinkite \"Ne\", jei norite, kad OsmAnd tik sukurtų ir naudotų naują folderį.</string>
    <string name="copying_osmand_one_file_descr">Kopijuojami failai (%/s) į naują saugojimo vietą...</string>
    <string name="copying_osmand_files_descr">OsmAnd failai kopijuojami į naują vietą (%/s)</string>
    <string name="copying_osmand_files">Kopijuojami OsmAnd failai</string>
@ -1855,4 +1855,12 @@
    <string name="use_opengl_render_descr">Naudoti aparatinį OpenGL vaizdavimą (gali neveikti kai kurioje įrangoje)</string>
    <string name="everything_up_to_date">Viskas atnaujinta</string>
    <string name="no_internet_connection">Parsisiųsti nepavyko. Prašome prisijungti prie Wi-Fi, jei norite tęsti.</string>
-    </resources>
+    <string name="map_locale">Žemėlapio kalba</string>
+    <string name="rendering_attr_transportStops_name">Transporto stotelės</string>
+    <string name="navigate_point_zone">Zona</string>
+    <string name="download_tab_downloads">Atsisiuntimai</string>
+    <string name="download_tab_updates">Atnaujinimai</string>
+    <string name="navigate_point_northing">Šiaurė</string>
+    <string name="navigate_point_easting">Rytai</string>
+    <string name="download_tab_local">Vietinis</string>
+	</resources>
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@ -500,7 +500,7 @@
 	<string name="route_general_information">Total distanse %1$s, reisetid %2$d t %3$d m.</string>
 	<string name="router_service_descr">Velg en nettbasert eller offline navigeringstjeneste</string>
 	<string name="router_service">Navigeringstjeneste</string>
-	<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet er ikke tilgjengelig</string>
+	<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet er ikke tilgjengelig!</string>
 	<string name="download_question">Laste ned {0} - {1} ?</string>
 	<string name="download_question_exist">Offline-data for {0} finnes allerede ({1}). Vil du oppdatere ({2}) ?</string>
 	<string name="address">Adresse</string>
@ -1067,18 +1067,22 @@
 	<string name="download_files">Last ned</string>
 	<string name="osmo_use_https_descr">Bruk sikker forbindelse med server</string>
    <string name="osmo_use_https">Bruk HTTPS</string>
-	<string name="application_dir_change_warning2">Skal OsmAnd også kopiere datafilene til det nye stedet?</string>
+	<string name="application_dir_change_warning2">Skal OsmAnd også kopiere datafilene til det nye stedet? Velg \'Nei\' for at OsmAnd kun skal opprette og bruke den nye mappen.</string>
    <string name="error_avoid_specific_road">Nærmeste vei ble ikke funnet</string>
    <string name="home_button">Hjem</string>
    <string name="map_update">Kart</string>
 	<string name="search_for">Søk etter</string>
 	<string name="show_map">VIS KART</string>
 	<string name="coordinates">Koordinater</string>
-	<string name="download_tab_downloads">Nedlastinger</string>
+	<string name="download_tab_downloads">Alle nedlastinger</string>
    <string name="download_tab_updates">Oppdateringer</string>
    <string name="no_internet_connection">Ikke mulig å laste ned. Koble til Wi-Fi for å fortsette.</string>
    <string name="dismiss">Avvis</string>
    <string name="everything_up_to_date">Alt er oppdatert</string>
    <string name="use_opengl_render">Bruk OpenGL-opptegning</string>
    <string name="use_opengl_render_descr">Bruk maskinvareakselerert OpenGL-opptegning (virker kanskje ikke på enkelte enheter)</string>
-    </resources>
+    <string name="map_locale">Språk på kart</string>
+    <string name="rendering_attr_transportStops_name">Stoppesteder</string>
+    <string name="navigate_point_zone">Sone</string>
+    <string name="download_tab_local">Lokal</string>
+	</resources>
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@ -521,7 +521,7 @@
  <string name="voice">Stem</string>
  <string name="no_vector_map_loaded">Geen vectorkaarten geladen</string>
  <string name="map_route_by_gpx">Navigeer met GPX-bestand</string>
-  <string name="gpx_files_not_found">Geen GPX-bestanden gevonden in de /tracks-map</string>
+  <string name="gpx_files_not_found">Geen GPX-bestanden gevonden in de tracks-map</string>
  <string name="layer_gpx_layer">GPX-track…</string>
  <string name="error_reading_gpx">Fout bij het lezen van GPX-gegevens</string>
  <string name="vector_data">Offline vectorkaarten</string>
@ -657,7 +657,7 @@
  <string name="route_general_information">Totale afstand %1$s, reistijd %2$d u %3$d m.</string>
  <string name="router_service_descr">Kies een online of offline routeberekening</string>
  <string name="router_service">Routeberekening</string>
-  <string name="sd_dir_not_accessible">Opslagmap op SD kaart niet toegankelijk</string>
+  <string name="sd_dir_not_accessible">Opslagmap op SD kaart is niet toegankelijk</string>
  <string name="download_question">Download {0} - {1} ?</string>
  <string name="download_question_exist">Offline gegevens voor {0} bestaan al ({1}). Wil je deze bijwerken ({2})?</string>
  <string name="address">Adres</string>
@ -1611,7 +1611,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
    <string name="routing_preferences_descr">Routeberekening-voorkeuren</string>
    <string name="app_mode_truck">Vrachtauto</string>
    <string name="android_19_location_disabled">Vanaf Android 4.4 (KitKat) kunnen kaarten niet meer worden opgeslagen in de bestaande map(%s). Wil je een nieuwe map maken op de toegestane locatie en de OsmAnd-bestanden daar naartoe kopiëren?\n Let op: oude bestanden blijven bestaan. U kunt ze zelf verwijderen.\n Let op: het is niet meer mogelijk bestanden te delen tussen OsmAnd en Osmand+.</string>
-    <string name="application_dir_change_warning2">OsmAnd kan proberen de bestanden naar de nieuwe bestemming te verplaatsen. Wil je dat?</string>
+    <string name="application_dir_change_warning2">Wil je dat OsmAnd de bestanden naar de nieuwe map verplaatst? Als je \'Nee\' kiest maakt Osmand een lege map om te gebruiken.</string>
    <string name="copying_osmand_one_file_descr">Bestand (%s) wordt gekopieerd naar de nieuwe locatie...</string>
    <string name="copying_osmand_files_descr">OsmAnd-bestanden worden naar de nieuwe locatie gekopieerd (%s)</string>
    <string name="copying_osmand_files">Kopieer OsmAnd-bestanden</string>
@ -2024,4 +2024,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="navigate_point_easting">Oostwaarde</string>
    <string name="navigate_point_northing">Noordwaarde</string>
    <string name="navigate_point_zone">Zone</string>
-    </resources>
+    <string name="map_locale">Taal van de kaart</string>
+    <string name="rendering_attr_transportStops_name">OV-haltes</string>
+    <string name="voices">Gesproken aanwijzingen</string>
+	</resources>
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@ -678,7 +678,7 @@
  <string name="route_general_information">Общая протяженность = %1$s, время в пути = %2$d ч. %3$d мин.</string>
  <string name="router_service_descr">Выберите онлайн или оффлайн сервис для прокладки маршрута</string>
  <string name="router_service">Прокладка маршрута</string>
-  <string name="sd_dir_not_accessible">Директория хранения данных на SD-карте не доступна</string>
+  <string name="sd_dir_not_accessible">Директория хранения данных на SD-карте не доступна!</string>
  <string name="download_question">Вы хотите загрузить {0} - {1} ?</string>
  <string name="download_question_exist">Локальная карта для {0} уже существует ({1}). Хотите её обновить ({2}) ?</string>
  <string name="address">Адрес</string>
@ -1427,7 +1427,7 @@
 	<string name="android_19_location_disabled">Начиная с версии Android 4.4 (KitKat) Вы не можете скачивать и обновлять карту в прежнее хранилище (%s). Вы хотите изменить расположение на допустимое и скопировать все файлы OsmAnd туда?
 \n Примечание 1: Ваши старые файлы останутся нетронутыми (но могут быть удалены вручную).
 \n Примечание 2: При переносе файлов в новое хранилище совместное использование файлов OsmAnd и OsmAnd+ не возможно.</string>
-    <string name="application_dir_change_warning2">OsmAnd пытается перенести данные на новое место. Вы хотите этого?</string>
+    <string name="application_dir_change_warning2">Хотите ли Вы, чтобы OsmAnd скопировал файлы данных на новое место? Выберите \"Нет\", чтобы OsmAnd только создал и использовал новую директорию.</string>
    <string name="copying_osmand_one_file_descr">Копирование файла (%s) на новое место…</string>
    <string name="copying_osmand_files_descr">Копирование файлов данных OsmAnd на новое место (%s)</string>
    <string name="tip_recent_changes_1_6_t">Изменения в 1.6:
@ -1824,10 +1824,12 @@
    <string name="use_opengl_render">Использовать OpenGL для рендеринга</string>
    <string name="use_opengl_render_descr">Использовать аппаратное ускорение OpenGL для рендеринга (может не работать на некоторых устройствах)</string>
    <string name="show_map">ПОКАЗАТЬ КАРТУ</string>
-	<string name="show_all">ПОКАЗАТЬ ВСЁ</string>
+	<string name="show_all">ПОКАЗАТЬ ВСЕ</string>
 	<string name="no_internet_connection">Загрузка невозможна. Подключите Wi-Fi для продолжения.</string>
    <string name="download_tab_downloads">Загрузки</string>
    <string name="download_tab_updates">Обновления</string>
    <string name="download_tab_local">Локальные</string>
 	<string name="navigate_point_zone">Зона</string>
+    <string name="rendering_attr_transportStops_name">Остановки транспорта</string>
+    <string name="dismiss">Не отправлять</string>
    </resources>
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@ -525,4 +525,49 @@
 	<string name="poi_toilets">Bagnu</string>
 	<string name="poi_currencyexchange">Cambiadore de valutas</string>
 	<string name="poi_accountant">Istùdiu contàbile</string>
+	<string name="poi_cape">Ispuntone/promontòriu</string>
+	<string name="poi_reef">Costera</string>
+	<string name="poi_seamark_anchorage">Ancoràggiu</string>
+	<string name="poi_seamark_beacon">Faru/fogu de sinnalatzione</string>
+	<string name="poi_seamark_berth">Atracu</string>
+	<string name="poi_seamark_dyke">Àrgine</string>
+	<string name="poi_seamark_floating_dock">Pontinu gallegiante</string>
+	<string name="poi_seamark_fog_signal">Nautòfonu</string>
+	<string name="poi_seamark_harbour">Portu</string>
+	<string name="poi_seamark_landmark">Puntu de riferimentu</string>
+	<string name="poi_seamark_mooring">Ormègiu</string>
+	<string name="poi_seamark_pile">Palu de ancoràgiu</string>
+	<string name="poi_seamark_wreck">Relitu</string>
+
+	<string name="poi_nursing_home">Domo de cura</string>
+	<string name="poi_fire_flapper">Pala catzafogu</string>
+	<string name="poi_fire_hose">Manicotu anti-incèndiu</string>
+	<string name="poi_fire_water_pond">Lagu de abba anti-incèndiu</string>
+	<string name="poi_border_control">Puntu de controllu</string>
+	<string name="poi_traffic_calming_cushion">Cabitzales rallentadores</string>
+	<string name="poi_traffic_calming_rumble_strip">Istrìscias rallentadoras</string>
+	<string name="poi_traffic_calming_table">Dossu a mesa</string>
+	<string name="poi_traffic_calming_choker">Restringhimentu de carrutzada rallentadore</string>
+	<string name="poi_car_wash">Autosabunadore</string>
+	<string name="poi_fuel">Rifornidore de carburante</string>
+	<string name="poi_skiing">Iscì</string>
+	<string name="poi_wreck">Relitu navale</string>
+	<string name="poi_alpine_hut">Refùgiu alpinu</string>
+	<string name="poi_shelter">Cuadorju</string>
+	<string name="poi_metal_construction_craft">Costrutziones metàllicas</string>
+	<string name="poi_parquet_layer">Assentadore de parquet</string>
+	<string name="poi_tiler">Assentadore de regiolas</string>
+	<string name="poi_seamark_radio_station">Istatzione ràdio (in mare)</string>
+	<string name="poi_seamark_light">Lughe (in mare)</string>
+	<string name="poi_seamark_light_major">Lughe manna (in mare)</string>
+	<string name="poi_seamark_light_minor">Lughe minore (in mare)</string>
+	<string name="poi_seamark_light_float">Lughe gallegiante (in mare)</string>
+	<string name="poi_seamark_light_vessel">Lughe de nave ancorada</string>
+	<string name="poi_seamark_notice">Cartellu de informatziones (in mare)</string>
+	<string name="poi_seamark_signal_station_traffic">Istatzione de sinnalatzione, tràficu (in mare)</string>
+	<string name="poi_seamark_signal_station_warning">Istatzione de sinnalatzione, avertimentu de perìgulu (in mare)</string>
+	<string name="poi_seamark_small_craft_facility">Servìtzios pro barcas minores</string>
+	<string name="poi_seamark_topmark">Miràgliu</string>
+	<string name="poi_motor_sport">Isport a motore</string>
+	<string name="poi_carpet_layer">Assentadore de moquette</string>
 	</resources>
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@ -683,7 +683,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
    <string name="osmo_mode_restart">Reavia sa sessione OsMo</string>
    <string name="osmo_settings_debug">Informatziones de debug</string>
    <string name="lang_fa">Persianu</string>
-	<string name="route_descr_destination">\t</string>
+	<string name="route_descr_destination">Destinatzione</string>
    <string name="osmo_not_signed_in">Atzessu ad OsMo falliu</string>
    <string name="osmo_auto_connect_descr">Connèttidi automaticamente a su servìtziu a pustis de s\'allughinzu</string>
    <string name="osmo_auto_connect">Connessione automàtica</string>
@ -1482,7 +1482,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="route_general_information">Distàntzia totale %1$s, durada de su biàgiu %2$d h %3$d m.</string>
 	<string name="router_service_descr">Issèbera unu servìtziu in lìnia o sena lìnia de nàvigu</string>
 	<string name="router_service">Servìtziu de nàvigu</string>
-	<string name="sd_dir_not_accessible">Sa cartella de sarbamentu in s\'ischeda SD no est atzessiva</string>
+	<string name="sd_dir_not_accessible">Sa cartella de sarbamentu in s\'ischeda SD no est atzessiva!</string>
 	<string name="download_question">Iscarrigare {0} - {1} ?</string>
 	<string name="download_question_exist">Sos datos non in lìnia pro {0} esistint giai ({1}). Los boles agiornare ({2}) ?</string>
 	<string name="address">Indiritzu</string>
@ -1799,4 +1799,6 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="navigate_point_zone">Zona</string>
    <string name="navigate_point_northing">In diretzione Nord</string>
    <string name="navigate_point_easting">In diretzione Est</string>
+    <string name="rendering_attr_transportStops_name">Firmadas traspòrtu pùblicu</string>
+    <string name="map_locale">Limba de sa mapa</string>
    </resources>
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@ -251,8 +251,8 @@
  <string name="index_name_oceania">Oceánia</string>
  <string name="index_name_other">Celosvetové a tematické mapy</string>
  <string name="index_name_wiki">Celosvetové body z Wikipedie</string>
-  <string name="index_name_voice">Hlasové balíky (nahrávky, obmedzená funkcionalita)</string>
-  <string name="index_name_tts_voice">Hlasové balíky (TTS-generované, odporúčané)</string>
+  <string name="index_name_voice">Hlasové povely (nahrávky, obmedzená funkcionalita)</string>
+  <string name="index_name_tts_voice">Hlasové povely (TTS-generované, odporúčané)</string>
  <string name="amenity_type_osmwiki">Wikipedia (offline)</string>
  <string name="amenity_type_user_defined">Užívateľský</string>
  <string name="fav_export_confirmation">Súbor s predošle exportovanými obľúbenými bodmi už existuje. Chcete ho nahradiť?</string>
@ -567,7 +567,7 @@
  <string name="select_build_to_install">Vyberte jednu zo zostáv OsmAndu na nainštalovanie</string>
  <string name="contribution_activity">Špeciálna aktivita pre kontribútorskú verziu</string>
  <string name="gps_status_app_not_found">Aplikácia pre stav GPS nie je nainštalovaná. Nájsť ju na Markete?</string>
-  <string name="voice_is_not_available_msg">Hlasové navigovanie nie je dostupné. Prosím, choďte do nastavení a zvoľte alebo stiahnite preferované hlasové údaje.</string>
+  <string name="voice_is_not_available_msg">Hlasové navigovanie nie je dostupné, prosím choďte do nastavení a zvoľte alebo stiahnite balík hlasových povelov.</string>
  <string name="voice_is_not_available_title">Hlasové údaje nie sú určené</string>
  <string name="daynight_mode_day">Denný režim</string>
  <string name="daynight_mode_night">Nočný režim</string>
@ -616,7 +616,7 @@
  <string name="transport_search_none">nič</string>
  <string name="transport_search_again">Hľadať znova prepravu</string>
  <string name="map_index">Mapa</string>
-  <string name="voice">Hlasové údaje</string>
+  <string name="voice">Nahrávka hlasu</string>
  <string name="no_vector_map_loaded">Vektorové mapy neboli načítané</string>
  <string name="map_route_by_gpx">Cestovať použitím GPX</string>
  <string name="gpx_files_not_found">Žiadne GPX súbory neboli nájdené v priečinku stôp</string>
@ -757,7 +757,7 @@
  <string name="route_general_information">Celková vzdialenosť %1$s, čas cestovania %2$d h %3$d m.</string>
  <string name="router_service_descr">Výber online alebo offline navigačnej služby</string>
  <string name="router_service">Navigačná služba</string>
-  <string name="sd_dir_not_accessible">Priečinok pre uloženie na SD karte nie je prístupný</string>
+  <string name="sd_dir_not_accessible">Priečinok pre uloženie na SD karte nie je prístupný!</string>
  <string name="download_question">Stiahnuť {0} - {1} ?</string>
  <string name="download_question_exist">Offline údaje pre {0} už existujú ({1}). Chcete ich aktualizovať ({2}) ?</string>
  <string name="address">Adresa</string>
@ -1843,7 +1843,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
    <string name="none_selected_gpx">Žiadny súbor GPX nebol vybraný. Podržaním vyberte z dostupných stôp.</string>
    <string name="local_index_unselect_gpx_file">Odznačiť</string>
    <string name="local_index_select_gpx_file">Vybrať na zobrazenie</string>
-    <string name="route_descr_destination">\t</string>
+    <string name="route_descr_destination">Cieľ</string>
    <string name="no_index_file_to_download">Nenašlo sa nič na stiahnutie, prosím skontrolujte pripojenie na Internet.</string>
    <string name="osmo_gpx_points_downloaded">OsMo body %1$s stiahnuté.</string>
    <string name="osmo_auto_connect_descr">Automaticky pripojiť k zariadeniu po spustení aplikácie</string>
@ -2004,7 +2004,12 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
    <string name="use_opengl_render_descr">Použiť hardvérovo urýchľované vykresľovanie pomocou OpenGL (nemusí na niektorých zariadeniach fungovať)</string>
    <string name="no_internet_connection">Nie je možné stiahnuť. Prosím pripojte sa na Wi-Fi, aby bolo možné pokračovať.</string>
    <string name="navigate_point_zone">Zóna</string>
-    <string name="download_tab_downloads">Sťahovania</string>
+    <string name="download_tab_downloads">Všetky sťahovania</string>
    <string name="download_tab_updates">Aktualizácie</string>
    <string name="download_tab_local">Lokálne</string>
-	</resources>
+	<string name="map_locale">Jazyk mapy</string>
+    <string name="rendering_attr_transportStops_name">Zastávky verejnej dopravy</string>
+    <string name="voices">Hlasové povely</string>
+	<string name="navigate_point_northing">Vertikálna súradnica</string>
+    <string name="navigate_point_easting">Horizontálna súradnica</string>
+    </resources>
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@ -1442,7 +1442,7 @@
    <string name="guidance_preferences_descr">導航偏好</string>
    <string name="routing_preferences_descr">路線偏好</string>
    <string name="app_mode_truck">卡車</string>
-    <string name="application_dir_change_warning2">您想要將 OsmAnd 資料複製到新的目的地嗎？</string>
+    <string name="application_dir_change_warning2">您想要將 OsmAnd 資料複製到新的目的地嗎？選擇否，OsmAnd 只建立和使用新的資料夾。</string>
    <string name="copying_osmand_one_file_descr">複製檔案 (%s) 到新的目的地...</string>
    <string name="copying_osmand_files_descr">複製 OsmAnd 資料檔到新的目的地 (%s)</string>
    <string name="copying_osmand_files">複製 OsmAnd 資料檔案</string>
@ -1850,4 +1850,6 @@
 	<string name="navigate_point_northing">北距</string>
    <string name="navigate_point_easting">東距</string>
    <string name="navigate_point_zone">地區</string>
+    <string name="map_locale">地圖上的語言</string>
+    <string name="rendering_attr_transportStops_name">候車亭</string>
    </resources>
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@ -15,7 +15,7 @@
    <string name="navigate_point_zone">Zone</string>
    <string name="navigate_point_northing">Northing</string>
    <string name="navigate_point_easting">Easting</string>
-    <string name="download_tab_downloads">Downloads</string>
+    <string name="download_tab_downloads">All&#160;Downloads</string>
    <string name="download_tab_updates">Updates</string>
    <string name="download_tab_local">Local</string>
 	<string name="no_internet_connection">Not possible to download. Please connect to Wi-Fi to proceed.</string>
@ -560,7 +560,7 @@
    <string name="route_descr_map_location">Map: </string>
    <string name="route_descr_lat_lon">Lat %1$.3f, lon %2$.3f</string>
    <string name="route_descr_current_location">Current position</string>
-    <string name="route_descr_destination"></string>
+    <string name="route_descr_destination">Destination</string>
    <string name="route_to">To:</string>
    <string name="route_via">Via:</string>
    <string name="route_from">From:</string>
@ -1350,8 +1350,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="index_name_oceania">Oceania</string>
 	<string name="index_name_other">Worldwide and topic maps</string>
 	<string name="index_name_wiki">Worldwide Wikipedia POIs</string>
-	<string name="index_name_voice">Voice packs (recorded, limited features)</string>
-	<string name="index_name_tts_voice">Voice packs (TTS-synthesized, prefer)</string>
+	<string name="index_name_voice">Voice prompts (recorded, limited features)</string>
+	<string name="index_name_tts_voice">Voice prompts (TTS-synthesized, prefer)</string>
 	<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
 	<string name="amenity_type_user_defined">User defined</string>
 	<string name="fav_export_confirmation">File with previously exported favorites already exists. Do you want to replace it?</string>
@ -1519,7 +1519,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="local_indexes_cat_voice">Voice data (recorded)</string>
 	<string name="local_indexes_cat_gpx">GPX data</string>
 	<string name="local_indexes_cat_poi">POI data</string>
-	<string name="ttsvoice">TTS Voice</string>
+	<string name="ttsvoice">TTS voice</string>
 	<string name="search_offline_clear_search">New Search</string>
 	<string name="map_text_size_descr">Select text size for names on the map</string>
 	<string name="map_text_size">Map font size</string>
@ -1670,7 +1670,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="loading_builds">Loading OsmAnd builds&#8230;</string>
 	<string name="select_build_to_install">Select an OsmAnd build to install</string>
 	<string name="gps_status_app_not_found">GPS Status application not installed. Search in Market?</string>
-	<string name="voice_is_not_available_msg">Voice guidance is not available. Please go to settings, choose preferred voice data package, and download it.</string>
+	<string name="voice_is_not_available_msg">No voice guidance available, please go to the Navigation Settings and select or download a voice prompt package.</string>
 	<string name="voice_is_not_available_title">No voice guidance selected</string>
 	<string name="daynight_mode_day">Day</string>
 	<string name="daynight_mode_night">Night</string>
@ -1710,7 +1710,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="transport_search_none">none</string>
 	<string name="transport_search_again">Reset Transportation search</string>
 	<string name="map_index">Map</string>
-	<string name="voice">Voice</string>
+	<string name="voice">Recorded voice</string>
+	<string name="voices">Voice prompts</string>
 	<string name="no_vector_map_loaded">Vector maps were not loaded</string>
 	<string name="map_route_by_gpx">Navigate using GPX</string>
 	<string name="gpx_files_not_found">No GPX files found in the tracks folder</string>
@ -1847,7 +1848,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="route_general_information">Total distance %1$s, travelling time %2$d h %3$d m.</string>
 	<string name="router_service_descr">Choose an online or offline navigation service</string>
 	<string name="router_service">Navigation service</string>
-	<string name="sd_dir_not_accessible">The data storage folder on the SD card is not accessible</string>
+	<string name="sd_dir_not_accessible">The data storage folder on the SD card is not accessible!</string>
 	<string name="download_question">Download {0} - {1} ?</string>
 	<string name="download_question_exist">Offline data for {0} already exists ({1}). Do you want to update it ({2}) ?</string>
 	<string name="address">Address</string>
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@ -563,6 +563,21 @@ public class MapActivity extends AccessibleActivity {
 		return super.onTrackballEvent(event);
 	}

+	@Override
+	protected void onSaveInstanceState(Bundle outState) {
+		super.onSaveInstanceState(outState);
+		MapActivityActions.DrawerType drawerState = mapActions.getDrawerType();
+		outState.putSerializable("drawer_state",drawerState);
+	}
+
+	@Override
+	protected void onRestoreInstanceState(Bundle savedInstanceState) {
+		super.onRestoreInstanceState(savedInstanceState);
+		if (savedInstanceState != null){
+			mapActions.setDrawerType((MapActivityActions.DrawerType) savedInstanceState.getSerializable("drawer_state"));
+		}
+	}
+
 	@Override
 	protected void onStart() {
 		super.onStart();
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@ -92,14 +92,14 @@ public class MapActivityActions implements DialogProvider {
 	ListView mDrawerList;
 	private WaypointDialogHelper waypointDialogHelper;

-	private enum DrawerType{
+	public enum DrawerType{
 		WAYPOINTS,
 		CONFIGURE_SCREEN,
 		CONFIGURE_MAP,
 		MAIN_MENU
 	}

-	private DrawerType currentDrawer;
+	private DrawerType currentDrawer = DrawerType.MAIN_MENU;

 	public MapActivityActions(MapActivity mapActivity){
 		this.mapActivity = mapActivity;
@ -176,8 +176,14 @@ public class MapActivityActions implements DialogProvider {
    	mapActivity.showDialog(DIALOG_RELOAD_TITLE);
    }

-    
-    
+	public DrawerType getDrawerType(){
+		return currentDrawer;
+	}
+
+	public void setDrawerType(DrawerType type){
+		this.currentDrawer = type;
+		prepareStartOptionsMenu();
+	}
    
    protected String getString(int res){
    	return mapActivity.getString(res);
@ -581,7 +587,7 @@ public class MapActivityActions implements DialogProvider {
 						if (currentDrawer == DrawerType.WAYPOINTS){
 							showWaypointsInDrawer(false);
 						} else if (currentDrawer == DrawerType.MAIN_MENU){
-							final ContextMenuAdapter cm = createOptionsMenu();
+							final ContextMenuAdapter cm = createMainOptionsMenu();
 							prepareOptionsMenu(cm);
 						} else {
 							mDrawerList.invalidateViews();
@ -600,8 +606,20 @@ public class MapActivityActions implements DialogProvider {
 				}
 			});
 		}
-		final ContextMenuAdapter cm = createOptionsMenu();
-		prepareOptionsMenu(cm);
+		switch (currentDrawer){
+			case MAIN_MENU:
+				prepareOptionsMenu(createMainOptionsMenu());
+				break;
+			case CONFIGURE_MAP:
+				prepareConfigureMap();
+				break;
+			case CONFIGURE_SCREEN:
+				prepareConfigureScreen();
+				break;
+			case WAYPOINTS:
+				showWaypointsInDrawer(false);
+				break;
+		}
 	}

 	public void prepareOptionsMenu(final ContextMenuAdapter cm) {
@ -652,7 +670,12 @@ public class MapActivityActions implements DialogProvider {
 		prepareOptionsMenu(new ConfigureMapMenu().createListAdapter(mapActivity, true));
 	}

-	private ContextMenuAdapter createOptionsMenu() {
+	public void onDrawerBack() {
+		currentDrawer = DrawerType.MAIN_MENU;
+		prepareStartOptionsMenu();
+	}
+
+	private ContextMenuAdapter createMainOptionsMenu() {
 		final OsmandMapTileView mapView = mapActivity.getMapView();
 		final OsmandApplication app = mapActivity.getMyApplication();
 		ContextMenuAdapter optionsMenuHelper = new ContextMenuAdapter(app);
@ -826,9 +849,7 @@ public class MapActivityActions implements DialogProvider {
 			.listen(new OnContextMenuClick() {
 				@Override
 				public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-					currentDrawer = DrawerType.CONFIGURE_SCREEN;
-					ContextMenuAdapter cm = mapActivity.getMapLayers().getMapInfoLayer().getViewConfigureMenuAdapter();
-					prepareOptionsMenu(cm);
+					prepareConfigureScreen();
 					return false;
 				}
 			}).reg();
@ -885,6 +906,12 @@ public class MapActivityActions implements DialogProvider {
 		return optionsMenuHelper;
 	}

+	private void prepareConfigureScreen() {
+		currentDrawer = DrawerType.CONFIGURE_SCREEN;
+		ContextMenuAdapter cm = mapActivity.getMapLayers().getMapInfoLayer().getViewConfigureMenuAdapter();
+		prepareOptionsMenu(cm);
+	}
+
 	public void showWaypointsInDrawer(boolean flat) {
 		currentDrawer = DrawerType.WAYPOINTS;
 		final int[] running = new int[] { -1 };
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@ -49,7 +49,7 @@ public class ConfigureMapMenu {

 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-						ma.getMapActions().prepareStartOptionsMenu();
+						ma.getMapActions().onDrawerBack();
 						return false;
 					}
 				}).reg();
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
@ -30,7 +30,7 @@ public class DownloadActivityType {
 	private static Map<String, DownloadActivityType> byTag = new HashMap<String, DownloadActivityType>();
 	
 	public static final DownloadActivityType NORMAL_FILE = new DownloadActivityType(R.string.download_regular_maps, "map");
-	public static final DownloadActivityType VOICE_FILE = new DownloadActivityType(R.string.voice, "voice");
+	public static final DownloadActivityType VOICE_FILE = new DownloadActivityType(R.string.voices, "voice");
 	public static final DownloadActivityType ROADS_FILE = new DownloadActivityType(R.string.download_roads_only_maps, "road_map");
 	public static final DownloadActivityType SRTM_COUNTRY_FILE  = new DownloadActivityType(R.string.download_srtm_maps, "srtm_map"); 
 	public static final DownloadActivityType HILLSHADE_FILE = new DownloadActivityType(R.string.download_hillshade_maps, "hillshade");
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
@ -357,7 +357,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 				if (dlg != null) {
 					dlg.dismiss();
 				} else if(a instanceof MapActivity){
-					((MapActivity) a).getMapActions().prepareStartOptionsMenu();
+					((MapActivity) a).getMapActions().onDrawerBack();
 					((MapActivity) a).getMapActions().toggleDrawer();
 				}
 			}
@ -375,7 +375,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 					if (dlg != null) {
 						dlg.dismiss();
 					} else if(a instanceof MapActivity){
-						((MapActivity) a).getMapActions().prepareStartOptionsMenu();
+						((MapActivity) a).getMapActions().onDrawerBack();
 						((MapActivity) a).getMapActions().toggleDrawer();
 					}
 				}
@ -527,7 +527,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 			@Override
 			public void onItemClick(AdapterView<?> adapterView, View view, int item, long l) {
 				if (item == 0) {
-					mapActivity.getMapActions().prepareStartOptionsMenu();
+					mapActivity.getMapActions().onDrawerBack();
 				} else if (listAdapter.getItem(item) instanceof LocationPointWrapper) {
 					LocationPointWrapper ps = (LocationPointWrapper) listAdapter.getItem(item);
 					showOnMap(app, ctx, ps.getPoint(), dialog);
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@ -298,7 +298,7 @@ public class MapInfoLayer extends OsmandMapLayer {

 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-						map.getMapActions().prepareStartOptionsMenu();
+						map.getMapActions().onDrawerBack();
 						return false;
 					}
 				}).reg();
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java
@ -39,7 +39,7 @@ public class MapMenuControls extends MapControls {
 				// double lat = activity.getMapView().getLatitude();
 				// double lon = activity.getMapView().getLongitude();
 				// MainMenuActivity.backToMainMenuDialog(activity, new LatLon(lat, lon));
-				mapActivity.getMapActions().prepareStartOptionsMenu();
+				mapActivity.getMapActions().onDrawerBack();
 				mapActivity.getMapActions().toggleDrawer();
 				notifyClicked();
 			}
--- a/OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java
@ -26,7 +26,7 @@ public class SmallMapMenuControls extends MapControls {
 			@Override
 			public void onClick(View v) {
 				notifyClicked();
-				mapActivity.getMapActions().prepareStartOptionsMenu();
+				mapActivity.getMapActions().onDrawerBack();
 				mapActivity.getMapActions().toggleDrawer();
 			}
 		});