- Fixed location and name of many voices

	- added the tool check_missing_voices.pl to
	  replace list_missing_sounds.sh
	* configure.in: added marathi voices
	* gcompris.spec.in: added marathi voices
	* src/gcompris/Makefile.mingw: fixed to compile again on windows

17 files changed, 128 insertions, 55 deletions

diff --git a/ChangeLog b/ChangeLog
index 1289618..0ebf77c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2006-07-14  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	- Fixed location and name of many voices
+	- added the tool check_missing_voices.pl to 
+	  replace list_missing_sounds.sh
+	
+	* boards/sounds/cs/geography/uruguay.ogg:
+	* boards/sounds/cs/geography/uruquay.ogg:
+	* boards/sounds/da/misc/perfect.ogg:
+	* boards/sounds/da/misc/perfekt.ogg:
+	* boards/sounds/de/colors/back.ogg:
+	* boards/sounds/de/misc/back.ogg:
+	* boards/sounds/es/colors/back.ogg:
+	* boards/sounds/es/misc/back.ogg:
+	* boards/sounds/eu/geography/french-guyana.ogg:
+	* boards/sounds/fi/geography/luxembourg.ogg:
+	* boards/sounds/fi/geography/luxemburg.ogg:
+	* boards/sounds/fr/misc/about.ogg:
+	* boards/sounds/fr/misc/configuration.ogg:
+	* boards/sounds/pt_BR/misc/congratulations.ogg:
+	* boards/sounds/sv/geography/antarctica.ogg:
+	* boards/sounds/sv/geography/antartica.ogg:
+	* tools/check_missing_voices.pl:
+	* configure.in: added marathi voices
+	* gcompris.spec.in: added marathi voices
+	* src/gcompris/Makefile.mingw: fixed to compile again on windows
+
 2006-07-12  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	* configure.in: *** release 8.0BETA2 **
diff --git a/README.translators b/README.translators
index f03a581..b6e0bda 100644
--- a/README.translators
+++ b/README.translators
@@ -39,3 +39,6 @@ What is great with GCompris is that you can use it to practice a foreign
 language.
 Read the file boards/sounds/HOWTO_ENCODE to get more detailed instructions
 
+To check that you completed the translation of all voices and that there are no
+missing files. You can use the tool check_missing_voices.pl located in the tools
+directory.
\ No newline at end of file
diff --git a/boards/sounds/cs/geography/uruquay.ogg b/boards/sounds/cs/geography/uruguay.ogg
index 7fa0017..7fa0017 100644
--- a/boards/sounds/cs/geography/uruquay.ogg
+++ b/boards/sounds/cs/geography/uruguay.ogg
diff --git a/boards/sounds/da/misc/perfekt.ogg b/boards/sounds/da/misc/perfect.ogg
index 7fa2557..7fa2557 100644
--- a/boards/sounds/da/misc/perfekt.ogg
+++ b/boards/sounds/da/misc/perfect.ogg
diff --git a/boards/sounds/de/colors/back.ogg b/boards/sounds/de/misc/back.ogg
index 40fa436..40fa436 100644
--- a/boards/sounds/de/colors/back.ogg
+++ b/boards/sounds/de/misc/back.ogg
diff --git a/boards/sounds/es/colors/back.ogg b/boards/sounds/es/misc/back.ogg
index dd7ead9..dd7ead9 100644
--- a/boards/sounds/es/colors/back.ogg
+++ b/boards/sounds/es/misc/back.ogg
diff --git a/boards/sounds/eu/geography/french-guyana.ogg b/boards/sounds/eu/geography/french-guyana.ogg
deleted file mode 100644
index d08f11b..0000000
--- a/boards/sounds/eu/geography/french-guyana.ogg
+++ /dev/null
diff --git a/boards/sounds/fi/geography/luxemburg.ogg b/boards/sounds/fi/geography/luxembourg.ogg
index 39e252e..39e252e 100644
--- a/boards/sounds/fi/geography/luxemburg.ogg
+++ b/boards/sounds/fi/geography/luxembourg.ogg
diff --git a/boards/sounds/fr/misc/about.ogg b/boards/sounds/fr/misc/about.ogg
index a3a2e8d..0fbd29d 100644
--- a/boards/sounds/fr/misc/about.ogg
+++ b/boards/sounds/fr/misc/about.ogg
diff --git a/boards/sounds/fr/misc/configuration.ogg b/boards/sounds/fr/misc/configuration.ogg
index 915b3af..acc5458 100644
--- a/boards/sounds/fr/misc/configuration.ogg
+++ b/boards/sounds/fr/misc/configuration.ogg
diff --git a/boards/sounds/pt_BR/misc/congratulations.ogg b/boards/sounds/pt_BR/misc/congratulations.ogg
deleted file mode 100644
index 093b24b..0000000
--- a/boards/sounds/pt_BR/misc/congratulations.ogg
+++ /dev/null
diff --git a/boards/sounds/sv/geography/antarctica.ogg b/boards/sounds/sv/geography/antartica.ogg
index 46fbc53..46fbc53 100644
--- a/boards/sounds/sv/geography/antarctica.ogg
+++ b/boards/sounds/sv/geography/antartica.ogg
diff --git a/configure.in b/configure.in
index 7aa3307..7109b5c 100644
--- a/configure.in
+++ b/configure.in
@@ -413,6 +413,10 @@ VERSION_VOICES_IT=1.0
 AC_SUBST(VERSION_VOICES_IT)
 
 # NL
