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

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

commit bb2276b84879011c8adc31cc80394a33f600c761
Merge: 5f6f1b7 301722d
Author: Jenkins <jenkins endlessm com>
Date:   Fri Aug 1 15:51:43 2014 -0700

    Merge branch 'master' for Release_2.1.2-rc1

 gnome-initial-setup/gis-driver.c                   |   24 ++-
 gnome-initial-setup/gis-driver.h                   |    2 +
 .../pages/account/gis-account-page.c               |    5 +-
 .../pages/account/gis-account-page.ui              |  133 +++++++-----
 .../pages/location/gis-location-page.c             |   21 ++-
 .../pages/location/gis-location-page.ui            |  114 ++++++----
 .../pages/network/gis-network-page.ui              |   50 ++++-
 po/af.po                                           |  110 +++++-----
 po/an.po                                           |  110 +++++-----
 po/ar.po                                           |  110 +++++-----
 po/as.po                                           |  110 +++++-----
 po/be.po                                           |  110 +++++-----
 po/bg.po                                           |  110 +++++-----
 po/bn_IN.po                                        |  110 +++++-----
 po/ca.po                                           |  110 +++++-----
 po/ca valencia po                                  |  110 +++++-----
 po/cs.po                                           |  110 +++++-----
 po/da.po                                           |  110 +++++-----
 po/de.po                                           |  110 +++++-----
 po/el.po                                           |  110 +++++-----
 po/en_GB.po                                        |  110 +++++-----
 po/eo.po                                           |  106 +++++-----
 po/es.po                                           |  226 +++++++++++---------
 po/et.po                                           |  110 +++++-----
 po/eu.po                                           |  110 +++++-----
 po/fa.po                                           |  110 +++++-----
 po/fi.po                                           |  110 +++++-----
 po/fr.po                                           |  110 +++++-----
 po/fur.po                                          |  110 +++++-----
 po/ga.po                                           |  110 +++++-----
 po/gl.po                                           |  110 +++++-----
 po/gnome-initial-setup.pot                         |  140 ++++++++-----
 po/gu.po                                           |  110 +++++-----
 po/he.po                                           |  110 +++++-----
 po/hi.po                                           |  110 +++++-----
 po/hu.po                                           |  110 +++++-----
 po/ia.po                                           |  110 +++++-----
 po/id.po                                           |  110 +++++-----
 po/it.po                                           |  110 +++++-----
 po/ja.po                                           |  110 +++++-----
 po/kk.po                                           |  110 +++++-----
 po/kn.po                                           |  110 +++++-----
 po/ko.po                                           |  110 +++++-----
 po/lt.po                                           |  110 +++++-----
 po/lv.po                                           |  110 +++++-----
 po/ml.po                                           |  110 +++++-----
 po/mr.po                                           |  110 +++++-----
 po/nb.po                                           |  110 +++++-----
 po/nl.po                                           |  110 +++++-----
 po/or.po                                           |  110 +++++-----
 po/pa.po                                           |  110 +++++-----
 po/pl.po                                           |  110 +++++-----
 po/pt.po                                           |  110 +++++-----
 po/pt_BR.po                                        |  145 ++++++++-----
 po/ru.po                                           |  110 +++++-----
 po/sk.po                                           |  120 +++++------
 po/sl.po                                           |  110 +++++-----
 po/sr.po                                           |  110 +++++-----
 po/sr latin po                                     |  110 +++++-----
 po/sv.po                                           |  110 +++++-----
 po/ta.po                                           |  110 +++++-----
 po/te.po                                           |  110 +++++-----
 po/tg.po                                           |  110 +++++-----
 po/th.po                                           |  110 +++++-----
 po/tr.po                                           |  110 +++++-----
 po/ug.po                                           |  110 +++++-----
 po/uk.po                                           |  110 +++++-----
 po/vi.po                                           |  110 +++++-----
 po/zh_CN.po                                        |  110 +++++-----
 po/zh_HK.po                                        |  110 +++++-----
 po/zh_TW.po                                        |  110 +++++-----
 71 files changed, 3776 insertions(+), 3800 deletions(-)
---