From 156cb5e81b63ca1d3d79ba446a32470aa5e2e78b Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Tue, 4 Aug 2015 17:29:42 +0200
Subject: [PATCH] Updated conflict message (same as in web app)

---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ba2f78ca..d7c45b87 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -265,8 +265,8 @@
     <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
     <string name="instant_video_upload_on_wifi">Upload videos via WiFi only</string>
     <string name="instant_upload_path">/InstantUpload</string>
-    <string name="conflict_title">Update conflict</string>
-    <string name="conflict_message">Remote file %s is not synchronized with local file. Continuing will replace content of file on server.</string>
+    <string name="conflict_title">File conflict</string>
+    <string name="conflict_message">Which files do you want to keep? If you select both versions, the local file will have a number added to its name.</string>
     <string name="conflict_keep_both">Keep both</string>
     <string name="conflict_use_local_version">Use local version</string>
     <string name="conflict_use_server_version">Use server version</string>
-- 
2.11.0