X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7df9aa7310ca252571747003df35bee057828488..d2df3f9b33263b63069aebc249475b1da31efd03:/res/values/strings.xml?ds=sidebyside

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 21b840c2..ba2f78ca 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -200,7 +200,7 @@
 	<string name="auth_can_not_auth_against_server">Cannot authenticate against this server</string>
     <string name="auth_account_does_not_exist">Account does not exist in the device yet</string>
     
-    <string name="fd_keep_in_sync">Favorite</string>
+    <string name="favorite">Favorite</string>
     <string name="unfavorite">Unfavorite</string>
     <string name="common_rename">Rename</string>
     <string name="common_remove">Remove</string>
@@ -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>