Add french string
merge
add javadoc