includes new images by Franck Doucet fixed for no=>nb/nn fixed by Jérôme

	* src/boards/reversecount.c: (reversecount_next_level),
	(reversecount_create_item): includes new images by Franck Doucet
	* src/gcompris/config.c:  fixed for no=>nb/nn
	* README: fixed by Jérôme Warnier jwarnier at beeznest.net
	* configure.in: assemlt flag increated, fixed for no=>nb/nn

4 files changed, 29 insertions, 30 deletions

diff --git a/README b/README
index c4ff8fe..8355356 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 		     GCompris / I Have Understood
 		      GCompris is a GNU package
 
-GCompris is an educationnal game for children starting at 3.
-It uses GTK and the Gnome Libraries (especially the gnome canvas),
+GCompris is an educational game for children starting at 3.
+It uses GTK and the GNOME Libraries (especially the GNOME canvas),
 the libxml and gtk-pixbuf.
 
 
@@ -10,14 +10,14 @@ the libxml and gtk-pixbuf.
 			 GCompris MOTIVATION
 
 Big Issue:
-  Today Linux does not have a lot of usefull educational tools for children.
+  Today Linux does not have a lot of useful educational tools for children.
   When they exist, they are hard to find and request the teacher/parent to
   manage a lot of independant small tools.
 
 
 Big Goal:
-  Build an educationnal game suite all accessible from a single user interface.
-  GCompris provides a simple to use user interface that makes it easy select
+  Build an educational game suite all accessible from a single user interface.
+  GCompris provides a simple to use user interface that makes it easy to select
   appropriate boards. 
 
 How:
@@ -26,7 +26,7 @@ How:
   the board is free to implement the game scheme it wants.
   The status bar is a common facility provided to the board.
 
-  To make GCompris a powerfull tool for all its users, the teachers,
+  To make GCompris a powerful tool for all its users, the teachers,
   the children but also the developers, GCompris implements a plugin system
   where each board is an independant plugin. Then if the board requires it,
   the data set for this board is defined in an XML file.
@@ -45,17 +45,20 @@ About You:
 -------------------------------------------------------------------------------
                            NOTE TO TRANSLATORS
 
-Gcompris is a little bit special in terms of translation needs. The best is done
-to bring back everything to .po files but it is not exaustive.
+GCompris is a little bit special in terms of translation needs. The best is
+done to bring back everything to .po files but it is not exhaustive.
 
 To complete the translation, you must also provide:
 
 A set of file in boards/wordsgame/wordslevelx.yy
 Where x is the level or max and yy your target locale.
-note that these words must be choosen to be simple in your language, don't necessary
-translate the english. Also, it is important to make sure that these words can be 
-written with your keyboard in one key (no alt gr stuff or compose key).
+Note that these words must be choosen to be simple in your language, don't
+necessary translate the English. Also, it is important to make sure that
+these words can be written with your keyboard in one key (no alt-gr stuff or
+compose key).
 
 A complete voice translation in boards/sounds/yy
 It is best to choose somebody that speaks and articulate well your language.
-What is great with gcompris is that you can use it to practice a foreign language.
+What is great with GCompris is that you can use it to practice a foreign
+language.
+
diff --git a/configure.in b/configure.in
index c4499d6..f2f1247 100644
--- a/configure.in
+++ b/configure.in
@@ -114,7 +114,7 @@ AC_MSG_ERROR([You must have popt 1.5 or newer to compile gcompris.]))
 AM_ICONV
 
 dnl Add the languages which your application supports here.
-ALL_LINGUAS="am ar az ca cs da de el en_CA en_GB es fi fr he hi hr hu it lt mk ml ms nl no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr wa"
+ALL_LINGUAS="am ar az ca cs da de el en_CA en_GB es fi fr he hi hr hu it lt mk ml ms nl nb nn pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr wa"
 
 dnl GCompris needs to know which locale are supported
 AC_SUBST(ALL_LINGUAS)
