Conflicts: app/src/main/res/values-fr/strings.xml app/src/main/res/values-ja/strings.xml app/src/main/res/values-ro/strings.xml
Conflicts: app/src/main/res/values-fr/strings.xml app/src/main/res/values-ja/strings.xml app/src/main/res/values-ro/strings.xml