Switch labels on login page to be consistent with alternate language files
Merge branch 'trello-60' into dryad-dev