X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a7ee15e023d2bcd06f5f4a2c36981c0b56af06d4..3f2081e6073bd0c11d672890f350da80abc554b2:/res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index de85daac..0428f411 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -77,6 +77,7 @@
     <string name="filedetails_sync_file">Refresh</string>
 	<string name="filedetails_redownload">Redownload</string>
     <string name="filedetails_open">Open</string>
+    <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>
     <string name="common_ok">OK</string>
@@ -109,6 +110,10 @@
     <string name="sync_string_contacts">Contacts</string>
 	<string name="sync_fail_ticker">Synchronization failed</string>
     <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
+	<string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
+	<string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
+    <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
+	<string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
 	<string name="use_ssl">Use Secure Connection</string>
     <string name="location_no_provider">ownCloud cannot track your device. Please check your location settings</string>