Merge "Update strings and tag it translatable" into sc-dev