Merge branch 'master' of https://github.com/osmandapp/Osmand

2015-02-06 15:52:50 +02:00 · 2015-02-06 15:52:50 +02:00 · 8939e88ea6
commit 8939e88ea6
parent 439693bedc 007ec92275
25 changed files with 2 additions and 2 deletions
--- a/OsmAnd/res/drawable-hdpi/expandable_category_empty_dark.png
+++ b/OsmAnd/res/drawable-hdpi/expandable_category_empty_dark.png
--- a/OsmAnd/res/drawable-hdpi/expandable_category_empty_light.png
+++ b/OsmAnd/res/drawable-hdpi/expandable_category_empty_light.png
--- a/OsmAnd/res/drawable-hdpi/expandable_category_pushed_dark.png
+++ b/OsmAnd/res/drawable-hdpi/expandable_category_pushed_dark.png
--- a/OsmAnd/res/drawable-hdpi/expandable_category_pushed_light.png
+++ b/OsmAnd/res/drawable-hdpi/expandable_category_pushed_light.png
--- a/OsmAnd/res/drawable-hdpi/expandable_category_unpushed_dark.png
+++ b/OsmAnd/res/drawable-hdpi/expandable_category_unpushed_dark.png
--- a/OsmAnd/res/drawable-hdpi/expandable_category_unpushed_light.png
+++ b/OsmAnd/res/drawable-hdpi/expandable_category_unpushed_light.png
--- a/OsmAnd/res/drawable-mdpi/expandable_category_empty_dark.png
+++ b/OsmAnd/res/drawable-mdpi/expandable_category_empty_dark.png
--- a/OsmAnd/res/drawable-mdpi/expandable_category_empty_light.png
+++ b/OsmAnd/res/drawable-mdpi/expandable_category_empty_light.png
--- a/OsmAnd/res/drawable-mdpi/expandable_category_pushed_dark.png
+++ b/OsmAnd/res/drawable-mdpi/expandable_category_pushed_dark.png
--- a/OsmAnd/res/drawable-mdpi/expandable_category_pushed_light.png
+++ b/OsmAnd/res/drawable-mdpi/expandable_category_pushed_light.png
--- a/OsmAnd/res/drawable-mdpi/expandable_category_unpushed_dark.png
+++ b/OsmAnd/res/drawable-mdpi/expandable_category_unpushed_dark.png
--- a/OsmAnd/res/drawable-mdpi/expandable_category_unpushed_light.png
+++ b/OsmAnd/res/drawable-mdpi/expandable_category_unpushed_light.png
--- a/OsmAnd/res/drawable-xhdpi/expandable_category_empty_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/expandable_category_empty_dark.png
--- a/OsmAnd/res/drawable-xhdpi/expandable_category_empty_light.png
+++ b/OsmAnd/res/drawable-xhdpi/expandable_category_empty_light.png
--- a/OsmAnd/res/drawable-xhdpi/expandable_category_pushed_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/expandable_category_pushed_dark.png
--- a/OsmAnd/res/drawable-xhdpi/expandable_category_pushed_light.png
+++ b/OsmAnd/res/drawable-xhdpi/expandable_category_pushed_light.png
--- a/OsmAnd/res/drawable-xhdpi/expandable_category_unpushed_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/expandable_category_unpushed_dark.png
--- a/OsmAnd/res/drawable-xhdpi/expandable_category_unpushed_light.png
+++ b/OsmAnd/res/drawable-xhdpi/expandable_category_unpushed_light.png
--- a/OsmAnd/res/drawable-xxhdpi/expandable_category_empty_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/expandable_category_empty_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/expandable_category_empty_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/expandable_category_empty_light.png
--- a/OsmAnd/res/drawable-xxhdpi/expandable_category_pushed_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/expandable_category_pushed_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/expandable_category_pushed_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/expandable_category_pushed_light.png
--- a/OsmAnd/res/drawable-xxhdpi/expandable_category_unpushed_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/expandable_category_unpushed_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/expandable_category_unpushed_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/expandable_category_unpushed_light.png
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -1918,8 +1918,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
    <string name="gps_status">Statut GPS</string>
    <string name="parking_place">Place de stationnement</string>
    <string name="remove_the_tag">Retirer l\'étiquette</string>
-    <string name="enable_plugin">Désactiver</string>
-	<string name="disable_plugin">Activer</string>
+    <string name="enable_plugin">Désactivé</string>
+	<string name="disable_plugin">Activé</string>
 <string name="plugin_description_title">Description</string>
 	<string name="plugin_settings_button_caption">Paramètres</string>
 <string name="edit_group">Modifier le groupe</string>