Merging Marian's change to German translation.

MyTracks/res/layout/list.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apl/res/com.google.android.maps"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent">
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar"
+    android:layout_weight="0"
+    android:padding="3dip">
+    <TextView android:id="@+id/message"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:textSize="16dip"
+      android:textColor="#fff"
+      android:text="@string/select_map_message"
+      android:layout_weight="0"/>
+  </LinearLayout>
+  <ListView android:id="@+id/maplist"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"/>
+    <TextView android:id="@+id/mapslist_empty"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:layout_gravity="center"
+      android:gravity="center"
+      android:padding="3dip"
+      android:textSize="16dip"
+      android:textColor="#c00"
+      android:textStyle="bold"
+      android:text="@string/mapslist_no_maps_available"
+      android:visibility="gone"/>
+    <TextView android:id="@+id/failed"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:padding="3dip"
+    android:textSize="16dip"
+    android:textColor="#c00"
+    android:textStyle="bold"
+    android:text="@string/maps_list_failed"
+    android:visibility="gone"/>
+    <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar"
+    android:layout_weight="0"
+    android:padding="3dip">
+      <LinearLayout android:id="@+id/loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="3dip"
+        android:layout_gravity="center">
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"/>
+        <ProgressBar
+          android:layout_height="20dip"
+          android:layout_width="20dip"
+          android:layout_gravity="center"/>
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:paddingLeft="3dip"
+          android:textSize="16dip"
+          android:textColor="#fff"
+          android:textStyle="bold"
+          android:text="@string/maps_list_loading"/>
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"/>
+      </LinearLayout>
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"/>
+    </LinearLayout>
+</LinearLayout>

MyTracks/res/layout/mytracks_list.xml

@@ -50,6 +50,12 @@ limitations under the License.
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_weight="1"/>
+    <Button android:id="@+id/tracklist_btn_import_all"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/tracklist_btn_import_all"
+      android:textSize="14dip"/>
     <Button android:id="@+id/tracklist_btn_export_all"
       android:layout_width="wrap_content"
       android:layout_height="48dip"

MyTracks/res/layout/mytracks_send_to_google.xml

@@ -41,6 +41,39 @@ limitations under the License.
       android:stretchColumns="1"
       android:layout_marginTop="5dip"
       android:layout_marginLeft="5dip">
+      
+      <!-- My Maps -->
+      <TableRow>
+        <ImageView android:src="@drawable/mymaps_icon"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+        <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical"
+          android:layout_marginLeft="10dip">
+          <CheckBox android:id="@+id/sendtogoogle_google_mymaps"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/sendtogoogle_google_mymaps"
+            android:textSize="20dip"
+            android:checked="true"/>
+          <RadioGroup android:id="@+id/sendtogoogle_group_mymaps"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+            <RadioButton android:id="@+id/sendtogoogle_create_new_map"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/sendtogoogle_create_new_map"/>
+            <RadioButton android:id="@+id/sendtogoogle_pick_existing_map"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/sendtogoogle_pick_existing_map"/>
+          </RadioGroup>
+        </LinearLayout>
+      </TableRow>
+
+      <!-- Fusion Tables -->
       <TableRow>
         <ImageView android:src="@drawable/googledocs_icon"
           android:layout_width="wrap_content"
@@ -58,6 +91,8 @@ limitations under the License.
             android:checked="true"/>
         </LinearLayout>
       </TableRow>
+
+      <!-- Google Docs -->
       <TableRow>
         <ImageView android:src="@drawable/googledocs_icon"
           android:layout_width="wrap_content"

MyTracks/res/values-ca/strings.xml

@@ -54,7 +54,7 @@ limitations under the License.
   <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>
