MINOR: Standardize the popups
Merge branch 'more-prettifying' into i18n-updates
Update strings