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
+9 -11
View File
@@ -63,35 +63,35 @@ limitations under the License.
<string name="progress_message">Enviando seu caminho ao Google.</string>
<string name="progress_message_reading_track">Lendo caminho...</string>
<string name="progress_message_preparing_track">Preparando caminho...</string>
<string name="progress_message_authenticating_fusiontables">Autenticando com o Google Fusion Tables...</string>
<string name="progress_message_authenticating_fusion_tables">Autenticando com o Google Fusion Tables...</string>
<string name="progress_message_authenticating_docs">Authenticando com o Google Docs...</string>
<string name="progress_message_sending_docs">Enviando caminho para o Google Docs...</string>
<string name="progress_message_sending_fusiontables">Enviando caminho para o Google Fusion Tables...</string>
<string name="progress_message_creating_fusiontable">Criando nova Fusion Table...</string>
<string name="import_progress_message">Importando um caminho de GPS. Isso pode demorar alguns instantes.</string>
<string name="write_progress_message">Salvando arquivo para o cartão SD. Isso pode demorar alguns instantes.</string>
<string name="progress_message_sending_fusion_tables">Enviando caminho para o Google Fusion Tables...</string>
<string name="progress_message_creating_fusion_table">Criando nova Fusion Table...</string>
<string name="progress_message_import">Importando um caminho de GPS. Isso pode demorar alguns instantes.</string>
<string name="progress_message_export">Salvando arquivo para o cartão SD. Isso pode demorar alguns instantes.</string>
<string name="progress_message_updating_track">Atualizando estatísticas do caminho...</string>
<!-- Used by DeleteAllDataHandler -->
<string name="are_you_sure_question">Você tem certeza?</string>
<string name="confirmation_title_are_you_sure">Você tem certeza?</string>
<string name="all_data_will_be_permanently_deleted">Todos os seus caminhos e marcadores serão apagados deste telefone.</string>
<string name="track_will_be_permanently_deleted">O caminho e todos os seus marcadores serão permanentemente apagados deste telefone.</string>
<string name="marker_will_be_permanently_deleted">O marcador será permanentemente apagado deste telefone.</string>
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">"Criado por My Tracks no Android.</string>
<string name="fusiontable_link">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android.</string>
<string name="send_to_google_by_mytracks">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">Pontos</string>
<string name="recorded_date">Gravado</string>
<string name="category">"Tipo de atividade</string>
<string name="waypoint_category">"Tipo de marcador</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">"Gravando seu caminho...</string>
<string name="new_track">"Caminho %d</string>
<string name="new_track_format">"Caminho %d</string>
<!-- Common -->
<string name="no">Não</string>
@@ -101,8 +101,6 @@ limitations under the License.
<string name="success">Successo</string>
<string name="waypoint">Ponto de passagem</string>
<string name="cancel">Cancelar</string>
<string name="close">Fechar</string>
<string name="edit">Editar</string>
<string name="save">Salvar</string>
<!-- Placemark labels for start and end of track -->