A bit of cleanup for non english menu shortcut code.
Merge pull request #713 from monkeyiq/2013sep/hk-non-english-cleanup

A bit of cleanup for non english menu shortcut code.