aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorHerbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>2010-11-04 18:37:18 +0100
committerHerbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>2010-11-04 18:37:18 +0100
commit14b495f76c3b5befae3748d29a6de8e76a661e61 (patch)
tree1e6665147e54fb632cdce06e48599b1a6583714c /res
parent513a2b910899567f0a37bf8186d8b1878eac9476 (diff)
parent610916025f1a08b10a51633d42adc7014d6c71d0 (diff)
downloadBlueGPS-14b495f76c3b5befae3748d29a6de8e76a661e61.zip
BlueGPS-14b495f76c3b5befae3748d29a6de8e76a661e61.tar.gz
BlueGPS-14b495f76c3b5befae3748d29a6de8e76a661e61.tar.bz2
merging refs/heads/dev_1.1.x into HEAD
Diffstat (limited to 'res')
-rw-r--r--res/values-fr/strings.xml2
-rw-r--r--res/values/strings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0e3f14b..fd0a090 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -89,7 +89,7 @@
<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_mock_location_disabled">Positions 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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9629cb1..197b4c7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -92,7 +92,7 @@
<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_mock_location_disabled">Mock locations 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>