X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/6698b2d5f109df7db935ff5e962a631167391076..1327ce731589bb5454047ea4a71314c4f24ef322:/res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 22cf669d..ba2f78ca 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -268,8 +268,8 @@
     <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>
+    <string name="conflict_use_local_version">Use local version</string>
+    <string name="conflict_use_server_version">Use server version</string>
     
     <string name="preview_image_description">Image preview</string>
     <string name="preview_image_error_unknown_format">This image cannot be shown</string>