Main.html now using translation
Translation now in use on all user viewable strings
Translation update
Translation update
Merge fix