-  <string name="status_enable_gps">Piqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar.</string>
+  <string name="status_enable_gps">Toqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar.</string>
   <string name="status_approximate_location">Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques.</string>
   <string name="status_no_location">No es pot determinar la ubicació. Habiliteu més fonts d\'ubicació (vegeu els paràmetres de seguretat i ubicació) i assegureu-vos que el cel és visible. Proveu de nou més tard.</string>
   <string name="status_waypoint_inserted">S\'ha inserit un marcader de punt de ruta.</string>
@@ -133,7 +133,6 @@ 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_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>
@@ -171,7 +170,7 @@ limitations under the License.
   <string name="settings_not_available_summary">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ínin entre dos avisos de veu</string>
+  <string name="settings_announcement_frequency_summary">Temps mínim entre dos avisos de veu</string>
 
   <string name="settings_min_recording_distance">Distància mínima entre punts</string>
   <string name="settings_min_recording_distance_summary">La distància més petita entre dos punts enregistrats de la vostra posició</string>
@@ -182,7 +181,7 @@ limitations under the License.
   <string name="settings_min_recording_interval">Temps mínim entre punts</string>
   <string name="settings_min_recording_interval_summary">Interval de temps mínim entre dos enregistraments de la vostra posició</string>
 
-  <string name="settings_min_required_accuracy">Precisió míima</string>
+  <string name="settings_min_required_accuracy">Precisió mínima</string>
   <string name="settings_min_required_accuracy_summary">S\'aturarà l\'enregistrament si la vostra posició no és així de precisa com a mínim</string>
 
   <string name="settings_metric_units">Fes servir unitats mètriques</string>
@@ -240,13 +239,13 @@ limitations under the License.
 
   <!-- Sharing -->
   <string name="share_map_subject">M\'agradaria compartir un mapa amb tu</string>
-  <string name="share_map_body_format">Crec que estaràs interessat en aquest mapa:
+  <string name="share_map_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">Crec que estaràs interessat en aquesta ruta.
+  <string name="send_track_body_format">Em sembla que estaràs interessat en aquesta ruta.
 
-    Per verue aquesta ruta fes servir Google Earth o altre programari de mapes.</string>
+    Per veure aquesta ruta fes servir Google Earth o altre programari de mapes.</string>
   <string name="share_track">Comparteix la ruta amb amics</string>
 
   <!-- Visibility -->
@@ -256,8 +255,8 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">Average Moving Speed</string>
-  <string name="average_moving_pace_label">Average Moving Pace</string>
+  <string name="average_moving_speed_label">Velocitat mitjana en moviment</string>
+  <string name="average_moving_pace_label">Ritme mitjà en moviment</string>
 
   <!-- Average -->
   <string name="average_speed_label">Velocitat mitjana</string>

MyTracks/res/values-es-rES/strings.xml

@@ -47,7 +47,6 @@ limitations under the License.
   <string name="tracklist_save_as_tcx">Guardar en archivo TCX</string>
   <string name="tracklist_btn_send_all_to_fusiontables">Enviar a Google Fusion Tables</string>
   <!-- Export All -->
-  <string name="tracklist_share_linkfusion">Un enlace a Google Fusion Tables</string>
   <string name="tracklist_share_csv_file">Un archivo CSV</string>
   <string name="tracklist_share_tcx_file">Un archivo TCX</string>
 

MyTracks/res/values-es/strings.xml

@@ -121,7 +121,6 @@ limitations under the License.
   <string name="tracklist_all_tracks">Todos los recorridos:"</string>
   <string name="tracklist_this_track">Este recorrido"</string>
   <string name="tracklist_share_track">Compartir con amigos..."</string>
-  <string name="tracklist_share_linkfusion">Un enlace a Google Fusion Tables</string>
   <string name="tracklist_share_gpx_file">Un archivo GPX"</string>
   <string name="tracklist_share_kml_file">Un archivo KML"</string>
   <string name="tracklist_clear_map">"Limpiar mapa"</string>

MyTracks/res/values-fr/arrays.xml

@@ -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

