Some more localizations and get rid of duplicate id
Merge pull request #61 from ardiman/master

Some more localizations and get rid of duplicate id