Merged remote changes

2011-01-05 09:00:36 +01:00
parent ead876036d
commit cb533c954b
44 changed files with 3302 additions and 534 deletions
@@ -393,12 +393,16 @@ limitations under the License.

  <array name="sensor_type_options">
    <item>None</item>
+    <item>ANT+ Sensors</item>
+    <item>SRM ANT+ Bridge</item>
    <item>Zephyr Bluetooth</item>
  </array>

  <!-- DO NOT TRANSLATE -->
  <array name="sensor_type_values">
    <item>@string/none</item>
+    <item>@string/ant_sensor_type</item>
+    <item>@string/srm_ant_bridge_sensor_type</item>
    <item>@string/zephyr_sensor_type</item>
  </array>