@@ -30,7 +30,9 @@ 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>
@@ -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_fusiontable_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_fusiontables">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_fusiontables">Envoi du parcours vers Google Mes cartes...</string> -->
-  <!-- <string name="progress_message_creating_fusiontable">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>
@@ -109,8 +111,8 @@ limitations under the License.
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Afficher</string>
-  <!-- <string name="tracklist_send_to_fusiontables">Envoyer à Google Mes cartes</string> -->
-  <!-- <string name="tracklist_send_to_new_fusiontable">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>
@@ -118,14 +120,13 @@ 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_fusiontables">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_linkfusion">Lien sur Google Mes cartes</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>
@@ -193,6 +194,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>
 
@@ -267,6 +296,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>
@@ -274,6 +306,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>
@@ -330,4 +368,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

@@ -129,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_linkfusion">Un link alla mappa in «Le mie mappe» di Google</string> -->
+  <string name="tracklist_share_link">Un link alla mappa</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>

MyTracks/res/values-ja/arrays.xml

@@ -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

@@ -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_fusiontables">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,52 +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_fusiontable_has_been_created">新しいGoogleマイマップを 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">ここをタップして，セキュリティ &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_fusiontables">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_fusiontables">トラックをGoogleマップに送信しています...</string> -->
-  <!-- <string name="progress_message_creating_fusiontable">新しいマイマップを生成しています...</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="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>
@@ -96,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>
@@ -111,8 +113,8 @@ limitations under the License.
 
   <!--  TrackList -->
   <string name="tracklist_show_track">表示</string>
-  <!-- <string name="tracklist_send_to_new_fusiontable">Google Fusion Tablesへ送信</string> -->
-  <!-- <string name="tracklist_send_to_new_fusiontable">新規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>
@@ -121,42 +123,43 @@ 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_fusiontables">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_linkfusion">Googleマイマップへのリンク</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>
@@ -164,9 +167,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>
@@ -197,13 +201,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">このマップに興味を持って頂けると思います:
 
@@ -211,7 +251,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 -->
@@ -266,23 +306,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 -->
@@ -295,6 +328,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,11 +346,11 @@ limitations under the License.
   <string name="about_team">チーム:</string>
   <string name="about_version">バージョン:</string>
   <string name="about_support">サポート:</string>
+  <string name="about_privacy">プライバシー:</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">送信...</string>
-  <!-- <string name="sendtogoogle_google_fusiontables">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_send_stats">トラック統計情報送信</string>
   <string name="sendtogoogle_send_stats_and_points">統計情報とポイント送信</string>
@@ -324,22 +361,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 -->
@@ -357,4 +395,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

@@ -131,7 +131,6 @@ 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_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>

MyTracks/res/values-pt-rBR/strings.xml

@@ -18,9 +18,9 @@ limitations under the License.
   <!-- Used by the Menu -->
   <string name="start_recording">Gravar caminho</string>
   <string name="stop_recording">Para gravação</string>
-  <string name="switch_to_sat">Modo do satélite"</string>
-  <string name="switch_to_map">Modo do mapa"</string>
-  <string name="mylocation">Minha Localização"</string>
+  <string name="switch_to_sat">Modo do satélite</string>
+  <string name="switch_to_map">Modo do mapa</string>
+  <string name="mylocation">Minha Localização</string>
   <string name="list_tracks">Caminhos</string>
   <string name="list_markers">Marcadores</string>
   <string name="delete_all_tracks">Apagar todos os caminhos</string>
@@ -31,10 +31,10 @@ limitations under the License.
   <string name="current_segment">Último segmento</string>
 
   <!-- 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_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_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_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>
   <string name="error_unable_to_read_file">Impossível ler do arquivo.</string>
@@ -52,7 +52,7 @@ limitations under the License.
   <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>
