diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index 6b0a1f29d..47950e6c8 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -75,7 +75,7 @@ limitations under the License.
   <string name="progress_message_updating_track">S\'estan actualitzant les estadístiques de la ruta...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Esteu segur?</string>
+  <string name="confirmation_title_are_you_sure">Esteu segur?</string>
   <string name="all_data_will_be_permanently_deleted">Tots els marcadors i rutes s\'eliminaran d\'aquest telèfon.</string>
   <string name="track_will_be_permanently_deleted">La ruta i els seus marcadors s\'eliminaran de forma permanent d\'aquest telèfon.</string>
   <string name="marker_will_be_permanently_deleted">El marcador s\'eliminarà de forma permanent d\'aquest telèfon.</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index f75260ca9..cbf89ccd7 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -75,7 +75,7 @@ limitations under the License.
   <string name="progress_message_updating_track">Aktualisiere Trackstatistik...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Bist Du Dir wirklich sicher?</string>
+  <string name="confirmation_title_are_you_sure">Bist Du Dir wirklich sicher?</string>
   <string name="all_data_will_be_permanently_deleted">Alle Tracks und Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
   <string name="track_will_be_permanently_deleted">Dieser Track und seine Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
   <string name="marker_will_be_permanently_deleted">Dieser Wegpunkt wird endgültig von diesem Gerät gelöscht.</string>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 74f3b8df4..e5994ac47 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -85,7 +85,7 @@ limitations under the License.
 
   <!-- Used by DeleteAllDataHandler -->
     <string name="delete_track_activity_title">Borrar recorrido</string>
-  <string name="are_you_sure_question">¿Está usted seguro?</string>
+  <string name="confirmation_title_are_you_sure">¿Está usted seguro?</string>
   <string name="all_data_will_be_permanently_deleted">Todos los recorridos y señales serán borradas de este teléfono.</string>
   <string name="track_will_be_permanently_deleted">El recorrido y sus señales serán borrados permanentemente de este teléfono.</string>
   <string name="marker_will_be_permanently_deleted">La señal será borrada permanentemente de este teléfono.</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index 11a5773d6..62aed647c 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -84,7 +84,7 @@ limitations under the License.
   <string name="progress_message_updating_track">Päivitetään reitin tilastoja...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Oletko varma?</string>
+  <string name="confirmation_title_are_you_sure">Oletko varma?</string>
   <string name="all_data_will_be_permanently_deleted">Kaikki reitit ja merkinnät poistetaan puhelimesta.</string>
   <string name="track_will_be_permanently_deleted">Reitti ja se merkinnät poistetaan pysyvästi puhelimesta.</string>
   <string name="marker_will_be_permanently_deleted">Merkintä poistetaan puhelimesta.</string>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index a3ff4b37d..8469d0757 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -76,7 +76,7 @@ limitations under the License.
   <string name="progress_message_updating_track">Mise à jour des statistiques du parcours...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Êtes-vous sûr?</string>
+  <string name="confirmation_title_are_you_sure">Êtes-vous sûr?</string>
   <string name="all_data_will_be_permanently_deleted">Tous les parcours et balises vont être supprimés de ce téléphone.</string>
   <string name="track_will_be_permanently_deleted">Le parcours et ses balises vont être supprimés de manière permanente de ce téléphone.</string>
   <string name="marker_will_be_permanently_deleted">Les balises vont être supprimées de manière permanente de ce téléphone.</string>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index 47a7c4c67..9d25f1dff 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -73,7 +73,7 @@ limitations under the License.
   <string name="progress_message_updating_track">Aggiornamento delle statistiche del percorso in corso...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Sei sicuro?</string>
+  <string name="confirmation_title_are_you_sure">Sei sicuro?</string>
   <string name="all_data_will_be_permanently_deleted">Tutti i percorsi e segnaposti saranno eliminati definitivamente da questo telefono.</string>
   <string name="track_will_be_permanently_deleted">Il percorso e i suoi segnaposti saranno eliminati definitivamente da questo telefono.</string>
   <string name="marker_will_be_permanently_deleted">Il segnaposto sarà eliminato definitivamente da questo telefono.</string>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 9b89947f1..61fc2c9ae 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -81,7 +81,7 @@ limitations under the License.
   <string name="progress_message_updating_track">トラック統計情報を更新しています...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">よろしいですか?</string>
