original patch by Nick was not applyable, so small changes for i18n add manually