[gbrainy/gbrainy-17x: 16/16] Merge branch 'master' into gbrainy-17x

[Jordi Mas <jmas src gnome org>]

commit 2d0c8037bbbe2f505b5a9cfe701a4d5128464f09
Merge: 17e993b 2509640
Author: Jordi Mas <jmas softcatala org>
Date:   Thu Dec 30 20:29:07 2010 +0100

    Merge branch 'master' into gbrainy-17x

 help/C/export.page                    |   45 +
 help/Makefile.am                      |    5 +-
 help/af/af.po                         |  979 ++++++++++++++++++
 help/ca/ca.po                         |  192 ++--
 help/es/es.po                         |  136 ++-
 po/ca.po                              |  391 ++++----
 po/cs.po                              |   13 +-
 po/es.po                              |   43 +-
 po/hu.po                              | 1833 +++++++++++++++++++++++----------
 po/sl.po                              |  372 ++++----
 src/Core/Libraries/CairoContext.cs    |   12 +-
 src/Games/Logic/PuzzleMatrixGroups.cs |    2 +-
 12 files changed, 2906 insertions(+), 1117 deletions(-)
---