new image changes

OsmAnd/res/values-es/strings.xml

@@ -716,13 +716,19 @@
   <string name="edit_filter_create_message">Se creó el filtro {0}</string>
   <string name="default_buttons_selectall">Seleccionar todo</string>
   <string name="offline_navigation_not_available">La navegación offline no está disponible temporalmente.</string>
+<<<<<<< HEAD
   <string name="left_side_navigation">Conducción por la izquierda</string>
   <string name="left_side_navigation_descr">Seleccionar para países con tráfico por la izquierda</string>
+=======
+  <string name="left_side_navigation">Left-Hand Driving</string>
+  <string name="left_side_navigation_descr">Select for countries with left-hand traffic</string>
+>>>>>>> new image changes
   <string name="download_link_and_local_description">Pulsa aquí para descargar o actualizar datos sin conexión.\nPulsa cualquier ítem para ver más detalles, mantén pulsado para desactivar o borrar. Datos actuales en el dispositivo (libre %1$s):</string>
   <string name="unknown_from_location">La localización de inicio no ha sido determinada</string>
   <string name="context_menu_item_directions">Directions to here</string>
   <string name="confirm_interrupt_download">¿Quiere interrumpir la descarga de fichero?</string>
   <string name="basemap_was_selected_to_download">El MapaBase es necesario para el correcto funcionamiento de la aplicación y ha sido seleccionado para descargar.</string>
+<<<<<<< HEAD
   <string name="gpx_index_settings_descr">" (incluye analizador GPX)"</string>
   <string name="map_online_plugin_is_not_installed">Habilita el plugin de mapas online para seleccionar diferentes fuentes de mapas</string>
   <string name="map_online_data">Mapas Online</string>
@@ -770,6 +776,55 @@
   <string name="show_ruler_level">Mostrar escala</string>
   <string name="info_button">Info</string>
   <string name="back_to_location">Volver a localización</string>
+=======
+  <string name="gpx_index_settings_descr">" (includes GPX analyzer)"</string>
+  <string name="map_online_plugin_is_not_installed">Habilita el plugin de mapas online para seleccionar diferentes fuentes de mapas</string>
+  <string name="map_online_data">Mapas Online</string>
+  <string name="map_online_data_descr">Use online maps (download and cache tiles on SD card)</string>
+  <string name="online_map_settings">Online Map</string>
+  <string name="online_map_settings_descr">Configure online or cached tile map sources</string>
+  <string name="map_settings">- Map Settings</string>
+  <string name="map_settings_descr">Configure the map display</string>
+  <string name="osmand_rastermaps_plugin_description">This plugin facilitates using a variety of online or cached tile maps as base map or as overlay / underlay maps. The maps can also be prepared offline and copied to the Osmand folder.</string>
+  <string name="osmand_rastermaps_plugin_name">Online Maps</string>
+  <string name="osmand_background_plugin_description">This plugin allows tracking or navigation in power saving (screen off) mode by periodically waking up the GPS device to record a track point or play a voice prompt.</string>
+  <string name="osmand_background_plugin_name">Screen Off Features</string>
+  <string name="osmand_accessibility_description">This plugin configures special accessibility features.</string>
+  <string name="osmand_accessibility_name">Accessibility</string>
+  <string name="extra_settings">Advanced settings</string>
+  <string name="osmand_monitoring_description">This plugin facilitates recording your trips to GPX files or live monitoring using a web service.</string>
+  <string name="osmand_monitoring_name">Tracking + Monitoring</string>
+  <string name="osmand_extra_settings_description">This plugin provides advanced map configuration and some device-specific settings.</string>
+  <string name="osmand_extra_settings_name">Advanced Settings</string>
+  <string name="osmand_development_plugin_description">This plugin enables development and debugging features like animated navigation or rendering performance display.</string>
+  <string name="osmand_development_plugin_name">Osmand Development</string>
+  <string name="plugins_screen">Plugin Manager</string>
+  <string name="select_plugin_to_activate">Touch a Plugin to activate or deactivate it. (Restarting Osmand may be required.)</string>
+  <string name="prefs_plugins_descr">Plugins provide extra functionality bundled within the application like tracking, tile maps, screen off mode, accessibility settings, and others.</string>
+  <string name="prefs_plugins">Plugin Manager</string>
+  <string name="tip_recent_changes_0_8_0_t">"Cambios en 0.8.0 : \n\t- Funcionalidad de plugins \n\t- Soporte para nuevos datos de mapa offline \n\t- Muchos arreglos de fallos "</string>
+  <string name="osm_editing_plugin_description">This plugin facilitates OSM feedback like collecting / modifying OSM POI objects, opening / commenting OSM bugs, and contributing recorded GPX files (requires OSM credentials).</string>
+  <string name="osm_editing_plugin_name">OSM Editing</string>
+  <string name="vector_maps_may_display_faster_on_some_devices">Vector maps likely display faster. May not work well on some devices.</string>
+  <string name="simulate_route_progression_manually">Simulate route progression manually</string>
+  <string name="play_commands_of_currently_selected_voice">Play commands of currently selected voice</string>
+  <string name="debugging_and_development">Osmand debugging and development</string>
+  <string name="native_rendering">Native rendering</string>
+  <string name="animate_routing">Animate navigation</string>
+  <string name="test_voice_prompts">Test voice prompts</string>
+  <string name="tip_recent_changes_0_7_2_t">"Changes in 0.7.2 : \n\t- Native rendering for all devices \n\t- Offline POI editing \n\t- Accessibility \n\t- Lots of bug fixes "</string>
+  <string name="send_files_to_osm">Send GPX files to OSM?</string>
+  <string name="gpx_visibility_txt">Visibility</string>
+  <string name="gpx_tags_txt">Tags</string>
+  <string name="gpx_description_txt">Description</string>
+  <string name="validate_gpx_upload_name_pwd">Please specify OSM user name and password to upload GPX files.</string>
+  <string name="default_buttons_support">Support</string>
+  <string name="support_new_features">Support new features</string>
+  <string name="show_ruler_level_descr">Display ruler on the map</string>
+  <string name="show_ruler_level">Display ruler</string>
+  <string name="info_button">Info</string>
+  <string name="back_to_location">Back to location</string>
+>>>>>>> new image changes
   <string name="help">Ayuda</string>
   <string name="show_details">Mostrar detalles</string>
   <string name="accessibility_extensions_descr">Accessibility extensions for old Android versions</string>
