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

[John Ralls <jralls src gnome org>]

commit 58e4827c6b217b2fae4e3bce8cad1cb3796c5688
Merge: fa97e12 deed717
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jun 11 23:21:22 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/Makefile.am                             |    2 +
 gtk/gtkcssprovider.c                        |   26 +
 gtk/gtkroundedbox.c                         |  209 ++++
 gtk/gtkroundedboxprivate.h                  |   66 ++
 gtk/gtkshadow.c                             |   43 +
 gtk/gtkshadowprivate.h                      |   12 +-
 gtk/gtkstyleproperty.c                      |  118 ++-
 gtk/gtkthemingengine.c                      |  515 ++--------
 po-properties/es.po                         | 1486 ++++++++++++++-------------
 po-properties/sl.po                         | 1258 ++++++++++++-----------
 po/sl.po                                    |  713 +++++++-------
 tests/reftests/Makefile.am                  |   11 +-
 tests/reftests/background-area.css          |   19 +
 tests/reftests/background-area.ref.ui       |   19 +
 tests/reftests/background-area.ui           |   18 +
 tests/reftests/box-shadow-spec-inset.css    |   65 ++
 tests/reftests/box-shadow-spec-inset.ref.ui |  330 ++++++
 tests/reftests/box-shadow-spec-inset.ui     |  124 +++
 tests/reftests/unresolvable.css             |   16 +
 tests/reftests/unresolvable.ref.ui          |   11 +
 tests/reftests/unresolvable.ui              |   13 +
 21 files changed, 2881 insertions(+), 2193 deletions(-)
---