Rename and reorganize variables in

- About
- EULA
- My Location
- Permission
- Preferred Units
- Voice
- Welcome

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

@@ -52,14 +52,14 @@ class Eula {
     }
 
     final AlertDialog.Builder builder = initDialog(activity);
-    builder.setPositiveButton(R.string.accept,
+    builder.setPositiveButton(R.string.eula_accept,
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {
             accept(activity, preferences);
           }
         });
-    builder.setNegativeButton(R.string.decline,
+    builder.setNegativeButton(R.string.eula_decline,
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {

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

@@ -72,7 +72,7 @@ public class WelcomeActivity extends Activity {
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setView(view);
     builder.setPositiveButton(R.string.ok, null);
-    builder.setNegativeButton(R.string.license, new DialogInterface.OnClickListener() {
+    builder.setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() {
       @Override 
       public void onClick(DialogInterface dialog, int which) {
         Eula.showEula(WelcomeActivity.this);

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_current_location;
+      int toastResId = R.string.my_location_approximate_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_current_location;
+        toastResId = R.string.my_location_no_location;
       }
 
       // Let the user know we have only an approximate location:

MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java

@@ -165,7 +165,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
     double d =  stats.getTotalDistance() / 1000;
     double s =  stats.getAverageMovingSpeed() * 3.6;
     if (d == 0) {
-      return context.getString(R.string.announce_no_distance);
+      return context.getString(R.string.voice_no_distance);
     }
 
     int speedLabel;
@@ -199,7 +199,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
       }
     }
 
-    return context.getString(R.string.announce_template,
+    return context.getString(R.string.voice_template,
         d,
         context.getString(metricUnits
                           ? R.string.voice_kilometers