Closes #6617
This needs a bit of work to cleanup and translate the strings ... but what do you think about it?