From c6d9be499cb4f962cc4b631372f89a20aa5d2e9d Mon Sep 17 00:00:00 2001
From: Sandor Dornbush <Sandor Dornbush@localhost>
Date: Fri, 4 Feb 2011 12:16:36 -0800
Subject: [PATCH] Merge heads.

---
 MyTracks/res/values-ca/strings.xml     | 23 ++-------
 MyTracks/res/values-de/strings.xml     | 70 ++++++++++++++------------
 MyTracks/res/values-es/strings.xml     | 10 ++--
 MyTracks/res/values-fr/strings.xml     | 21 ++++----
 MyTracks/res/values-it/strings.xml     | 27 ++++------
 MyTracks/res/values-ja/strings.xml     | 24 ++++-----
 MyTracks/res/values-pl/strings.xml     | 30 ++++-------
 MyTracks/res/values-pt-rBR/strings.xml | 24 ++++-----
 MyTracks/res/values-sv/strings.xml     | 24 ++++-----
 MyTracks/res/values-zh-rCN/strings.xml | 13 ++---
 10 files changed, 105 insertions(+), 161 deletions(-)

diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index d70610a60..c00f6782c 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -50,7 +50,7 @@ limitations under the License.
   <string name="wait_for_fix">S\'està esperant per tenir una posició GPS fixa. Assegureu-vos que el cel és visible.</string>
   <string name="status_now_recording">Ara s\'està enregistrant una ruta nova.</string>
   <string name="status_stopped_recording">S\'ha aturat l\'enregistrament de la ruta.</string>
-  <string name="status_new_mymap_has_been_created">S\'ha creat un Google My Map nou a maps.google.com.</string>
+  <string name="status_new_fusiontable_has_been_created">S\'ha creat un Google Fusion Table nou a google.com/fusiontables.</string>
   <string name="status_tracks_have_been_uploaded">S\'ha enviat la ruta a maps.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_new_doc">S\'ha enviat la ruta a un full de càlcul a docs.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_docs">S\'ha enviat la ruta a docs.google.com.</string>
@@ -82,8 +82,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Creat per My Tracks a l\'Android.</string>
-  <string name="my_map_link">Creat per &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; a l\'Android.</string>
-  <string name="new_map_title">Mapa nou</string>
+  <string name="fusiontable_link">Creat per &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; a l\'Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Punts</string>
@@ -134,7 +133,7 @@ limitations under the License.
   <string name="tracklist_all_tracks">Totes les rutes:</string>
   <string name="tracklist_this_track">Aquesta ruta</string>
   <string name="tracklist_share_track">Comparteix amb amics...</string>
-  <string name="tracklist_share_link">Un enllaç a Google My Map</string>
+  <string name="tracklist_share_linkfusion">Un enllaç a Google Fusion Table</string>
   <string name="tracklist_share_gpx_file">Un fitxer GPX</string>
   <string name="tracklist_share_kml_file">Un fitxer KML</string>
   <string name="tracklist_share_csv_file">Un fitxer CSV</string>
@@ -217,14 +216,9 @@ limitations under the License.
   <string name="eclair_required">Suportat només en Android 2.0 i superior</string>
   <string name="settings_sensor_type">Tipus de sensor</string>
   <string name="settings_sensor_type_summary">El tipus de sensor al qual es connecta.</string>
-  <string name="settings_sensor_id">Identificador del sensor</string>
-  <string name="settings_sensor_id_summary">L\'identificador enviat als sensors.</string>
-  <string name="sensor_id_malformed">L\'identificador ha de ser un valor sencer.</string>
   <string name="bluetooth_sensor_title">Sensor bluetooth</string>
   <string name="bluetooth_sensor_summary">El sensor bluetooth al qual es connecta.</string>
   <string name="settings_modular_stats_display_title">Pantalla d\'estadístiques modulars</string>
-  <string name="settings_modular_stats_display_summary_on">La pantalla d\'estadístiques es divideix en mòduls diferents.</string>
-  <string name="settings_modular_stats_display_summary_off">Mostra totes les estadístiques en una sola pantalla.</string>
 
   <string name="settings_backup">Còpia de seguretat (BETA)</string>
   <string name="settings_sd_backup">Còpia de seguretat a la targeta SD</string>
@@ -342,14 +336,11 @@ limitations under the License.
   <string name="help">Ajuda</string>
   <string name="about_team">Equip:</string>
   <string name="about_version">Versió:</string>
-  <string name="about_email">Assistència</string>
   <string name="about_support">Assistència:</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Envia a...</string>
   <string name="sendtogoogle_send_now">Envia ara</string>
-  <string name="sendtogoogle_create_new_map">Crea un mapa nou</string>
-  <string name="sendtogoogle_pick_existing_map">Seleccioneu un mapa existent</string>
   <string name="sendtogoogle_send_stats">Envia les estadístiques de la ruta</string>
   <string name="sendtogoogle_send_stats_and_points">Envia les estadístiques i els punts</string>
 
@@ -395,14 +386,6 @@ limitations under the License.
   <string name="check_units_title">Avís de les unitats de mesura</string>
   <string name="check_units_message">Les unitats són mètriques per defecte. Voleu canviar aquest paràmetre?</string>
 
-  <!-- Signal Strength -->
-  <string name="error_rate"> Rati d\'error: %1$d</string>
-  <string name="signal_to_noise_ratio"> Relació senyal/soroll: %1$d</string>
-  <string name="ecio"> Ec/lo: %1$.1f dB</string>
-  <string name="gsm_strength">Intensistat GSM: %1$d</string>
-  <string name="cdma_strength">Intensitat CDMA: %1$d dBm</string>
-  <string name="evdo_strength">Intensitat EVDO: %1$d dBm</string>
-
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="bluetooth_options">Opcions del Bluetooth</string>
   <string name="bluetooth_pairing">Associació de dispositius</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index 893d3d5d0..c742a76d8 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -15,14 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 --> 
 <resources> 
- 
   <!-- Used by the Menu --> 
   <string name="start_recording">Track aufzeichnen</string> 
   <string name="stop_recording">Aufzeichnung anhalten</string> 
   <string name="switch_to_sat">Satellitenansicht</string> 
   <string name="switch_to_map">Kartenansicht</string> 
   <string name="mylocation">Mein Aufenthaltsort</string> 
-  <string name="list_markers">Wegpunkte</string> 
+  <string name="list_markers">Wegpunkte</string>
   <string name="delete_all_tracks">Alle Tracks löschen</string> 
   <string name="settings">Einstellungen</string> 
   <string name="elevation">Höhe</string> 
@@ -82,8 +81,7 @@ limitations under the License.
  
   <!-- Text and links when uploading to Google Fusion Tables --> 
   <string name="new_map_description">Erstellt von My Tracks für Android.</string> 
-  <string name="my_map_link">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string> 
-  <string name="new_map_title">Neue Karte</string> 
+  <string name="fusiontable_link">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
  
   <!-- Formatting of track and marker descriptions --> 
   <string name="points">Punkte</string> 
