Adds a few new translations and fixes some merge conflicts caused by removing brand_strings.xml files