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

[John Ralls <jralls src gnome org>]

commit e49b6faaea01bb3c694e4f1a9ac43f5ebe51ab42
Merge: 476a0fa 31c036b
Author: John Ralls <jralls ceridwen us>
Date:   Thu Mar 31 23:21:10 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/x11/gdkdisplay-x11.c |    2 +-
 gdk/x11/gdkmain-x11.c    |    2 +-
 gtk/gtktreeselection.c   |   82 +
 po-properties/de.po      |  851 ++++-----
 po-properties/pt.po      | 1061 ++++++-----
 po-properties/pt_BR.po   | 4716 ++++++++++++++++++++++++++--------------------
 po/de.po                 |  189 +-
 7 files changed, 3759 insertions(+), 3144 deletions(-)
---