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

[John Ralls <jralls src gnome org>]

commit 236201521f259e97f02d9fb7f1d277b8c91a65b0
Merge: f9b0206 22876d7
Author: John Ralls <jralls ceridwen us>
Date:   Fri Jan 14 23:21:24 2011 -0800

    Merge branch 'master' into quartz-integration

 build/win32/vs9/gdk-win32.vcproj          |    8 +-
 build/win32/vs9/gdk.vcprojin              |    8 +-
 build/win32/vs9/gtk-demo.vcproj           |    8 +-
 build/win32/vs9/gtk.vcprojin              |   10 +-
 configure.ac                              |   11 +-
 docs/reference/gtk/building.sgml          |   20 +-
 docs/reference/gtk/compiling.sgml         |    2 +-
 docs/reference/gtk/gtk3-sections.txt      |    4 +-
 docs/reference/gtk/other_software.sgml    |    2 +-
 docs/reference/gtk/question_index.sgml    |   27 +-
 docs/reference/gtk/resources.sgml         |    2 +-
 docs/reference/gtk/text_widget.sgml       |    2 +-
 docs/reference/gtk/tmpl/.gitignore        |    4 +
 docs/reference/gtk/tmpl/gtkmenushell.sgml |  224 -----
 docs/reference/gtk/tmpl/gtkprintjob.sgml  |  186 ----
 docs/reference/gtk/tmpl/gtkselection.sgml |  542 -----------
 docs/reference/gtk/tmpl/gtktexttag.sgml   |  498 ----------
 docs/reference/gtk/tree_widget.sgml       |    2 +-
 docs/reference/gtk/windows.sgml           |    2 +-
 docs/reference/gtk/x11.sgml               |    2 +-
 gdk/Makefile.am                           |   13 +-
 gtk/Makefile.am                           |   22 +-
 gtk/gtk.symbols                           |    2 +
 gtk/gtkcellrendereraccel.c                |  224 +++--
 gtk/gtkcontainer.c                        |    6 +-
 gtk/gtkcontainer.h                        |    7 +-
 gtk/gtkentry.c                            |   89 +--
 gtk/gtkenums.h                            |   23 +-
 gtk/gtkeventbox.c                         |    4 +
 gtk/gtkmain.c                             |    2 +-
 gtk/gtkmenushell.c                        |  115 +++
 gtk/gtkprintjob.c                         |   15 +
 gtk/gtkprintjob.h                         |   10 +
 gtk/gtkrange.c                            |   77 ++-
 gtk/gtkrange.h                            |    7 +-
 gtk/gtkscale.c                            |    8 +-
 gtk/gtkselection.c                        |   26 +
 gtk/gtkselection.h                        |  156 ++--
 gtk/gtkselectionprivate.h                 |   37 +
 gtk/gtkstylecontext.c                     |    2 +-
 gtk/gtktextattributes.h                   |    8 +
 gtk/gtktexttag.c                          |   16 +
 gtk/gtktextview.c                         |    1 +
 gtk/gtkthemingengine.c                    |   52 +-
 gtk/gtkwidget.c                           |    2 +-
 modules/engines/Makefile.am               |    2 +-
 modules/engines/ms-windows/msw_style.c    |   18 +-
 po-properties/gl.po                       |  583 ++++++------
 po/ug.po                                  | 1499 ++++++++++++++++-------------
 49 files changed, 1860 insertions(+), 2730 deletions(-)
---