Sync translations with transifex
Merge remote-tracking branch 'upstream/master'
Correct the language in a couple of strings. Fixes #99.
Merge pull request #100 from flexiondotorg/master

Correct the language in a couple of strings. Fixes #99.
Sync translations with transifex
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into dev
git2 compatibility