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

[John Ralls <jralls src gnome org>]

commit 17f4e783b0b13f7bb91b102155c312ca079a4b53
Merge: fee50a6 23f2aab
Author: John Ralls <jralls ceridwen us>
Date:   Wed Aug 24 23:21:06 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/Makefile.am                 |    3 +-
 gtk/gtkaccellabel.c             |   52 ++--
 gtk/gtkcolorbutton.c            |    2 +
 po-properties/es.po             |  118 ++++----
 po-properties/gl.po             |  113 ++++----
 po/es.po                        |  453 ++++++++++++++--------------
 po/gl.po                        |  189 ++++++------
 po/nb.po                        |  413 ++++++++++++-------------
 po/sv.po                        |  641 ++++++++++++---------------------------
 tests/prop-editor.c             |  498 +++++++++++++++---------------
 tests/testfontselectiondialog.c |    2 +-
 11 files changed, 1140 insertions(+), 1344 deletions(-)
---