Merge remote-tracking branch 'mjb/master'

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

diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 53af2a305b2bee9182c479e0436cbb8516248943..f803840607bc9cd8a15fd8614c5d87658981c690 100644 (file)
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -15,18 +15,19 @@
 -->
 
 <resources>
-    <string name="app_name">Bluetooth Chat</string>
+    <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>
-    <string name="title_connecting">connecting...</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="scanning">scanning for devices…</string>
     <string name="select_device">select a device to connect</string>
     <string name="none_paired">No devices have been paired</string>
     <string name="none_found">No devices found</string>
@@ -34,8 +35,25 @@
     <string name="title_other_devices">Other Available Devices</string>
     <string name="button_scan">Scan for devices</string>
 
-    <!-- Options Menu -->
-    <string name="secure_connect">Connect a device - Secure</string>
-    <string name="insecure_connect">Connect a device - Insecure</string>
-    <string name="discoverable">Make discoverable</string>
+    <!-- Service -->
+    <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>
+
+
+       <!-- UI fields -->
+    <string name="callsign_label">Callsign</string>
+    <string name="serial_label">Serial no.</string>
+    <string name="flight_label">Flight no.</string>
+    <string name="rssi_label">RSSI</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>