fix many localization issues
Merge pull request #34 from kariminf/master

fix many localization issues