[gnome-initial-setup/shell/4765: 228/362] Merge branch 'master' for Release_2.1.6-rc7

[Jasper St. Pierre <jstpierre src gnome org>]

commit b81a13cc6a566553c31d2bd756aef33493546ac5
Merge: 4aaf5bd cde5626
Author: Jenkins <jenkins endlessm com>
Date:   Tue Sep 16 21:11:49 2014 -0700

    Merge branch 'master' for Release_2.1.6-rc7

 gnome-initial-setup/Makefile.am                    |    3 +-
 gnome-initial-setup/gis-driver.c                   |   57 +---
 gnome-initial-setup/gis-window.c                   |  155 +++++++++
 gnome-initial-setup/gis-window.h                   |   62 ++++
 gnome-initial-setup/gnome-initial-setup.c          |    1 -
 .../pages/display/gis-display-page.c               |   15 +-
 .../pages/keyboard/gis-keyboard-page.c             |   63 +++-
 .../pages/language/cc-common-language.c            |    8 +-
 .../pages/language/gis-language-page.ui            |    1 +
 po/af.po                                           |  225 ++++++--------
 po/ca.po                                           |  241 ++++++--------
 po/el.po                                           |  351 ++++++--------------
 po/gu.po                                           |  248 +++++---------
 po/mr.po                                           |  314 ++++++------------
 po/vi.po                                           |  288 +++++-----------
 15 files changed, 862 insertions(+), 1170 deletions(-)
---