- Added Somali voices by M. I. Mursal

151 files changed, 275 insertions, 85 deletions

diff --git a/ChangeLog b/ChangeLog
index d81b30f..74033b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,159 @@
 2006-11-04  Bruno coudoin  <bruno.coudoin@free.fr>
 
+	- Added Somali voices by M. I. Mursal
+
+	* boards/sounds/so/alphabet/10.ogg:
+	* boards/sounds/so/alphabet/11.ogg:
+	* boards/sounds/so/alphabet/12.ogg:
+	* boards/sounds/so/alphabet/13.ogg:
+	* boards/sounds/so/alphabet/14.ogg:
+	* boards/sounds/so/alphabet/15.ogg:
+	* boards/sounds/so/alphabet/16.ogg:
+	* boards/sounds/so/alphabet/17.ogg:
+	* boards/sounds/so/alphabet/18.ogg:
+	* boards/sounds/so/alphabet/19.ogg:
+	* boards/sounds/so/alphabet/20.ogg:
+	* boards/sounds/so/alphabet/U0030.ogg:
+	* boards/sounds/so/alphabet/U0031.ogg:
+	* boards/sounds/so/alphabet/U0032.ogg:
+	* boards/sounds/so/alphabet/U0033.ogg:
+	* boards/sounds/so/alphabet/U0034.ogg:
+	* boards/sounds/so/alphabet/U0035.ogg:
+	* boards/sounds/so/alphabet/U0036.ogg:
+	* boards/sounds/so/alphabet/U0037.ogg:
+	* boards/sounds/so/alphabet/U0038.ogg:
+	* boards/sounds/so/alphabet/U0039.ogg:
+	* boards/sounds/so/alphabet/U0061.ogg:
+	* boards/sounds/so/alphabet/U0062.ogg:
+	* boards/sounds/so/alphabet/U0063.ogg:
+	* boards/sounds/so/alphabet/U0064.ogg:
+	* boards/sounds/so/alphabet/U0065.ogg:
+	* boards/sounds/so/alphabet/U0066.ogg:
+	* boards/sounds/so/alphabet/U0067.ogg:
+	* boards/sounds/so/alphabet/U0068.ogg:
+	* boards/sounds/so/alphabet/U0069.ogg:
+	* boards/sounds/so/alphabet/U006A.ogg:
+	* boards/sounds/so/alphabet/U006B.ogg:
+	* boards/sounds/so/alphabet/U006C.ogg:
+	* boards/sounds/so/alphabet/U006D.ogg:
+	* boards/sounds/so/alphabet/U006E.ogg:
+	* boards/sounds/so/alphabet/U006F.ogg:
+	* boards/sounds/so/alphabet/U0070.ogg:
+	* boards/sounds/so/alphabet/U0071.ogg:
+	* boards/sounds/so/alphabet/U0072.ogg:
+	* boards/sounds/so/alphabet/U0073.ogg:
+	* boards/sounds/so/alphabet/U0074.ogg:
+	* boards/sounds/so/alphabet/U0075.ogg:
+	* boards/sounds/so/alphabet/U0076.ogg:
+	* boards/sounds/so/alphabet/U0077.ogg:
+	* boards/sounds/so/alphabet/U0078.ogg:
+	* boards/sounds/so/alphabet/U0079.ogg:
+	* boards/sounds/so/alphabet/U007A.ogg:
+	* boards/sounds/so/colors/black.ogg:
+	* boards/sounds/so/colors/blue.ogg:
+	* boards/sounds/so/colors/brown.ogg:
+	* boards/sounds/so/colors/green.ogg:
+	* boards/sounds/so/colors/grey.ogg:
+	* boards/sounds/so/colors/orange.ogg:
+	* boards/sounds/so/colors/pink.ogg:
+	* boards/sounds/so/colors/purple.ogg:
+	* boards/sounds/so/colors/red.ogg:
+	* boards/sounds/so/colors/white.ogg:
+	* boards/sounds/so/colors/yellow.ogg:
+	* boards/sounds/so/geography/alaska.ogg:
+	* boards/sounds/so/geography/albania.ogg:
+	* boards/sounds/so/geography/argentina.ogg:
+	* boards/sounds/so/geography/austria.ogg:
+	* boards/sounds/so/geography/bahamas.ogg:
+	* boards/sounds/so/geography/belarus.ogg:
+	* boards/sounds/so/geography/belgium.ogg:
+	* boards/sounds/so/geography/bolivia.ogg:
+	* boards/sounds/so/geography/bosnia_herzegovina.ogg:
+	* boards/sounds/so/geography/brazil.ogg:
+	* boards/sounds/so/geography/bulgaria.ogg:
+	* boards/sounds/so/geography/canada.ogg:
+	* boards/sounds/so/geography/chile.ogg:
+	* boards/sounds/so/geography/colombia.ogg:
+	* boards/sounds/so/geography/costa_rica.ogg:
+	* boards/sounds/so/geography/croatia.ogg:
+	* boards/sounds/so/geography/cuba.ogg:
+	* boards/sounds/so/geography/cyprus.ogg:
+	* boards/sounds/so/geography/czech.ogg:
+	* boards/sounds/so/geography/denmark.ogg:
+	* boards/sounds/so/geography/dominican_republic.ogg:
+	* boards/sounds/so/geography/ecuador.ogg:
+	* boards/sounds/so/geography/estonia.ogg:
+	* boards/sounds/so/geography/finland.ogg:
+	* boards/sounds/so/geography/france.ogg:
+	* boards/sounds/so/geography/french_guiana.ogg:
+	* boards/sounds/so/geography/germany.ogg:
+	* boards/sounds/so/geography/greece.ogg:
+	* boards/sounds/so/geography/greenland.ogg:
+	* boards/sounds/so/geography/guatemala.ogg:
+	* boards/sounds/so/geography/guyana.ogg:
+	* boards/sounds/so/geography/haiti.ogg:
+	* boards/sounds/so/geography/honduras.ogg:
+	* boards/sounds/so/geography/hungary.ogg:
+	* boards/sounds/so/geography/iceland.ogg:
+	* boards/sounds/so/geography/ireland.ogg:
+	* boards/sounds/so/geography/italy.ogg:
+	* boards/sounds/so/geography/jamaica.ogg:
+	* boards/sounds/so/geography/latvia.ogg:
+	* boards/sounds/so/geography/lithuania.ogg:
+	* boards/sounds/so/geography/luxembourg.ogg:
+	* boards/sounds/so/geography/macedonia.ogg:
+	* boards/sounds/so/geography/mexico.ogg:
+	* boards/sounds/so/geography/moldova.ogg:
+	* boards/sounds/so/geography/netherland.ogg:
+	* boards/sounds/so/geography/nicaragua.ogg:
+	* boards/sounds/so/geography/norway.ogg:
+	* boards/sounds/so/geography/panama.ogg:
+	* boards/sounds/so/geography/paraguay.ogg:
+	* boards/sounds/so/geography/peru.ogg:
+	* boards/sounds/so/geography/poland.ogg:
+	* boards/sounds/so/geography/portugal.ogg:
+	* boards/sounds/so/geography/romania.ogg:
+	* boards/sounds/so/geography/russia.ogg:
+	* boards/sounds/so/geography/salvador.ogg:
+	* boards/sounds/so/geography/serbia_montenegro.ogg:
+	* boards/sounds/so/geography/slovakia.ogg:
+	* boards/sounds/so/geography/slovenia.ogg:
+	* boards/sounds/so/geography/spain.ogg:
+	* boards/sounds/so/geography/suriname.ogg:
+	* boards/sounds/so/geography/sweden.ogg:
+	* boards/sounds/so/geography/switz.ogg:
+	* boards/sounds/so/geography/turkey.ogg:
+	* boards/sounds/so/geography/ukraine.ogg:
+	* boards/sounds/so/geography/united_kingdom.ogg:
+	* boards/sounds/so/geography/uruguay.ogg:
+	* boards/sounds/so/geography/usa.ogg:
+	* boards/sounds/so/geography/venezuela.ogg:
+	* boards/sounds/so/misc/awesome.ogg:
+	* boards/sounds/so/misc/back.ogg:
+	* boards/sounds/so/misc/by.ogg:
+	* boards/sounds/so/misc/check_answer.ogg:
+	* boards/sounds/so/misc/click_on_letter.ogg:
+	* boards/sounds/so/misc/congratulation.ogg:
+	* boards/sounds/so/misc/equal.ogg:
+	* boards/sounds/so/misc/fantastic.ogg:
+	* boards/sounds/so/misc/good.ogg:
+	* boards/sounds/so/misc/great.ogg:
+	* boards/sounds/so/misc/help.ogg:
+	* boards/sounds/so/misc/level.ogg:
+	* boards/sounds/so/misc/minus.ogg:
+	* boards/sounds/so/misc/ok.ogg:
+	* boards/sounds/so/misc/outof.ogg:
+	* boards/sounds/so/misc/perfect.ogg:
+	* boards/sounds/so/misc/plus.ogg:
+	* boards/sounds/so/misc/quit.ogg:
+	* boards/sounds/so/misc/super.ogg:
+	* boards/sounds/so/misc/waytogo.ogg:
+	* boards/sounds/so/misc/welcome.ogg:
+	* configure.in:
+	* po/Makefile.in.in:
+
+2006-11-04  Bruno coudoin  <bruno.coudoin@free.fr>
+
 
 	* src/boards/clickgame.c: (clickgame_pause),
 	(fish_reverse_direction), (fish_gobble), (canvas_event),
