Conflicts: res/values-es/strings.xml src/com/owncloud/android/operations/SynchronizeFolderOperation.java