+  <string name="confirmation_title_are_you_sure">よろしいですか?</string>
   <string name="all_data_will_be_permanently_deleted">全てのトラックとマーカーをこの端末から削除します．</string>
   <string name="track_will_be_permanently_deleted">トラックとマーカーをこの端末から完全に削除します．</string>
   <string name="marker_will_be_permanently_deleted">マーカーをこの端末から完全に削除します．</string>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index d9772353e..4a6b3368b 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -74,7 +74,7 @@ limitations under the License.
   <string name="progress_message_updating_track">Aktualizacja statystyk trasy...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Jesteś pewien?</string>
+  <string name="confirmation_title_are_you_sure">Jesteś pewien?</string>
   <string name="all_data_will_be_permanently_deleted">Wszystkie trasy i znaczniki zostaną usunięte z telefonu.</string>
   <string name="track_will_be_permanently_deleted">Trasa i jej znaczniki zostanie całkowicie usunięta z telefonu.</string>
   <string name="marker_will_be_permanently_deleted">Znacznik zostanie całkowicie usunięty z telefonu.</string>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index 183800c47..7941efa8d 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -73,7 +73,7 @@ limitations under the License.
   <string name="progress_message_updating_track">Atualizando estatísticas do caminho...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Você tem certeza?</string>
+  <string name="confirmation_title_are_you_sure">Você tem certeza?</string>
   <string name="all_data_will_be_permanently_deleted">Todos os seus caminhos e marcadores serão apagados deste telefone.</string>
   <string name="track_will_be_permanently_deleted">O caminho e todos os seus marcadores serão permanentemente apagados deste telefone.</string>
   <string name="marker_will_be_permanently_deleted">O marcador será permanentemente apagado deste telefone.</string>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index 3e585f214..2351e0600 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -83,7 +83,7 @@ limitations under the License.
   <string name="progress_message_updating_track">Обновление статистики трека...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Вы уверены?</string>
+  <string name="confirmation_title_are_you_sure">Вы уверены?</string>
   <string name="all_data_will_be_permanently_deleted">Все треки и маркеры будут удалены с этого телефона.</string>
   <string name="track_will_be_permanently_deleted">Трек и его маркеры будут удалены из этого телефона.</string>
   <string name="marker_will_be_permanently_deleted">Маркер будет удален с этого телефона.</string>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index 957081d75..0834bd839 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -74,7 +74,7 @@ limitations under the License.
   <string name="progress_message_updating_track">Uppdaterar spårstatistik...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Är du säker?</string>
+  <string name="confirmation_title_are_you_sure">Är du säker?</string>
   <string name="all_data_will_be_permanently_deleted">Alla spår och markörer kommer att tas bort från telefonen.</string>
   <string name="track_will_be_permanently_deleted">Spåret och dess markörer kommer att permanent tas bort från telefonen.</string>
   <string name="marker_will_be_permanently_deleted">Markören kommer att permanent tas bort från telefonen.</string>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index fdf7967d9..9f4ec36f0 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -84,7 +84,7 @@ limitations under the License.
   <string name="progress_message_updating_track">更新轨迹统计信息中...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">请确认</string>
+  <string name="confirmation_title_are_you_sure">请确认</string>
   <string name="all_data_will_be_permanently_deleted">所以轨迹和标记都将被从本机删除.</string>
   <string name="track_will_be_permanently_deleted">选定轨迹和它相关的标记都将被从本机彻底删除.</string>
   <string name="marker_will_be_permanently_deleted">选定标记将被从本机删除.</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 7578863da..958bdb952 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -113,7 +113,7 @@ limitations under the License.
   <!-- Error messages when importing a track. -->
   <string name="error_import_unable_to_read_file"
     translation_description="When importing a track from the SD card, a messsage indicating that
-      MyTracks is unable to read the file.">
+      My Tracks is unable to read the file.">
     Unable to read from file.
   </string>
   <string name="error_import_invalid_gpx_format"
