Easy Merge

Lionel,

  I've created a pull request that should merge **automatically**.  This means you can accept the pull request through the web interface and then simply update the repository on your local machine (or re-clone the repository, your choice) and have the latest versions of the .po files to work with.