[gnome-games/gsoc-seed-games: 34/34] Merge branch 'master' into gsoc-seed-games
- From: Tim Horton <hortont src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-games/gsoc-seed-games: 34/34] Merge branch 'master' into gsoc-seed-games
- Date: Mon, 22 Jun 2009 18:36:30 -0400 (EDT)
commit b8930fa8a048da7d1d7024b8885bd90f012862ae
Merge: 221ee29... 5bb3c4b...
Author: Tim Horton <hortont svn gnome org>
Date: Mon Jun 22 18:35:47 2009 -0400
Merge branch 'master' into gsoc-seed-games
Conflicts:
libgames-support/games-card-textures-cache.c
NEWS | 99 +
aisleriot/Makefile.am | 8 +
aisleriot/TODO | 4 +-
aisleriot/card.c | 46 +-
aisleriot/help/C/aisleriot.xml | 2 +-
aisleriot/help/C/athena.xml | 4 +-
aisleriot/help/C/aunt_mary.xml | 4 +-
aisleriot/help/C/saratoga.xml | 4 +-
aisleriot/help/ca/ca.po | 4 +-
aisleriot/help/de/de.po | 4 +-
aisleriot/help/el/el.po | 4 +-
aisleriot/help/es/es.po | 91 +-
aisleriot/help/eu/eu.po | 4 +-
aisleriot/help/fr/fr.po | 2 +-
aisleriot/help/oc/oc.po | 2 +-
aisleriot/help/ru/ru.po | 4 +-
aisleriot/help/sv/sv.po | 2 +-
aisleriot/rules/carpet.scm | 12 +-
aisleriot/rules/cruel.scm | 16 +-
aisleriot/rules/klondike.scm | 28 +-
aisleriot/rules/spider.scm | 21 +-
aisleriot/slot-renderer.c | 44 +-
aisleriot/sol.c | 1 +
aisleriot/window.c | 95 +-
blackjack/help/C/blackjack.xml | 4 +-
blackjack/help/ca/ca.po | 6 +-
blackjack/help/da/da.po | 8 +-
blackjack/help/de/de.po | 8 +-
blackjack/help/el/el.po | 8 +-
blackjack/help/en_GB/en_GB.po | 8 +-
blackjack/help/es/es.po | 8 +-
blackjack/help/eu/eu.po | 8 +-
blackjack/help/fr/fr.po | 8 +-
blackjack/help/oc/oc.po | 4 +-
blackjack/help/sv/sv.po | 8 +-
configure.in | 26 +-
glchess/data/glchess.ui | 9 +-
glchess/help/C/glchess.xml | 4 +-
glchess/help/ca/ca.po | 8 +-
glchess/help/de/de.po | 8 +-
glchess/help/el/el.po | 8 +-
glchess/help/en_GB/en_GB.po | 8 +-
glchess/help/es/es.po | 8 +-
glchess/help/eu/eu.po | 8 +-
glchess/help/fr/fr.po | 8 +-
glchess/help/oc/oc.po | 4 +-
glchess/help/pt_BR/pt_BR.po | 8 +-
glchess/help/ru/ru.po | 6 +-
glchess/help/sv/sv.po | 4 +-
glchess/src/lib/gtkui/gtkui.py | 1 +
glines/help/C/glines.xml | 4 +-
glines/help/Makefile.am | 2 +-
glines/help/ca/ca.po | 8 +-
glines/help/cs/cs.po | 399 ++
glines/help/cs/figures/glines-gameover.png | Bin 0 -> 62667 bytes
glines/help/cs/figures/glines-startgame.png | Bin 0 -> 19512 bytes
glines/help/cs/figures/preferences.png | Bin 0 -> 21847 bytes
glines/help/de/de.po | 8 +-
glines/help/el/el.po | 6 +-
glines/help/en_GB/en_GB.po | 8 +-
glines/help/es/es.po | 8 +-
glines/help/eu/eu.po | 8 +-
glines/help/fr/fr.po | 8 +-
glines/help/it/it.po | 8 +-
glines/help/oc/oc.po | 4 +-
glines/help/ru/ru.po | 8 +-
glines/help/sv/sv.po | 8 +-
glines/help/tr/tr.po | 6 +-
gnect/help/C/gnect.xml | 4 +-
gnect/help/ca/ca.po | 4 +-
gnect/help/de/de.po | 8 +-
gnect/help/el/el.po | 6 +-
gnect/help/en_GB/en_GB.po | 4 +-
gnect/help/es/es.po | 185 +-
gnect/help/eu/eu.po | 6 +-
gnect/help/fr/fr.po | 6 +-
gnect/help/it/it.po | 8 +-
gnect/help/oc/oc.po | 2 +-
gnect/help/sv/sv.po | 8 +-
gnibbles/help/C/gnibbles.xml | 4 +-
gnibbles/help/ca/ca.po | 8 +-
gnibbles/help/de/de.po | 8 +-
gnibbles/help/el/el.po | 8 +-
gnibbles/help/en_GB/en_GB.po | 8 +-
gnibbles/help/es/es.po | 8 +-
gnibbles/help/eu/eu.po | 8 +-
gnibbles/help/fr/fr.po | 8 +-
gnibbles/help/it/it.po | 8 +-
gnibbles/help/oc/oc.po | 4 +-
gnibbles/help/sv/sv.po | 4 +-
gnobots2/help/C/gnobots2.xml | 4 +-
gnobots2/help/ca/ca.po | 8 +-
gnobots2/help/de/de.po | 8 +-
gnobots2/help/el/el.po | 8 +-
gnobots2/help/en_GB/en_GB.po | 8 +-
gnobots2/help/es/es.po | 6 +-
gnobots2/help/eu/eu.po | 8 +-
gnobots2/help/fr/fr.po | 8 +-
gnobots2/help/it/it.po | 8 +-
gnobots2/help/oc/oc.po | 4 +-
gnobots2/help/sv/sv.po | 4 +-
gnome-sudoku/help/C/gnome-sudoku.xml | 2 +-
gnome-sudoku/help/ca/ca.po | 4 +-
gnome-sudoku/help/da/da.po | 4 +-
gnome-sudoku/help/de/de.po | 4 +-
gnome-sudoku/help/el/el.po | 4 +-
gnome-sudoku/help/en_GB/en_GB.po | 4 +-
gnome-sudoku/help/es/es.po | 6 +-
gnome-sudoku/help/eu/eu.po | 4 +-
gnome-sudoku/help/fr/fr.po | 4 +-
gnome-sudoku/help/it/it.po | 6 +-
gnome-sudoku/help/oc/oc.po | 2 +-
gnome-sudoku/help/pt_BR/pt_BR.po | 4 +-
gnome-sudoku/help/ru/ru.po | 4 +-
gnome-sudoku/help/sv/sv.po | 2 +-
gnometris/blockops.cpp | 161 +-
gnometris/blockops.h | 7 +-
gnometris/help/C/gnometris.xml | 6 +-
gnometris/help/Makefile.am | 2 +-
gnometris/help/cs/cs.po | 656 +++
gnometris/help/es/es.po | 158 +-
gnometris/help/eu/eu.po | 8 +-
gnometris/help/oc/oc.po | 4 +-
gnometris/preview.cpp | 2 +-
gnometris/renderer.cpp | 23 +-
gnometris/renderer.h | 5 +-
gnometris/tetris.cpp | 20 +
gnometris/tetris.h | 4 +
gnomine/help/C/gnomine.xml | 2 +-
gnomine/help/Makefile.am | 2 +-
gnomine/help/ca/ca.po | 4 +-
gnomine/help/cs/cs.po | 488 +++
gnomine/help/cs/figures/highscores.png | Bin 0 -> 20396 bytes
gnomine/help/cs/figures/imnotsureflagscheckbox.png | Bin 0 -> 3246 bytes
gnomine/help/cs/figures/main-window.png | Bin 0 -> 194653 bytes
gnomine/help/cs/figures/preferences.png | Bin 0 -> 24476 bytes
gnomine/help/cs/figures/statusbar.png | Bin 0 -> 3287 bytes
gnomine/help/de/de.po | 4 +-
gnomine/help/el/el.po | 4 +-
gnomine/help/en_GB/en_GB.po | 4 +-
gnomine/help/es/es.po | 2 +-
gnomine/help/eu/eu.po | 4 +-
gnomine/help/fr/fr.po | 4 +-
gnomine/help/it/it.po | 6 +-
gnomine/help/oc/oc.po | 2 +-
gnomine/help/sv/sv.po | 4 +-
gnomine/help/zh_CN/zh_CN.po | 4 +-
gnotravex/help/C/gnotravex.xml | 4 +-
gnotravex/help/ca/ca.po | 8 +-
gnotravex/help/de/de.po | 6 +-
gnotravex/help/el/el.po | 8 +-
gnotravex/help/en_GB/en_GB.po | 8 +-
gnotravex/help/es/es.po | 8 +-
gnotravex/help/eu/eu.po | 6 +-
gnotravex/help/fr/fr.po | 8 +-
gnotravex/help/it/it.po | 8 +-
gnotravex/help/oc/oc.po | 4 +-
gnotravex/help/ru/ru.po | 8 +-
gnotravex/help/sv/sv.po | 8 +-
gnotski/help/C/gnotski.xml | 6 +-
gnotski/help/ca/ca.po | 8 +-
gnotski/help/de/de.po | 12 +-
gnotski/help/el/el.po | 12 +-
gnotski/help/en_GB/en_GB.po | 12 +-
gnotski/help/es/es.po | 8 +-
gnotski/help/eu/eu.po | 12 +-
gnotski/help/fr/fr.po | 12 +-
gnotski/help/it/it.po | 12 +-
gnotski/help/oc/oc.po | 6 +-
gnotski/help/sv/sv.po | 12 +-
gtali/help/C/gtali.xml | 4 +-
gtali/help/ca/ca.po | 8 +-
gtali/help/de/de.po | 8 +-
gtali/help/el/el.po | 8 +-
gtali/help/en_GB/en_GB.po | 8 +-
gtali/help/es/es.po | 6 +-
gtali/help/eu/eu.po | 8 +-
gtali/help/fr/fr.po | 8 +-
gtali/help/it/it.po | 8 +-
gtali/help/oc/oc.po | 4 +-
gtali/help/pt_BR/pt_BR.po | 8 +-
gtali/help/sv/sv.po | 6 +-
iagno/help/C/iagno.xml | 4 +-
iagno/help/ca/ca.po | 8 +-
iagno/help/de/de.po | 6 +-
iagno/help/el/el.po | 8 +-
iagno/help/en_GB/en_GB.po | 8 +-
iagno/help/es/es.po | 8 +-
iagno/help/eu/eu.po | 8 +-
iagno/help/fr/fr.po | 8 +-
iagno/help/it/it.po | 8 +-
iagno/help/oc/oc.po | 4 +-
iagno/help/pt_BR/pt_BR.po | 8 +-
iagno/help/sv/sv.po | 6 +-
libgames-support/games-card-textures-cache.c | 2 +-
libgames-support/games-sound.c | 3 +-
mahjongg/help/C/mahjongg.xml | 154 +-
mahjongg/help/ca/ca.po | 8 +-
mahjongg/help/de/de.po | 6 +-
mahjongg/help/el/el.po | 8 +-
mahjongg/help/en_GB/en_GB.po | 8 +-
mahjongg/help/es/es.po | 579 ++--
mahjongg/help/eu/eu.po | 6 +-
mahjongg/help/fr/fr.po | 8 +-
mahjongg/help/it/it.po | 6 +-
mahjongg/help/oc/oc.po | 4 +-
mahjongg/help/sv/sv.po | 4 +-
po/et.po | 4316 ++++++++------------
po/nb.po | 2684 ++++++-------
same-gnome/help/ca/ca.po | 2 +-
same-gnome/help/el/el.po | 2 +-
same-gnome/help/it/it.po | 4 +-
same-gnome/help/ru/ru.po | 8 +-
213 files changed, 6301 insertions(+), 5104 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
