From 5d9af268996d502b840608e5f2b3b6ffc68b3c2a Mon Sep 17 00:00:00 2001
From: Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>
Date: Sun, 24 Oct 2010 22:14:32 +0200
Subject: Separate localized string from other values.

All localized strings are now in the string.xml files
while constants, defaults values and prefrerence keys are in constants.xml
---
 res/values-fr/strings.xml |  2 ++
 res/values/constants.xml  | 36 ++++++++++++++++++++++++++++++++++++
 res/values/strings.xml    | 14 --------------
 3 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 res/values/constants.xml

(limited to 'res')

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6cbb744..155ed80 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>
diff --git a/res/values/constants.xml b/res/values/constants.xml
new file mode 100644
index 0000000..bdbf3d9
--- /dev/null
+++ b/res/values/constants.xml
@@ -0,0 +1,36 @@
+<?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="defaultConnectionRetries">0</string>
+    <string name="defaultTrackFileDirectory">/sdcard/nmea</string>
+    <string name="defaultTrackFilePrefix">btnmeatrack</string>
+    <string name="defaultMockGpsName">bluetooth_gps</string>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 81710f7..c538625 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,20 +20,6 @@
 -->
 <resources>
     <string name="app_name">BlueGps</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="defaultConnectionRetries">0</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>
-- 
cgit v1.1


From 5b11f327cf16eeecd279aaed8b384385c0f5fa10 Mon Sep 17 00:00:00 2001
From: Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>
Date: Sun, 24 Oct 2010 23:41:55 +0200
Subject: add alert messages when bluetooth GPS connection cannot be enabled

---
 res/values-fr/strings.xml | 5 +++++
 res/values/strings.xml    | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'res')

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 155ed80..fc46e65 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -47,6 +47,11 @@
     <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_disabled">Oups ! Le GPS est désactivé</string>
+    <string name="msg_bluetooth_unsupported">Oups ! Bluetooth non disponible</string>
+    <string name="msg_bluetooth_disabled">Oups ! Bluetooth désactivé</string>
+    <string name="msg_mock_location_disabled">Oups ! 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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c538625..cc9c0d6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -50,6 +50,11 @@
     <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_disabled">Cannot start: GPS is disabled</string>
+    <string name="msg_bluetooth_unsupported">Cannot start: Bluetooth is not supported</string>
+    <string name="msg_bluetooth_disabled">Cannot start: Bluetooth is disabled</string>
+    <string name="msg_mock_location_disabled">Cannot start: 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>
-- 
cgit v1.1


From a3b73fd4921983fda49f0efa485a894e1c87c5ba Mon Sep 17 00:00:00 2001
From: Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>
Date: Tue, 26 Oct 2010 02:49:21 +0200
Subject: add notifications when service cannot be started

* add notification when service cannot be started
---
 res/values-fr/strings.xml | 12 +++++++-----
 res/values/strings.xml    | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'res')

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index fc46e65..4d558df 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -47,10 +47,12 @@
     <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_disabled">Oups ! Le GPS est désactivé</string>
-    <string name="msg_bluetooth_unsupported">Oups ! Bluetooth non disponible</string>
-    <string name="msg_bluetooth_disabled">Oups ! Bluetooth désactivé</string>
-    <string name="msg_mock_location_disabled">Oups ! Postitions fictives non autorisées</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>
@@ -64,5 +66,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/strings.xml b/res/values/strings.xml
index cc9c0d6..410ea35 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -50,10 +50,12 @@
     <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_disabled">Cannot start: GPS is disabled</string>
-    <string name="msg_bluetooth_unsupported">Cannot start: Bluetooth is not supported</string>
-    <string name="msg_bluetooth_disabled">Cannot start: Bluetooth is disabled</string>
-    <string name="msg_mock_location_disabled">Cannot start: Mock location is disabled</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>
@@ -67,5 +69,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>
-- 
cgit v1.1