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

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2011-11-07 09:27:10 -08:00
parent 96d8397787 014e5257d0
commit 32bc71ae0f
30 changed files with 1246 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/AndroidManifest.xml
+3 -3
View File
@@ -102,7 +102,7 @@ limitations under the License.
</activity>
<activity android:name="com.google.android.apps.mytracks.SettingsActivity"
android:label="@string/mytracks_settings" >
android:label="@string/settings_title" >
<intent-filter>
<category android:name="android.intent.category.PREFERENCE" />
</intent-filter>
@@ -248,8 +248,8 @@ limitations under the License.
<!-- Permission to get MyTracks broadcasts. For internal MyTracks communication. -->
<permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
android:permissionGroup="android.permission-group.LOCATION"
android:label="@string/mytracks_notifications_permission_label"
android:description="@string/mytracks_notifications_permission_description"
android:label="@string/notification_permission_label"
android:description="@string/notification_permission_label"
android:protectionLevel="signature" />
<!-- We read and write raw track data, obviously. -->
MyTracks/res/layout/chart_settings.xml
+1 -1
View File
@@ -97,7 +97,7 @@ limitations under the License.
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/elevation"/>
android:text="@string/elevation_label"/>
<CheckBox android:id="@+id/chart_settings_speed"
android:checked="true"
android:layout_width="fill_parent"
MyTracks/res/layout/mytracks_send_to_google.xml
-14
View File
@@ -108,20 +108,6 @@ limitations under the License.
android:text="@string/sendtogoogle_google_docs"
android:textSize="20dip"
android:checked="true"/>
<RadioGroup android:id="@+id/sendtogoogle_group_docs"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:visibility="gone">
<RadioButton android:id="@+id/sendtogoogle_send_stats"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_send_stats"/>
<RadioButton android:id="@+id/sendtogoogle_send_stats_and_points"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sendtogoogle_send_stats_and_points"
android:enabled="false"/>
</RadioGroup>
</LinearLayout>
</TableRow>
</TableLayout>
MyTracks/res/values-ca/strings.xml
+19 -19
View File
@@ -165,12 +165,12 @@ limitations under the License.
<string name="waypointdetails_category_hint">Tipus de marcador</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">Paràmetres de My Tracks</string>
<string name="settings_title">Paràmetres de My Tracks</string>
<string name="settings_display">Visualització</string>
<string name="settings_recording">Enregistrament</string>
<string name="settings_sharing">Compartició</string>
<string name="settings_not_available_summary">No es troba disponible a la vostra versió de l\'Android</string>
<string name="settings_announcement_frequency_not_available">No es troba disponible a la vostra versió de l\'Android</string>
<string name="settings_announcement_frequency">Freqüència d\'avís</string>
<string name="settings_announcement_frequency_summary">Temps mínim entre dos avisos de veu</string>
@@ -241,14 +241,14 @@ limitations under the License.
<!-- Sharing -->
<string name="share_map_subject">M\'agradaria compartir un mapa amb tu</string>
<string name="share_map_body_format">Em sembla que estaràs interessat en aquest mapa:
<string name="share_track_url_body_format">Em sembla que estaràs interessat en aquest mapa:
%s</string>
<string name="send_track_subject">M\'agradaria compartir una ruta amb tu</string>
<string name="send_track_body_format">Em sembla que estaràs interessat en aquesta ruta.
<string name="share_track_subject">M\'agradaria compartir una ruta amb tu</string>
<string name="share_track_file_body_format">Em sembla que estaràs interessat en aquesta ruta.
Per veure aquesta ruta fes servir Google Earth o altre programari de mapes.</string>
<string name="share_track">Comparteix la ruta amb amics</string>
<string name="share_track_url">Comparteix la ruta amb amics</string>
<!-- Visibility -->
<string name="public_map">Públic</string>
@@ -294,22 +294,22 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">hora</string>
<string name="hours">hores</string>
<string name="minute">minut</string>
<string name="minutes">minuts</string>
<string name="second">segon</string>
<string name="seconds">segons</string>
<string name="voice_hour">hora</string>
<string name="voice_hours">hores</string>
<string name="voice_minute">minut</string>
<string name="voice_minutes">minuts</string>
<string name="voice_second">segon</string>
<string name="voice_seconds">segons</string>
<!-- Distance -->
<string name="kilometers_long">kilòmetres</string>
<string name="miles_long">milles</string>
<string name="voice_kilometers">kilòmetres</string>
<string name="voice_miles">milles</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour_long">kilòmetres per hora</string>
<string name="per_kilometer">per kilòmetre</string>
<string name="mile_per_hour_long">milles per hora</string>
<string name="per_mile">per milla</string>
<string name="voice_kilometer_per_hour">kilòmetres per hora</string>
<string name="voice_per_kilometer">per kilòmetre</string>
<string name="voice_mile_per_hour">milles per hora</string>
<string name="voice_per_mile">per milla</string>
<!-- Stats Labels -->
<string name="moving_time_label">Temps en moviment</string>
@@ -391,7 +391,7 @@ limitations under the License.
<string name="bluetooth_pairing">Associació de dispositius</string>
<string name="bluetooth_pairing_summary">Obriu els paràmetres de bluetooth de l\'Android per associar un dispositiu</string>
<string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
<string name="sensor_options">Opcions del sensor</string>
<string name="settings_sensor">Opcions del sensor</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">Connectat a %s</string>
MyTracks/res/values-de/strings.xml
+20 -20
View File
@@ -168,12 +168,12 @@ limitations under the License.
<string name="waypointdetails_category_hint">Art des Wegpunktes</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">Einstellungen für My Tracks</string>
<string name="settings_title">Einstellungen für My Tracks</string>
<string name="settings_display">Anzeige</string>
<string name="settings_recording">Aufzeichnung</string>
<string name="settings_sharing">Mit Freunden teilen</string>
<string name="settings_not_available_summary">In dieser Android-Version nicht verfügbar</string>
<string name="settings_announcement_frequency_not_available">In dieser Android-Version nicht verfügbar</string>
<string name="settings_announcement_frequency">Dauer zwischen Ansagen</string>
<string name="settings_announcement_frequency_summary">Kürzeste Zeit zwischen zwei Ansagen</string>
@@ -249,16 +249,16 @@ limitations under the License.
<string name="mytracks_sky">GPS-Satelliten</string>
<!-- Sharing -->
<string name="share_map">Karte mit Freunden teilen</string>
<string name="share_track_picker_title">Karte mit Freunden teilen</string>
<string name="share_map_subject">Ich möchte gerne eine Karte mit Dir teilen.</string>
<string name="share_map_body_format">Vielleicht interessierst Du Dich für diese Karte:
<string name="share_track_url_body_format">Vielleicht interessierst Du Dich für diese Karte:
%s</string>
<string name="send_track_subject">Ich möchte einen GPS-Track mit Dir teilen</string>
<string name="send_track_body_format">Vielleicht interessierst Du Dich für diese Track:
<string name="share_track_subject">Ich möchte einen GPS-Track mit Dir teilen</string>
<string name="share_track_file_body_format">Vielleicht interessierst Du Dich für diese Track:
Der Track kann mit Google Earth oder anderer Karten-Software visualisiert werden.</string>
<string name="share_track">Track mit Freunden teilen</string>
<string name="share_track_url">Track mit Freunden teilen</string>
<!-- Visibility -->
<string name="public_map">Öffentlich</string>
@@ -304,33 +304,33 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">Stunde</string>
<string name="hours">Stunden</string>
<string name="voice_hour">Stunde</string>
<string name="voice_hours">Stunden</string>
<string name="hr">Std</string>
<string name="min">Min</string>
<string name="minute">Minute</string>
<string name="minutes">Minuten</string>
<string name="second">Sekunde</string>
<string name="seconds">Sekunden</string>
<string name="voice_minute">Minute</string>
<string name="voice_minutes">Minuten</string>
<string name="voice_second">Sekunde</string>
<string name="voice_seconds">Sekunden</string>
<!--string name="milliseconds">ms</string-->
<!-- Distance -->
<!--string name="meter">m</string-->
<!--string name="kilometer">km</string-->
<string name="kilometers_long">Kilometer</string>
<string name="voice_kilometers">Kilometer</string>
<string name="feet">Fuß</string>
<!--string name="mile">mi</string-->
<string name="miles_long">Meilen</string>
<string name="voice_miles">Meilen</string>
<!-- Speed and Pace -->
<!--string name="kilometer_per_hour">km/h</string-->
<string name="kilometer_per_hour_long">Kilometer pro Stunde</string>
<string name="voice_kilometer_per_hour">Kilometer pro Stunde</string>
<!--string name="min_per_kilometer">min/km</string-->
<string name="per_kilometer">pro Kilometer</string>
<string name="voice_per_kilometer">pro Kilometer</string>
<!--string name="mile_per_hour">mi/h</string-->
<string name="mile_per_hour_long">Meilen pro Stunde</string>
<string name="voice_mile_per_hour">Meilen pro Stunde</string>
<!--string name="min_per_mile">min/mi</string-->
<string name="per_mile">pro Meile</string>
<string name="voice_per_mile">pro Meile</string>
<!-- Sensors -->
<!--string name="watts">W</string-->
@@ -424,7 +424,7 @@ limitations under the License.
<string name="bluetooth_pairing">Geräteverbindung</string>
<string name="bluetooth_pairing_summary">Öffnet Androids Bluetooth-Einstellungen, um Geräte zu verbinden.</string>
<!--string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string-->
<string name="sensor_options">Sensor-Einstellungen</string>
<string name="settings_sensor">Sensor-Einstellungen</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">Verbunden mit %s</string>
MyTracks/res/values-es-rES/strings.xml
+1 -1
View File
@@ -55,7 +55,7 @@ limitations under the License.
<!-- MyTracks Waypoint Details -->
<!-- MyTracks Settings -->
<string name="settings_not_available_summary">No está disponible en su versión de Android</string>
<string name="settings_announcement_frequency_not_available">No está disponible en su versión de Android</string>
<string name="settings_report_speed_or_pace">Mostrar velocidad</string>
MyTracks/res/values-es/strings.xml
+20 -20
View File
@@ -197,12 +197,12 @@ limitations under the License.
<string name="waypointdetails_category_hint">Tipo de señal</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">Configuraciones de My Tracks</string>
<string name="settings_title">Configuraciones de My Tracks</string>
<string name="settings_display">Visualizador</string>
<string name="settings_recording">Grabando</string>
<string name="settings_sharing">Compartiendo</string>
<string name="settings_not_available_summary">No disponible para tu versión de Android</string>
<string name="settings_announcement_frequency_not_available">No disponible para tu versión de Android</string>
<string name="settings_not_while_recording">No disponible mientras se graba el recorrido</string>
<string name="settings_allow_access">Permitir acceso</string>
@@ -309,7 +309,7 @@ limitations under the License.
<string name="maps_list_failed">¡No se pudieron cargar sus mapas en este momento!</string>
<string name="open_map">Seleccionar este mapa</string>
<string name="edit_map_details">Editar detalles del mapa</string>
<string name="share_track">Compartir recorrido</string>
<string name="share_track_url">Compartir recorrido</string>
<string name="delete_map">Borrar mapa de su cuenta</string>
<string name="map_title">Titulo del mapa:</string>
<string name="map_description">Descripción del mapa:</string>
@@ -319,13 +319,13 @@ limitations under the License.
<string name="map_not_searchable">Este mapa y sus contenidos no aparecerán en los resultados de busquedas, aunque pueden ser vistos por otros a traves de su enlace directo</string>
<!-- Sharing -->
<string name="share_map">Compartir mapa con amigos</string>
<string name="share_track_picker_title">Compartir mapa con amigos</string>
<string name="share_map_subject">Me gustaría compartir un mapa contigo</string>
<string name="share_map_body_format">Creo que este mapa pudiera interesarte:
<string name="share_track_url_body_format">Creo que este mapa pudiera interesarte:
%s</string>
<string name="send_track_subject">Me gustaría compartir un recorrido contigo</string>
<string name="send_track_body_format">Creo que este recorrido pudiera interesarte.
<string name="share_track_subject">Me gustaría compartir un recorrido contigo</string>
<string name="share_track_file_body_format">Creo que este recorrido pudiera interesarte.
Para ver este recorrido usa Google Earth o algún otro software de mapeo.</string>
@@ -373,23 +373,23 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">hora</string>
<string name="hours">horas</string>
<string name="minute">minuto</string>
<string name="minutes">minutos</string>
<string name="second">segundo</string>
<string name="seconds">segundos</string>
<string name="voice_hour">hora</string>
<string name="voice_hours">horas</string>
<string name="voice_minute">minuto</string>
<string name="voice_minutes">minutos</string>
<string name="voice_second">segundo</string>
<string name="voice_seconds">segundos</string>
<!-- Distance -->
<string name="kilometers_long">kilómetros</string>
<string name="voice_kilometers">kilómetros</string>
<string name="feet">pies</string>
<string name="miles_long">millas</string>
<string name="voice_miles">millas</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour_long">kilómetros por hora</string>
<string name="per_kilometer">por kilómetro</string>
<string name="mile_per_hour_long">millas por hora</string>
<string name="per_mile">por milla</string>
<string name="voice_kilometer_per_hour">kilómetros por hora</string>
<string name="voice_per_kilometer">por kilómetro</string>
<string name="voice_mile_per_hour">millas por hora</string>
<string name="voice_per_mile">por milla</string>
<!-- Sensors -->
<string name="battery_level">Nivel de batería</string>
@@ -480,7 +480,7 @@ limitations under the License.
<string name="bluetooth_pairing_summary">Abrir la configuración Bluetooth de Android para conectar un dispositivo</string>
<string name="sensor_bluetooth_options_key">Sensor Bluetooth activado</string>
<string name="ant_options">Optiones ANT</string>
<string name="sensor_options">Opciones del sensor</string>
<string name="settings_sensor">Opciones del sensor</string>
<string name="track_color_mode">Modo de Recorrido Coloreado</string>
<string name="fixed_speed_options">Opciones de velocidad fija</string>
<string name="dynamic_speed_options">Opciones de velocidad dinámica</string>
MyTracks/res/values-fi/strings.xml
+20 -20
View File
@@ -197,12 +197,12 @@ limitations under the License.
<string name="waypointdetails_category_hint">Merkinnän tyyppi</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">My Tracks Asetukset</string>
<string name="settings_title">My Tracks Asetukset</string>
<string name="settings_display">Näyttö</string>
<string name="settings_recording">Tallennus</string>
<string name="settings_sharing">Jakaminen</string>
<string name="settings_not_available_summary">Ei tuettu tässä Android-versiossa</string>
<string name="settings_announcement_frequency_not_available">Ei tuettu tässä Android-versiossa</string>
<string name="settings_not_while_recording">Ei saatavilla reittiä tallennettaessa.</string>
<string name="settings_announcement_frequency">Äänimerkki</string>
@@ -290,7 +290,7 @@ limitations under the License.
<string name="maps_list_failed">Karttoja ei voitu ladata!</string>
<string name="open_map">Valitse tämä kartta</string>
<string name="edit_map_details">Muokkaa kartan tietoja</string>
<string name="share_track">Jaa reitti</string>
<string name="share_track_url">Jaa reitti</string>
<string name="delete_map">Poista kartta tililtä</string>
<string name="map_title">Kartan otsikko:</string>
<string name="map_description">Kartan kuvaus:</string>
@@ -300,13 +300,13 @@ limitations under the License.
<string name="map_not_searchable">Kartta tai sen sisältö ei näy hakutuloksissa. Tiedot näkyvät muille kuitenkin suoralla URL-linkillä</string>
<!-- Sharing -->
<string name="share_map">Jaa kartta</string>
<string name="share_track_picker_title">Jaa kartta</string>
<string name="share_map_subject">Haluaisin jakaa kartan kanssasi</string>
<string name="share_map_body_format">Saattaisit olla kiinnostunut tästä reitistä:
<string name="share_track_url_body_format">Saattaisit olla kiinnostunut tästä reitistä:
%s</string>
<string name="send_track_subject">Haluaisin jakaa reitin kanssasi</string>
<string name="send_track_body_format">Saattaisit olla kiinnostunut tästä reitistä.
<string name="share_track_subject">Haluaisin jakaa reitin kanssasi</string>
<string name="share_track_file_body_format">Saattaisit olla kiinnostunut tästä reitistä.
Käytä Google Earthia tai jotain muuta karttaohjelmistoa kartan katsomiseen.</string>
@@ -354,33 +354,33 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">tunti</string>
<string name="hours">tuntia</string>
<string name="voice_hour">tunti</string>
<string name="voice_hours">tuntia</string>
<string name="hr">h</string>
<string name="min">min</string>
<string name="minute">minuutti</string>
<string name="minutes">minuuttia</string>
<string name="second">sekunti</string>
<string name="seconds">sekuntia</string>
<string name="voice_minute">minuutti</string>
<string name="voice_minutes">minuuttia</string>
<string name="voice_second">sekunti</string>
<string name="voice_seconds">sekuntia</string>
<string name="milliseconds">ms</string>
<!-- Distance -->
<string name="meter">m</string>
<string name="kilometer">km</string>
<string name="kilometers_long">kilometriä</string>
<string name="voice_kilometers">kilometriä</string>
<string name="feet">ft</string>
<string name="mile">mi</string>
<string name="miles_long">mailia</string>
<string name="voice_miles">mailia</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour">km/h</string>
<string name="kilometer_per_hour_long">kilometriä tunnissa</string>
<string name="voice_kilometer_per_hour">kilometriä tunnissa</string>
<string name="min_per_kilometer">min/km</string>
<string name="per_kilometer">per kilometri</string>
<string name="voice_per_kilometer">per kilometri</string>
<string name="mile_per_hour">mi/h</string>
<string name="mile_per_hour_long">mailia tunnissa</string>
<string name="voice_mile_per_hour">mailia tunnissa</string>
<string name="min_per_mile">min/mi</string>
<string name="per_mile">per maili</string>
<string name="voice_per_mile">per maili</string>
<!-- Sensors -->
<string name="watts">W</string>
@@ -477,7 +477,7 @@ limitations under the License.
<string name="bluetooth_pairing_summary">Avaa Androidin bluetooth-asetukset luodaksesi laitepareja</string>
<string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
<string name="ant_options">ANT asetukset</string>
<string name="sensor_options">Sensorien asetukset</string>
<string name="settings_sensor">Sensorien asetukset</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">Yhdistetty %s</string>
MyTracks/res/values-fr/strings.xml
+17 -17
View File
@@ -158,7 +158,7 @@ limitations under the License.
<string name="waypointdetails_category_hint">Nom de balise</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">Paramètres My Tracks</string>
<string name="settings_title">Paramètres My Tracks</string>
<string name="settings_display">Affichage</string>
<string name="settings_recording">Enregistrement</string>
<string name="settings_sharing">Partage</string>
@@ -228,16 +228,16 @@ limitations under the License.
<string name="mytracks_sky">Satellites GPS</string>
<!-- Sharing -->
<string name="share_map">Partager.</string>
<string name="share_track_picker_title">Partager.</string>
<string name="share_map_subject">Je voudrais partager ma carte avec vous</string>
<string name="share_map_body_format">Je pense que cette carte vous intéressera :
<string name="share_track_url_body_format">Je pense que cette carte vous intéressera :
%s</string>
<string name="send_track_subject">Je voudrais partager un parcours avec vous</string>
<string name="send_track_body_format">Je pense que ce parcours vous intéressera.
<string name="share_track_subject">Je voudrais partager un parcours avec vous</string>
<string name="share_track_file_body_format">Je pense que ce parcours vous intéressera.
Pour voir ce parcours, utilisez Google Earth ou tout autre logiciel de cartographie.</string>
<string name="share_track">Partager des parcours.</string>
<string name="share_track_url">Partager des parcours.</string>
<!-- Visibility -->
<string name="unlisted_map">Carte non listée</string>
@@ -280,23 +280,23 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">heure</string>
<string name="hours">heures</string>
<string name="second">seconde</string>
<string name="seconds">secondes</string>
<string name="voice_hour">heure</string>
<string name="voice_hours">heures</string>
<string name="voice_second">seconde</string>
<string name="voice_seconds">secondes</string>
<!-- Distance -->
<string name="feet">pied</string>
<string name="kilometers_long">kilomètres</string>
<string name="miles_long">milles</string>
<string name="voice_kilometers">kilomètres</string>
<string name="voice_miles">milles</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour">km/h</string>
<string name="kilometer_per_hour_long">kilomètres/heure</string>
<string name="per_kilometer">par kilomètre</string>
<string name="voice_kilometer_per_hour">kilomètres/heure</string>
<string name="voice_per_kilometer">par kilomètre</string>
<string name="mile_per_hour">mi/h</string>
<string name="mile_per_hour_long">miles/heure</string>
<string name="per_mile">per mile</string>
<string name="voice_mile_per_hour">miles/heure</string>
<string name="voice_per_mile">per mile</string>
<string name="waiting">Waiting...</string>
@@ -380,7 +380,7 @@ limitations under the License.
<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>
<string name="settings_sensor">Options du capteur</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">Connecté à %s</string>
MyTracks/res/values-it/strings.xml
+17 -17
View File
@@ -161,7 +161,7 @@ limitations under the License.
<string name="waypointdetails_category_hint">Tipo di segnaposto</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">Impostazioni di My Tracks</string>
<string name="settings_title">Impostazioni di My Tracks</string>
<string name="settings_display">Visualizzazione</string>
<string name="settings_recording">Registrazione</string>
<string name="settings_sharing">Condivisione</string>
@@ -206,14 +206,14 @@ limitations under the License.
<!-- Sharing -->
<string name="share_map_subject">Vorrei condividere una mappa con te</string>
<string name="share_map_body_format">Credo che questa mappa potrebbe interessarti:
<string name="share_track_url_body_format">Credo che questa mappa potrebbe interessarti:
%s</string>
<string name="send_track_subject">Vorrei condividere un percorso con te</string>
<string name="send_track_body_format">Credo che questo percorso potrebbe interessarti.
<string name="share_track_subject">Vorrei condividere un percorso con te</string>
<string name="share_track_file_body_format">Credo che questo percorso potrebbe interessarti.
Per vedere questo percorso, usa Google Earth o un altro software di cartografia.</string>
<string name="share_track">Condividi il percorso con amici</string>
<string name="share_track_url">Condividi il percorso con amici</string>
<!-- Visibility -->
<string name="public_map">Pubblica</string>
@@ -259,32 +259,32 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">ora</string>
<string name="hours">ore</string>
<string name="voice_hour">ora</string>
<string name="voice_hours">ore</string>
<string name="hr">h</string>
<string name="min">min</string>
<string name="minute">minuto</string>
<string name="minutes">minuti</string>
<string name="second">secondo</string>
<string name="seconds">secondi</string>
<string name="voice_minute">minuto</string>
<string name="voice_minutes">minuti</string>
<string name="voice_second">secondo</string>
<string name="voice_seconds">secondi</string>
<!-- Distance -->
<string name="meter">m</string>
<string name="kilometer">km</string>
<string name="kilometers_long">chilometri</string>
<string name="voice_kilometers">chilometri</string>
<string name="feet">pd</string>
<string name="mile">mi</string>
<string name="miles_long">miglia</string>
<string name="voice_miles">miglia</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour">km/h</string>
<string name="kilometer_per_hour_long">chilometri orari</string>
<string name="voice_kilometer_per_hour">chilometri orari</string>
<string name="min_per_kilometer">min/km</string>
<string name="per_kilometer">per chilometro</string>
<string name="voice_per_kilometer">per chilometro</string>
<string name="mile_per_hour">mi/h</string>
<string name="mile_per_hour_long">miglia orarie</string>
<string name="voice_mile_per_hour">miglia orarie</string>
<string name="min_per_mile">min/mi</string>
<string name="per_mile">per miglio</string>
<string name="voice_per_mile">per miglio</string>
<!-- Stats Labels -->
<string name="moving_time_label">Durata in moto</string>
MyTracks/res/values-ja/strings.xml
+21 -21
View File
@@ -190,12 +190,12 @@ limitations under the License.
<string name="waypointdetails_category_hint">マーカータイプ</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">My Tracks設定</string>
<string name="settings_title">My Tracks設定</string>
<string name="settings_display">表示</string>
<string name="settings_recording">記録</string>
<string name="settings_sharing">共有</string>
<string name="settings_not_available_summary">このAndroidバージョンでは使用できません</string>
<string name="settings_announcement_frequency_not_available">このAndroidバージョンでは使用できません</string>
<string name="settings_announcement_frequency">定期通知</string>
<string name="settings_announcement_frequency_summary">音声通知間隔の最小時間</string>
@@ -277,7 +277,7 @@ limitations under the License.
<string name="maps_list_failed">今回はマップをロードできませんでした!</string>
<string name="open_map">このマップを選択</string>
<string name="edit_map_details">マップ詳細編集</string>
<string name="share_track">トラック共有</string>
<string name="share_track_url">トラック共有</string>
<string name="delete_map">アカウントからマップを削除</string>
<string name="map_title">マップタイトル:</string>
<string name="map_description">マップ説明:</string>
@@ -287,16 +287,16 @@ limitations under the License.
<string name="map_not_searchable">このマップもコンテンツも検索結果に表示されませんが、直接リンクで見られる可能性があります</string>
<!-- Sharing -->
<string name="share_map">マップ共有</string>
<string name="share_track_picker_title">マップ共有</string>
<string name="share_map_subject">マップを共有したいと思います</string>
<string name="share_map_body_format">このマップに興味を持って頂けると思います:
<string name="share_track_url_body_format">このマップに興味を持って頂けると思います:
%s</string>
<string name="send_track_subject">トラックを共有したいと思います</string>
<string name="send_track_body_format">このトラックに興味を持って頂けると思います．
<string name="share_track_subject">トラックを共有したいと思います</string>
<string name="share_track_file_body_format">このトラックに興味を持って頂けると思います．
このトラックを閲覧するには、Google Earthまたは他のマッピングソフトウェアが必要です．</string>
<string name="share_track">トラックの共有</string>
<string name="share_track_url">トラックの共有</string>
<!-- Visibility -->
<string name="public_map">公開</string>
@@ -342,25 +342,25 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">時</string>
<string name="hours">時</string>
<string name="voice_hour">時</string>
<string name="voice_hours">時</string>
<string name="hr">時</string>
<string name="min">分</string>
<string name="minute">分</string>
<string name="minutes">分</string>
<string name="second">秒</string>
<string name="seconds">秒</string>
<string name="voice_minute">分</string>
<string name="voice_minutes">分</string>
<string name="voice_second">秒</string>
<string name="voice_seconds">秒</string>
<string name="milliseconds">ミリ秒</string>
<!-- Distance -->
<string name="kilometers_long">キロメータ</string>
<string name="miles_long">マイル</string>
<string name="voice_kilometers">キロメータ</string>
<string name="voice_miles">マイル</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>
<string name="voice_kilometer_per_hour">キロメータ毎時</string>
<string name="voice_per_kilometer">毎キロメータ</string>
<string name="voice_mile_per_hour">マイル毎時</string>
<string name="voice_per_mile">毎マイル</string>
<!-- Stats Labels -->
<string name="moving_time_label">移動時間</string>
@@ -446,7 +446,7 @@ limitations under the License.
<string name="bluetooth_pairing_summary">ペアリングを行うには「Bluetooth設定」を開いて下さい</string>
<string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
<string name="ant_options">ANTオプション</string>
<string name="sensor_options">センサーオプション</string>
<string name="settings_sensor">センサーオプション</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">%sに接続しました</string>
MyTracks/res/values-pl/strings.xml
+18 -18
View File
@@ -163,7 +163,7 @@ limitations under the License.
<string name="waypointdetails_category_hint">Typ znacznika</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">Ustawienia My Tracks</string>
<string name="settings_title">Ustawienia My Tracks</string>
<string name="settings_display">Wyświetlanie</string>
<string name="settings_recording">Rejestrowanie</string>
<string name="settings_sharing">Dzielenie</string>
@@ -234,14 +234,14 @@ limitations under the License.
<!-- Sharing -->
<string name="share_map_subject">Chciałbym się z Tobą podzielić mapą</string>
<string name="share_map_body_format">Myślę, że może Cię zainteresować ta mapa:
<string name="share_track_url_body_format">Myślę, że może Cię zainteresować ta mapa:
%s</string>
<string name="send_track_subject">Chciałbym się z Tobą podzielić trasą</string>
<string name="send_track_body_format">Myślę, że może Cię zainteresować ta trasa.
<string name="share_track_subject">Chciałbym się z Tobą podzielić trasą</string>
<string name="share_track_file_body_format">Myślę, że może Cię zainteresować ta trasa.
Trasę możesz obejrzeć w Google Earth lub innym programie do obsługi map.</string>
<string name="share_track">Podziel się trasą z przyjaciółmi</string>
<string name="share_track_url">Podziel się trasą z przyjaciółmi</string>
<!-- Visibility -->
<string name="public_map">Publiczna</string>
@@ -287,32 +287,32 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">godzina</string>
<string name="hours">godziny</string>
<string name="voice_hour">godzina</string>
<string name="voice_hours">godziny</string>
<string name="hr">godz.</string>
<string name="min">min</string>
<string name="minute">minuta</string>
<string name="minutes">minuty</string>
<string name="second">sekunda</string>
<string name="seconds">sekundy</string>
<string name="voice_minute">minuta</string>
<string name="voice_minutes">minuty</string>
<string name="voice_second">sekunda</string>
<string name="voice_seconds">sekundy</string>
<!-- Distance -->
<string name="meter">m</string>
<string name="kilometer">km</string>
<string name="kilometers_long">kilometerów</string>
<string name="voice_kilometers">kilometerów</string>
<string name="feet">st.</string>
<string name="mile">mi</string>
<string name="miles_long">mil</string>
<string name="voice_miles">mil</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour">km/h</string>
<string name="kilometer_per_hour_long">kilometry na godzinę</string>
<string name="voice_kilometer_per_hour">kilometry na godzinę</string>
<string name="min_per_kilometer">min/km</string>
<string name="per_kilometer">na kilometr</string>
<string name="voice_per_kilometer">na kilometr</string>
<string name="mile_per_hour">mi/h</string>
<string name="mile_per_hour_long">mile na godzinę</string>
<string name="voice_mile_per_hour">mile na godzinę</string>
<string name="min_per_mile">min/mi</string>
<string name="per_mile">na milę</string>
<string name="voice_per_mile">na milę</string>
<!-- Stats Labels -->
<string name="moving_time_label">Czas w ruchu</string>
@@ -395,7 +395,7 @@ limitations under the License.
<string name="bluetooth_pairing_summary">Przejdź do ustawień Bluetooth Androida aby sparować urządzenie</string>
<string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
<string name="ant_options">Opce ANT</string>
<string name="sensor_options">Opcje Czujników</string>
<string name="settings_sensor">Opcje Czujników</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">Połączony z %s</string>
MyTracks/res/values-pt-rBR/strings.xml
+18 -18
View File
@@ -158,11 +158,11 @@ limitations under the License.
<string name="waypointdetails_category_hint">Tipo do Marcador</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">Configurações do My Tracks</string>
<string name="settings_title">Configurações do My Tracks</string>
<string name="settings_display">Exibição</string>
<string name="settings_recording">Gravação</string>
<string name="settings_sharing">Compartilhamento</string>
<string name="settings_not_available_summary">Não disponível na sua versão do Android</string>
<string name="settings_announcement_frequency_not_available">Não disponível na sua versão do Android</string>
<string name="settings_not_while_recording">Não disponível durante a gravação de uma trilha</string>
<string name="settings_announcement_frequency">Tempo entre anúncios</string>
<string name="settings_announcement_frequency_summary">Tempo mínimo entre dois anúncios de voz</string>
@@ -195,14 +195,14 @@ limitations under the License.
<!-- Sharing -->
<string name="share_map_subject">Eu gostaria de compartilhar um mapa com você</string>
<string name="share_map_body_format">Eu acredito que você pode se interessar por este mapa:
<string name="share_track_url_body_format">Eu acredito que você pode se interessar por este mapa:
%s</string>
<string name="send_track_subject">Eu gostaria de compartilhar um caminho com você</string>
<string name="send_track_body_format">Eu acredito que você pode se interesasr por este caminho.
<string name="share_track_subject">Eu gostaria de compartilhar um caminho com você</string>
<string name="share_track_file_body_format">Eu acredito que você pode se interesasr por este caminho.
Para visualizar este caminho, use o Google Earth ou outro software de mapas.</string>
<string name="share_track">Compartilhar caminho com amigos</string>
<string name="share_track_url">Compartilhar caminho com amigos</string>
<!-- Visibility -->
<string name="public_map">Público</string>
@@ -246,24 +246,24 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">hora</string>
<string name="hours">horas</string>
<string name="voice_hour">hora</string>
<string name="voice_hours">horas</string>
<string name="hr">h</string>
<string name="minute">minuto</string>
<string name="minutes">minutos</string>
<string name="second">segundo</string>
<string name="seconds">segundos</string>
<string name="voice_minute">minuto</string>
<string name="voice_minutes">minutos</string>
<string name="voice_second">segundo</string>
<string name="voice_seconds">segundos</string>
<!-- Distance -->
<string name="feet">pés</string>
<string name="kilometers_long">kilômetros</string>
<string name="miles_long">milhas</string>
<string name="voice_kilometers">kilômetros</string>
<string name="voice_miles">milhas</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour_long">kilômetros por hora</string>
<string name="per_kilometer">por kilômetro</string>
<string name="mile_per_hour_long">milhas por hora</string>
<string name="per_mile">por milha</string>
<string name="voice_kilometer_per_hour">kilômetros por hora</string>
<string name="voice_per_kilometer">por kilômetro</string>
<string name="voice_mile_per_hour">milhas por hora</string>
<string name="voice_per_mile">por milha</string>
<!-- Stats Labels -->
<string name="moving_time_label">Tempo em Movimento</string>
MyTracks/res/values-ru/strings.xml
+20 -20
View File
@@ -193,12 +193,12 @@ limitations under the License.
<string name="waypointdetails_category_hint">Тип маркера</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">Настройки My Tracks</string>
<string name="settings_title">Настройки My Tracks</string>
<string name="settings_display">Отображение</string>
<string name="settings_recording">Запись</string>
<string name="settings_sharing">Обмен</string>
<string name="settings_not_available_summary">Не доступен в вашем версии Android</string>
<string name="settings_announcement_frequency_not_available">Не доступен в вашем версии Android</string>
<string name="settings_not_while_recording">Не доступно во время записи трека</string>
<string name="settings_announcement_frequency">Частота объявлений</string>
@@ -286,7 +286,7 @@ limitations under the License.
<string name="maps_list_failed">Ваши карты не могут быть загружены в данный момент!</string>
<string name="open_map">Выберите эту карту</string>
<string name="edit_map_details">Править детали карты</string>
<string name="share_track">Поделиться треком</string>
<string name="share_track_url">Поделиться треком</string>
<string name="delete_map">Удалить Карту из вашей учетной записи</string>
<string name="map_title">Название карты:</string>
<string name="map_description">Описание карты:</string>
@@ -296,13 +296,13 @@ limitations under the License.
<string name="map_not_searchable">Ни эта карта, ни ее содержимое не будут отображаться в результатах поиска, но их могут по-прежнему просматривать другие через прямую ссылку</string>
<!-- Sharing -->
<string name="share_map">Поделиться картой с друзьями</string>
<string name="share_track_picker_title">Поделиться картой с друзьями</string>
<string name="share_map_subject">Я хотел бы поделиться с вами треком</string>
<string name="share_map_body_format">Я думаю, вы можете быть заинтересованы в этом треке:
<string name="share_track_url_body_format">Я думаю, вы можете быть заинтересованы в этом треке:
%s</string>
<string name="send_track_subject">Я хотел бы поделиться с вами треком</string>
<string name="send_track_body_format">Я думаю, вы можете быть заинтересованы в этом треке.
<string name="share_track_subject">Я хотел бы поделиться с вами треком</string>
<string name="share_track_file_body_format">Я думаю, вы можете быть заинтересованы в этом треке.
Просмотреть трек можно с помощью Google Планета Земля или другого программного обоспечения для карт.</string>
@@ -350,33 +350,33 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">час</string>
<string name="hours">часов</string>
<string name="voice_hour">час</string>
<string name="voice_hours">часов</string>
<string name="hr">ч</string>
<string name="min">мин</string>
<string name="minute">минута</string>
<string name="minutes">минут</string>
<string name="second">секунда</string>
<string name="seconds">секунд</string>
<string name="voice_minute">минута</string>
<string name="voice_minutes">минут</string>
<string name="voice_second">секунда</string>
<string name="voice_seconds">секунд</string>
<string name="milliseconds">мс</string>
<!-- Distance -->
<string name="meter">м</string>
<string name="kilometer">км</string>
<string name="kilometers_long">километров</string>
<string name="voice_kilometers">километров</string>
<string name="feet">футов</string>
<string name="mile">миль</string>
<string name="miles_long">мили</string>
<string name="voice_miles">мили</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour">км/ч</string>
<string name="kilometer_per_hour_long">километров в час</string>
<string name="voice_kilometer_per_hour">километров в час</string>
<string name="min_per_kilometer">мин/км</string>
<string name="per_kilometer">за километр</string>
<string name="voice_per_kilometer">за километр</string>
<string name="mile_per_hour">миль/ч</string>
<string name="mile_per_hour_long">миль в час</string>
<string name="voice_mile_per_hour">миль в час</string>
<string name="min_per_mile">мин/миля</string>
<string name="per_mile">за милю</string>
<string name="voice_per_mile">за милю</string>
<!-- Sensors -->
<string name="watts">Вт</string>
@@ -473,7 +473,7 @@ limitations under the License.
<string name="bluetooth_pairing_summary">Открыть настройки Android по bluetooth для подключения устройства</string>
<string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
<string name="ant_options">Параметры ANT</string>
<string name="sensor_options">Параметры датчика</string>
<string name="settings_sensor">Параметры датчика</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">Подключен к %s</string>
MyTracks/res/values-sv/strings.xml
+17 -17
View File
@@ -163,7 +163,7 @@ limitations under the License.
<string name="waypointdetails_category_hint">Markörtyp</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">My Tracks inställningar</string>
<string name="settings_title">My Tracks inställningar</string>
<string name="settings_display">Visning</string>
<string name="settings_recording">Inspelning</string>
<string name="settings_sharing">Delning</string>
@@ -209,14 +209,14 @@ limitations under the License.
<!-- Sharing -->
<string name="share_map_subject">Jag vill dela en karta med dig</string>
<string name="share_map_body_format">Jag tror att du skulle vara intresserad av den här kartan:
<string name="share_track_url_body_format">Jag tror att du skulle vara intresserad av den här kartan:
%s</string>
<string name="send_track_subject">Jag vill dela ett spår med dig</string>
<string name="send_track_body_format">Jag tror att du skulle vara intresserad av det här spåret.
<string name="share_track_subject">Jag vill dela ett spår med dig</string>
<string name="share_track_file_body_format">Jag tror att du skulle vara intresserad av det här spåret.
För att se det här spåret använd Google Earth eller något annat kartprogram.</string>
<string name="share_track">Dela spår med vänner</string>
<string name="share_track_url">Dela spår med vänner</string>
<!-- Visibility -->
<string name="public_map">Publik</string>
@@ -262,32 +262,32 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">timme</string>
<string name="hours">timmar</string>
<string name="voice_hour">timme</string>
<string name="voice_hours">timmar</string>
<string name="hr">tim</string>
<string name="min">min</string>
<string name="minute">minut</string>
<string name="minutes">minuter</string>
<string name="second">sekund</string>
<string name="seconds">sekunder</string>
<string name="voice_minute">minut</string>
<string name="voice_minutes">minuter</string>
<string name="voice_second">sekund</string>
<string name="voice_seconds">sekunder</string>
<!-- Distance -->
<string name="meter">m</string>
<string name="kilometer">km</string>
<string name="kilometers_long">kilometer</string>
<string name="voice_kilometers">kilometer</string>
<string name="feet">ft</string>
<string name="mile">mi</string>
<string name="miles_long">miles</string>
<string name="voice_miles">miles</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour">km/h</string>
<string name="kilometer_per_hour_long">kilometer i timmen</string>
<string name="voice_kilometer_per_hour">kilometer i timmen</string>
<string name="min_per_kilometer">min/km</string>
<string name="per_kilometer">per kilometer</string>
<string name="voice_per_kilometer">per kilometer</string>
<string name="mile_per_hour">mi/h</string>
<string name="mile_per_hour_long">miles i timmen</string>
<string name="voice_mile_per_hour">miles i timmen</string>
<string name="min_per_mile">min/mi</string>
<string name="per_mile">per mile</string>
<string name="voice_per_mile">per mile</string>
<!-- Stats Labels -->
<string name="moving_time_label">Rörlig tid</string>
MyTracks/res/values-zh-rCN/strings.xml
+20 -20
View File
@@ -194,12 +194,12 @@ limitations under the License.
<string name="waypointdetails_category_hint">标记类型</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">My Tracks 设置</string>
<string name="settings_title">My Tracks 设置</string>
<string name="settings_display">显示</string>
<string name="settings_recording">记录</string>
<string name="settings_sharing">分享</string>
<string name="settings_not_available_summary">不支持当前使用的 Android 版本</string>
<string name="settings_announcement_frequency_not_available">不支持当前使用的 Android 版本</string>
<string name="settings_not_while_recording">在记录轨迹时不可用</string>
<string name="settings_announcement_frequency">通知频度</string>
@@ -287,7 +287,7 @@ limitations under the License.
<string name="maps_list_failed">现在无法载入你的地图!</string>
<string name="open_map">选择此地图</string>
<string name="edit_map_details">编辑地图详细信息</string>
<string name="share_track">分享轨迹</string>
<string name="share_track_url">分享轨迹</string>
<string name="delete_map">从你的帐号删除地图</string>
<string name="map_title">地图标题:</string>
<string name="map_description">地图描述:</string>
@@ -297,13 +297,13 @@ limitations under the License.
<string name="map_not_searchable">此地图和它的内容不会在搜索结果中出现, 但其它用户依然可以通过直接 URL 访问它</string>
<!-- Sharing -->
<string name="share_map">与朋友分享地图</string>
<string name="share_track_picker_title">与朋友分享地图</string>
<string name="share_map_subject">我想与你分享一张地图</string>
<string name="share_map_body_format">我想你可能会对这个地图感兴趣:
<string name="share_track_url_body_format">我想你可能会对这个地图感兴趣:
%s</string>
<string name="send_track_subject">我想与你分享一条轨迹</string>
<string name="send_track_body_format">我想你可能会对这条轨迹感兴趣.
<string name="share_track_subject">我想与你分享一条轨迹</string>
<string name="share_track_file_body_format">我想你可能会对这条轨迹感兴趣.
请用 Google Earth 或其它地图软件查看此轨迹.</string>
@@ -351,24 +351,24 @@ limitations under the License.
<!-- Units -->
<!-- Time -->
<string name="hour">小时</string>
<string name="hours">小时</string>
<string name="voice_hour">小时</string>
<string name="voice_hours">小时</string>
<string name="hr">时</string>
<string name="min">分</string>
<string name="minute">分钟</string>
<string name="minutes">分钟</string>
<string name="second">秒</string>
<string name="seconds">秒</string>
<string name="voice_minute">分钟</string>
<string name="voice_minutes">分钟</string>
<string name="voice_second">秒</string>
<string name="voice_seconds">秒</string>
<!-- Distance -->
<string name="kilometers_long">千米</string>
<string name="miles_long">英里</string>
<string name="voice_kilometers">千米</string>
<string name="voice_miles">英里</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>
<string name="voice_kilometer_per_hour">千米每小时</string>
<string name="voice_per_kilometer">每千米</string>
<string name="voice_mile_per_hour">英里每小时</string>
<string name="voice_per_mile">每英里</string>
<!-- Stats Labels -->
<string name="moving_time_label">移动时间</string>
@@ -453,7 +453,7 @@ 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>
<string name="settings_sensor">感应器选项</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">连接到 %s</string>
MyTracks/res/values/do_not_translate.xml
+3
View File
@@ -41,6 +41,9 @@ limitations under the License.
<string name="track_color_mode_value_fixed">FIXED</string>
<string name="track_color_mode_value_dynamic">DYNAMIC</string>
<!-- When a value is unknown. E.g. when speed is unknown '- km/hr'. -->
<string name="unknown">-</string>
<!-- Send to Google URLs -->
<string name="sendtogoogle_google_fusiontables_url">google.com/fusiontables</string>
<string name="sendtogoogle_google_mymaps_url">maps.google.com</string>
MyTracks/res/values/keys.xml
-1
View File
@@ -34,7 +34,6 @@ limitations under the License.
<string name="modular_stats_display_key">modularStatsDisplay</string>
<string name="pick_existing_map_key">pickExistingMap</string>
<string name="report_speed_key">reportSpeed</string>
<string name="send_stats_and_points_key">sendStatsAndPoints</string>
<string name="send_to_docs_key">sendToDocs</string>
<string name="send_to_fusion_tables_key">sendToFusionTables</string>
<string name="send_to_my_maps_key">sendToMyMaps</string>
MyTracks/res/values/strings.xml
+927 -319
View File
File diff suppressed because it is too large Load Diff
MyTracks/res/xml/preferences.xml
+3 -3
View File
@@ -40,7 +40,7 @@ limitations under the License.
android:entryValues="@array/track_color_mode_values"
android:defaultValue="@string/track_color_mode_value_none"/>
<PreferenceCategory android:title="@string/fixed_speed_options"
<PreferenceCategory android:title="@string/track_color_mode_option_fixed"
android:key="@string/track_color_mode_fixed_speed_options_key">
<EditTextPreference android:key="@string/track_color_mode_fixed_speed_slow_key"
android:title="@string/settings_track_color_mode_fixed_speed_slow"
@@ -75,7 +75,7 @@ limitations under the License.
</EditTextPreference>
</PreferenceCategory>
<PreferenceCategory android:title="@string/dynamic_speed_options">
<PreferenceCategory android:title="@string/track_color_mode_option_dynamic">
<EditTextPreference android:key="@string/track_color_mode_dynamic_speed_variation_key"
android:title="@string/settings_track_color_mode_dynamic_speed_variation"
android:summary="@string/settings_track_color_mode_dynamic_speed_variation_summary"
@@ -154,7 +154,7 @@ limitations under the License.
</PreferenceScreen>
<!-- Sensors -->
<PreferenceScreen android:title="@string/sensor_options"
<PreferenceScreen android:title="@string/settings_sensor"
android:key="@string/sensor_options_key">
<ListPreference android:key="@string/sensor_type_key"
android:title="@string/settings_sensor_type"
MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+1 -1
View File
@@ -210,7 +210,7 @@ public class ChartView extends View {
R.color.elevation_border,
new ZoomSettings(MAX_INTERVALS,
new int[] {5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000}),
R.string.elevation);
R.string.elevation_label);
series[SPEED_SERIES] =
new ChartValueSeries(context,
MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class SettingsActivity extends PreferenceActivity {
announcementFrequency.setEnabled(false);
announcementFrequency.setValue("-1");
announcementFrequency.setSummary(
R.string.settings_not_available_summary);
R.string.settings_announcement_frequency_not_available);
}
// Hook up switching of displayed list entries between metric and imperial
MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+3 -3
View File
@@ -132,16 +132,16 @@ public class SaveActivity extends Activity {
// Share the file.
Intent shareIntent = new Intent(Intent.ACTION_SEND);
shareIntent.putExtra(Intent.EXTRA_SUBJECT,
getResources().getText(R.string.send_track_subject).toString());
getResources().getText(R.string.share_track_subject).toString());
shareIntent.putExtra(Intent.EXTRA_TEXT,
getResources().getText(R.string.send_track_body_format)
getResources().getText(R.string.share_track_file_body_format)
.toString());
shareIntent.setType(format.getMimeType());
Uri u = Uri.fromFile(new File(writer.getAbsolutePath()));
shareIntent.putExtra(Intent.EXTRA_STREAM, u);
shareIntent.putExtra(getString(R.string.track_id_broadcast_extra), trackId);
startActivity(Intent.createChooser(shareIntent,
getResources().getText(R.string.share_track).toString()));
getResources().getText(R.string.share_track_picker_title).toString()));
}
private void showResultDialog() {
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class ResultDialogFactory {
builder.setPositiveButton(activity.getString(R.string.ok), onOkClickListener);
if (onShareClickListener != null) {
builder.setNegativeButton(activity.getString(R.string.share_track),
builder.setNegativeButton(activity.getString(R.string.share_track_url),
onShareClickListener);
}
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
+3 -3
View File
@@ -692,15 +692,15 @@ public class SendActivity extends Activity implements ProgressIndicator {
boolean shareUrlOnly = sharedPreferences.getBoolean(
getString(R.string.share_url_only_key), false);
String msg = shareUrlOnly ? url : String.format(
getResources().getText(R.string.share_map_body_format).toString(), url);
getResources().getText(R.string.share_track_url_body_format).toString(), url);
Intent shareIntent = new Intent(Intent.ACTION_SEND);
shareIntent.setType("text/plain");
shareIntent.putExtra(Intent.EXTRA_SUBJECT,
getResources().getText(R.string.share_map_subject).toString());
getResources().getText(R.string.share_track_subject).toString());
shareIntent.putExtra(Intent.EXTRA_TEXT, msg);
startActivity(Intent.createChooser(shareIntent,
getResources().getText(R.string.share_map).toString()));
getResources().getText(R.string.share_track_picker_title).toString()));
}
protected String getFusionTablesUrl(long trackId) {
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendDialog.java
-19
View File
@@ -45,7 +45,6 @@ public class SendDialog extends Dialog {
private CheckBox sendToMyMapsCheckBox;
private CheckBox sendToFusionTablesCheckBox;
private CheckBox sendToDocsCheckBox;
private RadioButton sendStatsAndPointsRadioButton;
private OnClickListener clickListener;
public SendDialog(Context context) {
@@ -69,9 +68,6 @@ public class SendDialog extends Dialog {
(RadioButton) findViewById(R.id.sendtogoogle_create_new_map);
pickMapRadioButton =
(RadioButton) findViewById(R.id.sendtogoogle_pick_existing_map);
RadioButton sendStatsRadioButton = (RadioButton) findViewById(R.id.sendtogoogle_send_stats);
sendStatsAndPointsRadioButton = (RadioButton) findViewById(
R.id.sendtogoogle_send_stats_and_points);
Button cancel = (Button) findViewById(R.id.sendtogoogle_cancel);
cancel.setOnClickListener(new View.OnClickListener() {
@@ -124,14 +120,6 @@ public class SendDialog extends Dialog {
createNewMapRadioButton.setChecked(
!prefs.getBoolean(
getContext().getString(R.string.pick_existing_map_key), false));
sendStatsAndPointsRadioButton.setChecked(
prefs.getBoolean(
getContext().getString(R.string.send_stats_and_points_key),
false));
sendStatsRadioButton.setChecked(
!prefs.getBoolean(
getContext().getString(R.string.send_stats_and_points_key),
false));
}
}
@@ -154,9 +142,6 @@ public class SendDialog extends Dialog {
editor.putBoolean(
getContext().getString(R.string.pick_existing_map_key),
pickMapRadioButton.isChecked());
editor.putBoolean(
getContext().getString(R.string.send_stats_and_points_key),
sendStatsAndPointsRadioButton.isChecked());
editor.commit();
}
}
@@ -182,8 +167,4 @@ public class SendDialog extends Dialog {
public boolean getCreateNewMap() {
return createNewMapRadioButton.isChecked();
}
public boolean getSendStatsAndPoints() {
return sendStatsAndPointsRadioButton.isChecked();
}
}
MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
+41 -20
View File
@@ -53,11 +53,6 @@ public class StatusAnnouncerTask implements PeriodicTask {
*/
private final Context context;
/**
* String utilities.
*/
private final StringUtils stringUtils;
/**
* The interface to the text to speech engine.
*/
@@ -93,14 +88,8 @@ public class StatusAnnouncerTask implements PeriodicTask {
}
};
public StatusAnnouncerTask(Context context) {
this(context, new StringUtils(context));
}
public StatusAnnouncerTask(Context context, StringUtils stringUtils) {
this.context = context;
this.stringUtils = stringUtils;
}
/**
@@ -182,17 +171,17 @@ public class StatusAnnouncerTask implements PeriodicTask {
int speedLabel;
if (metricUnits) {
if (reportSpeed) {
speedLabel = R.string.kilometer_per_hour_long;
speedLabel = R.string.voice_kilometer_per_hour;
} else {
speedLabel = R.string.per_kilometer;
speedLabel = R.string.voice_per_kilometer;
}
} else {
s *= UnitConversions.KMH_TO_MPH;
d *= UnitConversions.KM_TO_MI;
if (reportSpeed) {
speedLabel = R.string.mile_per_hour_long;
speedLabel = R.string.voice_mile_per_hour;
} else {
speedLabel = R.string.per_mile;
speedLabel = R.string.voice_per_mile;
}
}
@@ -206,17 +195,16 @@ public class StatusAnnouncerTask implements PeriodicTask {
double pace = 3600000.0 / s;
Log.w(Constants.TAG,
"Converted speed: " + s + " to pace: " + pace);
speed = stringUtils.formatTimeLong((long) pace);
speed = getAnnounceTime((long) pace);
}
}
return context.getString(R.string.announce_template,
context.getString(R.string.total_distance_label),
d,
context.getString(metricUnits
? R.string.kilometers_long
: R.string.miles_long),
stringUtils.formatTimeLong(stats.getMovingTime()),
? R.string.voice_kilometers
: R.string.voice_miles),
getAnnounceTime(stats.getMovingTime()),
speed,
context.getString(speedLabel));
}
@@ -333,4 +321,37 @@ public class StatusAnnouncerTask implements PeriodicTask {
public static int getVolumeStream() {
return TextToSpeech.Engine.DEFAULT_STREAM;
}
/**
* Gets a string to announce the time.
*
* @param time the time
*/
private String getAnnounceTime(long time) {
int[] parts = StringUtils.getTimeParts(time);
String secLabel =
context.getString(parts[0] == 1 ? R.string.voice_second : R.string.voice_seconds);
String minLabel =
context.getString(parts[1] == 1 ? R.string.voice_minute : R.string.voice_minutes);
String hourLabel =
context.getString(parts[2] == 1 ? R.string.voice_hour : R.string.voice_hours);
StringBuilder sb = new StringBuilder();
if (parts[2] != 0) {
sb.append(parts[2]);
sb.append(" ");
sb.append(hourLabel);
sb.append(" ");
sb.append(parts[1]);
sb.append(minLabel);
} else {
sb.append(parts[1]);
sb.append(" ");
sb.append(minLabel);
sb.append(" ");
sb.append(parts[0]);
sb.append(secLabel);
}
return sb.toString();
}
}
MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
+2 -30
View File
@@ -221,34 +221,6 @@ public class StringUtils implements DescriptionGenerator {
this.context = context;
}
public String formatTimeLong(long time) {
int[] parts = getTimeParts(time);
String secLabel =
context.getString(parts[0] == 1 ? R.string.second : R.string.seconds);
String minLabel =
context.getString(parts[1] == 1 ? R.string.minute : R.string.minutes);
String hourLabel =
context.getString(parts[2] == 1 ? R.string.hour : R.string.hours);
StringBuilder sb = new StringBuilder();
if (parts[2] != 0) {
sb.append(parts[2]);
sb.append(" ");
sb.append(hourLabel);
sb.append(" ");
sb.append(parts[1]);
sb.append(minLabel);
} else {
sb.append(parts[1]);
sb.append(" ");
sb.append(minLabel);
sb.append(" ");
sb.append(parts[0]);
sb.append(secLabel);
}
return sb.toString();
}
/**
* Generates a description for a track (with information about the
* statistics).
@@ -462,10 +434,10 @@ public class StringUtils implements DescriptionGenerator {
+ "%s: %d %s (%d %s)\n"
+ "%s: %d %s\n"
+ "%s: %d %s\n",
context.getString(R.string.distance_label),
context.getString(R.string.total_distance_label),
distanceInKm, context.getString(R.string.kilometer),
distanceInMiles, context.getString(R.string.mile),
context.getString(R.string.time_label),
context.getString(R.string.total_time_label),
StringUtils.formatTime(stats.getTotalTime()),
context.getString(R.string.moving_time_label),
StringUtils.formatTime(stats.getMovingTime()),
MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
+2 -2
View File
@@ -34,7 +34,7 @@ public class ChartValueSeriesTest extends AndroidTestCase {
R.color.elevation_fill,
R.color.elevation_border,
new ZoomSettings(5, new int[] {100}),
R.string.elevation);
R.string.elevation_label);
}
public void testInitialConditions() {
@@ -44,7 +44,7 @@ public class ChartValueSeriesTest extends AndroidTestCase {
assertEquals(0, series.getMax());
assertEquals(0.0, series.getSpread());
assertEquals(Style.STROKE, series.getPaint().getStyle());
assertEquals(getContext().getString(R.string.elevation),
assertEquals(getContext().getString(R.string.elevation_label),
series.getTitle());
assertTrue(series.isEnabled());
}
MyTracksTest/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTaskTest.java
+27 -31
View File
@@ -20,7 +20,6 @@ import static com.google.android.testing.mocking.AndroidMock.eq;
import static com.google.android.testing.mocking.AndroidMock.expect;
import static com.google.android.testing.mocking.AndroidMock.same;
import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerTask;
import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.testing.mocking.AndroidMock;
@@ -55,7 +54,6 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
private Locale oldDefaultLocale;
private StatusAnnouncerTask task;
private StringUtils stringUtils;
private StatusAnnouncerTask mockTask;
private Capture<OnInitListener> initListenerCapture;
private Capture<PhoneStateListener> phoneListenerCapture;
@@ -263,7 +261,6 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
oldDefaultLocale = Locale.getDefault();
Locale.setDefault(DEFAULT_LOCALE);
stringUtils = AndroidMock.createMock(StringUtils.class, getContext());
// Eww, the effort required just to mock TextToSpeech is insane
final AtomicBoolean listenerCalled = new AtomicBoolean();
@@ -294,9 +291,8 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
phoneListenerCapture = new Capture<PhoneStateListener>();
// Create a partial forwarding mock
mockTask = AndroidMock.createMock(StatusAnnouncerTask.class,
getContext(), stringUtils);
task = new StatusAnnouncerTask(getContext(), stringUtils) {
mockTask = AndroidMock.createMock(StatusAnnouncerTask.class, getContext());
task = new StatusAnnouncerTask(getContext()) {
@Override
protected TextToSpeech newTextToSpeech(Context ctx,
OnInitListener onInitListener) {
@@ -333,11 +329,11 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
expect(tts.setSpeechRate(StatusAnnouncerTask.TTS_SPEECH_RATE))
.andReturn(TextToSpeech.SUCCESS);
AndroidMock.replay(tts, stringUtils);
AndroidMock.replay(tts);
ttsInitListener.onInit(TextToSpeech.SUCCESS);
AndroidMock.verify(mockTask, tts, stringUtils);
AndroidMock.verify(mockTask, tts);
}
public void testStart_languageNotSupported() {
@@ -352,11 +348,11 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
expect(tts.setSpeechRate(StatusAnnouncerTask.TTS_SPEECH_RATE))
.andReturn(TextToSpeech.SUCCESS);
AndroidMock.replay(tts, stringUtils);
AndroidMock.replay(tts);
ttsInitListener.onInit(TextToSpeech.SUCCESS);
AndroidMock.verify(mockTask, tts, stringUtils);
AndroidMock.verify(mockTask, tts);
}
public void testStart_notReady() {
@@ -364,11 +360,11 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
OnInitListener ttsInitListener = initListenerCapture.getValue();
assertNotNull(ttsInitListener);
AndroidMock.replay(tts, stringUtils);
AndroidMock.replay(tts);
ttsInitListener.onInit(TextToSpeech.ERROR);
AndroidMock.verify(mockTask, tts, stringUtils);
AndroidMock.verify(mockTask, tts);
}
public void testShutdown() {
@@ -382,9 +378,9 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
mockTask.listenToPhoneState(
same(phoneListener), eq(PhoneStateListener.LISTEN_NONE));
tts.shutdown();
AndroidMock.replay(mockTask, tts, stringUtils);
AndroidMock.replay(mockTask, tts);
task.shutdown();
AndroidMock.verify(mockTask, tts, stringUtils);
AndroidMock.verify(mockTask, tts);
}
public void testRun() throws Exception {
@@ -404,9 +400,9 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
.andReturn(TextToSpeech.SUCCESS);
// Run the announcement
AndroidMock.replay(tts, stringUtils);
AndroidMock.replay(tts);
task.runWithStatistics(stats);
AndroidMock.verify(mockTask, tts, stringUtils);
AndroidMock.verify(mockTask, tts);
}
public void testRun_notReady() throws Exception {
@@ -414,9 +410,9 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
startTask(TextToSpeech.ERROR);
// Run the announcement
AndroidMock.replay(tts, stringUtils);
AndroidMock.replay(tts);
task.runWithStatistics(null);
AndroidMock.verify(mockTask, tts, stringUtils);
AndroidMock.verify(mockTask, tts);
}
public void testRun_duringCall() throws Exception {
@@ -425,11 +421,11 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
expect(tts.isSpeaking()).andStubReturn(false);
// Run the announcement
AndroidMock.replay(tts, stringUtils);
AndroidMock.replay(tts);
PhoneStateListener phoneListener = phoneListenerCapture.getValue();
phoneListener.onCallStateChanged(TelephonyManager.CALL_STATE_OFFHOOK, null);
task.runWithStatistics(null);
AndroidMock.verify(mockTask, tts, stringUtils);
AndroidMock.verify(mockTask, tts);
}
public void testRun_ringWhileSpeaking() throws Exception {
@@ -438,7 +434,7 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
expect(tts.isSpeaking()).andStubReturn(true);
expect(tts.stop()).andReturn(TextToSpeech.SUCCESS);
AndroidMock.replay(tts, stringUtils);
AndroidMock.replay(tts);
// Update the state to ringing - this should stop the current announcement.
PhoneStateListener phoneListener = phoneListenerCapture.getValue();
@@ -447,7 +443,7 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
// Run the announcement - this should do nothing.
task.runWithStatistics(null);
AndroidMock.verify(mockTask, tts, stringUtils);
AndroidMock.verify(mockTask, tts);
}
public void testRun_whileRinging() throws Exception {
@@ -456,20 +452,20 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
expect(tts.isSpeaking()).andStubReturn(false);
// Run the announcement
AndroidMock.replay(tts, stringUtils);
AndroidMock.replay(tts);
PhoneStateListener phoneListener = phoneListenerCapture.getValue();
phoneListener.onCallStateChanged(TelephonyManager.CALL_STATE_RINGING, null);
task.runWithStatistics(null);
AndroidMock.verify(mockTask, tts, stringUtils);
AndroidMock.verify(mockTask, tts);
}
public void testRun_noService() throws Exception {
startTask(TextToSpeech.SUCCESS);
// Run the announcement
AndroidMock.replay(tts, stringUtils);
AndroidMock.replay(tts);
task.run(null);
AndroidMock.verify(mockTask, tts, stringUtils);
AndroidMock.verify(mockTask, tts);
}
public void testRun_noStats() throws Exception {
@@ -478,18 +474,18 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
startTask(TextToSpeech.SUCCESS);
// Run the announcement
AndroidMock.replay(tts, stringUtils);
AndroidMock.replay(tts);
task.runWithStatistics(null);
AndroidMock.verify(mockTask, tts, stringUtils);
AndroidMock.verify(mockTask, tts);
}
private void startTask(int state) {
AndroidMock.resetToNice(tts, stringUtils);
AndroidMock.replay(tts, stringUtils);
AndroidMock.resetToNice(tts);
AndroidMock.replay(tts);
doStart();
OnInitListener ttsInitListener = initListenerCapture.getValue();
ttsInitListener.onInit(state);
AndroidMock.resetToDefault(tts, stringUtils);
AndroidMock.resetToDefault(tts);
}
private void doStart() {