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

[Bruno Coudoin <bcoudoin src gnome org>]

commit ae14a8d4023a0d10fc533cd6a4900e6367c59e35
Merge: 3c8d08f cc885de
Author: serah <serah4291 gmail com>
Date:   Tue Jun 19 15:59:16 2012 +0530

    Merge remote-tracking branch 'upstream/master'

 Makefile.mingw.in                                  |    2 +-
 boards/sounds/silence1s.ogg                        |  Bin 0 -> 4112 bytes
 po/POTFILES.in                                     |   24 +-
 po/el.po                                           | 3309 ++++++++++++++------
 po/es.po                                           |  558 ++--
 po/sl.po                                           |  566 ++--
 src/click_on_letter-activity/click_on_letter.c     |    3 +-
 src/gcompris/config.c                              |    1 +
 .../resources/geography/.gitignore                 |    9 +-
 .../resources/geography/Makefile.am                |    9 +-
 .../resources/geography/board2_1.xml.in            |   50 -
 .../resources/geography/board3_0.xml.in            |   71 +-
 .../resources/geography/board4_0.xml.in            |  194 +-
 .../geography/{board3_1.xml.in => board5_0.xml.in} |    7 +-
 .../resources/geography/board6_0.xml.in            |  141 +
 .../geography/{board4_1.xml.in => board7_0.xml.in} |    0
 .../geography/{board4_2.xml.in => board8_0.xml.in} |    0
 .../resources/geography/europe/europe.png          |  Bin 138269 -> 68305 bytes
 .../resources/geography/europe/montenegro.png      |  Bin 0 -> 225 bytes
 .../resources/geography/europe/serbia.png          |  Bin 0 -> 320 bytes
 .../geography/europe/serbia_montenegro.png         |  Bin 316 -> 0 bytes
 tools/create_nsis_translations.pl                  |    1 +
 22 files changed, 3236 insertions(+), 1709 deletions(-)
---