Issue #1257326 by attiks: Applied patch i1257326.patch with some code correction and better use of the t() function by attiks.