Merge "Fix strings for translation"