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

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

commit 1ac897ae06951824f9a02506952455a33a0d68b8
Merge: 2ab9c02 8849465
Author: Jenkins <jenkins endlessm com>
Date:   Tue Aug 12 18:50:56 2014 -0700

    Merge branch 'master' for Release_2.1.3-rc6

 .../pages/display/display-overscan.png             |  Bin 0 -> 26233 bytes
 .../pages/display/display.gresource.xml            |    1 +
 .../pages/display/gis-display-page.c               |  136 +++++++++++++------
 .../pages/display/gis-display-page.ui              |   90 ++++++++++---
 po/af.po                                           |  139 ++++++++++++++-----
 po/an.po                                           |  139 ++++++++++++++-----
 po/ar.po                                           |   31 +++--
 po/as.po                                           |  139 ++++++++++++++-----
 po/be.po                                           |  139 ++++++++++++++-----
 po/bg.po                                           |  139 ++++++++++++++-----
 po/bn_IN.po                                        |  128 +++++++++++++-----
 po/ca.po                                           |  139 ++++++++++++++-----
 po/ca valencia po                                  |  139 ++++++++++++++-----
 po/cs.po                                           |  139 ++++++++++++++-----
 po/da.po                                           |  139 ++++++++++++++-----
 po/de.po                                           |  141 ++++++++++++++-----
 po/el.po                                           |  141 ++++++++++++++-----
 po/en_GB.po                                        |  139 ++++++++++++++-----
 po/eo.po                                           |  138 ++++++++++++++-----
 po/es.po                                           |   40 +++---
 po/et.po                                           |  139 ++++++++++++++-----
 po/eu.po                                           |  139 ++++++++++++++-----
 po/fa.po                                           |  139 ++++++++++++++-----
 po/fi.po                                           |  139 ++++++++++++++-----
 po/fr.po                                           |  139 ++++++++++++++-----
 po/fur.po                                          |  139 ++++++++++++++-----
 po/ga.po                                           |  129 +++++++++++++-----
 po/gl.po                                           |  139 ++++++++++++++-----
 po/gnome-initial-setup.pot                         |   28 ++--
 po/gu.po                                           |  139 ++++++++++++++-----
 po/he.po                                           |  139 ++++++++++++++-----
 po/hi.po                                           |  139 ++++++++++++++-----
 po/hu.po                                           |  139 ++++++++++++++-----
 po/ia.po                                           |  139 ++++++++++++++-----
 po/id.po                                           |  139 ++++++++++++++-----
 po/it.po                                           |  139 ++++++++++++++-----
 po/ja.po                                           |  139 ++++++++++++++-----
 po/kk.po                                           |  139 ++++++++++++++-----
 po/kn.po                                           |  139 ++++++++++++++-----
 po/ko.po                                           |  139 ++++++++++++++-----
 po/lt.po                                           |  139 ++++++++++++++-----
 po/lv.po                                           |  139 ++++++++++++++-----
 po/ml.po                                           |  139 ++++++++++++++-----
 po/mr.po                                           |  139 ++++++++++++++-----
 po/nb.po                                           |  139 ++++++++++++++-----
 po/nl.po                                           |  139 ++++++++++++++-----
 po/or.po                                           |  139 ++++++++++++++-----
 po/pa.po                                           |  137 ++++++++++++++-----
 po/pl.po                                           |  139 ++++++++++++++-----
 po/pt.po                                           |  139 ++++++++++++++-----
 po/pt_BR.po                                        |   40 +++---
 po/ru.po                                           |  139 ++++++++++++++-----
 po/sk.po                                           |  143 +++++++++++++++-----
 po/sl.po                                           |  139 ++++++++++++++-----
 po/sr.po                                           |  139 ++++++++++++++-----
 po/sr latin po                                     |  139 ++++++++++++++-----
 po/sv.po                                           |  129 +++++++++++++-----
 po/ta.po                                           |  139 ++++++++++++++-----
 po/te.po                                           |  139 ++++++++++++++-----
 po/tg.po                                           |  139 ++++++++++++++-----
 po/th.po                                           |  129 +++++++++++++-----
 po/tr.po                                           |  139 ++++++++++++++-----
 po/ug.po                                           |  139 ++++++++++++++-----
 po/uk.po                                           |  139 ++++++++++++++-----
 po/vi.po                                           |  139 ++++++++++++++-----
 po/zh_CN.po                                        |  137 ++++++++++++++-----
 po/zh_HK.po                                        |  137 ++++++++++++++-----
 po/zh_TW.po                                        |  137 ++++++++++++++-----
 68 files changed, 6442 insertions(+), 2222 deletions(-)
---