@@ -93,7 +91,7 @@ limitations under the License.
   <string name="part">(Teil %d)</string> 
  
   <!-- Used by the track recording service --> 
-  <string name="recording_your_track">Dein Track wird aufgezeichnet…</string> 
+  <string name="recording_your_track">Dein Track wird aufgezeichnet…</string>
  
   <!-- Common --> 
   <string name="no">Nein</string> 
@@ -101,18 +99,19 @@ limitations under the License.
   <string name="error">Fehler</string> 
   <string name="success">Erfolgreich</string> 
   <string name="waypoint">Wegpunkt</string> 
+  <string name="license">Lizenz</string>
   <string name="cancel">Abbrechen</string>
+  <string name="close">Schließen</string>
   <string name="edit">Bearbeiten</string>
   <string name="save">Sichern</string>
 
   <!-- Placemark labels for start and end of track --> 
-  <string name="start">(Beginn)</string> 
   <string name="end">(Ende)</string> 
  
   <!--  TrackList --> 
   <string name="tracklist_show_track">Anzeigen</string> 
-  <string name="tracklist_send_to_mymaps">An eine Google MyMaps-Karte senden</string> 
-  <string name="tracklist_send_to_new_mymap">An eine neue Google MyMaps-Karte senden</string> 
+  <string name="tracklist_send_to_fusiontables">An eine Google Fusion Tables-Karte senden</string>
+  <string name="tracklist_send_to_new_fusiontable">An eine neue Google Fusion Tables-Karte senden</string> 
   <string name="tracklist_send_to_docs">An Google Docs senden</string> 
   <string name="tracklist_send_to_google">An Google senden…</string> 
   <string name="tracklist_delete_track">Vom Gerät löschen…</string> 
@@ -122,9 +121,9 @@ limitations under the License.
   <string name="tracklist_save_as_kml">KML-Datei exportieren</string> 
   <string name="tracklist_save_as_csv">CSV-Datei exportieren</string> 
   <string name="tracklist_save_as_tcx">TCX-Datei exportieren</string> 
-  <string name="tracklist_btn_send_all_to_mymaps">An Google MyMaps senden</string> 
+  <string name="tracklist_btn_send_all_to_fusiontables">An Google Fusion Tables senden</string> 
   <string name="tracklist_btn_delete_all">Alle Tracks löschen</string> 
-  <!-- Export All --> 
+  <!-- Export All -->
   <string name="tracklist_btn_export_all">Alle Tracks exportieren</string> 
   <string name="export_done">Exportieren beendet</string> 
   <string name="tracklist_pick_one">Einen Track auswählen. Lange berühren für mehr Optionen.</string> 
@@ -213,14 +212,17 @@ limitations under the License.
  
   <string name="eclair_required">Wird nur unter Android 2.0 oder höher unterstützt</string> 
   <string name="settings_sensor_type">Sensortyp</string> 
-  <string name="settings_sensor_type_summary">Der Typ des zu verbindenden Sensors</string> 
-  <string name="settings_sensor_id">Sensor-Id</string> 
-  <string name="settings_sensor_id_summary">Die zum Sensor zu sendende Id</string> 
-  <string name="sensor_id_malformed">Die Id muss eine Ganzzahl sein.</string> 
+  <string name="settings_sensor_type_summary">Der Typ des zu verbindenden Sensors</string>
+  <string name="settings_heart_rate_ant_sensor_id">Verbindung mit ANT Herzqrequenzmesser aufheben</string>
+  <string name="settings_power_ant_sensor_id">Verbindung mit ANT Kraftmesser aufheben</string>
+  <string name="settings_srm_bridge_ant_sensor_id">Verbindung mit ANT srm bridge aufheben</string>
+  <string name="settings_ant_not_paired">ANT-Sensor nicht verbunden</string>
+  <string name="settings_ant_paired">ANT-Sensor verbunden mit: %d</string>
   <string name="bluetooth_sensor_title">Bluetooth-Sensor</string> 
   <string name="bluetooth_sensor_summary">Der zu verbindende Bluetoothsensor</string> 
   <string name="settings_modular_stats_display_title">Art der Datenanzeige</string> 
  
+  <!-- Backups --> 
   <string name="settings_backup">Datensicherung (BETA)</string> 
   <string name="settings_sd_backup">SD-Karten-Sicherung</string> 
   <string name="settings_backup_to_sd">Jetzt sichern</string> 
@@ -229,7 +231,6 @@ limitations under the License.
   <string name="settings_restore_from_sd_summary">Alle Tracks und Einstellungen von der SD-Karte holen.</string> 
   <string name="settings_no_backup_while_recording">Während ein Track aufgezeichnet wird, kann nicht mit der Datensicherung gearbeitet werden.</string> 
  
-  <!-- Backups --> 
   <string name="restore_overwrites_warning">Eine Wiederherstellung von der SD-Karte ÜBERSCHREIBT alle vorhandenen Tracks und Einstellungen. Willst Du das wirklich?</string> 
   <string name="select_backup_to_restore">Wähle die wiederherzustellende Datensicherung aus</string> 
   <string name="no_backups">Keine Datensicherungen gefunden.</string> 
@@ -304,16 +305,16 @@ limitations under the License.
   <string name="seconds">Sekunden</string> 
  
   <!-- Distance --> 
-  <string name="feet">Fuß</string> 
-  <string name="kilometers_long">Kilometer</string> 
+  <string name="kilometers_long">Kilometer</string>
+  <string name="feet">Fuß</string>
   <string name="miles_long">Meilen</string> 
  
-  <!-- Speed and Pace --> 
-  <string name="kilometer_per_hour_long">Kilometer pro Stunde</string> 
+  <!-- Speed and Pace -->
+  <string name="kilometer_per_hour_long">Kilometer pro Stunde</string>
   <string name="per_kilometer">pro Kilometer</string> 
-  <string name="mile_per_hour_long">Meilen pro Stunde</string> 
+  <string name="mile_per_hour_long">Meilen pro Stunde</string>
   <string name="per_mile">pro Meile</string> 
- 
+
   <!-- Stats Labels --> 
   <string name="moving_time_label">Zeit in Bewegung</string> 
   <string name="total_time_label">Gesamtzeit</string> 
@@ -324,7 +325,7 @@ limitations under the License.
   <string name="statistics">Statistik</string> 
   <string name="total_distance_label">Gesamtentfernung</string> 
   <string name="distance_label">Entfernung</string> 
-  <string name="power">Energie</string> 
+  <string name="power">Kraft</string> 
   <string name="cadence">Kadenz</string> 
   <string name="heart_rate">Herzfrequenz</string> 
   <string name="max_heart_rate">Höchste Herzfrequenz</string> 
@@ -338,10 +339,12 @@ limitations under the License.
   <!-- About --> 
   <string name="about">Über</string> 
   <string name="help">Hilfe</string> 
-  <string name="about_email">Unterstützung</string> 
+  <string name="about_support">Unterstützung:</string>
+  <string name="about_privacy">Datenschutz:</string>
  