@@ -25,7 +179,7 @@
 	(gc_sound_play_ogg): Improved the management of the sound:
 	- shuffle the background musics on startup
 	- really close the audio device when sounds are deactivated in the config panel
-	- reopen the audio devide when sounds are activated in tha config panel
+	- reopen the audio devide when sounds are activated in the config panel
 
 2006-11-03  Bruno coudoin  <bruno.coudoin@free.fr>
 
diff --git a/autopackage/default.apspec.in b/autopackage/default.apspec.in
index 7ef7ddf..05c23aa 100644
--- a/autopackage/default.apspec.in
+++ b/autopackage/default.apspec.in
@@ -10,19 +10,9 @@ Maintainer: Bruno Coudoin <bruno.coudoin@free.fr>
 Packager: Bruno Coudoin <bruno.coudoin@free.fr>
 PackageVersion: 1
 CPUArchitectures: x86
-AutopackageTarget: 1.0
+AutopackageTarget: 1.2
 License: GNU General Public License (GPL)
-
-[Description]
-Some of the activities are game orientated, but nonetheless still educational.
-Below you can find a list of categories with some of the activities available in that category:
--  computer discovery: keyboard, mouse, different mouse gesture, ...
--  algebra: table memory, enumeration, double entry table, mirror image, ...
--  science: the canal lock, the water cycle, the submarine, electric simulation ...
--  geography: place the country on the map
--  games: chess, memory, connect 4, oware, sudoku ...
--  reading: reading practice
--  other: learn to tell time, puzzle of famous paintings, vector drawing, cartoon making, ...
+PackageFileName: gcompris-$SOFTWAREVERSION.x86.package
 
 [BuildPrepare]
 # If you're using autotools, the default should be enough.
@@ -38,6 +28,8 @@ unprepareBuild
 [Globals]
 
 [Prepare]
+require @gtk.org/gtk 2.4
+removeOwningPackage $PREFIX/bin/gcompris
 
 [Imports]
 # This command will tell makeinstaller what to include in the package.
@@ -55,7 +47,9 @@ installData share/gcompris
 installIcon share/pixmaps/gcompris.*
 installLocale share/locale/
 # You probably need to change the category
-installDesktop "Edutainment" share/applications/gcompris.desktop
+installMenuItem "Edutainment" share/applications/gcompris.desktop
+installMenuItem "Edutainment" share/applications/gcompris-edit.desktop
+PackageDesktop: share/applications/gcompris.desktop
 
 [Uninstall]
 # Leaving this at the default is safe unless you use custom commands in
