merge heads

MyTracks/src/com/google/android/apps/mytracks/MapActivity.java

@@ -504,12 +504,12 @@ public class MapActivity extends com.google.android.maps.MapActivity
     final boolean isGpsDisabled;
     switch (state) {
       case DISABLED:
-        messageId = R.string.status_enable_gps;
+        messageId = R.string.status_need_to_enable_gps;
         isGpsDisabled = true;
         break;
       case NO_FIX:
       case BAD_FIX:
-        messageId = R.string.wait_for_fix;
+        messageId = R.string.status_wait_for_gps_fix;
         isGpsDisabled = false;
         break;
       case GOOD_FIX:

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

@@ -369,7 +369,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
     try {
       long waypointId = trackRecordingService.insertWaypoint(request);
       if (waypointId >= 0) {
-        Toast.makeText(this, R.string.status_statistics_inserted,
+        Toast.makeText(this, R.string.status_marker_inserted,
             Toast.LENGTH_LONG).show();
       }
       return waypointId;

MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java

@@ -227,7 +227,7 @@ public class WaypointsList extends ListActivity
       if (trackRecordingService != null) {
         long waypointId = trackRecordingService.insertWaypoint(request);
         if (waypointId >= 0) {
-          Toast.makeText(this, R.string.status_statistics_inserted,
+          Toast.makeText(this, R.string.status_marker_inserted,
               Toast.LENGTH_LONG).show();
           return waypointId;
         }

MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java

@@ -147,10 +147,10 @@ class DataSourcesWrapperImpl implements DataSourcesWrapper {
       // We don't have a recent GPS fix, just use cell towers if available
       loc = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
 
-      int toastResId = R.string.status_approximate_location;
+      int toastResId = R.string.status_approximate_current_location;
       if (loc == null || loc.getTime() < now - MAX_NETWORK_AGE_MS) {
         // We don't have a recent cell tower location, let the user know:
-        toastResId = R.string.status_no_location;
+        toastResId = R.string.status_no_current_location;
       }
 
       // Let the user know we have only an approximate location:

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

@@ -117,10 +117,10 @@ public class SendToDocs {
       if (success) {
         if (createdNewSpreadSheet) {
           statusMessage = activity.getString(
-              R.string.status_tracks_have_been_uploaded_to_new_doc);
+              R.string.sending_to_docs_success_new_doc);
         } else {
           statusMessage = activity.getString(
-              R.string.status_tracks_have_been_uploaded_to_docs);
+              R.string.sending_to_docs_success_existing_doc);
         }
       } else {
         statusMessage = activity.getString(R.string.error_sending_to_docs);

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

@@ -205,7 +205,7 @@ public class SendToFusionTables implements Runnable {
         return;
       }
 
-      statusMessageId = R.string.status_new_fusiontable_has_been_created;
+      statusMessageId = R.string.sending_to_fusion_tables_success;
       Log.d(Constants.TAG, "SendToFusionTables: Done: " + success);
       progressIndicator.setProgressValue(PROGRESS_COMPLETE);
     } finally {

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

@@ -173,8 +173,8 @@ public class SendToMyMaps implements Runnable {
 
       if (success) {
         statusMessageId = isNewMap
-            ? R.string.status_new_mymap_has_been_created
-            : R.string.status_tracks_have_been_uploaded;
+            ? R.string.sending_to_my_maps_success_new_map
+            : R.string.sending_to_my_maps_success_existing_map;
       }
       Log.d(TAG, "SendToMyMaps: Done: " + success);
       progressIndicator.setProgressValue(100);