altosdroid: formatting/whitespace, correct ids

[fw/altos] / altosdroid / res / values / strings.xml

diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 249550fb7cfb32bbaa163dacafdc3f61742e6d3c..1bef6ec830a990b915c9ca21b631b174971b8d21 100644 (file)
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -17,14 +17,15 @@
 <resources>
     <string name="app_name">AltosDroid</string>
 
-    <!--  BluetoothChat -->
-    <string name="send">Send</string>
-    <string name="not_connected">You are not connected to a device</string>
-    <string name="bt_not_enabled_leaving">Bluetooth was not enabled. Leaving Bluetooth Chat.</string>
+    <!--  AltosDroid -->
+    <string name="bt_not_enabled">Bluetooth was not enabled.</string>
     <string name="title_connecting">connecting…</string>
     <string name="title_connected_to">connected: </string>
     <string name="title_not_connected">not connected</string>
 
+    <!-- Options Menu -->
+    <string name="connect_device">Connect a device</string>
+
     <!--  DeviceListActivity -->
     <string name="scanning">scanning for devices…</string>
     <string name="select_device">select a device to connect</string>
@@ -34,30 +35,22 @@
     <string name="title_other_devices">Other Available Devices</string>
     <string name="button_scan">Scan for devices</string>
 
-    <!-- Options Menu -->
-    <string name="connect_device">Connect a device</string>
-    <string name="telemetry_service_control">Control Service</string>
-    <string name="telemetry_service_bind">(Un)Bind Service</string>
-
     <!-- Service -->
-    <string name="telemetry_service_label">AltOS Telemetry Service</string>
+    <string name="telemetry_service_label">AltosDroid Telemetry Service</string>
     <string name="telemetry_service_started">Telemetry Service Started</string>
     <string name="telemetry_service_stopped">Telemetry Service Stopped</string>
 
 
-    <string name="activity_telemetry_service_controller">App/Service/Local Service Controller</string>
-    <string name="telemetry_service_controller">This demonstrates how you can implement persistent services that
-        may be started and stopped as desired.</string>
-    <string name="start_service">Start Service</string>
-    <string name="stop_service">Stop Service</string>
-
-    <string name="activity_telemetry_service_binding">App/Service/Local Service Binding</string>
-    <string name="telemetry_service_binding">This demonstrates how you can connect with a persistent
-        service.  Notice how it automatically starts for you, and play around with the
-        interaction between this and Local Service Controller.</string>
-    <string name="bind_service">Bind Service</string>
-    <string name="unbind_service">Unbind Service</string>
-    <string name="telemetry_service_connected">Connected to local service</string>
-    <string name="telemetry_service_disconnected">Disconnected from local service</string>
+       <!-- UI fields -->
+    <string name="callsign_label">Callsign</string>
+    <string name="state_label">State</string>
+    <string name="speed_label">Speed</string>
+    <string name="accel_label">Acceleration</string>
+    <string name="range_label">Range</string>
+    <string name="height_label">Height</string>
+    <string name="elevation_label">Elevation</string>
+    <string name="bearing_label">Bearing</string>
+    <string name="latitude_label">Latitude</string>
+    <string name="longitude_label">Longitude</string>
 
 </resources>