This reverts commit 4e8c8e35de. Conflicts: res/values-ca/strings.xml res/values-cs/strings.xml res/values-da/strings.xml res/values-de/strings.xml res/values-el/strings.xml res/values-es/strings.xml res/values-fi/strings.xml res/values-fr-rCA/strings.xml res/values-fr/strings.xml res/values-gl/strings.xml res/values-hu/strings.xml res/values-it/strings.xml res/values-iw/strings.xml res/values-ja/strings.xml res/values-ko/strings.xml res/values-nl/strings.xml res/values-pl/strings.xml res/values-pt-rBR/strings.xml res/values-ru/strings.xml res/values-sv/strings.xml res/values-tr/strings.xml res/values-uk/strings.xml res/values-zh-rCN/strings.xml res/values-zh-rTW/strings.xml res/values/strings.xml
4e8c8e35de