Update strings in other locales.

Remove one unused color.

MyTracks/res/values/colors.xml

@@ -20,7 +20,6 @@ limitations under the License.
   <color name="gray">#FFAAAAAA</color>
   <color name="red">#FFFF0000</color>
   <color name="transparent">#00000000</color>
-  <color name="white">#FFFFFFFF</color>
 
   <!-- holo_orange_dark -->
   <color name="warning_background">#FFFF8800</color>

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

@@ -116,9 +116,10 @@ public class MarkerEditActivity extends AbstractMyTracksActivity {
       waypointSection.setVisibility(View.VISIBLE);
       int nextMarkerNumber = trackId == -1L ? -1
           : MyTracksProviderUtils.Factory.get(this).getNextMarkerNumber(trackId, false);
-      String name = nextMarkerNumber == -1 ? getString(R.string.marker_type_waypoint)
-          : getString(R.string.marker_name_format, nextMarkerNumber);
-      waypointName.setText(name);
+      if (nextMarkerNumber == -1) {
+        nextMarkerNumber = 0;
+      }
+      waypointName.setText(getString(R.string.marker_name_format, nextMarkerNumber));
       waypointName.selectAll();
       waypointMarkerType.setText("");
       waypointDescription.setText("");

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

@@ -960,8 +960,10 @@ public class TrackRecordingService extends Service {
       name = request.getName();
     } else {
       int nextMarkerNumber = providerUtils.getNextMarkerNumber(recordingTrackId, false);
-      name = nextMarkerNumber == -1 ? getString(R.string.marker_type_waypoint)
-          : getString(R.string.marker_name_format, nextMarkerNumber);
+      if (nextMarkerNumber == -1) {
+        nextMarkerNumber = 0;
+      }
+      name = getString(R.string.marker_name_format, nextMarkerNumber);
     }
     wpt.setName(name);
     if (request.getCategory() != null) {
@@ -997,8 +999,10 @@ public class TrackRecordingService extends Service {
       name = request.getName();
     } else {
       int nextMarkerNumber = providerUtils.getNextMarkerNumber(recordingTrackId, true);
-      name = nextMarkerNumber == -1 ? getString(R.string.marker_type_statistics)
-          : getString(R.string.marker_split_name_format, nextMarkerNumber);
+      if (nextMarkerNumber == -1) {
+        nextMarkerNumber = 0;
+      }
+      name = getString(R.string.marker_split_name_format, nextMarkerNumber);
     }
     waypoint.setName(name);
     waypoint.setStatistics(waypointStatsBuilder.getStatistics());