[gtk+: 2/2] Merge ssh://git.gnome.org/git/gtk+

[Chun-wei Fan <fanchunwei src gnome org>]

commit e9319c618212f385d5e3702cc86c51bd87970356
Merge: f792660 867dc0b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Sat Jan 15 12:42:52 2011 +0800

    Merge ssh://git.gnome.org/git/gtk+

 NEWS                                             |   24 +-
 configure.ac                                     |   13 +-
 docs/reference/gtk/building.sgml                 |   20 +-
 docs/reference/gtk/compiling.sgml                |    2 +-
 docs/reference/gtk/gtk-builder-convert.xml       |   11 +
 docs/reference/gtk/migrating-2to3.xml            |   43 +
 docs/reference/gtk/migrating-GtkStyleContext.xml |   19 +-
 docs/reference/gtk/other_software.sgml           |    2 +-
 docs/reference/gtk/question_index.sgml           |  394 ++--
 docs/reference/gtk/resources.sgml                |    2 +-
 docs/reference/gtk/text_widget.sgml              |    2 +-
 docs/reference/gtk/tmpl/.gitignore               |    7 +
 docs/reference/gtk/tmpl/gtkenums.sgml            |  458 ----
 docs/reference/gtk/tmpl/gtkmenubar.sgml          |  104 -
 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/tmpl/gtktreemodel.sgml        |  864 -------
 docs/reference/gtk/tree_widget.sgml              |    2 +-
 docs/reference/gtk/windows.sgml                  |    2 +-
 docs/reference/gtk/x11.sgml                      |    2 +-
 gdk/Makefile.am                                  |   13 +-
 gdk/gdkoffscreenwindow.c                         |    2 +-
 gtk/Makefile.am                                  |   22 +-
 gtk/gtk-builder-convert                          |   31 +-
 gtk/gtkcellarea.c                                |    1 +
 gtk/gtkcellareabox.c                             |    1 +
 gtk/gtkcelllayout.c                              |   47 +-
 gtk/gtkcellrenderer.c                            |    4 +-
 gtk/gtkcellrendereraccel.c                       |  224 ++-
 gtk/gtkcellview.c                                |    2 +
 gtk/gtkcheckmenuitem.c                           |   45 +-
 gtk/gtkcontainer.c                               |    6 +-
 gtk/gtkcontainer.h                               |    7 +-
 gtk/gtkcssprovider.c                             |   34 +-
 gtk/gtkenums.h                                   |  291 +++-
 gtk/gtkeventbox.c                                |    4 +
 gtk/gtkgrid.c                                    |    1 +
 gtk/gtkicontheme.c                               |    3 +
 gtk/gtkimagemenuitem.c                           |   22 +-
 gtk/gtkmain.c                                    |    2 +-
 gtk/gtkmenu.c                                    |   91 +-
 gtk/gtkmenubar.c                                 |   18 +
 gtk/gtkmenuitem.c                                |  195 +-
 gtk/gtkmenushell.c                               |  124 +-
 gtk/gtkorientable.c                              |   41 +-
 gtk/gtkorientable.h                              |    3 +
 gtk/gtkpapersize.c                               |  307 ++--
 gtk/gtkprintjob.c                                |   15 +
 gtk/gtkprintjob.h                                |   10 +
 gtk/gtkprogressbar.c                             |    1 +
 gtk/gtkselection.c                               |   26 +
 gtk/gtkselection.h                               |  156 +-
 gtk/gtkselectionprivate.h                        |   37 +
 gtk/gtkseparator.c                               |    1 +
 gtk/gtkshow.c                                    |    8 +-
 gtk/gtkstylecontext.c                            |   58 +-
 gtk/gtkswitch.c                                  |    9 +
 gtk/gtktearoffmenuitem.c                         |   88 +-
 gtk/gtktextattributes.h                          |    8 +
 gtk/gtktexttag.c                                 |   16 +
 gtk/gtktextview.c                                |    1 +
 gtk/gtkthemingengine.c                           |   19 +-
 gtk/gtktoolitemgroup.c                           |   99 +-
 gtk/gtktoolpalette.c                             |    1 +
 gtk/gtktreemodel.c                               | 1301 ++++++-----
 gtk/gtktreemodel.h                               |   42 +-
 gtk/gtkwidget.c                                  |    2 +-
 gtk/tests/Makefile.am                            |    7 +-
 gtk/tests/papersize.c                            |  128 +
 modules/engines/Makefile.am                      |    2 +-
 modules/engines/ms-windows/msw_style.c           |   18 +-
 po-properties/et.po                              | 2118 +++++++++++-----
 po-properties/gl.po                              |  583 +++---
 po/eu.po                                         | 2790 ++++++++--------------
 po/fa.po                                         |    6 +-
 po/ug.po                                         | 1499 +++++++------
 78 files changed, 6343 insertions(+), 7668 deletions(-)
---