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

[John Ralls <jralls src gnome org>]

commit c76194b45b1cfa0a88d98c5ddeaf9518533f4185
Merge: 32b9bf1 ceeb50b
Author: John Ralls <jralls ceridwen us>
Date:   Fri Feb 4 23:21:10 2011 -0800

    Merge branch 'master' into quartz-integration

 demos/gtk-demo/images.c                         |    2 +-
 docs/reference/gtk/migrating-2to3.xml           |   78 +
 docs/reference/gtk/migrating-GtkApplication.xml |   16 +-
 docs/reference/gtk/objects_grouped.sgml         |    1 -
 examples/menu/Makefile                          |    9 +-
 examples/menu/itemfactory.c                     |  176 -
 gdk/keyname-table.h                             |   39 +
 gdk/x11/gdkdevice-xi2.c                         |   19 +-
 gdk/x11/gdkdevicemanager-core-x11.c             |  126 +-
 gdk/x11/gdkdevicemanager-xi2.c                  |  134 +-
 gdk/x11/gdkprivate-x11.h                        |    5 +-
 gtk/gtkaccelgroup.c                             |    7 +-
 gtk/gtkaccellabel.c                             |   21 +-
 gtk/gtkcssprovider.c                            |    2 +
 gtk/gtkrecentchoosermenu.c                      |    9 +-
 gtk/gtkstyle.c                                  |    9 +-
 gtk/gtkstylecontext.c                           |    2 +-
 gtk/gtktreeviewcolumn.c                         |    2 -
 gtk/gtkwidget.c                                 |    2 +-
 gtk/gtkwindow.c                                 |   20 +-
 po-properties/en.po                             | 7393 +++++++++++++++++++++++
 po/LINGUAS                                      |    1 +
 po/ar.po                                        |  605 ++-
 po/en.po                                        | 4405 ++++++++++++++
 tests/Makefile.am                               |    8 +-
 tests/testnoscreen.c                            |   47 +
 tests/testtreepos.c                             |  123 +
 27 files changed, 12650 insertions(+), 611 deletions(-)
---