[gnome-initial-setup/shell/4765: 142/362] Merge branch 'master' for Release_2.1.3-rc2

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

commit 10d8f4eb81f6a43c4674b43735f7cf146583e8a4
Merge: 42ebb76 484ef1b
Author: Jenkins <jenkins endlessm com>
Date:   Thu Aug 7 16:59:22 2014 -0700

    Merge branch 'master' for Release_2.1.3-rc2

 configure.ac                                       |    1 +
 gnome-initial-setup/Makefile.am                    |    1 +
 gnome-initial-setup/gnome-initial-setup.c          |    3 +
 gnome-initial-setup/pages/Makefile.am              |    1 +
 gnome-initial-setup/pages/display/.gitignore       |    1 +
 gnome-initial-setup/pages/display/Makefile.am      |   27 +++
 .../pages/display/display.gresource.xml            |    7 +
 .../pages/display/gis-display-page.c               |  219 ++++++++++++++++++++
 .../pages/display/gis-display-page.h               |   57 +++++
 .../pages/display/gis-display-page.ui              |   84 ++++++++
 po/POTFILES.in                                     |    2 +
 po/ar.po                                           |   33 +++-
 po/es.po                                           |   31 +++-
 po/gnome-initial-setup.pot                         |   30 +++-
 po/pt_BR.po                                        |   49 ++++--
 15 files changed, 521 insertions(+), 25 deletions(-)
---