merging refs/heads/BlueGPS4Droid_1.1.x into master (1.2.x)

3 files changed, 92 insertions, 66 deletions

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d8215d8..c13a079 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -19,6 +19,8 @@
 	along with BluetoothGPS4Droid. If not, see : http://www.gnu.org/licenses/.

 -->

 <resources>

+    <string name="app_name">BlueGps</string>

+    

     <string name="pref_start_gps_title">Start/Stop GPS</string>

     <string name="pref_start_gps_summary_off">Le GPS Bluetooth est arrêté</string>

     <string name="pref_start_gps_summary_on">Le GPS Bluetooth est démarré</string>

@@ -76,6 +78,13 @@
     <string name="msg_gps_provider_started">GPS Bluetooth... démarré</string>

     <string name="msg_gps_provider_stopped">GPS Bluetooth... arrêté</string>

     <string name="msg_gps_provider_already_started">GPS Bluetooth... déjà démarré</string>

+    <string name="msg_gps_provider_stopped_by_problem">"Oups ! %s"</string>

+    <string name="msg_two_many_connection_problems">Problèmes de connexion</string>

+    <string name="msg_gps_provider_disabled">Le GPS est désactivé</string>

+    <string name="msg_bluetooth_unsupported">Bluetooth non disponible</string>

+    <string name="msg_bluetooth_disabled">Bluetooth désactivé</string>

+    <string name="msg_mock_location_disabled">Postitions fictives non autorisées</string>

+    <string name="msg_bluetooth_gps_unavaible">Impossible de se connecter au GPS</string>

     <string name="msg_nmea_recording_started">Enregistrement des traces NMEA... démarré</string>

     <string name="msg_nmea_recording_stopped">Enregistrement des traces NMEA... arrêté</string>

     <string name="msg_nmea_recording_already_started">Enregistrement des traces GPS... déjà démarré</string>

@@ -88,5 +97,5 @@
     	<item quantity="other">"Encore %d essais avant fermeture"</item>

     </plurals>

     <string name="service_closed_because_connection_problem_notification_title">BlueGps arrêté</string>

-    <string name="service_closed_because_connection_problem_notification">Motif : problèmes de connexion</string>

+    <string name="service_closed_because_connection_problem_notification">"Motif : %s"</string>

 </resources>

diff --git a/res/values/constants.xml b/res/values/constants.xml
new file mode 100644
index 0000000..b46b97d
--- /dev/null
+++ b/res/values/constants.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!-- 

+	Copyright (C) 2010 Herbert von Broeuschmeul

+	Copyright (C) 2010 BluetoothGPS4Droid Project

+	  

+	This file is part of BluetoothGPS4Droid.

+	

+	BluetoothGPS4Droid is free software: you can redistribute it and/or modify

+	it under the terms of the GNU General Public License as published by

+	the Free Software Foundation, either version 3 of the License, or

+	(at your option) any later version.

+	

+	BluetoothGPS4Droid is distributed in the hope that it will be useful,

+	but WITHOUT ANY WARRANTY; without even the implied warranty of

+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+	GNU General Public License for more details.

+	

+	You should have received a copy of the GNU General Public License

+	along with BluetoothGPS4Droid. If not, see : http://www.gnu.org/licenses/.

+-->

+<resources>

+    <string name="pref_start_gps_key">startGps</string>

+    <string name="pref_gps_location_provider_key">gpsLocationProviderKey</string>

+    <string name="pref_replace_std_gps_key">replaceStdtGps</string>

+    <string name="pref_mock_gps_name_key">mockGpsName</string>

+    <string name="pref_connection_retries_key">connectionRetries</string>

+    <string name="pref_recording_key">trackRecording</string>

+    <string name="pref_trackfile_directory_key">trackFileDirectory</string>

+    <string name="pref_trackfile_prefix_key">trackFilePrefix</string>

+    <string name="pref_bluetooth_device_key">bluetoothDevice</string>

+

+    <string name="pref_sirf_gps_key">sirfGps</string>

+    <string name="pref_sirf_enable_gll_key">enableGLL</string>

+    <string name="pref_sirf_enable_vtg_key">enableVTG</string>

+    <string name="pref_sirf_enable_gsa_key">enableGSA</string>

+    <string name="pref_sirf_enable_gsv_key">enableGSV</string>

+    <string name="pref_sirf_enable_zda_key">enableZDA</string>

+    <string name="pref_sirf_enable_sbas_key">enableSBAS</string>