-  <!-- Send to Google --> 
-  <string name="sendtogoogle_title">Senden an…</string> 
+  <!-- Send to Google -->
+  <string name="sendtogoogle_title">Senden an…</string>
+  <string name="sendtogoogle_google_docs">Google Text &amp; Tabellen</string>
   <string name="sendtogoogle_send_now">Jetzt senden</string> 
   <string name="sendtogoogle_send_stats">Trackstatistik senden</string> 
   <string name="sendtogoogle_send_stats_and_points">Statistik und Punkte senden</string> 
@@ -369,6 +372,7 @@ limitations under the License.
  
   <!-- Welcome --> 
   <string name="welcome">Willkommen</string> 
+  <string name="welcome_read_later">OK</string>
   <string name="welcome_about">Über My Tracks</string> 
  
   <!-- Announcement --> 
@@ -387,20 +391,20 @@ limitations under the License.
   <string name="check_units_title">Einheitenbenachrichtigung</string> 
   <string name="check_units_message">Voreingestellt sind metrische Einheiten. Willst Du diese Einstellung ändern?</string> 
  
-  <!-- Fake preference keys - never saved, but show options in the preferences screen --> 
-  <string name="bluetooth_options">Bluetootheinstellungen</string> 
+  <!-- Fake preference keys - never saved, but show options in the preferences screen -->
+  <string name="bluetooth_options">Bluetooth-Einstellungen</string> 
   <string name="bluetooth_pairing">Geräteverbindung</string> 
-  <string name="bluetooth_pairing_summary">Öffnet Androids Bluetootheinstellungen, um Geräte zu verbinden.</string> 
-  <string name="sensor_options">Sensoreinstellungen</string> 
+  <string name="bluetooth_pairing_summary">Öffnet Androids Bluetooth-Einstellungen, um Geräte zu verbinden.</string> 
+  <string name="sensor_options">Sensor-Einstellungen</string> 
  
   <!-- Bluetooth Sensor --> 
   <string name="bluetooth_connected">Verbunden mit %s</string> 
-  <string name="bluetooth_connecting">Verbinde mit Bluetoothsensor ...</string> 
-  <string name="bluetooth_not_connected">Bluetoothsensor nicht verbunden.</string> 
+  <string name="bluetooth_connecting">Verbinde mit Bluetooth-Sensor ...</string> 
+  <string name="bluetooth_not_connected">Bluetooth-Sensor nicht verbunden.</string> 
  
   <!-- Sensor State --> 
-  <string name="sensor_data_time">Sensor Data Time</string> 
-  <string name="power_meter_enabled">Energiemessung aktiviert</string> 
+  <string name="sensor_data_time">Uhrzeit</string> 
+  <string name="power_meter_enabled">Kraftmesser aktiviert</string> 
   <string name="heart_rate_monitor_enabled">Herzfrequenzmessung aktiviert</string> 
   <string name="no_sensor_manager">Keine Sensoren verfügbar</string> 
   <string name="enabled">Aktiviert</string> 
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index d222f5f71..3fba9958b 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -47,7 +47,7 @@ limitations under the License.
   <string name="wait_for_fix">Esperando una ubicación mas exacta del GPS. Asegúrese que el cielo sea visible.</string>
   <string name="status_now_recording">Grabando un nuevo recorrido.</string>
   <string name="status_stopped_recording">Grabacíon interrumpida.</string>
-  <string name="status_new_mymap_has_been_created">Un mapa Google My Map nuevo has sido creado en maps.google.com.</string>
+  <string name="status_new_fusiontable_has_been_created">Un mapa Google Fusion Tables nuevo has sido creado en google.com/fusiontables.</string>
   <string name="status_tracks_have_been_uploaded">Su recorrido ha sido enviado a maps.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_new_doc">Su recorrido ha sido enviado a una nueva hoja de cálculo en docs.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_docs">Su recorrido ha sido enviado a docs.google.com.</string>
@@ -62,11 +62,11 @@ limitations under the License.
   <string name="progress_message">Enviando su recorrido a Google.</string>
   <string name="progress_message_reading_track">Leyendo recorrido...</string>
   <string name="progress_message_preparing_track">Preparando recorrido...</string>
-  <string name="progress_message_authenticating_mymaps">Autenticando con Google Maps...</string>
+  <string name="progress_message_authenticating_fusiontables">Autenticando con Google Fusion Tables...</string>
   <string name="progress_message_authenticating_docs">Autenticando con Google Docs...</string>
   <string name="progress_message_sending_docs">Enviando recorrido a Google Docs...</string>
-  <string name="progress_message_sending_mymaps">Enviando recorrido a Google Maps...</string>
-  <string name="progress_message_creating_map">Creando nuevo mapa My Map...</string>
+  <string name="progress_message_sending_fusiontables">Enviando recorrido a Google Fusion Tables...</string>
+  <string name="progress_message_creating_fusiontable">Creando nuevo mapa Fusion Tables...</string>
   <string name="import_progress_message">Importando un recorrido GPS. Esto puede tardar.</string>
   <string name="write_progress_message">Escribiendo archivo a tarjeta SD. Esto puede tardar.</string>
   <string name="progress_message_updating_track">Actualizando estadísticas del recorrido...</string>
@@ -321,8 +321,6 @@ limitations under the License.
   <!-- About -->
   <string name="about">Sobre</string>
   <string name="help">Ayuda</string>
-  <string name="about_email">Soporte técnico</string>
-
   <string name="about_team">Equipo:</string>
   <string name="about_support">Soporte técnico:</string>
 
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index bda838f98..3f58be7e7 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -49,7 +49,7 @@ limitations under the License.
   <string name="wait_for_fix">Attente du signal GPS. Assurez-vous que le ciel est bien visible.</string>
   <string name="status_now_recording">Parcours en cours d\'enregistrement.</string>
   <string name="status_stopped_recording">Enregistrement du parcours terminé.</string>
-  <string name="status_new_mymap_has_been_created">Une nouvelle carte Google \'Mes cartes\' vient d\'être créée sur maps.google.com.</string>
+  <!-- <string name="status_new_fusiontable_has_been_created">Une nouvelle carte Google \'Mes cartes\' vient d\'être créée sur maps.google.com.</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 +64,11 @@ limitations under the License.
   <string name="progress_message">Envoi du parcours à Google...</string>
   <string name="progress_message_reading_track">Lecture du parcours...</string>
   <string name="progress_message_preparing_track">Préparation du parcours</string>
-  <string name="progress_message_authenticating_mymaps">Authentification à Google Mes cartes...</string>
+  <!-- <string name="progress_message_authenticating_fusiontables">Authentification à Google Mes cartes...</string> -->
   <string name="progress_message_authenticating_docs">Authentification à Google Docs...</string>
   <string name="progress_message_sending_docs">Envoi du parcours vers Google Docs...</string>
