renamed string values

[pub/Android/ownCloud.git] / res / values-en-rGB / strings.xml

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 3227e4a..b42c38f 100644 (file)
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -250,8 +250,8 @@
   <string name="conflict_title">Update conflict</string>
   <string name="conflict_message">Remote file %s is not synchronised 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">Overwrite</string>
+  <string name="conflict_use_server_version">Don\'t upload</string>
   <string name="preview_image_description">Image preview</string>
   <string name="preview_image_error_unknown_format">This image cannot be shown</string>
   <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>