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

[John Ralls <jralls src gnome org>]

commit 18ec9d6b5cb120e03f10e185abcb438191466721
Merge: 08c16ac 45d01b6
Author: John Ralls <jralls ceridwen us>
Date:   Tue Mar 29 23:21:12 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtklabel.c               |  731 ++++---
 gtk/gtkprogressbar.c         |   15 +-
 gtk/gtksearchenginetracker.c |    1 +
 gtk/gtkstatusicon.c          |   20 +
 gtk/gtkthemingengine.c       |  432 ++--
 gtk/gtktrayicon-x11.c        |   86 +-
 gtk/gtktrayicon.h            |    1 +
 po-properties/da.po          | 4708 +++++++++++++++++++++++-------------------
 po-properties/zh_CN.po       | 1076 +++++-----
 po/da.po                     | 2095 +++++++++++--------
 tests/testcombochange.c      |    8 +-
 tests/testdnd.c              |    8 +-
 tests/testgtk.c              |    8 +-
 13 files changed, 5058 insertions(+), 4131 deletions(-)
---