-  <string name="status_enable_gps">"Por favor pressione aqui para ir aos ajustes de segurança e localização e verifique que o GPS esteja habilitado. Pressione o botão de voltar para retornar."</string>
+  <string name="status_enable_gps">"Por favor pressione aqui para ir aos ajustes de segurança e localização e verifique que o GPS esteja habilitado. Pressione o botão de voltar para retornar.</string>
   <string name="status_approximate_location">Nota: Uma localização aproximada, determinada por torres de telefonia celular, está sendo mostrada.</string>
   <string name="status_no_location">Sua localização não pôde ser determinada.  Habilite fontes adicionais de localização (veja configurações de Segurança e Localização) e assegure-se de que o céu está visível.</string>
   <string name="status_waypoint_inserted">Um marcador de ponto de passagem foi inserido.</string>
@@ -79,19 +79,19 @@ limitations under the License.
   <string name="marker_will_be_permanently_deleted">O marcador será permanentemente apagado deste telefone.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
-  <string name="new_map_description">"Criado por My Tracks no Android."</string>
-  <string name="fusiontable_link">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android."</string>
+  <string name="new_map_description">"Criado por My Tracks no Android.</string>
+  <string name="fusiontable_link">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Pontos</string>
-  <string name="recorded_date">Gravado"</string>
-  <string name="category">"Tipo de atividade"</string>
-  <string name="waypoint_category">"Tipo de marcador"</string>
-  <string name="part">"(Parte %d)"</string>
+  <string name="recorded_date">Gravado</string>
+  <string name="category">"Tipo de atividade</string>
+  <string name="waypoint_category">"Tipo de marcador</string>
+  <string name="part">"(Parte %d)</string>
 
   <!-- Used by the track recording service -->
-  <string name="recording_your_track">"Gravando seu caminho..."</string>
-  <string name="new_track">"Caminho %d"</string>
+  <string name="recording_your_track">"Gravando seu caminho...</string>
+  <string name="new_track">"Caminho %d</string>
 
   <!-- Common -->
   <string name="no">Não</string>
@@ -122,22 +122,22 @@ limitations under the License.
   <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_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>
+  <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 a mapa</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>
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Apagar todos os marcadores</string>
   <string name="waypointslist_this_waypoint">Este Marcador</string>
   <string name="waypointslist_delete_waypoint">Apagar</string>
-  <string name="waypointslist_edit_waypoint">Editar detalhes"</string>
-  <string name="waypointslist_show_waypoint">Mostrar no mapa"</string>
-  <string name="waypointslist_btn_insert_waypoint">Inserir ponto no caminho"</string>
-  <string name="waypointslist_btn_insert_statistics">Inserir estatísticas"</string>
+  <string name="waypointslist_edit_waypoint">Editar detalhes</string>
+  <string name="waypointslist_show_waypoint">Mostrar no mapa</string>
+  <string name="waypointslist_btn_insert_waypoint">Inserir ponto no caminho</string>
+  <string name="waypointslist_btn_insert_statistics">Inserir estatísticas</string>
   <string name="waypointslist_pick_one">Escolha um marcador.  Pressione&amp;segure para mais opções.</string>
 
   <!-- MyTracks Details -->

MyTracks/res/values-sv/strings.xml

@@ -131,7 +131,6 @@ 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_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>

MyTracks/res/values-zh-rCN/strings.xml

@@ -132,7 +132,6 @@ 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_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>

MyTracks/res/values/arrays.xml

@@ -406,4 +406,10 @@ limitations under the License.
     <item>@string/zephyr_sensor_type</item>
   </array>
 
+  <!-- DO NOT TRANSLATE -->
+  <string-array name="ant_sensor_type_values">
+  	<item>@string/ant_sensor_type</item>
+  	<item>@string/srm_ant_bridge_sensor_type</item>
+  </string-array>
+
 </resources>

MyTracks/res/values/keys.xml

