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

[John Ralls <jralls src gnome org>]

commit f9b0206c5d6955fa7533633118f5a5dadb4913a6
Merge: 65bd0f6 92c8a3e
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jan 13 23:21:24 2011 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/migrating-2to3.xml            |   43 +
 docs/reference/gtk/migrating-GtkStyleContext.xml |   19 +-
 docs/reference/gtk/question_index.sgml           |  369 ++---
 docs/reference/gtk/tmpl/.gitignore               |    1 +
 docs/reference/gtk/tmpl/gtkmenubar.sgml          |  104 --
 gdk/gdkoffscreenwindow.c                         |    2 +-
 gtk/gtkcelllayout.c                              |   47 +-
 gtk/gtkenums.h                                   |   10 +
 gtk/gtkicontheme.c                               |    3 +
 gtk/gtkmenubar.c                                 |   18 +
 gtk/gtkshow.c                                    |    8 +-
 po-properties/et.po                              | 2118 +++++++++++++++-------
 po/fa.po                                         |    6 +-
 13 files changed, 1760 insertions(+), 988 deletions(-)
---