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

[John Ralls <jralls src gnome org>]

commit 8112653f39f89ad1b78bd97978ffd44feea0a6e0
Merge: 19b41e8 3933f99
Author: John Ralls <jralls ceridwen us>
Date:   Tue Jan 25 23:21:12 2011 -0800

    Merge branch 'master' into quartz-integration

 gtk/gtkalignment.h       |    6 +
 gtk/gtkapplication.h     |    2 +-
 gtk/gtkarrow.h           |    6 +
 gtk/gtkaspectframe.h     |    6 +
 gtk/gtkbbox.h            |    6 +
 gtk/gtkbin.h             |    6 +
 gtk/gtkcssprovider.h     |    6 +
 gtk/gtkfixed.h           |    6 +
 gtk/gtkicontheme.h       |    6 +
 gtk/gtkmisc.h            |    6 +
 gtk/gtkmodifierstyle.h   |    6 +
 gtk/gtknumerableicon.h   |    2 +-
 gtk/gtkstatusicon.h      |    2 +
 gtk/gtkstylecontext.h    |    6 +
 gtk/gtkstyleproperties.h |    6 +
 gtk/gtkwidget.c          |    4 -
 po-properties/zh_HK.po   | 3552 ++++++++++++++++++++++++++--------------------
 po-properties/zh_TW.po   | 3555 ++++++++++++++++++++++++++--------------------
 po/zh_HK.po              | 1107 ++++++++-------
 po/zh_TW.po              | 1109 ++++++++-------
 20 files changed, 5259 insertions(+), 4146 deletions(-)
---