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

This commit is contained in:
Victor Shcherb 2015-09-28 00:07:53 +02:00
commit 28ed24b58f
2 changed files with 8 additions and 2 deletions

View file

@ -2035,7 +2035,7 @@
<string name="next_proceed">Siguiente</string> <string name="next_proceed">Siguiente</string>
<string name="opening_at">Abren a las</string> <string name="opening_at">Abren a las</string>
<string name="closing_at">Cierran a las</string> <string name="closing_at">Cierran a las</string>
<string name="av_locations_descr">Archivo GPX con ubicaciones de la nota</string> <string name="av_locations_descr">Archivo GPX con notas de ubicaciones</string>
<string name="av_locations">Ubicaciones</string> <string name="av_locations">Ubicaciones</string>
<string name="tag_poi_name">nombre</string> <string name="tag_poi_name">nombre</string>
<string name="tag_poi_amenity">servicio</string> <string name="tag_poi_amenity">servicio</string>
@ -2060,4 +2060,10 @@
<string name="simulate_your_location_stop_descr">Parar simulación de ubicación</string> <string name="simulate_your_location_stop_descr">Parar simulación de ubicación</string>
<string name="simulate_your_location_descr">Simular usando grabación GPX o ruta calculada</string> <string name="simulate_your_location_descr">Simular usando grabación GPX o ruta calculada</string>
<string name="downloads_left_template">Quedan %1$s descargas</string> <string name="downloads_left_template">Quedan %1$s descargas</string>
<string name="shared_string_trip_recording">Grabando viaje</string>
<string name="shared_string_navigation">Navegación</string>
<string name="osmand_running_in_background">Ejecutando en segundo plano</string>
<string name="favourites_edit_dialog_title">Información del favorito</string>
<string name="favourites_context_menu_add">Añadir favorito</string>
<string name="roads">Carreteras</string>
</resources> </resources>

View file

@ -2165,5 +2165,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="favourites_context_menu_add">Ajouter un favori</string> <string name="favourites_context_menu_add">Ajouter un favori</string>
<string name="shared_string_trip_recording">Enregistrement de l\'itinéraire</string> <string name="shared_string_trip_recording">Enregistrement de l\'itinéraire</string>
<string name="shared_string_navigation">Navigation</string> <string name="shared_string_navigation">Navigation</string>
<string name="osmand_running_in_background">Exécuter en tâche de fond</string> <string name="osmand_running_in_background">Exécution en tâche de fond</string>
</resources> </resources>