@@ -445,15 +445,13 @@ AC_SUBST(VERSION_VOICES_GEOGRAPHY_PT)
 VERSION_VOICES_MISC_PT=1.1
 AC_SUBST(VERSION_VOICES_MISC_PT)
 
-VERSION_FLAGS=1.4
+VERSION_FLAGS=1.5
 AC_SUBST(VERSION_FLAGS)
 
 
 dnl Autoconf output
 AC_OUTPUT([ gcompris.spec
 Makefile
-gcompris.desktop
-gcompris-edit.desktop
 src/Makefile
 src/gcompris/Makefile
 src/gcompris/libgcompris-1.0.pc
diff --git a/src/boards/reversecount.c b/src/boards/reversecount.c
index 2416f55..0bb3dc3 100644
--- a/src/boards/reversecount.c
+++ b/src/boards/reversecount.c
@@ -85,16 +85,13 @@ static GnomeCanvasItem *clock_image_item;
 // List of images to use in the game
 static gchar *imageList[] =
 {
-  "gcompris/animals/bear001.jpg",
-  "gcompris/animals/malaybear002.jpg",
-  "gcompris/animals/polabear011.jpg",
-  "gcompris/animals/joybear001.jpg",
-  "gcompris/animals/polarbear001.jpg",
-  "gcompris/animals/joybear002.jpg",
-  "gcompris/animals/flamentrosegc.jpg",
-  "gcompris/animals/girafegc.jpg",
-  "gcompris/animals/rhinogc.jpg",
-  "gcompris/animals/singegc.jpg",
+  "reversecount/baleine.png",
+  "reversecount/phoque.png",
+  "reversecount/ourspolaire.png",
+  "reversecount/morse.png",
+  "reversecount/elephant_mer.png",
+  "reversecount/epaulard.png",
+  "reversecount/narval.png",
 };
 #define NUMBER_OF_IMAGES 10
 
@@ -338,7 +335,7 @@ static void reversecount_next_level()
 {
 
   gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas),
-			  imageList[RAND(0, NUMBER_OF_IMAGES-1)]);
+			  imageList[gcomprisBoard->level-1]);
 
   gcompris_bar_set_level(gcomprisBoard);
 
@@ -542,7 +539,7 @@ static GnomeCanvasItem *reversecount_create_item(GnomeCanvasGroup *parent)
       int *val;
 
       i = dice_area_x + gdk_pixbuf_get_width(pixmap) * d + 30;
-      j = block_height + 25;
+      j = block_height + 25 + d*7;
 
       item = gnome_canvas_item_new (boardRootItem,
 				    gnome_canvas_pixbuf_get_type (),
diff --git a/src/gcompris/config.c b/src/gcompris/config.c
index 03502b4..3a5e8a1 100644
--- a/src/gcompris/config.c
+++ b/src/gcompris/config.c
@@ -1,6 +1,6 @@
 /* gcompris - config.c
  *
- * Time-stamp: <2004/09/28 00:42:05 bcoudoin>
+ * Time-stamp: <2004/10/18 01:20:19 bruno>
  *
  * Copyright (C) 2000-2003 Bruno Coudoin
  *
@@ -85,7 +85,8 @@ static gchar *linguas[] = {
   "ml_IN.UTF-8",	N_("Malayalam"),
   "ms_MY.UTF-8",	N_("Malay"),
   "nl_NL.UTF-8",	N_("Dutch"),
-  "no_NO.UTF-8",	N_("Norwegian"),
+  "nb_NO.UTF-8",	N_("Norwegian Bokmal"),
+  "nn_NO.UTF-8",	N_("Norwegian Nynorsk"),
   "pl_PL.UTF-8",	N_("Polish"),
   "pt_PT.UTF-8",	N_("Portuguese"),
   "pt_BR.UTF-8",	N_("Brazil Portuguese"),