diff --git a/boards/sounds/so/alphabet/10.ogg b/boards/sounds/so/alphabet/10.ogg
new file mode 100644
index 0000000..11fc53c
--- /dev/null
+++ b/boards/sounds/so/alphabet/10.ogg
diff --git a/boards/sounds/so/alphabet/11.ogg b/boards/sounds/so/alphabet/11.ogg
new file mode 100644
index 0000000..4a10972
--- /dev/null
+++ b/boards/sounds/so/alphabet/11.ogg
diff --git a/boards/sounds/so/alphabet/12.ogg b/boards/sounds/so/alphabet/12.ogg
new file mode 100644
index 0000000..518acce
--- /dev/null
+++ b/boards/sounds/so/alphabet/12.ogg
diff --git a/boards/sounds/so/alphabet/13.ogg b/boards/sounds/so/alphabet/13.ogg
new file mode 100644
index 0000000..15a32f9
--- /dev/null
+++ b/boards/sounds/so/alphabet/13.ogg
diff --git a/boards/sounds/so/alphabet/14.ogg b/boards/sounds/so/alphabet/14.ogg
new file mode 100644
index 0000000..b76fad3
--- /dev/null
+++ b/boards/sounds/so/alphabet/14.ogg
diff --git a/boards/sounds/so/alphabet/15.ogg b/boards/sounds/so/alphabet/15.ogg
new file mode 100644
index 0000000..7baa01b
--- /dev/null
+++ b/boards/sounds/so/alphabet/15.ogg
diff --git a/boards/sounds/so/alphabet/16.ogg b/boards/sounds/so/alphabet/16.ogg
new file mode 100644
index 0000000..a3b4d90
--- /dev/null
+++ b/boards/sounds/so/alphabet/16.ogg
diff --git a/boards/sounds/so/alphabet/17.ogg b/boards/sounds/so/alphabet/17.ogg
new file mode 100644
index 0000000..2d49cd2
--- /dev/null
+++ b/boards/sounds/so/alphabet/17.ogg
diff --git a/boards/sounds/so/alphabet/18.ogg b/boards/sounds/so/alphabet/18.ogg
new file mode 100644
index 0000000..dd8eea9
--- /dev/null
+++ b/boards/sounds/so/alphabet/18.ogg
diff --git a/boards/sounds/so/alphabet/19.ogg b/boards/sounds/so/alphabet/19.ogg
new file mode 100644
index 0000000..b739f82
--- /dev/null
+++ b/boards/sounds/so/alphabet/19.ogg
diff --git a/boards/sounds/so/alphabet/20.ogg b/boards/sounds/so/alphabet/20.ogg
new file mode 100644
index 0000000..724ac99
--- /dev/null
+++ b/boards/sounds/so/alphabet/20.ogg
diff --git a/boards/sounds/so/alphabet/U0030.ogg b/boards/sounds/so/alphabet/U0030.ogg
new file mode 100644
index 0000000..f919707
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0030.ogg
diff --git a/boards/sounds/so/alphabet/U0031.ogg b/boards/sounds/so/alphabet/U0031.ogg
new file mode 100644
index 0000000..ff05b24
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0031.ogg
diff --git a/boards/sounds/so/alphabet/U0032.ogg b/boards/sounds/so/alphabet/U0032.ogg
new file mode 100644
index 0000000..9e92c22
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0032.ogg
diff --git a/boards/sounds/so/alphabet/U0033.ogg b/boards/sounds/so/alphabet/U0033.ogg
new file mode 100644
index 0000000..4ec7fb5
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0033.ogg
diff --git a/boards/sounds/so/alphabet/U0034.ogg b/boards/sounds/so/alphabet/U0034.ogg
new file mode 100644
index 0000000..da11b96
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0034.ogg
diff --git a/boards/sounds/so/alphabet/U0035.ogg b/boards/sounds/so/alphabet/U0035.ogg
new file mode 100644
index 0000000..d0bdad9
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0035.ogg
diff --git a/boards/sounds/so/alphabet/U0036.ogg b/boards/sounds/so/alphabet/U0036.ogg
new file mode 100644
index 0000000..d0e7b78
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0036.ogg
diff --git a/boards/sounds/so/alphabet/U0037.ogg b/boards/sounds/so/alphabet/U0037.ogg
new file mode 100644
index 0000000..198d091
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0037.ogg
diff --git a/boards/sounds/so/alphabet/U0038.ogg b/boards/sounds/so/alphabet/U0038.ogg
new file mode 100644
index 0000000..b348b83
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0038.ogg
diff --git a/boards/sounds/so/alphabet/U0039.ogg b/boards/sounds/so/alphabet/U0039.ogg
new file mode 100644
index 0000000..1f1bca5
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0039.ogg
diff --git a/boards/sounds/so/alphabet/U0061.ogg b/boards/sounds/so/alphabet/U0061.ogg
new file mode 100644
index 0000000..5e982e5
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0061.ogg
diff --git a/boards/sounds/so/alphabet/U0062.ogg b/boards/sounds/so/alphabet/U0062.ogg
new file mode 100644
index 0000000..ddc57b5
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0062.ogg
diff --git a/boards/sounds/so/alphabet/U0063.ogg b/boards/sounds/so/alphabet/U0063.ogg
new file mode 100644
index 0000000..ca00d76
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0063.ogg
diff --git a/boards/sounds/so/alphabet/U0064.ogg b/boards/sounds/so/alphabet/U0064.ogg
new file mode 100644
index 0000000..9ba6a84
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0064.ogg
diff --git a/boards/sounds/so/alphabet/U0065.ogg b/boards/sounds/so/alphabet/U0065.ogg
new file mode 100644
index 0000000..30c9ef4
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0065.ogg
diff --git a/boards/sounds/so/alphabet/U0066.ogg b/boards/sounds/so/alphabet/U0066.ogg
new file mode 100644
index 0000000..672886f
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0066.ogg
diff --git a/boards/sounds/so/alphabet/U0067.ogg b/boards/sounds/so/alphabet/U0067.ogg
new file mode 100644
index 0000000..1327e83
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0067.ogg
diff --git a/boards/sounds/so/alphabet/U0068.ogg b/boards/sounds/so/alphabet/U0068.ogg
new file mode 100644
index 0000000..9c3a81b
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0068.ogg
diff --git a/boards/sounds/so/alphabet/U0069.ogg b/boards/sounds/so/alphabet/U0069.ogg
new file mode 100644
index 0000000..ff8702e
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0069.ogg
diff --git a/boards/sounds/so/alphabet/U006A.ogg b/boards/sounds/so/alphabet/U006A.ogg
new file mode 100644
index 0000000..6012cfc
--- /dev/null
+++ b/boards/sounds/so/alphabet/U006A.ogg
diff --git a/boards/sounds/so/alphabet/U006B.ogg b/boards/sounds/so/alphabet/U006B.ogg
new file mode 100644
index 0000000..8d69401
--- /dev/null
+++ b/boards/sounds/so/alphabet/U006B.ogg
diff --git a/boards/sounds/so/alphabet/U006C.ogg b/boards/sounds/so/alphabet/U006C.ogg
new file mode 100644
index 0000000..af94ae8
--- /dev/null
+++ b/boards/sounds/so/alphabet/U006C.ogg
diff --git a/boards/sounds/so/alphabet/U006D.ogg b/boards/sounds/so/alphabet/U006D.ogg
new file mode 100644
index 0000000..25a3016
--- /dev/null
+++ b/boards/sounds/so/alphabet/U006D.ogg
diff --git a/boards/sounds/so/alphabet/U006E.ogg b/boards/sounds/so/alphabet/U006E.ogg
new file mode 100644
index 0000000..9826302
--- /dev/null
+++ b/boards/sounds/so/alphabet/U006E.ogg
diff --git a/boards/sounds/so/alphabet/U006F.ogg b/boards/sounds/so/alphabet/U006F.ogg
new file mode 100644
index 0000000..e9e448c
--- /dev/null
+++ b/boards/sounds/so/alphabet/U006F.ogg
diff --git a/boards/sounds/so/alphabet/U0070.ogg b/boards/sounds/so/alphabet/U0070.ogg
new file mode 100644
index 0000000..a40bd04
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0070.ogg
diff --git a/boards/sounds/so/alphabet/U0071.ogg b/boards/sounds/so/alphabet/U0071.ogg
new file mode 100644
index 0000000..999dc8d
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0071.ogg
diff --git a/boards/sounds/so/alphabet/U0072.ogg b/boards/sounds/so/alphabet/U0072.ogg
new file mode 100644
index 0000000..4766fbf
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0072.ogg
diff --git a/boards/sounds/so/alphabet/U0073.ogg b/boards/sounds/so/alphabet/U0073.ogg
new file mode 100644
index 0000000..468013d
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0073.ogg
diff --git a/boards/sounds/so/alphabet/U0074.ogg b/boards/sounds/so/alphabet/U0074.ogg
new file mode 100644
index 0000000..68362f3
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0074.ogg
diff --git a/boards/sounds/so/alphabet/U0075.ogg b/boards/sounds/so/alphabet/U0075.ogg
new file mode 100644
index 0000000..f167ed0
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0075.ogg
diff --git a/boards/sounds/so/alphabet/U0076.ogg b/boards/sounds/so/alphabet/U0076.ogg
new file mode 100644
index 0000000..1fe69c1
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0076.ogg
diff --git a/boards/sounds/so/alphabet/U0077.ogg b/boards/sounds/so/alphabet/U0077.ogg
new file mode 100644
index 0000000..64d71d1
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0077.ogg
diff --git a/boards/sounds/so/alphabet/U0078.ogg b/boards/sounds/so/alphabet/U0078.ogg
new file mode 100644
index 0000000..99d01a8
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0078.ogg
diff --git a/boards/sounds/so/alphabet/U0079.ogg b/boards/sounds/so/alphabet/U0079.ogg
new file mode 100644
index 0000000..d417381
--- /dev/null
+++ b/boards/sounds/so/alphabet/U0079.ogg
diff --git a/boards/sounds/so/alphabet/U007A.ogg b/boards/sounds/so/alphabet/U007A.ogg
new file mode 100644
index 0000000..617ecfe
--- /dev/null
+++ b/boards/sounds/so/alphabet/U007A.ogg
diff --git a/boards/sounds/so/colors/black.ogg b/boards/sounds/so/colors/black.ogg
new file mode 100644
index 0000000..1189586
--- /dev/null
+++ b/boards/sounds/so/colors/black.ogg
diff --git a/boards/sounds/so/colors/blue.ogg b/boards/sounds/so/colors/blue.ogg
new file mode 100644
index 0000000..fec7ab2
--- /dev/null
+++ b/boards/sounds/so/colors/blue.ogg
diff --git a/boards/sounds/so/colors/brown.ogg b/boards/sounds/so/colors/brown.ogg
new file mode 100644
index 0000000..a92ae2d
--- /dev/null
+++ b/boards/sounds/so/colors/brown.ogg
diff --git a/boards/sounds/so/colors/green.ogg b/boards/sounds/so/colors/green.ogg
new file mode 100644
index 0000000..20c71fd
--- /dev/null
+++ b/boards/sounds/so/colors/green.ogg
diff --git a/boards/sounds/so/colors/grey.ogg b/boards/sounds/so/colors/grey.ogg
new file mode 100644
index 0000000..a9963f2
--- /dev/null
+++ b/boards/sounds/so/colors/grey.ogg
diff --git a/boards/sounds/so/colors/orange.ogg b/boards/sounds/so/colors/orange.ogg
new file mode 100644
index 0000000..bc0cb76
--- /dev/null
+++ b/boards/sounds/so/colors/orange.ogg
diff --git a/boards/sounds/so/colors/pink.ogg b/boards/sounds/so/colors/pink.ogg
new file mode 100644
index 0000000..78f7162
--- /dev/null
+++ b/boards/sounds/so/colors/pink.ogg
diff --git a/boards/sounds/so/colors/purple.ogg b/boards/sounds/so/colors/purple.ogg
new file mode 100644
index 0000000..86d37ca
--- /dev/null
+++ b/boards/sounds/so/colors/purple.ogg
diff --git a/boards/sounds/so/colors/red.ogg b/boards/sounds/so/colors/red.ogg
new file mode 100644
index 0000000..2353da9
--- /dev/null
+++ b/boards/sounds/so/colors/red.ogg
diff --git a/boards/sounds/so/colors/white.ogg b/boards/sounds/so/colors/white.ogg
new file mode 100644
index 0000000..86e1aa1
--- /dev/null
+++ b/boards/sounds/so/colors/white.ogg
diff --git a/boards/sounds/so/colors/yellow.ogg b/boards/sounds/so/colors/yellow.ogg
new file mode 100644
index 0000000..b0ce6bf
--- /dev/null
+++ b/boards/sounds/so/colors/yellow.ogg
diff --git a/boards/sounds/so/geography/alaska.ogg b/boards/sounds/so/geography/alaska.ogg
new file mode 100644
index 0000000..68d5b8f
--- /dev/null
+++ b/boards/sounds/so/geography/alaska.ogg
diff --git a/boards/sounds/so/geography/albania.ogg b/boards/sounds/so/geography/albania.ogg
new file mode 100644
index 0000000..bf778eb
--- /dev/null
+++ b/boards/sounds/so/geography/albania.ogg
diff --git a/boards/sounds/so/geography/argentina.ogg b/boards/sounds/so/geography/argentina.ogg
new file mode 100644
index 0000000..c49e8bf
--- /dev/null
+++ b/boards/sounds/so/geography/argentina.ogg
diff --git a/boards/sounds/so/geography/austria.ogg b/boards/sounds/so/geography/austria.ogg
new file mode 100644
index 0000000..8f1fb06
--- /dev/null
+++ b/boards/sounds/so/geography/austria.ogg
diff --git a/boards/sounds/so/geography/bahamas.ogg b/boards/sounds/so/geography/bahamas.ogg
new file mode 100644
index 0000000..2950d91
--- /dev/null
+++ b/boards/sounds/so/geography/bahamas.ogg
diff --git a/boards/sounds/so/geography/belarus.ogg b/boards/sounds/so/geography/belarus.ogg
new file mode 100644
index 0000000..eccc925
--- /dev/null
+++ b/boards/sounds/so/geography/belarus.ogg
diff --git a/boards/sounds/so/geography/belgium.ogg b/boards/sounds/so/geography/belgium.ogg
new file mode 100644
index 0000000..3c778dc
--- /dev/null
+++ b/boards/sounds/so/geography/belgium.ogg
diff --git a/boards/sounds/so/geography/bolivia.ogg b/boards/sounds/so/geography/bolivia.ogg
new file mode 100644
index 0000000..31069b0
--- /dev/null
+++ b/boards/sounds/so/geography/bolivia.ogg
diff --git a/boards/sounds/so/geography/bosnia_herzegovina.ogg b/boards/sounds/so/geography/bosnia_herzegovina.ogg
new file mode 100644
index 0000000..dfbe1c9
--- /dev/null
+++ b/boards/sounds/so/geography/bosnia_herzegovina.ogg
diff --git a/boards/sounds/so/geography/brazil.ogg b/boards/sounds/so/geography/brazil.ogg
new file mode 100644
index 0000000..0ca547a
--- /dev/null
+++ b/boards/sounds/so/geography/brazil.ogg
diff --git a/boards/sounds/so/geography/bulgaria.ogg b/boards/sounds/so/geography/bulgaria.ogg
new file mode 100644
index 0000000..4354d89
--- /dev/null
+++ b/boards/sounds/so/geography/bulgaria.ogg
diff --git a/boards/sounds/so/geography/canada.ogg b/boards/sounds/so/geography/canada.ogg
new file mode 100644
index 0000000..d2513ff
--- /dev/null
+++ b/boards/sounds/so/geography/canada.ogg
diff --git a/boards/sounds/so/geography/chile.ogg b/boards/sounds/so/geography/chile.ogg
new file mode 100644
index 0000000..3e0aff3
--- /dev/null
+++ b/boards/sounds/so/geography/chile.ogg
diff --git a/boards/sounds/so/geography/colombia.ogg b/boards/sounds/so/geography/colombia.ogg
new file mode 100644
index 0000000..68fe966
--- /dev/null
+++ b/boards/sounds/so/geography/colombia.ogg
diff --git a/boards/sounds/so/geography/costa_rica.ogg b/boards/sounds/so/geography/costa_rica.ogg
new file mode 100644
index 0000000..424c012
--- /dev/null
+++ b/boards/sounds/so/geography/costa_rica.ogg
diff --git a/boards/sounds/so/geography/croatia.ogg b/boards/sounds/so/geography/croatia.ogg
new file mode 100644
index 0000000..e40878b
--- /dev/null
+++ b/boards/sounds/so/geography/croatia.ogg
diff --git a/boards/sounds/so/geography/cuba.ogg b/boards/sounds/so/geography/cuba.ogg
new file mode 100644
index 0000000..c046211
--- /dev/null
+++ b/boards/sounds/so/geography/cuba.ogg
diff --git a/boards/sounds/so/geography/cyprus.ogg b/boards/sounds/so/geography/cyprus.ogg
new file mode 100644
index 0000000..c7c8a28
--- /dev/null
+++ b/boards/sounds/so/geography/cyprus.ogg
diff --git a/boards/sounds/so/geography/czech.ogg b/boards/sounds/so/geography/czech.ogg
new file mode 100644
index 0000000..52abaab
--- /dev/null
+++ b/boards/sounds/so/geography/czech.ogg
diff --git a/boards/sounds/so/geography/denmark.ogg b/boards/sounds/so/geography/denmark.ogg
new file mode 100644
index 0000000..a293e0e
--- /dev/null
+++ b/boards/sounds/so/geography/denmark.ogg
diff --git a/boards/sounds/so/geography/dominican_republic.ogg b/boards/sounds/so/geography/dominican_republic.ogg
new file mode 100644
index 0000000..fa25f3a
--- /dev/null
+++ b/boards/sounds/so/geography/dominican_republic.ogg
diff --git a/boards/sounds/so/geography/ecuador.ogg b/boards/sounds/so/geography/ecuador.ogg
new file mode 100644
index 0000000..0d289a0
--- /dev/null
+++ b/boards/sounds/so/geography/ecuador.ogg
diff --git a/boards/sounds/so/geography/estonia.ogg b/boards/sounds/so/geography/estonia.ogg
new file mode 100644
index 0000000..82b6d84
--- /dev/null
+++ b/boards/sounds/so/geography/estonia.ogg
diff --git a/boards/sounds/so/geography/finland.ogg b/boards/sounds/so/geography/finland.ogg
new file mode 100644
index 0000000..55831fd
--- /dev/null
+++ b/boards/sounds/so/geography/finland.ogg
diff --git a/boards/sounds/so/geography/france.ogg b/boards/sounds/so/geography/france.ogg
new file mode 100644
index 0000000..1d85b81
--- /dev/null
+++ b/boards/sounds/so/geography/france.ogg
diff --git a/boards/sounds/so/geography/french_guiana.ogg b/boards/sounds/so/geography/french_guiana.ogg
new file mode 100644
index 0000000..cc6efb6
--- /dev/null
+++ b/boards/sounds/so/geography/french_guiana.ogg
diff --git a/boards/sounds/so/geography/germany.ogg b/boards/sounds/so/geography/germany.ogg
new file mode 100644
index 0000000..1a5f4d1
--- /dev/null
+++ b/boards/sounds/so/geography/germany.ogg
diff --git a/boards/sounds/so/geography/greece.ogg b/boards/sounds/so/geography/greece.ogg
new file mode 100644
index 0000000..26dea86
--- /dev/null
+++ b/boards/sounds/so/geography/greece.ogg
diff --git a/boards/sounds/so/geography/greenland.ogg b/boards/sounds/so/geography/greenland.ogg
new file mode 100644
index 0000000..9e61705
--- /dev/null
+++ b/boards/sounds/so/geography/greenland.ogg
diff --git a/boards/sounds/so/geography/guatemala.ogg b/boards/sounds/so/geography/guatemala.ogg
new file mode 100644
index 0000000..f2a8794
--- /dev/null
+++ b/boards/sounds/so/geography/guatemala.ogg
diff --git a/boards/sounds/so/geography/guyana.ogg b/boards/sounds/so/geography/guyana.ogg
new file mode 100644
index 0000000..7d5f60a
--- /dev/null
+++ b/boards/sounds/so/geography/guyana.ogg
diff --git a/boards/sounds/so/geography/haiti.ogg b/boards/sounds/so/geography/haiti.ogg
new file mode 100644
index 0000000..47a88aa
--- /dev/null
+++ b/boards/sounds/so/geography/haiti.ogg
diff --git a/boards/sounds/so/geography/honduras.ogg b/boards/sounds/so/geography/honduras.ogg
new file mode 100644
index 0000000..047316d
--- /dev/null
+++ b/boards/sounds/so/geography/honduras.ogg
diff --git a/boards/sounds/so/geography/hungary.ogg b/boards/sounds/so/geography/hungary.ogg
new file mode 100644
index 0000000..0885d4b
--- /dev/null
+++ b/boards/sounds/so/geography/hungary.ogg
diff --git a/boards/sounds/so/geography/iceland.ogg b/boards/sounds/so/geography/iceland.ogg
new file mode 100644
index 0000000..3afe930
--- /dev/null
+++ b/boards/sounds/so/geography/iceland.ogg
diff --git a/boards/sounds/so/geography/ireland.ogg b/boards/sounds/so/geography/ireland.ogg
new file mode 100644
index 0000000..d9085a4
--- /dev/null
+++ b/boards/sounds/so/geography/ireland.ogg
diff --git a/boards/sounds/so/geography/italy.ogg b/boards/sounds/so/geography/italy.ogg
new file mode 100644
index 0000000..14fb402
--- /dev/null
+++ b/boards/sounds/so/geography/italy.ogg
diff --git a/boards/sounds/so/geography/jamaica.ogg b/boards/sounds/so/geography/jamaica.ogg
new file mode 100644
index 0000000..c261379
--- /dev/null
+++ b/boards/sounds/so/geography/jamaica.ogg
diff --git a/boards/sounds/so/geography/latvia.ogg b/boards/sounds/so/geography/latvia.ogg
new file mode 100644
index 0000000..802616c
--- /dev/null
+++ b/boards/sounds/so/geography/latvia.ogg
diff --git a/boards/sounds/so/geography/lithuania.ogg b/boards/sounds/so/geography/lithuania.ogg
new file mode 100644
index 0000000..8fca74e
--- /dev/null
+++ b/boards/sounds/so/geography/lithuania.ogg
diff --git a/boards/sounds/so/geography/luxembourg.ogg b/boards/sounds/so/geography/luxembourg.ogg
new file mode 100644
index 0000000..ea8f2f6
--- /dev/null
+++ b/boards/sounds/so/geography/luxembourg.ogg
diff --git a/boards/sounds/so/geography/macedonia.ogg b/boards/sounds/so/geography/macedonia.ogg
new file mode 100644
index 0000000..98658b2
--- /dev/null
+++ b/boards/sounds/so/geography/macedonia.ogg
diff --git a/boards/sounds/so/geography/mexico.ogg b/boards/sounds/so/geography/mexico.ogg
new file mode 100644
index 0000000..0fe36b3
--- /dev/null
+++ b/boards/sounds/so/geography/mexico.ogg
diff --git a/boards/sounds/so/geography/moldova.ogg b/boards/sounds/so/geography/moldova.ogg
new file mode 100644
index 0000000..ed6850b
--- /dev/null
+++ b/boards/sounds/so/geography/moldova.ogg
diff --git a/boards/sounds/so/geography/netherland.ogg b/boards/sounds/so/geography/netherland.ogg
new file mode 100644
index 0000000..1f94bc2
--- /dev/null
+++ b/boards/sounds/so/geography/netherland.ogg
diff --git a/boards/sounds/so/geography/nicaragua.ogg b/boards/sounds/so/geography/nicaragua.ogg
new file mode 100644
index 0000000..2d99a2a
--- /dev/null
+++ b/boards/sounds/so/geography/nicaragua.ogg
diff --git a/boards/sounds/so/geography/norway.ogg b/boards/sounds/so/geography/norway.ogg
new file mode 100644
index 0000000..e835db8
--- /dev/null
+++ b/boards/sounds/so/geography/norway.ogg
diff --git a/boards/sounds/so/geography/panama.ogg b/boards/sounds/so/geography/panama.ogg
new file mode 100644
index 0000000..9deda07
--- /dev/null
+++ b/boards/sounds/so/geography/panama.ogg
diff --git a/boards/sounds/so/geography/paraguay.ogg b/boards/sounds/so/geography/paraguay.ogg
new file mode 100644
index 0000000..dcf467b
--- /dev/null
+++ b/boards/sounds/so/geography/paraguay.ogg
diff --git a/boards/sounds/so/geography/peru.ogg b/boards/sounds/so/geography/peru.ogg
new file mode 100644
index 0000000..6f1ebc6
--- /dev/null
+++ b/boards/sounds/so/geography/peru.ogg
diff --git a/boards/sounds/so/geography/poland.ogg b/boards/sounds/so/geography/poland.ogg
new file mode 100644
index 0000000..d07ed86
--- /dev/null
+++ b/boards/sounds/so/geography/poland.ogg
diff --git a/boards/sounds/so/geography/portugal.ogg b/boards/sounds/so/geography/portugal.ogg
new file mode 100644
index 0000000..52895a0
--- /dev/null
+++ b/boards/sounds/so/geography/portugal.ogg
diff --git a/boards/sounds/so/geography/romania.ogg b/boards/sounds/so/geography/romania.ogg
new file mode 100644
index 0000000..e191c0e
--- /dev/null
+++ b/boards/sounds/so/geography/romania.ogg
diff --git a/boards/sounds/so/geography/russia.ogg b/boards/sounds/so/geography/russia.ogg
new file mode 100644
index 0000000..5d7b184
--- /dev/null
+++ b/boards/sounds/so/geography/russia.ogg
diff --git a/boards/sounds/so/geography/salvador.ogg b/boards/sounds/so/geography/salvador.ogg
new file mode 100644
index 0000000..c3e9c2c
--- /dev/null
+++ b/boards/sounds/so/geography/salvador.ogg
diff --git a/boards/sounds/so/geography/serbia_montenegro.ogg b/boards/sounds/so/geography/serbia_montenegro.ogg
new file mode 100644
index 0000000..efeba17
--- /dev/null
+++ b/boards/sounds/so/geography/serbia_montenegro.ogg
diff --git a/boards/sounds/so/geography/slovakia.ogg b/boards/sounds/so/geography/slovakia.ogg
new file mode 100644
index 0000000..914617d
--- /dev/null
+++ b/boards/sounds/so/geography/slovakia.ogg
diff --git a/boards/sounds/so/geography/slovenia.ogg b/boards/sounds/so/geography/slovenia.ogg
new file mode 100644
index 0000000..63b1712
--- /dev/null
+++ b/boards/sounds/so/geography/slovenia.ogg
diff --git a/boards/sounds/so/geography/spain.ogg b/boards/sounds/so/geography/spain.ogg
new file mode 100644
index 0000000..21d39b9
--- /dev/null
+++ b/boards/sounds/so/geography/spain.ogg
diff --git a/boards/sounds/so/geography/suriname.ogg b/boards/sounds/so/geography/suriname.ogg
new file mode 100644
index 0000000..cb8dcc3
--- /dev/null
+++ b/boards/sounds/so/geography/suriname.ogg
diff --git a/boards/sounds/so/geography/sweden.ogg b/boards/sounds/so/geography/sweden.ogg
new file mode 100644
index 0000000..28a3e0e
--- /dev/null
+++ b/boards/sounds/so/geography/sweden.ogg
diff --git a/boards/sounds/so/geography/switz.ogg b/boards/sounds/so/geography/switz.ogg
new file mode 100644
index 0000000..cdf62f2
--- /dev/null
+++ b/boards/sounds/so/geography/switz.ogg
diff --git a/boards/sounds/so/geography/turkey.ogg b/boards/sounds/so/geography/turkey.ogg
new file mode 100644
index 0000000..b9e02e2
--- /dev/null
+++ b/boards/sounds/so/geography/turkey.ogg
diff --git a/boards/sounds/so/geography/ukraine.ogg b/boards/sounds/so/geography/ukraine.ogg
new file mode 100644
index 0000000..d18cf10
--- /dev/null
+++ b/boards/sounds/so/geography/ukraine.ogg
diff --git a/boards/sounds/so/geography/united_kingdom.ogg b/boards/sounds/so/geography/united_kingdom.ogg
new file mode 100644
index 0000000..40fee6e
--- /dev/null
+++ b/boards/sounds/so/geography/united_kingdom.ogg
diff --git a/boards/sounds/so/geography/uruguay.ogg b/boards/sounds/so/geography/uruguay.ogg
new file mode 100644
index 0000000..cf20714
--- /dev/null
+++ b/boards/sounds/so/geography/uruguay.ogg
diff --git a/boards/sounds/so/geography/usa.ogg b/boards/sounds/so/geography/usa.ogg
new file mode 100644
index 0000000..a1b159d
--- /dev/null
+++ b/boards/sounds/so/geography/usa.ogg
diff --git a/boards/sounds/so/geography/venezuela.ogg b/boards/sounds/so/geography/venezuela.ogg
new file mode 100644
index 0000000..220128e
--- /dev/null
+++ b/boards/sounds/so/geography/venezuela.ogg
diff --git a/boards/sounds/so/misc/awesome.ogg b/boards/sounds/so/misc/awesome.ogg
new file mode 100644
index 0000000..ae27155
--- /dev/null
+++ b/boards/sounds/so/misc/awesome.ogg
diff --git a/boards/sounds/so/misc/back.ogg b/boards/sounds/so/misc/back.ogg
new file mode 100644
index 0000000..9006040
--- /dev/null
+++ b/boards/sounds/so/misc/back.ogg
diff --git a/boards/sounds/so/misc/by.ogg b/boards/sounds/so/misc/by.ogg
new file mode 100644
index 0000000..217b91e
--- /dev/null
+++ b/boards/sounds/so/misc/by.ogg
diff --git a/boards/sounds/so/misc/check_answer.ogg b/boards/sounds/so/misc/check_answer.ogg
new file mode 100644
index 0000000..85c251f
--- /dev/null
+++ b/boards/sounds/so/misc/check_answer.ogg
diff --git a/boards/sounds/so/misc/click_on_letter.ogg b/boards/sounds/so/misc/click_on_letter.ogg
new file mode 100644
index 0000000..253d0ed
--- /dev/null
+++ b/boards/sounds/so/misc/click_on_letter.ogg
diff --git a/boards/sounds/so/misc/congratulation.ogg b/boards/sounds/so/misc/congratulation.ogg
new file mode 100644
index 0000000..c72461a
--- /dev/null
+++ b/boards/sounds/so/misc/congratulation.ogg
diff --git a/boards/sounds/so/misc/equal.ogg b/boards/sounds/so/misc/equal.ogg
new file mode 100644
index 0000000..3002710
--- /dev/null
+++ b/boards/sounds/so/misc/equal.ogg
diff --git a/boards/sounds/so/misc/fantastic.ogg b/boards/sounds/so/misc/fantastic.ogg
new file mode 100644
index 0000000..3ef5dca
--- /dev/null
+++ b/boards/sounds/so/misc/fantastic.ogg
diff --git a/boards/sounds/so/misc/good.ogg b/boards/sounds/so/misc/good.ogg
new file mode 100644
index 0000000..c08fe5c
--- /dev/null
+++ b/boards/sounds/so/misc/good.ogg
diff --git a/boards/sounds/so/misc/great.ogg b/boards/sounds/so/misc/great.ogg
new file mode 100644
index 0000000..e23f3fe
--- /dev/null
+++ b/boards/sounds/so/misc/great.ogg
diff --git a/boards/sounds/so/misc/help.ogg b/boards/sounds/so/misc/help.ogg
new file mode 100644
index 0000000..69c5bf5
--- /dev/null
+++ b/boards/sounds/so/misc/help.ogg
diff --git a/boards/sounds/so/misc/level.ogg b/boards/sounds/so/misc/level.ogg
new file mode 100644
index 0000000..1d7d92c
--- /dev/null
+++ b/boards/sounds/so/misc/level.ogg
diff --git a/boards/sounds/so/misc/minus.ogg b/boards/sounds/so/misc/minus.ogg
new file mode 100644
index 0000000..6738b29
--- /dev/null
+++ b/boards/sounds/so/misc/minus.ogg
diff --git a/boards/sounds/so/misc/ok.ogg b/boards/sounds/so/misc/ok.ogg
new file mode 100644
index 0000000..bf4986a
--- /dev/null
+++ b/boards/sounds/so/misc/ok.ogg
diff --git a/boards/sounds/so/misc/outof.ogg b/boards/sounds/so/misc/outof.ogg
new file mode 100644
index 0000000..9a72543
--- /dev/null
+++ b/boards/sounds/so/misc/outof.ogg
diff --git a/boards/sounds/so/misc/perfect.ogg b/boards/sounds/so/misc/perfect.ogg
new file mode 100644
index 0000000..992e8a0
--- /dev/null
+++ b/boards/sounds/so/misc/perfect.ogg
diff --git a/boards/sounds/so/misc/plus.ogg b/boards/sounds/so/misc/plus.ogg
new file mode 100644
index 0000000..d36f092
--- /dev/null
+++ b/boards/sounds/so/misc/plus.ogg
diff --git a/boards/sounds/so/misc/quit.ogg b/boards/sounds/so/misc/quit.ogg
new file mode 100644
index 0000000..2c231fa
--- /dev/null
+++ b/boards/sounds/so/misc/quit.ogg
diff --git a/boards/sounds/so/misc/super.ogg b/boards/sounds/so/misc/super.ogg
new file mode 100644
index 0000000..a434dc9
--- /dev/null
+++ b/boards/sounds/so/misc/super.ogg
diff --git a/boards/sounds/so/misc/waytogo.ogg b/boards/sounds/so/misc/waytogo.ogg
new file mode 100644
index 0000000..73f7d09
--- /dev/null
+++ b/boards/sounds/so/misc/waytogo.ogg
diff --git a/boards/sounds/so/misc/welcome.ogg b/boards/sounds/so/misc/welcome.ogg
new file mode 100644
index 0000000..b9396dd
--- /dev/null
+++ b/boards/sounds/so/misc/welcome.ogg
diff --git a/configure.in b/configure.in
index 3fc510b..8b72c5f 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(src/gcompris/gcompris.c)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gcompris, 8.2BETA2)
+AM_INIT_AUTOMAKE(gcompris, 8.2)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index d2d4e4c..1a6961e 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -22,6 +22,7 @@ PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
 SHELL = /bin/sh
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -33,17 +34,18 @@ exec_prefix = @exec_prefix@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = $(libdir)/locale
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/glib-2.0/gettext/po
 subdir = po
 install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
