diff --git a/MyTracks/.classpath b/MyTracks/.classpath
index 562e3f629..ed354affc 100644
--- a/MyTracks/.classpath
+++ b/MyTracks/.classpath
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
-	<classpathentry kind="lib" path="libs/google-common.jar"/>
-	<classpathentry kind="lib" path="libs/accounts.jar"/>
-	<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="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"/>
+        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+        <classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
+        <classpathentry kind="lib" path="libs/google-common.jar"/>
+        <classpathentry kind="lib" path="libs/accounts.jar"/>
+        <classpathentry kind="lib" path="libs/google-api-client-1.2.2-alpha.jar"/>
+        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="gen"/>
+        <classpathentry exported="true" kind="lib" path="/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-ca/arrays.xml b/MyTracks/res/values-ca/arrays.xml
index 2bba332fa..693efc12b 100644
--- a/MyTracks/res/values-ca/arrays.xml
+++ b/MyTracks/res/values-ca/arrays.xml
@@ -284,11 +284,4 @@ limitations under the License.
     <item>punt de referència</item>
   </array>
 
-  <array name="sensor_type_options">
-    <item>Cap</item>
-    <item>ANT+ Sensors</item>
-    <item>SRM ANT+ Bridge</item>
-    <item>Zephyr Bluetooth</item>
-  </array>
-
 </resources>
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index 6ac1e8525..39d3236d6 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -409,4 +409,11 @@ limitations under the License.
   <string name="searching">S\'està cercant</string>
   <string name="sending">S\'està enviant</string>
 
+  <!-- Sensor Type Options -->
+  <string name="no_sensor_option">NONE</string>
+  <string name="ant_sensor_option">ANT+ Sensors</string>
+  <string name="ant_bridge_sensor_option">SRM ANT+ Bridge</string>
+  <string name="polar_bt_sensor_option">Polar Bluetooth</string>
+  <string name="zephyr_bt_sensor_option">Zephyr Bluetooth</string>
+
 </resources>
diff --git a/MyTracks/res/values-es-rES/arrays.xml b/MyTracks/res/values-es-rES/arrays.xml
index 757121f6b..cb7c0b79a 100644
--- a/MyTracks/res/values-es-rES/arrays.xml
+++ b/MyTracks/res/values-es-rES/arrays.xml
@@ -143,11 +143,4 @@ limitations under the License.
     <item>camino</item>
   </array>
 
-  <array name="sensor_type_options">
-    <item>Ninguna</item>
-    <item>ANT+ Sensores</item>
-    <item>SRM ANT+ Puente</item>
-    <item>Zephyr Bluetooth</item>
-  </array>
-
 </resources>
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index 2cb837ae1..faf1b5c85 100644
--- a/MyTracks/res/values-es-rES/strings.xml
+++ b/MyTracks/res/values-es-rES/strings.xml
@@ -128,4 +128,11 @@ limitations under the License.
   $6 : Speed units (mph) : Pace units (per mile)
   -->
 
+  <!-- Sensor Type Options -->
+  <string name="no_sensor_option">NONE</string>
+  <string name="ant_sensor_option">ANT+ Sensors</string>
+  <string name="ant_bridge_sensor_option">SRM ANT+ Bridge</string>
+  <string name="polar_bt_sensor_option">Polar Bluetooth</string>
+  <string name="zephyr_bt_sensor_option">Zephyr Bluetooth</string>
+  
 </resources>
diff --git a/MyTracks/res/values-fr/arrays.xml b/MyTracks/res/values-fr/arrays.xml
index 18740a364..ef0994644 100644
--- a/MyTracks/res/values-fr/arrays.xml
+++ b/MyTracks/res/values-fr/arrays.xml
@@ -291,11 +291,4 @@ limitations under the License.
     <item>point de passage</item>
   </array>
 
-  <array name="sensor_type_options">
-    <item>Aucun</item>
-    <item>Capteur ANT+</item>
-    <item>Pont SRM ANT+</item>
-    <item>Bluetooth Zephyr</item>
-  </array>
-
 </resources>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index a1c00f1fc..49cc6516d 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -397,6 +397,13 @@ limitations under the License.
   <string name="searching">Recherche</string>
   <string name="sending">Envoi</string>
 
