Merge branch 'fr-po' of git://github.com/jnavila/git