@@ -36,6 +36,7 @@ limitations under the License.
   <string name="send_stats_and_points_key">sendStatsAndPoints</string>
   <string name="send_to_docs_key">sendToDocs</string>
   <string name="send_to_my_maps_key">sendToMyMaps</string>
+  <string name="send_to_fusion_tables_key">sendToFusionTables</string>
   <string name="sensor_type_key">sensorType</string>
   <string name="share_url_only_key">shareUrlOnly</string>
   <string name="split_frequency_key">splitFrequency</string>
@@ -49,4 +50,8 @@ limitations under the License.
   <!-- Keys for non-persisted preferences - DO NOT TRANSLATE -->
   <string name="backup_to_sd_key">backupToSd</string>
   <string name="restore_from_sd_key">restoreFromSd</string>
+
+  <!-- Inoperative keys used for the location of preferences items -->
+  <string name="sensor_options_key">sensorOptions</string>
+  <string name="ant_options_key">antOptions</string>
 </resources>

MyTracks/res/values/strings.xml

@@ -35,6 +35,7 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">No location manager was found on this device!</string>
   <string name="error_no_gps_location_provider">No GPS location provider was found on this device.</string>
+  <string name="error_sending_to_mymap">There was an error while sending your track to Google My Map. Please try again later.</string>
   <string name="error_sending_to_fusiontables">There was an error while sending your track to Google Fusion Tables. Please try again later.</string>
   <string name="error_sending_to_docs">There was an error while sending your track to Google Docs. Please try again later.</string>
   <string name="error_unable_to_start_recording">Unable to start recording. Try again.</string>
@@ -50,10 +51,12 @@ limitations under the License.
   <string name="wait_for_fix">Waiting for a better GPS fix. Make sure the sky is visible.</string>
   <string name="status_now_recording">Now recording a new track.</string>
   <string name="status_stopped_recording">Stopped recording your track.</string>
+  <string name="status_new_mymap_has_been_created">A new Google My Map has been created at maps.google.com.</string>
   <string name="status_new_fusiontable_has_been_created">A new Google Fusion table has been created at google.com/fusiontables.</string>
   <string name="status_tracks_have_been_uploaded">Your track has been sent to maps.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_new_doc">Your track has been sent to a new spreadsheet at docs.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_docs">Your track has been sent to docs.google.com.</string>
+  <string name="status_mymap_info">It may sometimes take a few minutes before new tracks appear.</string>
   <string name="status_enable_gps">Please tap here to go to Security and Location Settings and check \'enable GPS satellites\'. Press back button to return.</string>
   <string name="status_approximate_location">Note: An approximate location as determined from cell towers and WIFI networks is shown.</string>
   <string name="status_no_location">A location can currently not be determined. Enable more location sources (see Security and Location Settings) and make sure the sky is visible. Try again later.</string>
@@ -66,8 +69,11 @@ limitations under the License.
   <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_mymaps">Authenticating to Google Maps...</string>
   <string name="progress_message_authenticating_docs">Authenticating to Google Docs...</string>
   <string name="progress_message_sending_docs">Sending track to Google Docs...</string>
+  <string name="progress_message_sending_mymaps">Sending track to Google Maps...</string>
+  <string name="progress_message_creating_map">Creating new My Map...</string>
   <string name="progress_message_sending_fusiontables">Sending track to Fusion Tables...</string>
   <string name="progress_message_creating_fusiontable">Creating new Fusion table...</string>
   <string name="import_progress_message">Importing a GPS track. This may take a while.</string>
@@ -84,6 +90,10 @@ limitations under the License.
   <string name="new_map_description">Created by My Tracks on Android.</string>
   <string name="fusiontable_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
 
+  <!-- Text and links when uploading to Google My Maps -->
+  <string name="my_map_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
+  <string name="new_map_title">New map</string>
+
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Points</string>
   <string name="recorded_date">Recorded</string>
