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

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