merge heads

This commit is contained in:
Jimmy Shih
2011-10-31 09:41:15 -07:00
parent c1d4dd92cd
commit 507ab6723c
26 changed files with 570 additions and 289 deletions
+12 -14
View File
@@ -71,28 +71,28 @@ limitations under the License.
<string name="progress_message">Enviando su recorrido a Google.</string>
<string name="progress_message_reading_track">Leyendo recorrido...</string>
<string name="progress_message_preparing_track">Preparando recorrido...</string>
<string name="progress_message_authenticating_fusiontables">Autenticando con Google Fusion Tables...</string>
<string name="progress_message_authenticating_mymaps">Autenticando con Google Maps...</string>
<string name="progress_message_authenticating_fusion_tables">Autenticando con Google Fusion Tables...</string>
<string name="progress_message_authenticating_my_maps">Autenticando con Google Maps...</string>
<string name="progress_message_authenticating_docs">Autenticando con Google Docs...</string>
<string name="progress_message_sending_docs">Enviando recorrido a Google Docs...</string>
<string name="progress_message_sending_mymaps">Enviando recorrido a Google Maps...</string>
<string name="progress_message_sending_my_maps">Enviando recorrido a Google Maps...</string>
<string name="progress_message_creating_map">Creando nuevo Sitio...</string>
<string name="progress_message_sending_fusiontables">Enviando recorrido a Google Fusion Tables...</string>
<string name="progress_message_creating_fusiontable">Creando nuevo mapa Fusion Tables...</string>
<string name="import_progress_message">Importando un recorrido GPS. Esto puede tardar.</string>
<string name="write_progress_message">Escribiendo archivo a tarjeta SD. Esto puede tardar.</string>
<string name="progress_message_sending_fusion_tables">Enviando recorrido a Google Fusion Tables...</string>
<string name="progress_message_creating_fusion_table">Creando nuevo mapa Fusion Tables...</string>
<string name="progress_message_import">Importando un recorrido GPS. Esto puede tardar.</string>
<string name="progress_message_export">Escribiendo archivo a tarjeta SD. Esto puede tardar.</string>
<string name="progress_message_updating_track">Actualizando estadísticas del recorrido...</string>
<!-- Used by DeleteAllDataHandler -->
<string name="deletetrack_title">Borrar recorrido</string>
<string name="are_you_sure_question">¿Está usted seguro?</string>
<string name="delete_track_activity_title">Borrar recorrido</string>
<string name="confirmation_title_are_you_sure">¿Está usted seguro?</string>
<string name="all_data_will_be_permanently_deleted">Todos los recorridos y señales serán borradas de este teléfono.</string>
<string name="track_will_be_permanently_deleted">El recorrido y sus señales serán borrados permanentemente de este teléfono.</string>
<string name="marker_will_be_permanently_deleted">La señal será borrada permanentemente de este teléfono.</string>
<!-- Text and links when uploading to Google Fusion Tables -->
<string name="new_map_description">Creado por My Tracks para Android.</string>
<string name="fusiontable_link">Creado por &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
<string name="send_to_google_by_mytracks">Creado por &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
<!-- Text and links when uploading to Google My Maps -->
<string name="my_map_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
@@ -103,11 +103,11 @@ limitations under the License.
<string name="recorded_date">Grabado</string>
<string name="category">Tipo de actividad</string>
<string name="waypoint_category">Tipo de señal</string>
<string name="part">"(Parte %d)"</string>
<string name="track_part_format">"(Parte %d)"</string>
<!-- Used by the track recording service -->
<string name="recording_your_track">Grabando su recorrido...</string>
<string name="new_track">Recorrido %d</string>
<string name="new_track_format">Recorrido %d</string>
<!-- Common -->
<string name="yes">Sí</string>
@@ -115,8 +115,6 @@ limitations under the License.
<string name="waypoint">Marcador de recorrido</string>
<string name="license">Licencia</string>
<string name="cancel">Cancelar</string>
<string name="close">Cerrar</string>
<string name="edit">Editar</string>
<string name="save">Guardar</string>
<!-- Placemark labels for start and end of track -->