+CC = @CC@
+GENCAT = @GENCAT@
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
 XGETTEXT = @XGETTEXT@
@@ -52,22 +54,32 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
 GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
-ALL_LINGUAS = @ALL_LINGUAS@
+DEFS = @DEFS@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+INCLUDES = -I.. -I$(top_srcdir)/intl
 
-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
+SOURCES = 
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
+$(POFILES) $(SOURCES)
 EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
-#This Gets Replace for some reason
 
-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+INSTOBJEXT = @INSTOBJEXT@
 
 .SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
+.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+
+.c.o:
+	$(COMPILE) $<
 
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
@@ -82,7 +94,7 @@ CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else
 
 .po.cat:
 	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && gencat $@ $*.msg
+	  && rm -f $@ && $(GENCAT) $@ $*.msg
 
 
 all: all-@USE_NLS@
@@ -93,98 +105,120 @@ all-no:
 $(GETTEXT_PACKAGE).pot: $(POTFILES)
 	$(GENPOT)
 
-install: install-data
+install: install-exec install-data
+install-exec:
 install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
-	$(mkdir_p) $(DESTDIR)$(itlocaledir)
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
+	if test -n "$(MKINSTALLDIRS)"; then \
+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
 	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
-	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $$dir; \
-	  if test -r $$lang.gmo; then \
-	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+	fi
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  case "$$cat" in \
+	    *.gmo) destdir=$(gnulocaledir);; \
+	    *)     destdir=$(localedir);; \
+	  esac; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
+	  if test -n "$(MKINSTALLDIRS)"; then \
+	    $(MKINSTALLDIRS) $$dir; \
 	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$lang.gmo as" \
-		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
 	  fi; \