-  <string name="progress_message_sending_mymaps">Envoi du parcours vers Google Mes cartes...</string>
-  <string name="progress_message_creating_map">Création d\'une nouvelle carte...</string>
+  <!-- <string name="progress_message_sending_fusiontables">Envoi du parcours vers Google Mes cartes...</string> -->
+  <!-- <string name="progress_message_creating_fusiontable">Création d\'une nouvelle carte...</string> -->
   <string name="import_progress_message">Importation du parcours GPS. Patientez SVP.</string>
   <string name="write_progress_message">Enregistrement du fichier sur la carte SD. Patientez SVP.</string>
   <string name="progress_message_updating_track">Mise à jour des statistiques du parcours...</string>
@@ -81,8 +81,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Créée par My Tracks sous Android.</string>
-  <string name="my_map_link">Créée par &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; sous Android.</string>
-  <string name="new_map_title">Nouvelle carte</string>
+  <string name="fusiontable_link">Créée par &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; sous Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="recorded_date">Enregistré</string>
@@ -110,8 +109,8 @@ limitations under the License.
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Afficher</string>
-  <string name="tracklist_send_to_mymaps">Envoyer à Google Mes cartes</string>
-  <string name="tracklist_send_to_new_mymap">Envoyer et créer un nouvelle carte Google Mes cartes</string>
+  <!-- <string name="tracklist_send_to_fusiontables">Envoyer à Google 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_docs">Envoyer à Google Docs</string>
   <string name="tracklist_send_to_google">Envoyer à Google...</string>
   <string name="tracklist_delete_track">Effacer du téléphone...</string>
@@ -119,14 +118,14 @@ limitations under the License.
   <string name="tracklist_write_to_sd">Enregistrer sur la carte SD...</string>
   <string name="tracklist_save_as_gpx">Enregistrer en fichier GPX </string>
   <string name="tracklist_save_as_kml">Enregistrer en fichier KML</string>
-  <string name="tracklist_btn_send_all_to_mymaps">Envoyer à Google Mes cartes</string>
+  <!-- <string name="tracklist_btn_send_all_to_fusiontables">Envoyer à Google Mes cartes</string> -->
   <string name="tracklist_btn_export_all">Exporter tous les parcours</string>
   <string name="tracklist_btn_delete_all">Tout supprimer</string>
   <string name="tracklist_pick_one">Choisissez un parcours. Faites un appui prolongé pour plus d\'options.</string>
   <string name="tracklist_all_tracks">Tous les parcours:</string>
   <string name="tracklist_this_track">Ce parcours</string>
   <string name="tracklist_share_track">Partager...</string>
-  <string name="tracklist_share_link">Lien sur Google Mes cartes</string>
+  <!-- <string name="tracklist_share_linkfusion">Lien sur Google 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>
@@ -293,8 +292,6 @@ limitations under the License.
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Envoyer à</string>
   <string name="sendtogoogle_send_now">Envoyer maintenant</string>
-  <string name="sendtogoogle_create_new_map">Créer une nouvelle carte</string>
-  <string name="sendtogoogle_pick_existing_map">Choisir une carte</string>
   <string name="sendtogoogle_send_stats">Envoyer les statistiques du parcours</string>
   <string name="sendtogoogle_send_stats_and_points">Envoyer les statistiques et les balises</string>
 
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index 51f608d27..6451b836a 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <string name="app_name">My Tracks</string>
-
   <!-- Used by the Menu -->
   <string name="start_recording">Registra percorso</string>
   <string name="stop_recording">Fine registrazione</string>
@@ -50,7 +48,7 @@ limitations under the License.
   <string name="wait_for_fix">Sto aspettando il fix del GPS. Accertati che il cielo sia visibile.</string>
   <string name="status_now_recording">Sto registrando un nuovo percorso.</string>
   <string name="status_stopped_recording">Registrazione del percorso terminata.</string>
-  <string name="status_new_mymap_has_been_created">Una nuova mappa è stata creata in «Le mie mappe» su maps.google.com.</string>
+  <!-- <string name="status_new_fusiontable_has_been_created">Una nuova mappa è stata creata in «Le mie mappe» su maps.google.com.</string> -->
   <string name="status_tracks_have_been_uploaded">Il tuo percorso è stato inviato a maps.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_new_doc">Il tuo percorso è stato inviato ad un nuovo foglio di calcolo su docs.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_docs">Il tuo percorso è stato inviato a docs.google.com.</string>
@@ -65,11 +63,11 @@ limitations under the License.
   <string name="progress_message">Invio del percorso a Google in corso.</string>
   <string name="progress_message_reading_track">Lettura in corso...</string>
   <string name="progress_message_preparing_track">Elaborazione del percorso in corso...</string>
-  <string name="progress_message_authenticating_mymaps">Autenticazione a Google Maps in corso...</string>
+  <!-- <string name="progress_message_authenticating_fusiontables">Autenticazione a Google Maps in corso...</string> -->
   <string name="progress_message_authenticating_docs">Autenticazione a Google Docs in corso...</string>
   <string name="progress_message_sending_docs">Invio del percorso a Google Docs in corso...</string>
-  <string name="progress_message_sending_mymaps">Invio del percorso a Google Maps in corso...</string>
-  <string name="progress_message_creating_map">Creazione di una nuova mappa in «Le mie mappe» in corso...</string>
+  <!-- <string name="progress_message_sending_fusiontables">Invio del percorso a Google Maps in corso...</string> -->
+  <!-- <string name="progress_message_creating_fusiontable">Creazione di una nuova mappa in «Le mie mappe» in corso...</string> -->
   <string name="import_progress_message">Importazione del percorso GPS in corso. Attendere prego...</string>
   <string name="write_progress_message">Salvataggio del file sulla scheda SD in corso. Attendere prego...</string>
   <string name="progress_message_updating_track">Aggiornamento delle statistiche del percorso in corso...</string>
@@ -82,8 +80,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Creato da My Tracks su Android.</string>
-  <string name="my_map_link">Creato da &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; su Android.</string>
-  <string name="new_map_title">Nuova mappa</string>
+  <string name="fusiontable_link">Creato da &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; su Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Punti</string>
@@ -114,8 +111,8 @@ limitations under the License.
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Mostra</string>
-  <string name="tracklist_send_to_mymaps">Invia a «Le mie mappe» di Google</string>
-  <string name="tracklist_send_to_new_mymap">Invia a nuova mappa in «Le mie mappe» di Google</string>
+  <!-- <string name="tracklist_send_to_fusiontables">Invia a «Le mie mappe» di Google</string> -->
+  <!-- <string name="tracklist_send_to_new_fusiontable">Invia a nuova mappa in «Le mie mappe» di Google</string>  -->
   <string name="tracklist_send_to_docs">Invia a Google Docs</string>
   <string name="tracklist_send_to_google">Invia a Google...</string>
   <string name="tracklist_delete_track">Elimina dal telefono...</string>
