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

[John Ralls <jralls src gnome org>]

commit d192a97495643096210b9bbaecf4ac08ea4460e3
Merge: ed6eeed 5580fe0
Author: John Ralls <jralls ceridwen us>
Date:   Tue Aug 16 23:21:29 2011 -0700

    Merge branch 'master' into quartz-integration

 build/win32/vs10/gtk+.props  |   17 +
 build/win32/vs9/gtk+.vsprops |    9 +
 po-properties/es.po          |   62 ++-
 po-properties/gl.po          | 1179 ++++++++++++++++++++++--------------------
 po/gl.po                     |  378 +++++++-------
 tests/testtoplevelembed.c    |    2 +-
 6 files changed, 856 insertions(+), 791 deletions(-)
---