Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Polish l10n works
Merge pull request #27 from Chocimier/master

Further localisation