[gbrainy/gbrainy-17x: 18/18] Merge branch 'master', remote branch 'origin' into gbrainy-17x

[Jordi Mas <jmas src gnome org>]

commit 7554b0c2bc0479aab0455f5381c5a5a392bbfd6a
Merge: 62ff08f 94e0938
Author: Jordi Mas <jmas softcatala org>
Date:   Sat Jan 29 14:45:45 2011 +0100

    Merge branch 'master', remote branch 'origin' into gbrainy-17x

 configure.ac                                       |   20 +-
 data/games.xml                                     |   22 +-
 gbrainy.sln                                        |   10 +-
 po/LINGUAS                                         |    1 +
 po/af.po                                           |    4 +-
 po/ca.po                                           |    2 +-
 po/cs.po                                           |   64 +-
 po/es.po                                           |  108 +-
 po/fr.po                                           |   73 +-
 po/pt.po                                           | 4988 ++++++++++++++++++++
 po/sl.po                                           |   92 +-
 .../Classical/Dialogs/ui/PdfExportDialog.ui        |    3 +-
 src/Clients/Classical/Makefile.am                  |    1 +
 src/Clients/WebForms/Default.aspx                  |    4 +
 src/Clients/WebForms/Default.aspx.cs               |   51 +-
 src/Clients/WebForms/Default.aspx.designer.cs      |   24 +-
 src/Clients/WebForms/Download.aspx                 |   14 +
 .../WebForms/{Finish.aspx.cs => Download.aspx.cs}  |   14 +-
 ....aspx.designer.cs => Download.aspx.designer.cs} |   16 +-
 src/Clients/WebForms/Finish.aspx                   |    9 -
 src/Clients/WebForms/Game.aspx                     |   57 +-
 src/Clients/WebForms/Game.aspx.cs                  |   85 +-
 src/Clients/WebForms/Game.aspx.designer.cs         |   32 +-
 src/Clients/WebForms/LanguageSupport.cs            |    2 +-
 src/Clients/WebForms/MasterPage.master             |    5 +-
 src/Clients/WebForms/MasterPage.master.cs          |   36 +-
 src/Clients/WebForms/MasterPage.master.designer.cs |   12 +-
 src/Clients/WebForms/Status.aspx.designer.cs       |   22 +-
 src/Clients/WebForms/WebForms.csproj               |   41 +-
 src/Clients/WebForms/styles.css                    |    1 -
 src/Games/Logic/PuzzleExtraCircle.cs               |    2 +-
 31 files changed, 5487 insertions(+), 328 deletions(-)
---