@@ -123,7 +120,7 @@ limitations under the License.
   <string name="tracklist_write_to_sd">Salva su scheda SD...</string>
   <string name="tracklist_save_as_gpx">Salva in un file GPX</string>
   <string name="tracklist_save_as_kml">Salva in un file KML</string>
-  <string name="tracklist_btn_send_all_to_mymaps">Invia a «Le mie mappe» di Google</string>
+  <!-- <string name="tracklist_btn_send_all_to_fusiontables">Invia a «Le mie mappe» di Google</string> -->
   <string name="tracklist_btn_delete_all">Elimina tutti i percorsi</string>
   <!-- Export All -->
   <string name="tracklist_btn_export_all">Esporta tutti i percorsi</string>
@@ -132,7 +129,7 @@ limitations under the License.
   <string name="tracklist_all_tracks">Tutti i percorsi:</string>
   <string name="tracklist_this_track">Questo percorso</string>
   <string name="tracklist_share_track">Condividi con amici...</string>
-  <string name="tracklist_share_link">Un link alla mappa in «Le mie mappe» di Google</string>
+  <!-- <string name="tracklist_share_linkfusion">Un link alla mappa in «Le mie mappe» di Google</string> -->
   <string name="tracklist_share_gpx_file">Un file GPX</string>
   <string name="tracklist_share_kml_file">Un file KML</string>
   <string name="tracklist_clear_map">Cancella la mappa</string>
@@ -306,19 +303,15 @@ limitations under the License.
   <!-- About -->
   <string name="about">Informazioni</string>
   <string name="help">Aiuto</string>
-  <string name="about_email">Supporto</string>
-
   <string name="about_team">Team:</string>
   <string name="about_version">Versione:</string>
   <string name="about_support">Supporto:</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Invia a...</string>
-  <string name="sendtogoogle_google_mymaps">«Le mie mappe» di Google</string>
+  <!-- <string name="sendtogoogle_google_fusiontables">«Le mie mappe» di Google</string> -->
   <string name="sendtogoogle_google_docs">Google Docs</string>
   <string name="sendtogoogle_send_now">Invia adesso</string>
-  <string name="sendtogoogle_create_new_map">Crea una nuova mappa</string>
-  <string name="sendtogoogle_pick_existing_map">Scegli una mappa esistente</string>
   <string name="sendtogoogle_send_stats">Invia statistiche del percorso</string>
   <string name="sendtogoogle_send_stats_and_points">Invia statistiche e segnaposti</string>
 
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 33aa9f245..4e2b3f144 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -48,7 +48,7 @@ limitations under the License.
   <string name="wait_for_fix">GPS位置精度がよくなるまで待機しています．空が見えるところにいて下さい．</string>
   <string name="status_now_recording">新しいトラックを記録中です．</string>
   <string name="status_stopped_recording">トラック記録を停止しました．</string>
-  <string name="status_new_mymap_has_been_created">新しいGoogleマイマップを maps.google.com に作成しました．</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>
@@ -63,11 +63,11 @@ limitations under the License.
   <string name="progress_message">トラックをGoogleに送信しました．</string>
   <string name="progress_message_reading_track">トラックを読んでいます...</string>
   <string name="progress_message_preparing_track">トラックを準備しています...</string>
-  <string name="progress_message_authenticating_mymaps">Googleマップの認証しています...</string>
+  <!-- <string name="progress_message_authenticating_fusiontables">Googleマップの認証しています...</string> -->
   <string name="progress_message_authenticating_docs">Google Docsへの認証を行っています...</string>
   <string name="progress_message_sending_docs">トラックをGoogle Docsに送信しています...</string>
-  <string name="progress_message_sending_mymaps">トラックをGoogleマップに送信しています...</string>
-  <string name="progress_message_creating_map">新しいマイマップを生成しています...</string>
+  <!-- <string name="progress_message_sending_fusiontables">トラックをGoogleマップに送信しています...</string> -->
+  <!-- <string name="progress_message_creating_fusiontable">新しいマイマップを生成しています...</string> -->
   <string name="import_progress_message">GPSトラックをインポートしています．若干時間がかかります．</string>
   <string name="write_progress_message">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
   <string name="progress_message_updating_track">トラック統計情報を更新しています...</string>
@@ -80,8 +80,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Android用My Tracksで作成</string>
-  <string name="my_map_link">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
-  <string name="new_map_title">新規マップ</string>
+  <string name="fusiontable_link">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">ポイント</string>
@@ -112,8 +111,8 @@ limitations under the License.
 
   <!--  TrackList -->
   <string name="tracklist_show_track">表示</string>
-  <string name="tracklist_send_to_mymaps">Google My Mapsへ送信</string>
-  <string name="tracklist_send_to_new_mymap">新規Googleマイマップへ送信</string>
+  <!-- <string name="tracklist_send_to_new_fusiontable">Google Fusion Tablesへ送信</string> -->
+  <!-- <string name="tracklist_send_to_new_fusiontable">新規Googleマイマップへ送信</string> -->
   <string name="tracklist_send_to_docs">Google Docsへ送信</string>
   <string name="tracklist_send_to_google">Googleへ送信...</string>
   <string name="tracklist_delete_track">端末から削除...</string>
@@ -122,7 +121,7 @@ limitations under the License.
   <string name="tracklist_save_as_gpx">GPXファイルの保存</string>
   <string name="tracklist_save_as_kml">KMLファイルの保存</string>
   <string name="tracklist_save_as_csv">CVSファイルの保存</string>
-  <string name="tracklist_btn_send_all_to_mymaps">Googleマイマップへの送信</string>
+  <string name="tracklist_btn_send_all_to_fusiontables">Googleマイマップへの送信</string>
   <string name="tracklist_btn_delete_all">全てのトラックの削除</string>
   <!-- Export All -->
   <string name="tracklist_btn_export_all">全てのトラックのエクスポート</string>
@@ -131,7 +130,7 @@ limitations under the License.
   <string name="tracklist_all_tracks">全てのトラック:</string>
   <string name="tracklist_this_track">このトラック</string>
   <string name="tracklist_share_track">共有...</string>
-  <string name="tracklist_share_link">Googleマイマップへのリンク</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>
@@ -309,16 +308,13 @@ limitations under the License.
   <string name="help">ヘルプ</string>
   <string name="about_team">チーム:</string>
   <string name="about_version">バージョン:</string>
-  <string name="about_email">サポート</string>
   <string name="about_support">サポート:</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">送信...</string>
-  <string name="sendtogoogle_google_mymaps">Googleマイマップ</string>
+  <!-- <string name="sendtogoogle_google_fusiontables">Googleマイマップ</string> -->
   <string name="sendtogoogle_google_docs">Google Docs</string>
   <string name="sendtogoogle_send_now">今すぐ送信</string>