+    <string name="pref_sirf_enable_nmea_key">enableNMEA</string>

+    <string name="pref_sirf_enable_static_navigation_key">enableStaticNavigation</string>

+

+    <string name="defaultConnectionRetries">0</string>

+    <string name="defaultTrackFileDirectory">/sdcard/nmea</string>

+    <string name="defaultTrackFilePrefix">btnmeatrack</string>

+    <string name="defaultMockGpsName">bluetooth_gps</string>

+

+    

+    <string name="sirf_nmea_gga_on">PSRF103,00,00,01,01</string>

+    <string name="sirf_nmea_rmc_on">PSRF103,04,00,01,01</string>

+    <string name="sirf_nmea_gll_on">PSRF103,01,00,01,01</string>

+    <string name="sirf_nmea_gll_off">PSRF103,01,00,00,01</string>

+    <string name="sirf_nmea_gsa_on">PSRF103,02,00,05,01</string>

+    <string name="sirf_nmea_gsa_off">PSRF103,02,00,00,01</string>

+    <string name="sirf_nmea_gsv_on">PSRF103,03,00,05,01</string>

+    <string name="sirf_nmea_gsv_off">PSRF103,03,00,00,01</string>

+    <string name="sirf_nmea_vtg_on">PSRF103,05,00,01,01</string>

+    <string name="sirf_nmea_vtg_off">PSRF103,05,00,00,01</string>

+    <string name="sirf_nmea_zda_on">PSRF103,08,00,01,01</string>

+    <string name="sirf_nmea_zda_off">PSRF103,08,00,00,01</string>

+

+    <string name="sirf_nmea_to_binary">PSRF100,0,38400,8,1,0</string>

+    

+    <string name="sirf_nmea_sbas_on">PSRF151,01</string>

+    <string name="sirf_nmea_sbas_off">PSRF151,00</string>

+    

+    <string name="sirf_bin_static_nav_on">8F01</string>

+    <string name="sirf_bin_static_nav_off">8F00</string> 

+    <string name="sirf_bin_to_nmea">8702</string>

+    <string name="sirf_bin_to_nmea_38400">810201010001050105010001000100010001000100019600</string>

+    <string name="sirf_bin_to_nmea_38400_alt">8102%02X01%02X01%02X01%02X01%02X01%02X01%02X01%02X01%02X0100019600</string>

+    <string name="sirf_bin_dgps_ext_on">85020000000000</string>

+    <string name="sirf_bin_dgps_sbas_on">85010000000000</string>

+    <string name="sirf_software_version">8400</string>   

+</resources>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4876fc2..98403fe 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,70 +21,6 @@
 <resources>

     <string name="app_name">BlueGps</string>

     

-    <string name="sirf_nmea_gga_on">PSRF103,00,00,01,01</string>

-    <string name="sirf_nmea_rmc_on">PSRF103,04,00,01,01</string>

-    <string name="sirf_nmea_gll_on">PSRF103,01,00,01,01</string>

-    <string name="sirf_nmea_gll_off">PSRF103,01,00,00,01</string>

-    <string name="sirf_nmea_gsa_on">PSRF103,02,00,05,01</string>

-    <string name="sirf_nmea_gsa_off">PSRF103,02,00,00,01</string>

-    <string name="sirf_nmea_gsv_on">PSRF103,03,00,05,01</string>

-    <string name="sirf_nmea_gsv_off">PSRF103,03,00,00,01</string>

-    <string name="sirf_nmea_vtg_on">PSRF103,05,00,01,01</string>

-    <string name="sirf_nmea_vtg_off">PSRF103,05,00,00,01</string>

-    <string name="sirf_nmea_zda_on">PSRF103,08,00,01,01</string>

-    <string name="sirf_nmea_zda_off">PSRF103,08,00,00,01</string>

-

-    <string name="sirf_nmea_to_binary">PSRF100,0,38400,8,1,0</string>

-    

-    <string name="sirf_nmea_sbas_on">PSRF151,01</string>

-    <string name="sirf_nmea_sbas_off">PSRF151,00</string>

-    

-<!--

-    <string name="sirf_sbas_on">$PSRF151,01*0F</string>

-    <string name="sirf_sbas_off">$PSRF151,00*0E</string>  

--->

-    <string name="sirf_bin_static_nav_on">8F01</string>

-    <string name="sirf_bin_static_nav_off">8F00</string> 

-    <string name="sirf_bin_to_nmea">8702</string>