+VERSION_VOICES_MR=1.0
+AC_SUBST(VERSION_VOICES_MR)
+
+# NL
 VERSION_VOICES_NL=1.0
 AC_SUBST(VERSION_VOICES_NL)
 
diff --git a/gcompris.spec.in b/gcompris.spec.in
index 2bf4bb3..129859c 100644
--- a/gcompris.spec.in
+++ b/gcompris.spec.in
@@ -145,15 +145,6 @@ Version: @VERSION_VOICES_FR@
 French voices for the GCompris game
 
 
-%package -n assetml-voices-fi
-Summary:        GCompris voices in Finish
-Group: 		Amusements/Games
-Version: @VERSION_VOICES_FI@
-
-%description -n assetml-voices-fi
-Finish voices for the GCompris game
-
-
 %package -n assetml-voices-hu
 Summary:        GCompris voices in Hungarian
 Group: 		Amusements/Games
@@ -181,6 +172,15 @@ Version: @VERSION_VOICES_NL@
 Dutch voices for the GCompris game
 
 
+%package -n assetml-voices-mr
+Summary:        GCompris voices in Marathi
+Group: 		Amusements/Games
+Version: @VERSION_VOICES_MR@
+
+%description -n assetml-voices-mr
+Marathi voices for the GCompris game
+
+
 %package -n assetml-voices-pt
 Summary:        GCompris voices in Portuguese
 Group: 		Amusements/Games
