merge heads

2011-11-07 09:27:10 -08:00
parent 96d8397787 014e5257d0
commit 32bc71ae0f
30 changed files with 1246 additions and 680 deletions
@@ -41,6 +41,9 @@ limitations under the License.
  <string name="track_color_mode_value_fixed">FIXED</string>
  <string name="track_color_mode_value_dynamic">DYNAMIC</string>

+  <!-- When a value is unknown. E.g. when speed is unknown '- km/hr'. -->
+  <string name="unknown">-</string>
+      
  <!-- Send to Google URLs -->
  <string name="sendtogoogle_google_fusiontables_url">google.com/fusiontables</string>
  <string name="sendtogoogle_google_mymaps_url">maps.google.com</string>
@@ -34,7 +34,6 @@ limitations under the License.
  <string name="modular_stats_display_key">modularStatsDisplay</string>
  <string name="pick_existing_map_key">pickExistingMap</string>
  <string name="report_speed_key">reportSpeed</string>
-  <string name="send_stats_and_points_key">sendStatsAndPoints</string>
  <string name="send_to_docs_key">sendToDocs</string>
  <string name="send_to_fusion_tables_key">sendToFusionTables</string>
  <string name="send_to_my_maps_key">sendToMyMaps</string>