-  <string name="sendtogoogle_create_new_map">新規マップ作成</string>
-  <string name="sendtogoogle_pick_existing_map">既存マップ選択</string>
   <string name="sendtogoogle_send_stats">トラック統計情報送信</string>
   <string name="sendtogoogle_send_stats_and_points">統計情報とポイント送信</string>
 
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index 620bccd16..264a87990 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -49,7 +49,7 @@ limitations under the License.
   <string name="wait_for_fix">Oczekiwanie na lepsze ustalenie pozycji GPS. Upewnij się, że niebo jest widoczne.</string>
   <string name="status_now_recording">Rejestrowanie nowej trasy.</string>
   <string name="status_stopped_recording">Zatrzymano rejestrowanie nowej trasy.</string>
-  <string name="status_new_mymap_has_been_created">Utworzona nową Mapę Google na maps.google.com.</string>
+  <!-- <string name="status_new_fusiontable_has_been_created">Utworzona nową Mapę Google na maps.google.com.</string> -->
   <string name="status_tracks_have_been_uploaded">Twoja trasa został wysłana do maps.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_new_doc">Twoja trasa została wysłana do nowego arkusza na docs.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_docs">Twoja trasa została wysłana do docs.google.com.</string>
@@ -64,11 +64,11 @@ limitations under the License.
   <string name="progress_message">Przesyłanie trasy do Google.</string>
   <string name="progress_message_reading_track">Czytanie trasy...</string>
   <string name="progress_message_preparing_track">Przygotowywanie trasy...</string>
-  <string name="progress_message_authenticating_mymaps">Uwierzytelnianie w Mapach Google...</string>
+  <!-- <string name="progress_message_authenticating_fusiontables">Uwierzytelnianie w Mapach Google...</string> -->
   <string name="progress_message_authenticating_docs">Uwierzytelnianie w Dokumentach Google...</string>
   <string name="progress_message_sending_docs">Przesyłanie trasy do Dokumentów Google...</string>
-  <string name="progress_message_sending_mymaps">Przesyłanie trasy do Map Google...</string>
-  <string name="progress_message_creating_map">Tworzenie nowej Mojej Mapy...</string>
+  <!-- <string name="progress_message_sending_fusiontables">Przesyłanie trasy do Map Google...</string> -->
+  <!-- <string name="progress_message_creating_fusiontable">Tworzenie nowej Mojej Mapy...</string> -->
   <string name="import_progress_message">Importowanie trasy GPS. Poczekaj chwilę.</string>
   <string name="write_progress_message">Zapisywanie pliku na kartę SD. Poczekaj chwilę.</string>
   <string name="progress_message_updating_track">Aktualizacja statystyk trasy...</string>
@@ -81,8 +81,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Utworzono za pomocą My Tracks na Android.</string>
-  <string name="my_map_link">Utworzona przez &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; na Android.</string>
-  <string name="new_map_title">Nowa mapa</string>
+  <string name="fusiontable_link">Utworzona przez &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; na Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Punkty</string>
@@ -113,8 +112,8 @@ limitations under the License.
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Pokaż</string>
-  <string name="tracklist_send_to_mymaps">Wyślij do Moich Map Google</string>
-  <string name="tracklist_send_to_new_mymap">Wyślij do Moich Map Google jako nową mapę</string>
+  <!-- <string name="tracklist_send_to_fusiontables">Wyślij do Moich Map Google</string> -->
+  <!-- <string name="tracklist_send_to_new_fusiontable">Wyślij do Moich Map Google jako nową mapę</string> -->
   <string name="tracklist_send_to_docs">Wyślij do Dokumentów Google</string>
   <string name="tracklist_send_to_google">Wyślij do Google...</string>
   <string name="tracklist_delete_track">Usuń z telefonu...</string>
@@ -123,7 +122,7 @@ limitations under the License.
   <string name="tracklist_save_as_gpx">Zapisz plik GPX</string>
   <string name="tracklist_save_as_kml">Zapisz plik KML</string>
   <string name="tracklist_save_as_csv">Zapisz plik CSV</string>
-  <string name="tracklist_btn_send_all_to_mymaps">Wyślij do Moich Map Google</string>
+  <!-- <string name="tracklist_btn_send_all_to_fusiontables">Wyślij do Moich Map Google</string> -->
   <string name="tracklist_btn_delete_all">Usuń wszystkie trasy</string>
   <!-- Export All -->
   <string name="tracklist_btn_export_all">Eksportuj wszystkie trasy</string>
@@ -132,7 +131,7 @@ limitations under the License.
   <string name="tracklist_all_tracks">Wszystkie trasy:</string>
   <string name="tracklist_this_track">Ta trasa</string>
   <string name="tracklist_share_track">Podziel się z przyjaciółmi...</string>
-  <string name="tracklist_share_link">Link do Moich Map Google</string>
+  <!-- <string name="tracklist_share_linkfusion">Link do Moich Map Google</string> -->
   <string name="tracklist_share_gpx_file">Plik GPX</string>
   <string name="tracklist_share_kml_file">PLik KML</string>
   <string name="tracklist_share_csv_file">Plik CSV</string>
@@ -209,14 +208,9 @@ limitations under the License.
   <string name="eclair_required">Dostępne tylko w wersji Android 2.0 lub nowszej</string>
   <string name="settings_sensor_type">Typ Czujnika</string>
   <string name="settings_sensor_type_summary">Typ czujnika do podłączenia.</string>
-  <string name="settings_sensor_id">Id Czujnika</string>
-  <string name="settings_sensor_id_summary">Identyfikator wysyłany do czujników.</string>
-  <string name="sensor_id_malformed">Identyfikator musi być liczbą całkowitą.</string>
   <string name="bluetooth_sensor_title">Czujnik bluetooth</string>
   <string name="bluetooth_sensor_summary">Czujnik bluetooth do podłączenia.</string>
   <string name="settings_modular_stats_display_title">Widok Statystyk Modularnych</string>
-  <string name="settings_modular_stats_display_summary_on">Ekran statystyk jest podzielony w zależności od trybu.</string>
-  <string name="settings_modular_stats_display_summary_off">Wyświetl wszystkie statystyki na jednym ekranie.</string>
 
   <string name="settings_backup">Kopia zapasowa (BETA)</string>
   <string name="settings_sd_backup">Kopia zapasowa na kartę SD</string>
@@ -341,18 +335,14 @@ limitations under the License.
   <string name="help">Pomoc</string>
   <string name="about_team">Zespół:</string>
   <string name="about_version">Wersja:</string>
-  <string name="about_email">Wsparcie</string>
   <string name="about_support">Wsparcie:</string>
-  
   <string name="about_bart">Bartłomiej Niechwiej</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Wyślij do...</string>
-  <string name="sendtogoogle_google_mymaps">Moje Mapy Google</string>
+  <!-- <string name="sendtogoogle_google_fusiontables">Moje Mapy Google</string> -->
   <string name="sendtogoogle_google_docs">Dokumenty Google</string>
   <string name="sendtogoogle_send_now">Wyślij teraz</string>
