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

[John Ralls <jralls src gnome org>]

commit 3572ca2b9a9a03ad85cb04b0e7fec1063defbee0
Merge: def2125 db4fa1a
Author: John Ralls <jralls ceridwen us>
Date:   Wed Feb 23 23:21:08 2011 -0800

    Merge branch 'master' into quartz-integration

 gdk/gdkdevicemanager.c            |   16 +-
 gdk/gdkwindow.c                   |    2 +-
 gdk/quartz/gdkeventloop-quartz.c  |    2 +-
 gdk/win32/gdkkeys-win32.c         |    2 +-
 gtk/gtkbuildable.c                |    2 +-
 gtk/gtkbutton.c                   |    4 +-
 gtk/gtkcellarea.c                 |   34 +-
 gtk/gtkcellareabox.c              |    2 +-
 gtk/gtkcellareacontext.c          |    6 +-
 gtk/gtkcellrenderer.c             |    4 +-
 gtk/gtkcellview.c                 |    8 +-
 gtk/gtkcontainer.c                |    2 +-
 gtk/gtkentry.c                    |    2 +-
 gtk/gtkiconview.c                 |   87 +-
 gtk/gtkmenu.c                     |    2 +-
 gtk/gtkrange.c                    |    2 +-
 gtk/gtkstylecontext.c             |    6 +-
 gtk/gtkstyleprovider.c            |    4 +-
 gtk/gtktestutils.c                |    2 +-
 gtk/gtktextview.c                 |    2 +-
 gtk/gtktoolpalette.c              |    4 +-
 gtk/gtktreemenu.c                 |   12 +-
 gtk/gtktreeviewcolumn.c           |    2 +-
 gtk/gtkwidget.c                   |    9 +-
 gtk/gtkwindow.c                   |    2 +-
 modules/other/gail/gailtreeview.c |    4 +-
 po-properties/zh_CN.po            | 4837 +++++++++++++++++++++----------------
 po/de.po                          |  580 +++--
 tests/cellareascaffold.c          |    4 +-
 29 files changed, 3216 insertions(+), 2429 deletions(-)
---