Translations:Manual:Merging histories/6/fr