-	  if test -r $$lang.gmo.m; then \
-	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	  if test -r $$cat; then \
+	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
 	  else \
-	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+	    echo "installing $(srcdir)/$$cat as" \
+		 "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+	  fi; \
+	  if test -r $$cat.m; then \
+	    $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+	  else \
+	    if test -r $(srcdir)/$$cat.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
+		$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	      echo "installing $(srcdir)/$$cat as" \
+		   "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
 	    else \
 	      true; \
 	    fi; \
 	  fi; \
 	done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+	if test "$(PACKAGE)" = "glib"; then \
+	  if test -n "$(MKINSTALLDIRS)"; then \
+	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+	  else \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+	  fi; \
+	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+	else \
+	  : ; \
+	fi
 
 # Define this as empty until I found a useful application.
 installcheck:
 
 uninstall:
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
-	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
-	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
 	done
+	if test "$(PACKAGE)" = "glib"; then \
+	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+	fi
 
 check: all $(GETTEXT_PACKAGE).pot
 
+dvi info tags TAGS ID:
+
 mostlyclean:
-	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+	rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+	rm -fr *.o
 	rm -f .intltool-merge-cache
 
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES stamp-it
-	rm -f *.mo *.msg *.cat *.cat.m *.gmo
+	rm -f Makefile Makefile.in POTFILES
+	rm -f *.mo *.msg *.cat *.cat.m $(GMOFILES)
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f Makefile.in.in
 
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	extra_dists="$(EXTRA_DISTFILES)"; \
 	for file in $$extra_dists; do \
