Merge from popoutte - tests, french translation and new icons