Merge pull request #334 from hwhw/master

Refactoring: Make globals local
Merge pull request #335 from chrox/master

add missing gettext and Menu module
Merge remote-tracking branch 'upstream/master'