[gbrainy/gbrainy_15x: 40/40] Merge branch 'master' into gbrainy_15x

[Jordi Mas <jmas src gnome org>]

commit 3df8a7223eb59cb04d81d7a465d46860b1ac8a31
Merge: 5c73c7f 95d96e0
Author: Jordi Mas <jmas softcatala org>
Date:   Sat May 15 19:51:48 2010 +0200

    Merge branch 'master' into gbrainy_15x

 configure.ac                                       |    2 +-
 data/verbal_analogies.xml                          |    4 +-
 help/C/customgame.page                             |   47 +
 help/C/difficulty.page                             |   40 +
 help/C/figures/all-games.png                       |  Bin 0 -> 445 bytes
 help/C/figures/bottom.png                          |  Bin 8628 -> 0 bytes
 help/C/figures/gbrainy.png                         |  Bin 0 -> 1284 bytes
 help/C/figures/history.png                         |  Bin 23258 -> 0 bytes
 help/C/figures/logic-games.png                     |  Bin 0 -> 1811 bytes
 help/C/figures/math-games.png                      |  Bin 0 -> 1191 bytes
 help/C/figures/memory-games.png                    |  Bin 0 -> 1146 bytes
 help/C/figures/preferences.png                     |  Bin 29165 -> 0 bytes
 help/C/figures/results.png                         |  Bin 38668 -> 0 bytes
 help/C/figures/toolbar.png                         |  Bin 10488 -> 0 bytes
 help/C/figures/verbal-games.png                    |  Bin 0 -> 1762 bytes
 help/C/gameplay.page                               |   52 +
 help/C/gametypes.page                              |  117 ++-
 help/C/history.page                                |   87 +-
 help/C/index.page                                  |   54 +-
 help/C/introduction.page                           |   15 -
 help/C/license.page                                |   57 +
 help/C/multiplayer.page                            |   25 +
 help/C/newgame.page                                |  188 +++
 help/C/pause.page                                  |   75 +
 help/C/playing.page                                |   41 -
 help/C/preferences.page                            |   48 -
 help/C/results.page                                |   16 -
 help/C/score.page                                  |  122 ++
 help/C/scoring.page                                |   45 -
 help/C/times.page                                  |   40 +
 help/C/tips.page                                   |   33 +
 help/Makefile.am                                   |   33 +-
 help/ca/ca.po                                      | 1248 +++++++++------
 help/de/de.po                                      | 1600 +++++++++++++------
 help/es/es.po                                      | 1722 ++++++++++++++------
 po/ca.po                                           |  213 ++--
 po/cs.po                                           |  166 +-
 po/da.po                                           |  219 ++--
 po/es.po                                           |  214 ++--
 po/fi.po                                           |  787 +++++----
 po/pt_BR.po                                        | 1426 +++++++++--------
 po/sl.po                                           |  246 ++--
 src/Clients/Classical/Dialogs/AboutDialog.cs       |    7 +-
 src/Clients/Classical/gbrainy.cs                   |    2 +-
 src/Core/Libraries/GetText.cs                      |   49 +
 src/Core/Main/ColorPalette.cs                      |    2 +-
 src/Core/Main/GameTips.cs                          |    2 +-
 src/Core/Main/Memory.cs                            |    5 +-
 src/Core/Main/Verbal/Analogies.cs                  |   56 +-
 src/Core/Main/Verbal/Analogy.cs                    |   21 +
 src/Core/Makefile.am                               |    1 +
 src/Core/Views/CountDownView.cs                    |   11 +-
 .../Calculation/CalculationGreatestDivisor.cs      |   60 +-
 src/Games/Calculation/CalculationPrimes.cs         |   52 +-
 src/Games/Logic/Puzzle3DCube.cs                    |   10 +-
 src/Games/Logic/PuzzleCounting.cs                  |    8 +-
 src/Games/Logic/PuzzleFigures.cs                   |    2 +-
 src/Games/Logic/PuzzleNumericSequence.cs           |   27 +-
 src/Games/Memory/MemoryFigures.cs                  |    4 +-
 59 files changed, 6101 insertions(+), 3200 deletions(-)
---