Cleanup

P.S. Anyone knows what tab space should I use in order to get the same result in github, Git Extensions and my text editor?
Merge remote-tracking branch 'upstream/master' into N2C11
Updated Locales
Merge pull request #126 from nelegalno/N2C11

N2C11