+  <!-- Sensor Type Options -->
+  <string name="no_sensor_option">Aucun</string>
+  <string name="ant_sensor_option">Capteur ANT+</string>
+  <string name="ant_bridge_sensor_option">Pont SRM ANT+</string>
+  <string name="polar_bt_sensor_option">Bluetooth Polar</string>
+  <string name="zephyr_bt_sensor_option">Bluetooth Zephyr</string>
+
   <!-- Manifest description (not seen inside the app) -->
   <string name="notification_permission_label">notifications lors de l\'enregistrement de parcours</string>
   <string name="read_tracks_permission_label">lecture des parcours enregistrés</string>
diff --git a/MyTracks/res/values-ja/arrays.xml b/MyTracks/res/values-ja/arrays.xml
index 31e45abee..aeffc5d84 100644
--- a/MyTracks/res/values-ja/arrays.xml
+++ b/MyTracks/res/values-ja/arrays.xml
@@ -272,11 +272,4 @@ limitations under the License.
     <item>ウェイポイント</item>
   </array>
 
-  <array name="sensor_type_options">
-    <item>なし</item>
-    <item>ANT+ センサー</item>
-    <item>SRM ANT+ ブリッジ</item>
-    <item>Zephyr Bluetooth</item>
-  </array>
-
 </resources>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 5732e571f..dc8bd7032 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -463,6 +463,13 @@ limitations under the License.
   <string name="searching">検索中</string>
   <string name="sending">送信中</string>
 
+  <!-- Sensor Type Options -->
+  <string name="no_sensor_option">なし</string>
+  <string name="ant_sensor_option">ANT+ センサー</string>
+  <string name="ant_bridge_sensor_option">SRM ANT+ ブリッジ</string>
+  <string name="polar_bt_sensor_option">Polar Bluetooth</string>
+  <string name="zephyr_bt_sensor_option">Zephyr Bluetooth</string>
+    
   <!-- Manifest description (not seen inside the app) -->
   <string name="notification_permission_label">トラック記録通知受信</string>
   <string name="read_tracks_permission_label">トラック読み込み</string>
diff --git a/MyTracks/res/values-ru/arrays.xml b/MyTracks/res/values-ru/arrays.xml
index feb32549f..e8cf89568 100755
--- a/MyTracks/res/values-ru/arrays.xml
+++ b/MyTracks/res/values-ru/arrays.xml
@@ -272,11 +272,4 @@ limitations under the License.
     <item>путевая точка</item>
   </array>
 
-  <array name="sensor_type_options">
-    <item>Нет</item>
-    <item>ANT+ Sensors</item>
-    <item>SRM ANT+ Bridge</item>
-    <item>Zephyr Bluetooth</item>
-  </array>
-
 </resources>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index 5e3068b2f..2270d2c23 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -490,6 +490,13 @@ limitations under the License.
   <string name="searching">Поиск</string>
   <string name="sending">Отправка</string>
 
+  <!-- Sensor Type Options -->
+  <string name="no_sensor_option">Нет</string>
+  <string name="ant_sensor_option">ANT+ Датчик</string>
+  <string name="ant_bridge_sensor_option">SRM ANT+ Bridge</string>
+  <string name="polar_bt_sensor_option">Polar Bluetooth</string>
+  <string name="zephyr_bt_sensor_option">Zephyr Bluetooth</string>
+
   <!-- Manifest description (not seen inside the app) -->
   <string name="notification_permission_label">получать уведомления о записи трека</string>
   <string name="read_tracks_permission_label">чтение записанных данных трека</string>
diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml
index 1adc71997..c78c6de86 100644
--- a/MyTracks/res/values/arrays_do_not_translate.xml
+++ b/MyTracks/res/values/arrays_do_not_translate.xml
@@ -109,7 +109,7 @@ limitations under the License.
   </array>
 
   <array name="sensor_type_options">
-    <item>@string/none</item>
+    <item>@string/no_sensor_option</item>
     <item>@string/ant_sensor_option</item>
     <item>@string/ant_bridge_sensor_option</item>
     <item>@string/polar_bt_sensor_option</item>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index d35f16060..c02ef1733 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -500,6 +500,7 @@ limitations under the License.
   <string name="write_tracks_permission_description">Be able to write track data, such as starting recording or adding waypoints.</string>
 
   <!-- Sensor Type Options -->
+  <string name="no_sensor_option">NONE</string>
   <string name="ant_sensor_option">ANT+ Sensors</string>
   <string name="ant_bridge_sensor_option">SRM ANT+ Bridge</string>
   <string name="polar_bt_sensor_option">Polar Bluetooth</string>