[gcompris: 91/111] Merge branch 'master' of github.com:serah/GCompris
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris: 91/111] Merge branch 'master' of github.com:serah/GCompris
- Date: Thu, 4 Oct 2012 00:02:13 +0000 (UTC)
commit 80559841c151b068fa5c133b393a936431dbddf6
Merge: f050869 0e7d9b3
Author: serah <serah4291 gmail com>
Date: Sat Aug 25 02:34:58 2012 +0530
Merge branch 'master' of github.com:serah/GCompris
configure.ac | 21 +-
macosx/GComprisAdmin | 177 +-
macosx/configure_mac.sh | 4 +-
macosx/createBundle.sh | 2 +-
macosx/gcompris.bundle | 81 +-
macosx/launcher.sh | 177 +-
po/POTFILES.in | 2 +-
po/bg.po | 39 +-
po/de.po | 2376 +----
po/el.po | 68 +-
po/es.po | 61 +-
po/fr.po | 628 +-
po/gl.po | 920 +-
po/ja.po | 5000 ++++------
po/sl.po | 214 +-
po/sr.po | 953 +-
po/sr latin po | 953 +-
po/th.po |11507 +++++++++++---------
src/babymatch-activity/shapegame.c | 36 +-
.../resources/babyshapes/board8_0.xml.in | 2 +-
.../resources/babyshapes/board8_1.xml.in | 2 +-
.../resources/babyshapes/board8_2.xml.in | 2 +-
.../resources/babyshapes/board8_3.xml.in | 2 +-
.../resources/babyshapes/board8_4.xml.in | 2 +-
src/braille_fun-activity/braille_fun.py | 6 +-
src/braille_fun-activity/braille_fun.xml.in | 2 +-
src/bundleit.sh | 20 +
.../resources/chronos/board4_3.xml.in | 2 +-
src/electric-activity/electric.py | 2 +-
src/electric-activity/electric.xml.in | 2 +-
src/gcompris/Makefile.am | 6 +-
src/gcompris/Makefile.mingw | 1 -
src/gcompris/binreloc.c | 18 +-
src/gcompris/board_config_wordlist.c | 1 -
src/gcompris/gameutil.c | 4 -
src/gcompris/gc_net.c | 388 -
src/gcompris/gc_net.h | 46 -
src/gcompris/gcompris.c | 51 +-
src/gcompris/gcompris.h | 1 -
src/gcompris/gcompris_db.c | 1 +
src/gcompris/images_selector.c | 2 +-
src/gcompris/log.c | 1 +
src/gcompris/properties.c | 5 +-
src/gcompris/properties.h | 3 -
.../resources/geo_country/board10_0.xml.in | 2 +-
.../resources/geo_country/board10_1.xml.in | 2 +-
.../resources/geo_country/board11_0.xml.in | 2 +-
.../resources/geo_country/board11_1.xml.in | 2 +-
.../resources/geo_country/board11_2.xml.in | 2 +-
.../resources/geo_country/board11_3.xml.in | 2 +-
.../resources/geo_country/board12_0.xml.in | 2 +-
.../resources/geo_country/board13_0.xml.in | 2 +-
.../resources/geo_country/board14_0.xml.in | 2 +-
.../resources/geo_country/board7_0.xml.in | 2 +-
.../resources/geo_country/board8_0.xml.in | 2 +-
.../resources/geo_country/board9_0.xml.in | 2 +-
.../resources/geography/Makefile.am | 64 +-
.../resources/geography/afrique/benin.png | Bin 276 -> 269 bytes
.../resources/geography/afrique/burkina_faso.png | Bin 328 -> 303 bytes
.../resources/geography/afrique/cameroon.png | Bin 425 -> 353 bytes
.../resources/geography/afrique/chad.png | Bin 499 -> 405 bytes
.../resources/geography/afrique/egypt.png | Bin 367 -> 343 bytes
.../resources/geography/afrique/eritrea.png | Bin 309 -> 299 bytes
.../resources/geography/afrique/ethiopia.png | Bin 524 -> 405 bytes
.../resources/geography/afrique/gabon.png | Bin 341 -> 299 bytes
.../resources/geography/afrique/ghana.png | Bin 289 -> 285 bytes
.../resources/geography/afrique/guinea.png | Bin 336 -> 312 bytes
.../resources/geography/afrique/ivory_coast.png | Bin 330 -> 308 bytes
.../resources/geography/afrique/kenya.png | Bin 362 -> 342 bytes
.../resources/geography/afrique/libya.png | Bin 494 -> 407 bytes
.../resources/geography/afrique/madagascar.png | Bin 364 -> 357 bytes
.../resources/geography/afrique/malawi.png | Bin 284 -> 291 bytes
.../resources/geography/afrique/mali.png | Bin 521 -> 404 bytes
.../resources/geography/afrique/mauritania.png | Bin 391 -> 331 bytes
.../resources/geography/afrique/moroco.png | Bin 593 -> 401 bytes
.../resources/geography/afrique/mozambique.png | Bin 530 -> 439 bytes
.../resources/geography/afrique/nigeria.png | Bin 431 -> 366 bytes
.../resources/geography/afrique/soudan.png | Bin 573 -> 446 bytes
.../resources/geography/asia/afghanistan.png | Bin 0 -> 601 bytes
.../resources/geography/asia/africa.png | Bin 0 -> 612 bytes
.../resources/geography/asia/africa2.png | Bin 0 -> 1079 bytes
.../resources/geography/asia/armenia.png | Bin 0 -> 258 bytes
.../resources/geography/asia/azerbaijan.png | Bin 0 -> 314 bytes
.../resources/geography/asia/background.png | Bin 0 -> 89294 bytes
.../resources/geography/asia/bahrein.png | Bin 0 -> 264 bytes
.../resources/geography/asia/bangladesh.png | Bin 0 -> 377 bytes
.../resources/geography/asia/bhoutan.png | Bin 0 -> 236 bytes
.../resources/geography/asia/black_sea.png | Bin 0 -> 353 bytes
.../resources/geography/asia/brunei.png | Bin 0 -> 411 bytes
.../resources/geography/asia/cambodia.png | Bin 0 -> 338 bytes
.../resources/geography/asia/caspian_sea.png | Bin 0 -> 807 bytes
.../resources/geography/asia/china.png | Bin 0 -> 2229 bytes
.../resources/geography/asia/chypre.png | Bin 0 -> 182 bytes
.../resources/geography/asia/georgia.png | Bin 0 -> 328 bytes
.../resources/geography/asia/india.png | Bin 0 -> 1415 bytes
.../resources/geography/asia/indonesia.png | Bin 0 -> 1288 bytes
.../resources/geography/asia/irak.png | Bin 0 -> 546 bytes
.../resources/geography/asia/iran.png | Bin 0 -> 797 bytes
.../resources/geography/asia/israel.png | Bin 0 -> 250 bytes
.../resources/geography/asia/japan.png | Bin 0 -> 689 bytes
.../resources/geography/asia/jordan.png | Bin 0 -> 292 bytes
.../resources/geography/asia/kazakhstan.png | Bin 0 -> 1205 bytes
.../resources/geography/asia/kirghizstan.png | Bin 0 -> 417 bytes
.../resources/geography/asia/koweit.png | Bin 0 -> 222 bytes
.../resources/geography/asia/laos.png | Bin 0 -> 446 bytes
.../resources/geography/asia/lebanon.png | Bin 0 -> 220 bytes
.../resources/geography/asia/malaysia.png | Bin 0 -> 587 bytes
.../resources/geography/asia/mediteranean_sea.png | Bin 0 -> 304 bytes
.../resources/geography/asia/mongolia.png | Bin 0 -> 785 bytes
.../resources/geography/asia/nepal.png | Bin 0 -> 379 bytes
.../resources/geography/asia/north_corea.png | Bin 0 -> 379 bytes
.../resources/geography/asia/nyanmar.png | Bin 0 -> 698 bytes
.../resources/geography/asia/oman.png | Bin 0 -> 476 bytes
.../resources/geography/asia/ouzbekistan.png | Bin 0 -> 620 bytes
.../resources/geography/asia/pakistan.png | Bin 0 -> 1037 bytes
.../resources/geography/asia/palestine.png | Bin 0 -> 494 bytes
.../resources/geography/asia/persian_gulf.png | Bin 0 -> 538 bytes
.../resources/geography/asia/philippines.png | Bin 0 -> 683 bytes
.../resources/geography/asia/qatar.png | Bin 0 -> 384 bytes
.../resources/geography/asia/red_sea.png | Bin 0 -> 694 bytes
.../resources/geography/asia/russia.png | Bin 0 -> 4157 bytes
.../resources/geography/asia/saudi_arabia.png | Bin 0 -> 828 bytes
.../resources/geography/asia/south_corea.png | Bin 0 -> 349 bytes
.../resources/geography/asia/sri_lanka.png | Bin 0 -> 265 bytes
.../resources/geography/asia/syria.png | Bin 0 -> 366 bytes
.../resources/geography/asia/tadjikistan.png | Bin 0 -> 445 bytes
.../resources/geography/asia/taiwan.png | Bin 0 -> 252 bytes
.../resources/geography/asia/thailand.png | Bin 0 -> 649 bytes
.../resources/geography/asia/turkey.png | Bin 0 -> 594 bytes
.../resources/geography/asia/turkmenistan.png | Bin 0 -> 546 bytes
.../geography/asia/united_arab_emirates.png | Bin 0 -> 319 bytes
.../resources/geography/asia/vietnam.png | Bin 0 -> 594 bytes
.../resources/geography/asia/yemen.png | Bin 0 -> 456 bytes
.../resources/geography/board6_0.xml.in | 2 +-
.../resources/geography/board7_0.xml.in | 2 +-
.../resources/geography/board9_0.xml.in | 115 +
.../resources/geography/europe/Makefile.am | 3 +-
src/lang-activity/resources/lang/intro/README.txt | 3 +
.../resources/lang/intro/be_quiet.jpg | Bin 0 -> 33073 bytes
.../resources/lang/intro/birthday.jpg | Bin 0 -> 33374 bytes
.../resources/lang/intro/birthday_clement_when.jpg | Bin 0 -> 27064 bytes
.../resources/lang/intro/calendar_december.png | Bin 0 -> 31353 bytes
.../resources/lang/intro/calendar_jan_15th.png | Bin 0 -> 25144 bytes
.../{chritophe_fly.jpg => christophe_fly.jpg} | Bin 28106 -> 28106 bytes
.../resources/lang/intro/clara_born_when.jpg | Bin 0 -> 13696 bytes
.../resources/lang/intro/climbing_tree.jpg | Bin 61902 -> 60915 bytes
.../resources/lang/intro/cousins_videogames.jpg | Bin 0 -> 29357 bytes
.../resources/lang/intro/don_t_run.jpg | Bin 0 -> 47353 bytes
.../resources/lang/intro/get_dressed.jpg | Bin 0 -> 38804 bytes
.../resources/lang/intro/month_unknown.png | Bin 0 -> 29145 bytes
.../resources/lang/intro/open_eyes.jpg | Bin 0 -> 53477 bytes
.../resources/lang/intro/open_window.jpg | Bin 0 -> 46200 bytes
.../resources/lang/intro/playground.jpg | Bin 67155 -> 64195 bytes
src/lang-activity/resources/lang/intro/repeat.jpg | Bin 0 -> 48075 bytes
.../resources/lang/intro/shut_door.jpg | Bin 0 -> 37919 bytes
.../resources/lang/intro/simon_bicycle.jpg | Bin 58159 -> 51209 bytes
.../resources/lang/intro/stand_up.jpg | Bin 0 -> 50819 bytes
.../resources/lang/intro/student_walk.jpg | Bin 63187 -> 28817 bytes
.../resources/lang/intro/time_to_go.jpg | Bin 60763 -> 37755 bytes
.../resources/lang/intro/wake_up_7am.jpg | Bin 0 -> 19822 bytes
.../resources/lang/intro/wake_up_7am.png | Bin 119640 -> 0 bytes
.../resources/lang/intro/wash_face.jpg | Bin 0 -> 38892 bytes
src/lang-activity/resources/lang/lang.xml.in | 108 +-
src/lightsoff-activity/lightsoff.xml.in | 2 +-
src/missing_letter-activity/missingletter_config.c | 8 +-
.../resources/missing_letter/board2.xml.in | 2 +-
src/runit.sh | 5 +-
src/wordprocessor-activity/wordprocessor.xml.in | 2 +-
sweets.recipe | 3 +-
tools/gcompris_shapegame.py | 14 +-
170 files changed, 11421 insertions(+), 12727 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
