merge heads

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() {

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);

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() {

MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java

@@ -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_fusiontable);
+      progressIndicator.setProgressMessage(R.string.progress_message_creating_fusion_table);
       if (!createNewTable(track) || !makeTableUnlisted()) {
         return;
       }
 
       progressIndicator.setProgressValue(PROGRESS_UPLOAD_DATA_MIN);
-      progressIndicator.setProgressMessage(R.string.progress_message_sending_fusiontables);
+      progressIndicator.setProgressMessage(R.string.progress_message_sending_fusion_tables);
 
       // Upload all of the segments of the track plus start/end markers
       if (!uploadAllTrackPoints(track, originalDescription)) {
@@ -462,7 +462,7 @@ public class SendToFusionTables implements Runnable {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.part), totalSegmentsUploaded));
+                context.getString(R.string.track_part_format), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
       Log.d(Constants.TAG,

MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java

@@ -326,12 +326,12 @@ public class SendToMyMaps implements Runnable {
 
     // Start uploading them
     progressIndicator.setProgressMessage(
-        R.string.progress_message_sending_mymaps);
+        R.string.progress_message_sending_my_maps);
     for (Track splitTrack : splitTracks) {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.part), totalSegmentsUploaded));
+                context.getString(R.string.track_part_format), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
       Log.d(TAG,

MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java

@@ -93,7 +93,7 @@ public class ImportActivity extends Activity {
         progressDialog.setIcon(android.R.drawable.ic_dialog_info);
         progressDialog.setTitle(R.string.progress_title);
         progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-        progressDialog.setMessage(getString(R.string.import_progress_message));
+        progressDialog.setMessage(getString(R.string.progress_message_import));
         return progressDialog;
       case SUCCESS_DIALOG:
         final Builder dialogBuilder = new AlertDialog.Builder(this);

MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java

@@ -81,7 +81,7 @@ class WriteProgressController {
     dialog.setIcon(android.R.drawable.ic_dialog_info);
     dialog.setTitle(activity.getString(R.string.progress_title));
     dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-    dialog.setMessage(activity.getString(R.string.write_progress_message));
+    dialog.setMessage(activity.getString(R.string.progress_message_export));
     dialog.setIndeterminate(true);
     dialog.setOnCancelListener(dialogCancelListener);
     return dialog;

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.new_map_description));
+            + category + " - " + context.getString(R.string.send_to_google_by_mytracks));
         metaData.setSearchable(isPublic);
         Entry entry = MyMapsGDataConverter.getMapEntryForMetadata(metaData);
         Log.d(MyMapsConstants.TAG, "Title: " + entry.getTitle());

MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java

@@ -404,7 +404,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
     Log.d(TAG, "SendActivity.authenticateToGoogleMaps");
     progressDialog.setProgress(0);
     progressDialog.setMessage(getString(
-        R.string.progress_message_authenticating_mymaps));
+        R.string.progress_message_authenticating_my_maps));
     authenticate(Constants.AUTHENTICATE_TO_MY_MAPS, MyMapsConstants.SERVICE_NAME);
     // AUTHENTICATE_TO_MY_MAPS callback calls sendToGoogleMaps
     return SendState.NOT_READY;
@@ -480,7 +480,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
   private SendState authenticateToFusionTables() {
     progressDialog.setProgress(0);
     progressDialog.setMessage(getString(
-        R.string.progress_message_authenticating_fusiontables));
+        R.string.progress_message_authenticating_fusion_tables));
     authenticate(Constants.AUTHENTICATE_TO_FUSION_TABLES, SendToFusionTables.SERVICE_ID);
     // AUTHENTICATE_TO_FUSION_TABLES callback calls sendToFusionTables
     return SendState.NOT_READY;

MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java

@@ -51,7 +51,7 @@ class DefaultTrackNameFactory {
       SimpleDateFormat formatter = new SimpleDateFormat(TIMESTAMP_DATE_FORMAT);
       return formatter.format(new Date(startTime));
     } else {
-      return String.format(context.getString(R.string.new_track), trackId);
+      return String.format(context.getString(R.string.new_track_format), trackId);
     }
   }
 

MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java

@@ -331,7 +331,7 @@ public class StringUtils implements DescriptionGenerator {
         + "<img border=\"0\" src=\"%s\"/>",
 
         // Line 1
-        context.getString(R.string.fusiontable_link),
+        context.getString(R.string.send_to_google_by_mytracks),
 
         // Line 2
         context.getString(R.string.total_distance_label),