Some translation fixes at the beginning and mostly cosmetics at the end.
Merge pull request #22 from lcartier/patch-4

Some translation fixes at the beginning and mostly cosmetics at the end.