-fr/strings.xml Conflicts: src/com/owncloud/android/datamodel/FileDataStorageManager.java src/com/owncloud/android/datamodel/OCFile.java