@@ -240,37 +240,37 @@ limitations under the License.
   </string>    
   <string name="progress_message_reading_track"
     translation_description="When sending a track to Google, the message on the progress dialog
-      indicating Mytracks is reading the track the its database.">
+      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 MyTracks is preparing the track.">
+      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 MyTracks is creating a new map in Google My Maps.">
+      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 MyTracks is creating a new Fusion Table in Google Fusion Tables.">
+      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 MyTracks is sending the track data.">
+      dialog indicating MyxTracks 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 MyTracks is sending the track data.">
+      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 MyTracks is sending the track data.">
+      indicating My Tracks is sending the track data.">
     Sending a track to Google Docs...
   </string>
   
@@ -287,27 +287,30 @@ limitations under the License.
   </string>
 
   <!-- Used by deletion actions -->
-  <string name="are_you_sure_question"
-    translation_description="When deleting data, the title on the confirmation dialog.">
+  <string name="confirmation_title_are_you_sure"
+    translation_description="When deleting data (e.g., deleting all tracks, deleting a track,
+      deleting a marker, etc.), the title on the confirmation dialog asking the user if he is sure."
+      >
     Are you sure?
   </string>
   <string name="all_data_will_be_permanently_deleted"
-    translation_description="When deleting all data, the confirmation message to ask the user if he
-      is sure.">
-    All tracks and markers will be deleted from this phone.
+    translation_description="When deleting all tracks, the message on the confirmation dialog
+      informing the user that all tracks and markers will be permanently deleted from the phone.">
+    All tracks and markers will be permanently deleted from the phone.
   </string>
   <string name="track_will_be_permanently_deleted"
-    translation_description="When deleting a track, the confirmation message to ask the user if he
-      is sure.">
-    The track and its markers will be permanently deleted from this phone.
+    translation_description="When deleting a track, the message on the confirmation dialog informing
+      the user that the track and its markers will be permanently deleted from the phone.">
+    The track and its markers will be permanently deleted from the phone.
   </string>
   <string name="marker_will_be_permanently_deleted"
-    translation_description="When deleting a marker, the confirmation message to ask the user if he
-      is sure.">
-    The marker will be permanently deleted from this phone.
+    translation_description="When deleting a marker, the message on the confirmation dialog
+      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
@@ -329,8 +332,8 @@ limitations under the License.
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track"
-    translation_description="When recording a track, the message on the MyTracks notification 
-      informing the user that MyTracks is actively recording his track.">
+    translation_description="When recording a track, the message on the My Tracks notification 
+      informing the user that My Tracks is actively recording his track.">
     Recording your track...
   </string>
   <string name="new_track_format"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
index 2338b5b39..ff1f35fe9 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
@@ -52,7 +52,7 @@ public class DeleteAllTracks extends Handler {
     AlertDialog.Builder builder = new AlertDialog.Builder(context);
     builder.setMessage(
         context.getString(R.string.all_data_will_be_permanently_deleted));
-    builder.setTitle(context.getString(R.string.are_you_sure_question));
+    builder.setTitle(context.getString(R.string.confirmation_title_are_you_sure));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
     builder.setPositiveButton(context.getString(R.string.yes),
         new DialogInterface.OnClickListener() {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java b/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
index bc53c8fed..a0746a9e1 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
@@ -78,7 +78,7 @@ public class DeleteTrack extends Activity
 
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setMessage(getString(R.string.track_will_be_permanently_deleted));
-    builder.setTitle(getString(R.string.are_you_sure_question));
+    builder.setTitle(getString(R.string.confirmation_title_are_you_sure));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
     builder.setPositiveButton(getString(R.string.yes), this);
     builder.setNegativeButton(getString(R.string.no), this);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
index f397e7a9f..5e04c6ba8 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
@@ -296,7 +296,7 @@ public class WaypointsList extends ListActivity
     AlertDialog dialog = null;
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setMessage(getString(R.string.marker_will_be_permanently_deleted));
-    builder.setTitle(getString(R.string.are_you_sure_question));
+    builder.setTitle(getString(R.string.confirmation_title_are_you_sure));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
     builder.setPositiveButton(getString(R.string.yes),
         new DialogInterface.OnClickListener() {