Translation update, and fixed bad merge in fr_FR