Fix Number of thumbs in combined mode
French update (1 string)
Fix #824
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
corrections from merge