[gtk+/quartz-integration: 14/14] Merge branch 'master' into quartz-integration

[John Ralls <jralls src gnome org>]

commit e084d4f89c8008f352dab400c9c1cb8e5f84191a
Merge: 0f07f62 f9e685e
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jan 8 23:21:09 2011 -0800

    Merge branch 'master' into quartz-integration

 gtk/gtk.symbols         |    1 +
 gtk/gtkcelllayout.c     |  337 ++--
 gtk/gtkcssprovider.c    |    7 +-
 gtk/gtkmodules.h        |    7 +-
 gtk/gtkplug-x11.c       |   88 +-
 gtk/gtkprogressbar.c    |   10 +
 gtk/gtkscrolledwindow.c |   15 +
 gtk/gtksymboliccolor.c  |    6 +-
 gtk/gtktreeprivate.h    |    5 +
 gtk/gtktreeview.c       |  103 ++
 gtk/gtktreeview.h       |    7 +
 gtk/gtktreeviewcolumn.c |   55 +-
 gtk/gtkwidget.c         |    2 +-
 po-properties/en_GB.po  | 4433 ++++++++++++++++++++++++++---------------------
 po/en_GB.po             | 1030 ++++++-----
 po/es.po                |  827 +++++----
 po/id.po                | 1071 +++++++-----
 17 files changed, 4528 insertions(+), 3476 deletions(-)
---