fixed wrong javadoc
french transalation
fixed wrong javadoc
fixed wrong javadoc
french transalation
Merge remote-tracking branch 'origin/master'