@@ -778,8 +833,13 @@
   <string name="accessibility_mode_descr">Turns on the accessibility features</string>
   <string name="accessibility_on">On</string>
   <string name="accessibility_off">Off</string>
+<<<<<<< HEAD
   <string name="accessibility_default">Usar valores de configuración globales del sistema</string>
   <string name="backToMenu">Volver al Menú</string>
+=======
+  <string name="accessibility_default">According to the global system setting</string>
+  <string name="backToMenu">Back To Menu</string>
+>>>>>>> new image changes
   <string name="zoomOut">Zoom out</string>
   <string name="zoomIn">Zoom in</string>
   <string name="zoomIs">Zoom is</string>
@@ -801,6 +861,7 @@
   <string name="north_north_west">nornoroeste</string>
   <string name="front">Front</string>
   <string name="front_right">Front right</string>
+<<<<<<< HEAD
   <string name="right">Derecha</string>
   <string name="back_right">Back right</string>
   <string name="back">Back</string>
@@ -808,6 +869,15 @@
   <string name="left">Izquierda</string>
   <string name="front_left">Front left</string>
   <string name="oclock">en punto</string>
+=======
+  <string name="right">Right</string>
+  <string name="back_right">Back right</string>
+  <string name="back">Back</string>
+  <string name="back_left">Back left</string>
+  <string name="left">Left</string>
+  <string name="front_left">Front left</string>
+  <string name="oclock">o\'clock</string>
+>>>>>>> new image changes
   <string name="towards">towards</string>
   <string name="accuracy">Precisión</string>
   <string name="altitude">Altitud</string>
@@ -820,7 +890,11 @@
   <string name="auto_announce_off">Stop autoannouncing</string>
   <string name="scroll_map_by_gestures_descr">Scroll map by gestures on the touchscreen</string>
   <string name="scroll_map_by_gestures">Natural map scrolling</string>
+<<<<<<< HEAD
   <string name="i_am_here">Estoy aquí</string>
+=======
+  <string name="i_am_here">I am here</string>
+>>>>>>> new image changes
   <string name="zoom_by_trackball_descr">Change map zooming by horizontal trackball moves</string>
   <string name="zoom_by_trackball">Use trackball for zoom control</string>
   <string name="use_short_object_names_descr">Use short object names in touch exploration mode</string>