From 0118a7691f866e4e7e09306d13363a8f0b841699 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Wed, 9 Nov 2011 15:09:57 -0800
Subject: [PATCH] Rename and reorganize variables in strings.xml - My Maps List
 - Send to Google

---
 MyTracks/AndroidManifest.xml                  |   2 +-
 MyTracks/res/layout/list.xml                  |   8 +-
 .../res/layout/mytracks_send_to_google.xml    |  14 +-
 MyTracks/res/layout/send_to_google_result.xml |   6 +-
 MyTracks/res/values-ca/strings.xml            |  53 +-
 MyTracks/res/values-de/strings.xml            |  57 ++-
 MyTracks/res/values-es-rES/strings.xml        |   6 +-
 MyTracks/res/values-es/strings.xml            |  83 ++--
 MyTracks/res/values-fi/strings.xml            |  83 ++--
 MyTracks/res/values-fr/strings.xml            |  49 +-
 MyTracks/res/values-it/strings.xml            |  55 ++-
 MyTracks/res/values-ja/strings.xml            |  77 ++-
 MyTracks/res/values-pl/strings.xml            |  55 ++-
 MyTracks/res/values-pt-rBR/strings.xml        |  53 +-
 MyTracks/res/values-ru/strings.xml            |  83 ++--
 MyTracks/res/values-sv/strings.xml            |  55 ++-
 MyTracks/res/values-zh-rCN/strings.xml        |  79 ++-
 MyTracks/res/values/strings.xml               | 454 +++++++++---------
 .../android/apps/mytracks/AccountChooser.java |   6 +-
 .../apps/mytracks/MyMapsListAdapter.java      |   4 +-
 .../android/apps/mytracks/io/SendToDocs.java  |   8 +-
 .../apps/mytracks/io/SendToFusionTables.java  |  12 +-
 .../apps/mytracks/io/SendToMyMaps.java        |  23 +-
 .../io/backup/BackupActivityHelper.java       |   4 +-
 .../io/file/WriteProgressController.java      |   2 +-
 .../apps/mytracks/io/mymaps/MapsFacade.java   |   2 +-
 .../io/sendtogoogle/SendActivity.java         |  16 +-
 .../mytracks/io/sendtogoogle/SendType.java    |   6 +-
 .../apps/mytracks/util/StringUtils.java       |   6 +-
 29 files changed, 660 insertions(+), 701 deletions(-)

diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index b64ea518c..ddac36008 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -56,7 +56,7 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.MyMapsList"
-              android:label="@string/map_list_title"
+              android:label="@string/my_maps_list_title"
               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
               android:exported="false" />
 
diff --git a/MyTracks/res/layout/list.xml b/MyTracks/res/layout/list.xml
index 33567b8d2..b137b426d 100644
--- a/MyTracks/res/layout/list.xml
+++ b/MyTracks/res/layout/list.xml
@@ -31,7 +31,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/select_map_message"
+      android:text="@string/my_maps_list_pick_map"
       android:layout_weight="0"/>
   </LinearLayout>
   <ListView android:id="@+id/maplist"
@@ -47,7 +47,7 @@ limitations under the License.
       android:textSize="16dip"
       android:textColor="#c00"
       android:textStyle="bold"
-      android:text="@string/mapslist_no_maps_available"
+      android:text="@string/my_maps_list_no_maps"
       android:visibility="gone"/>
     <TextView android:id="@+id/failed"
     android:layout_width="fill_parent"
@@ -58,7 +58,7 @@ limitations under the License.
     android:textSize="16dip"
     android:textColor="#c00"
     android:textStyle="bold"
-    android:text="@string/maps_list_failed"
+    android:text="@string/my_maps_list_error"
     android:visibility="gone"/>
     <LinearLayout
     android:orientation="horizontal"
@@ -89,7 +89,7 @@ limitations under the License.
           android:textSize="16dip"
           android:textColor="#fff"
           android:textStyle="bold"
-          android:text="@string/maps_list_loading"/>
+          android:text="@string/my_maps_list_loading"/>
         <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
diff --git a/MyTracks/res/layout/mytracks_send_to_google.xml b/MyTracks/res/layout/mytracks_send_to_google.xml
index cc7a0408f..9d984b120 100644
--- a/MyTracks/res/layout/mytracks_send_to_google.xml
+++ b/MyTracks/res/layout/mytracks_send_to_google.xml
@@ -26,7 +26,7 @@ limitations under the License.
     <TextView
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/sendtogoogle_title"
+      android:text="@string/send_google_title"
       android:textSize="20dip"
       android:textColor="#fff"
       android:layout_marginLeft="10dip"/>
@@ -55,7 +55,7 @@ limitations under the License.
           <CheckBox android:id="@+id/sendtogoogle_google_mymaps"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sendtogoogle_google_mymaps"
+            android:text="@string/send_google_my_maps"
             android:textSize="20dip"
             android:checked="true"/>
           <RadioGroup android:id="@+id/sendtogoogle_group_mymaps"
@@ -64,11 +64,11 @@ limitations under the License.
             <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"/>
+              android:text="@string/send_google_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"/>
+              android:text="@string/send_google_existing_map"/>
           </RadioGroup>
         </LinearLayout>
       </TableRow>
@@ -86,7 +86,7 @@ limitations under the License.
           <CheckBox android:id="@+id/sendtogoogle_google_fusiontables"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sendtogoogle_google_fusiontables"
+            android:text="@string/send_google_fusion_tables"
             android:textSize="20dip"
             android:checked="true"/>
         </LinearLayout>
@@ -105,7 +105,7 @@ limitations under the License.
           <CheckBox android:id="@+id/sendtogoogle_google_docs"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sendtogoogle_google_docs"
+            android:text="@string/send_google_docs"
             android:textSize="20dip"
             android:checked="true"/>
         </LinearLayout>
@@ -116,7 +116,7 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/sendtogoogle_send_now"
       android:layout_gravity="left"
-      android:text="@string/sendtogoogle_send_now"
+      android:text="@string/send_google_send_now"
       style="@style/Button"/>
     <Button android:id="@+id/sendtogoogle_cancel"
       android:layout_gravity="right"
diff --git a/MyTracks/res/layout/send_to_google_result.xml b/MyTracks/res/layout/send_to_google_result.xml
index e457935cf..344cf1725 100644
--- a/MyTracks/res/layout/send_to_google_result.xml
+++ b/MyTracks/res/layout/send_to_google_result.xml
@@ -31,7 +31,7 @@ services.
   <TextView
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/sending_to_google_upload_status"
+      android:text="@string/send_google_result_title"
       style="?android:attr/textAppearanceLarge"/>
   <TableLayout
       android:layout_width="wrap_content"
@@ -52,14 +52,14 @@ services.
       android:id="@+id/send_to_google_result_comment"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/sending_to_google_additional_info"
+      android:text="@string/send_google_success_footer"
       android:visibility="gone"
       style="?android:attr/textAppearanceSmall"/>
   <TextView
       android:id="@+id/send_to_google_result_error"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/error_sending_to_google"
+      android:text="@string/send_google_error"
       android:visibility="gone"
       style="?android:attr/textAppearanceLarge"/>
 </LinearLayout>
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index 9f1751b6e..32b21f355 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -35,13 +35,13 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">No s\'ha trobat cap gestor d\'ubicacions en aquest dispositiu.</string>
   <string name="gps_not_found">No s\'ha trobat cap proveïdor d\'ubicació GPS en aquest dispositiu.</string>
-  <string name="error_sending_to_fusion_tables">S\'ha produït un error quan s\'enviava la ruta a Google Fusion Tables. Proveu més tard.</string>
-  <string name="error_sending_to_docs">S\'ha prdouït un error quan s\'enviava la ruta a Google Docs. Proveu més tard.</string>
+  <string name="send_google_error_fusion_tables">S\'ha produït un error quan s\'enviava la ruta a Google Fusion Tables. Proveu més tard.</string>
+  <string name="send_google_error_docs">S\'ha prdouït un error quan s\'enviava la ruta a Google Docs. Proveu més tard.</string>
   <string name="track_record_error">No es pot iniciar l\'enregistrament. Proveu de nou.</string>
   <string name="error_unable_to_stop_recording">No es pot aturar l\'enregistrament. Proveu de nou.</string>
   <string name="error_import_unable_to_read_file">No es pot llegir des del fitxer.</string>
   <string name="error_import_invalid_gpx_format">El fitxer no conté un format GPX vàlid.</string>
