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

[John Ralls <jralls src gnome org>]

commit 5cca18553f0c0bda9e6c22aedccb374d6f571793
Merge: 6ff119a 3116a75
Author: John Ralls <jralls ceridwen us>
Date:   Thu Mar 24 23:21:10 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk+.doap                |   46 +
 gtk/gtklabel.c           |    4 +-
 gtk/gtksettings.c        |   18 +
 gtk/gtkstyleproperties.c |    2 +-
 gtk/gtkswitch.c          |   23 +
 po/af.po                 | 2155 ++++++++++++++++++++++++++--------------------
 po/zh_CN.po              |  798 ++++++++++-------
 7 files changed, 1769 insertions(+), 1277 deletions(-)
---