Fix ordering/spacing of in headers  #4133
Make strings more translateable #4133