Update translation strings for new variable interpolation format
Fix up whitespace.
Merge branch 'develop'