Merge pull request #36 from eleybourn/master

Sync with master, including translations
Fix to FR strings (apostrophe without backslash)
Merge pull request #476 from Grunthos/master

Fix fr string