@@ -114,6 +124,8 @@ limitations under the License.
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Show</string>
+  <string name="tracklist_send_to_mymaps">Send to Google My Maps</string>
+  <string name="tracklist_send_to_new_mymap">Send to New Google My Map</string>
   <string name="tracklist_send_to_fusiontables">Send to Google Fusion Tables</string>
   <string name="tracklist_send_to_new_fusiontable">Send to New Google Fusion Table</string>
   <string name="tracklist_send_to_docs">Send to Google Docs</string>
@@ -126,20 +138,32 @@ limitations under the License.
   <string name="tracklist_save_as_csv">Save a CSV file</string>
   <string name="tracklist_save_as_tcx">Save a TCX file</string>
   <string name="tracklist_btn_send_all_to_fusiontables">Send to Google Fusion Tables</string>
-  <string name="tracklist_btn_delete_all">Delete all tracks</string>
+  <string name="tracklist_btn_send_all_to_mymaps">Send to Google My Maps</string>
+  <string name="tracklist_btn_delete_all">Delete all</string>
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">Export all tracks</string>
+  <string name="tracklist_btn_export_all">Export all</string>
   <string name="export_done">Export finished</string>
   <string name="tracklist_pick_one">Pick a track. Press&amp;hold for more options.</string>
   <string name="tracklist_all_tracks">All Tracks:</string>
   <string name="tracklist_this_track">This Track</string>
   <string name="tracklist_share_track">Share with Friends...</string>
-  <string name="tracklist_share_linkfusion">A link to Google Fusion Tables</string>
+  <string name="tracklist_share_link">A link to the map</string>
   <string name="tracklist_share_gpx_file">A GPX file</string>
   <string name="tracklist_share_kml_file">A KML file</string>
   <string name="tracklist_share_csv_file">A CSV file</string>
   <string name="tracklist_share_tcx_file">A TCX file</string>
   <string name="tracklist_clear_map">Clear map</string>
+  <!-- Import All -->
+  <string name="tracklist_btn_import_all">Import all</string>
+  <string name="import_done">Import finished, imported</string>
+  <!-- Format:
+  $1 : Successful imports
+  $2 : Attempted imports
+  $3 : MyTracks gpx path
+  -->
+  <string name="import_done">Imported %1$d of %2$d GPX files from %3$s</string>
+  <string name="import_empty">No GPX files found in %s. SD card may be unreadable or directory may not contain GPX files.</string>
+  <string name="import_error">Import error for file %s</string>
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Delete all markers</string>
@@ -219,7 +243,7 @@ limitations under the License.
   <string name="settings_sensor_type_summary">The type of sensor to connect to</string>
   <string name="settings_heart_rate_ant_sensor_id">Clear ANT heart rate sensor pairing</string>
   <string name="settings_power_ant_sensor_id">Clear ANT power sensor pairing</string>
-  <string name="settings_srm_bridge_ant_sensor_id">Clear ANT srm bridge sensor pairing</string>
+  <string name="settings_srm_bridge_ant_sensor_id">Clear ANT SRM bridge sensor pairing</string>
   <string name="settings_ant_not_paired">ANT sensor not paired</string>
   <string name="settings_ant_paired">ANT sensor paired with: %d</string>
   <string name="bluetooth_sensor_title">Bluetooth sensor</string>
@@ -244,6 +268,23 @@ limitations under the License.
   <!-- MyTracksSky -->
   <string name="mytracks_sky">GPS Satellites</string>
 
