diff --git a/MyTracks/proguard.cfg b/MyTracks/proguard.cfg
index 7a2867d7e..65fa34cbb 100644
--- a/MyTracks/proguard.cfg
+++ b/MyTracks/proguard.cfg
@@ -12,6 +12,8 @@
 -dontwarn com.google.android.googleapps.**
 -dontwarn com.android.common.**
 -dontwarn com.google.android.gsf.**
+-dontwarn org.codehaus.**
+-dontwarn com.google.appengine.**
 
 # Keep everything android references from XMLs
 -keep public class * extends android.app.Activity
@@ -20,6 +22,7 @@
 -keep public class * extends android.app,backup.BackupAgent
 -keep public class * extends android.content.BroadcastReceiver
 -keep public class * extends android.content.ContentProvider
+-keep public class * extends android.preference.Preference
 -keep public class com.android.vending.licensing.ILicensingService
 
 -keepclasseswithmembernames class * {
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index d57f702da..c742a76d8 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -15,14 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 --> 
 <resources> 
- 
   <!-- Used by the Menu --> 
   <string name="start_recording">Track aufzeichnen</string> 
   <string name="stop_recording">Aufzeichnung anhalten</string> 
   <string name="switch_to_sat">Satellitenansicht</string> 
   <string name="switch_to_map">Kartenansicht</string> 
   <string name="mylocation">Mein Aufenthaltsort</string> 
-  <string name="list_markers">Wegpunkte</string> 
+  <string name="list_markers">Wegpunkte</string>
   <string name="delete_all_tracks">Alle Tracks löschen</string> 
   <string name="settings">Einstellungen</string> 
   <string name="elevation">Höhe</string> 
@@ -82,7 +81,7 @@ limitations under the License.
  
   <!-- Text and links when uploading to Google Fusion Tables --> 
   <string name="new_map_description">Erstellt von My Tracks für Android.</string> 
-  <string name="fusiontable_link">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string> 
+  <string name="fusiontable_link">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
  
   <!-- Formatting of track and marker descriptions --> 
   <string name="points">Punkte</string> 
@@ -92,7 +91,7 @@ limitations under the License.
   <string name="part">(Teil %d)</string> 
  
   <!-- Used by the track recording service --> 
-  <string name="recording_your_track">Dein Track wird aufgezeichnet…</string> 
+  <string name="recording_your_track">Dein Track wird aufgezeichnet…</string>
  
   <!-- Common --> 
   <string name="no">Nein</string> 
@@ -100,12 +99,13 @@ limitations under the License.
   <string name="error">Fehler</string> 
   <string name="success">Erfolgreich</string> 
   <string name="waypoint">Wegpunkt</string> 
+  <string name="license">Lizenz</string>
   <string name="cancel">Abbrechen</string>
+  <string name="close">Schließen</string>
   <string name="edit">Bearbeiten</string>
   <string name="save">Sichern</string>
 
   <!-- Placemark labels for start and end of track --> 
-  <string name="start">(Beginn)</string> 
   <string name="end">(Ende)</string> 
  
   <!--  TrackList --> 
@@ -212,11 +212,17 @@ limitations under the License.
  
   <string name="eclair_required">Wird nur unter Android 2.0 oder höher unterstützt</string> 
   <string name="settings_sensor_type">Sensortyp</string> 
-  <string name="settings_sensor_type_summary">Der Typ des zu verbindenden Sensors</string> 
+  <string name="settings_sensor_type_summary">Der Typ des zu verbindenden Sensors</string>
+  <string name="settings_heart_rate_ant_sensor_id">Verbindung mit ANT Herzqrequenzmesser aufheben</string>
+  <string name="settings_power_ant_sensor_id">Verbindung mit ANT Kraftmesser aufheben</string>
+  <string name="settings_srm_bridge_ant_sensor_id">Verbindung mit ANT srm bridge aufheben</string>
+  <string name="settings_ant_not_paired">ANT-Sensor nicht verbunden</string>
+  <string name="settings_ant_paired">ANT-Sensor verbunden mit: %d</string>
   <string name="bluetooth_sensor_title">Bluetooth-Sensor</string> 
   <string name="bluetooth_sensor_summary">Der zu verbindende Bluetoothsensor</string> 
   <string name="settings_modular_stats_display_title">Art der Datenanzeige</string> 
  
+  <!-- Backups --> 
   <string name="settings_backup">Datensicherung (BETA)</string> 
   <string name="settings_sd_backup">SD-Karten-Sicherung</string> 
   <string name="settings_backup_to_sd">Jetzt sichern</string> 
@@ -225,7 +231,6 @@ limitations under the License.
   <string name="settings_restore_from_sd_summary">Alle Tracks und Einstellungen von der SD-Karte holen.</string> 
   <string name="settings_no_backup_while_recording">Während ein Track aufgezeichnet wird, kann nicht mit der Datensicherung gearbeitet werden.</string> 
  
-  <!-- Backups --> 
   <string name="restore_overwrites_warning">Eine Wiederherstellung von der SD-Karte ÜBERSCHREIBT alle vorhandenen Tracks und Einstellungen. Willst Du das wirklich?</string> 
   <string name="select_backup_to_restore">Wähle die wiederherzustellende Datensicherung aus</string> 
   <string name="no_backups">Keine Datensicherungen gefunden.</string> 
@@ -300,16 +305,16 @@ limitations under the License.
   <string name="seconds">Sekunden</string> 
  
   <!-- Distance --> 
-  <string name="feet">Fuß</string> 
-  <string name="kilometers_long">Kilometer</string> 
+  <string name="kilometers_long">Kilometer</string>
+  <string name="feet">Fuß</string>
   <string name="miles_long">Meilen</string> 
  
-  <!-- Speed and Pace --> 
-  <string name="kilometer_per_hour_long">Kilometer pro Stunde</string> 
+  <!-- Speed and Pace -->
+  <string name="kilometer_per_hour_long">Kilometer pro Stunde</string>
   <string name="per_kilometer">pro Kilometer</string> 
-  <string name="mile_per_hour_long">Meilen pro Stunde</string> 
+  <string name="mile_per_hour_long">Meilen pro Stunde</string>
   <string name="per_mile">pro Meile</string> 
- 
+
   <!-- Stats Labels --> 
   <string name="moving_time_label">Zeit in Bewegung</string> 
   <string name="total_time_label">Gesamtzeit</string> 
@@ -320,7 +325,7 @@ limitations under the License.
   <string name="statistics">Statistik</string> 
   <string name="total_distance_label">Gesamtentfernung</string> 
   <string name="distance_label">Entfernung</string> 
-  <string name="power">Energie</string> 
+  <string name="power">Kraft</string> 
   <string name="cadence">Kadenz</string> 
   <string name="heart_rate">Herzfrequenz</string> 
   <string name="max_heart_rate">Höchste Herzfrequenz</string> 
@@ -334,10 +339,12 @@ limitations under the License.
   <!-- About --> 
   <string name="about">Über</string> 
   <string name="help">Hilfe</string> 
-  <string name="about_support">Unterstützung</string> 
+  <string name="about_support">Unterstützung:</string>
+  <string name="about_privacy">Datenschutz:</string>
  
-  <!-- Send to Google --> 
-  <string name="sendtogoogle_title">Senden an…</string> 
+  <!-- Send to Google -->
+  <string name="sendtogoogle_title">Senden an…</string>
+  <string name="sendtogoogle_google_docs">Google Text &amp; Tabellen</string>
   <string name="sendtogoogle_send_now">Jetzt senden</string> 
   <string name="sendtogoogle_send_stats">Trackstatistik senden</string> 
   <string name="sendtogoogle_send_stats_and_points">Statistik und Punkte senden</string> 
@@ -365,6 +372,7 @@ limitations under the License.
  
   <!-- Welcome --> 
   <string name="welcome">Willkommen</string> 
+  <string name="welcome_read_later">OK</string>
   <string name="welcome_about">Über My Tracks</string> 
  
   <!-- Announcement --> 
@@ -383,20 +391,20 @@ limitations under the License.
   <string name="check_units_title">Einheitenbenachrichtigung</string> 
   <string name="check_units_message">Voreingestellt sind metrische Einheiten. Willst Du diese Einstellung ändern?</string> 
  
-  <!-- Fake preference keys - never saved, but show options in the preferences screen --> 
-  <string name="bluetooth_options">Bluetootheinstellungen</string> 
+  <!-- Fake preference keys - never saved, but show options in the preferences screen -->
+  <string name="bluetooth_options">Bluetooth-Einstellungen</string> 
   <string name="bluetooth_pairing">Geräteverbindung</string> 
-  <string name="bluetooth_pairing_summary">Öffnet Androids Bluetootheinstellungen, um Geräte zu verbinden.</string> 
-  <string name="sensor_options">Sensoreinstellungen</string> 
+  <string name="bluetooth_pairing_summary">Öffnet Androids Bluetooth-Einstellungen, um Geräte zu verbinden.</string> 
+  <string name="sensor_options">Sensor-Einstellungen</string> 
  
   <!-- Bluetooth Sensor --> 
   <string name="bluetooth_connected">Verbunden mit %s</string> 
-  <string name="bluetooth_connecting">Verbinde mit Bluetoothsensor ...</string> 
-  <string name="bluetooth_not_connected">Bluetoothsensor nicht verbunden.</string> 
+  <string name="bluetooth_connecting">Verbinde mit Bluetooth-Sensor ...</string> 
+  <string name="bluetooth_not_connected">Bluetooth-Sensor nicht verbunden.</string> 
  
   <!-- Sensor State --> 
-  <string name="sensor_data_time">Sensor Data Time</string> 
-  <string name="power_meter_enabled">Energiemessung aktiviert</string> 
+  <string name="sensor_data_time">Uhrzeit</string> 
+  <string name="power_meter_enabled">Kraftmesser aktiviert</string> 
   <string name="heart_rate_monitor_enabled">Herzfrequenzmessung aktiviert</string> 
   <string name="no_sensor_manager">Keine Sensoren verfügbar</string> 
   <string name="enabled">Aktiviert</string> 
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 732daae32..8895c3c22 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -98,7 +98,6 @@ limitations under the License.
   <!-- Common -->
   <string name="no">いいえ</string>
   <string name="yes">はい</string>
-  <string name="ok">OK</string>
   <string name="error">エラー</string>
   <string name="success">成功</string>
   <string name="waypoint">ウェイポイント</string>
@@ -311,29 +310,15 @@ limitations under the License.
   <string name="milliseconds">ミリ秒</string>
 
   <!-- Distance -->
-  <!-- string name="meter">m</string --> <!-- duplicate -->
-  <!-- string name="kilometer">km</string --> <!-- duplicate -->
   <string name="kilometers_long">キロメータ</string>
-  <!-- string name="feet">ft</string --> <!-- duplicate -->
-  <!-- string name="mile">mi</string --> <!-- duplicate -->
   <string name="miles_long">マイル</string>
 
   <!-- Speed and Pace -->
-  <!-- string name="kilometer_per_hour">km/h</string --> <!-- duplicate -->
   <string name="kilometer_per_hour_long">キロメータ毎時</string>
-  <!-- string name="min_per_kilometer">min/km</string --> <!-- duplicate -->
   <string name="per_kilometer">毎キロメータ</string>
-  <!-- string name="mile_per_hour">mi/h</string --> <!-- duplicate -->
   <string name="mile_per_hour_long">マイル毎時</string>
-  <!-- string name="min_per_mile">min/mi</string --> <!-- duplicate -->
   <string name="per_mile">毎マイル</string>
 
-  <!-- Sensors -->
-  <!-- string name="watts">W</string --> <!-- duplicate -->
-
-  <!-- string name="revolutions_per_minute">rpm</string --> <!-- duplicate -->
-  <!-- string name="bpm">bpm</string --> <!-- duplicate -->
-
   <!-- Stats Labels -->
   <string name="moving_time_label">移動時間</string>
   <string name="total_time_label">合計時間</string>
@@ -366,8 +351,7 @@ limitations under the License.
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">送信...</string>
-  <!-- string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string --> <!-- duplicate -->
-  <!-- string name="sendtogoogle_google_docs">Google Docs</string --> <!-- duplicate -->
+  <string name="sendtogoogle_google_fusiontables">Googleマイマップ</string>
   <string name="sendtogoogle_send_now">今すぐ送信</string>
   <string name="sendtogoogle_send_stats">トラック統計情報送信</string>
   <string name="sendtogoogle_send_stats_and_points">統計情報とポイント送信</string>
@@ -395,7 +379,6 @@ limitations under the License.
 
   <!-- Welcome -->
   <string name="welcome">ようこそ</string>
-  <!-- string name="welcome_read_later">Ok</string --> <!-- duplicate -->
   <string name="welcome_about">My Tracksについて</string>
 
   <!-- Announcement -->
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
index edb36908b..dba669a9a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
@@ -30,13 +30,14 @@ import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
 import com.google.api.client.googleapis.GoogleHeaders;
-import com.google.api.client.googleapis.GoogleTransport;
+import com.google.api.client.googleapis.MethodOverrideIntercepter;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpResponseException;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.InputStreamContent;
+import com.google.api.client.javanet.NetHttpTransport;
 import com.google.api.client.util.Strings;
 
 import android.app.Activity;
@@ -106,6 +107,12 @@ public class SendToFusionTables implements Runnable {
   private static String MARKER_TYPE_END = "large_red";
   private static String MARKER_TYPE_WAYPOINT = "large_yellow";
 
+  static {
+    // We manually assign the transport to avoid having HttpTransport try to
+    // load it via reflection (which breaks due to ProGuard).
+    HttpTransport.setLowLevelHttpTransport(new NetHttpTransport());
+  }
+
   public SendToFusionTables(Activity context, AuthManager auth,
       long trackId, ProgressIndicator progressIndicator,
       OnSendCompletedListener onCompletion) {
@@ -116,10 +123,14 @@ public class SendToFusionTables implements Runnable {
     this.onCompletion = onCompletion;
     this.stringUtils = new StringUtils(context);
     this.providerUtils = MyTracksProviderUtils.Factory.get(context);
-    transport = GoogleTransport.create();
-    GoogleHeaders headers = (GoogleHeaders) transport.defaultHeaders;
+
+    GoogleHeaders headers = new GoogleHeaders();
     headers.setApplicationName("Google-MyTracks-" + MyTracksUtils.getMyTracksVersion(context));
     headers.gdataVersion = GDATA_VERSION;
+
+    transport = new HttpTransport();
+    MethodOverrideIntercepter.setAsFirstFor(transport);
+    transport.defaultHeaders = headers;
   }
 
   @Override
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ApiFeatures.java b/MyTracks/src/com/google/android/apps/mytracks/util/ApiFeatures.java
index 0bdec6e81..c6dd60c75 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/ApiFeatures.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/ApiFeatures.java
@@ -33,12 +33,7 @@ public class ApiFeatures {
    */
   public static final int ANDROID_API_LEVEL = Integer.parseInt(
       Build.VERSION.SDK);
-  
-  private static final String PLATFORM_ADAPTER_GINGERBREAD =
-    "com.google.android.apps.mytracks.util.GingerbreadPlatformAdapter";
-  private static final String PLATFORM_ADAPTER_ECLAIR =
-    "com.google.android.apps.mytracks.util.EclairPlatformAdapter";
-  
+
   private static ApiFeatures instance;
   
   /**
@@ -67,30 +62,18 @@ public class ApiFeatures {
    * Allow subclasses for mocking, but no direct instantiation.
    */
   protected ApiFeatures() {
+    // It is safe to import unsupported classes as long as we only actually
+    // load the class when supported.
     if (getApiLevel() >= 9) {
-      apiPlatformAdapter = createPlatformAdapter(PLATFORM_ADAPTER_GINGERBREAD);
+      apiPlatformAdapter = new GingerbreadPlatformAdapter();
     } else if (getApiLevel() >= 5) {
-      apiPlatformAdapter = createPlatformAdapter(PLATFORM_ADAPTER_ECLAIR);
+      apiPlatformAdapter = new EclairPlatformAdapter();
     } else {
-      // Cupcake adapter is always supported, so it's safe to do static linkage.
       apiPlatformAdapter = new CupcakePlatformAdapter();
     }
-    
+
     Log.i(MyTracksConstants.TAG, "Using platform adapter " + apiPlatformAdapter.getClass());
   }
-  
-  private static ApiPlatformAdapter createPlatformAdapter(String className) {
-    try {
-      Class<?> clazz = Class.forName(className);
-      return (ApiPlatformAdapter) clazz.newInstance();
-    } catch (ClassNotFoundException e) {
-      throw new RuntimeException("ApiFeatures: Unable to find " + className, e);
-    } catch (InstantiationException e) {
-      throw new RuntimeException("ApiFeatures: Unable to instantiate " + className, e);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException("ApiFeatures: Unable to access " + className, e);
-    }
-  }
 
   public ApiPlatformAdapter getApiPlatformAdapter() {
     return apiPlatformAdapter;
diff --git a/MyTracksTest/.factorypath b/MyTracksTest/.factorypath
index fefa9e647..37f943be0 100644
--- a/MyTracksTest/.factorypath
+++ b/MyTracksTest/.factorypath
@@ -1,7 +1,6 @@
 <factorypath>
-    <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="WKSPJAR" id="/MyTracksTest/libs/AndroidMockGenerator.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="ANDROID_SDK/platforms/android-8/android.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="ANDROID_SDK/add-ons/addon_google_apis_google_inc_8/libs/maps.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="ANDROID_SDK/platforms/android-9/android.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="ANDROID_SDK/add-ons/addon_google_apis_google_inc_9/libs/maps.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="MYTRACKS_BIN" enabled="true" runInBatchMode="false"/>
 </factorypath>