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

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

commit bb8729d370b02f261e33d9408bab19b671ad6c8c
Merge: 8640bd2 9919968
Author: Jenkins <jenkins endlessm com>
Date:   Fri Aug 29 15:10:25 2014 -0700

    Merge branch 'master' for Release_2.1.5-rc2

 .../pages/display/gis-display-page.ui              |    2 +-
 .../pages/keyboard/cc-input-chooser.c              |   23 +++---
 .../pages/language/gis-language-page.ui            |   35 +++++++++-
 po/af.po                                           |   71 +++++++++++--------
 po/an.po                                           |   71 +++++++++++--------
 po/ar.po                                           |   56 +++++++++-------
 po/as.po                                           |   71 +++++++++++--------
 po/be.po                                           |   71 +++++++++++--------
 po/bg.po                                           |   71 +++++++++++--------
 po/bn_IN.po                                        |   71 +++++++++++--------
 po/ca.po                                           |   71 +++++++++++--------
 po/ca valencia po                                  |   71 +++++++++++--------
 po/cs.po                                           |   71 +++++++++++--------
 po/da.po                                           |   71 +++++++++++--------
 po/de.po                                           |   71 +++++++++++--------
 po/el.po                                           |   71 +++++++++++--------
 po/en_GB.po                                        |   71 +++++++++++--------
 po/eo.po                                           |   71 +++++++++++--------
 po/es.po                                           |   58 +++++++++-------
 po/et.po                                           |   71 +++++++++++--------
 po/eu.po                                           |   71 +++++++++++--------
 po/fa.po                                           |   71 +++++++++++--------
 po/fi.po                                           |   71 +++++++++++--------
 po/fr.po                                           |   58 +++++++++-------
 po/fur.po                                          |   71 +++++++++++--------
 po/ga.po                                           |   71 +++++++++++--------
 po/gl.po                                           |   71 +++++++++++--------
 po/gnome-initial-setup.pot                         |   54 ++++++++------
 po/gu.po                                           |   71 +++++++++++--------
 po/he.po                                           |   71 +++++++++++--------
 po/hi.po                                           |   71 +++++++++++--------
 po/hu.po                                           |   71 +++++++++++--------
 po/ia.po                                           |   71 +++++++++++--------
 po/id.po                                           |   71 +++++++++++--------
 po/it.po                                           |   71 +++++++++++--------
 po/ja.po                                           |   71 +++++++++++--------
 po/kk.po                                           |   71 +++++++++++--------
 po/kn.po                                           |   71 +++++++++++--------
 po/ko.po                                           |   71 +++++++++++--------
 po/lt.po                                           |   71 +++++++++++--------
 po/lv.po                                           |   71 +++++++++++--------
 po/ml.po                                           |   71 +++++++++++--------
 po/mr.po                                           |   71 +++++++++++--------
 po/nb.po                                           |   71 +++++++++++--------
 po/nl.po                                           |   71 +++++++++++--------
 po/or.po                                           |   71 +++++++++++--------
 po/pa.po                                           |   71 +++++++++++--------
 po/pl.po                                           |   71 +++++++++++--------
 po/pt.po                                           |   71 +++++++++++--------
 po/pt_BR.po                                        |   59 +++++++++-------
 po/ru.po                                           |   71 +++++++++++--------
 po/sk.po                                           |   73 +++++++++++---------
 po/sl.po                                           |   71 +++++++++++--------
 po/sr.po                                           |   71 +++++++++++--------
 po/sr latin po                                     |   71 +++++++++++--------
 po/sv.po                                           |   71 +++++++++++--------
 po/ta.po                                           |   71 +++++++++++--------
 po/te.po                                           |   71 +++++++++++--------
 po/tg.po                                           |   71 +++++++++++--------
 po/th.po                                           |   71 +++++++++++--------
 po/tr.po                                           |   71 +++++++++++--------
 po/ug.po                                           |   71 +++++++++++--------
 po/uk.po                                           |   71 +++++++++++--------
 po/vi.po                                           |   71 +++++++++++--------
 po/zh_CN.po                                        |   71 +++++++++++--------
 po/zh_HK.po                                        |   71 +++++++++++--------
 po/zh_TW.po                                        |   71 +++++++++++--------
 67 files changed, 2571 insertions(+), 1965 deletions(-)
---