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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ba2f78ca..071c4cb2 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>
@@ -341,6 +341,7 @@
 	<string name="with_you_subject_header">with you</string>
     
 	<string name="subject_token">%1$s shared \"%2$s\" with you</string>
+    <string name="saml_subject_token">\"%1$s\" has been shared with you</string>
 
     <string name="auth_refresh_button">Refresh connection</string>
     <string name="auth_host_address">Server address</string>
@@ -356,5 +357,6 @@
     <string name="file_list__footer__files">%1$d files</string>
     <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
     <string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
-
+    <string name="action_switch_grid_view">Switch to grid view</string>
+    <string name="action_switch_list_view">Switch to list view</string>
 </resources>