merge heads

2011-11-05 12:08:14 -07:00
parent 4e288e4b85
commit c26e63dec3
32 changed files with 1317 additions and 720 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_mymaps_url">maps.google.com</string>
  <string name="sendtogoogle_google_fusiontables_url">google.com/fusiontables</string>
@@ -31,7 +31,6 @@ limitations under the License.
  <string name="min_required_accuracy_key">minRequiredAccuracy</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>