NOJIRA Improve I18N
Merge pull request #40 from vbonamy/I18N_IMPROVE

NOJIRA Improve I18N