[gnome-initial-setup/shell/4765: 175/362] Merge branch 'master' for Release_2.1.5-rc1

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

commit 8640bd295bac8896f7cb5d9018ae7f7d632a9e46
Merge: 1ac897a ce21d5b
Author: Jenkins <jenkins endlessm com>
Date:   Tue Aug 26 16:09:31 2014 -0700

    Merge branch 'master' for Release_2.1.5-rc1

 gnome-initial-setup/gis-driver.c                   |   24 ++-
 gnome-initial-setup/gis-driver.h                   |    2 +
 .../pages/account/gis-account-page.c               |   26 +++
 .../pages/account/gis-account-page.ui              |   14 ++-
 .../pages/language/cc-common-language.c            |    1 +
 .../pages/language/gis-language-page.c             |   11 +-
 .../pages/language/gis-language-page.ui            |   22 ++-
 .../pages/network/gis-network-page.c               |   56 ++++---
 po/ar.po                                           |   90 +++++-----
 po/fr.po                                           |  201 ++++++++------------
 10 files changed, 249 insertions(+), 198 deletions(-)
---