gcompris r3564 - in branches/GCOMPRIS_8_3: . boards/flags boards/wordsgame src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Tue Oct  7 23:16:36 2008
New Revision: 3564
URL: http://svn.gnome.org/viewvc/gcompris?rev=3564&view=rev

Log:
	*** RELEASE 8.3.8 ***

	Updated translation from trunk.
	Added support for spoken introductions.


Added:
   branches/GCOMPRIS_8_3/boards/flags/ta.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/wordsgame/default-he.xml
Removed:
   branches/GCOMPRIS_8_3/boards/flags/cu.png
   branches/GCOMPRIS_8_3/boards/flags/cz.png
   branches/GCOMPRIS_8_3/boards/flags/ee.png
   branches/GCOMPRIS_8_3/boards/flags/gr.png
   branches/GCOMPRIS_8_3/boards/flags/is.png
   branches/GCOMPRIS_8_3/boards/flags/jp.png
   branches/GCOMPRIS_8_3/boards/flags/si.png
   branches/GCOMPRIS_8_3/boards/flags/uy.png
   branches/GCOMPRIS_8_3/boards/flags/yu.png
Modified:
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/configure.in
   branches/GCOMPRIS_8_3/src/gcompris/board.c
   branches/GCOMPRIS_8_3/src/gcompris/gameutil.c

Added: branches/GCOMPRIS_8_3/boards/flags/ta.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/wordsgame/default-he.xml
==============================================================================
--- (empty file)
+++ branches/GCOMPRIS_8_3/boards/wordsgame/default-he.xml	Tue Oct  7 23:16:36 2008
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<GCompris>
+<Wordlist name="default-he" description="Default Hebrew" locale="he">
+<level value="1">
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+××
+×××
+×××
+××
+××
+××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+×××
+××
+×××
+×××
+×××
+×××
+×××
+
+</level>
+<level value="2">
+××××
+××××
+××××
+××××
+×××
+××××
+××××
+×××××
+××××
+××××
+××××
+××××
+××××
+××××
+××××
+××××
+××××
+××××
+×××××
+×××××
+××××
+××××
+××××
+××××
+××××
+××××
+×××××
+××××
+××××
+××××
+×××××
+×××××
+×××××
+×××
+××××
+××××
+××××
+××××
+××××
+×××××
+××××
+×××
+
+</level>
+<level value="3">
+××××××××
+××××
+××××
+××××××
+×××××
+××
+×××
+××××
+×××××××
+××××
+××××
+××××
+×××
+××××
+×××
+×××××
+×××××
+××××
+××××
+×××
+××
+×××××
+××××××
+××××××××
+×××××
+××××××
+×××××
+×××××
+×××××
+×××××××
+××××
+××××××
+×××××
+×××××
+×××××
+×××××××
+××××××
+×××××
+×××××
+×××××
+×××××
+××××××
+×××××
+×××××
+×××××
+××××××
+×××××××
+×××××××
+×××××××
+×××××
+××××
+</level>
+</Wordlist>
+</GCompris>

Modified: branches/GCOMPRIS_8_3/configure.in
==============================================================================
--- branches/GCOMPRIS_8_3/configure.in	(original)
+++ branches/GCOMPRIS_8_3/configure.in	Tue Oct  7 23:16:36 2008
@@ -2,7 +2,7 @@
 
 AC_INIT(src/gcompris/gcompris.c)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gcompris, 8.3.7)
+AM_INIT_AUTOMAKE(gcompris, 8.3.8)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 

Modified: branches/GCOMPRIS_8_3/src/gcompris/board.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/board.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/board.c	Tue Oct  7 23:16:36 2008
@@ -390,11 +390,11 @@
       bp = gcomprisBoard->plugin;
       gc_board_set_current(gcomprisBoard);
 
+      gc_activity_intro_play(gcomprisBoard);
+
       bp->start_board(gcomprisBoard);
       bp_data->playing = TRUE;
 
-      gc_activity_intro_play(gcomprisBoard);
-
       return;
     }
 

Modified: branches/GCOMPRIS_8_3/src/gcompris/gameutil.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gameutil.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gameutil.c	Tue Oct  7 23:16:36 2008
@@ -94,7 +94,7 @@
       char *str;
 
       if(!pixmap)
-	g_warning("Loading image '%s' returned a null pointer", filename);
+	g_warning("Loading image '%s' returned a null pointer", pixmapfile);
       else
 	g_warning ("Couldn't find file %s !", pixmapfile);
 
@@ -669,7 +669,7 @@
 {
   gchar *str;
 
-  str = gc_file_find_absolute("voices/$LOCALE/activity/%s-intro.ogg",
+  str = gc_file_find_absolute("voices/$LOCALE/intro/%s.ogg",
 			      gcomprisBoard->name, NULL);
   gc_sound_play_ogg(str, NULL);
   g_free(str);