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

[John Ralls <jralls src gnome org>]

commit 92d306faf6c88381653e0476ea40579360a8d9c7
Merge: 085c618 eab3d94
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jan 22 23:21:11 2011 -0800

    Merge branch 'master' into quartz-integration

 gdk/x11/checksettings.c   |    3 -
 gdk/x11/gdksettings.c     |    9 ++-
 gtk/gtkcellrenderertext.c |   17 ++--
 po-properties/he.po       |  132 +++++++++++++++-------------
 po/es.po                  |  216 +++++++++++++++++++++++---------------------
 po/et.po                  |   20 +++-
 po/he.po                  |  217 +++++++++++++++++++++++---------------------
 7 files changed, 327 insertions(+), 287 deletions(-)
---