Fixed sub-menus not being translated correctly.
Fixed merge conflict
Fixed some names
Merge pull request #16 from hex6/master

Fixed sub-menus and merge conflicts.