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

OsmAnd/res/values-be/strings.xml

@@ -2093,4 +2093,5 @@
 <string name="poi_deleted_localy">POI будуць выдаленыя, як толькі вы загрузіце вашы зьмены</string>
 	<string name="show_on_start">Паказваць пры запуску</string>
 	<string name="count_of_lines">Колькасьць радкоў</string>
-</resources>
+<string name="address_unknown">Адрас пакуль невядомы</string>
+    </resources>

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

@@ -1326,7 +1326,7 @@
 	<string name="poi_mini_roundabout">Mini rotonda</string>
 	<string name="poi_railway_crossing">Cruce peatonal ferroviario</string>
 	<string name="poi_railway_level_crossing">Cruce ferroviario</string>
-	<string name="poi_bird_hide">Puesto de observación</string>
+	<string name="poi_bird_hide">Observatorio de aves</string>
 	<string name="poi_horse_riding">Equitación</string>
 	<string name="poi_garden">Jardín</string>
 

OsmAnd/res/values-es/phrases.xml

@@ -1330,7 +1330,7 @@
 	<string name="poi_mini_roundabout">Mini rotonda</string>
 	<string name="poi_railway_crossing">Cruce peatonal de ferrocarril</string>
 	<string name="poi_railway_level_crossing">Cruce de ferrocarril</string>
-	<string name="poi_bird_hide">Puesto de observación de aves</string>
+	<string name="poi_bird_hide">Observatorio de aves</string>
 	<string name="poi_leisure_common">Zona de ocio común</string>
 	<string name="poi_garden">Jardín</string>
 

OsmAnd/res/values-es/strings.xml

@@ -958,7 +958,7 @@
   
   <string name="show_cameras">Mostrar radares</string>
   <string name="show_traffic_warnings">Mostrar límites de velocidad</string>
-  <string name="avoid_toll_roads">Evitar peajes de carreteras</string>
+  <string name="avoid_toll_roads">Peajes de carreteras</string>
   <string name="tip_recent_changes_0_8_2_t">"Cambios en 0.8.2 :
 \n\t* Mejoras en navegación\n\t* Controles del mapas dinámicos\n\t* Ajustes del mapa movido a la pantalla del mapa\n\t* Botón de bloqueo del mapa con servicios de registro\n\t* Arreglado idiomas árabe, kannada e idiomas RTL "</string>
   <string name="map_widget_top_text">Nombre de calle</string>
@@ -1502,13 +1502,13 @@
 	<string name="routing_attr_prefer_motorway_description">Preferir autopistas</string>
 	<string name="routing_attr_short_way_name">Camino más corto</string>
 	<string name="routing_attr_short_way_description">Utiliza el camino más corto</string>
-	<string name="routing_attr_avoid_toll_name">Evitar peajes de carreteras</string>
+	<string name="routing_attr_avoid_toll_name">Peajes de carreteras</string>
 	<string name="routing_attr_avoid_toll_description">Evita las carreteras con peaje</string>
-	<string name="routing_attr_avoid_unpaved_name">Evitar carreteras no pavimentadas</string>
+	<string name="routing_attr_avoid_unpaved_name">Carreteras no pavimentadas</string>
 	<string name="routing_attr_avoid_unpaved_description">Evita las carreteras no pavimentadas</string>
-	<string name="routing_attr_avoid_ferries_name">Evitar ferries</string>
+	<string name="routing_attr_avoid_ferries_name">Ferris / transbordadores</string>
 	<string name="routing_attr_avoid_ferries_description">Evita utilizar ferries</string>
-	<string name="routing_attr_avoid_motorway_name">Evitar autopistas</string>
+	<string name="routing_attr_avoid_motorway_name">Autopistas</string>
 	<string name="routing_attr_avoid_motorway_description">Evita las autopistas</string>
 	<string name="routing_attr_weight_name">Límite de peso</string>
 	<string name="routing_attr_weight_description">Especifique el peso del vehículo permitido en rutas</string>
@@ -2064,7 +2064,7 @@
     <string name="shared_string_copy">Copiar</string>
     <string name="application_dir_change_warning3">¿Quiere que OsmAnd también copie los archivos de datos al nuevo destino?</string>
     <string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
-    <string name="routing_attr_avoid_borders_name">Evitar cruce de fronteras</string>
+    <string name="routing_attr_avoid_borders_name">Cruce de fronteras</string>
 	<string name="routing_attr_avoid_borders_description">Evita cruzar una frontera hacia otro país</string>
 	<string name="routing_attr_height_name">Límite de altura</string>
 	<string name="routing_attr_height_description">Especifique la altura del vehículo que se permite en las rutas</string>
@@ -2163,7 +2163,7 @@
 	<string name="app_name_osmand">OsmAnd</string>
 	<string name="offline_maps_and_navigation">Mapas y navegación\nfuera de línea</string>
 <string name="commit_poi">Enviar PDI</string>
-<string name="routing_attr_avoid_shuttle_train_name">Evitar tren de enlace</string>
+<string name="routing_attr_avoid_shuttle_train_name">Tren de enlace</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Evite tomar trenes de enlace</string>
     <string name="plugin_settings">Complementos</string>
 	<string name="tab_title_basic">Básico</string>
@@ -2190,4 +2190,5 @@
 <string name="poi_deleted_localy">El PDI se eliminará una vez subido los cambios</string>
 	<string name="show_gpx">Mostrar GPX</string>
 <string name="count_of_lines">Número de líneas</string>
-</resources>
+<string name="show_on_start">Mostrar al inicio</string>
+	</resources>

OsmAnd/res/values/strings.xml

@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="address_unknown">Address is not known yet</string>
     <string name="av_locations_descr">Gpx file with note locations</string>
     <string name="av_locations">Locations</string>
     <string name="plugin_settings">Plugins</string>

OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java

@@ -62,7 +62,7 @@ public class MapContextMenu {
 		this.object = object;
 		foundStreetName = null;
 
-		acquireStretName(mapActivity, new LatLon(pointDescription.getLat(), pointDescription.getLon()));
+		acquireStreetName(mapActivity, new LatLon(pointDescription.getLat(), pointDescription.getLon()));
 
 		MapContextMenuFragment.showInstance(mapActivity);
 
@@ -142,7 +142,7 @@ public class MapContextMenu {
 			return foundStreetName;
 	}
 
-	private void acquireStretName(final MapActivity activity, final LatLon loc) {
+	private void acquireStreetName(final MapActivity activity, final LatLon loc) {
 		new AsyncTask<LatLon, Void, RouteDataObject>() {
 			Exception e = null;