@@ -282,6 +282,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/share/locale/*/*/*
 %{prefix}/share/pixmaps/*.png
 %_infodir/*
+%_mandir/*
 
 %files devel
 %dir %_includedir/libgcompris-1.0/libgcompris
@@ -331,6 +332,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{prefix}/share/gcompris/boards/sounds/it
 
+%files -n assetml-voices-mr
+%defattr(-, root, root)
+%{prefix}/share/gcompris/boards/sounds/mr
+
 %files -n assetml-voices-nl
 %defattr(-, root, root)
 %{prefix}/share/gcompris/boards/sounds/nl
diff --git a/src/gcompris/Makefile.mingw b/src/gcompris/Makefile.mingw
index 881432c..7c946dc 100644
--- a/src/gcompris/Makefile.mingw
+++ b/src/gcompris/Makefile.mingw
@@ -79,7 +79,6 @@ LIB_PATHS =		-L$(GTK_TOP)/lib \
 EXE_C_SRC = \
 	about.c \
 	anim.c \
-	assetml.c \
 	bar.c \
 	board.c \
 	board_config.c \
diff --git a/tools/check_missing_voices.pl b/tools/check_missing_voices.pl
new file mode 100755
index 0000000..10e922d
--- /dev/null
+++ b/tools/check_missing_voices.pl
@@ -0,0 +1,80 @@
+#!/usr/bin/perl
+
+#
+# Run this program in the top level GCompris directory
+# with a locale parameter like ./check_missing_voices fr
+#
+# It will tell you which voices are missing
+#
+use strict;
+use Data::Dumper;
+
+
+if(!defined $ARGV[0])
+  {
+    print "Usage: ./check_missing_voices <locale>\n";
+    print "       e.g. ./check_missing_voices fr\n";
+    exit 1;
+  }
+my $TARGET_LOCALE =  $ARGV[0];
+
+my $BASEDIR="./boards/sounds";
+
+# I don't set alphabet dir, it's too locale specific
+my @SUBDIRS= qw/geography misc colors/;
+
+if(! -d $BASEDIR)
+  {
+    print "ERROR: You must run this tool from the top GCompris directory this way:\n";
+    print "       ./tools/check_missing_voices.pl $TARGET_LOCALE\n";
+    exit(1);
+  }
+
+my @LOCALES;
+foreach my $file (`ls $BASEDIR`)
+  {
+    chomp($file);
+    if (-d "$BASEDIR/$file" &&
+	($file =~ /^[a-z]{2}$/ || $file =~ /^[a-z]{2}_[a-zA-Z]{2}$/))
+      {
+       push(@LOCALES, $file);
+      }
+  }
+
+printf("Locale already supported: @LOCALES\n");
+
+# Create the longest list possible
+my @ALL_FILES;
+foreach my $locale (@LOCALES)
+  {
+    foreach my $subdir (@SUBDIRS)
+      {
+	opendir DIR, "$BASEDIR/$locale/$subdir"
+	  or die "cannot open dir $BASEDIR/$locale/$subdir: $!";
+	foreach my $file ( grep { $_ =~ /\.ogg$/} readdir DIR)
+	  {
+	    if("@ALL_FILES" !~ /$subdir\/$file/g)
+	      {
+		push(@ALL_FILES, "$subdir/$file");
+	      }
+	  }
+	closedir DIR;
+      }
+  }
+
+#
+# Now we have the uniq list of all the files of all locales.
+# We now check each one is translated in the target locale
+#
+print "Missing files for locale '$TARGET_LOCALE':\n";
+my $got_error = 0;
+foreach my $file (@ALL_FILES)
+  {
+    if(! -f "$BASEDIR/$TARGET_LOCALE/$file")
+      {
+	print "$file\n";
+	$got_error = 1;
+      }
+  }
+print "\nGreat, nothing is missing !\n" if !$got_error;
+print "\nI did not checked the directory '$BASEDIR/$TARGET_LOCALE/alphabet'\n"
diff --git a/tools/list_missing_sounds.sh b/tools/list_missing_sounds.sh
deleted file mode 100755
index 411ea0c..0000000
--- a/tools/list_missing_sounds.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2006 Jose JORGE
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#######################################################################
-#
-# This script lists the sounds missing in some locale compared to english
-# It much be run with the list of locale sound you want to compare
-# list_missing_sounds fr en de
-#
-snd_path="boards/sounds/"
-reference="en"
-
-if test "$1" == ""
-then
-  echo "Usage: $0 <locale>"
-  echo "With locale being a locale as found in boards/sounds like fr"
-  echo "Run it in the GCompris root directory"
-  exit 1
-fi
-
-for locale in $@
-do
-  if test -d boards/sounds/$locale; then 
-	  find $snd_path$locale | grep .ogg > ~/tmp/sounds_$locale.lst
-	  find $snd_path$reference | grep .ogg | sed s+/$reference/+/$locale/+ > ~/tmp/sounds_$reference.lst
-	  echo "The sounds avaliable in $reference that miss in $locale are :"
-	  grep -v -f ~/tmp/sounds_$locale.lst ~/tmp/sounds_$reference.lst
-  fi
-done
-rm ~/tmp/sounds_$locale.lst ~/tmp/sounds_$reference.lst