+  <!-- My Maps -->
+  <string name="select_map_message">Pick a map from your account:</string>
+  <string name="create_new_map">Create new map...</string>
+  <string name="map_list_title">Send to Google My Maps</string>
+  <string name="maps_list_loading">Loading maps...</string>
+  <string name="maps_list_failed">Your maps could not be loaded at this time!</string>
+  <string name="open_map">Select this Map</string>
+  <string name="edit_map_details">Edit Map Details</string>
+  <string name="share_track">Share Track with Friends</string>
+  <string name="delete_map">Delete Map from your Account</string>
+  <string name="map_title">Map Title:</string>
+  <string name="map_description">Map Description:</string>
+  <string name="map_searchable_edit">Make this map and its contents show up in search results</string>
+  <string name="map_not_searchable_edit">Do not let this map or its contents show up in search results, though they may still be viewed be others through the direct URL</string>
+  <string name="map_searchable">This map and its contents will show in search results</string>
+  <string name="map_not_searchable">Neither this map nor its contents will show in search results, but they may still be viewed by others through a direct link</string>
+
   <!-- Sharing -->
   <string name="share_map">Share map with friends</string>
   <string name="share_map_subject">I would like to share a track with you</string>
@@ -367,8 +408,11 @@ limitations under the License.
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Send to...</string>
   <string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string>
+  <string name="sendtogoogle_google_mymaps">Google My Maps</string>
   <string name="sendtogoogle_google_docs">Google Docs</string>
   <string name="sendtogoogle_send_now">Send now</string>
+  <string name="sendtogoogle_create_new_map">Create a new map</string>
+  <string name="sendtogoogle_pick_existing_map">Pick an existing map</string>
   <string name="sendtogoogle_send_stats">Send track statistics</string>
   <string name="sendtogoogle_send_stats_and_points">Send statistics and points</string>
 
@@ -420,6 +464,7 @@ limitations under the License.
   <string name="bluetooth_pairing">Device pairing</string>
   <string name="bluetooth_pairing_summary">Open Android\'s bluetooth settings to pair a device</string>
   <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
+  <string name="ant_options">ANT options</string>
   <string name="sensor_options">Sensor Options</string>
 
   <!-- Bluetooth Sensor -->

MyTracks/res/xml/preferences.xml

@@ -102,7 +102,8 @@ limitations under the License.
   </PreferenceScreen>
 
   <!-- Sensors -->
-  <PreferenceScreen android:title="@string/sensor_options">
+  <PreferenceScreen android:title="@string/sensor_options"
+      android:key="@string/sensor_options_key">
     <ListPreference android:key="@string/sensor_type_key"
         android:title="@string/settings_sensor_type"
         android:summary="@string/settings_sensor_type_summary"
@@ -122,20 +123,22 @@ limitations under the License.
                   android:summary="@string/bluetooth_pairing_summary"
                   android:persistent="false" />
     </PreferenceCategory>
-    
-    <com.google.android.apps.mytracks.AntPreference
-    	android:key="@string/ant_heart_rate_sensor_id_key"
-        android:title="@string/settings_heart_rate_ant_sensor_id"/>
 
+    <PreferenceCategory android:title="@string/ant_options"
+      android:key="@string/ant_options_key">
+	    <com.google.android.apps.mytracks.AntPreference
+	    	android:key="@string/ant_heart_rate_sensor_id_key"
+	        android:title="@string/settings_heart_rate_ant_sensor_id"/>
 <!--
-    <com.google.android.apps.mytracks.AntPreference
-    	android:key="@string/ant_power_sensor_id_key"
-        android:title="@string/settings_power_ant_sensor_id"/>
+	    <com.google.android.apps.mytracks.AntPreference
+	    	android:key="@string/ant_power_sensor_id_key"
+	        android:title="@string/settings_power_ant_sensor_id"/>
 -->
-    
-    <com.google.android.apps.mytracks.AntPreference
-    	android:key="@string/ant_srm_bridge_sensor_id_key"
-        android:title="@string/settings_srm_bridge_ant_sensor_id"/>
+
+	    <com.google.android.apps.mytracks.AntPreference
+	    	android:key="@string/ant_srm_bridge_sensor_id_key"
+	        android:title="@string/settings_srm_bridge_ant_sensor_id"/>
+    </PreferenceCategory>
   </PreferenceScreen>
 
   <!-- Sharing settings -->