merged the translation over to using my templates

Benjamin Mako Hill || Want to submit a patch?