-	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	  test -f $$file && dists="$$dists $$file"; \
 	done; \
 	for file in $$dists; do \
-	  test -f $$file || file="$(srcdir)/$$file"; \
-	  ln $$file $(distdir) 2> /dev/null \
-	    || cp -p $$file $(distdir); \
+	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+	    || cp -p $(srcdir)/$$file $(distdir); \
 	done
 
 update-po: Makefile
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	tmpdir=`pwd`; \
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
-	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
-	for lang in $$linguas; do \
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  echo "$$lang:"; \
 	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
 	  if $$result; then \
@@ -200,20 +234,28 @@ update-po: Makefile
 	      fi; \
 	    fi; \
 	  else \
-	    echo "msgmerge for $$lang.gmo failed!"; \
+	    echo "msgmerge for $$cat failed!"; \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  fi; \
 	done
 
-Makefile POTFILES: stamp-it
-	@if test ! -f $@; then \
-	  rm -f stamp-it; \
-	  $(MAKE) stamp-it; \
-	fi
-
-stamp-it: Makefile.in.in ../config.status POTFILES.in
+# POTFILES is created from POTFILES.in by stripping comments, empty lines
+# and Intltool tags (enclosed in square brackets), and appending a full
+# relative path to them
+POTFILES: POTFILES.in
+	( posrcprefix='$(top_srcdir)/'; \
+	  rm -f $@-t $@ \
+	    && (sed -e '/^#/d' 					\
+		    -e 's/^[[].*] *//' 				\
+		    -e '/^[ 	]*$$/d' 			\
+		    -e "s@^@	$$posrcprefix@" $(srcdir)/$@.in	\
+		| sed -e '$$!s/$$/ \\/') > $@-t \
+	    && chmod a-w $@-t \
+	    && mv $@-t $@ )
+
+Makefile: Makefile.in.in ../config.status POTFILES
 	cd .. \
-	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.