diff --git a/MyTracks/.settings/org.eclipse.jdt.core.prefs b/MyTracks/.settings/org.eclipse.jdt.core.prefs
index 65082d868..854a19bf4 100644
--- a/MyTracks/.settings/org.eclipse.jdt.core.prefs
+++ b/MyTracks/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,15 @@
 #Wed Sep 29 18:44:16 BRT 2010
 eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 7d6e6ea40..e865d117a 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -409,7 +409,6 @@ limitations under the License.
   <!-- SD card -->
   <string name="io_no_external_storage_found">没有发现存贮设备. 请确认插入了 SD 卡并且你的手机没有将挂载 SD 卡到电脑.</string>
   <string name="io_write_failed">无法写入文件.</string>
-  <string name="io_create_dir_failed">无法在 SD 卡上创建目录.</string>
   <string name="io_create_dir_failed">无法在 SD 存储卡上创建目录.</string>
   <string name="io_write_finished">轨迹已导出到 SD 卡.</string>
   <string name="io_read_finished">从 SD 存储卡读取完毕.</string>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartValueSeries.java b/MyTracks/src/com/google/android/apps/mytracks/ChartValueSeries.java
index d2bf16d29..d5ff24834 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartValueSeries.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartValueSeries.java
@@ -25,7 +25,7 @@ import android.graphics.Path;
 import java.text.DecimalFormat;
 
 /**
- * This class encasulates meta data about one series of values for a chart.
+ * This class encapsulates meta data about one series of values for a chart.
  *
  * @author Sandor Dornbush
  */
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
new file mode 100644
index 000000000..3a12071ad
--- /dev/null
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
@@ -0,0 +1,82 @@
+// Copyright 2010 Google Inc. All Rights Reserved.
+
+package com.google.android.apps.mytracks;
+
+import com.google.android.maps.mytracks.R;
+
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.test.AndroidTestCase;
+
+/**
+ * @author Sandor Dornbush
+ *
+ */
+public class ChartValueSeriesTest extends AndroidTestCase {
+  ChartValueSeries series;
+  Paint fillPaint1;
+ 
+  @Override
+  protected void setUp() throws Exception {
+    fillPaint1 = new Paint();
+    fillPaint1.setStyle(Style.FILL);
+    fillPaint1.setColor(getContext().getResources().getColor(R.color.green));
+    fillPaint1.setAntiAlias(true);
+    series = new ChartValueSeries(getContext(),
+        "###,###",
+        fillPaint1,
+        null,
+        100,
+        R.string.elevation);
+  }
+
+  public void testInitialConditions() {
+    assertEquals(25, series.getInterval());
+    assertEquals(1, series.getMaxLabelLength());
+    assertEquals(0, series.getMin());
+    assertEquals(0, series.getMax());
+    assertEquals(0.0, series.getSpread());
+    assertEquals(fillPaint1, series.getPaint());
+    assertEquals(getContext().getString(R.string.elevation),
+        series.getTitle());
+    assertTrue(series.isEnabled());
+  }
+
+  public void testEnabled() {
+    series.setEnabled(false);
+    assertFalse(series.isEnabled());
+  }
+  
+  public void testSmallUpdates() {
+    series.update(0);
+    series.update(10);
+    series.updateDimension();
+    assertEquals(25, series.getInterval());
+    assertEquals(3, series.getMaxLabelLength());
+    assertEquals(0, series.getMin());
+    assertEquals(100, series.getMax());
+    assertEquals(100.0, series.getSpread());
+  }
+
+  public void testBigUpdates() {
+    series.update(0);
+    series.update(901);
+    series.updateDimension();
+    assertEquals(200, series.getInterval());
+    assertEquals(5, series.getMaxLabelLength());
+    assertEquals(0, series.getMin());
+    assertEquals(1000, series.getMax());
+    assertEquals(1000.0, series.getSpread());
+  }
+
+  public void testNotZeroBasedUpdates() {
+    series.update(500);
+    series.update(1401);
+    series.updateDimension();
+    assertEquals(200, series.getInterval());
+    assertEquals(5, series.getMaxLabelLength());
+    assertEquals(500, series.getMin());
+    assertEquals(1500, series.getMax());
+    assertEquals(1000.0, series.getSpread());
+  }
+}