[-] BO : Fix bug #PSCFV-12272, can not translate theme overriden mails
// fixed issue where strings in files included with ./something.tpl did not have translation
Merge pull request #2273 from djfm/release

// fixed issue where strings in files included with ./something.tpl did ...
// undefined var
[-] BO : Fix bug #PSCSX-3893, Prev/ next buttons on order page does not check current Shop selection
// oops