[gcompris: 17/111] Merge remote-tracking branch 'upstream/master'

[Bruno Coudoin <bcoudoin src gnome org>]

commit 97d5a529bf0d510255484a2cc6333ec18df6026d
Merge: 9d73700 1f30778
Author: serah <serah4291 gmail com>
Date:   Thu May 31 20:54:24 2012 +0530

    Merge remote-tracking branch 'upstream/master'

 po/nn.po    | 4290 +++++++++++++++++++++++++++++++++++++++++------------------
 po/zh_HK.po | 3636 +++++++++++++++++++++++++-------------------------
 po/zh_TW.po | 3751 ++++++++++++++++++++++++++--------------------------
 3 files changed, 6693 insertions(+), 4984 deletions(-)
---