Modifications provided by Guy S.
Proposal provided by L10N on bugs.cacert.org
Corrections for the french translation
https://bugs.cacert.org/view.php?id=970
Convert line ending to Windows. New proposal for french translation
Merge commit 'origin/release' into bug-970
Add version of L1ON (https://bugs.cacert.org/view.php?id=970#c4098)
Merge branch 'release' of git@github.com:bergerc/cats into bug-970

Conflicts:

	lang/french.php
manually resolved
Merge branch 'bug-970' into testserver