Merge pull request #2 from chrox/master

add missing gettext and Menu module
Merge remote-tracking branch 'upstream/master'
add missing require for defining DEBUG
Merge pull request #337 from hwhw/master

add missing require for defining DEBUG in ConfigDialog