follow #1936
follow #1935
follow #1938
Merge pull request #1946 from cakephp/fr-updates

[fr] updates