Merge pull request #623 from lotan/develop

Parse ID3v2 genres translating IDs into names.
Fix some FR translation
Merge pull request #625 from arnaudbey/transl

Fix some FR translation
Merge branch 'upstream_develop' into develop