[fr] #2150, #2153, 3b1756f6, #2160, 19bbce7c

note for @cake17 I first added most of it in english, will translate when I get time, and also it's easier to review