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

[John Ralls <jralls src gnome org>]

commit 476a0fa67f581f95005b230ee6f081c15aab4cc8
Merge: 18ec9d6 5f99cdb
Author: John Ralls <jralls ceridwen us>
Date:   Wed Mar 30 23:21:13 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtkenums.h            |    3 +
 gtk/gtkgrid.c             |    4 +
 gtk/gtklabel.c            |    9 +-
 gtk/gtkwidget.c           |   84 +-
 po-properties/bg.po       |  394 ++--
 po-properties/en_GB.po    |  234 ++--
 po-properties/sr.po       | 4768 ++++++++++++++++++++++++--------------------
 po-properties/sr latin po | 4873 +++++++++++++++++++++++++--------------------
 po-properties/uk.po       | 1058 +++++-----
 tests/testadjustsize.c    |    3 +
 tests/testexpand.c        |    3 +
 tests/testgrid.c          |    3 +
 12 files changed, 6274 insertions(+), 5162 deletions(-)
---