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

[John Ralls <jralls src gnome org>]

commit 4680c61e08eaa4dc185602b4fc87d06a37c2b41a
Merge: 1f8fe91 f84c787
Author: John Ralls <jralls ceridwen us>
Date:   Sat Aug 13 23:21:25 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/quartz/gdkevents-quartz.c  |   84 +++-
 gdk/quartz/gdkglobals-quartz.c |   17 +
 gdk/quartz/gdkquartz.h         |   15 +
 gtk/gtkcomboboxtext.c          |    4 +-
 gtk/gtkfilefilter.c            |    6 +-
 gtk/gtkrecentfilter.c          |    6 +-
 po-properties/es.po            |  448 +++++++++--------
 po/zh_HK.po                    | 1077 ++++++++++++++++++++++------------------
 po/zh_TW.po                    | 1077 ++++++++++++++++++++++------------------
 9 files changed, 1509 insertions(+), 1225 deletions(-)
---