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

[John Ralls <jralls src gnome org>]

commit bc7259e49a268c570b59ebee302f4b160b3d46ca
Merge: 7641884 059df29
Author: John Ralls <jralls ceridwen us>
Date:   Sun Apr 3 23:21:23 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/x11/gdkkeys-x11.c   |   44 +-
 gdk/x11/gdkwindow-x11.c |    7 +-
 gtk/gtkcssprovider.c    |    3 +-
 gtk/gtkwindow.c         |    2 +-
 po-properties/ca.po     | 4662 ++++++++++++++++++++++++++---------------------
 po-properties/ru.po     |  294 ++--
 6 files changed, 2791 insertions(+), 2221 deletions(-)
---