Can you undo all the changes to this file?
You can use the command ```git checkout v2.1-dev -- res/values-de/10-preferences.xml``` to do that.
Probably it is just a whitespace change, but since the file is updated by a script, it is easier to keep it unchanged.