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

[John Ralls <jralls src gnome org>]

commit afee0c0b546e40ea305a0fa4559db36d7c4ee817
Merge: bc7259e bfffe34
Author: John Ralls <jralls ceridwen us>
Date:   Mon Apr 4 23:21:12 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtksizerequest.c   |    3 +-
 po-properties/ca.po    |   26 +-
 po-properties/pt_BR.po |  406 +++++-----
 po-properties/zh_HK.po | 1719 ++++++++++++++++++++-------------------
 po-properties/zh_TW.po | 1719 ++++++++++++++++++++-------------------
 po/bn.po               | 2147 +++++++++++++++++++++++++++---------------------
 po/ca.po               |    8 +-
 po/zh_HK.po            |  779 +++++++++++-------
 po/zh_TW.po            |  779 +++++++++++-------
 9 files changed, 4121 insertions(+), 3465 deletions(-)
---