fix 4 gettext!
Merge branch 'origin/master'