-  <string name="error_sending_to_google">S\'ha produït un error. Proveu de nou.</string>
+  <string name="send_google_error">S\'ha produït un error. Proveu de nou.</string>
   <string name="error_export_track_does_not_exist">No existeix la ruta.</string>
   <string name="error_import_out_of_memory">Aquest fitxer és massa gran (ha d\'ésser inferior a 500KB. S\'està cancel·lant.</string>
   <string name="marker_insert_error">No es pot inserir un marcador. No hi ha cap ubicació fixa disponible.</string>
@@ -50,10 +50,10 @@ limitations under the License.
   <string name="gps_wait_for_fix">S\'està esperant per tenir una posició GPS fixa. Assegureu-vos que el cel és visible.</string>
   <string name="track_record_success">Ara s\'està enregistrant una ruta nova.</string>
   <string name="status_stopped_recording">S\'ha aturat l\'enregistrament de la ruta.</string>
-  <string name="sending_to_fusion_tables_success">S\'ha creat un Google Fusion Table nou a google.com/fusiontables.</string>
-  <string name="sending_to_my_maps_success_existing_map">S\'ha enviat la ruta a maps.google.com.</string>
-  <string name="sending_to_docs_success_new_doc">S\'ha enviat la ruta a un full de càlcul a docs.google.com.</string>
-  <string name="sending_to_docs_success_existing_doc">S\'ha enviat la ruta a docs.google.com.</string>
+  <string name="send_google_success_fusion_tables">S\'ha creat un Google Fusion Table nou a google.com/fusiontables.</string>
+  <string name="send_google_success_existing_map">S\'ha enviat la ruta a maps.google.com.</string>
+  <string name="send_google_success_new_doc">S\'ha enviat la ruta a un full de càlcul a docs.google.com.</string>
+  <string name="send_google_success_existing_doc">S\'ha enviat la ruta a docs.google.com.</string>
   <string name="gps_need_to_enable">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="my_location_approximate_location">Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques.</string>
   <string name="my_location_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>
@@ -61,15 +61,15 @@ limitations under the License.
   <string name="marker_insert_success">S\'ha inserit un marcador d\'estadístiques.</string>
 
   <!-- Progress dialog -->
-  <string name="progress_title">Espereu...</string>
+  <string name="generic_progress_title">Espereu...</string>
   <string name="progress_message">S\'està enviant la ruta a Google.</string>
-  <string name="progress_message_reading_track">S\'està llegint la ruta...</string>
-  <string name="progress_message_preparing_track">S\'està preparant la ruta...</string>
-  <string name="progress_message_authenticating_fusion_tables">S\'està  to Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_docs">S\'està autenticant a Google Docs...</string>
-  <string name="progress_message_sending_docs">S\'està enviant la ruta a Google Docs...</string>
-  <string name="progress_message_sending_fusion_tables">S\'està enviant a Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">S\'està creant un Fusion Table nou...</string>
+  <string name="send_google_progress_reading_track">S\'està llegint la ruta...</string>
+  <string name="send_google_progress_preparing_track">S\'està preparant la ruta...</string>
+  <string name="send_google_progress_auth_fusion_tables">S\'està  to Google Fusion Tables...</string>
+  <string name="send_google_progress_auth_docs">S\'està autenticant a Google Docs...</string>
+  <string name="send_google_progress_sending_docs">S\'està enviant la ruta a Google Docs...</string>
+  <string name="send_google_progress_sending_fusion_tables">S\'està enviant a Google Fusion Tables...</string>
+  <string name="send_google_progress_creating_fusion_table">S\'està creant un Fusion Table nou...</string>
   <string name="progress_message_import">S\'està imporant una ruta GPS. Això pot trigar una estona.</string>
   <string name="progress_message_export">S\'està escrivint a la targeta SD. Això pot trigar una estona.</string>
   <string name="progress_message_updating_track">S\'estan actualitzant les estadístiques de la ruta...</string>
@@ -82,13 +82,12 @@ 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="send_to_google_by_mytracks">Creat per &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; a l\'Android.</string>
+  <string name="send_google_by_my_tracks">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="recorded_date">Enregistrat</string>
-  <string name="category">Tipus d\'activitat</string>
+  <string name="send_google_recorded">Enregistrat</string>
   <string name="waypoint_category">Tipus de marcador</string>
-  <string name="send_google_track_part_format">(Part %d)</string>
+  <string name="send_google_track_part_label">(Part %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">S\'està enregistrant la ruta...</string>
@@ -247,9 +246,9 @@ limitations under the License.
   <string name="share_track_url">Comparteix la ruta amb amics</string>
 
   <!-- Visibility -->
-  <string name="public_map">Públic</string>
-  <string name="unlisted_map">No llistat</string>
-  <string name="mapslist_no_maps_available">Encara no teniu cap mapa.</string>
+  <string name="my_maps_list_public_label">Públic</string>
+  <string name="my_maps_list_unlisted_label">No llistat</string>
+  <string name="my_maps_list_no_maps">Encara no teniu cap mapa.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -336,15 +335,15 @@ limitations under the License.
   <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="send_google_title">Envia a...</string>
+  <string name="send_google_send_now">Envia ara</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>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">No s\'ha trobat cap compte</string>
-  <string name="no_account_found">No s\'ha trobat cap compte on pujar les rutes.</string>
-  <string name="choose_account_title">Trieu un compte</string>
+  <string name="send_google_no_account">No s\'ha trobat cap compte</string>
+  <string name="send_google_no_account_message">No s\'ha trobat cap compte on pujar les rutes.</string>
+  <string name="send_google_choose_account">Trieu un compte</string>
 
   <!-- SD card -->
   <string name="io_no_external_storage_found">No s\'ha trobat cap dispositiu d\'emmagatzematge extern. Assegureu-vos que la targeta SD està inserida i que el telèfon no està connectat a un ordinador.</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index 64a2bd9a9..da92fb84c 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -35,13 +35,13 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">Es wurde kein Dienst zur Positionsermittlung auf diesem Gerät gefunden.</string>
   <string name="gps_not_found">Es wurde kein GPS-Empfänger auf diesem Gerät gefunden.</string>
-  <string name="error_sending_to_fusion_tables">Beim Senden des Tracks an Google Fusion Tables ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
-  <string name="error_sending_to_docs">Beim Senden des Tracks an Google Text &amp; Tabellen ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
+  <string name="send_google_error_fusion_tables">Beim Senden des Tracks an Google Fusion Tables ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
+  <string name="send_google_error_docs">Beim Senden des Tracks an Google Text &amp; Tabellen ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
   <string name="track_record_error">Start der Aufzeichnung fehlgeschlagen. Bitte versuche es noch einmal.</string>
   <string name="error_unable_to_stop_recording">Anhalten unmöglich. Bitte versuche es noch einmal.</string>
   <string name="error_import_unable_to_read_file">Konnte Datei nicht lesen.</string>
   <string name="error_import_invalid_gpx_format">Datei ist nicht im GPX-Format.</string>
-  <string name="error_sending_to_google">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
+  <string name="send_google_error">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
   <string name="error_export_track_does_not_exist">Track existiert nicht.</string>
   <string name="error_import_out_of_memory">Die Datei ist zu groß (maximal 500 KB). Operation abgebrochen.</string>
   <string name="marker_insert_error">Der Wegpunkt kann nicht einfügt werden. Keine Positionsbestimmung möglich.</string>
@@ -50,10 +50,10 @@ limitations under the License.
   <string name="gps_wait_for_fix">Warte auf ein besseres GPS-Signal. Bitte stelle sicher, dass der Himmel sichtbar ist.</string>
   <string name="track_record_success">Ein neuer Track wird aufgezeichnet.</string>
   <string name="status_stopped_recording">Die Aufzeichnung wurde angehalten.</string>
-  <string name="sending_to_fusion_tables_success">Eine neue Tabelle wurde auf google.com/fusiontables erstellt.</string>
-  <string name="sending_to_my_maps_success_existing_map">Dein Track wurde auf maps.google.com gespeichert.</string>
-  <string name="sending_to_docs_success_new_doc">Dein Track wurde in einer neuen Tabelle bei docs.google.com gespeichert.</string>
-  <string name="sending_to_docs_success_existing_doc">Dein Track wurde an docs.google.com gesendet.</string>
+  <string name="send_google_success_fusion_tables">Eine neue Tabelle wurde auf google.com/fusiontables erstellt.</string>
+  <string name="send_google_success_existing_map">Dein Track wurde auf maps.google.com gespeichert.</string>
+  <string name="send_google_success_new_doc">Dein Track wurde in einer neuen Tabelle bei docs.google.com gespeichert.</string>
+  <string name="send_google_success_existing_doc">Dein Track wurde an docs.google.com gesendet.</string>
   <string name="gps_need_to_enable">Hier berühren, um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücke dann den Zurück-Knopf, um hierher zurückzukehren.</string>
   <string name="my_location_approximate_location">Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Mobilfunkstationen und WiFi-Netzwerken.</string>
   <string name="my_location_no_location">Die Position kann derzeit nicht bestimmt werden. Aktiviere mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stelle sicher, dass der Himmel sichtbar ist.</string>
@@ -61,15 +61,15 @@ limitations under the License.
   <string name="marker_insert_success">Ein Statistikwegpunkt wurde eingefügt.</string>
 
   <!-- Progress dialog -->
-  <string name="progress_title">Bitte warten…</string>
+  <string name="generic_progress_title">Bitte warten…</string>
   <string name="progress_message">Dein Track wird an Google gesendet...</string>
-  <string name="progress_message_reading_track">Lese Track...</string>
-  <string name="progress_message_preparing_track">Bereite Track vor...</string>
-  <string name="progress_message_authenticating_fusion_tables">Anmeldung bei Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_docs">Anmeldung bei Google Text &amp; Tabellen...</string>
-  <string name="progress_message_sending_docs">Track wird an Google Text &amp; Tabellen gesendet...</string>
-  <string name="progress_message_sending_fusion_tables">Track wird an Google Fusion Tables gesendet...</string>
-  <string name="progress_message_creating_fusion_table">Neue \'Fusion Tabelle\' wird erstellt...</string>
+  <string name="send_google_progress_reading_track">Lese Track...</string>
+  <string name="send_google_progress_preparing_track">Bereite Track vor...</string>
+  <string name="send_google_progress_auth_fusion_tables">Anmeldung bei Google Fusion Tables...</string>
+  <string name="send_google_progress_auth_docs">Anmeldung bei Google Text &amp; Tabellen...</string>
+  <string name="send_google_progress_sending_docs">Track wird an Google Text &amp; Tabellen gesendet...</string>
+  <string name="send_google_progress_sending_fusion_tables">Track wird an Google Fusion Tables gesendet...</string>
+  <string name="send_google_progress_creating_fusion_table">Neue \'Fusion Tabelle\' wird erstellt...</string>
   <string name="progress_message_import">Importiere GPS-Track. Das kann ein wenig dauern.</string>
   <string name="progress_message_export">Schreibe Datei auf SD-Karte. Das kann ein wenig dauern.</string>
   <string name="progress_message_updating_track">Aktualisiere Trackstatistik...</string>
@@ -82,14 +82,13 @@ 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="send_to_google_by_mytracks">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
+  <string name="send_google_by_my_tracks">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>
-  <string name="recorded_date">Aufgezeichnet am</string>
-  <string name="category">Aktivität</string>
+  <string name="send_google_recorded">Aufgezeichnet am</string>
   <string name="waypoint_category">Art des Wegpunktes</string>
-  <string name="send_google_track_part_format">(Teil %d)</string>
+  <string name="send_google_track_part_label">(Teil %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">Dein Track wird aufgezeichnet…</string>
@@ -257,9 +256,9 @@ limitations under the License.
   <string name="share_track_url">Track mit Freunden teilen</string>
 
   <!-- Visibility -->
-  <string name="public_map">Öffentlich</string>
-  <string name="unlisted_map">Nicht in Suchergebnissen enthalten.</string>
-  <string name="mapslist_no_maps_available">Du hast noch keine Karten.</string>
+  <string name="my_maps_list_public_label">Öffentlich</string>
+  <string name="my_maps_list_unlisted_label">Nicht in Suchergebnissen enthalten.</string>
+  <string name="my_maps_list_no_maps">Du hast noch keine Karten.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -366,17 +365,17 @@ limitations under the License.
   <string name="about_privacy">Datenschutz:</string>
 
   <!-- Send to Google -->
-  <string name="sendtogoogle_title">Senden an…</string>
-  <!--string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string-->
-  <string name="sendtogoogle_google_docs">Google Text &amp; Tabellen</string>
-  <string name="sendtogoogle_send_now">Jetzt senden</string>
+  <string  name="send_google_title">Senden an…</string>
+  <!--string name="send_google_fusion_tables">Google Fusion Tables</string-->
+  <string name="send_google_docs">Google Text &amp; Tabellen</string>
+  <string name="send_google_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>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Kein Konto vorhanden</string>
-  <string name="no_account_found">Kein Konto gefunden, um Tracks zu versenden.</string>
-  <string name="choose_account_title">Wähle ein Konto</string>
+  <string name="send_google_no_account">Kein Konto vorhanden</string>
+  <string name="send_google_no_account_message">Kein Konto gefunden, um Tracks zu versenden.</string>
+  <string name="send_google_choose_account">Wähle ein Konto</string>
 
   <!-- SD card -->
   <string name="io_no_external_storage_found">Keine externes Speichermedium verfügbar. Stelle sicher, dass eine SD-Karte vorhanden ist und nicht bereits von einem Computer darauf zugegriffen wird.</string>
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index fe7ecf052..5ccb4b169 100644
--- a/MyTracks/res/values-es-rES/strings.xml
+++ b/MyTracks/res/values-es-rES/strings.xml
@@ -103,9 +103,9 @@ limitations under the License.
   <!-- Send to Google -->
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">No se ha encontrado la cuenta</string>
-  <string name="no_account_found">No se ha encontrado la cuenta a la que subir los recorridos.</string>
-  <string name="choose_account_title">Elegir cuenta</string>
+  <string name="send_google_no_account">No se ha encontrado la cuenta</string>
+  <string name="send_google_no_account_message">No se ha encontrado la cuenta a la que subir los recorridos.</string>
+  <string name="send_google_choose_account">Elegir cuenta</string>
 
   <!-- SD card -->
   <string name="io_read_failed">No es posible leer del fichero.</string>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 2d4956f63..1736769c8 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -35,15 +35,15 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">Ningún administrador de ubicación fue hallado en este dispositivo! </string>
   <string name="gps_not_found">Ningún proveedor de ubicación GPS fue hallado en este dispositivo.</string>
-  <string name="error_sending_to_my_maps">Se produjo un error al enviar su recorrido a Google Mis Sitios.</string>
-  <string name="error_sending_to_fusion_tables">Se produjo un error al enviar su recorrido a Google Fusion Tables.</string>
-  <string name="error_sending_to_docs">Se produjo un error al enviar su recorrido a Google Docs.</string>
+  <string name="send_google_error_my_maps">Se produjo un error al enviar su recorrido a Google Mis Sitios.</string>
+  <string name="send_google_error_fusion_tables">Se produjo un error al enviar su recorrido a Google Fusion Tables.</string>
+  <string name="send_google_error_docs">Se produjo un error al enviar su recorrido a Google Docs.</string>
   <string name="error_sending_generic">Por favor, inténtelo de nuevo mas tarde.</string>
   <string name="track_record_error">No se puede iniciar la grabación. Inténtelo de nuevo. </string>
   <string name="error_unable_to_stop_recording">No se puede detener la grabación. Inténtelo de nuevo.</string>
   <string name="error_import_unable_to_read_file">No pude leer del archivo.</string>
   <string name="error_import_invalid_gpx_format">El archivo no tiene un format GPX válido.</string>
-  <string name="error_sending_to_google">A ocurrido un error. Por favor, inténtelo de nuevo.</string>
+  <string name="send_google_error">A ocurrido un error. Por favor, inténtelo de nuevo.</string>
   <string name="error_export_track_does_not_exist">El recorrido no existe.</string>
   <string name="error_export_operation_canceled">La operación fue cancelada.</string>
   <string name="error_import_out_of_memory">El archivo es demasiado grande (tiene que ser menor a 500 KB). Abortando.</string>
@@ -53,32 +53,32 @@ limitations under the License.
   <string name="gps_wait_for_fix">Esperando una ubicación mas exacta del GPS. Asegúrese que el cielo sea visible.</string>
   <string name="track_record_success">Grabando un nuevo recorrido.</string>
   <string name="status_stopped_recording">Grabación interrumpida.</string>
-  <string name="sending_to_my_maps_success_new_map">Un nuevo sitio ha sido añadido en maps.google.com.</string>
-  <string name="sending_to_fusion_tables_success">Una nueva tabla de Google Fusion ha sido creada en google.com/fusiontables.</string>
-  <string name="sending_to_my_maps_success_existing_map">Su recorrido ha sido enviado a maps.google.com.</string>
-  <string name="sending_to_docs_success_new_doc">Su recorrido ha sido enviado a una nueva hoja de cálculo de docs.google.com.</string>
-  <string name="sending_to_docs_success_existing_doc">Su recorrido ha sido enviado a docs.google.com.</string>
-  <string name="sending_to_google_additional_info">Es posible que pasen unos minutos hasta que los nuevos recorridos aparezcan.</string>
+  <string name="send_google_success_new_map">Un nuevo sitio ha sido añadido en maps.google.com.</string>
+  <string name="send_google_success_fusion_tables">Una nueva tabla de Google Fusion ha sido creada en google.com/fusiontables.</string>
+  <string name="send_google_success_existing_map">Su recorrido ha sido enviado a maps.google.com.</string>
+  <string name="send_google_success_new_doc">Su recorrido ha sido enviado a una nueva hoja de cálculo de docs.google.com.</string>
+  <string name="send_google_success_existing_doc">Su recorrido ha sido enviado a docs.google.com.</string>
+  <string name="send_google_success_footer">Es posible que pasen unos minutos hasta que los nuevos recorridos aparezcan.</string>
   <string name="gps_need_to_enable">Por favor, presione aquí para ir al menú de Seguridad y Ubicación, y asegúrese que el GPS esté habilitado. Presione el botón "atrás" para regresar.</string>
   <string name="my_location_approximate_location">Nota: Una ubicación aproximada es determinada a partir de torres de telefonía celular y redes WIFI.</string>
   <string name="my_location_no_location">No puede ser determinada la ubicación actual. Habilite más fuentes de datos (vea las configuraciones de Seguridad y Ubicación) y asegúrese que el cielo sea visible. Inténtelo mas tarde.</string>
   <string name="status_waypoint_inserted">Un marcador de recorrido fue insertado.</string>
   <string name="marker_insert_success">Un marcador de estadísticas fue insertado.</string>
-  <string name="sending_to_google_upload_status">Estado del envío:</string>
+  <string name="send_google_result_title">Estado del envío:</string>
   
   <!-- Progress dialog -->
-  <string name="progress_title">Por favor espere...</string>
+  <string name="generic_progress_title">Por favor espere...</string>
   <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_fusion_tables">Autenticando con Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_my_maps">Autenticando con Google Maps...</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_my_maps">Enviando recorrido a Google Maps...</string>
-  <string name="progress_message_creating_map">Creando nuevo Sitio...</string>
-  <string name="progress_message_sending_fusion_tables">Enviando recorrido a Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">Creando nuevo mapa Fusion Tables...</string>
+  <string name="send_google_progress_reading_track">Leyendo recorrido...</string>
+  <string name="send_google_progress_preparing_track">Preparando recorrido...</string>
+  <string name="send_google_progress_auth_fusion_tables">Autenticando con Google Fusion Tables...</string>
+  <string name="send_google_progress_auth_my_maps">Autenticando con Google Maps...</string>
+  <string name="send_google_progress_auth_docs">Autenticando con Google Docs...</string>
+  <string name="send_google_progress_sending_docs">Enviando recorrido a Google Docs...</string>
+  <string name="send_google_progress_sending_my_maps">Enviando recorrido a Google Maps...</string>
+  <string name="send_google_progress_creating_map">Creando nuevo Sitio...</string>
+  <string name="send_google_progress_sending_fusion_tables">Enviando recorrido a Google Fusion Tables...</string>
+  <string name="send_google_progress_creating_fusion_table">Creando nuevo mapa Fusion Tables...</string>
   <string name="progress_message_import">Importando un recorrido GPS. Esto puede tardar.</string>
   <string name="progress_message_export">Escribiendo archivo a tarjeta SD. Esto puede tardar.</string>
   <string name="progress_message_updating_track">Actualizando estadísticas del recorrido...</string>
@@ -92,7 +92,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Creado por My Tracks para Android.</string>
-  <string name="send_to_google_by_mytracks">Creado por &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
+  <string name="send_google_by_my_tracks">Creado por &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en 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; en Android.</string>
@@ -100,10 +100,9 @@ limitations under the License.
   
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Puntos</string>
-  <string name="recorded_date">Grabado</string>
-  <string name="category">Tipo de actividad</string>
+  <string name="send_google_recorded">Grabado</string>
   <string name="waypoint_category">Tipo de señal</string>
-  <string name="send_google_track_part_format">"(Parte %d)"</string>
+  <string name="send_google_track_part_label">"(Parte %d)"</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">Grabando su recorrido...</string>
@@ -298,11 +297,11 @@ limitations under the License.
   <string name="mytracks_sky">Satélites GPS</string>
 
   <!-- My Maps -->
-  <string name="select_map_message">Seleccione un mapa de su cuenta:</string>
+  <string name="my_maps_list_pick_map">Seleccione un mapa de su cuenta:</string>
   <string name="create_new_map">Crear un nuevo mapa...</string>
-  <string name="map_list_title">Enviar a Google Mis Sitios</string>
-  <string name="maps_list_loading">Cargando mapas...</string>
-  <string name="maps_list_failed">¡No se pudieron cargar sus mapas en este momento!</string>
+  <string name="my_maps_list_title">Enviar a Google Mis Sitios</string>
+  <string name="my_maps_list_loading">Cargando mapas...</string>
+  <string name="my_maps_list_error">¡No se pudieron cargar sus mapas en este momento!</string>
   <string name="open_map">Seleccionar este mapa</string>
   <string name="edit_map_details">Editar detalles del mapa</string>
   <string name="share_track_url">Compartir recorrido</string>
@@ -326,9 +325,9 @@ limitations under the License.
     Para ver este recorrido usa Google Earth o algún otro software de mapeo.</string>
 
   <!-- Visibility -->
-  <string name="public_map">Público</string>
-  <string name="unlisted_map">No listado</string>
-  <string name="mapslist_no_maps_available">Aún no tienes ningún mapa.</string>
+  <string name="my_maps_list_public_label">Público</string>
+  <string name="my_maps_list_unlisted_label">No listado</string>
+  <string name="my_maps_list_no_maps">Aún no tienes ningún mapa.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -420,19 +419,19 @@ limitations under the License.
   <string name="about_privacy">Privacidad:</string>
   
   <!-- Send to Google -->
-  <string name="sendtogoogle_title">Enviar a...</string>
-  <string name="sendtogoogle_google_fusiontables">Tablas Google Fusion</string>
-  <string name="sendtogoogle_google_mymaps">Mis Sitios Google</string>
-  <string name="sendtogoogle_send_now">Enviar ahora</string>
-  <string name="sendtogoogle_create_new_map">Crear nuevo mapa</string>
-  <string name="sendtogoogle_pick_existing_map">Elegir un mapa existente</string>
+  <string  name="send_google_title">Enviar a...</string>
+  <string name="send_google_fusion_tables">Tablas Google Fusion</string>
+  <string name="send_google_my_maps">Mis Sitios Google</string>
+  <string name="send_google_send_now">Enviar ahora</string>
+  <string name="send_google_new_map">Crear nuevo mapa</string>
+  <string name="send_google_existing_map">Elegir un mapa existente</string>
   <string name="sendtogoogle_send_stats">Enviar estadísticas de recorrido</string>
   <string name="sendtogoogle_send_stats_and_points">Enviar estadísticas y puntos</string>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Cuenta no encontrada</string>
-  <string name="no_account_found">No se encontro la cuenta a la que subir las rutas.</string>
-  <string name="choose_account_title">Elija una cuenta</string>
+  <string name="send_google_no_account">Cuenta no encontrada</string>
+  <string name="send_google_no_account_message">No se encontro la cuenta a la que subir las rutas.</string>
+  <string name="send_google_choose_account">Elija una cuenta</string>
   
   <!-- SD card -->
   <string name="io_no_external_storage_found">Ningún almacenamiento externo fue encontrado. Asegúrese que la tarjeta SD se encuentre insertada y que su teléfono no este conectado a una computadora.</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index 3e872444d..b8082d42b 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -35,9 +35,9 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">Paikkatietoja ei löytynyt!</string>
   <string name="gps_not_found">GPS-palvelua ei löytynyt.</string>
-  <string name="error_sending_to_my_maps">Virhe lähetettäessä reittiä Google My Maps-palveluun.</string>
-  <string name="error_sending_to_fusion_tables">Virhe lähetettäessä reittiä Google Fusion Tables-palveluun.</string>
-  <string name="error_sending_to_docs">Virhe lähetettäessä reittiä Google Docs-palveluun..</string>
+  <string name="send_google_error_my_maps">Virhe lähetettäessä reittiä Google My Maps-palveluun.</string>
+  <string name="send_google_error_fusion_tables">Virhe lähetettäessä reittiä Google Fusion Tables-palveluun.</string>
+  <string name="send_google_error_docs">Virhe lähetettäessä reittiä Google Docs-palveluun..</string>
   <string name="error_sending_generic">Yritä myöhemmin uudelleen.</string>
   <string name="track_record_error">Tallennusta ei voitu aloittaa. Yritä uudelleen.</string>
   <string name="error_unable_to_stop_recording">Tallennusta ei voitu pysäyttää. Yritä uudelleen.</string>
@@ -53,32 +53,32 @@ limitations under the License.
   <string name="gps_wait_for_fix">Odotetaan parempaa GPS-yhteyttä. Varmista että taivas on näkyvissä.</string>
   <string name="track_record_success">Tallennetaan uutta reittiä.</string>
   <string name="status_stopped_recording">Reitin tallentaminen lopetettiin.</string>
-  <string name="sending_to_my_maps_success_new_map">Uusi Google My Map on luotu osoitteeseen maps.google.com.</string>
-  <string name="sending_to_fusion_tables_success">Uusi Google Fusion taulukko on luotu osoitteeseen google.com/fusiontables.</string>
-  <string name="sending_to_my_maps_success_existing_map">Reittisi on lähetetty osoitteeseen maps.google.com.</string>
-  <string name="sending_to_docs_success_new_doc">Reittisi on luotu taulukoksi osoitteeseen  docs.google.com.</string>
-  <string name="sending_to_docs_success_existing_doc">Reittisi on lähetetty osoitteeseen docs.google.com.</string>
-  <string name="sending_to_google_additional_info">Reitin näkyminen saattaa kestää muutaman minuutin.</string>
+  <string name="send_google_success_new_map">Uusi Google My Map on luotu osoitteeseen maps.google.com.</string>
+  <string name="send_google_success_fusion_tables">Uusi Google Fusion taulukko on luotu osoitteeseen google.com/fusiontables.</string>
+  <string name="send_google_success_existing_map">Reittisi on lähetetty osoitteeseen maps.google.com.</string>
+  <string name="send_google_success_new_doc">Reittisi on luotu taulukoksi osoitteeseen  docs.google.com.</string>
+  <string name="send_google_success_existing_doc">Reittisi on lähetetty osoitteeseen docs.google.com.</string>
+  <string name="send_google_success_footer">Reitin näkyminen saattaa kestää muutaman minuutin.</string>
   <string name="gps_need_to_enable">Avaa tästä Sijainti ja suojaus -asetukset ja valitse \'Käytä GPS-satelliitteja\'. Palaa ohjelmaan painamalla Takaisin-näppäintä.</string>
   <string name="my_location_approximate_location">Huomio: Näkyvä sijainti perustuu kännykkämastoista ja WLAN-verkoista arvioituun paikkatietoon.</string>
   <string name="my_location_no_location">Paikkatietoa ei löydy. Aktivoi lisää paikannusmenetelmiä (katso Asetukset) ja varmista että taivas on näkyvissä. Yritä myöhemmin uudelleen.</string>
   <string name="status_waypoint_inserted">Reittimerkintä lisätty.</string>
   <string name="marker_insert_success">Tilastomerkintä lisätty.</string>
-  <string name="sending_to_google_upload_status">Lähetyksen tila:</string>
+  <string name="send_google_result_title">Lähetyksen tila:</string>
 
   <!-- Progress dialog -->
-  <string name="progress_title">Odota...</string>
+  <string name="generic_progress_title">Odota...</string>
   <string name="progress_message">Lähetetään reittiä Google:n palvelimelle.</string>
-  <string name="progress_message_reading_track">Luetaan reittiä...</string>
-  <string name="progress_message_preparing_track">Valmistellaan reittiä...</string>
-  <string name="progress_message_authenticating_fusion_tables">Todennetaan Google Fusion Tables -tiliä...</string>
-  <string name="progress_message_authenticating_my_maps">Todennetaan Google Maps -tiliä...</string>
-  <string name="progress_message_authenticating_docs">Todennetaan Google Docs -tiliä...</string>
-  <string name="progress_message_sending_docs">Lähetetään reittiä Google Docsiin...</string>
-  <string name="progress_message_sending_my_maps">Lähetetään reittiä Google Mapsiin...</string>
-  <string name="progress_message_creating_map">Luodaan uutta My Mapsia...</string>
-  <string name="progress_message_sending_fusion_tables">Lähetetään reittiä Fusion Tablesiin...</string>
-  <string name="progress_message_creating_fusion_table">Luodaan uutta Fusion tablea...</string>
+  <string name="send_google_progress_reading_track">Luetaan reittiä...</string>
+  <string name="send_google_progress_preparing_track">Valmistellaan reittiä...</string>
+  <string name="send_google_progress_auth_fusion_tables">Todennetaan Google Fusion Tables -tiliä...</string>
+  <string name="send_google_progress_auth_my_maps">Todennetaan Google Maps -tiliä...</string>
+  <string name="send_google_progress_auth_docs">Todennetaan Google Docs -tiliä...</string>
+  <string name="send_google_progress_sending_docs">Lähetetään reittiä Google Docsiin...</string>
+  <string name="send_google_progress_sending_my_maps">Lähetetään reittiä Google Mapsiin...</string>
+  <string name="send_google_progress_creating_map">Luodaan uutta My Mapsia...</string>
+  <string name="send_google_progress_sending_fusion_tables">Lähetetään reittiä Fusion Tablesiin...</string>
+  <string name="send_google_progress_creating_fusion_table">Luodaan uutta Fusion tablea...</string>
   <string name="progress_message_import">Tuodaan uutta GPS-reittiä. Odota.</string>
   <string name="progress_message_export">Kirjoitetaan tiedostoa SD-kortille. Odota.</string>
   <string name="progress_message_updating_track">Päivitetään reitin tilastoja...</string>
@@ -91,7 +91,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Created by My Tracks on Android.</string>
-  <string name="send_to_google_by_mytracks">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
+  <string name="send_google_by_my_tracks">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>
@@ -99,10 +99,9 @@ limitations under the License.
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Pisteet</string>
-  <string name="recorded_date">Tallennettu</string>
-  <string name="category">Liikunnan muoto</string>
+  <string name="send_google_recorded">Tallennettu</string>
   <string name="waypoint_category">Merkinnän tyyppi</string>
-  <string name="send_google_track_part_format">(Osa %d)</string>
+  <string name="send_google_track_part_label">(Osa %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">Tallennetaan reittiä...</string>
@@ -279,11 +278,11 @@ limitations under the License.
   <string name="mytracks_sky">GPS-satelliitit</string>
 
   <!-- My Maps -->
-  <string name="select_map_message">Valitse kartta tililtäsi:</string>
+  <string name="my_maps_list_pick_map">Valitse kartta tililtäsi:</string>
   <string name="create_new_map">Luo uusi kartta...</string>
-  <string name="map_list_title">Lähetä Google My Mapsiin</string>
-  <string name="maps_list_loading">Ladataan karttoja...</string>
-  <string name="maps_list_failed">Karttoja ei voitu ladata!</string>
+  <string name="my_maps_list_title">Lähetä Google My Mapsiin</string>
+  <string name="my_maps_list_loading">Ladataan karttoja...</string>
+  <string name="my_maps_list_error">Karttoja ei voitu ladata!</string>
   <string name="open_map">Valitse tämä kartta</string>
   <string name="edit_map_details">Muokkaa kartan tietoja</string>
   <string name="share_track_url">Jaa reitti</string>
@@ -307,9 +306,9 @@ limitations under the License.
     Käytä Google Earthia tai jotain muuta karttaohjelmistoa kartan katsomiseen.</string>
 
   <!-- Visibility -->
-  <string name="public_map">Julkinen</string>
-  <string name="unlisted_map">Ei listattu</string>
-  <string name="mapslist_no_maps_available">Ei karttoja saatavilla.</string>
+  <string name="my_maps_list_public_label">Julkinen</string>
+  <string name="my_maps_list_unlisted_label">Ei listattu</string>
+  <string name="my_maps_list_no_maps">Ei karttoja saatavilla.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -415,20 +414,20 @@ limitations under the License.
   <string name="about_privacy">Yksityisyys:</string>
 
   <!-- Send to Google -->
-  <string name="sendtogoogle_title">Lähetä...</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">Lähetä</string>
-  <string name="sendtogoogle_create_new_map">Luo uusi kartta</string>
-  <string name="sendtogoogle_pick_existing_map">Valitse kartta</string>
+  <string  name="send_google_title">Lähetä...</string>
+  <string name="send_google_fusion_tables">Google Fusion Tables</string>
+  <string name="send_google_my_maps">Google My Maps</string>
+  <string name="send_google_docs">Google Docs</string>
+  <string name="send_google_send_now">Lähetä</string>
+  <string name="send_google_new_map">Luo uusi kartta</string>
+  <string name="send_google_existing_map">Valitse kartta</string>
   <string name="sendtogoogle_send_stats">Lähetä reitin statistiikka</string>
   <string name="sendtogoogle_send_stats_and_points">Lähetä reitin statistiikka ja pisteet</string>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Tiliä ei löytynyt</string>
-  <string name="no_account_found">Tiliä johon reitin voisi lähettää ei löytynyt.</string>
-  <string name="choose_account_title">Valitse tili</string>
+  <string name="send_google_no_account">Tiliä ei löytynyt</string>
+  <string name="send_google_no_account_message">Tiliä johon reitin voisi lähettää ei löytynyt.</string>
+  <string name="send_google_choose_account">Valitse tili</string>
 
   <!-- SD card -->
   <string name="io_no_external_storage_found">Ulkoista tallennusmediaa ei löytynyt. Varmista että SD-kortti on kytketty eikä puhelinta ole liitetty tietokoneeseen.</string>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 636b18528..94267dff4 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -36,8 +36,8 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">Aucune source de localisation n\'a été trouvée sur ce système !</string>
   <string name="gps_not_found">Aucune source GPS de localisation n\'a été trouvée sur ce système.</string>
-  <string name="error_sending_to_fusion_tables">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Fusion Tables. Réessayez plus tard SVP.</string>
-  <string name="error_sending_to_docs">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Docs. Réessayez plus tard SVP.</string>
+  <string name="send_google_error_fusion_tables">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Fusion Tables. Réessayez plus tard SVP.</string>
+  <string name="send_google_error_docs">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Docs. Réessayez plus tard SVP.</string>
   <string name="track_record_error">Impossible de débuter l\'enregistrement. Réessayez.</string>
   <string name="error_unable_to_stop_recording">Impossible de stopper l\'enregistrement. Réessayez.</string>
   <string name="error_import_unable_to_read_file">Impossible de lire le fichier.</string>
@@ -51,10 +51,10 @@ limitations under the License.
   <string name="gps_wait_for_fix">Attente du signal GPS. Assurez-vous que le ciel est bien visible.</string>
   <string name="track_record_success">Parcours en cours d\'enregistrement.</string>
   <string name="status_stopped_recording">Enregistrement du parcours terminé.</string>
-  <string name="sending_to_fusion_tables_success">Une nouvelle table Google Fusion vient d\'être créée sur google.com/fusiontables.</string>
-  <string name="sending_to_my_maps_success_existing_map">Votre parcours a été envoyé à maps.google.com.</string>
-  <string name="sending_to_docs_success_new_doc">Votre parcours a été envoyé dans un tableur à docs.google.com.</string>
-  <string name="sending_to_docs_success_existing_doc">Votre parcours a été envoyé à docs.google.com.</string>
+  <string name="send_google_success_fusion_tables">Une nouvelle table Google Fusion vient d\'être créée sur google.com/fusiontables.</string>
+  <string name="send_google_success_existing_map">Votre parcours a été envoyé à maps.google.com.</string>
+  <string name="send_google_success_new_doc">Votre parcours a été envoyé dans un tableur à docs.google.com.</string>
+  <string name="send_google_success_existing_doc">Votre parcours a été envoyé à docs.google.com.</string>
   <string name="gps_need_to_enable">Cliquez ici et allez dans \'Paramètres\', \'Sécurité et Localisation\' et selectionnez \'Activer les satellites GPS\'. Appuyez sur le bouton de retour pour revenir au menu.</string>
   <string name="my_location_approximate_location">Note : Votre position est approximative, elle a été déterminée par les antennes de téléphonie ou le réseau WiFi.</string>
   <string name="my_location_no_location">Votre position ne peut être déterminée. Vérifiez votre configuration dans \'Paramètres\', \'Sécurité et Localisation\'. Assurez-vous également que le ciel soit bien visible.</string>
@@ -62,15 +62,15 @@ limitations under the License.
   <string name="marker_insert_success">Une balise de statistiques a été insérée.</string>
 
   <!-- Progress dialog -->
-  <string name="progress_title">Patientez SVP...</string>
+  <string name="generic_progress_title">Patientez SVP...</string>
   <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_fusion_tables">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_fusion_tables">Envoi du parcours vers Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">Création d\'une nouvelle \'Fusion Table\'...</string>
+  <string name="send_google_progress_reading_track">Lecture du parcours...</string>
+  <string name="send_google_progress_preparing_track">Préparation du parcours</string>
+  <string name="send_google_progress_auth_fusion_tables">Authentification à Google Fusion Tables...</string>
+  <string name="send_google_progress_auth_docs">Authentification à Google Docs...</string>
+  <string name="send_google_progress_sending_docs">Envoi du parcours vers Google Docs...</string>
+  <string name="send_google_progress_sending_fusion_tables">Envoi du parcours vers Google Fusion Tables...</string>
+  <string name="send_google_progress_creating_fusion_table">Création d\'une nouvelle \'Fusion Table\'...</string>
   <string name="progress_message_import">Importation du parcours GPS. Patientez SVP.</string>
   <string name="progress_message_export">Enregistrement du fichier sur la carte SD. Patientez SVP.</string>
   <string name="progress_message_updating_track">Mise à jour des statistiques du parcours...</string>
@@ -83,13 +83,12 @@ 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="send_to_google_by_mytracks">Créée par &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; sous Android.</string>
+  <string name="send_google_by_my_tracks">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>
-  <string name="category">Type d\'activité</string>
+  <string name="send_google_recorded">Enregistré</string>
   <string name="waypoint_category">Type de balise</string>
-  <string name="send_google_track_part_format">(Portion %d)</string>
+  <string name="send_google_track_part_label">(Portion %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">Enregistrement de votre parcours...</string>
@@ -236,8 +235,8 @@ limitations under the License.
   <string name="share_track_url">Partager des parcours.</string>
 
   <!-- Visibility -->
-  <string name="unlisted_map">Carte non listée</string>
-  <string name="mapslist_no_maps_available">Vous n\'avez par encore de carte personnalisée.</string>
+  <string name="my_maps_list_unlisted_label">Carte non listée</string>
+  <string name="my_maps_list_no_maps">Vous n\'avez par encore de carte personnalisée.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -326,15 +325,15 @@ limitations under the License.
   <string name="about_team">Équipe :</string>
 
   <!-- Send to Google -->
-  <string name="sendtogoogle_title">Envoyer à</string>
-  <string name="sendtogoogle_send_now">Envoyer maintenant</string>
+  <string  name="send_google_title">Envoyer à</string>
+  <string name="send_google_send_now">Envoyer maintenant</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>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Pas de compte Google</string>
-  <string name="no_account_found">Un compte Google est nécessaire pour télécharger le parcours.</string>
-  <string name="choose_account_title">Choisissez un compte</string>
+  <string name="send_google_no_account">Pas de compte Google</string>
+  <string name="send_google_no_account_message">Un compte Google est nécessaire pour télécharger le parcours.</string>
+  <string name="send_google_choose_account">Choisissez un compte</string>
 
   <!-- SD card -->
   <string name="io_no_external_storage_found">Aucun emplacement externe de sauvegarde n\'a été trouvé. Assurez-vous qu\'une carte SD est insérée et que votre téléphone n\'est pas relié à un ordinateur.</string>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index 021036fb2..3ee9fcf11 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -33,8 +33,8 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">Nessuna fonte di posizione trovata su questo dispositivo.</string>
   <string name="gps_not_found">Nessuna fonte di posizione GPS trovata su questo dispositivo.</string>
-  <string name="error_sending_to_fusion_tables">Si è verificato un errore nell\'invio del percorso a Google Fusion Tables. Per favore riprova più tardi.</string>
-  <string name="error_sending_to_docs">Si è verificato un errore nell\'invio del percorso a Google Docs. Per favore riporva più tardi.</string>
+  <string name="send_google_error_fusion_tables">Si è verificato un errore nell\'invio del percorso a Google Fusion Tables. Per favore riprova più tardi.</string>
+  <string name="send_google_error_docs">Si è verificato un errore nell\'invio del percorso a Google Docs. Per favore riporva più tardi.</string>
   <string name="track_record_error">Impossibile iniziare la registrazione. Riprova.</string>
   <string name="error_unable_to_stop_recording">Impossibile fermare la registrazione. Riprova.</string>
   <string name="error_import_unable_to_read_file">Impossibile leggere da un file.</string>
@@ -48,10 +48,10 @@ limitations under the License.
   <string name="gps_wait_for_fix">Sto aspettando il fix del GPS. Accertati che il cielo sia visibile.</string>
   <string name="track_record_success">Sto registrando un nuovo percorso.</string>
   <string name="status_stopped_recording">Registrazione del percorso terminata.</string>
-  <!-- <string name="sending_to_fusion_tables_success">Una nuova mappa è stata creata in «Le mie mappe» su maps.google.com.</string> -->
-  <string name="sending_to_my_maps_success_existing_map">Il tuo percorso è stato inviato a maps.google.com.</string>
-  <string name="sending_to_docs_success_new_doc">Il tuo percorso è stato inviato ad un nuovo foglio di calcolo su docs.google.com.</string>
-  <string name="sending_to_docs_success_existing_doc">Il tuo percorso è stato inviato a docs.google.com.</string>
+  <!-- <string name="send_google_success_fusion_tables">Una nuova mappa è stata creata in «Le mie mappe» su maps.google.com.</string> -->
+  <string name="send_google_success_existing_map">Il tuo percorso è stato inviato a maps.google.com.</string>
+  <string name="send_google_success_new_doc">Il tuo percorso è stato inviato ad un nuovo foglio di calcolo su docs.google.com.</string>
+  <string name="send_google_success_existing_doc">Il tuo percorso è stato inviato a docs.google.com.</string>
   <string name="gps_need_to_enable">Premi qui per andare a «Impostazioni di posizione e protezione» e attiva «Utilizza satelliti GPS». Poi premi il tasto di ritorno per tornare qui.</string>
   <string name="my_location_approximate_location">Nota: la posizione indicata è un\'approssimazione determinata in base alle antenne cellulari e reti WIFI vicine.</string>
   <string name="my_location_no_location">La posizione non può essere determinata. Attiva più fonti di posizione (vedi «Impostazioni di posizione e protezione») e eccertati che il cielo sia visibile. Riprova più tardi.</string>
@@ -59,15 +59,15 @@ limitations under the License.
   <string name="marker_insert_success">Inserito un segnaposto con statistiche.</string>
 
   <!-- Progress dialog -->
-  <string name="progress_title">Attendi per favore...</string>
+  <string name="generic_progress_title">Attendi per favore...</string>
   <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_fusion_tables">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_fusion_tables">Invio del percorso a Google Maps in corso...</string> -->
-  <!-- <string name="progress_message_creating_fusion_table">Creazione di una nuova mappa in «Le mie mappe» in corso...</string> -->
+  <string name="send_google_progress_reading_track">Lettura in corso...</string>
+  <string name="send_google_progress_preparing_track">Elaborazione del percorso in corso...</string>
+  <!-- <string name="send_google_progress_auth_fusion_tables">Autenticazione a Google Maps in corso...</string> -->
+  <string name="send_google_progress_auth_docs">Autenticazione a Google Docs in corso...</string>
+  <string name="send_google_progress_sending_docs">Invio del percorso a Google Docs in corso...</string>
+  <!-- <string name="send_google_progress_sending_fusion_tables">Invio del percorso a Google Maps in corso...</string> -->
+  <!-- <string name="send_google_progress_creating_fusion_table">Creazione di una nuova mappa in «Le mie mappe» in corso...</string> -->
   <string name="progress_message_import">Importazione del percorso GPS in corso. Attendere prego...</string>
   <string name="progress_message_export">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>
@@ -80,14 +80,13 @@ 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="send_to_google_by_mytracks">Creato da &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; su Android.</string>
+  <string name="send_google_by_my_tracks">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>
-  <string name="recorded_date">Registrato</string>
-  <string name="category">Tipo di attività</string>
+  <string name="send_google_recorded">Registrato</string>
   <string name="waypoint_category">Tipo di segnaposto</string>
-  <string name="send_google_track_part_format">(Parte %d)</string>
+  <string name="send_google_track_part_label">(Parte %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">Registrazione del percorso in corso...</string>
@@ -212,9 +211,9 @@ limitations under the License.
   <string name="share_track_url">Condividi il percorso con amici</string>
 
   <!-- Visibility -->
-  <string name="public_map">Pubblica</string>
-  <string name="unlisted_map">Privata</string>
-  <string name="mapslist_no_maps_available">Non hai ancora alcuna mappa.</string>
+  <string name="my_maps_list_public_label">Pubblica</string>
+  <string name="my_maps_list_unlisted_label">Privata</string>
+  <string name="my_maps_list_no_maps">Non hai ancora alcuna mappa.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -308,17 +307,17 @@ limitations under the License.
   <string name="about_support">Supporto:</string>
 
   <!-- Send to Google -->
-  <string name="sendtogoogle_title">Invia a...</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="send_google_title">Invia a...</string>
+  <!-- <string name="send_google_fusion_tables">«Le mie mappe» di Google</string> -->
+  <string name="send_google_docs">Google Docs</string>
+  <string name="send_google_send_now">Invia adesso</string>
   <string name="sendtogoogle_send_stats">Invia statistiche del percorso</string>
   <string name="sendtogoogle_send_stats_and_points">Invia statistiche e segnaposti</string>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Account non trovato</string>
-  <string name="no_account_found">Non ho trovato un account a cui inviare i percorsi.</string>
-  <string name="choose_account_title">Scegli un account</string>
+  <string name="send_google_no_account">Account non trovato</string>
+  <string name="send_google_no_account_message">Non ho trovato un account a cui inviare i percorsi.</string>
+  <string name="send_google_choose_account">Scegli un account</string>
 
   <!-- SD card -->
   <string name="io_no_external_storage_found">Nessuna memoria esterna trovata. Assicurati che la scheda SD sia inserita e che il telefono no sia montato su un computer.</string>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index ce698fa43..74c24182e 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -35,9 +35,9 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">この端末でロケーションマネージャを発見できませんでした．</string>
   <string name="gps_not_found">この端末でGPSロケーションプロバイダを発見できました．</string>
-  <string name="error_sending_to_my_maps">Googleマイマップへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
-  <string name="error_sending_to_fusion_tables">Google Fusion Tablesへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
-  <string name="error_sending_to_docs">Google Docsへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
+  <string name="send_google_error_my_maps">Googleマイマップへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
+  <string name="send_google_error_fusion_tables">Google Fusion Tablesへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
+  <string name="send_google_error_docs">Google Docsへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
   <string name="track_record_error">記録作成開始できません．もう一度試して下さい．</string>
   <string name="error_unable_to_stop_recording">記録停止できません．もう一度試して下さい．</string>
   <string name="error_import_unable_to_read_file">ファイルからの読み込みができません．</string>
@@ -51,12 +51,12 @@ limitations under the License.
   <string name="gps_wait_for_fix">GPS位置精度がよくなるまで待機しています．空が見えるところにいて下さい．</string>
   <string name="track_record_success">新しいトラックを記録中です．</string>
   <string name="status_stopped_recording">トラック記録を停止しました．</string>
-  <string name="sending_to_my_maps_success_new_map">新しいマイマップをmap.google.comに作成しました．</string>
-  <string name="sending_to_fusion_tables_success">新しいGoogle Fusion Tableをgoogle.com/fusiontablesに作成しました．</string>
-  <string name="sending_to_my_maps_success_existing_map">トラックをmaps.google.comに送信しました．</string>
-  <string name="sending_to_docs_success_new_doc">トラックをdocs.google.comの新しいスプレッドシートに送信しました．</string>
-  <string name="sending_to_docs_success_existing_doc">トラックをdocs.google.comに送信しました．</string>
-  <string name="sending_to_google_additional_info">新しいトラックが表示されるまでに数分かかることがあります．</string>
+  <string name="send_google_success_new_map">新しいマイマップをmap.google.comに作成しました．</string>
+  <string name="send_google_success_fusion_tables">新しいGoogle Fusion Tableをgoogle.com/fusiontablesに作成しました．</string>
+  <string name="send_google_success_existing_map">トラックをmaps.google.comに送信しました．</string>
+  <string name="send_google_success_new_doc">トラックをdocs.google.comの新しいスプレッドシートに送信しました．</string>
+  <string name="send_google_success_existing_doc">トラックをdocs.google.comに送信しました．</string>
+  <string name="send_google_success_footer">新しいトラックが表示されるまでに数分かかることがあります．</string>
   <string name="gps_need_to_enable">ここをタップして「位置情報とセキュリティの設定」を開いて「GPS機能を使用」にチェックを入れて下さい．バックボタンで戻ってください．</string>
   <string name="my_location_approximate_location">ご注意: 携帯電話中継局とWi-Fiネットワークから大まかな位置を特定します．</string>
   <string name="my_location_no_location">現在位置決定ができません．位置取得源を増やし(位置情報とセキュリティの設定 をご覧ください)、空が見えるようにして下さい．もう一度試して下さい．</string>
@@ -64,18 +64,18 @@ limitations under the License.
   <string name="marker_insert_success">統計マーカーを挿入しました．</string>
 
   <!-- Progress dialog -->
-  <string name="progress_title">お待ちください...</string>
+  <string name="generic_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_fusion_tables">Google Fusion Tablesへの認証を行っています...</string>
-  <string name="progress_message_authenticating_my_maps">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_my_maps">トラックをGoogleマップに送信しています...</string>
-  <string name="progress_message_creating_map">新しいマイマップを作成しています...</string>
-  <string name="progress_message_sending_fusion_tables">トラックをFusion Tablesに送信しています...</string>
-  <string name="progress_message_creating_fusion_table">新しいFusionテーブルを生成しています...</string>
+  <string name="send_google_progress_reading_track">トラックを読んでいます...</string>
+  <string name="send_google_progress_preparing_track">トラックを準備しています...</string>
+  <string name="send_google_progress_auth_fusion_tables">Google Fusion Tablesへの認証を行っています...</string>
+  <string name="send_google_progress_auth_my_maps">Googleマップへの認証を行っています...</string>
+  <string name="send_google_progress_auth_docs">Google Docsへの認証を行っています...</string>
+  <string name="send_google_progress_sending_docs">トラックをGoogle Docsに送信しています...</string>
+  <string name="send_google_progress_sending_my_maps">トラックをGoogleマップに送信しています...</string>
+  <string name="send_google_progress_creating_map">新しいマイマップを作成しています...</string>
+  <string name="send_google_progress_sending_fusion_tables">トラックをFusion Tablesに送信しています...</string>
+  <string name="send_google_progress_creating_fusion_table">新しいFusionテーブルを生成しています...</string>
   <string name="progress_message_import">GPSトラックをインポートしています．若干時間がかかります．</string>
   <string name="progress_message_export">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
   <string name="progress_message_updating_track">トラック統計情報を更新しています...</string>
@@ -88,7 +88,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Android用My Tracksで作成</string>
-  <string name="send_to_google_by_mytracks">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
+  <string name="send_google_by_my_tracks">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="my_map_link">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
@@ -96,10 +96,9 @@ limitations under the License.
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">ポイント</string>
-  <string name="recorded_date">記録日</string>
-  <string name="category">活動タイプ</string>
+  <string name="send_google_recorded">記録日</string>
   <string name="waypoint_category">マーカータイプ</string>
-  <string name="send_google_track_part_format">(パート %d)</string>
+  <string name="send_google_track_part_label">(パート %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">トラックを保存中...</string>
@@ -266,11 +265,11 @@ limitations under the License.
   <string name="mytracks_sky">GPS衛星</string>
 
   <!-- My Maps -->
-  <string name="select_map_message">アカウントからのマップ選択:</string>
+  <string name="my_maps_list_pick_map">アカウントからのマップ選択:</string>
   <string name="create_new_map">新規マップ作成...</string>
-  <string name="map_list_title">Googleマイマップに送信</string>
-  <string name="maps_list_loading">マップをロード中...</string>
-  <string name="maps_list_failed">今回はマップをロードできませんでした!</string>
+  <string name="my_maps_list_title">Googleマイマップに送信</string>
+  <string name="my_maps_list_loading">マップをロード中...</string>
+  <string name="my_maps_list_error">今回はマップをロードできませんでした!</string>
   <string name="open_map">このマップを選択</string>
   <string name="edit_map_details">マップ詳細編集</string>
   <string name="share_track_url">トラック共有</string>
@@ -295,9 +294,9 @@ limitations under the License.
   <string name="share_track_url">トラックの共有</string>
 
   <!-- Visibility -->
-  <string name="public_map">公開</string>
-  <string name="unlisted_map">リストに出さない</string>
-  <string name="mapslist_no_maps_available">まだ地図がありません．</string>
+  <string name="my_maps_list_public_label">公開</string>
+  <string name="my_maps_list_unlisted_label">リストに出さない</string>
+  <string name="my_maps_list_no_maps">まだ地図がありません．</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -388,18 +387,18 @@ limitations under the License.
   <string name="about_privacy">プライバシー:</string>
 
   <!-- Send to Google -->
-  <string name="sendtogoogle_title">送信...</string>
-  <string name="sendtogoogle_google_mymaps">Googleマイマップ</string>
-  <string name="sendtogoogle_send_now">今すぐ送信</string>
-  <string name="sendtogoogle_create_new_map">新規マップ作成</string>
-  <string name="sendtogoogle_pick_existing_map">既存マップ選択</string>
+  <string  name="send_google_title">送信...</string>
+  <string name="send_google_my_maps">Googleマイマップ</string>
+  <string name="send_google_send_now">今すぐ送信</string>
+  <string name="send_google_new_map">新規マップ作成</string>
+  <string name="send_google_existing_map">既存マップ選択</string>
   <string name="sendtogoogle_send_stats">トラック統計情報送信</string>
   <string name="sendtogoogle_send_stats_and_points">統計情報とポイント送信</string>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">アカウントを発見できませんでした．</string>
-  <string name="no_account_found">トラックをアップロードするためのアカウントを発見できませんでした．</string>
-  <string name="choose_account_title">アカウント選択</string>
+  <string name="send_google_no_account">アカウントを発見できませんでした．</string>
+  <string name="send_google_no_account_message">トラックをアップロードするためのアカウントを発見できませんでした．</string>
+  <string name="send_google_choose_account">アカウント選択</string>
 
   <!-- SD card -->
   <string name="io_no_external_storage_found">外部ストレージを発見できませんでした．SDカードが刺さっているか、端末がコンピュータにマウントされていないか確認してください．</string>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index 1091d1da6..07768244a 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -34,8 +34,8 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">Brak menedżera lokalizacji na urządzeniu!</string>
   <string name="gps_not_found">Brak dostawcy lokalizacji GPS na urządzeniu.</string>
-  <string name="error_sending_to_fusion_tables">Podczas przesyłania pliku do Moich Map Google pojawił się błąd. Spróbuj ponownie później.</string>
-  <string name="error_sending_to_docs">Podczas przesyłania pliku do Dokumentów Google pojawił się błąd. Spróbuj ponownie później.</string>
+  <string name="send_google_error_fusion_tables">Podczas przesyłania pliku do Moich Map Google pojawił się błąd. Spróbuj ponownie później.</string>
+  <string name="send_google_error_docs">Podczas przesyłania pliku do Dokumentów Google pojawił się błąd. Spróbuj ponownie później.</string>
   <string name="track_record_error">Nie można rozpocząć rejestrowania. Spróbuj ponownie.</string>
   <string name="error_unable_to_stop_recording">Nie można zakończyć rejestrowania. Spróbuj ponownie.</string>
   <string name="error_import_unable_to_read_file">Nie można czytać z pliku.</string>
@@ -49,10 +49,10 @@ limitations under the License.
   <string name="gps_wait_for_fix">Oczekiwanie na lepsze ustalenie pozycji GPS. Upewnij się, że niebo jest widoczne.</string>
   <string name="track_record_success">Rejestrowanie nowej trasy.</string>
   <string name="status_stopped_recording">Zatrzymano rejestrowanie nowej trasy.</string>
-  <!-- <string name="sending_to_fusion_tables_success">Utworzona nową Mapę Google na maps.google.com.</string> -->
-  <string name="sending_to_my_maps_success_existing_map">Twoja trasa został wysłana do maps.google.com.</string>
-  <string name="sending_to_docs_success_new_doc">Twoja trasa została wysłana do nowego arkusza na docs.google.com.</string>
-  <string name="sending_to_docs_success_existing_doc">Twoja trasa została wysłana do docs.google.com.</string>
+  <!-- <string name="send_google_success_fusion_tables">Utworzona nową Mapę Google na maps.google.com.</string> -->
+  <string name="send_google_success_existing_map">Twoja trasa został wysłana do maps.google.com.</string>
+  <string name="send_google_success_new_doc">Twoja trasa została wysłana do nowego arkusza na docs.google.com.</string>
+  <string name="send_google_success_existing_doc">Twoja trasa została wysłana do docs.google.com.</string>
   <string name="gps_need_to_enable">Tapnij tutaj, aby przejść do ustawień Lokalizacji i zabezpieczeń, a następnie zaznacz Użyj satelitów GPS. Naciśnij klawisz Wstecz, aby powrócić.</string>
   <string name="my_location_approximate_location">Uwaga: używana jest przybliżona lokalizacja ustalona za pomocą stacji komórkowych i sieci WIFI.</string>
   <string name="my_location_no_location">Lokalizacja nie może być obecnie ustalona. Włącz wiecej źródeł (zobacz ustawienia Lokalizacji i zabezpieczeń) i upewnij się, że niebo jest widoczne. Spróbuj później.</string>
@@ -60,15 +60,15 @@ limitations under the License.
   <string name="marker_insert_success">Wstawiono znacznik statystyk.</string>
 
   <!-- Progress dialog -->
-  <string name="progress_title">Proszę czekać...</string>
+  <string name="generic_progress_title">Proszę czekać...</string>
   <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_fusion_tables">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_fusion_tables">Przesyłanie trasy do Map Google...</string> -->
-  <!-- <string name="progress_message_creating_fusion_table">Tworzenie nowej Mojej Mapy...</string> -->
+  <string name="send_google_progress_reading_track">Czytanie trasy...</string>
+  <string name="send_google_progress_preparing_track">Przygotowywanie trasy...</string>
+  <!-- <string name="send_google_progress_auth_fusion_tables">Uwierzytelnianie w Mapach Google...</string> -->
+  <string name="send_google_progress_auth_docs">Uwierzytelnianie w Dokumentach Google...</string>
+  <string name="send_google_progress_sending_docs">Przesyłanie trasy do Dokumentów Google...</string>
+  <!-- <string name="send_google_progress_sending_fusion_tables">Przesyłanie trasy do Map Google...</string> -->
+  <!-- <string name="send_google_progress_creating_fusion_table">Tworzenie nowej Mojej Mapy...</string> -->
   <string name="progress_message_import">Importowanie trasy GPS. Poczekaj chwilę.</string>
   <string name="progress_message_export">Zapisywanie pliku na kartę SD. Poczekaj chwilę.</string>
   <string name="progress_message_updating_track">Aktualizacja statystyk trasy...</string>
@@ -81,14 +81,13 @@ 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="send_to_google_by_mytracks">Utworzona przez &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; na Android.</string>
+  <string name="send_google_by_my_tracks">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>
-  <string name="recorded_date">Zapisana</string>
-  <string name="category">Typ aktywności</string>
+  <string name="send_google_recorded">Zapisana</string>
   <string name="waypoint_category">Typ znacznika</string>
-  <string name="send_google_track_part_format">(Część %d)</string>
+  <string name="send_google_track_part_label">(Część %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">Rejestrowanie twojej trasy...</string>
@@ -240,9 +239,9 @@ limitations under the License.
   <string name="share_track_url">Podziel się trasą z przyjaciółmi</string>
 
   <!-- Visibility -->
-  <string name="public_map">Publiczna</string>
-  <string name="unlisted_map">Niepubliczna</string>
-  <string name="mapslist_no_maps_available">Nie masz jeszcze żadnych map.</string>
+  <string name="my_maps_list_public_label">Publiczna</string>
+  <string name="my_maps_list_unlisted_label">Niepubliczna</string>
+  <string name="my_maps_list_no_maps">Nie masz jeszcze żadnych map.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -336,17 +335,17 @@ limitations under the License.
   <string name="about_support">Wsparcie:</string>
 
   <!-- Send to Google -->
-  <string name="sendtogoogle_title">Wyślij do...</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="send_google_title">Wyślij do...</string>
+  <!-- <string name="send_google_fusion_tables">Moje Mapy Google</string> -->
+  <string name="send_google_docs">Dokumenty Google</string>
+  <string name="send_google_send_now">Wyślij teraz</string>
   <string name="sendtogoogle_send_stats">Wyślij statystyki trasy</string>
   <string name="sendtogoogle_send_stats_and_points">Wyślij statystyki i punkty</string>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Znaleziono nowe konto</string>
-  <string name="no_account_found">Nie znaleziono konta do przesyłu.</string>
-  <string name="choose_account_title">Wybierz konto</string>
+  <string name="send_google_no_account">Znaleziono nowe konto</string>
+  <string name="send_google_no_account_message">Nie znaleziono konta do przesyłu.</string>
+  <string name="send_google_choose_account">Wybierz konto</string>
 
   <!-- SD card -->
   <string name="io_no_external_storage_found">Nie znaleziono zewnętrznej pamięci. Upewniej się, że karta SD jest w telefonie i nie jest podłączona do komputera.</string>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index 26e99a577..67a522070 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -33,8 +33,8 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">Gerenciador de localização não encontrado neste dispositivo!</string>
   <string name="gps_not_found">"Provedor de posição de GPS não encontrado neste dispositivo.</string>
-  <string name="error_sending_to_fusion_tables">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="send_google_error_fusion_tables">Ocorreu um erro ao enviar seu caminho para o Google Fusion Tables. Por favor tente novamente mais tarde.</string>
+  <string name="send_google_error_docs">Ocorreu um erro ao enviar seu caminho para o Google Docs. Por favor tente novamente mais tarde.</string>
   <string name="track_record_error">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_import_unable_to_read_file">Impossível ler do arquivo.</string>
@@ -48,10 +48,10 @@ limitations under the License.
   <string name="gps_wait_for_fix">Esperando por um sinal melhor do GPS.  Assegure-se de que o céu está visível.</string>
   <string name="track_record_success">Gravando um novo caminho.</string>
   <string name="status_stopped_recording">Gravação interrompida.</string>
-  <string name="sending_to_fusion_tables_success">Uma nova Fusion Table Google foi criada em google.com/fusiontables.</string>
-  <string name="sending_to_my_maps_success_existing_map">Seu caminho foi enviado para maps.google.com.</string>
-  <string name="sending_to_docs_success_new_doc">Seu caminho foi enviado para uma nova planilha em docs.google.com.</string>
-  <string name="sending_to_docs_success_existing_doc">Seu caminho foi enviado para docs.google.com.</string>
+  <string name="send_google_success_fusion_tables">Uma nova Fusion Table Google foi criada em google.com/fusiontables.</string>
+  <string name="send_google_success_existing_map">Seu caminho foi enviado para maps.google.com.</string>
+  <string name="send_google_success_new_doc">Seu caminho foi enviado para uma nova planilha em docs.google.com.</string>
+  <string name="send_google_success_existing_doc">Seu caminho foi enviado para docs.google.com.</string>
   <string name="gps_need_to_enable">"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="my_location_approximate_location">Nota: Uma localização aproximada, determinada por torres de telefonia celular, está sendo mostrada.</string>
   <string name="my_location_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>
@@ -59,15 +59,15 @@ limitations under the License.
   <string name="marker_insert_success">Um marcador de estatísticas foi inserido..</string>
 
   <!-- Progress dialog -->
-  <string name="progress_title">Por favor aguarde...</string>
+  <string name="generic_progress_title">Por favor aguarde...</string>
   <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_fusion_tables">Autenticando com o Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_docs">Authenticando com o Google Docs...</string>
-  <string name="progress_message_sending_docs">Enviando caminho para o Google Docs...</string>
-  <string name="progress_message_sending_fusion_tables">Enviando caminho para o Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">Criando nova Fusion Table...</string>
+  <string name="send_google_progress_reading_track">Lendo caminho...</string>
+  <string name="send_google_progress_preparing_track">Preparando caminho...</string>
+  <string name="send_google_progress_auth_fusion_tables">Autenticando com o Google Fusion Tables...</string>
+  <string name="send_google_progress_auth_docs">Authenticando com o Google Docs...</string>
+  <string name="send_google_progress_sending_docs">Enviando caminho para o Google Docs...</string>
+  <string name="send_google_progress_sending_fusion_tables">Enviando caminho para o Google Fusion Tables...</string>
+  <string name="send_google_progress_creating_fusion_table">Criando nova Fusion Table...</string>
   <string name="progress_message_import">Importando um caminho de GPS. Isso pode demorar alguns instantes.</string>
   <string name="progress_message_export">Salvando arquivo para o cartão SD. Isso pode demorar alguns instantes.</string>
   <string name="progress_message_updating_track">Atualizando estatísticas do caminho...</string>
@@ -80,14 +80,13 @@ 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="send_to_google_by_mytracks">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android.</string>
+  <string name="send_google_by_my_tracks">"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="send_google_recorded">Gravado</string>
   <string name="waypoint_category">"Tipo de marcador</string>
-  <string name="send_google_track_part_format">"(Parte %d)</string>
+  <string name="send_google_track_part_label">"(Parte %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">"Gravando seu caminho...</string>
@@ -201,9 +200,9 @@ limitations under the License.
   <string name="share_track_url">Compartilhar caminho com amigos</string>
 
   <!-- Visibility -->
-  <string name="public_map">Público</string>
-  <string name="unlisted_map">Não listado</string>
-  <string name="mapslist_no_maps_available">Você ainda não tem nenhum mapa.</string>
+  <string name="my_maps_list_public_label">Público</string>
+  <string name="my_maps_list_unlisted_label">Não listado</string>
+  <string name="my_maps_list_no_maps">Você ainda não tem nenhum mapa.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -287,16 +286,16 @@ limitations under the License.
   <string name="about_support">Suporte:</string>
 
   <!-- Send to Google -->
-  <string name="sendtogoogle_title">Enviar para...</string>
-  <string name="sendtogoogle_google_docs">Google Docs</string>
-  <string name="sendtogoogle_send_now">Enviar agora</string>
+  <string  name="send_google_title">Enviar para...</string>
+  <string name="send_google_docs">Google Docs</string>
+  <string name="send_google_send_now">Enviar agora</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>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Nenhuma conta encontrada</string>
-  <string name="no_account_found">Não foi encontrada nenhuma conta para a qual trilhas possam ser enviadas.</string>
-  <string name="choose_account_title">Escolher conta</string>
+  <string name="send_google_no_account">Nenhuma conta encontrada</string>
+  <string name="send_google_no_account_message">Não foi encontrada nenhuma conta para a qual trilhas possam ser enviadas.</string>
+  <string name="send_google_choose_account">Escolher conta</string>
 
   <!-- SD card -->
   <string name="io_no_external_storage_found">Nenhum armazenamento externo foi encontrado. Assegure-se de que um cartão SD esteja inserido e que seu telefone não esteja montado em um computador.</string>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index 706a5f13c..cd56efeb1 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -35,9 +35,9 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">На этом устройстве не был обнаружен диспетчер местоположения!</string>
   <string name="gps_not_found">На этом устройстве не был обнаружен поставщик GPS местоположения.</string>
-  <string name="error_sending_to_my_maps">Ошибка при отправке вашего трека в Google \"Мои карты\".</string>
-  <string name="error_sending_to_fusion_tables">Ошибка при отправке вашего трека в Google Fusion Tables.</string>
-  <string name="error_sending_to_docs">Ошибка при отправке вашего трека в Google Документы.</string>
+  <string name="send_google_error_my_maps">Ошибка при отправке вашего трека в Google \"Мои карты\".</string>
+  <string name="send_google_error_fusion_tables">Ошибка при отправке вашего трека в Google Fusion Tables.</string>
+  <string name="send_google_error_docs">Ошибка при отправке вашего трека в Google Документы.</string>
   <string name="error_sending_generic">Пожалуйста, повторите попытку позже.</string>
   <string name="track_record_error">Не удалось начать запись. Попробуйте еще раз.</string>
   <string name="error_unable_to_stop_recording">Не удалось остановить запись. Попробуйте еще раз.</string>
@@ -52,32 +52,32 @@ limitations under the License.
   <string name="gps_wait_for_fix">Ожидание сигнала GPS. Убедитесь в том, что вы находитесь под открытым небом.</string>
   <string name="track_record_success">Записывается новый трек.</string>
   <string name="status_stopped_recording">Запись вашего трека остановлена.</string>
-  <string name="sending_to_my_maps_success_new_map">Новая Google \"Мои карты\" была создана на maps.google.com.</string>
-  <string name="sending_to_fusion_tables_success">Новая таблица Google Fusion была создана на google.com/fusiontables.</string>
-  <string name="sending_to_my_maps_success_existing_map">Твой трек был отправлен на maps.google.com.</string>
-  <string name="sending_to_docs_success_new_doc">Ваш трек был отправлен в новую электронную таблицу на docs.google.com.</string>
-  <string name="sending_to_docs_success_existing_doc">Ваш трек был отправлен в docs.google.com.</string>
-  <string name="sending_to_google_additional_info">Это может занять несколько минут, прежде чем появятся новые треки.</string>
+  <string name="send_google_success_new_map">Новая Google \"Мои карты\" была создана на maps.google.com.</string>
+  <string name="send_google_success_fusion_tables">Новая таблица Google Fusion была создана на google.com/fusiontables.</string>
+  <string name="send_google_success_existing_map">Твой трек был отправлен на maps.google.com.</string>
+  <string name="send_google_success_new_doc">Ваш трек был отправлен в новую электронную таблицу на docs.google.com.</string>
+  <string name="send_google_success_existing_doc">Ваш трек был отправлен в docs.google.com.</string>
+  <string name="send_google_success_footer">Это может занять несколько минут, прежде чем появятся новые треки.</string>
   <string name="gps_need_to_enable">Пожалуйста, нажмите здесь для перехода к разделу настроек Координаты и отметьте пункт \"Спутники GPS\". Для возвращения нажмите кнопку Назад.</string>
   <string name="my_location_approximate_location">Примечание: приблизительное местоположение определено относительно вышек сотовой связи и беспроводных сетей.</string>
   <string name="my_location_no_location">В настоящее время местоположение не может быть определено. Включите больше источников местоположение (см. раздел настроек Координаты) и убедитесь в том, что находитесь под открытым небом. Повторите попытку позднее.</string>
   <string name="status_waypoint_inserted">Маркер путевой точки был вставлен.</string>
   <string name="marker_insert_success">Маркер статистики был вставлен.</string>
-  <string name="sending_to_google_upload_status">Статус загрузки:</string>
+  <string name="send_google_result_title">Статус загрузки:</string>
 
   <!-- Progress dialog -->
-  <string name="progress_title">Пожалуйста, подождите...</string>
+  <string name="generic_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_fusion_tables">Аутентификация на Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_my_maps">Аутентификация на Google Карты...</string>
-  <string name="progress_message_authenticating_docs">Аутентификация в Google Документы...</string>
-  <string name="progress_message_sending_docs">Отправка трека в Google Документы...</string>
-  <string name="progress_message_sending_my_maps">Отправка трека в Google Карты...</string>
-  <string name="progress_message_creating_map">Создание новой \"Моей карты\" ...</string>
-  <string name="progress_message_sending_fusion_tables">Отправка трека в Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">Создание новой Fusion table...</string>
+  <string name="send_google_progress_reading_track">Чтение трека...</string>
+  <string name="send_google_progress_preparing_track">Подготовка трека...</string>
+  <string name="send_google_progress_auth_fusion_tables">Аутентификация на Google Fusion Tables...</string>
+  <string name="send_google_progress_auth_my_maps">Аутентификация на Google Карты...</string>
+  <string name="send_google_progress_auth_docs">Аутентификация в Google Документы...</string>
+  <string name="send_google_progress_sending_docs">Отправка трека в Google Документы...</string>
+  <string name="send_google_progress_sending_my_maps">Отправка трека в Google Карты...</string>
+  <string name="send_google_progress_creating_map">Создание новой \"Моей карты\" ...</string>
+  <string name="send_google_progress_sending_fusion_tables">Отправка трека в Fusion Tables...</string>
+  <string name="send_google_progress_creating_fusion_table">Создание новой Fusion table...</string>
   <string name="progress_message_import">Импорт GPS трека. Это может занять некоторое время.</string>
   <string name="progress_message_export">Запись файла на SD карту. Это может занять некоторое время.</string>
   <string name="progress_message_updating_track">Обновление статистики трека...</string>
@@ -90,7 +90,7 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Создано My Tracks на Android.</string>
-  <string name="send_to_google_by_mytracks">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
+  <string name="send_google_by_my_tracks">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="my_map_link">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
@@ -98,10 +98,9 @@ limitations under the License.
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Точки</string>
-  <string name="recorded_date">Записан</string>
-  <string name="category">Тип деятельности</string>
+  <string name="send_google_recorded">Записан</string>
   <string name="waypoint_category">Тип маркера</string>
-  <string name="send_google_track_part_format">(Часть %d)</string>
+  <string name="send_google_track_part_label">(Часть %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">Запись трека...</string>
@@ -275,11 +274,11 @@ limitations under the License.
   <string name="mytracks_sky">Спутники GPS</string>
 
   <!-- My Maps -->
-  <string name="select_map_message">Выберите карту из вашей учетной записи:</string>
+  <string name="my_maps_list_pick_map">Выберите карту из вашей учетной записи:</string>
   <string name="create_new_map">Создать новую карту...</string>
-  <string name="map_list_title">Отправить в Google \"Мои карты\"</string>
-  <string name="maps_list_loading">Загрузка карты ...</string>
-  <string name="maps_list_failed">Ваши карты не могут быть загружены в данный момент!</string>
+  <string name="my_maps_list_title">Отправить в Google \"Мои карты\"</string>
+  <string name="my_maps_list_loading">Загрузка карты ...</string>
+  <string name="my_maps_list_error">Ваши карты не могут быть загружены в данный момент!</string>
   <string name="open_map">Выберите эту карту</string>
   <string name="edit_map_details">Править детали карты</string>
   <string name="share_track_url">Поделиться треком</string>
@@ -303,9 +302,9 @@ limitations under the License.
 Просмотреть трек можно с помощью Google Планета Земля или другого программного обоспечения для карт.</string>
 
   <!-- Visibility -->
-  <string name="public_map">Общественные</string>
-  <string name="unlisted_map">Частные</string>
-  <string name="mapslist_no_maps_available">У вас пока еще нет карт.</string>
+  <string name="my_maps_list_public_label">Общественные</string>
+  <string name="my_maps_list_unlisted_label">Частные</string>
+  <string name="my_maps_list_no_maps">У вас пока еще нет карт.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -411,20 +410,20 @@ limitations under the License.
   <string name="about_privacy">Приватность:</string>
 
   <!-- Send to Google -->
-  <string name="sendtogoogle_title">Отправить...</string>
-  <string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string>
-  <string name="sendtogoogle_google_mymaps">Google \"Мои карты\"</string>
-  <string name="sendtogoogle_google_docs">Google Документы</string>
-  <string name="sendtogoogle_send_now">Отправить</string>
-  <string name="sendtogoogle_create_new_map">Создать новую карту</string>
-  <string name="sendtogoogle_pick_existing_map">Выбрать существующую карту</string>
+  <string  name="send_google_title">Отправить...</string>
+  <string name="send_google_fusion_tables">Google Fusion Tables</string>
+  <string name="send_google_my_maps">Google \"Мои карты\"</string>
+  <string name="send_google_docs">Google Документы</string>
+  <string name="send_google_send_now">Отправить</string>
+  <string name="send_google_new_map">Создать новую карту</string>
+  <string name="send_google_existing_map">Выбрать существующую карту</string>
   <string name="sendtogoogle_send_stats">Отправить статистику трека</string>
   <string name="sendtogoogle_send_stats_and_points">Отправить статистику и точки</string>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Учетная запись не найдена</string>
-  <string name="no_account_found">Не найдена учетная запись для загрузки треков.</string>
-  <string name="choose_account_title">Выбор учетной записи</string>
+  <string name="send_google_no_account">Учетная запись не найдена</string>
+  <string name="send_google_no_account_message">Не найдена учетная запись для загрузки треков.</string>
+  <string name="send_google_choose_account">Выбор учетной записи</string>
 
   <!-- SD card -->
   <string name="io_no_external_storage_found">Не обнаружено внешнее устройство хранения данных. Убедитесь, что SD карта вставлена, и что ваш телефон не подключен к компьютеру.</string>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index de620cad9..63540543d 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -34,8 +34,8 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">Ingen platshanterare hittades på denna enhet!</string>
   <string name="gps_not_found">Ingen GPS-positioneringstjänst hittades på denna enhet.</string>
-  <string name="error_sending_to_fusion_tables">Det uppstod ett fel i sändningen av ditt spår till Google Fusion Tables. Försök igen senare.</string>
-  <string name="error_sending_to_docs">Det uppstod ett fel i sändningen av ditt spår till Google Dokument. Försök igen senare.</string>
+  <string name="send_google_error_fusion_tables">Det uppstod ett fel i sändningen av ditt spår till Google Fusion Tables. Försök igen senare.</string>
+  <string name="send_google_error_docs">Det uppstod ett fel i sändningen av ditt spår till Google Dokument. Försök igen senare.</string>
   <string name="track_record_error">Kan inte starta inspelningen. Försök igen.</string>
   <string name="error_unable_to_stop_recording">Kan inte stoppa inspelningen. Försök igen.</string>
   <string name="error_import_unable_to_read_file">Kan inte läsa från fil.</string>
@@ -49,10 +49,10 @@ limitations under the License.
   <string name="gps_wait_for_fix">Väntar på bättre GPS-position. Se till att himlen är synlig.</string>
   <string name="track_record_success">Spelar nu in ett nytt spår.</string>
   <string name="status_stopped_recording">Stoppade inspelning av ditt spår.</string>
-  <!-- <string name="sending_to_fusion_tables_success">En ny Google Mina Kartor har skapats på maps.google.com.</string> -->
-  <string name="sending_to_my_maps_success_existing_map">Ditt spår har skickats till maps.google.com.</string>
-  <string name="sending_to_docs_success_new_doc">Ditt spår har skickats till ett nytt kalkylblad på docs.google.com.</string>
-  <string name="sending_to_docs_success_existing_doc">Ditt spår har skickats till docs.google.com.</string>
+  <!-- <string name="send_google_success_fusion_tables">En ny Google Mina Kartor har skapats på maps.google.com.</string> -->
+  <string name="send_google_success_existing_map">Ditt spår har skickats till maps.google.com.</string>
+  <string name="send_google_success_new_doc">Ditt spår har skickats till ett nytt kalkylblad på docs.google.com.</string>
+  <string name="send_google_success_existing_doc">Ditt spår har skickats till docs.google.com.</string>
   <string name="gps_need_to_enable">Klicka här för att gå till Säkerhet och Platsinställningar och kryssa i \'aktivera gps-satteliter\'. Tryck på tillbakaknappen för att återgå.</string>
   <string name="my_location_approximate_location">OBS: En ungefärlig position som avgörs från mobilmaster och WIFI-nät visas.</string>
   <string name="my_location_no_location">En position kan för närvarande inte fastställas. Aktivera mer platskällor (se Säkerhet och Platsinställningar) och se till att himlen är synlig. Försök igen senare.</string>
@@ -60,15 +60,15 @@ limitations under the License.
   <string name="marker_insert_success">En statistikmarkör har lagts in.</string>
 
   <!-- Progress dialog -->
-  <string name="progress_title">Var god vänta...</string>
+  <string name="generic_progress_title">Var god vänta...</string>
   <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_fusion_tables">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_fusion_tables">Skickar spår till Google Kartor...</string> -->
-  <!-- <string name="progress_message_creating_fusion_table">Skapar en ny Min Karta...</string> -->
+  <string name="send_google_progress_reading_track">Läser spår...</string>
+  <string name="send_google_progress_preparing_track">Förbereder spår...</string>
+  <!-- <string name="send_google_progress_auth_fusion_tables">Autentiserar till Google Kartor...</string> -->
+  <string name="send_google_progress_auth_docs">Autentiserar till Google Dokument...</string>
+  <string name="send_google_progress_sending_docs">Skickar spår till Google Dokument...</string>
+  <!-- <string name="send_google_progress_sending_fusion_tables">Skickar spår till Google Kartor...</string> -->
+  <!-- <string name="send_google_progress_creating_fusion_table">Skapar en ny Min Karta...</string> -->
   <string name="progress_message_import">Importerar ett GPS-spår. Detta kan ta en stund.</string>
   <string name="progress_message_export">Skriver till SD-kortet. Detta kan ta en stund.</string>
   <string name="progress_message_updating_track">Uppdaterar spårstatistik...</string>
@@ -81,14 +81,13 @@ 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="send_to_google_by_mytracks">Skapad av &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; på Android.</string>
+  <string name="send_google_by_my_tracks">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>
-  <string name="recorded_date">Inspelad</string>
-  <string name="category">Aktivitetstyp</string>
+  <string name="send_google_recorded">Inspelad</string>
   <string name="waypoint_category">Markörtyp</string>
-  <string name="send_google_track_part_format">(Del %d)</string>
+  <string name="send_google_track_part_label">(Del %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">Spelar in ditt spår...</string>
@@ -215,9 +214,9 @@ limitations under the License.
   <string name="share_track_url">Dela spår med vänner</string>
 
   <!-- Visibility -->
-  <string name="public_map">Publik</string>
-  <string name="unlisted_map">Olistat</string>
-  <string name="mapslist_no_maps_available">Du har inga kartor än.</string>
+  <string name="my_maps_list_public_label">Publik</string>
+  <string name="my_maps_list_unlisted_label">Olistat</string>
+  <string name="my_maps_list_no_maps">Du har inga kartor än.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -311,17 +310,17 @@ limitations under the License.
   <string name="about_support">Support:</string>
 
   <!-- Send to Google -->
-  <string name="sendtogoogle_title">Skicka till...</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="send_google_title">Skicka till...</string>
+  <!--<string name="send_google_fusion_tables">Google Mina Kartor</string>-->
+  <string name="send_google_docs">Google Dokument</string>
+  <string name="send_google_send_now">Skicka nu</string>
   <string name="sendtogoogle_send_stats">Skicka spårstatistik</string>
   <string name="sendtogoogle_send_stats_and_points">Skicka statistik och punkter</string>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Inget konto hittades</string>
-  <string name="no_account_found">Inget konto hittades att ladda upp spåret till.</string>
-  <string name="choose_account_title">Välj konto</string>
+  <string name="send_google_no_account">Inget konto hittades</string>
+  <string name="send_google_no_account_message">Inget konto hittades att ladda upp spåret till.</string>
+  <string name="send_google_choose_account">Välj konto</string>
 
   <!-- SD card -->
   <string name="io_no_external_storage_found">Ingen extern lagring hittades. Se till att ett SD-kort sitter i och att telefonen inte är monterad till en dator.</string>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index b6ea0ca8c..adf00d8a0 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -35,9 +35,9 @@ limitations under the License.
   <!-- Error messages -->
   <string name="error_no_location_manager">此设备上没有位置管理器!</string>
   <string name="gps_not_found">此设备上没有 GPS 定位装置.</string>
-  <string name="error_sending_to_my_maps">发送轨迹到 Google My Map 时发生错误.</string>
-  <string name="error_sending_to_fusion_tables">发送轨迹到 Google Fusion Tables 时发生错误. 请稍后重试.</string>
-  <string name="error_sending_to_docs">发送轨迹到 Google Docs 时发生错误. 请稍后重试.</string>
+  <string name="send_google_error_my_maps">发送轨迹到 Google My Map 时发生错误.</string>
+  <string name="send_google_error_fusion_tables">发送轨迹到 Google Fusion Tables 时发生错误. 请稍后重试.</string>
+  <string name="send_google_error_docs">发送轨迹到 Google Docs 时发生错误. 请稍后重试.</string>
   <string name="error_sending_generic">请稍后再试.</string>
   <string name="track_record_error">无法开始记录. 请重试.</string>
   <string name="error_unable_to_stop_recording">无法停止记录. 请重试.</string>
@@ -53,32 +53,32 @@ limitations under the License.
   <string name="gps_wait_for_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
   <string name="track_record_success">现在开始记录新的轨迹.</string>
   <string name="status_stopped_recording">停止记录你的轨迹.</string>
-  <string name="sending_to_my_maps_success_new_map">已在 maps.google.com 创建了新的 Google My Map.</string>
-  <string name="sending_to_fusion_tables_success">已在 google.com/fusiontables 创建新 Google Fusion Table.</string>
-  <string name="sending_to_my_maps_success_existing_map">你的轨迹已经发送到 maps.google.com.</string>
-  <string name="sending_to_docs_success_new_doc">你的轨迹已经作为新的电子表格发送到 docs.google.com.</string>
-  <string name="sending_to_docs_success_existing_doc">你的轨迹已经发送到 docs.google.com.</string>
-  <string name="sending_to_google_additional_info">可能需要等待几分钟才能看见新的轨迹.</string>
+  <string name="send_google_success_new_map">已在 maps.google.com 创建了新的 Google My Map.</string>
+  <string name="send_google_success_fusion_tables">已在 google.com/fusiontables 创建新 Google Fusion Table.</string>
+  <string name="send_google_success_existing_map">你的轨迹已经发送到 maps.google.com.</string>
+  <string name="send_google_success_new_doc">你的轨迹已经作为新的电子表格发送到 docs.google.com.</string>
+  <string name="send_google_success_existing_doc">你的轨迹已经发送到 docs.google.com.</string>
+  <string name="send_google_success_footer">可能需要等待几分钟才能看见新的轨迹.</string>
   <string name="gps_need_to_enable">请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回.</string>
   <string name="my_location_approximate_location">注意: 当前显示的位置是根据无线信号和无线网络计算的近似位置.</string>
   <string name="my_location_no_location">目前无法定位. 请启用更多的位置来源 (在\'安全和位置设置\'中) 并确认天空是可见的. 再重试.</string>
   <string name="status_waypoint_inserted">插入了一个路点标记.</string>
   <string name="marker_insert_success">插入了一个统计标记.</string>
-  <string name="sending_to_google_upload_status">上传状态:</string>
+  <string name="send_google_result_title">上传状态:</string>
 
   <!-- Progress dialog -->
-  <string name="progress_title">请稍候...</string>
+  <string name="generic_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_fusion_tables">登录 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_fusion_tables">发送轨迹到 Google Fusion Tables 中...</string>
-  <string name="progress_message_creating_fusion_table">创建新的 Fusion Table 中...</string>
-  <string name="progress_message_creating_map">创建新的 My Map...</string>
-  <string name="progress_message_sending_fusion_tables">发送轨迹到 Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">创建新的 Fusion table...</string>
+  <string name="send_google_progress_reading_track">读取轨迹中...</string>
+  <string name="send_google_progress_preparing_track">准备轨迹中...</string>
+  <string name="send_google_progress_auth_fusion_tables">登录 Google Fusion Tables 中...</string>
+  <string name="send_google_progress_auth_docs">登录 Google Docs 中...</string>
+  <string name="send_google_progress_sending_docs">发送轨迹到 Google Docs 中...</string>
+  <string name="send_google_progress_sending_fusion_tables">发送轨迹到 Google Fusion Tables 中...</string>
+  <string name="send_google_progress_creating_fusion_table">创建新的 Fusion Table 中...</string>
+  <string name="send_google_progress_creating_map">创建新的 My Map...</string>
+  <string name="send_google_progress_sending_fusion_tables">发送轨迹到 Fusion Tables...</string>
+  <string name="send_google_progress_creating_fusion_table">创建新的 Fusion table...</string>
   <string name="progress_message_import">导入 GPS 轨迹中. 请稍候.</string>
   <string name="progress_message_export">写入文件到 SD 卡中. 请稍候.</string>
   <string name="progress_message_updating_track">更新轨迹统计信息中...</string>
@@ -91,18 +91,17 @@ limitations under the License.
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">由 Android 平台的 My Tracks 创建.</string>
-  <string name="send_to_google_by_mytracks">由 Android 平台的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
+  <string name="send_google_by_my_tracks">由 Android 平台的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
-  <string name="send_to_google_by_mytracks">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
+  <string name="send_google_by_my_tracks">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
   <string name="new_map_title">新地图</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">路点</string>
-  <string name="recorded_date">记录日期</string>
-  <string name="category">活动类型</string>
+  <string name="send_google_recorded">记录日期</string>
   <string name="waypoint_category">标记类型</string>
-  <string name="send_google_track_part_format">(第 %d 部分)</string>
+  <string name="send_google_track_part_label">(第 %d 部分)</string>
 
   <!-- Used by the track recording service -->
   <string name="track_record_notification">记录轨迹中...</string>
@@ -276,11 +275,11 @@ limitations under the License.
   <string name="mytracks_sky">GPS 卫星</string>
 
   <!-- My Maps -->
-  <string name="select_map_message">从你的帐号中选择一个地图:</string>
+  <string name="my_maps_list_pick_map">从你的帐号中选择一个地图:</string>
   <string name="create_new_map">创建新地图...</string>
-  <string name="map_list_title">发送到 Google My Maps</string>
-  <string name="maps_list_loading">载入地图中...</string>
-  <string name="maps_list_failed">现在无法载入你的地图!</string>
+  <string name="my_maps_list_title">发送到 Google My Maps</string>
+  <string name="my_maps_list_loading">载入地图中...</string>
+  <string name="my_maps_list_error">现在无法载入你的地图!</string>
   <string name="open_map">选择此地图</string>
   <string name="edit_map_details">编辑地图详细信息</string>
   <string name="share_track_url">分享轨迹</string>
@@ -304,9 +303,9 @@ limitations under the License.
     请用 Google Earth 或其它地图软件查看此轨迹.</string>
 
   <!-- Visibility -->
-  <string name="public_map">公开</string>
-  <string name="unlisted_map">未公布</string>
-  <string name="mapslist_no_maps_available">你还没有保存任何地图.</string>
+  <string name="my_maps_list_public_label">公开</string>
+  <string name="my_maps_list_unlisted_label">未公布</string>
+  <string name="my_maps_list_no_maps">你还没有保存任何地图.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -396,17 +395,17 @@ limitations under the License.
   <string name="about_privacy">隐私策略:</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="send_google_title">发送到...</string>
+  <string name="send_google_send_now">立即发送</string>
+  <string name="send_google_new_map">创建新地图</string>
+  <string name="send_google_existing_map">选择已有地图</string>
   <string name="sendtogoogle_send_stats">发送轨迹统计信息</string>
   <string name="sendtogoogle_send_stats_and_points">发送统计信息和路点</string>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">没有帐户</string>
-  <string name="no_account_found">没有可用于上传轨迹的帐户.</string>
-  <string name="choose_account_title">选择帐户</string>
+  <string name="send_google_no_account">没有帐户</string>
+  <string name="send_google_no_account_message">没有可用于上传轨迹的帐户.</string>
+  <string name="send_google_choose_account">选择帐户</string>
 
   <!-- SD card -->
   <string name="io_no_external_storage_found">没有发现存储设备. 请确认插入了 SD 存储卡并且你的手机没有将挂载 SD 卡到电脑.</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 8080fa0bc..aa54999cf 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -79,7 +79,14 @@ limitations under the License.
       or decline.">
     End User License Agreement
   </string>
-    
+  
+  <!-- Generic -->
+  <string name="generic_progress_title"
+    translation_description="When displaying a progress dialog, the title on the dialog asking the
+      user to wait.">
+    Please wait...
+  </string>
+      
   <!-- GPS -->
   <string name="gps_need_to_enable"
     translation_description="In the main view, the message on the top asking the user to enable
@@ -250,6 +257,43 @@ limitations under the License.
     \'Location &amp; security\' settings) and make sure the sky is visible. Try again later.
   </string>
   
+  <!-- My Maps List -->
+  <string name="my_maps_list_error"
+     translation_description="When sending a track to an existing Google My Map, the text on the 
+       'My Maps' list page informing the user that his maps cannot be loaded at this time.">
+    Your maps could not be loaded at this time.
+  </string>
+  <string name="my_maps_list_loading"
+    translation_description="When sending a track to an existing Google My Map, the progress dialog
+      message informing the user that his maps are being loaded.">
+    Loading maps...
+  </string>
+  <string name="my_maps_list_no_maps"
+    translation_description="When sending a track to an existing Google My Map, the text on the
+      'My Maps' list page informing the user that he doesn't have any maps."> 
+    You don\'t have any maps.
+  </string>  
+  <string name="my_maps_list_pick_map"
+    translation_description="When sending a track to an existing Google My Map, the text on the
+      'My Maps' list page asking the user to pick one of his maps.">
+    Pick a map:
+  </string>
+  <string name="my_maps_list_public_label"
+    translation_description="When sending a track to an existing Google My Map, in the 'My Maps'
+      list page, the label next to the maps that are public, as opposed to being unlisted.">
+    Public
+  </string>        
+  <string name="my_maps_list_title"
+    translation_description="When sending a track to an existing Google My Map, the title of the
+      page listing the user's maps in Google My Maps.">
+    Your Google My Maps
+  </string>
+  <string name="my_maps_list_unlisted_label"
+    translation_description="When sending a track to an existing Google My Map, in the 'My Maps'
+      list page, the label next to the maps that are unlisted, as opposed to being public.">
+    Unlisted
+  </string>
+      
   <!-- Permission - not seen inside the app -->
   <string name="permission_notification_description"
     translation_description="When installing a third-party app that wants to receive My Tracks 
@@ -299,13 +343,179 @@ limitations under the License.
     Preferred Units
   </string>
   
-  <!-- Send Google -->    
-  <string name="send_google_track_part_format"
-    translation_description="When sending a track to Google, the string format to name segments
-      when splitting a large track. E.g., '(Part 1)'.">
+  <!-- Send Google -->
+  <string name="send_google_by_my_tracks"
+    translation_description="When sending a track to Google, a note indicating it is created by
+      My Tracks on Android, with the 'My Tracks' word containng a http link to
+      http://mytracks.appspot.com.">
+    Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.
+  </string>
+  <string name="send_google_choose_account"
+    translation_description="When sending to Google, the dialog title to choose a Google account.">
+    Choose Account
+  </string>
+  <string name="send_google_docs"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
+      checkbox option to send to Google Docs.">
+    Google Docs
+  </string>
+  <string name="send_google_existing_map"
+    translation_description="When sending a track to Google My Maps, the radio option to use an
+      existing map as opposed to create a new map.">
+    Use an existing map
+  </string>
+  <string name="send_google_fusion_tables"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
+      checkbox option to send to Google Fusion Tables.">
+    Google Fusion Tables
+  </string>  
+  <string name="send_google_error"
+    translation_description="When sending a track to Google, a message indicating that an error has
+      occurred and ask the user to try again.">
+    An error occurred. Please try again.
+  </string>
+  <string name="send_google_error_docs"
+    translation_description="When sending a track to Google Docs, a message indicating that an error
+      has occurred.">
+    There was an error while sending your track to Google Docs.
+  </string>  
+  <string name="send_google_error_fusion_tables"
+    translation_description="When sending a track to Google Fusion Table, a message indicating that
+      an error has occurred.">
+    There was an error while sending your track to Google Fusion Tables.
+  </string>  
+  <string name="send_google_error_my_maps"
+    translation_description="When sending a track to Google My Maps, a message indicating that an
+      error has occured.">
+    There was an error while sending your track to Google My Maps.
+  </string>
+  <string name="send_google_my_maps"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
+      checkbox option to send to Google My Maps.">
+    Google My Maps
+  </string>
+  <string name="send_google_new_map"
+    translation_description="When sending a track to Google My Maps, the radio option to create a
+      new map as opposed to use an existing map.">
+    Create a new map
+  </string>
+  <string name="send_google_no_account"
+    translation_description="When sending to Google, the dialog title when no Google account is
+      found.">
+    No Account Found
+  </string>
+  <string name="send_google_no_account_message"
+    translation_description="When sending to Google, the dialog message when no Google account is
+      found.">
+    No account found to upload tracks to.
+  </string>
+  <string name="send_google_progress_auth_docs"
+    translation_description="When sending a track to Google Docs, the messsage on the progress
+      dialog indicating authenticating to Google Docs.">
+    Authenticating to Google Docs...
+  </string>   
+  <string name="send_google_progress_auth_fusion_tables"
+    translation_description="When sending a track to Google Fusion Tables, the messsage on the
+      progress dialog indicating authenticating to Google Fusion Tables.">
+    Authenticating to Google Fusion Tables...
+  </string>
+  <string name="send_google_progress_auth_my_maps"
+    translation_description="When sending a track to Google My Maps, the messsage on the progress
+      dialog indicating authenticating to Google My Maps.">
+    Authenticating to Google My Maps...
+  </string>
+  <string name="send_google_progress_creating_fusion_table"
+    translation_description="When sending a track to Google Fusion Tables, the messsage on the
+      progress dialog indicating My Tracks is creating a new Fusion Table in Google Fusion Tables.">
+    Creating a new Fusion Table...
+  </string>  
+  <string name="send_google_progress_creating_map"
+    translation_description="When sending a track to Google My Maps, the messsage on the progress
+      dialog indicating My Tracks is creating a new map in Google My Maps.">
+    Creating a new My Map...
+  </string>
+  <string name="send_google_progress_preparing_track"
+    translation_description="When sending a track to Google My Maps, the message on the progress
+      dialog indicating My Tracks is preparing the track's data for upload.">
+    Preparing track...
+  </string>    
+  <string name="send_google_progress_reading_track"
+    translation_description="When sending a track to Google, the message on the progress dialog
+      indicating My Tracks is reading the track from its database.">
+    Reading track...
+  </string>  
+  <string name="send_google_progress_sending_docs"
+    translation_description="When sending a track to Google Docs, the message on the progress dialog
+      indicating My Tracks is sending the track data.">
+    Sending a track to Google Docs...
+  </string>  
+  <string name="send_google_progress_sending_fusion_tables"
+    translation_description="When sending a track to Google Fusion Tables, the message on the
+      progress dialog indicating My Tracks is sending the track data.">
+    Sending a track to Google Fusion Tables...
+  </string>
+  <string name="send_google_progress_sending_my_maps"
+    translation_description="When sending a track to Google My Maps, the message on the progress
+      dialog indicating My Tracks is sending the track data.">
+    Sending a track to Google My Maps...
+  </string>
+  <string name="send_google_recorded"
+    translation_description="When sending a track to Google, in the track description, a tag
+      for the track recorded date. E.g., 'Recorded: Tue Sep 06 15:08:30 PDT 2011'.">        
+    Recorded
+  </string>
+  <string name="send_google_result_title"
+    translation_description="When sending a track to Google, the header on the top of the result
+      page.">
+    Upload status:
+  </string>
+  <string name="send_google_send_now"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
+      button on the bottom to send the track to the selected Google services.">
+    Send now
+  </string>   
+  <string name="send_google_success_existing_doc"
+    translation_description="When sending a track to Google Docs, the message on the result page
+      indicating that the track is sent to an existing spreadsheet.">      
+    Your track has been sent to docs.google.com.
+  </string> 
+  <string name="send_google_success_existing_map"
+    translation_description="When sending a track to Google My Maps, the message on the result page
+      indicating that the track is sent to an existing map.">
+    Your track has been sent to maps.google.com.
+  </string>  
+  <string name="send_google_success_footer"
+    translation_description="When sending a track to Google, the additional comment on the bottom of
+      the result page.">
+    It may take a few minutes before new tracks appear.
+  </string>
+  <string name="send_google_success_fusion_tables"
+    translation_description="When sending a track to Google Fusion Tables, the message on the result
+      page indicating success.">
+    A new Google Fusion table has been created at google.com/fusiontables.
+  </string>  
+  <string name="send_google_success_new_doc"
+    translation_description="When sending a track to Google Docs, the message on the result page
+      indicating that a new spreadsheet is created.">
+    A new spreadsheet is created at docs.google.com.
+  </string>
+  <string name="send_google_success_new_map"
+    translation_description="When sending a track to Google My Maps, the message on the result page
+      indicating that a new map is created.">
+    A new Google My Map has been created at maps.google.com.
+  </string>
+  <string name="send_google_title"
+    translation_description="When sending a track to Google, the dialog title to choose the Google
+      services to send the track to. The user can choose Google My Maps, Google Fusion
+      Tables, and Google Docs.">
+    Send to...
+  </string>
+  <string name="send_google_track_part_label"
+    translation_description="When sending a track to Google, the label to name segments when
+      splitting a large track. E.g., '(Part 1)'.">
     (Part %d)
   </string>
-  
+      
   <!--  Sensor State -->
   <string name="sensor_state_battery"
     translation_description="In the 'Sensor State' page, the label for the battery level on the bike
@@ -1176,28 +1386,6 @@ limitations under the License.
     Welcome
   </string>
       
-  <!-- Error messages when sending to Google. -->
-  <string name="error_sending_to_google"
-    translation_description="When sending a track to Google, a message indicating that an error has
-      occurred and ask the user to try again.">
-    An error occurred. Please try again.
-  </string>
-  <string name="error_sending_to_my_maps"
-    translation_description="When sending a track to Google My Maps, a message indicating that an
-      error has occured.">
-    There was an error while sending your track to Google My Maps.
-  </string>
-  <string name="error_sending_to_fusion_tables"
-    translation_description="When sending a track to Google Fusion Table, a message indicating that
-      an error has occurred.">
-    There was an error while sending your track to Google Fusion Tables.
-  </string>
-  <string name="error_sending_to_docs"
-    translation_description="When sending a track to Google Docs, a message indicating that an error
-      has occurred.">
-    There was an error while sending your track to Google Docs.
-  </string>  
-
   <!--  Error messages when exporting a track. -->
   <string name="error_export_generic"
     translation_description="When exporting a track to the SD card, a generic error message
@@ -1209,102 +1397,6 @@ limitations under the License.
       export operation was canceled.">
     The operation was canceled.
   </string>
-
-  <!-- Sending to Google status messages. -->
-  <string name="sending_to_google_upload_status"
-    translation_description="When sending a track to Google, the header on the top of the result
-      page.">
-    Upload status:
-  </string>
-  <string name="sending_to_google_additional_info"
-    translation_description="When sending a track to Google, the additional comment on the bottom of
-      the result page.">
-    It may take a few minutes before new tracks appear.
-  </string>
-  <string name="sending_to_my_maps_success_new_map"
-    translation_description="When sending a track to Google My Maps, the message on the result page
-      indicating that a new map is created.">
-    A new Google My Map has been created at maps.google.com.
-  </string>
-  <string name="sending_to_my_maps_success_existing_map"
-    translation_description="When sending a track to Google My Maps, the message on the result page
-      indicating that the track is sent to an existing map.">
-    Your track has been sent to maps.google.com.
-  </string>
-  <string name="sending_to_fusion_tables_success"
-    translation_description="When sending a track to Google Fusion Tables, the message on the result
-      page indicating success.">
-    A new Google Fusion table has been created at google.com/fusiontables.
-  </string>  
-  <string name="sending_to_docs_success_new_doc"
-    translation_description="When sending a track to Google Docs, the message on the result page
-      indicating that a new spreadsheet is created.">
-    A new spreadsheet is created at docs.google.com.
-  </string>
-  <string name="sending_to_docs_success_existing_doc"
-    translation_description="When sending a track to Google Docs, the message on the result page
-      indicating that the track is sent to an existing spreadsheet.">      
-    Your track has been sent to docs.google.com.
-  </string>
-
-  <!-- Progress dialog title -->
-  <string name="progress_title"
-    translation_description="When displaying a progress dialog, the title on the dialog asking the
-      user to wait.">
-    Please wait...
-  </string>
-  
-  <!-- Progress dialog messages when sending to Google. -->
-  <string name="progress_message_authenticating_my_maps"
-    translation_description="When sending a track to Google My Maps, the messsage on the progress
-      dialog indicating authenticating to Google My Maps.">
-    Authenticating to Google My Maps...
-  </string>
-  <string name="progress_message_authenticating_fusion_tables"
-    translation_description="When sending a track to Google Fusion Tables, the messsage on the
-      progress dialog indicating authenticating to Google Fusion Tables.">
-    Authenticating to Google Fusion Tables...
-  </string>
-  <string name="progress_message_authenticating_docs"
-    translation_description="When sending a track to Google Docs, the messsage on the progress
-      dialog indicating authenticating to Google Docs.">
-    Authenticating to Google Docs...
-  </string>    
-  <string name="progress_message_reading_track"
-    translation_description="When sending a track to Google, the message on the progress dialog
-      indicating My Tracks is reading the track from its database.">
-    Reading track...
-  </string>  
-  <string name="progress_message_preparing_track"
-    translation_description="When sending a track to Google My Maps, the message on the progress
-      dialog indicating My Tracks is preparing the track's data for upload.">
-    Preparing track...
-  </string> 
-  <string name="progress_message_creating_map"
-    translation_description="When sending a track to Google My Maps, the messsage on the progress
-      dialog indicating My Tracks is creating a new map in Google My Maps.">
-    Creating a new My Map...
-  </string>
-  <string name="progress_message_creating_fusion_table"
-    translation_description="When sending a track to Google Fusion Tables, the messsage on the
-      progress dialog indicating My Tracks is creating a new Fusion Table in Google Fusion Tables.">
-    Creating a new Fusion Table...
-  </string>  
-  <string name="progress_message_sending_my_maps"
-    translation_description="When sending a track to Google My Maps, the message on the progress
-      dialog indicating My Tracks is sending the track data.">
-    Sending a track to Google My Maps...
-  </string>
-  <string name="progress_message_sending_fusion_tables"
-    translation_description="When sending a track to Google Fusion Tables, the message on the
-      progress dialog indicating My Tracks is sending the track data.">
-    Sending a track to Google Fusion Tables...
-  </string>
-  <string name="progress_message_sending_docs"
-    translation_description="When sending a track to Google Docs, the message on the progress dialog
-      indicating My Tracks is sending the track data.">
-    Sending a track to Google Docs...
-  </string>
   
   <!-- Export progress messages. -->
   <string name="progress_message_export"
@@ -1335,27 +1427,6 @@ limitations under the License.
       informing the user that the marker will be permanently deleted from the phone.">
     The marker will be permanently deleted from the phone.
   </string>
-
-  <!-- Text and link when uploading to Google. -->
-  <!-- TODO(jshih@google.com) remove the html href tag from this string. -->
-  <string name="send_to_google_by_mytracks"
-    translation_description="When sending a track to Google, a note indicating it is created by
-      My Tracks on Android, with the 'My Tracks' word containng a http link to
-      http://mytracks.appspot.com.">
-    Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.
-  </string>
-
-  <!-- Tags for a track description. -->
-  <string name="recorded_date"
-    translation_description="When sending a track to Google, in the track description, a tag
-      for the track recorded date. E.g., 'Recorded: Tue Sep 06 15:08:30 PDT 2011'.">        
-    Recorded
-  </string>
-  <string name="category"
-    translation_description="When sending a track to Google, in the track desription, a tag
-      for the activity type. E.g., 'Activity type: hiking'.">
-    Activity type
-  </string>
   
   <!-- Button texts -->
   <string name="yes"
@@ -1411,44 +1482,7 @@ limitations under the License.
       one of the tracks. E.g., 'Import error for file /mnt/sdcard/MyTacks/gpx/1.gpx'."> 
     Import error for file %s
   </string>  
-       
-  <!-- Google My Maps -->
-  <string name="map_list_title"
-    translation_description="When sending a track to an existing Google My Map, the title of the
-      page listing the user's maps in Google My Maps.">
-    Your Google My Maps
-  </string>
-  <string name="select_map_message"
-    translation_description="When sending a track to an existing Google My Map, the text on 'Your
-      Google My Maps' page asking the user to pick one of his maps.">
-    Pick a map:
-  </string>
-  <string name="mapslist_no_maps_available"
-    translation_description="When showing a track to an existing Google My Map, the text on 'Your
-      Google My Maps' page informing the user that he doesn't have any map."> 
-    You don\'t have any maps.
-  </string>
-  <string name="maps_list_loading"
-    translation_description="When sending a track to an existing Google My Map, a progress message
-      informing the user that My Tracks is loading his maps.">
-    Loading maps...
-  </string>
-  <string name="maps_list_failed"
-     translation_description="When sending a track to an existing Google My Map, a message informing
-       the user that My Tracks cannot load his maps.">
-    Your maps could not be loaded at this time.
-  </string>
-  <string name="public_map"
-    translation_description="In the 'Your Google My Maps' page, tag next to the maps that are public
-      (as opposed to being not listed).">
-    Public
-  </string>
-  <string name="unlisted_map"
-    translation_description="In the 'Your Google My Maps' page, tag next to the maps that are not
-      listed (as opposed to being public).">
-    Unlisted
-  </string>
-  
+
   <!-- Share Track -->
   <string name="share_track_url"
     translation_description="After sending a track to Google, in the confirmation dialog, a
@@ -1474,60 +1508,6 @@ limitations under the License.
     I think you might be interested in this track.\n\nTo view this track use Google Earth or other
     mapping software.
   </string>
-  
-  <!-- Send to Google dialog -->
-  <string name="sendtogoogle_title"
-    translation_description="When sending a track to Google, the dialog title to choose the Google
-      services to send the track to. The user can choose Google My Maps, Google Fusion
-      Tables, and Google Docs.">
-    Send to...
-  </string>
-  <string name="sendtogoogle_google_mymaps"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
-      checkbox option to send to Google My Maps.">
-    Google My Maps
-  </string>
-  <string name="sendtogoogle_create_new_map"
-    translation_description="When sending a track to Google My Maps, the radio option to create a
-      new map as opposed to use an existing map.">
-    Create a new map
-  </string>
-  <string name="sendtogoogle_pick_existing_map"
-    translation_description="When sending a track to Google My Maps, the radio option to use an
-      existing map as opposed to create a new map.">
-    Use an existing map
-  </string>
-  <string name="sendtogoogle_google_fusiontables"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
-      checkbox option to send to Google Fusion Tables.">
-    Google Fusion Tables
-  </string>
-  <string name="sendtogoogle_google_docs"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
-      checkbox option to send to Google Docs.">
-    Google Docs
-  </string>
-  <string name="sendtogoogle_send_now"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
-      button on the bottom to send the track to the selected Google services.">
-    Send now
-  </string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="choose_account_title"
-    translation_description="When sending to Google, the dialog title to choose a Google account.">
-    Choose Account
-  </string>
-  <string name="no_account_found_title"
-    translation_description="When sending to Google, the dialog title when no Google account is
-      found.">
-    No Account Found
-  </string>
-  <string name="no_account_found"
-    translation_description="When sending to Google, the dialog message when no Google account is
-      found.">
-    No account found to upload tracks to.
-  </string>
 
   <!-- writing to SD card -->
   <string name="io_no_external_storage_found"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java b/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
index 69d0aaa7d..17e200b79 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
@@ -78,7 +78,7 @@ public class AccountChooser {
     // Let the user choose.
     Log.e(Constants.TAG, "Multiple matching accounts found.");
     final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setTitle(R.string.choose_account_title);
+    builder.setTitle(R.string.send_google_choose_account);
     builder.setCancelable(false);
     builder.setPositiveButton(R.string.ok,
         new DialogInterface.OnClickListener() {
@@ -124,8 +124,8 @@ public class AccountChooser {
       final AccountHandler handler) {
     Log.e(Constants.TAG, "No matching accounts found.");
     final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setTitle(R.string.no_account_found_title);
-    builder.setMessage(R.string.no_account_found);
+    builder.setTitle(R.string.send_google_no_account);
+    builder.setMessage(R.string.send_google_no_account_message);
     builder.setCancelable(true);
     builder.setPositiveButton(R.string.ok,
         new DialogInterface.OnClickListener() {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyMapsListAdapter.java b/MyTracks/src/com/google/android/apps/mytracks/MyMapsListAdapter.java
index 5780a950b..8b26da6d3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyMapsListAdapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyMapsListAdapter.java
@@ -99,10 +99,10 @@ public class MyMapsListAdapter implements ListAdapter {
       (TextView) convertView.findViewById(R.id.maplistpublic);
     if (publicList.get(position)) {
       publicUnlisted.setTextColor(Color.RED);
-      publicUnlisted.setText(R.string.public_map);
+      publicUnlisted.setText(R.string.my_maps_list_public_label);
     } else {
       publicUnlisted.setTextColor(Color.GREEN);
-      publicUnlisted.setText(R.string.unlisted_map);
+      publicUnlisted.setText(R.string.my_maps_list_unlisted_label);
     }
 
     return convertView;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java
index 472d1db0c..c09f7c06e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java
@@ -92,7 +92,7 @@ public class SendToDocs {
 
   private void doUpload(long trackId) {
     // TODO
-    statusMessage = activity.getString(R.string.error_sending_to_fusion_tables);
+    statusMessage = activity.getString(R.string.send_google_error_docs);
     success = false;
 
     try {
@@ -117,13 +117,13 @@ public class SendToDocs {
       if (success) {
         if (createdNewSpreadSheet) {
           statusMessage = activity.getString(
-              R.string.sending_to_docs_success_new_doc);
+              R.string.send_google_success_new_doc);
         } else {
           statusMessage = activity.getString(
-              R.string.sending_to_docs_success_existing_doc);
+              R.string.send_google_success_existing_doc);
         }
       } else {
-        statusMessage = activity.getString(R.string.error_sending_to_docs);
+        statusMessage = activity.getString(R.string.send_google_error_docs);
       }
       Log.d(Constants.TAG, "SendToDocs: Done.");
     } finally {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
index 7159aa2fd..2779d2f36 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
@@ -168,11 +168,11 @@ public class SendToFusionTables implements Runnable {
   }
 
   private void doUpload() {
-    int statusMessageId = R.string.error_sending_to_fusion_tables;
+    int statusMessageId = R.string.send_google_error_fusion_tables;
     boolean success = true;
     try {
       progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
-      progressIndicator.setProgressMessage(R.string.progress_message_reading_track);
+      progressIndicator.setProgressMessage(R.string.send_google_progress_reading_track);
 
       // Get the track meta-data
       Track track = providerUtils.getTrack(trackId);
@@ -185,13 +185,13 @@ public class SendToFusionTables implements Runnable {
 
       // Create a new table:
       progressIndicator.setProgressValue(PROGRESS_FUSION_TABLE_CREATE);
-      progressIndicator.setProgressMessage(R.string.progress_message_creating_fusion_table);
+      progressIndicator.setProgressMessage(R.string.send_google_progress_creating_fusion_table);
       if (!createNewTable(track) || !makeTableUnlisted()) {
         return;
       }
 
       progressIndicator.setProgressValue(PROGRESS_UPLOAD_DATA_MIN);
-      progressIndicator.setProgressMessage(R.string.progress_message_sending_fusion_tables);
+      progressIndicator.setProgressMessage(R.string.send_google_progress_sending_fusion_tables);
 
       // Upload all of the segments of the track plus start/end markers
       if (!uploadAllTrackPoints(track, originalDescription)) {
@@ -205,7 +205,7 @@ public class SendToFusionTables implements Runnable {
         return;
       }
 
-      statusMessageId = R.string.sending_to_fusion_tables_success;
+      statusMessageId = R.string.send_google_success_fusion_tables;
       Log.d(Constants.TAG, "SendToFusionTables: Done: " + success);
       progressIndicator.setProgressValue(PROGRESS_COMPLETE);
     } finally {
@@ -462,7 +462,7 @@ public class SendToFusionTables implements Runnable {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.send_google_track_part_format), totalSegmentsUploaded));
+                context.getString(R.string.send_google_track_part_label), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
       Log.d(Constants.TAG,
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
index 8fa7ec05d..ba538213d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
@@ -98,11 +98,10 @@ public class SendToMyMaps implements Runnable {
   }
 
   private void doUpload() {
-    int statusMessageId = R.string.error_sending_to_my_maps;
+    int statusMessageId = R.string.send_google_error_my_maps;
     boolean success = true;
     try {
-      progressIndicator.setProgressMessage(
-          R.string.progress_message_reading_track);
+      progressIndicator.setProgressMessage(R.string.send_google_progress_reading_track);
 
       // Get the track meta-data
       Track track = providerUtils.getTrack(trackId);
@@ -128,8 +127,7 @@ public class SendToMyMaps implements Runnable {
               context.getString(R.string.default_map_public_key), true);
         }
 
-        progressIndicator.setProgressMessage(
-            R.string.progress_message_creating_map);
+        progressIndicator.setProgressMessage(R.string.send_google_progress_creating_map);
 
         StringBuilder mapIdBuilder = new StringBuilder();
         success = mapsClient.createNewMap(
@@ -174,8 +172,8 @@ public class SendToMyMaps implements Runnable {
 
       if (success) {
         statusMessageId = isNewMap
-            ? R.string.sending_to_my_maps_success_new_map
-            : R.string.sending_to_my_maps_success_existing_map;
+            ? R.string.send_google_success_new_map
+            : R.string.send_google_success_existing_map;
       }
       Log.d(TAG, "SendToMyMaps: Done: " + success);
       progressIndicator.setProgressValue(100);
@@ -236,8 +234,7 @@ public class SendToMyMaps implements Runnable {
           new DoubleBuffer(Constants.ELEVATION_SMOOTHING_FACTOR);
 
       List<Location> locations = new ArrayList<Location>(MAX_POINTS_PER_UPLOAD);
-      progressIndicator.setProgressMessage(
-          R.string.progress_message_reading_track);
+      progressIndicator.setProgressMessage(R.string.send_google_progress_reading_track);
       Location lastLocation = null;
       do {
         if (totalLocationsRead % 100 == 0) {
@@ -310,8 +307,7 @@ public class SendToMyMaps implements Runnable {
 
 
   private boolean prepareAndUploadPoints(Track track, List<Location> locations) {
-    progressIndicator.setProgressMessage(
-        R.string.progress_message_preparing_track);
+    progressIndicator.setProgressMessage(R.string.send_google_progress_preparing_track);
     updateProgress();
 
     int numLocations = locations.size();
@@ -325,13 +321,12 @@ public class SendToMyMaps implements Runnable {
     ArrayList<Track> splitTracks = prepareLocations(track, locations);
 
     // Start uploading them
-    progressIndicator.setProgressMessage(
-        R.string.progress_message_sending_my_maps);
+    progressIndicator.setProgressMessage(R.string.send_google_progress_sending_my_maps);
     for (Track splitTrack : splitTracks) {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.send_google_track_part_format), totalSegmentsUploaded));
+                context.getString(R.string.send_google_track_part_label), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
       Log.d(TAG,
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
index 716206710..209d4a8cb 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
@@ -85,7 +85,7 @@ public class BackupActivityHelper {
 
     final ProgressDialog progressDialog = ProgressDialog.show(
         activity,
-        activity.getString(R.string.progress_title),
+        activity.getString(R.string.generic_progress_title),
         activity.getString(R.string.settings_backup_now_progress_message),
         true);
 
@@ -186,7 +186,7 @@ public class BackupActivityHelper {
     // Show a progress dialog
     ProgressDialog.show(
         activity,
-        activity.getString(R.string.progress_title),
+        activity.getString(R.string.generic_progress_title),
         activity.getString(R.string.settings_backup_restore_progress_message),
         true);
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
index e40ef6895..d61ff1010 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
@@ -79,7 +79,7 @@ class WriteProgressController {
   public ProgressDialog createProgressDialog() {
     dialog = new ProgressDialog(activity);
     dialog.setIcon(android.R.drawable.ic_dialog_info);
-    dialog.setTitle(activity.getString(R.string.progress_title));
+    dialog.setTitle(activity.getString(R.string.generic_progress_title));
     dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
     dialog.setMessage(activity.getString(R.string.progress_message_export));
     dialog.setIndeterminate(true);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
index 7a149c35a..0e5019a63 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
@@ -119,7 +119,7 @@ public class MapsFacade {
         MyMapsMapMetadata metaData = new MyMapsMapMetadata();
         metaData.setTitle(title);
         metaData.setDescription(description + " - "
-            + category + " - " + context.getString(R.string.send_to_google_by_mytracks));
+            + category + " - " + context.getString(R.string.send_google_by_my_tracks));
         metaData.setSearchable(isPublic);
         Entry entry = MyMapsGDataConverter.getMapEntryForMetadata(metaData);
         Log.d(MyMapsConstants.TAG, "Title: " + entry.getTitle());
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
index 573e95765..fe9e90222 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
@@ -392,7 +392,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
     progressDialog = new ProgressDialog(this);
     progressDialog.setCancelable(false);
     progressDialog.setIcon(android.R.drawable.ic_dialog_info);
-    progressDialog.setTitle(R.string.progress_title);
+    progressDialog.setTitle(R.string.generic_progress_title);
     progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
     progressDialog.setMax(100);
     progressDialog.setProgress(0);
@@ -403,8 +403,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
   private SendState authenticateToGoogleMaps() {
     Log.d(TAG, "SendActivity.authenticateToGoogleMaps");
     progressDialog.setProgress(0);
-    progressDialog.setMessage(getString(
-        R.string.progress_message_authenticating_my_maps));
+    progressDialog.setMessage(getString(R.string.send_google_progress_auth_my_maps));
     authenticate(Constants.AUTHENTICATE_TO_MY_MAPS, MyMapsConstants.SERVICE_NAME);
     // AUTHENTICATE_TO_MY_MAPS callback calls sendToGoogleMaps
     return SendState.NOT_READY;
@@ -479,8 +478,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
 
   private SendState authenticateToFusionTables() {
     progressDialog.setProgress(0);
-    progressDialog.setMessage(getString(
-        R.string.progress_message_authenticating_fusion_tables));
+    progressDialog.setMessage(getString(R.string.send_google_progress_auth_fusion_tables));
     authenticate(Constants.AUTHENTICATE_TO_FUSION_TABLES, SendToFusionTables.SERVICE_ID);
     // AUTHENTICATE_TO_FUSION_TABLES callback calls sendToFusionTables
     return SendState.NOT_READY;
@@ -536,8 +534,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
 
   private SendState authenticateToGoogleDocs() {
     setProgressValue(0);
-    setProgressMessage(
-        R.string.progress_message_authenticating_docs);
+    setProgressMessage(R.string.send_google_progress_auth_docs);
     authenticate(Constants.AUTHENTICATE_TO_DOCLIST, SendToDocs.GDATA_SERVICE_NAME_DOCLIST);
     // AUTHENTICATE_TO_DOCLIST callback calls authenticateToGoogleTrix
     return SendState.NOT_READY;
@@ -545,8 +542,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
 
   private SendState authenticateToGoogleTrix() {
     setProgressValue(30);
-    setProgressMessage(
-        R.string.progress_message_authenticating_docs);
+    setProgressMessage(R.string.send_google_progress_auth_docs);
     authenticate(Constants.AUTHENTICATE_TO_TRIX, SendToDocs.GDATA_SERVICE_NAME_TRIX);
     // AUTHENTICATE_TO_TRIX callback calls sendToGoogleDocs
     return SendState.NOT_READY;
@@ -557,7 +553,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
     tracker.trackPageView("/send/docs");
 
     setProgressValue(50);
-    setProgressMessage(R.string.progress_message_sending_docs);
+    setProgressMessage(R.string.send_google_progress_sending_docs);
     final SendToDocs sender = new SendToDocs(this,
         authMap.get(SendToDocs.GDATA_SERVICE_NAME_TRIX),
         authMap.get(SendToDocs.GDATA_SERVICE_NAME_DOCLIST),
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java
index 66feccf41..755d43445 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java
@@ -23,11 +23,11 @@ import com.google.android.maps.mytracks.R;
  * @author Matthew Simmons
  */
 public enum SendType {
-  MYMAPS(R.string.sendtogoogle_google_mymaps,
+  MYMAPS(R.string.send_google_my_maps,
       R.string.sendtogoogle_google_mymaps_url),
-  FUSION_TABLES(R.string.sendtogoogle_google_fusiontables,
+  FUSION_TABLES(R.string.send_google_fusion_tables,
       R.string.sendtogoogle_google_fusiontables_url),
-  DOCS(R.string.sendtogoogle_google_docs,
+  DOCS(R.string.send_google_docs,
       R.string.sendtogoogle_google_docs_url);
 
   private int serviceName;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
index 43f7d78fa..5ffe70402 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
@@ -303,7 +303,7 @@ public class StringUtils implements DescriptionGenerator {
         + "<img border=\"0\" src=\"%s\"/>",
 
         // Line 1
-        context.getString(R.string.send_to_google_by_mytracks),
+        context.getString(R.string.send_google_by_my_tracks),
 
         // Line 2
         context.getString(R.string.stat_total_distance),
@@ -343,11 +343,11 @@ public class StringUtils implements DescriptionGenerator {
         context.getString(R.string.stat_min_grade), minGrade,
 
         // Line 11
-        context.getString(R.string.recorded_date),
+        context.getString(R.string.send_google_recorded),
         new Date(trackStats.getStartTime()),
 
         // Line 12
-        context.getString(R.string.category), category,
+        context.getString(R.string.track_detail_activity_type_hint), category,
 
         // Line 13
         ChartURLGenerator.getChartUrl(distances, elevations, track, context));