From 46ec8f55a101d11485d69ac3ea53be1d91d5da7a Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Mon, 29 Apr 2019 12:15:03 +0200
Subject: [PATCH] Improving labels

---
 app/src/main/res/values-fr/strings.xml | 2 +-
 app/src/main/res/values/strings.xml    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5fedd9a2..3e3b9d02 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -12,7 +12,7 @@
 
 	<!-- Not translated -->
 	<string name="address">Adresse</string>
-	<string name="suggestions">Suggestions</string>
+	<string name="suggestions">Suggestions de noms</string>
 	<string name="data_deleted" formatted="false">%s effacés</string>
 	<string name="end_date_not_possible">La date de fin doit être après la date de début</string>
 	<string name="save">Sauvegarder</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bd118771..9b5f049f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,11 +10,16 @@
     <string name="lines">Lines</string>
     <string name="initial_value">Initial Value</string>
     <string name="less_then_2_values_for_display">Can\'t show because there is less than two values to display!</string>
+<<<<<<< HEAD
     <!--<string name="session_missing_end_date">Please set the end date for the session</string>-->
+=======
+    <string name="invalid_object">The object you\'re trying to access is invalid</string>
+
+>>>>>>> 94f412c... Improving labels
     <!--<string name="default_error_message">Sorry, something went wrong...please contact us!</string>-->
 
     <string name="address">Address</string>
-    <string name="suggestions">Suggestions</string>
+    <string name="suggestions">Naming suggestions</string>
     <string name="data_deleted" formatted="false">%s deleted</string>
     <string name="end_date_not_possible">The end date should be after the start date</string>
     <string name="save">Save</string>