karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Merging proguard changes.

Browse Source
This commit is contained in:
Rodrigo Damazio
2011-02-09 15:40:18 -02:00
parent 4d9bdd1c12 95cbaf1993
commit ddafdcf392
22 changed files with 552 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/.classpath
+1 -1
View File
@@ -4,10 +4,10 @@
<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
<classpathentry kind="lib" path="libs/google-common.jar"/>
<classpathentry kind="lib" path="libs/accounts.jar"/>
<classpathentry kind="lib" path="libs/google-api-client-1.2.2-alpha.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
<classpathentry kind="lib" path="libs/google-api-client-1.2.1-alpha.jar"/>
<classpathentry kind="src" path="MyTracksLib_src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
MyTracks/AndroidManifest.xml
+2 -2
View File
@@ -17,8 +17,8 @@ limitations under the License.
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.maps.mytracks"
android:installLocation="auto"
android:versionCode="22"
android:versionName="1.0.21">
android:versionCode="23"
android:versionName="1.1.0">
<application android:icon="@drawable/arrow_icon"
android:label="@string/app_name"
android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">
MyTracks/default.properties
+5 -1
View File
@@ -11,5 +11,9 @@
split.density=false
# Project target.
target=Google Inc.:Google APIs:9
proguard.config=proguard.cfg
android.library.reference.1=../MyTracksLib/
# ProGuard is turned off while we investigate the removal of code that
# isn't actually dead from Fusion Tables. See issue 303 for an example of
# the result of that removal.
#proguard.config=proguard.cfg
MyTracks/libs/google-api-client-1.2.1-alpha.jar → MyTracks/libs/google-api-client-1.2.2-alpha.jar
BIN
View File
Binary file not shown.
MyTracks/res/values-ca/strings.xml
+10 -27
View File
@@ -35,7 +35,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">No s\'ha trobat cap gestor d\'ubicacions en aquest dispositiu.</string>
<string name="error_no_gps_location_provider">No s\'ha trobat cap proveïdor d\'ubicació GPS en aquest dispositiu.</string>
<string name="error_sending_to_mymap">S\'ha produït un error quan s\'enviava la ruta a Google My Map. Proveu més tard.</string>
<string name="error_sending_to_fusiontables">S\'ha produït un error quan s\'enviava la ruta a Google Fusion Tables. Proveu més tard.</string>
<string name="error_sending_to_docs">S\'ha prdouït un error quan s\'enviava la ruta a Google Docs. Proveu més tard.</string>
<string name="error_unable_to_start_recording">No es pot iniciar l\'enregistrament. Proveu de nou.</string>
<string name="error_unable_to_stop_recording">No es pot aturar l\'enregistrament. Proveu de nou.</string>
@@ -50,7 +50,7 @@ limitations under the License.
<string name="wait_for_fix">S\'està esperant per tenir una posició GPS fixa. Assegureu-vos que el cel és visible.</string>
<string name="status_now_recording">Ara s\'està enregistrant una ruta nova.</string>
<string name="status_stopped_recording">S\'ha aturat l\'enregistrament de la ruta.</string>
<string name="status_new_mymap_has_been_created">S\'ha creat un Google My Map nou a maps.google.com.</string>
<string name="status_new_fusiontable_has_been_created">S\'ha creat un Google Fusion Table nou a google.com/fusiontables.</string>
<string name="status_tracks_have_been_uploaded">S\'ha enviat la ruta a maps.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_new_doc">S\'ha enviat la ruta a un full de càlcul a docs.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_docs">S\'ha enviat la ruta a docs.google.com.</string>
@@ -65,11 +65,11 @@ limitations under the License.
<string name="progress_message">S\'està enviant la ruta a Google.</string>
<string name="progress_message_reading_track">S\'està llegint la ruta...</string>
<string name="progress_message_preparing_track">S\'està preparant la ruta...</string>
<string name="progress_message_authenticating_mymaps">S\'està to Google Maps...</string>
<string name="progress_message_authenticating_fusiontables">S\'està to Google Fusion Tables...</string>
<string name="progress_message_authenticating_docs">S\'està autenticant a Google Docs...</string>
<string name="progress_message_sending_docs">S\'està enviant la ruta a Google Docs...</string>
<string name="progress_message_sending_mymaps">S\'està enviant a Google Maps...</string>
<string name="progress_message_creating_map">S\'està creant un My Map nou...</string>
<string name="progress_message_sending_fusiontables">S\'està enviant a Google Fusion Tables...</string>
<string name="progress_message_creating_fusiontable">S\'està creant un Fusion Table nou...</string>
<string name="import_progress_message">S\'està imporant una ruta GPS. Això pot trigar una estona.</string>
<string name="write_progress_message">S\'està escrivint a la targeta SD. Això pot trigar una estona.</string>
<string name="progress_message_updating_track">S\'estan actualitzant les estadístiques de la ruta...</string>
@@ -82,8 +82,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">Creat per My Tracks a l\'Android.</string>
<string name="my_map_link">Creat per &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; a l\'Android.</string>
<string name="new_map_title">Mapa nou</string>
<string name="fusiontable_link">Creat per &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; a l\'Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">Punts</string>
@@ -114,8 +113,8 @@ limitations under the License.
<!-- TrackList -->
<string name="tracklist_show_track">Mostra</string>
<string name="tracklist_send_to_mymaps">Envia a Google My Maps</string>
<string name="tracklist_send_to_new_mymap">Envia a un Google My Map nou</string>
<string name="tracklist_send_to_fusiontables">Envia a Google Fusion Tables</string>
<string name="tracklist_send_to_new_fusiontable">Envia a un Google Fusion Table nou</string>
<string name="tracklist_send_to_docs">Envia a Google Docs</string>
<string name="tracklist_send_to_google">Envia a Google...</string>
<string name="tracklist_delete_track">Elimina del telèfon...</string>
@@ -125,7 +124,7 @@ limitations under the License.
<string name="tracklist_save_as_kml">Anomena i desa com un fitxer KML</string>
<string name="tracklist_save_as_csv">Anomena i desa com un fitxer CSV</string>
<string name="tracklist_save_as_tcx">Anomena i desa com un fitxer TCX</string>
<string name="tracklist_btn_send_all_to_mymaps">Envia a Google My Maps</string>
<string name="tracklist_btn_send_all_to_fusiontables">Envia a Google Fusion Tables</string>
<string name="tracklist_btn_delete_all">Elimina totes les rutes</string>
<!-- Export All -->
<string name="tracklist_btn_export_all">Exporta totes les rutes</string>
@@ -134,7 +133,7 @@ limitations under the License.
<string name="tracklist_all_tracks">Totes les rutes:</string>
<string name="tracklist_this_track">Aquesta ruta</string>
<string name="tracklist_share_track">Comparteix amb amics...</string>
<string name="tracklist_share_link">Un enllaç a Google My Map</string>
<string name="tracklist_share_linkfusion">Un enllaç a Google Fusion Table</string>
<string name="tracklist_share_gpx_file">Un fitxer GPX</string>
<string name="tracklist_share_kml_file">Un fitxer KML</string>
<string name="tracklist_share_csv_file">Un fitxer CSV</string>
@@ -217,14 +216,9 @@ limitations under the License.
<string name="eclair_required">Suportat només en Android 2.0 i superior</string>
<string name="settings_sensor_type">Tipus de sensor</string>
<string name="settings_sensor_type_summary">El tipus de sensor al qual es connecta.</string>
<string name="settings_sensor_id">Identificador del sensor</string>
<string name="settings_sensor_id_summary">L\'identificador enviat als sensors.</string>
<string name="sensor_id_malformed">L\'identificador ha de ser un valor sencer.</string>
<string name="bluetooth_sensor_title">Sensor bluetooth</string>
<string name="bluetooth_sensor_summary">El sensor bluetooth al qual es connecta.</string>
<string name="settings_modular_stats_display_title">Pantalla d\'estadístiques modulars</string>
<string name="settings_modular_stats_display_summary_on">La pantalla d\'estadístiques es divideix en mòduls diferents.</string>
<string name="settings_modular_stats_display_summary_off">Mostra totes les estadístiques en una sola pantalla.</string>
<string name="settings_backup">Còpia de seguretat (BETA)</string>
<string name="settings_sd_backup">Còpia de seguretat a la targeta SD</string>
@@ -342,14 +336,11 @@ limitations under the License.
<string name="help">Ajuda</string>
<string name="about_team">Equip:</string>
<string name="about_version">Versió:</string>
<string name="about_email">Assistència</string>
<string name="about_support">Assistència:</string>
<!-- Send to Google -->
<string name="sendtogoogle_title">Envia a...</string>
<string name="sendtogoogle_send_now">Envia ara</string>
<string name="sendtogoogle_create_new_map">Crea un mapa nou</string>
<string name="sendtogoogle_pick_existing_map">Seleccioneu un mapa existent</string>
<string name="sendtogoogle_send_stats">Envia les estadístiques de la ruta</string>
<string name="sendtogoogle_send_stats_and_points">Envia les estadístiques i els punts</string>
@@ -395,14 +386,6 @@ limitations under the License.
<string name="check_units_title">Avís de les unitats de mesura</string>
<string name="check_units_message">Les unitats són mètriques per defecte. Voleu canviar aquest paràmetre?</string>
<!-- Signal Strength -->
<string name="error_rate"> Rati d\'error: %1$d</string>
<string name="signal_to_noise_ratio"> Relació senyal/soroll: %1$d</string>
<string name="ecio"> Ec/lo: %1$.1f dB</string>
<string name="gsm_strength">Intensistat GSM: %1$d</string>
<string name="cdma_strength">Intensitat CDMA: %1$d dBm</string>
<string name="evdo_strength">Intensitat EVDO: %1$d dBm</string>
<!-- Fake preference keys - never saved, but show options in the preferences screen -->
<string name="bluetooth_options">Opcions del Bluetooth</string>
<string name="bluetooth_pairing">Associació de dispositius</string>
MyTracks/res/values-de/strings.xml
+37 -33
View File
@@ -15,14 +15,13 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Used by the Menu -->
<string name="start_recording">Track aufzeichnen</string>
<string name="stop_recording">Aufzeichnung anhalten</string>
<string name="switch_to_sat">Satellitenansicht</string>
<string name="switch_to_map">Kartenansicht</string>
<string name="mylocation">Mein Aufenthaltsort</string>
<string name="list_markers">Wegpunkte</string>
<string name="list_markers">Wegpunkte</string>
<string name="delete_all_tracks">Alle Tracks löschen</string>
<string name="settings">Einstellungen</string>
<string name="elevation">Höhe</string>
@@ -82,8 +81,7 @@ limitations under the License.
<!-- Text and links when uploading to Google Fusion Tables -->
<string name="new_map_description">Erstellt von My Tracks für Android.</string>
<string name="my_map_link">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
<string name="new_map_title">Neue Karte</string>
<string name="fusiontable_link">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">Punkte</string>
@@ -93,7 +91,7 @@ limitations under the License.
<string name="part">(Teil %d)</string>
<!-- Used by the track recording service -->
<string name="recording_your_track">Dein Track wird aufgezeichnet…</string>
<string name="recording_your_track">Dein Track wird aufgezeichnet…</string>
<!-- Common -->
<string name="no">Nein</string>
@@ -101,18 +99,19 @@ limitations under the License.
<string name="error">Fehler</string>
<string name="success">Erfolgreich</string>
<string name="waypoint">Wegpunkt</string>
<string name="license">Lizenz</string>
<string name="cancel">Abbrechen</string>
<string name="close">Schließen</string>
<string name="edit">Bearbeiten</string>
<string name="save">Sichern</string>
<!-- Placemark labels for start and end of track -->
<string name="start">(Beginn)</string>
<string name="end">(Ende)</string>
<!-- TrackList -->
<string name="tracklist_show_track">Anzeigen</string>
<string name="tracklist_send_to_mymaps">An eine Google MyMaps-Karte senden</string>
<string name="tracklist_send_to_new_mymap">An eine neue Google MyMaps-Karte senden</string>
<string name="tracklist_send_to_fusiontables">An eine Google Fusion Tables-Karte senden</string>
<string name="tracklist_send_to_new_fusiontable">An eine neue Google Fusion Tables-Karte senden</string>
<string name="tracklist_send_to_docs">An Google Docs senden</string>
<string name="tracklist_send_to_google">An Google senden…</string>
<string name="tracklist_delete_track">Vom Gerät löschen…</string>
@@ -122,9 +121,9 @@ limitations under the License.
<string name="tracklist_save_as_kml">KML-Datei exportieren</string>
<string name="tracklist_save_as_csv">CSV-Datei exportieren</string>
<string name="tracklist_save_as_tcx">TCX-Datei exportieren</string>
<string name="tracklist_btn_send_all_to_mymaps">An Google MyMaps senden</string>
<string name="tracklist_btn_send_all_to_fusiontables">An Google Fusion Tables senden</string>
<string name="tracklist_btn_delete_all">Alle Tracks löschen</string>
<!-- Export All -->
<!-- Export All -->
<string name="tracklist_btn_export_all">Alle Tracks exportieren</string>
<string name="export_done">Exportieren beendet</string>
<string name="tracklist_pick_one">Einen Track auswählen. Lange berühren für mehr Optionen.</string>
@@ -213,14 +212,17 @@ limitations under the License.
<string name="eclair_required">Wird nur unter Android 2.0 oder höher unterstützt</string>
<string name="settings_sensor_type">Sensortyp</string>
<string name="settings_sensor_type_summary">Der Typ des zu verbindenden Sensors</string>
<string name="settings_sensor_id">Sensor-Id</string>
<string name="settings_sensor_id_summary">Die zum Sensor zu sendende Id</string>
<string name="sensor_id_malformed">Die Id muss eine Ganzzahl sein.</string>
<string name="settings_sensor_type_summary">Der Typ des zu verbindenden Sensors</string>
<string name="settings_heart_rate_ant_sensor_id">Verbindung mit ANT Herzqrequenzmesser aufheben</string>
<string name="settings_power_ant_sensor_id">Verbindung mit ANT Kraftmesser aufheben</string>
<string name="settings_srm_bridge_ant_sensor_id">Verbindung mit ANT srm bridge aufheben</string>
<string name="settings_ant_not_paired">ANT-Sensor nicht verbunden</string>
<string name="settings_ant_paired">ANT-Sensor verbunden mit: %d</string>
<string name="bluetooth_sensor_title">Bluetooth-Sensor</string>
<string name="bluetooth_sensor_summary">Der zu verbindende Bluetoothsensor</string>
<string name="settings_modular_stats_display_title">Art der Datenanzeige</string>
<!-- Backups -->
<string name="settings_backup">Datensicherung (BETA)</string>
<string name="settings_sd_backup">SD-Karten-Sicherung</string>
<string name="settings_backup_to_sd">Jetzt sichern</string>
@@ -229,7 +231,6 @@ limitations under the License.
<string name="settings_restore_from_sd_summary">Alle Tracks und Einstellungen von der SD-Karte holen.</string>
<string name="settings_no_backup_while_recording">Während ein Track aufgezeichnet wird, kann nicht mit der Datensicherung gearbeitet werden.</string>
<!-- Backups -->
<string name="restore_overwrites_warning">Eine Wiederherstellung von der SD-Karte ÜBERSCHREIBT alle vorhandenen Tracks und Einstellungen. Willst Du das wirklich?</string>
<string name="select_backup_to_restore">Wähle die wiederherzustellende Datensicherung aus</string>
<string name="no_backups">Keine Datensicherungen gefunden.</string>
@@ -304,16 +305,16 @@ limitations under the License.
<string name="seconds">Sekunden</string>
<!-- Distance -->
<string name="feet">Fuß</string>
<string name="kilometers_long">Kilometer</string>
<string name="kilometers_long">Kilometer</string>
<string name="feet">Fuß</string>
<string name="miles_long">Meilen</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour_long">Kilometer pro Stunde</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour_long">Kilometer pro Stunde</string>
<string name="per_kilometer">pro Kilometer</string>
<string name="mile_per_hour_long">Meilen pro Stunde</string>
<string name="mile_per_hour_long">Meilen pro Stunde</string>
<string name="per_mile">pro Meile</string>
<!-- Stats Labels -->
<string name="moving_time_label">Zeit in Bewegung</string>
<string name="total_time_label">Gesamtzeit</string>
@@ -324,7 +325,7 @@ limitations under the License.
<string name="statistics">Statistik</string>
<string name="total_distance_label">Gesamtentfernung</string>
<string name="distance_label">Entfernung</string>
<string name="power">Energie</string>
<string name="power">Kraft</string>
<string name="cadence">Kadenz</string>
<string name="heart_rate">Herzfrequenz</string>
<string name="max_heart_rate">Höchste Herzfrequenz</string>
@@ -338,10 +339,12 @@ limitations under the License.
<!-- About -->
<string name="about">Über</string>
<string name="help">Hilfe</string>
<string name="about_email">Unterstützung</string>
<string name="about_support">Unterstützung:</string>
<string name="about_privacy">Datenschutz:</string>
<!-- Send to Google -->
<string name="sendtogoogle_title">Senden an…</string>
<!-- Send to Google -->
<string name="sendtogoogle_title">Senden an…</string>
<string name="sendtogoogle_google_docs">Google Text &amp; Tabellen</string>
<string name="sendtogoogle_send_now">Jetzt senden</string>
<string name="sendtogoogle_send_stats">Trackstatistik senden</string>
<string name="sendtogoogle_send_stats_and_points">Statistik und Punkte senden</string>
@@ -369,6 +372,7 @@ limitations under the License.
<!-- Welcome -->
<string name="welcome">Willkommen</string>
<string name="welcome_read_later">OK</string>
<string name="welcome_about">Über My Tracks</string>
<!-- Announcement -->
@@ -387,20 +391,20 @@ limitations under the License.
<string name="check_units_title">Einheitenbenachrichtigung</string>
<string name="check_units_message">Voreingestellt sind metrische Einheiten. Willst Du diese Einstellung ändern?</string>
<!-- Fake preference keys - never saved, but show options in the preferences screen -->
<string name="bluetooth_options">Bluetootheinstellungen</string>
<!-- Fake preference keys - never saved, but show options in the preferences screen -->
<string name="bluetooth_options">Bluetooth-Einstellungen</string>
<string name="bluetooth_pairing">Geräteverbindung</string>
<string name="bluetooth_pairing_summary">Öffnet Androids Bluetootheinstellungen, um Geräte zu verbinden.</string>
<string name="sensor_options">Sensoreinstellungen</string>
<string name="bluetooth_pairing_summary">Öffnet Androids Bluetooth-Einstellungen, um Geräte zu verbinden.</string>
<string name="sensor_options">Sensor-Einstellungen</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">Verbunden mit %s</string>
<string name="bluetooth_connecting">Verbinde mit Bluetoothsensor ...</string>
<string name="bluetooth_not_connected">Bluetoothsensor nicht verbunden.</string>
<string name="bluetooth_connecting">Verbinde mit Bluetooth-Sensor ...</string>
<string name="bluetooth_not_connected">Bluetooth-Sensor nicht verbunden.</string>
<!-- Sensor State -->
<string name="sensor_data_time">Sensor Data Time</string>
<string name="power_meter_enabled">Energiemessung aktiviert</string>
<string name="sensor_data_time">Uhrzeit</string>
<string name="power_meter_enabled">Kraftmesser aktiviert</string>
<string name="heart_rate_monitor_enabled">Herzfrequenzmessung aktiviert</string>
<string name="no_sensor_manager">Keine Sensoren verfügbar</string>
<string name="enabled">Aktiviert</string>
MyTracks/res/values-es/strings.xml
+5 -7
View File
@@ -32,7 +32,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">Ningún administrador de ubicación fue hallado en este aparato! </string>
<string name="error_no_gps_location_provider">Ningún proveedor GPS de ubicación fue hallado en este aparato.</string>
<string name="error_sending_to_mymap">Hubo un error al mandar su recorrido a Google My Map. Por favor inténtelo de nuevo más tarde.</string>
<string name="error_sending_to_fusiontables">Hubo un error al mandar su recorrido a Google Fusion Tables. Por favor inténtelo de nuevo más tarde.</string>
<string name="error_sending_to_docs">Hubo un error al mandar su recorrido a Google Docs. Por favor inténtelo de nuevo más tarde.</string>
<string name="error_unable_to_start_recording">No pude empezar a grabar. Por favor inténtelo de nuevo. </string>
<string name="error_unable_to_stop_recording">No pude dejar de grabar. Por favor inténtelo de nuevo.</string>
@@ -47,7 +47,7 @@ limitations under the License.
<string name="wait_for_fix">Esperando una ubicación mas exacta del GPS. Asegúrese que el cielo sea visible.</string>
<string name="status_now_recording">Grabando un nuevo recorrido.</string>
<string name="status_stopped_recording">Grabacíon interrumpida.</string>
<string name="status_new_mymap_has_been_created">Un mapa Google My Map nuevo has sido creado en maps.google.com.</string>
<string name="status_new_fusiontable_has_been_created">Un mapa Google Fusion Tables nuevo has sido creado en google.com/fusiontables.</string>
<string name="status_tracks_have_been_uploaded">Su recorrido ha sido enviado a maps.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_new_doc">Su recorrido ha sido enviado a una nueva hoja de cálculo en docs.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_docs">Su recorrido ha sido enviado a docs.google.com.</string>
@@ -62,11 +62,11 @@ 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_mymaps">Autenticando con Google Maps...</string>
<string name="progress_message_authenticating_fusiontables">Autenticando con Google Fusion Tables...</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_creating_map">Creando nuevo mapa My Map...</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_updating_track">Actualizando estadísticas del recorrido...</string>
@@ -321,8 +321,6 @@ limitations under the License.
<!-- About -->
<string name="about">Sobre</string>
<string name="help">Ayuda</string>
<string name="about_email">Soporte técnico</string>
<string name="about_team">Equipo:</string>
<string name="about_support">Soporte técnico:</string>
MyTracks/res/values-fr/arrays.xml
+8 -1
View File
@@ -201,7 +201,7 @@ limitations under the License.
<item>kayak</item>
<item>bateau à moteur</item>
<item>ferry</item>
<item>boat télécommandé</item>
<item>bateau télécommandé</item>
<item>surf</item>
<item>planche à voile</item>
<item>kite surf</item>
@@ -304,4 +304,11 @@ limitations under the License.
<item>point de passage</item>
</array>
<array name="sensor_type_options">
<item>Aucun</item>
<item>Capteur ANT+</item>
<item>Pont SRM ANT+</item>
<item>Bluetooth Zephyr</item>
</array>
</resources>
MyTracks/res/values-fr/strings.xml
+88 -14
View File
@@ -30,11 +30,13 @@ limitations under the License.
<string name="choose_track_message">Sélectionnez le parcours à visualiser</string>
<string name="current_track">Parcours actuel</string>
<string name="current_segment">Segment actuel</string>
<string name="sensor_state">État du capteur</string>
<string name="aggregated_stats">Statistiques consolidées</string>
<!-- Error messages -->
<string name="error_no_location_manager">Aucune source de localisation n\'a été trouvée sur ce système !</string>
<string name="error_no_gps_location_provider">Aucune source GPS de localisation n\'a été trouvée sur ce système.</string>
<string name="error_sending_to_mymap">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Mes cartes. Réessayez plus tard SVP.</string>
<string name="error_sending_to_fusiontables">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Fusion Tables. Réessayez plus tard SVP.</string>
<string name="error_sending_to_docs">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Docs. Réessayez plus tard SVP.</string>
<string name="error_unable_to_start_recording">Impossible de débuter l\'enregistrement. Réessayez.</string>
<string name="error_unable_to_stop_recording">Impossible de stopper l\'enregistrement. Réessayez.</string>
@@ -49,7 +51,7 @@ limitations under the License.
<string name="wait_for_fix">Attente du signal GPS. Assurez-vous que le ciel est bien visible.</string>
<string name="status_now_recording">Parcours en cours d\'enregistrement.</string>
<string name="status_stopped_recording">Enregistrement du parcours terminé.</string>
<string name="status_new_mymap_has_been_created">Une nouvelle carte Google \'Mes cartes\' vient d\'être créée sur maps.google.com.</string>
<string name="status_new_fusiontable_has_been_created">Une nouvelle table Google Fusion vient d\'être créée sur google.com/fusiontables.</string>
<string name="status_tracks_have_been_uploaded">Votre parcours a été envoyé à maps.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_new_doc">Votre parcours a été envoyé dans un tableur à docs.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_docs">Votre parcours a été envoyé à docs.google.com.</string>
@@ -64,11 +66,11 @@ limitations under the License.
<string name="progress_message">Envoi du parcours à Google...</string>
<string name="progress_message_reading_track">Lecture du parcours...</string>
<string name="progress_message_preparing_track">Préparation du parcours</string>
<string name="progress_message_authenticating_mymaps">Authentification à Google Mes cartes...</string>
<string name="progress_message_authenticating_fusiontables">Authentification à Google Fusion Tables...</string>
<string name="progress_message_authenticating_docs">Authentification à Google Docs...</string>
<string name="progress_message_sending_docs">Envoi du parcours vers Google Docs...</string>
<string name="progress_message_sending_mymaps">Envoi du parcours vers Google Mes cartes...</string>
<string name="progress_message_creating_map">Création d\'une nouvelle carte...</string>
<string name="progress_message_sending_fusiontables">Envoi du parcours vers Google Fusion Tables...</string>
<string name="progress_message_creating_fusiontable">Création d\'une nouvelle \'Fusion Table\'...</string>
<string name="import_progress_message">Importation du parcours GPS. Patientez SVP.</string>
<string name="write_progress_message">Enregistrement du fichier sur la carte SD. Patientez SVP.</string>
<string name="progress_message_updating_track">Mise à jour des statistiques du parcours...</string>
@@ -81,8 +83,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">Créée par My Tracks sous Android.</string>
<string name="my_map_link">Créée par &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; sous Android.</string>
<string name="new_map_title">Nouvelle carte</string>
<string name="fusiontable_link">Créée par &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; sous Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="recorded_date">Enregistré</string>
@@ -110,8 +111,8 @@ limitations under the License.
<!-- TrackList -->
<string name="tracklist_show_track">Afficher</string>
<string name="tracklist_send_to_mymaps">Envoyer à Google Mes cartes</string>
<string name="tracklist_send_to_new_mymap">Envoyer et créer un nouvelle carte Google Mes cartes</string>
<string name="tracklist_send_to_fusiontables">Envoyer à Google Fusion Tables</string>
<string name="tracklist_send_to_new_fusiontable">Envoyer et créer un nouvelle table Google Fusion Tables</string>
<string name="tracklist_send_to_docs">Envoyer à Google Docs</string>
<string name="tracklist_send_to_google">Envoyer à Google...</string>
<string name="tracklist_delete_track">Effacer du téléphone...</string>
@@ -119,14 +120,14 @@ limitations under the License.
<string name="tracklist_write_to_sd">Enregistrer sur la carte SD...</string>
<string name="tracklist_save_as_gpx">Enregistrer en fichier GPX </string>
<string name="tracklist_save_as_kml">Enregistrer en fichier KML</string>
<string name="tracklist_btn_send_all_to_mymaps">Envoyer à Google Mes cartes</string>
<string name="tracklist_btn_send_all_to_fusiontables">Envoyer à Google Fusion Tables</string>
<string name="tracklist_btn_export_all">Exporter tous les parcours</string>
<string name="tracklist_btn_delete_all">Tout supprimer</string>
<string name="tracklist_pick_one">Choisissez un parcours. Faites un appui prolongé pour plus d\'options.</string>
<string name="tracklist_all_tracks">Tous les parcours:</string>
<string name="tracklist_this_track">Ce parcours</string>
<string name="tracklist_share_track">Partager...</string>
<string name="tracklist_share_link">Lien sur Google Mes cartes</string>
<string name="tracklist_share_linkfusion">Lien sur Google Fusion Tables</string>
<string name="tracklist_share_gpx_file">Fichier GPX</string>
<string name="tracklist_share_kml_file">Fichier KML</string>
<string name="tracklist_clear_map">Effacer la carte</string>
@@ -194,6 +195,34 @@ limitations under the License.
<string name="settings_split_frequency_summary">Temps ou distance minimum avant l\'insertion d\'un marqueur de séparation</string>
<string name="pace_label">Rythme</string>
<string name="eclair_required">Nécessite au minimum Android 2.0</string>
<string name="settings_sensor_type">Type de capteur</string>
<string name="settings_sensor_type_summary">Type du capteur à utiliser</string>
<string name="settings_heart_rate_ant_sensor_id">Se désassocier du Cardiofréquencemètre ANT</string>
<string name="settings_power_ant_sensor_id">Se désassocier du compteur ANT</string>
<string name="settings_srm_bridge_ant_sensor_id">Se désassocier du pont SRM ANT</string>
<string name="settings_ant_not_paired">Capteur ANT non associé</string>
<string name="settings_ant_paired">Capteur ANT associé: %d</string>
<string name="bluetooth_sensor_title">Capteur Bluetooth</string>
<string name="bluetooth_sensor_summary">Capteur Bluetooth à utiliser</string>
<string name="settings_modular_stats_display_title">Affichage des statistiques modulaires</string>
<!-- Backups -->
<string name="settings_backup">Sauvegarde (BETA)</string>
<string name="settings_sd_backup">Sauvegarde sur carte SD</string>
<string name="settings_backup_to_sd">Sauvegarder</string>
<string name="settings_backup_to_sd_summary">Copier tous vos parcours et paramètres sur la carte SD</string>
<string name="settings_restore_from_sd">Restaurer</string>
<string name="settings_restore_from_sd_summary">Restaurer tous les parcours et paramètres depuis la carte SD</string>
<string name="settings_no_backup_while_recording">Sauvegarde impossible lors de l\'enregistrement d\'un parcours.</string>
<string name="restore_overwrites_warning">Restaurer une sauvegarde depuis la carte SD écrasera tous vos parcours et paramètres actuels.</string>
<string name="select_backup_to_restore">Choisissez la sauvegarde à restaurer</string>
<string name="no_backups">Pas de sauvegarde disponible.</string>
<string name="backup_write_progress_message">Écriture de tous vos parcours et paramètres sur la carte SD. Veuillez patienter...</string>
<string name="backup_import_progress_message">Lecture de tous vos parcours et paramètres depuis la carte SD. Veuillez patienter...</string>
<!-- MyTracksSky -->
<string name="mytracks_sky">Satellites GPS</string>
@@ -268,6 +297,9 @@ limitations under the License.
<string name="mile_per_hour_long">miles/heure</string>
<string name="per_mile">per mile</string>
<string name="waiting">Waiting...</string>
<!-- Stats Labels -->
<string name="moving_time_label">Durée (déplacement)</string>
<string name="total_time_label">Durée totale</string>
@@ -275,6 +307,12 @@ limitations under the License.
<string name="sd_unavail">Carte SD indisponible</string>
<string name="speed">Vitesse</string>
<string name="start_trip">Vous devez commencer un parcours</string>
<string name="distance_label">Distance</string>
<string name="power">Puissance</string>
<string name="cadence">Cadence</string>
<string name="heart_rate">Rythme cardiaque</string>
<string name="max_heart_rate">Rythme cardiaque maximum</string>
<string name="unknown">-</string>
<string name="statistics">Statistiques</string>
<string name="total_distance_label">Distance totale</string>
<string name="waiting">Patientez</string>
@@ -293,8 +331,6 @@ limitations under the License.
<!-- Send to Google -->
<string name="sendtogoogle_title">Envoyer à</string>
<string name="sendtogoogle_send_now">Envoyer maintenant</string>
<string name="sendtogoogle_create_new_map">Créer une nouvelle carte</string>
<string name="sendtogoogle_pick_existing_map">Choisir une carte</string>
<string name="sendtogoogle_send_stats">Envoyer les statistiques du parcours</string>
<string name="sendtogoogle_send_stats_and_points">Envoyer les statistiques et les balises</string>
@@ -333,4 +369,42 @@ limitations under the License.
$6 : Speed units (mph) : Pace units (per mile)
-->
<string name="announce_template">My Tracks %1$s %2$.2f %3$s en %4$s at %5$s %6$s</string>
<!-- Check Units -->
<string name="check_units_title">Note sur les unités de mesure</string>
<string name="check_units_message">Le système métrique est utilisé par défaut. Souhaitez-vous changer ce paramètre ?</string>
<!-- Fake preference keys - never saved, but show options in the preferences screen -->
<string name="method_bluetooth">Bluetooth</string>
<string name="bluetooth_options">Options Bluetooth</string>
<string name="bluetooth_pairing">Association d\'un appareil</string>
<string name="bluetooth_pairing_summary">Visitez les paramètres Bluetooth d\'Android pour associer un nouvel appareil</string>
<string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
<string name="sensor_options">Options du capteur</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">Connecté à %s</string>
<string name="bluetooth_connecting">Connexion du capteur Bluetooth...</string>
<string name="bluetooth_not_connected">Capteur Bluetooth non connecté</string>
<!-- Sensor State -->
<string name="sensor_data_time">Date des données du capteur</string>
<string name="power_meter_enabled">Compteur activé</string>
<string name="heart_rate_monitor_enabled">Cardiofréquencemètre activé</string>
<string name="no_sensor_manager">Pas de gestionnaire de capteur</string>
<string name="enabled">Activé</string>
<string name="connecting">Connexion</string>
<string name="connected">Connecté</string>
<string name="disconnected">Déconnecté</string>
<string name="no_sensor_service">Pas de capteur</string>
<string name="searching">Recherche</string>
<string name="sending">Envoi</string>
<!-- Manifest description (not seen inside the app) -->
<string name="notification_permission_label">notifications lors de l\'enregistrement de parcours</string>
<string name="read_tracks_permission_label">lecture des parcours enregistrés</string>
<string name="write_tracks_permission_label">sauvegarde de parcours, lancer/arrêter l\'enregistrement de parcours</string>
<string name="notification_permission_description">Notifications lors du lancement et de l\'arrêt de l\'enregistrement de parcours.</string>
<string name="read_tracks_permission_description">Possibilité de lire les données des parcours enregistrés, telles que les marqueurs et les points de passage.</string>
<string name="write_tracks_permission_description">Possibilité d\'écrire des données de parcours, telles que les marqueurs et les points de passage..</string>
</resources>
MyTracks/res/values-it/strings.xml
+11 -18
View File
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<string name="app_name">My Tracks</string>
<!-- Used by the Menu -->
<string name="start_recording">Registra percorso</string>
<string name="stop_recording">Fine registrazione</string>
@@ -35,7 +33,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">Nessuna fonte di posizione trovata su questo dispositivo.</string>
<string name="error_no_gps_location_provider">Nessuna fonte di posizione GPS trovata su questo dispositivo.</string>
<string name="error_sending_to_mymap">Si è verificato un errore nell\'invio del percorso a «Le mie mappe». Per favore riprova più tardi.</string>
<string name="error_sending_to_fusiontables">Si è verificato un errore nell\'invio del percorso a Google Fusion Tables. Per favore riprova più tardi.</string>
<string name="error_sending_to_docs">Si è verificato un errore nell\'invio del percorso a Google Docs. Per favore riporva più tardi.</string>
<string name="error_unable_to_start_recording">Impossibile iniziare la registrazione. Riprova.</string>
<string name="error_unable_to_stop_recording">Impossibile fermare la registrazione. Riprova.</string>
@@ -50,7 +48,7 @@ limitations under the License.
<string name="wait_for_fix">Sto aspettando il fix del GPS. Accertati che il cielo sia visibile.</string>
<string name="status_now_recording">Sto registrando un nuovo percorso.</string>
<string name="status_stopped_recording">Registrazione del percorso terminata.</string>
<string name="status_new_mymap_has_been_created">Una nuova mappa è stata creata in «Le mie mappe» su maps.google.com.</string>
<!-- <string name="status_new_fusiontable_has_been_created">Una nuova mappa è stata creata in «Le mie mappe» su maps.google.com.</string> -->
<string name="status_tracks_have_been_uploaded">Il tuo percorso è stato inviato a maps.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_new_doc">Il tuo percorso è stato inviato ad un nuovo foglio di calcolo su docs.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_docs">Il tuo percorso è stato inviato a docs.google.com.</string>
@@ -65,11 +63,11 @@ limitations under the License.
<string name="progress_message">Invio del percorso a Google in corso.</string>
<string name="progress_message_reading_track">Lettura in corso...</string>
<string name="progress_message_preparing_track">Elaborazione del percorso in corso...</string>
<string name="progress_message_authenticating_mymaps">Autenticazione a Google Maps in corso...</string>
<!-- <string name="progress_message_authenticating_fusiontables">Autenticazione a Google Maps in corso...</string> -->
<string name="progress_message_authenticating_docs">Autenticazione a Google Docs in corso...</string>
<string name="progress_message_sending_docs">Invio del percorso a Google Docs in corso...</string>
<string name="progress_message_sending_mymaps">Invio del percorso a Google Maps in corso...</string>
<string name="progress_message_creating_map">Creazione di una nuova mappa in «Le mie mappe» in corso...</string>
<!-- <string name="progress_message_sending_fusiontables">Invio del percorso a Google Maps in corso...</string> -->
<!-- <string name="progress_message_creating_fusiontable">Creazione di una nuova mappa in «Le mie mappe» in corso...</string> -->
<string name="import_progress_message">Importazione del percorso GPS in corso. Attendere prego...</string>
<string name="write_progress_message">Salvataggio del file sulla scheda SD in corso. Attendere prego...</string>
<string name="progress_message_updating_track">Aggiornamento delle statistiche del percorso in corso...</string>
@@ -82,8 +80,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">Creato da My Tracks su Android.</string>
<string name="my_map_link">Creato da &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; su Android.</string>
<string name="new_map_title">Nuova mappa</string>
<string name="fusiontable_link">Creato da &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; su Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">Punti</string>
@@ -114,8 +111,8 @@ limitations under the License.
<!-- TrackList -->
<string name="tracklist_show_track">Mostra</string>
<string name="tracklist_send_to_mymaps">Invia a «Le mie mappe» di Google</string>
<string name="tracklist_send_to_new_mymap">Invia a nuova mappa in «Le mie mappe» di Google</string>
<!-- <string name="tracklist_send_to_fusiontables">Invia a «Le mie mappe» di Google</string> -->
<!-- <string name="tracklist_send_to_new_fusiontable">Invia a nuova mappa in «Le mie mappe» di Google</string> -->
<string name="tracklist_send_to_docs">Invia a Google Docs</string>
<string name="tracklist_send_to_google">Invia a Google...</string>
<string name="tracklist_delete_track">Elimina dal telefono...</string>
@@ -123,7 +120,7 @@ limitations under the License.
<string name="tracklist_write_to_sd">Salva su scheda SD...</string>
<string name="tracklist_save_as_gpx">Salva in un file GPX</string>
<string name="tracklist_save_as_kml">Salva in un file KML</string>
<string name="tracklist_btn_send_all_to_mymaps">Invia a «Le mie mappe» di Google</string>
<!-- <string name="tracklist_btn_send_all_to_fusiontables">Invia a «Le mie mappe» di Google</string> -->
<string name="tracklist_btn_delete_all">Elimina tutti i percorsi</string>
<!-- Export All -->
<string name="tracklist_btn_export_all">Esporta tutti i percorsi</string>
@@ -132,7 +129,7 @@ limitations under the License.
<string name="tracklist_all_tracks">Tutti i percorsi:</string>
<string name="tracklist_this_track">Questo percorso</string>
<string name="tracklist_share_track">Condividi con amici...</string>
<string name="tracklist_share_link">Un link alla mappa in «Le mie mappe» di Google</string>
<!-- <string name="tracklist_share_linkfusion">Un link alla mappa in «Le mie mappe» di Google</string> -->
<string name="tracklist_share_gpx_file">Un file GPX</string>
<string name="tracklist_share_kml_file">Un file KML</string>
<string name="tracklist_clear_map">Cancella la mappa</string>
@@ -306,19 +303,15 @@ limitations under the License.
<!-- About -->
<string name="about">Informazioni</string>
<string name="help">Aiuto</string>
<string name="about_email">Supporto</string>
<string name="about_team">Team:</string>
<string name="about_version">Versione:</string>
<string name="about_support">Supporto:</string>
<!-- Send to Google -->
<string name="sendtogoogle_title">Invia a...</string>
<string name="sendtogoogle_google_mymaps">«Le mie mappe» di Google</string>
<!-- <string name="sendtogoogle_google_fusiontables">«Le mie mappe» di Google</string> -->
<string name="sendtogoogle_google_docs">Google Docs</string>
<string name="sendtogoogle_send_now">Invia adesso</string>
<string name="sendtogoogle_create_new_map">Crea una nuova mappa</string>
<string name="sendtogoogle_pick_existing_map">Scegli una mappa esistente</string>
<string name="sendtogoogle_send_stats">Invia statistiche del percorso</string>
<string name="sendtogoogle_send_stats_and_points">Invia statistiche e segnaposti</string>
MyTracks/res/values-ja/arrays.xml
+11 -3
View File
@@ -151,6 +151,14 @@ limitations under the License.
<item>1 分</item>
</string-array>
<!-- Auto-resume track timeout -->
<string-array name="auto_resume_track_timeout_options">
<item>なし</item>
<item>5 分</item>
<item>10 分</item>
<item>15 分</item>
<item>常時</item>
</string-array>
<!-- Other non-preference arrays -->
<array name="activity_types">
@@ -249,12 +257,12 @@ limitations under the License.
<item>ゴルフ場</item>
<item>雑貨店</item>
<item>美容室</item>
<item>散髪屋</item>
<item>船着き場</item>
<item>ハイキング道</item>
<item>ホテル</item>
<item>家</item>
<item>情報</item>
<item>交差</item>
<item>案内所</item>
<item>交差点</item>
<item>メールボックス</item>
<item>市場</item>
<item>集合場所</item>
MyTracks/res/values-ja/strings.xml
+132 -63
View File
@@ -22,18 +22,20 @@ limitations under the License.
<string name="switch_to_map">地図モード</string>
<string name="mylocation">現在地</string>
<string name="list_tracks">トラック</string>
<string name="list_markers">マーカ</string>
<string name="list_markers">マーカー</string>
<string name="delete_all_tracks">全トラック消去</string>
<string name="settings">設定</string>
<string name="elevation">標高</string>
<string name="choose_track_message">表示するトラックを選択して下さい</string>
<string name="current_track">現在のトラック</string>
<string name="current_segment">最終セグメント</string>
<string name="sensor_state">センサー情報</string>
<string name="aggregated_stats">集計情報</string>
<!-- Error messages -->
<string name="error_no_location_manager">この端末でロケーションマネージャを発見できませんでした</string>
<string name="error_no_gps_location_provider">この端末でGPSロケーションプロバイダを発見できました</string>
<string name="error_sending_to_mymap">Googleマイマップへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
<string name="error_no_location_manager">この端末でロケーションマネージャを発見できませんでした．</string>
<string name="error_no_gps_location_provider">この端末でGPSロケーションプロバイダを発見できました．</string>
<string name="error_sending_to_fusiontables">Google Fusion Tablesへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
<string name="error_sending_to_docs">Google Docsへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
<string name="error_unable_to_start_recording">記録作成開始できません．もう一度試して下さい．</string>
<string name="error_unable_to_stop_recording">記録停止できません．もう一度試して下さい．</string>
@@ -42,53 +44,52 @@ limitations under the License.
<string name="error_generic">エラーが発生しました．もう一度試して下さい．</string>
<string name="error_track_does_not_exist">トラックが存在しません．</string>
<string name="error_out_of_memory">大きなファイルです(500KB未満でなければなりません)．終了します．</string>
<string name="error_unable_to_insert_marker">マーカの挿入ができません．位置決定ができません．</string>
<string name="error_unable_to_insert_marker">マーカーの挿入ができません．位置決定ができません．</string>
<!-- Status messages -->
<string name="wait_for_fix">GPS位置精度がよくなるまで待機しています．空が見えるところにいて下さい．</string>
<string name="status_now_recording">新しいトラックを記録中です．</string>
<string name="status_stopped_recording">トラック記録を停止しました．</string>
<string name="status_new_mymap_has_been_created">新しいGoogleマイマップを maps.google.com に作成しました．</string>
<string name="status_tracks_have_been_uploaded">トラックを maps.google.com に送信しました．</string>
<string name="status_tracks_have_been_uploaded_to_new_doc">トラックを docs.google.com の新しいスプレッドシートに送信しました．</string>
<string name="status_tracks_have_been_uploaded_to_docs">トラックを docs.google.com に送信しました．</string>
<string name="status_enable_gps">ここをタップして，セキュリティ &amp;位置情報 を開いて，「GPS機能をONにする」にチェックして下さい．バックボタンで戻ってください．</string>
<string name="status_new_fusiontable_has_been_created">新しいGoogle Fusion Tableをgoogle.com/fusiontablesに作成しました．</string>
<string name="status_tracks_have_been_uploaded">トラックをmaps.google.comに送信しました．</string>
<string name="status_tracks_have_been_uploaded_to_new_doc">トラックをdocs.google.comの新しいスプレッドシートに送信しました．</string>
<string name="status_tracks_have_been_uploaded_to_docs">トラックをdocs.google.comに送信しました．</string>
<string name="status_enable_gps">ここをタップして「位置情報とセキュリティの設定」を開いて「GPS機能を使用」にチェックして下さい．バックボタンで戻ってください．</string>
<string name="status_approximate_location">ご注意: 携帯電話中継局とWi-Fiネットワークから大まかな位置を特定します．</string>
<string name="status_no_location">現在位置決定ができません．位置取得源を増やし(セキュリティ&amp;位置情報をご覧ください)，空が見えるようにして下さい．もう一度試して下さい．</string>
<string name="status_waypoint_inserted">ウェイポイントマーカを挿入しました．</string>
<string name="status_statistics_inserted">統計マーカを挿入しました．</string>
<string name="status_no_location">現在位置決定ができません．位置取得源を増やし(位置情報とセキュリティの設定 をご覧ください)、空が見えるようにして下さい．もう一度試して下さい．</string>
<string name="status_waypoint_inserted">ウェイポイントマーカーを挿入しました．</string>
<string name="status_statistics_inserted">統計マーカーを挿入しました．</string>
<!-- Progress dialog -->
<string name="progress_title">お待ちください...</string>
<string name="progress_message">トラックをGoogleに送信しました．</string>
<string name="progress_message_reading_track">トラックを読んでいます...</string>
<string name="progress_message_preparing_track">トラックを準備しています...</string>
<string name="progress_message_authenticating_mymaps">Googleマップの認証しています...</string>
<string name="progress_message_authenticating_fusiontables">Google Fusion Tablesへの認証を行っています...</string>
<string name="progress_message_authenticating_docs">Google Docsへの認証を行っています...</string>
<string name="progress_message_sending_docs">トラックをGoogle Docsに送信しています...</string>
<string name="progress_message_sending_mymaps">トラックをGoogleマップに送信しています...</string>
<string name="progress_message_creating_map">新しいマイマップを生成しています...</string>
<string name="progress_message_sending_fusiontables">トラックをFusion Tablesに送信しています...</string>
<string name="progress_message_creating_fusiontable">新しいFusion Tablesを生成しています...</string>
<string name="import_progress_message">GPSトラックをインポートしています．若干時間がかかります．</string>
<string name="write_progress_message">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
<string name="progress_message_updating_track">トラック統計情報を更新しています...</string>
<!-- Used by DeleteAllDataHandler -->
<string name="are_you_sure_question">よろしいですか?</string>
<string name="all_data_will_be_permanently_deleted">全てのトラックとマーカをこの端末から削除しました．</string>
<string name="track_will_be_permanently_deleted">トラックとマーカをこの端末から完全に削除しました．</string>
<string name="marker_will_be_permanently_deleted">マーカをこの端末から完全に削除しました．</string>
<string name="all_data_will_be_permanently_deleted">全てのトラックとマーカーをこの端末から削除します．</string>
<string name="track_will_be_permanently_deleted">トラックとマーカーをこの端末から完全に削除します．</string>
<string name="marker_will_be_permanently_deleted">マーカーをこの端末から完全に削除します．</string>
<!-- Text and links when uploading to Google My Maps -->
<!-- Text and links when uploading to Google Fusion Tables -->
<string name="new_map_description">Android用My Tracksで作成</string>
<string name="my_map_link">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
<string name="new_map_title">新規マップ</string>
<string name="fusiontable_link">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">ポイント</string>
<string name="recorded_date">記録</string>
<string name="recorded_date">記録日</string>
<string name="category">活動タイプ</string>
<string name="waypoint_category">マーカタイプ</string>
<string name="part">(Part %d)</string>
<string name="waypoint_category">マーカータイプ</string>
<string name="part">(パート %d)</string>
<!-- Used by the track recording service -->
<string name="recording_your_track">トラックを保存中...</string>
@@ -97,10 +98,10 @@ limitations under the License.
<!-- Common -->
<string name="no">いいえ</string>
<string name="yes">はい</string>
<string name="ok">OK</string>
<string name="error">エラー</string>
<string name="success">成功</string>
<string name="waypoint">ウェイポイント</string>
<string name="license">ライセンス</string>
<string name="cancel">キャンセル</string>
<string name="close">閉じる</string>
<string name="edit">編集</string>
@@ -112,8 +113,8 @@ limitations under the License.
<!-- TrackList -->
<string name="tracklist_show_track">表示</string>
<string name="tracklist_send_to_mymaps">Google My Mapsへ送信</string>
<string name="tracklist_send_to_new_mymap">新規Googleマイマップへ送信</string>
<string name="tracklist_send_to_fusiontables">Google Fusion Tablesへ送信</string>
<string name="tracklist_send_to_new_fusiontable">新規Google Fusion Tableへ送信</string>
<string name="tracklist_send_to_docs">Google Docsへ送信</string>
<string name="tracklist_send_to_google">Googleへ送信...</string>
<string name="tracklist_delete_track">端末から削除...</string>
@@ -122,42 +123,44 @@ limitations under the License.
<string name="tracklist_save_as_gpx">GPXファイルの保存</string>
<string name="tracklist_save_as_kml">KMLファイルの保存</string>
<string name="tracklist_save_as_csv">CVSファイルの保存</string>
<string name="tracklist_btn_send_all_to_mymaps">Googleマイマップへの送信</string>
<string name="tracklist_btn_delete_all">全てのトラックの削除</string>
<string name="tracklist_save_as_tcx">TCXファイルの保存</string>
<string name="tracklist_btn_send_all_to_fusiontables">Google Fusion Tablesへの送信</string>
<string name="tracklist_btn_delete_all">全トラックの削除</string>
<!-- Export All -->
<string name="tracklist_btn_export_all">全てのトラックのエクスポート</string>
<string name="export_done">エクスポート終了</string>
<string name="tracklist_btn_export_all">全トラックの出力</string>
<string name="export_done">出力終了</string>
<string name="tracklist_pick_one">トラックを選択します．オプションを表示するには長押しして下さい．</string>
<string name="tracklist_all_tracks">全てのトラック:</string>
<string name="tracklist_this_track">このトラック</string>
<string name="tracklist_share_track">共有...</string>
<string name="tracklist_share_link">Googleマイマップへのリンク</string>
<string name="tracklist_share_linkfusion">Google Fusion Tablesへのリンク</string>
<string name="tracklist_share_gpx_file">GPXファイル</string>
<string name="tracklist_share_kml_file">KMLファイル</string>
<string name="tracklist_share_csv_file">CSVファイル</string>
<string name="tracklist_share_tcx_file">TCXファイル</string>
<string name="tracklist_clear_map">マップの消去</string>
<!-- Waypoints list -->
<string name="waypointslist_btn_delete_all">全てのマーカの削除</string>
<string name="waypointslist_this_waypoint">このマーカ</string>
<string name="waypointslist_btn_delete_all">全てのマーカーの削除</string>
<string name="waypointslist_this_waypoint">このマーカー</string>
<string name="waypointslist_delete_waypoint">削除</string>
<string name="waypointslist_edit_waypoint">詳細編集</string>
<string name="waypointslist_show_waypoint">マップに表示</string>
<string name="waypointslist_btn_insert_waypoint">ウェイポイントの挿入</string>
<string name="waypointslist_btn_insert_statistics">統計情報の挿入</string>
<string name="waypointslist_pick_one">マーカを選択します．オプションを表示するには長押しして下さい．</string>
<string name="waypointslist_pick_one">マーカーを選択します．オプションを表示するには長押しして下さい．</string>
<!-- MyTracks Details -->
<string name="trackdetails_title">トラック詳細</string>
<string name="trackdetails_name">トラック名</string>
<string name="trackdetails_description">トラック説明</string>
<string name="trackdetails_category">活動タイプ(ハイキング, サイクリング,　ランニング, 登山...)</string>
<string name="trackdetails_category">活動タイプ(ハイキング, サイクリング、ランニング、登山...)</string>
<!-- MyTracks Waypoint Details -->
<string name="waypointdetails_title">マーカ詳細</string>
<string name="waypointdetails_name">マーカ名</string>
<string name="waypointdetails_description">マーカ説明</string>
<string name="waypointdetails_category">マーカタイプ(建物, 洞穴, 名所...)</string>
<string name="waypointdetails_title">マーカー詳細</string>
<string name="waypointdetails_name">マーカー名</string>
<string name="waypointdetails_description">マーカー説明</string>
<string name="waypointdetails_category">マーカータイプ(建物、洞穴、名所...)</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">My Tracks設定</string>
@@ -165,9 +168,10 @@ limitations under the License.
<string name="settings_recording">記録</string>
<string name="settings_sharing">共有</string>
<string name="settings_not_available_summary">このAndroidバージョンでは使用できません</string>
<string name="settings_announcement_frequency">定期通知</string>
<string name="settings_announcement_frequency_summary">音声通知間隔の最小時間</string>
<string name="settings_min_recording_distance">ポイント間の最短距離</string>
<string name="settings_min_recording_distance_summary">位置記録間の最短距離</string>
@@ -198,13 +202,49 @@ limitations under the License.
<string name="settings_share_url_only_summary_off">共有時にトラックのコンテントが含まれます</string>
<string name="settings_split_frequency">分割頻度</string>
<string name="settings_split_frequency_summary">分割マーカを挿入する時間または距離の間隔</string>
<string name="settings_split_frequency_summary">分割マーカーを挿入する時間または距離の間隔</string>
<string name="settings_auto_resume_track_timeout">記録自動再開の制限時間</string>
<string name="settings_auto_resume_track_timeout_summary">指定時間(分単位)以内なら端末再起動時に以前のトラック記録を再開します．</string>
<string name="settings_timestamp_track_name">日時をトラック名にする</string>
<string name="settings_timestamp_track_name_summary_on">デフォルトのトラック名をトラック開始日時にします．</string>
<string name="settings_timestamp_track_name_summary_off">トラック名を昇順の数字にします．</string>
<string name="pace_label">ペース</string>
<string name="eclair_required">Android 2.0以上でのみサポート</string>
<string name="settings_sensor_type">センサータイプ</string>
<string name="settings_sensor_type_summary">接続先センサーのタイプ</string>
<string name="settings_heart_rate_ant_sensor_id">ANT心拍数センサーとのペアリング解消</string>
<string name="settings_power_ant_sensor_id">ANT心拍強度センサーとのペアリング解消</string>
<string name="settings_srm_bridge_ant_sensor_id">ANT SRMブリッジセンサーとのペアリング解消</string>
<string name="settings_ant_not_paired">ANTセンサーとペアリングしていません</string>
<string name="settings_ant_paired">ANTセンサーとペアリング: %d</string>
<string name="bluetooth_sensor_title">Bluetoothセンサー</string>
<string name="bluetooth_sensor_summary">Bluetoothセンサー接続先</string>
<string name="settings_modular_stats_display_title">モジュール統計表示 </string>
<!-- Backups -->
<string name="settings_backup">バックアップ (ベータ版)</string>
<string name="settings_sd_backup">SDカード バックアップ</string>
<string name="settings_backup_to_sd">今すぐバックアップ</string>
<string name="settings_backup_to_sd_summary">SDカードに全てのトラックと設定をバックアップします</string>
<string name="settings_restore_from_sd">今すぐ復元</string>
<string name="settings_restore_from_sd_summary">SDカードから全てのトラックと設定を復元します</string>
<string name="settings_no_backup_while_recording">トラック記録中はバックアップ操作はできません．</string>
<string name="restore_overwrites_warning">SDカードからの復元を実行すると、現在のトラックと設定は *全て上書き* されてしまいます．よろしいですか?</string>
<string name="select_backup_to_restore">復元するバックアップの選択</string>
<string name="no_backups">バックアップがありません．</string>
<string name="backup_write_progress_message">SDカードに全てのトラックと設定をバックアップしています．しばらくかかることがあります...</string>
<string name="backup_import_progress_message">SDカードから全てのトラックと設定を復元しています．しばらくかかることがあります...</string>
<!-- MyTracksSky -->
<string name="mytracks_sky">GPS衛星</string>
<!-- Sharing -->
<string name="share_map">マップ共有</string>
<string name="share_map_subject">マップを共有したいと思います</string>
<string name="share_map_body_format">このマップに興味を持って頂けると思います:
@@ -212,7 +252,7 @@ limitations under the License.
<string name="send_track_subject">トラックを共有したいと思います</string>
<string name="send_track_body_format">このトラックに興味を持って頂けると思います．
このトラックを閲覧するには，Google Earthまたは他のマッピングソフトウェアが必要です．</string>
このトラックを閲覧するには、Google Earthまたは他のマッピングソフトウェアが必要です．</string>
<string name="share_track">トラックの共有</string>
<!-- Visibility -->
@@ -267,23 +307,16 @@ limitations under the License.
<string name="minutes">分</string>
<string name="second">秒</string>
<string name="seconds">秒</string>
<string name="milliseconds">ミリ秒</string>
<!-- Distance -->
<string name="meter">m</string>
<string name="kilometer">km</string>
<string name="kilometers_long">キロメータ</string>
<string name="feet">ft</string>
<string name="mile">mi</string>
<string name="miles_long">マイル</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour">km/h</string>
<string name="kilometer_per_hour_long">キロメータ毎時</string>
<string name="min_per_kilometer">min/km</string>
<string name="per_kilometer">毎キロメータ</string>
<string name="mile_per_hour">mi/h</string>
<string name="mile_per_hour_long">マイル毎時</string>
<string name="min_per_mile">min/mi</string>
<string name="per_mile">毎マイル</string>
<!-- Stats Labels -->
@@ -296,6 +329,10 @@ limitations under the License.
<string name="statistics">統計</string>
<string name="total_distance_label">合計距離</string>
<string name="distance_label">距離</string>
<string name="power">心拍強度</string>
<string name="cadence">ケイデンス</string>
<string name="heart_rate">心拍数</string>
<string name="max_heart_rate">最大心拍数</string>
<string name="unknown">-</string>
<string name="waiting">待機中...</string>
@@ -309,16 +346,13 @@ limitations under the License.
<string name="help">ヘルプ</string>
<string name="about_team">チーム:</string>
<string name="about_version">バージョン:</string>
<string name="about_email">サポート</string>
<string name="about_support">サポート:</string>
<string name="about_privacy">プライバシー:</string>
<!-- Send to Google -->
<string name="sendtogoogle_title">送信...</string>
<string name="sendtogoogle_google_mymaps">Googleマイマップ</string>
<string name="sendtogoogle_google_docs">Google Docs</string>
<string name="sendtogoogle_google_fusiontables">Googleマイマップ</string>
<string name="sendtogoogle_send_now">今すぐ送信</string>
<string name="sendtogoogle_create_new_map">新規マップ作成</string>
<string name="sendtogoogle_pick_existing_map">既存マップ選択</string>
<string name="sendtogoogle_send_stats">トラック統計情報送信</string>
<string name="sendtogoogle_send_stats_and_points">統計情報とポイント送信</string>
@@ -328,22 +362,23 @@ limitations under the License.
<string name="choose_account_title">アカウント選択</string>
<!-- SD card -->
<string name="io_no_external_storage_found">外部ストレージを発見できませんでした．SDカードが刺さっているか，端末がコンピュータにマウントされているか確認してください．</string>
<string name="io_no_external_storage_found">外部ストレージを発見できませんでした．SDカードが刺さっているか、端末がコンピュータにマウントされていないか確認してください．</string>
<string name="io_write_failed">ファイルへの書き込みができません．</string>
<string name="io_read_failed">ファイルからの読み込みができません．</string>
<string name="io_create_dir_failed">SDカードにディレクトリを作成できません．</string>
<string name="io_write_finished">SDカードへの書き込み終了．</string>
<string name="io_read_finished">SDカードからの読み込み終了．</string>
<!-- VersionChecker -->
<string name="version_check_title">アップグレードチェック</string>
<string name="version_check_upgrade_button">今すぐアップデート</string>
<string name="version_check_upgrade_button">今すぐアップグレード</string>
<string name="version_check_continue_button">アップグレードせずに続行</string>
<string name="upgrade_required">お使いの版では，確実には動作せず，サポートもされません．ご使用を続けるには %1$s のアップグレードしてください．</string>
<string name="upgrade_recommended">お使いの版では，確実には動作しません．すぐにアップグレードすることをお勧めします．アップグレードされない場合は問題発生の可能性があることをご認識ください． サーバ同期するような機能の中には，アップグレードされるまで機能しないものがあります．</string>
<string name="upgrade_available">%1$s の新しい版が出ています．現版で問題なくご使用になれますが，アップグレードするまで最新の機能をお使いになれません．</string>
<string name="upgrade_required">お使いの版では、確実には動作せず、サポートもされません．ご使用を続けるには %1$s をアップグレードしてください．</string>
<string name="upgrade_recommended">お使いの版では、確実には動作しません．すぐにアップグレードすることをお勧めします．アップグレードされない場合は問題発生の可能性があることをご認識ください． サーバ同期するような機能の中には、アップグレードされるまで機能しないものがあります．</string>
<string name="upgrade_available">%1$s の新しい版が出ています．現版で問題なくご使用になれますが、アップグレードするまで最新の機能をお使いになれません．</string>
<!-- Welcome -->
<string name="welcome">ようこそ</string>
<string name="welcome_read_later">Ok</string>
<string name="welcome_about">My Tracksについて</string>
<!-- Announcement -->
@@ -361,4 +396,38 @@ limitations under the License.
<!-- Check Units -->
<string name="check_units_title">計測単位についてのご注意</string>
<string name="check_units_message">デフォルトの単位はメートルです．設定を変更しますか?</string>
<!-- Fake preference keys - never saved, but show options in the preferences screen -->
<!-- string name="method_bluetooth">Bluetooth</string --> <!-- duplicate -->
<string name="bluetooth_options">Bluetoothオプション</string>
<string name="bluetooth_pairing">ペアリング</string>
<string name="bluetooth_pairing_summary">ペアリングを行うには「Bluetooth設定」を開いて下さい</string>
<string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
<string name="sensor_options">センサーオプション</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">%sに接続しました</string>
<string name="bluetooth_connecting">Bluetoothセンサー接続中...</string>
<string name="bluetooth_not_connected">Bluetoothセンサーに接続していません</string>
<!-- Sensor State -->
<string name="sensor_data_time">計測日時</string>
<string name="power_meter_enabled">パワーメーター有効</string>
<string name="heart_rate_monitor_enabled">心拍数モニタ有効</string>
<string name="no_sensor_manager">センサーマネージャがありません</string>
<string name="enabled">有効</string>
<string name="connecting">接続中</string>
<string name="connected">接続</string>
<string name="disconnected">解除</string>
<string name="no_sensor_service">センサーサービスがありません</string>
<string name="searching">検索中</string>
<string name="sending">送信中</string>
<!-- Manifest description (not seen inside the app) -->
<string name="notification_permission_label">トラック記録通知受信</string>
<string name="read_tracks_permission_label">トラック読み込み</string>
<string name="write_tracks_permission_label">トラック書き込み トラック記録の開始・終了</string>
<string name="notification_permission_description">トラック記録の開始・終了時に通知されます．</string>
<string name="read_tracks_permission_description">ポイントやウェイポイントといったトラックの読み込みを可能にします．</string>
<string name="write_tracks_permission_description">記録開始やウェイポイント追加といったトラック記録を可能にします．</string>
</resources>
MyTracks/res/values-pl/strings.xml
+11 -21
View File
@@ -34,7 +34,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">Brak menedżera lokalizacji na urządzeniu!</string>
<string name="error_no_gps_location_provider">Brak dostawcy lokalizacji GPS na urządzeniu.</string>
<string name="error_sending_to_mymap">Podczas przesyłania pliku do Moich Map Google pojawił się błąd. Spróbuj ponownie później.</string>
<string name="error_sending_to_fusiontables">Podczas przesyłania pliku do Moich Map Google pojawił się błąd. Spróbuj ponownie później.</string>
<string name="error_sending_to_docs">Podczas przesyłania pliku do Dokumentów Google pojawił się błąd. Spróbuj ponownie później.</string>
<string name="error_unable_to_start_recording">Nie można rozpocząć rejestrowania. Spróbuj ponownie.</string>
<string name="error_unable_to_stop_recording">Nie można zakończyć rejestrowania. Spróbuj ponownie.</string>
@@ -49,7 +49,7 @@ limitations under the License.
<string name="wait_for_fix">Oczekiwanie na lepsze ustalenie pozycji GPS. Upewnij się, że niebo jest widoczne.</string>
<string name="status_now_recording">Rejestrowanie nowej trasy.</string>
<string name="status_stopped_recording">Zatrzymano rejestrowanie nowej trasy.</string>
<string name="status_new_mymap_has_been_created">Utworzona nową Mapę Google na maps.google.com.</string>
<!-- <string name="status_new_fusiontable_has_been_created">Utworzona nową Mapę Google na maps.google.com.</string> -->
<string name="status_tracks_have_been_uploaded">Twoja trasa został wysłana do maps.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_new_doc">Twoja trasa została wysłana do nowego arkusza na docs.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_docs">Twoja trasa została wysłana do docs.google.com.</string>
@@ -64,11 +64,11 @@ limitations under the License.
<string name="progress_message">Przesyłanie trasy do Google.</string>
<string name="progress_message_reading_track">Czytanie trasy...</string>
<string name="progress_message_preparing_track">Przygotowywanie trasy...</string>
<string name="progress_message_authenticating_mymaps">Uwierzytelnianie w Mapach Google...</string>
<!-- <string name="progress_message_authenticating_fusiontables">Uwierzytelnianie w Mapach Google...</string> -->
<string name="progress_message_authenticating_docs">Uwierzytelnianie w Dokumentach Google...</string>
<string name="progress_message_sending_docs">Przesyłanie trasy do Dokumentów Google...</string>
<string name="progress_message_sending_mymaps">Przesyłanie trasy do Map Google...</string>
<string name="progress_message_creating_map">Tworzenie nowej Mojej Mapy...</string>
<!-- <string name="progress_message_sending_fusiontables">Przesyłanie trasy do Map Google...</string> -->
<!-- <string name="progress_message_creating_fusiontable">Tworzenie nowej Mojej Mapy...</string> -->
<string name="import_progress_message">Importowanie trasy GPS. Poczekaj chwilę.</string>
<string name="write_progress_message">Zapisywanie pliku na kartę SD. Poczekaj chwilę.</string>
<string name="progress_message_updating_track">Aktualizacja statystyk trasy...</string>
@@ -81,8 +81,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">Utworzono za pomocą My Tracks na Android.</string>
<string name="my_map_link">Utworzona przez &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; na Android.</string>
<string name="new_map_title">Nowa mapa</string>
<string name="fusiontable_link">Utworzona przez &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; na Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">Punkty</string>
@@ -113,8 +112,8 @@ limitations under the License.
<!-- TrackList -->
<string name="tracklist_show_track">Pokaż</string>
<string name="tracklist_send_to_mymaps">Wyślij do Moich Map Google</string>
<string name="tracklist_send_to_new_mymap">Wyślij do Moich Map Google jako nową mapę</string>
<!-- <string name="tracklist_send_to_fusiontables">Wyślij do Moich Map Google</string> -->
<!-- <string name="tracklist_send_to_new_fusiontable">Wyślij do Moich Map Google jako nową mapę</string> -->
<string name="tracklist_send_to_docs">Wyślij do Dokumentów Google</string>
<string name="tracklist_send_to_google">Wyślij do Google...</string>
<string name="tracklist_delete_track">Usuń z telefonu...</string>
@@ -123,7 +122,7 @@ limitations under the License.
<string name="tracklist_save_as_gpx">Zapisz plik GPX</string>
<string name="tracklist_save_as_kml">Zapisz plik KML</string>
<string name="tracklist_save_as_csv">Zapisz plik CSV</string>
<string name="tracklist_btn_send_all_to_mymaps">Wyślij do Moich Map Google</string>
<!-- <string name="tracklist_btn_send_all_to_fusiontables">Wyślij do Moich Map Google</string> -->
<string name="tracklist_btn_delete_all">Usuń wszystkie trasy</string>
<!-- Export All -->
<string name="tracklist_btn_export_all">Eksportuj wszystkie trasy</string>
@@ -132,7 +131,7 @@ limitations under the License.
<string name="tracklist_all_tracks">Wszystkie trasy:</string>
<string name="tracklist_this_track">Ta trasa</string>
<string name="tracklist_share_track">Podziel się z przyjaciółmi...</string>
<string name="tracklist_share_link">Link do Moich Map Google</string>
<!-- <string name="tracklist_share_linkfusion">Link do Moich Map Google</string> -->
<string name="tracklist_share_gpx_file">Plik GPX</string>
<string name="tracklist_share_kml_file">PLik KML</string>
<string name="tracklist_share_csv_file">Plik CSV</string>
@@ -209,14 +208,9 @@ limitations under the License.
<string name="eclair_required">Dostępne tylko w wersji Android 2.0 lub nowszej</string>
<string name="settings_sensor_type">Typ Czujnika</string>
<string name="settings_sensor_type_summary">Typ czujnika do podłączenia.</string>
<string name="settings_sensor_id">Id Czujnika</string>
<string name="settings_sensor_id_summary">Identyfikator wysyłany do czujników.</string>
<string name="sensor_id_malformed">Identyfikator musi być liczbą całkowitą.</string>
<string name="bluetooth_sensor_title">Czujnik bluetooth</string>
<string name="bluetooth_sensor_summary">Czujnik bluetooth do podłączenia.</string>
<string name="settings_modular_stats_display_title">Widok Statystyk Modularnych</string>
<string name="settings_modular_stats_display_summary_on">Ekran statystyk jest podzielony w zależności od trybu.</string>
<string name="settings_modular_stats_display_summary_off">Wyświetl wszystkie statystyki na jednym ekranie.</string>
<string name="settings_backup">Kopia zapasowa (BETA)</string>
<string name="settings_sd_backup">Kopia zapasowa na kartę SD</string>
@@ -341,18 +335,14 @@ limitations under the License.
<string name="help">Pomoc</string>
<string name="about_team">Zespół:</string>
<string name="about_version">Wersja:</string>
<string name="about_email">Wsparcie</string>
<string name="about_support">Wsparcie:</string>
<string name="about_bart">Bartłomiej Niechwiej</string>
<!-- Send to Google -->
<string name="sendtogoogle_title">Wyślij do...</string>
<string name="sendtogoogle_google_mymaps">Moje Mapy Google</string>
<!-- <string name="sendtogoogle_google_fusiontables">Moje Mapy Google</string> -->
<string name="sendtogoogle_google_docs">Dokumenty Google</string>
<string name="sendtogoogle_send_now">Wyślij teraz</string>
<string name="sendtogoogle_create_new_map">Utwórz nową mapę</string>
<string name="sendtogoogle_pick_existing_map">Wybierz istniejąca mapę</string>
<string name="sendtogoogle_send_stats">Wyślij statystyki trasy</string>
<string name="sendtogoogle_send_stats_and_points">Wyślij statystyki i punkty</string>
MyTracks/res/values-pt-rBR/strings.xml
+10 -16
View File
@@ -33,7 +33,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">Gerenciador de localização não encontrado neste dispositivo!"</string>
<string name="error_no_gps_location_provider">"Provedor de posição de GPS não encontrado neste dispositivo."</string>
<string name="error_sending_to_mymap">Ocorreu um erro ao enviar seu caminho para o Google Meu Mapa. Por favor tente novamente mais tarde."</string>
<string name="error_sending_to_fusiontables">Ocorreu um erro ao enviar seu caminho para o Google Fusion Tables. Por favor tente novamente mais tarde."</string>
<string name="error_sending_to_docs">Ocorreu um erro ao enviar seu caminho para o Google Docs. Por favor tente novamente mais tarde."</string>
<string name="error_unable_to_start_recording">Impossível iniciar a gravação. Tente novamente.</string>
<string name="error_unable_to_stop_recording">Impossível interromper a gravação. Tente novamente.</string>
@@ -48,7 +48,7 @@ limitations under the License.
<string name="wait_for_fix">Esperando por um sinal melhor do GPS. Assegure-se de que o céu está visível.</string>
<string name="status_now_recording">Gravando um novo caminho.</string>
<string name="status_stopped_recording">Gravação interrompida.</string>
<string name="status_new_mymap_has_been_created">Um novo Meu Mapa Google foi criado em maps.google.com.</string>
<string name="status_new_fusiontable_has_been_created">Uma nova Fusion Table Google foi criada em google.com/fusiontables.</string>
<string name="status_tracks_have_been_uploaded">Seu caminho foi enviado para maps.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_new_doc">Seu caminho foi enviado para uma nova planilha em docs.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_docs">Seu caminho foi enviado para docs.google.com.</string>
@@ -63,11 +63,11 @@ 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_mymaps">Autenticando com o Google Maps...</string>
<string name="progress_message_authenticating_fusiontables">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_mymaps">Enviando caminho para o Google Maps...</string>
<string name="progress_message_creating_map">Criando novo Meu Mapa...</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_updating_track">Atualizando estatísticas do caminho...</string>
@@ -80,8 +80,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">"Criado por My Tracks no Android."</string>
<string name="my_map_link">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android."</string>
<string name="new_map_title">Novo mapa</string>
<string name="fusiontable_link">"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>
@@ -111,8 +110,8 @@ limitations under the License.
<!-- TrackList -->
<string name="tracklist_show_track">Mostrar</string>
<string name="tracklist_send_to_mymaps">Enviar para o Google Meus Mapas</string>
<string name="tracklist_send_to_new_mymap">Enviar para o novo Google Meu Mapa</string>
<string name="tracklist_send_to_fusiontables">Enviar para o Google Fusion Tables</string>
<string name="tracklist_send_to_new_fusiontable">Enviar para nova Google Fusion Table</string>
<string name="tracklist_send_to_docs">Enviar para o Google Docs</string>
<string name="tracklist_send_to_google">Enviar para o Google...</string>
<string name="tracklist_delete_track">Apagar do telefone...</string>
@@ -120,13 +119,13 @@ limitations under the License.
<string name="tracklist_write_to_sd">Salvar no cartão SD...</string>
<string name="tracklist_save_as_gpx">Salvar arquivo GPX</string>
<string name="tracklist_save_as_kml">Salvar arquivo KML</string>
<string name="tracklist_btn_send_all_to_mymaps">Enviar para o Google Meus Mapas</string>
<string name="tracklist_btn_send_all_to_fusiontables">Enviar para o Google Fusion Tables</string>
<string name="tracklist_btn_delete_all">Apagar todos os caminhos</string>
<string name="tracklist_pick_one">Escolha um caminho. Pressione&amp;segure para mais opções.</string>
<string name="tracklist_all_tracks">Todos os Caminhos:"</string>
<string name="tracklist_this_track">Este Caminho"</string>
<string name="tracklist_share_track">Compartilhar com amigos..."</string>
<string name="tracklist_share_link">Um link para o Google Meu Mapa"</string>
<string name="tracklist_share_linkfusion">Um link para a Google Fusion Table"</string>
<string name="tracklist_share_gpx_file">Um arquivo GPX"</string>
<string name="tracklist_share_kml_file">Um arquivo KML"</string>
<string name="tracklist_clear_map">"Limpar mapa"</string>
@@ -280,19 +279,14 @@ limitations under the License.
<!-- About -->
<string name="about">Sobre</string>
<string name="help">Ajuda</string>
<string name="about_email">Suporte</string>
<string name="about_team">Equipe:</string>
<string name="about_version">Versão:</string>
<string name="about_support">Suporte:</string>
<!-- Send to Google -->
<string name="sendtogoogle_title">Enviar para...</string>
<string name="sendtogoogle_google_mymaps">Google Meus Mapas</string>
<string name="sendtogoogle_google_docs">Google Docs</string>
<string name="sendtogoogle_send_now">Enviar agora</string>
<string name="sendtogoogle_create_new_map">Criar novo mapa</string>
<string name="sendtogoogle_pick_existing_map">Escolher um mapa existente</string>
<string name="sendtogoogle_send_stats">Enviar estatísticas do caminho</string>
<string name="sendtogoogle_send_stats_and_points">Enviar estatísticas e pontos</string>
MyTracks/res/values-sv/strings.xml
+11 -15
View File
@@ -34,7 +34,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">Ingen platshanterare hittades på denna enhet!</string>
<string name="error_no_gps_location_provider">Ingen GPS-positioneringstjänst hittades på denna enhet.</string>
<string name="error_sending_to_mymap">Det uppstod ett fel i sändningen av ditt spår till Google Mina Kartor. Försök igen senare.</string>
<string name="error_sending_to_fusiontables">Det uppstod ett fel i sändningen av ditt spår till Google Fusion Tables. Försök igen senare.</string>
<string name="error_sending_to_docs">Det uppstod ett fel i sändningen av ditt spår till Google Dokument. Försök igen senare.</string>
<string name="error_unable_to_start_recording">Kan inte starta inspelningen. Försök igen.</string>
<string name="error_unable_to_stop_recording">Kan inte stoppa inspelningen. Försök igen.</string>
@@ -49,7 +49,7 @@ limitations under the License.
<string name="wait_for_fix">Väntar på bättre GPS-position. Se till att himlen är synlig.</string>
<string name="status_now_recording">Spelar nu in ett nytt spår.</string>
<string name="status_stopped_recording">Stoppade inspelning av ditt spår.</string>
<string name="status_new_mymap_has_been_created">En ny Google Mina Kartor har skapats på maps.google.com.</string>
<!-- <string name="status_new_fusiontable_has_been_created">En ny Google Mina Kartor har skapats på maps.google.com.</string> -->
<string name="status_tracks_have_been_uploaded">Ditt spår har skickats till maps.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_new_doc">Ditt spår har skickats till ett nytt kalkylblad på docs.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_docs">Ditt spår har skickats till docs.google.com.</string>
@@ -64,11 +64,11 @@ limitations under the License.
<string name="progress_message">Skickar ditt spår till Google.</string>
<string name="progress_message_reading_track">Läser spår...</string>
<string name="progress_message_preparing_track">Förbereder spår...</string>
<string name="progress_message_authenticating_mymaps">Autentiserar till Google Kartor...</string>
<!-- <string name="progress_message_authenticating_fusiontables">Autentiserar till Google Kartor...</string> -->
<string name="progress_message_authenticating_docs">Autentiserar till Google Dokument...</string>
<string name="progress_message_sending_docs">Skickar spår till Google Dokument...</string>
<string name="progress_message_sending_mymaps">Skickar spår till Google Kartor...</string>
<string name="progress_message_creating_map">Skapar en ny Min Karta...</string>
<!-- <string name="progress_message_sending_fusiontables">Skickar spår till Google Kartor...</string> -->
<!-- <string name="progress_message_creating_fusiontable">Skapar en ny Min Karta...</string> -->
<string name="import_progress_message">Importerar ett GPS-spår. Detta kan ta en stund.</string>
<string name="write_progress_message">Skriver till SD-kortet. Detta kan ta en stund.</string>
<string name="progress_message_updating_track">Uppdaterar spårstatistik...</string>
@@ -81,8 +81,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">Skapad av My Tracks på Android.</string>
<string name="my_map_link">Skapad av &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; på Android.</string>
<string name="new_map_title">Ny karta</string>
<string name="fusiontable_link">Skapad av &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; på Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">Punkter</string>
@@ -113,8 +112,8 @@ limitations under the License.
<!-- TrackList -->
<string name="tracklist_show_track">Visa</string>
<string name="tracklist_send_to_mymaps">Skicka till Google Mina Kartor</string>
<string name="tracklist_send_to_new_mymap">Skicka till ny Google Mina Kartor</string>
<!-- <string name="tracklist_send_to_fusiontables">Skicka till Google Mina Kartor</string> -->
<!-- <string name="tracklist_send_to_new_fusiontable">Skicka till ny Google Mina Kartor</string> -->
<string name="tracklist_send_to_docs">Skicka till Google Dokument</string>
<string name="tracklist_send_to_google">Skicka till Google...</string>
<string name="tracklist_delete_track">Ta bort från telefonen...</string>
@@ -123,7 +122,7 @@ limitations under the License.
<string name="tracklist_save_as_gpx">Spara en GPX-fil</string>
<string name="tracklist_save_as_kml">Spara en KML-fil</string>
<string name="tracklist_save_as_csv">Spara en CSV-fil</string>
<string name="tracklist_btn_send_all_to_mymaps">Skicka till Google Mina Kartor</string>
<!-- <string name="tracklist_btn_send_all_to_fusiontables">Skicka till Google Mina Kartor</string> -->
<string name="tracklist_btn_delete_all">Ta bort alla spår</string>
<!-- Export All -->
<string name="tracklist_btn_export_all">Exportera alla spår</string>
@@ -132,7 +131,7 @@ limitations under the License.
<string name="tracklist_all_tracks">Alla spår:</string>
<string name="tracklist_this_track">Det här spåret</string>
<string name="tracklist_share_track">Dela med vänner...</string>
<string name="tracklist_share_link">En länk till Google Mina Kartor</string>
<!-- <string name="tracklist_share_linkfusion">En länk till Google Mina Kartor</string> -->
<string name="tracklist_share_gpx_file">En GPX-fil</string>
<string name="tracklist_share_kml_file">En KML-fil</string>
<string name="tracklist_share_csv_file">En CSV-fil</string>
@@ -310,16 +309,13 @@ limitations under the License.
<string name="help">Hjälp</string>
<string name="about_team">Team:</string>
<string name="about_version">Version:</string>
<string name="about_email">Support</string>
<string name="about_support">Support:</string>
<!-- Send to Google -->
<string name="sendtogoogle_title">Skicka till...</string>
<string name="sendtogoogle_google_mymaps">Google Mina Kartor</string>
<!--<string name="sendtogoogle_google_fusiontables">Google Mina Kartor</string>-->
<string name="sendtogoogle_google_docs">Google Dokument</string>
<string name="sendtogoogle_send_now">Skicka nu</string>
<string name="sendtogoogle_create_new_map">Skapa en ny karta</string>
<string name="sendtogoogle_pick_existing_map">Välj en befintlig karta</string>
<string name="sendtogoogle_send_stats">Skicka spårstatistik</string>
<string name="sendtogoogle_send_stats_and_points">Skicka statistik och punkter</string>
MyTracks/res/values-zh-rCN/strings.xml
+10 -61
View File
@@ -15,9 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Used by the Menu -->
<string name="start_recording">记录轨迹</string>
<string name="stop_recording">停止记录</string>
@@ -37,7 +34,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">此设备上没有位置管理器!</string>
<string name="error_no_gps_location_provider">此设备上没有 GPS 定位装置.</string>
<string name="error_sending_to_mymap">发送你的轨迹到 Google My Map 时发生错误. 请稍后重试.</string>
<string name="error_sending_to_fusiontables">发送你的轨迹到 Google Fusion Tables 时发生错误. 请稍后重试.</string>
<string name="error_sending_to_docs">发送你的轨迹到 Google Docs 时发生错误. 请稍后重试.</string>
<string name="error_unable_to_start_recording">无法开始记录. 请重试.</string>
<string name="error_unable_to_stop_recording">无法停止记录. 请重试.</string>
@@ -52,7 +49,7 @@ limitations under the License.
<string name="wait_for_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
<string name="status_now_recording">现在开始记录新的轨迹.</string>
<string name="status_stopped_recording">停止记录你的轨迹.</string>
<string name="status_new_mymap_has_been_created">已在 maps.google.com 创建新 Google My Map.</string>
<string name="status_new_fusiontable_has_been_created">已在 google.com/fusiontables 创建新 Google Fusion Table.</string>
<string name="status_tracks_have_been_uploaded">你的轨迹已经发送到 maps.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_new_doc">你的轨迹已经作为新的电子表格发送到 docs.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_docs">你的轨迹已经发送到 docs.google.com.</string>
@@ -67,11 +64,11 @@ limitations under the License.
<string name="progress_message">发送你的轨迹到 Google.</string>
<string name="progress_message_reading_track">读取轨迹中...</string>
<string name="progress_message_preparing_track">准备轨迹中...</string>
<string name="progress_message_authenticating_mymaps">登录 Google Maps 中...</string>
<string name="progress_message_authenticating_fusiontables">登录 Google Fusion Tables 中...</string>
<string name="progress_message_authenticating_docs">登录 Google Docs 中...</string>
<string name="progress_message_sending_docs">发送轨迹到 Google Docs 中...</string>
<string name="progress_message_sending_mymaps">发送轨迹到 Google Maps 中...</string>
<string name="progress_message_creating_map">创建新的 My Map 中...</string>
<string name="progress_message_sending_fusiontables">发送轨迹到 Google Fusion Tables 中...</string>
<string name="progress_message_creating_fusiontable">创建新的 Fusion Table 中...</string>
<string name="import_progress_message">导入 GPS 轨迹中. 请稍候.</string>
<string name="write_progress_message">写入文件到 SD 卡中. 请稍候.</string>
<string name="progress_message_updating_track">更新轨迹统计信息中...</string>
@@ -84,8 +81,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">由 Android 上的 My Tracks 生成.</string>
<string name="my_map_link">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 生成.</string>
<string name="new_map_title">新地图</string>
<string name="fusiontable_link">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 生成.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">点数</string>
@@ -116,8 +112,8 @@ limitations under the License.
<!-- TrackList -->
<string name="tracklist_show_track">显示</string>
<string name="tracklist_send_to_mymaps">发送到 Google My Maps</string>
<string name="tracklist_send_to_new_mymap">发送到新建 Google My Map</string>
<string name="tracklist_send_to_fusiontables">发送到 Google Fusion Table</string>
<string name="tracklist_send_to_new_fusiontable">发送到新建 Google Fusion Table</string>
<string name="tracklist_send_to_docs">发送到 Google Docs</string>
<string name="tracklist_send_to_google">发送到 Google...</string>
<string name="tracklist_delete_track">从手机上删除...</string>
@@ -127,7 +123,7 @@ limitations under the License.
<string name="tracklist_save_as_kml">保存为 KML 文件</string>
<string name="tracklist_save_as_csv">保存为 CSV 文件</string>
<string name="tracklist_save_as_tcx">保存为 TCX 文件</string>
<string name="tracklist_btn_send_all_to_mymaps">发送到 Google My Maps</string>
<string name="tracklist_btn_send_all_to_fusiontables">发送到 Google Fusion Tables</string>
<string name="tracklist_btn_delete_all">删除所有轨迹</string>
<!-- Export All -->
<string name="tracklist_btn_export_all">导出所有轨迹</string>
@@ -136,7 +132,7 @@ limitations under the License.
<string name="tracklist_all_tracks">全部轨迹:</string>
<string name="tracklist_this_track">此轨迹</string>
<string name="tracklist_share_track">与朋友分享...</string>
<string name="tracklist_share_link">链接到 Google My Map</string>
<string name="tracklist_share_linkfusion">链接到 Google Fusion Table</string>
<string name="tracklist_share_gpx_file">GPX 文件</string>
<string name="tracklist_share_kml_file">KML 文件</string>
<string name="tracklist_share_csv_file">CSV 文件</string>
@@ -215,15 +211,9 @@ limitations under the License.
<string name="eclair_required">只在 Android 2.0 及以上版本支持</string>
<string name="settings_sensor_type">感应器类型</string>
<string name="settings_sensor_type_summary">要连接到的感应器类型</string>
<string name="settings_sensor_id">感应器ID</string>
<string name="settings_sensor_id_summary">发送到感应器的ID.</string>
<string name="sensor_id_malformed">ID必须是一个整数值.</string>
<string name="bluetooth_sensor_title">蓝牙感应器</string>
<string name="bluetooth_sensor_summary">要连接到的蓝牙感应器</string>
<string name="settings_backup">备份 (测试版)</string>
<string name="settings_sd_backup">SD 存储卡备份</string>
<string name="settings_backup_to_sd">立即备份</string>
@@ -306,32 +296,16 @@ limitations under the License.
<string name="second">秒</string>
<string name="seconds">秒</string>
<!-- Distance -->
<string name="kilometers_long">千米</string>
<string name="miles_long">英里</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour_long">千米每小时</string>
<string name="per_kilometer">每千米</string>
<string name="mile_per_hour_long">英里每小时</string>
<string name="per_mile">每英里</string>
<!-- Stats Labels -->
<string name="moving_time_label">移动时间</string>
<string name="total_time_label">总时间</string>
@@ -346,7 +320,6 @@ limitations under the License.
<string name="cadence">节奏</string>
<string name="heart_rate">心率</string>
<string name="max_heart_rate">最大心率</string>
<string name="waiting">请稍候...</string>
<!-- End User License Agreement -->
@@ -359,33 +332,11 @@ limitations under the License.
<string name="help">帮助</string>
<string name="about_team">开发团队:</string>
<string name="about_version">版本:</string>
<string name="about_email">技术支持</string>
<string name="about_support">技术支持:</string>
<!-- Send to Google -->
<string name="sendtogoogle_title">发送到...</string>
<string name="sendtogoogle_send_now">立即发送</string>
<string name="sendtogoogle_create_new_map">创建新地图</string>
<string name="sendtogoogle_pick_existing_map">选择已有地图</string>
<string name="sendtogoogle_send_stats">发送轨迹统计信息</string>
<string name="sendtogoogle_send_stats_and_points">发送统计信息和路点</string>
@@ -435,7 +386,6 @@ limitations under the License.
<string name="bluetooth_options">蓝牙设置</string>
<string name="bluetooth_pairing">设备关联</string>
<string name="bluetooth_pairing_summary">打开 Android 的蓝牙设置关联设备</string>
<string name="sensor_options">感应器选项</string>
<!-- Bluetooth Sensor -->
@@ -447,5 +397,4 @@ limitations under the License.
<string name="sensor_data_time">感应器数据时间</string>
<string name="power_meter_enabled">电源计量器已启用</string>
<string name="heart_rate_monitor_enabled">心率监视器已启用</string>
</resources>
MyTracks/res/values/strings.xml
-1
View File
@@ -64,7 +64,6 @@ limitations under the License.
<string name="progress_title">Please wait...</string>
<string name="progress_message">Sending your track to Google.</string>
<string name="progress_message_reading_track">Reading track...</string>
<string name="progress_message_preparing_track">Preparing track...</string>
<string name="progress_message_authenticating_fusiontables">Authenticating to Google Fusion Tables...</string>
<string name="progress_message_authenticating_docs">Authenticating to Google Docs...</string>
<string name="progress_message_sending_docs">Sending track to Google Docs...</string>
MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
+90 -94
View File
@@ -60,6 +60,7 @@ import java.util.ArrayList;
public class ChartActivity extends Activity implements
SharedPreferences.OnSharedPreferenceChangeListener {
private final static int BUFFER_SIZE = 1024;
private double profileLength = 0;
private boolean metricUnits = true;
@@ -101,7 +102,7 @@ public class ChartActivity extends Activity implements
/*
* UI elements:
*/
private ChartView cv;
private ChartView chartView;
private MenuItem chartSettingsMenuItem;
private LinearLayout busyPane;
private ZoomControls zoomControls;
@@ -118,10 +119,10 @@ public class ChartActivity extends Activity implements
@Override
public void run() {
busyPane.setVisibility(View.GONE);
zoomControls.setIsZoomInEnabled(cv.canZoomIn());
zoomControls.setIsZoomOutEnabled(cv.canZoomOut());
cv.setShowPointer(selectedTrackIsRecording());
cv.invalidate();
zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
chartView.setShowPointer(selectedTrackIsRecording());
chartView.invalidate();
}
};
@@ -158,54 +159,12 @@ public class ChartActivity extends Activity implements
private Handler updateTrackHandler;
/**
* A runnable that update the profile from the provider.
* A runnable that updates the profile from the provider.
*/
private final Runnable updateTrackRunnable = new Runnable() {
@Override
public void run() {
Log.d(MyTracksConstants.TAG, "MyTracks: Updating chart.");
Track track = providerUtils.getTrack(recordingTrackId);
if (track == null) {
Log.w(MyTracksConstants.TAG, "MyTracks: track not found");
return;
}
Cursor cursor = null;
try {
cursor = providerUtils.getLocationsCursor(recordingTrackId,
lastSeenLocationId + 1,
MyTracksConstants.MAX_DISPLAYED_TRACK_POINTS - cv.getData().size(),
true);
if (cursor != null) {
if (cursor.moveToLast()) {
final int idColumnIdx =
cursor.getColumnIndexOrThrow(TrackPointsColumns._ID);
ArrayList<double[]> data = new ArrayList<double[]>();
// Need two locations so we can keep track of the last location.
Location location = new MyTracksLocation("");
do {
lastSeenLocationId = cursor.getLong(idColumnIdx);
providerUtils.fillLocation(cursor, location);
if (MyTracksUtils.isValidLocation(location)) {
double[] point = new double[6];
location = getDataPoint(location, track, point);
data.add(point);
}
} while (cursor.moveToPrevious());
cv.addDataPoints(data);
}
}
} catch (RuntimeException e) {
Log.w(MyTracksConstants.TAG, "Caught an unexpected exception.", e);
} finally {
if (cursor != null) {
cursor.close();
}
uiHandler.post(new Runnable() {
public void run() {
cv.invalidate();
}
});
}
readNewTrackPoints();
}
};
@@ -222,13 +181,13 @@ public class ChartActivity extends Activity implements
metricUnits =
sharedPreferences.getBoolean(getString(R.string.metric_units_key),
true);
cv.setMetricUnits(metricUnits);
chartView.setMetricUnits(metricUnits);
readProfileAsync();
} else if (key.equals(getString(R.string.report_speed_key))) {
reportSpeed =
sharedPreferences.getBoolean(getString(R.string.report_speed_key),
true);
cv.setReportSpeed(reportSpeed, this);
chartView.setReportSpeed(reportSpeed, this);
readProfileAsync();
} else if (key.equals(getString(R.string.recording_track_key))) {
recordingTrackId =
@@ -254,11 +213,11 @@ public class ChartActivity extends Activity implements
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.mytracks_charts);
ViewGroup layout = (ViewGroup) findViewById(R.id.elevation_chart);
cv = new ChartView(this);
cv.setMode(this.mode);
chartView = new ChartView(this);
chartView.setMode(this.mode);
LayoutParams params =
new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
layout.addView(cv, params);
layout.addView(chartView, params);
SharedPreferences preferences =
getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
@@ -269,10 +228,10 @@ public class ChartActivity extends Activity implements
preferences.getLong(getString(R.string.recording_track_key), -1);
metricUnits = preferences.getBoolean(getString(R.string.metric_units_key),
true);
cv.setMetricUnits(metricUnits);
chartView.setMetricUnits(metricUnits);
reportSpeed = preferences.getBoolean(getString(R.string.report_speed_key),
true);
cv.setReportSpeed(reportSpeed, this);
chartView.setReportSpeed(reportSpeed, this);
preferences.registerOnSharedPreferenceChangeListener(this);
}
@@ -332,7 +291,7 @@ public class ChartActivity extends Activity implements
ChartActivity.this.runOnUiThread(new Runnable() {
@Override
public void run() {
cv.invalidate();
chartView.invalidate();
}
});
}
@@ -384,21 +343,21 @@ public class ChartActivity extends Activity implements
}
private void zoomIn() {
cv.zoomIn();
zoomControls.setIsZoomInEnabled(cv.canZoomIn());
zoomControls.setIsZoomOutEnabled(cv.canZoomOut());
chartView.zoomIn();
zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
}
private void zoomOut() {
cv.zoomOut();
zoomControls.setIsZoomInEnabled(cv.canZoomIn());
zoomControls.setIsZoomOutEnabled(cv.canZoomOut());
chartView.zoomOut();
zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
}
public void setMode(Mode newMode) {
if (this.mode != newMode) {
this.mode = newMode;
cv.setMode(this.mode);
chartView.setMode(this.mode);
readProfileAsync();
}
}
@@ -408,12 +367,12 @@ public class ChartActivity extends Activity implements
}
public void setSeriesEnabled(int index, boolean enabled) {
cv.getChartValueSeries(index).setEnabled(enabled);
chartView.getChartValueSeries(index).setEnabled(enabled);
runOnUiThread(updateChart);
}
public boolean isSeriesEnabled(int index) {
return cv.getChartValueSeries(index).isEnabled();
return chartView.getChartValueSeries(index).isEnabled();
}
private void readWaypoints() {
@@ -421,7 +380,7 @@ public class ChartActivity extends Activity implements
return;
}
Cursor cursor = null;
cv.clearWaypoints();
chartView.clearWaypoints();
try {
// We will silently drop extra waypoints to make the app responsive.
cursor =
@@ -431,7 +390,7 @@ public class ChartActivity extends Activity implements
if (cursor.moveToFirst()) {
do {
Waypoint wpt = providerUtils.createWaypoint(cursor);
cv.addWaypoint(wpt);
chartView.addWaypoint(wpt);
} while (cursor.moveToNext());
}
}
@@ -575,7 +534,7 @@ public class ChartActivity extends Activity implements
* Sets the chart data points reading from the provider. This is non-blocking.
*/
private void readProfileAsync() {
cv.reset();
chartView.reset();
updateTrackHandler.post(new Runnable() {
public void run() {
runOnUiThread(showSpinner);
@@ -594,7 +553,6 @@ public class ChartActivity extends Activity implements
profileLength = 0;
lastLocation = null;
startTime = -1;
Cursor cursor = null;
if (selectedTrackId < 0) {
return;
}
@@ -602,26 +560,70 @@ public class ChartActivity extends Activity implements
if (track == null) {
return;
}
long lastLocationRead = track.getStartId();
long totalLocations = track.getStopId() - track.getStartId();
lastSeenLocationId = track.getStartId();
final ArrayList<double[]> theData = readPointsToList(track);
runOnUiThread(new Runnable() {
public void run() {
chartView.setDataPoints(theData);
}
});
}
// Limit the number of chart readings. Ideally we would want around 1024.
int chartSamplingFrequency = Math.max(1, (int) (totalLocations / 1024.0));
int bufferSize = 1024;
/**
* Read all new track points.
*/
private void readNewTrackPoints() {
Log.i(MyTracksConstants.TAG, "MyTracks: Updating chart last seen: " + lastSeenLocationId);
Track track = providerUtils.getTrack(recordingTrackId);
if (track == null) {
Log.w(MyTracksConstants.TAG, "MyTracks: track not found");
return;
}
chartView.addDataPoints(readPointsToList(track));
uiHandler.post(new Runnable() {
public void run() {
chartView.invalidate();
}
});
Log.i(MyTracksConstants.TAG, "MyTracks: Updated chart last seen: " + lastSeenLocationId);
}
/**
* Get the frequency at which points should be displayed.
* Limit the number of chart readings. Ideally we would want around 1024.
* @param track The track which will be displayed.
* @return The inverse of the frequency of points to be displayed.
*/
private int getSamplingFrequency(Track track) {
long totalLocations = track.getStopId() - track.getStartId();
return Math.max(1, (int) (totalLocations / 1024.0));
}
private Cursor getLocationsCursor(long lastLocationRead) {
return providerUtils.getLocationsCursor(selectedTrackId, lastLocationRead, BUFFER_SIZE, false);
}
/**
* Read all of the points to a list.
* @param track The track which will be displayed.
* @return
*/
private ArrayList<double[]> readPointsToList(Track track) {
Cursor cursor = null;
long lastLocationRead = lastSeenLocationId;
int points = 0;
int chartSamplingFrequency = getSamplingFrequency(track);
ArrayList<double[]> result = new ArrayList<double[]>();
// Need two locations so we can keep track of the last location.
Location location = new MyTracksLocation("");
try {
final ArrayList<double[]> theData = new ArrayList<double[]>();
int points = 0;
// Need two locations so we can keep track of the last location.
Location location = new MyTracksLocation("");
while (lastLocationRead < track.getStopId()) {
cursor = providerUtils.getLocationsCursor(
selectedTrackId, lastLocationRead, bufferSize, false);
while (lastSeenLocationId < track.getStopId()) {
cursor = getLocationsCursor(lastLocationRead);
if (cursor != null) {
elevationBuffer.reset();
speedBuffer.reset();
if (cursor.moveToFirst()) {
final int idColumnIdx =
cursor.getColumnIndexOrThrow(TrackPointsColumns._ID);
final int idColumnIdx = cursor.getColumnIndexOrThrow(TrackPointsColumns._ID);
while (cursor.moveToNext()) {
points++;
providerUtils.fillLocation(cursor, location);
@@ -632,26 +634,20 @@ public class ChartActivity extends Activity implements
double[] point = new double[6];
location = getDataPoint(location, track, point);
if (points % chartSamplingFrequency == 0) {
theData.add(point);
result.add(point);
}
}
}
} else {
lastLocationRead += bufferSize;
lastLocationRead += BUFFER_SIZE;
}
} else {
lastLocationRead += bufferSize;
lastLocationRead += BUFFER_SIZE;
}
cursor.close();
cursor = null;
}
runOnUiThread(new Runnable() {
public void run() {
cv.setDataPoints(theData);
}
});
} catch (RuntimeException e) {
Log.w(MyTracksConstants.TAG, "Caught unexpected exception.", e);
return result;
} finally {
if (cursor != null) {
cursor.close();
MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+8 -5
View File
@@ -216,7 +216,7 @@ public class ChartView extends View {
R.color.speed_fill,
R.color.speed_border,
new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE,
new int[] {5, 10, 20, 50}),
new int[] {1, 5, 10, 20, 50}),
R.string.speed);
series[POWER_SERIES] =
new ChartValueSeries(context,
@@ -610,7 +610,8 @@ public class ChartView extends View {
c.translate(getScrollX(), 0);
drawYAxis(c);
final int spacer = 5;
float density = getContext().getResources().getDisplayMetrics().density;
final int spacer = (int) (5 * density);
int x = leftBorder - spacer;
for (ChartValueSeries cvs : series) {
if (cvs.isEnabled() && cvs.hasData()) {
@@ -726,9 +727,10 @@ public class ChartView extends View {
maxLength += cvs.getMaxLabelLength();
}
}
leftBorder = 4 + 8 * maxLength;
effectiveWidth = w - leftBorder - RIGHT_BORDER;
float density = getContext().getResources().getDisplayMetrics().density;
// TODO: This should be function of the number of variables displayed.
leftBorder = (int) (density * (4 + 8 * maxLength));
effectiveWidth = w - leftBorder - RIGHT_BORDER;
bottomBorder = (int) (density * BOTTOM_BORDER);
topBorder = (int) (density * TOP_BORDER);
effectiveHeight = h - topBorder - bottomBorder;
@@ -739,8 +741,9 @@ public class ChartView extends View {
}
private int getY(ChartValueSeries cvs, double y) {
int effectiveSpread = cvs.getInterval() * MAX_INTERVALS;
return topBorder + effectiveHeight
- (int) ((y - cvs.getMin()) * effectiveHeight / cvs.getSpread());
- (int) ((y - cvs.getMin()) * effectiveHeight / effectiveSpread);
}
private void drawXLabels(Canvas c) {
MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class SendToDocs {
}
private void doUpload() {
statusMessage = activity.getString(R.string.error_sending_to_mymap);
statusMessage = activity.getString(R.string.error_sending_to_fusiontables);
success = false;
try {
MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+99 -72
View File
@@ -84,6 +84,21 @@ public class SendToFusionTables implements Runnable {
private static final int MAX_POINTS_PER_UPLOAD = 2048;
private static final String GDATA_VERSION = "2";
// This class reports upload status to the user as a completion percentage
// using a progress bar. Progress is defined as follows:
//
// 0% Getting track metadata
// 5% Creating Fusion Table (GData to FT server)
// 10%-90% Uploading the track data to Fusion Tables
// 95% Uploading waypoints
// 100% Done
private static final int PROGRESS_INITIALIZATION = 0;
private static final int PROGRESS_FUSION_TABLE_CREATE = 5;
private static final int PROGRESS_UPLOAD_DATA_MIN = 10;
private static final int PROGRESS_UPLOAD_DATA_MAX = 90;
private static final int PROGRESS_UPLOAD_WAYPOINTS = 95;
private static final int PROGRESS_COMPLETE = 100;
private final Activity context;
private final AuthManager auth;
@@ -153,7 +168,7 @@ public class SendToFusionTables implements Runnable {
int statusMessageId = R.string.error_sending_to_fusiontables;
boolean success = true;
try {
progressIndicator.setProgressValue(1);
progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
progressIndicator.setProgressMessage(R.string.progress_message_reading_track);
// Get the track meta-data
@@ -161,25 +176,30 @@ public class SendToFusionTables implements Runnable {
String originalDescription = track.getDescription();
// Create a new table:
progressIndicator.setProgressValue(PROGRESS_FUSION_TABLE_CREATE);
progressIndicator.setProgressMessage(R.string.progress_message_creating_fusiontable);
success = createNewTable(track);
if (success) {
success = makeTableUnlisted(tableId);
if (!createNewTable(track) || !makeTableUnlisted(tableId)) {
return;
}
progressIndicator.setProgressValue(PROGRESS_UPLOAD_DATA_MIN);
progressIndicator.setProgressMessage(R.string.progress_message_sending_fusiontables);
// Upload all of the segments of the track plus start/end markers
if (success) {
success = uploadAllTrackPoints(track, originalDescription);
if (!uploadAllTrackPoints(track, originalDescription)) {
return;
}
progressIndicator.setProgressValue(PROGRESS_UPLOAD_WAYPOINTS);
// Upload all the waypoints.
if (success) {
success = uploadWaypoints(track);
statusMessageId = R.string.status_new_fusiontable_has_been_created;
if (!uploadWaypoints(track)) {
return;
}
statusMessageId = R.string.status_new_fusiontable_has_been_created;
Log.d(MyTracksConstants.TAG, "SendToFusionTables: Done: " + success);
progressIndicator.setProgressValue(100);
progressIndicator.setProgressValue(PROGRESS_COMPLETE);
} finally {
final boolean finalSuccess = success;
@@ -203,14 +223,14 @@ public class SendToFusionTables implements Runnable {
*/
private boolean createNewTable(Track track) {
Log.d(MyTracksConstants.TAG, "Creating a new fusion table.");
String query = "CREATE TABLE '" + track.getName() +
String query = "CREATE TABLE '" + sqlEscape(track.getName()) +
"' (name:STRING,description:STRING,geometry:LOCATION,marker:STRING)";
return runUpdate(query);
}
private boolean makeTableUnlisted(String tableId) {
Log.d(MyTracksConstants.TAG, "Setting visibility to unlisted.");
String query = "UPDATE TABLE " + tableId + " SET VISIBILITY = unlisted";
String query = "UPDATE TABLE " + tableId + " SET VISIBILITY = UNLISTED";
return runUpdate(query);
}
@@ -227,12 +247,16 @@ public class SendToFusionTables implements Runnable {
builder.append(',');
}
builder.append('\'');
builder.append(values[i].replaceAll("'", "''"));
builder.append(sqlEscape(values[i]));
builder.append('\'');
}
builder.append(')');
return builder.toString();
}
private static String sqlEscape(String value) {
return value.replaceAll("'", "''");
}
/**
* Creates a new row representing a marker.
@@ -298,11 +322,10 @@ public class SendToFusionTables implements Runnable {
DoubleBuffer elevationBuffer = new DoubleBuffer(MyTracksConstants.ELEVATION_SMOOTHING_FACTOR);
List<Location> locations = new ArrayList<Location>(MAX_POINTS_PER_UPLOAD);
progressIndicator.setProgressMessage(R.string.progress_message_reading_track);
Location lastLocation = null;
do {
if (totalLocationsRead % 100 == 0) {
updateProgress();
updateTrackDataUploadProgress();
}
Location loc = providerUtils.createLocation(locationsCursor);
@@ -414,8 +437,7 @@ public class SendToFusionTables implements Runnable {
}
private boolean prepareAndUploadPoints(Track track, List<Location> locations) {
progressIndicator.setProgressMessage(R.string.progress_message_preparing_track);
updateProgress();
updateTrackDataUploadProgress();
int numLocations = locations.size();
if (numLocations < 2) {
@@ -428,7 +450,6 @@ public class SendToFusionTables implements Runnable {
ArrayList<Track> splitTracks = prepareLocations(track, locations);
// Start uploading them
progressIndicator.setProgressMessage(R.string.progress_message_sending_fusiontables);
for (Track splitTrack : splitTracks) {
if (totalSegmentsUploaded > 1) {
splitTrack.setName(splitTrack.getName() + " "
@@ -452,7 +473,7 @@ public class SendToFusionTables implements Runnable {
locations.clear();
totalLocationsUploaded += numLocations;
updateProgress();
updateTrackDataUploadProgress();
return true;
}
@@ -481,7 +502,7 @@ public class SendToFusionTables implements Runnable {
boolean startNewTrackSegment = false;
for (Location loc : locations) {
if (totalLocationsPrepared % 100 == 0) {
updateProgress();
updateTrackDataUploadProgress();
}
if (loc.getLatitude() > 90) {
startNewTrackSegment = true;
@@ -574,41 +595,48 @@ public class SendToFusionTables implements Runnable {
// same time.
boolean success = true;
Cursor c = null;
c = providerUtils.getWaypointsCursor(
track.getId(), 0,
MyTracksConstants.MAX_LOADED_WAYPOINTS_POINTS);
if (c != null) {
if (c.moveToFirst()) {
// This will skip the 1st waypoint (it carries the stats for the
// last segment).
while (c.moveToNext()) {
Waypoint wpt = providerUtils.createWaypoint(c);
Log.d(MyTracksConstants.TAG, "SendToFusionTables: Creating waypoint.");
success = createNewPoint(wpt.getName(), wpt.getDescription(), wpt.getLocation(),
MARKER_TYPE_WAYPOINT);
if (!success) {
break;
try {
c = providerUtils.getWaypointsCursor(
track.getId(), 0,
MyTracksConstants.MAX_LOADED_WAYPOINTS_POINTS);
if (c != null) {
if (c.moveToFirst()) {
// This will skip the 1st waypoint (it carries the stats for the
// last segment).
while (c.moveToNext()) {
Waypoint wpt = providerUtils.createWaypoint(c);
Log.d(MyTracksConstants.TAG, "SendToFusionTables: Creating waypoint.");
success = createNewPoint(wpt.getName(), wpt.getDescription(), wpt.getLocation(),
MARKER_TYPE_WAYPOINT);
if (!success) {
break;
}
}
}
}
if (!success) {
Log.w(MyTracksConstants.TAG, "SendToFusionTables: upload waypoints failed.");
}
return success;
} finally {
if (c != null) {
c.close();
}
}
if (!success) {
Log.w(MyTracksConstants.TAG, "SendToFusionTables: upload waypoints failed.");
}
return success;
}
/**
* Sets the current upload progress.
*/
private void updateProgress() {
private void updateTrackDataUploadProgress() {
// The percent of the total that represents the completed part of this
// segment.
int totalPercentage =
// segment. We calculate it as an absolute percentage, and then scale it
// to fit the completion percentage range alloted to track data upload.
double totalPercentage =
(totalLocationsRead + totalLocationsPrepared + totalLocationsUploaded)
/ (totalLocations * 3);
totalPercentage = Math.min(99, totalPercentage);
progressIndicator.setProgressValue(totalPercentage);
double scaledPercentage = totalPercentage
* (PROGRESS_UPLOAD_DATA_MAX - PROGRESS_UPLOAD_DATA_MIN) + PROGRESS_UPLOAD_DATA_MIN;
progressIndicator.setProgressValue((int) scaledPercentage);
}
/**
@@ -636,32 +664,31 @@ public class SendToFusionTables implements Runnable {
String sql = "sql=" + URLEncoder.encode(query, "UTF-8");
isc.inputStream = new ByteArrayInputStream(Strings.toBytesUtf8(sql));
request.content = isc;
Log.d(MyTracksConstants.TAG, "Running update query " + url.toString() + ": " + sql);
try {
HttpResponse response = request.execute();
boolean success = response.isSuccessStatusCode;
if (success) {
byte[] result = new byte[1024];
response.getContent().read(result);
String s = Strings.fromBytesUtf8(result);
String[] lines = s.split(Strings.LINE_SEPARATOR);
if (lines[0].equals("tableid")) {
tableId = lines[1];
Log.d(MyTracksConstants.TAG, "tableId = " + tableId);
} else {
Log.w(MyTracksConstants.TAG, "Unrecognized response: " + lines[0]);
}
} else {
Log.d(MyTracksConstants.TAG, "Query failed: " + response.statusMessage + " (" +
response.statusCode + ")");
throw new GDataWrapper.HttpException(response.statusCode, response.statusMessage);
}
} catch (HttpResponseException e) {
if (e.response.statusCode == 401) {
throw new GDataWrapper.AuthenticationException(e);
}
}
Log.d(MyTracksConstants.TAG, "Running update query " + url.toString() + ": " + sql);
HttpResponse response;
try {
response = request.execute();
} catch (HttpResponseException e) {
throw new GDataWrapper.HttpException(e.response.statusCode, e.response.statusMessage);
}
boolean success = response.isSuccessStatusCode;
if (success) {
byte[] result = new byte[1024];
response.getContent().read(result);
String s = Strings.fromBytesUtf8(result);
String[] lines = s.split(Strings.LINE_SEPARATOR);
if (lines[0].equals("tableid")) {
tableId = lines[1];
Log.d(MyTracksConstants.TAG, "tableId = " + tableId);
} else {
Log.w(MyTracksConstants.TAG, "Unrecognized response: " + lines[0]);
}
} else {
Log.d(MyTracksConstants.TAG, "Query failed: " + response.statusMessage + " (" +
response.statusCode + ")");
throw new GDataWrapper.HttpException(response.statusCode, response.statusMessage);
}
}
});
return wrapper.getErrorType() == GDataWrapper.ERROR_NO_ERROR;
MyTracks/src/com/google/android/apps/mytracks/io/gdata/GDataWrapper.java
+2 -2
View File
@@ -212,7 +212,7 @@ public class GDataWrapper<C> {
} catch (HttpException e) {
Log.e(MyTracksConstants.TAG, "HttpException", e);
errorMessage = e.getMessage();
if (errorMessage.contains("401")) {
if (errorMessage != null && errorMessage.contains("401")) {
errorType = ERROR_AUTH;
} else {
errorType = ERROR_CONNECTION;
@@ -224,7 +224,7 @@ public class GDataWrapper<C> {
} catch (IOException e) {
Log.e(MyTracksConstants.TAG, "Exception", e);
errorMessage = e.getMessage();
if (errorMessage.contains("503")) {
if (errorMessage != null && errorMessage.contains("503")) {
errorType = ERROR_INTERNAL;
} else {
errorType = ERROR_CONNECTION;