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

[John Ralls <jralls src gnome org>]

commit f0e7ccc0a31d2fda6cc6874b7e346afbcdc67af4
Merge: f833410 a49ef87
Author: John Ralls <jralls ceridwen us>
Date:   Sun Jun 19 23:21:23 2011 -0700

    Merge branch 'master' into quartz-integration

 build/win32/vs10/gdk-win32.vcxproj |    1 -
 build/win32/vs10/gdk.vcxprojin     |    1 -
 build/win32/vs10/gtk+.props        |    3 +-
 build/win32/vs10/gtk-demo.vcxproj  |    1 -
 build/win32/vs10/gtk.vcxprojin     |    1 -
 build/win32/vs10/install.vcxproj   |    1 -
 po/es.po                           |  260 ++++++++-------
 po/nb.po                           |  684 +++++++++++++++++++-----------------
 8 files changed, 492 insertions(+), 460 deletions(-)
---