-  <string name="sendtogoogle_create_new_map">Utwórz nową mapę</string>
-  <string name="sendtogoogle_pick_existing_map">Wybierz istniejąca mapę</string>
   <string name="sendtogoogle_send_stats">Wyślij statystyki trasy</string>
   <string name="sendtogoogle_send_stats_and_points">Wyślij statystyki i punkty</string>
 
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index dcdf6cc04..5dfb033b3 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -48,7 +48,7 @@ limitations under the License.
   <string name="wait_for_fix">Esperando por um sinal melhor do GPS.  Assegure-se de que o céu está visível.</string>
   <string name="status_now_recording">Gravando um novo caminho.</string>
   <string name="status_stopped_recording">Gravação interrompida.</string>
-  <string name="status_new_mymap_has_been_created">Um novo Meu Mapa Google foi criado em maps.google.com.</string>
+  <string name="status_new_fusiontable_has_been_created">Uma nova Fusion Table Google foi criada em google.com/fusiontables.</string>
   <string name="status_tracks_have_been_uploaded">Seu caminho foi enviado para maps.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_new_doc">Seu caminho foi enviado para uma nova planilha em docs.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_docs">Seu caminho foi enviado para docs.google.com.</string>
@@ -63,11 +63,11 @@ limitations under the License.
   <string name="progress_message">Enviando seu caminho ao Google.</string>
   <string name="progress_message_reading_track">Lendo caminho...</string>
   <string name="progress_message_preparing_track">Preparando caminho...</string>
-  <string name="progress_message_authenticating_mymaps">Autenticando com o Google Maps...</string>
+  <string name="progress_message_authenticating_fusiontables">Autenticando com o Google Fusion Tables...</string>
   <string name="progress_message_authenticating_docs">Authenticando com o Google Docs...</string>
   <string name="progress_message_sending_docs">Enviando caminho para o Google Docs...</string>
-  <string name="progress_message_sending_mymaps">Enviando caminho para o Google Maps...</string>
-  <string name="progress_message_creating_map">Criando novo Meu Mapa...</string>
+  <string name="progress_message_sending_fusiontables">Enviando caminho para o Google Fusion Tables...</string>
+  <string name="progress_message_creating_fusiontable">Criando nova Fusion Table...</string>
   <string name="import_progress_message">Importando um caminho de GPS. Isso pode demorar alguns instantes.</string>
   <string name="write_progress_message">Salvando arquivo para o cartão SD. Isso pode demorar alguns instantes.</string>
   <string name="progress_message_updating_track">Atualizando estatísticas do caminho...</string>
@@ -80,8 +80,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">"Criado por My Tracks no Android."</string>
-  <string name="my_map_link">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android."</string>
-  <string name="new_map_title">Novo mapa</string>
+  <string name="fusiontable_link">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android."</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Pontos</string>
@@ -111,8 +110,8 @@ limitations under the License.
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Mostrar</string>
-  <string name="tracklist_send_to_mymaps">Enviar para o Google Meus Mapas</string>
-  <string name="tracklist_send_to_new_mymap">Enviar para o novo Google Meu Mapa</string>
+  <string name="tracklist_send_to_fusiontables">Enviar para o Google Fusion Tables</string>
+  <string name="tracklist_send_to_new_fusiontable">Enviar para nova Google Fusion Table</string>
   <string name="tracklist_send_to_docs">Enviar para o Google Docs</string>
   <string name="tracklist_send_to_google">Enviar para o Google...</string>
   <string name="tracklist_delete_track">Apagar do telefone...</string>
@@ -120,13 +119,13 @@ limitations under the License.
   <string name="tracklist_write_to_sd">Salvar no cartão SD...</string>
   <string name="tracklist_save_as_gpx">Salvar arquivo GPX</string>
   <string name="tracklist_save_as_kml">Salvar arquivo KML</string>
-  <string name="tracklist_btn_send_all_to_mymaps">Enviar para o Google Meus Mapas</string>
+  <string name="tracklist_btn_send_all_to_fusiontables">Enviar para o Google Fusion Tables</string>
   <string name="tracklist_btn_delete_all">Apagar todos os caminhos</string>
   <string name="tracklist_pick_one">Escolha um caminho. Pressione&amp;segure para mais opções.</string>
   <string name="tracklist_all_tracks">Todos os Caminhos:"</string>
   <string name="tracklist_this_track">Este Caminho"</string>
   <string name="tracklist_share_track">Compartilhar com amigos..."</string>
-  <string name="tracklist_share_link">Um link para o Google Meu Mapa"</string>
+  <string name="tracklist_share_linkfusion">Um link para a Google Fusion Table"</string>
   <string name="tracklist_share_gpx_file">Um arquivo GPX"</string>
   <string name="tracklist_share_kml_file">Um arquivo KML"</string>
   <string name="tracklist_clear_map">"Limpar mapa"</string>
@@ -280,19 +279,14 @@ limitations under the License.
   <!-- About -->
   <string name="about">Sobre</string>
   <string name="help">Ajuda</string>
-  <string name="about_email">Suporte</string>
-
   <string name="about_team">Equipe:</string>
   <string name="about_version">Versão:</string>
   <string name="about_support">Suporte:</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Enviar para...</string>
-  <string name="sendtogoogle_google_mymaps">Google Meus Mapas</string>
   <string name="sendtogoogle_google_docs">Google Docs</string>
   <string name="sendtogoogle_send_now">Enviar agora</string>
-  <string name="sendtogoogle_create_new_map">Criar novo mapa</string>
-  <string name="sendtogoogle_pick_existing_map">Escolher um mapa existente</string>
   <string name="sendtogoogle_send_stats">Enviar estatísticas do caminho</string>
   <string name="sendtogoogle_send_stats_and_points">Enviar estatísticas e pontos</string>
 
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index 35d0a37bc..a74ef8b99 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -49,7 +49,7 @@ limitations under the License.
   <string name="wait_for_fix">Väntar på bättre GPS-position. Se till att himlen är synlig.</string>
   <string name="status_now_recording">Spelar nu in ett nytt spår.</string>
   <string name="status_stopped_recording">Stoppade inspelning av ditt spår.</string>
-  <string name="status_new_mymap_has_been_created">En ny Google Mina Kartor har skapats på maps.google.com.</string>
+  <!-- <string name="status_new_fusiontable_has_been_created">En ny Google Mina Kartor har skapats på maps.google.com.</string> -->
   <string name="status_tracks_have_been_uploaded">Ditt spår har skickats till maps.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_new_doc">Ditt spår har skickats till ett nytt kalkylblad på docs.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_docs">Ditt spår har skickats till docs.google.com.</string>
@@ -64,11 +64,11 @@ limitations under the License.
   <string name="progress_message">Skickar ditt spår till Google.</string>
   <string name="progress_message_reading_track">Läser spår...</string>
   <string name="progress_message_preparing_track">Förbereder spår...</string>
-  <string name="progress_message_authenticating_mymaps">Autentiserar till Google Kartor...</string>
+  <!-- <string name="progress_message_authenticating_fusiontables">Autentiserar till Google Kartor...</string> -->
   <string name="progress_message_authenticating_docs">Autentiserar till Google Dokument...</string>
   <string name="progress_message_sending_docs">Skickar spår till Google Dokument...</string>
