update template, merge french translation
svn: r16432
This commit is contained in:
1 parent
e859d38ab3
commit
384b081489
2 files changed
+1936
-1438