-    <string name="sirf_bin_to_nmea_38400">810201010001050105010001000100010001000100019600</string>

-    <string name="sirf_bin_to_nmea_38400_alt">8102%02X01%02X01%02X01%02X01%02X01%02X01%02X01%02X01%02X0100019600</string>

-    <string name="sirf_bin_dgps_ext_on">85020000000000</string>

-    <string name="sirf_bin_dgps_sbas_on">85010000000000</string>

-    <string name="sirf_software_version">8400</string>

-    

-    

-    <!--

-    <string name="sirf_bin_to_nmea4800_1">A0A20018 8102010100010501050100010001000100010001000112C0 016AB0B3</string>

-    <string name="sirf_bin_to_nmea_on_2">A0A20002 8702 0089B0B3</string>

-    <string name="sirf_bin_dgps_ext_on">A0A20007 85020000000000 0087B0B3</string>

-    <string name="sirf_bin_dgps_sbas_on">A0A20007 85010000000000 0086B0B3</string>

-    -->

-    

-    <string name="pref_start_gps_key">startGps</string>

-    <string name="pref_gps_location_provider_key">gpsLocationProviderKey</string>

-    <string name="pref_replace_std_gps_key">replaceStdtGps</string>

-    <string name="pref_mock_gps_name_key">mockGpsName</string>

-    <string name="pref_connection_retries_key">connectionRetries</string>

-    <string name="pref_recording_key">trackRecording</string>

-    <string name="pref_trackfile_directory_key">trackFileDirectory</string>

-    <string name="pref_trackfile_prefix_key">trackFilePrefix</string>

-    <string name="pref_bluetooth_device_key">bluetoothDevice</string>

-    

-    <string name="pref_sirf_gps_key">sirfGps</string>

-    <string name="pref_sirf_enable_gll_key">enableGLL</string>

-    <string name="pref_sirf_enable_vtg_key">enableVTG</string>

-    <string name="pref_sirf_enable_gsa_key">enableGSA</string>

-    <string name="pref_sirf_enable_gsv_key">enableGSV</string>

-    <string name="pref_sirf_enable_zda_key">enableZDA</string>

-    <string name="pref_sirf_enable_sbas_key">enableSBAS</string>

-    <string name="pref_sirf_enable_nmea_key">enableNMEA</string>

-    <string name="pref_sirf_enable_static_navigation_key">enableStaticNavigation</string>

-

-    <string name="defaultConnectionRetries">5</string>

-    <string name="defaultTrackFileDirectory">/sdcard/nmea</string>

-    <string name="defaultTrackFilePrefix">btnmeatrack</string>

-    <string name="defaultMockGpsName">bluetooth_gps</string>

-    

     <string name="pref_start_gps_title">Start/Stop GPS</string>

     <string name="pref_start_gps_summary_off">Bluetooth GPS is off</string>

     <string name="pref_start_gps_summary_on">Bluetooth GPS is on</string>

@@ -145,6 +81,13 @@
     <string name="msg_gps_provider_started">Bluetooth GPS... started</string>

     <string name="msg_gps_provider_stopped">Bluetooth GPS... stopped</string>

     <string name="msg_gps_provider_already_started">Bluetooth GPS... is already on</string>

+    <string name="msg_gps_provider_stopped_by_problem">"Cannot start: %s"</string>

+    <string name="msg_two_many_connection_problems">Too many connection problems</string>

+    <string name="msg_gps_provider_disabled">GPS is disabled</string>

+    <string name="msg_bluetooth_unsupported">Bluetooth is not supported</string>

+    <string name="msg_bluetooth_disabled">Bluetooth is disabled</string>

+    <string name="msg_mock_location_disabled">Mock location is disabled</string>

+    <string name="msg_bluetooth_gps_unavaible">Cannot connect to bluetooth GPS</string>

     <string name="msg_nmea_recording_started">GPS NMEA recording... started</string>

     <string name="msg_nmea_recording_stopped">GPS NMEA recording... stopped</string>

     <string name="msg_nmea_recording_already_started">GPS track recording... is already on</string>

@@ -157,5 +100,5 @@
     	<item quantity="other">Will retry %d more times before closing</item>

     </plurals>

     <string name="service_closed_because_connection_problem_notification_title">BlueGps stopped</string>

-    <string name="service_closed_because_connection_problem_notification">Reason: too many connection problems</string>

+    <string name="service_closed_because_connection_problem_notification">"Reason: %"</string>

 </resources>