-  <string name="progress_message_sending_mymaps">Skickar spår till Google Kartor...</string>
-  <string name="progress_message_creating_map">Skapar en ny Min Karta...</string>
+  <!-- <string name="progress_message_sending_fusiontables">Skickar spår till Google Kartor...</string> -->
+  <!-- <string name="progress_message_creating_fusiontable">Skapar en ny Min Karta...</string> -->
   <string name="import_progress_message">Importerar ett GPS-spår. Detta kan ta en stund.</string>
   <string name="write_progress_message">Skriver till SD-kortet. Detta kan ta en stund.</string>
   <string name="progress_message_updating_track">Uppdaterar spårstatistik...</string>
@@ -81,8 +81,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Skapad av My Tracks på Android.</string>
-  <string name="my_map_link">Skapad av &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; på Android.</string>
-  <string name="new_map_title">Ny karta</string>
+  <string name="fusiontable_link">Skapad av &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; på Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Punkter</string>
@@ -113,8 +112,8 @@ limitations under the License.
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Visa</string>
-  <string name="tracklist_send_to_mymaps">Skicka till Google Mina Kartor</string>
-  <string name="tracklist_send_to_new_mymap">Skicka till ny Google Mina Kartor</string>
+  <!-- <string name="tracklist_send_to_fusiontables">Skicka till Google Mina Kartor</string> -->
+  <!-- <string name="tracklist_send_to_new_fusiontable">Skicka till ny Google Mina Kartor</string> -->
   <string name="tracklist_send_to_docs">Skicka till Google Dokument</string>
   <string name="tracklist_send_to_google">Skicka till Google...</string>
   <string name="tracklist_delete_track">Ta bort från telefonen...</string>
@@ -123,7 +122,7 @@ limitations under the License.
   <string name="tracklist_save_as_gpx">Spara en GPX-fil</string>
   <string name="tracklist_save_as_kml">Spara en KML-fil</string>
   <string name="tracklist_save_as_csv">Spara en CSV-fil</string>
-  <string name="tracklist_btn_send_all_to_mymaps">Skicka till Google Mina Kartor</string>
+  <!-- <string name="tracklist_btn_send_all_to_fusiontables">Skicka till Google Mina Kartor</string> -->
   <string name="tracklist_btn_delete_all">Ta bort alla spår</string>
   <!-- Export All -->
   <string name="tracklist_btn_export_all">Exportera alla spår</string>
@@ -132,7 +131,7 @@ limitations under the License.
   <string name="tracklist_all_tracks">Alla spår:</string>
   <string name="tracklist_this_track">Det här spåret</string>
   <string name="tracklist_share_track">Dela med vänner...</string>
-  <string name="tracklist_share_link">En länk till Google Mina Kartor</string>
+  <!-- <string name="tracklist_share_linkfusion">En länk till Google Mina Kartor</string> -->
   <string name="tracklist_share_gpx_file">En GPX-fil</string>
   <string name="tracklist_share_kml_file">En KML-fil</string>
   <string name="tracklist_share_csv_file">En CSV-fil</string>
@@ -310,16 +309,13 @@ limitations under the License.
   <string name="help">Hjälp</string>
   <string name="about_team">Team:</string>
   <string name="about_version">Version:</string>
-  <string name="about_email">Support</string>
   <string name="about_support">Support:</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Skicka till...</string>
-  <string name="sendtogoogle_google_mymaps">Google Mina Kartor</string>
+  <!--<string name="sendtogoogle_google_fusiontables">Google Mina Kartor</string>-->
   <string name="sendtogoogle_google_docs">Google Dokument</string>
   <string name="sendtogoogle_send_now">Skicka nu</string>
-  <string name="sendtogoogle_create_new_map">Skapa en ny karta</string>
-  <string name="sendtogoogle_pick_existing_map">Välj en befintlig karta</string>
   <string name="sendtogoogle_send_stats">Skicka spårstatistik</string>
   <string name="sendtogoogle_send_stats_and_points">Skicka statistik och punkter</string>
 
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 7fa0d81e0..d9b27a43c 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -49,7 +49,7 @@ limitations under the License.
   <string name="wait_for_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
   <string name="status_now_recording">现在开始记录新的轨迹.</string>
   <string name="status_stopped_recording">停止记录你的轨迹.</string>
-  <string name="status_new_fusiontable_has_been_created">已在 maps.google.com 创建新 Google Fusion Table.</string>
+  <string name="status_new_fusiontable_has_been_created">已在 google.com/fusiontables 创建新 Google Fusion Table.</string>
   <string name="status_tracks_have_been_uploaded">你的轨迹已经发送到 maps.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_new_doc">你的轨迹已经作为新的电子表格发送到 docs.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_docs">你的轨迹已经发送到 docs.google.com.</string>
@@ -81,8 +81,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">由 Android 上的 My Tracks 生成.</string>
-  <string name="my_map_link">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 生成.</string>
-  <string name="new_map_title">新地图</string>
+  <string name="fusiontable_link">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 生成.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">点数</string>
@@ -133,7 +132,7 @@ limitations under the License.
   <string name="tracklist_all_tracks">全部轨迹:</string>
   <string name="tracklist_this_track">此轨迹</string>
   <string name="tracklist_share_track">与朋友分享...</string>
-  <string name="tracklist_share_link">链接到 Google My Map</string>
+  <string name="tracklist_share_linkfusion">链接到 Google Fusion Table</string>
   <string name="tracklist_share_gpx_file">GPX 文件</string>
   <string name="tracklist_share_kml_file">KML 文件</string>
   <string name="tracklist_share_csv_file">CSV 文件</string>
@@ -212,9 +211,6 @@ limitations under the License.
   <string name="eclair_required">只在 Android 2.0 及以上版本支持</string>
   <string name="settings_sensor_type">感应器类型</string>
   <string name="settings_sensor_type_summary">要连接到的感应器类型</string>
-  <string name="settings_sensor_id">感应器ID</string>
-  <string name="settings_sensor_id_summary">发送到感应器的ID.</string>
-  <string name="sensor_id_malformed">ID必须是一个整数值.</string>
   <string name="bluetooth_sensor_title">蓝牙感应器</string>
   <string name="bluetooth_sensor_summary">要连接到的蓝牙感应器</string>
 
@@ -336,14 +332,11 @@ limitations under the License.
   <string name="help">帮助</string>
   <string name="about_team">开发团队:</string>
   <string name="about_version">版本:</string>
-  <string name="about_email">技术支持</string>
   <string name="about_support">技术支持:</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">发送到...</string>
   <string name="sendtogoogle_send_now">立即发送</string>
-  <string name="sendtogoogle_create_new_map">创建新地图</string>
-  <string name="sendtogoogle_pick_existing_map">选择已有地图</string>
   <string name="sendtogoogle_send_stats">发送轨迹统计信息</string>
   <string name="sendtogoogle_send_stats_and_points">发送统计信息和路点</string>