Merge branch 'new-debian' into debian

Conflicts:
	ChangeLog
	debian/altos.install
	debian/changelog
	debian/control
	debian/copyright
	debian/dirs
	debian/docs
	debian/menu
	debian/rules
	src/Makefile

1 files changed, 60 insertions, 0 deletions

diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
new file mode 100644
index 00000000..1b28284a
--- /dev/null
+++ b/altosdroid/res/values/strings.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <string name="app_name">AltosDroid</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>
+    <string name="select_freq">Select radio frequency</string>
+
+    <!--  DeviceListActivity -->
+    <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>
+    <string name="title_paired_devices">Paired Devices</string>
+    <string name="title_other_devices">Other Available Devices</string>
+    <string name="button_scan">Scan for devices</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>