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

[John Ralls <jralls src gnome org>]

commit 15953f0a700d74b228c11c4cf33b605869777865
Merge: e49b6fa b112d88
Author: John Ralls <jralls ceridwen us>
Date:   Fri Apr 1 23:21:23 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtkappchooserbutton.c   |   16 +-
 gtk/gtkentry.c              |   28 +-
 gtk/gtkfilechooserbutton.c  |   15 +-
 gtk/gtkfilechooserdefault.c |   20 +-
 gtk/gtkfilechooserentry.c   |    5 +-
 gtk/gtkprintunixdialog.c    |   22 +-
 po-properties/hi.po         | 5219 ++++++++++++++++++++++---------------------
 po-properties/hu.po         |  791 +++----
 po/hi.po                    | 2933 ++++++++++--------------
 po/hu.po                    |   43 +-
 po/pt_BR.po                 | 2115 ++++++++++--------
 11 files changed, 5533 insertions(+), 5674 deletions(-)
---