From 9f44b1695d04b617192a901ccbe92878e75cc206 Mon Sep 17 00:00:00 2001
From: JohnG <jrgert@gmail.com>
Date: Thu, 2 Jun 2011 20:58:27 -0400
Subject: [PATCH] Merge error fix.

String polar_sensor_type was left out of Sensor Type array.
---
 MyTracks/.classpath                             | 2 +-
 MyTracks/res/values/arrays_do_not_translate.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/MyTracks/.classpath b/MyTracks/.classpath
index f6347e54f..562e3f629 100644
--- a/MyTracks/.classpath
+++ b/MyTracks/.classpath
@@ -7,7 +7,7 @@
 	<classpathentry kind="lib" path="libs/google-api-client-1.2.2-alpha.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="src" path="MyTracksLib_src"/>
 	<classpathentry kind="lib" path="C:/Documents and Settings/John/My Documents/Projects/Eclipse/jrgert-polar-bluetooth/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
+	<classpathentry kind="src" path="MyTracksLib_src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml
index 474ad3c5a..1adc71997 100644
--- a/MyTracks/res/values/arrays_do_not_translate.xml
+++ b/MyTracks/res/values/arrays_do_not_translate.xml
@@ -120,6 +120,7 @@ limitations under the License.
     <item>@string/none</item>
     <item>@string/ant_sensor_type</item>
     <item>@string/srm_ant_bridge_sensor_type</item>
+    <item>@string/polar_sensor_type</item>
     <item>@string/zephyr_sensor_type</item>
   </array>