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

[John Ralls <jralls src gnome org>]

commit bfbffaee90bf3d1fdd80b4b12abceb423331a209
Merge: 29d8bd8 6d6b38c
Author: John Ralls <jralls ceridwen us>
Date:   Tue Jan 11 23:21:10 2011 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/migrating-2to3.xml              |    4 +-
 docs/reference/gtk/question_index.sgml             |   22 +-
 gdk/Makefile.am                                    |    9 +-
 gdk/gdkx.h                                         |   33 +
 gdk/win32/Makefile.am                              |    1 +
 gdk/win32/gdkprivate-win32.h                       |    1 -
 gtk/Makefile.am                                    |    9 +-
 gtk/gtk.h                                          |    1 +
 gtk/gtk.symbols                                    |   15 +-
 gtk/gtkappchooserbutton.c                          |    2 +
 gtk/gtkappchooserwidget.c                          |    2 +
 gtk/gtkcellareabox.c                               |   22 +-
 gtk/gtkcellareaboxcontext.c                        |   80 +-
 ...boxcontext.h => gtkcellareaboxcontextprivate.h} |   28 +-
 gtk/gtkmain.c                                      |    9 +-
 gtk/gtkmain.h                                      |    2 +-
 gtk/gtknumerableicon.c                             |    2 +-
 gtk/gtkstylecontext.c                              |    3 +
 gtk/gtkstylecontext.h                              |   31 +-
 gtk/gtktextattributes.c                            |  348 +++
 gtk/gtktextattributes.h                            |  166 +
 gtk/gtktextiter.h                                  |    3 +-
 gtk/gtktexttag.c                                   |  295 --
 gtk/gtktexttag.h                                   |  102 -
 modules/input/gtkimcontextime.c                    |    4 +
 po-properties/he.po                                | 3171 +++++++++++---------
 po/ar.po                                           | 1031 ++++---
 tests/cellareascaffold.c                           |    2 -
 tests/gtkoffscreenbox.c                            |    1 -
 29 files changed, 3002 insertions(+), 2397 deletions(-)
---