X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/8f2314d80e9bebbc63696eb8d72841372ad4de9c..0f1065e53a3cb411a3eb12417cf76fe4d64944cb:/res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 12fbdf6a..7b9fa890 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -200,4 +200,9 @@
     <string name="text_placeholder">This is a placeholder</string>
     
     <string name="instant_upload_on_wifi">Upload pictures via WiFi only</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_keep_both">Keep both</string>
+    <string name="conflict_overwrite">Overwrite</string>
+    <string name="conflict_dont_upload">Don\'t upload</string>
 </resources>