Merge pull request #1 from makrohn/master

sync with upstream
regenerate the translation template
update a bit my translation. Now by 65%
Merge pull request #70 from mquinson/master

 update a bit my translation. Now by 65%