Merge proposals dependent on lp://qastaging/~guidtz/ubuntu-desktop-course/ubuntu-desktop-course-french-guidtz

1. ubuntu-desktop-course-french-guidtz
2. Dependent merge proposals