gcompris r3622 - in branches/GCOMPRIS_8_3: . boards boards/doubleentry boards/geography boards/geography_country po src/boards



Author: bcoudoin
Date: Wed Nov 19 21:43:04 2008
New Revision: 3622
URL: http://svn.gnome.org/viewvc/gcompris?rev=3622&view=rev

Log:
	*** RELEASE 8.3.10 ***

	* Updated translations from trunk

	- po/pt_BR.po
	- po/es.po
	- po/sv.po
	- po/ka.po
	- po/he.po
	- po/pa.po


	* boards/voices/pa/*: Voices created by Ankit Sahai : ankitsahai85 in g mail

	- Fixed missing geography voices.

	* boards/doubleentry/board3_0.xml.in:
	* boards/geography.xml.in:
	* boards/geography/board1_0.xml.in:
	* boards/geography/board2_0.xml.in:
	* boards/geography/board2_1.xml.in:
	* boards/geography/board3_0.xml.in:
	* boards/geography/board3_1.xml.in:
	* boards/geography/board4_0.xml.in:
	* boards/geography/board4_1.xml.in:
	* boards/geography/board4_2.xml.in:
	* boards/geography_country/board1_0.xml.in:
	* boards/geography_country/board7_0.xml.in:
	* boards/geography_country/board8_0.xml.in:
	* boards/geography_country/board9_0.xml.in:
	* src/boards/submarine.c: (submarine_explosion): double crash protection



Modified:
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/boards/doubleentry/board3_0.xml.in
   branches/GCOMPRIS_8_3/boards/geography.xml.in
   branches/GCOMPRIS_8_3/boards/geography/board1_0.xml.in
   branches/GCOMPRIS_8_3/boards/geography/board2_0.xml.in
   branches/GCOMPRIS_8_3/boards/geography/board2_1.xml.in
   branches/GCOMPRIS_8_3/boards/geography/board3_0.xml.in
   branches/GCOMPRIS_8_3/boards/geography/board3_1.xml.in
   branches/GCOMPRIS_8_3/boards/geography/board4_0.xml.in
   branches/GCOMPRIS_8_3/boards/geography/board4_1.xml.in
   branches/GCOMPRIS_8_3/boards/geography/board4_2.xml.in
   branches/GCOMPRIS_8_3/boards/geography_country/board1_0.xml.in
   branches/GCOMPRIS_8_3/boards/geography_country/board7_0.xml.in
   branches/GCOMPRIS_8_3/boards/geography_country/board8_0.xml.in
   branches/GCOMPRIS_8_3/boards/geography_country/board9_0.xml.in
   branches/GCOMPRIS_8_3/po/es.po
   branches/GCOMPRIS_8_3/po/he.po
   branches/GCOMPRIS_8_3/po/ka.po
   branches/GCOMPRIS_8_3/po/pa.po
   branches/GCOMPRIS_8_3/po/pt_BR.po
   branches/GCOMPRIS_8_3/po/sv.po
   branches/GCOMPRIS_8_3/src/boards/submarine.c

Modified: branches/GCOMPRIS_8_3/boards/doubleentry/board3_0.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/doubleentry/board3_0.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/doubleentry/board3_0.xml.in	Wed Nov 19 21:43:04 2008
@@ -7,17 +7,17 @@
   </Title>
   <Title x="231" y="90" justification="GTK_JUSTIFY_CENTER"><name>1</name></Title>
   <Title x="137" y="325" justification="GTK_JUSTIFY_CENTER"><name>C</name></Title>
-  <Shape name="A" pixmapfile="doubleentry/d-entry_banane_1.png"  x="231" y="325"  zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0063.ogg sounds/$LOCALE/alphabet/U0031.ogg"/>
-  <Shape name="B" pixmapfile="doubleentry/d-entry_banane_2.png"  x="321" y="325"  zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0063.ogg sounds/$LOCALE/alphabet/U0032.ogg"/>
-  <Shape name="C" pixmapfile="doubleentry/d-entry_banane_3.png"  x="418" y="325"  zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0063.ogg sounds/$LOCALE/alphabet/U0033.ogg"/>
+  <Shape name="A" pixmapfile="doubleentry/d-entry_banane_1.png"  x="231" y="325"  zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0063.ogg voices/$LOCALE/alphabet/U0031.ogg"/>
+  <Shape name="B" pixmapfile="doubleentry/d-entry_banane_2.png"  x="321" y="325"  zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0063.ogg voices/$LOCALE/alphabet/U0032.ogg"/>
+  <Shape name="C" pixmapfile="doubleentry/d-entry_banane_3.png"  x="418" y="325"  zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0063.ogg voices/$LOCALE/alphabet/U0033.ogg"/>
   <Title x="321" y="90" justification="GTK_JUSTIFY_CENTER"><name>2</name></Title>
   <Title x="137" y="170" justification="GTK_JUSTIFY_CENTER"><name>A</name></Title>
-  <Shape name="D" pixmapfile="doubleentry/d-entry_pomme_1.png"   x="231" y="170"  zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0061.ogg sounds/$LOCALE/alphabet/U0031.ogg"/>
-  <Shape name="E" pixmapfile="doubleentry/d-entry_pomme_2.png"   x="321" y="170"  zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0061.ogg sounds/$LOCALE/alphabet/U0032.ogg"/>
-  <Shape name="F" pixmapfile="doubleentry/d-entry_pomme_3.png"   x="418" y="170"  zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0061.ogg sounds/$LOCALE/alphabet/U0033.ogg"/>
+  <Shape name="D" pixmapfile="doubleentry/d-entry_pomme_1.png"   x="231" y="170"  zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0061.ogg voices/$LOCALE/alphabet/U0031.ogg"/>
+  <Shape name="E" pixmapfile="doubleentry/d-entry_pomme_2.png"   x="321" y="170"  zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0061.ogg voices/$LOCALE/alphabet/U0032.ogg"/>
+  <Shape name="F" pixmapfile="doubleentry/d-entry_pomme_3.png"   x="418" y="170"  zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0061.ogg voices/$LOCALE/alphabet/U0033.ogg"/>
   <Title x="418" y="90" justification="GTK_JUSTIFY_CENTER"><name>3</name></Title>
   <Title x="137" y="245" justification="GTK_JUSTIFY_CENTER"><name>B</name></Title>
-  <Shape name="G" pixmapfile="doubleentry/d-entry_galette_1.png" x="231" y="245"  zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0062.ogg sounds/$LOCALE/alphabet/U0031.ogg"/>
-  <Shape name="H" pixmapfile="doubleentry/d-entry_galette_2.png" x="321" y="245"  zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0062.ogg sounds/$LOCALE/alphabet/U0032.ogg"/>
-  <Shape name="I" pixmapfile="doubleentry/d-entry_galette_3.png" x="418" y="245"  zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0062.ogg sounds/$LOCALE/alphabet/U0033.ogg"/>
+  <Shape name="G" pixmapfile="doubleentry/d-entry_galette_1.png" x="231" y="245"  zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0062.ogg voices/$LOCALE/alphabet/U0031.ogg"/>
+  <Shape name="H" pixmapfile="doubleentry/d-entry_galette_2.png" x="321" y="245"  zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0062.ogg voices/$LOCALE/alphabet/U0032.ogg"/>
+  <Shape name="I" pixmapfile="doubleentry/d-entry_galette_3.png" x="418" y="245"  zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0062.ogg voices/$LOCALE/alphabet/U0033.ogg"/>
 </ShapeGame>

Modified: branches/GCOMPRIS_8_3/boards/geography.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography.xml.in	Wed Nov 19 21:43:04 2008
@@ -5,7 +5,7 @@
 	 type="shapegame"
 	 section="/discovery/miscelaneous"
 	 icon="boardicons/globe.png"
-	 mandatory_sound_file="sounds/$LOCALE/geography/peru.ogg"
+	 mandatory_sound_file="voices/$LOCALE/geography/peru.ogg"
 	 difficulty="2"
 	 author="Jean-Philippe Ayanides (jp ayanides free fr)"
 	 boarddir="geography">

Modified: branches/GCOMPRIS_8_3/boards/geography/board1_0.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography/board1_0.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography/board1_0.xml.in	Wed Nov 19 21:43:04 2008
@@ -4,22 +4,22 @@
   <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER">
     <_name>Continents</_name>
   </Title>
-  <Shape name="A" pixmapfile="geography/continents/africa.png" x="433" y="318" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/africa.ogg">
+  <Shape name="A" pixmapfile="geography/continents/africa.png" x="433" y="318" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/africa.ogg">
         <_tooltip>Africa</_tooltip>
   </Shape>
-  <Shape name="B" pixmapfile="geography/continents/america.png" x="232" y="251" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/america.ogg">
+  <Shape name="B" pixmapfile="geography/continents/america.png" x="232" y="251" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/america.ogg">
         <_tooltip>America</_tooltip>
   </Shape>
-  <Shape name="D" pixmapfile="geography/continents/antartica.png" x="370" y="465" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/antartica.ogg">
+  <Shape name="D" pixmapfile="geography/continents/antartica.png" x="370" y="465" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/antartica.ogg">
         <_tooltip>Antartica</_tooltip>
   </Shape>
-  <Shape name="C" pixmapfile="geography/continents/asia.png" x="595" y="211" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/asia.ogg">
+  <Shape name="C" pixmapfile="geography/continents/asia.png" x="595" y="211" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/asia.ogg">
         <_tooltip>Asia</_tooltip>
   </Shape>
-    <Shape name="E" pixmapfile="geography/continents/europa.png" x="430" y="156" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/europe.ogg">
+    <Shape name="E" pixmapfile="geography/continents/europa.png" x="430" y="156" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/europe.ogg">
         <_tooltip>Europe</_tooltip>
   </Shape>
-  <Shape name="F" pixmapfile="geography/continents/oceania.png" x="695" y="398" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/oceania.ogg">
+  <Shape name="F" pixmapfile="geography/continents/oceania.png" x="695" y="398" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/oceania.ogg">
         <_tooltip>Oceania</_tooltip>
   </Shape>
   <Shape name="1" pixmapfile="geography/continents/back.png" type="SHAPE_BACKGROUND"

Modified: branches/GCOMPRIS_8_3/boards/geography/board2_0.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography/board2_0.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography/board2_0.xml.in	Wed Nov 19 21:43:04 2008
@@ -4,37 +4,37 @@
   <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER">
     <_name>North America</_name>
   </Title>
-  <Shape name="A" pixmapfile="geography/northamerica/bahamas.png" x="399" y="443" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/bahamas.ogg">
+  <Shape name="A" pixmapfile="geography/northamerica/bahamas.png" x="399" y="443" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/bahamas.ogg">
         <_tooltip>Bahamas</_tooltip>
   </Shape>
-  <Shape name="B" pixmapfile="geography/northamerica/canada.png" x="349" y="182" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/canada.ogg">
+  <Shape name="B" pixmapfile="geography/northamerica/canada.png" x="349" y="182" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/canada.ogg">
         <_tooltip>Canada</_tooltip>
   </Shape>
-  <Shape name="C" pixmapfile="geography/northamerica/cuba.png" x="595" y="400" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/cuba.ogg">
+  <Shape name="C" pixmapfile="geography/northamerica/cuba.png" x="595" y="400" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/cuba.ogg">
         <_tooltip>Cuba</_tooltip>
   </Shape>
-  <Shape name="D" pixmapfile="geography/northamerica/dominican_republic.png" x="700" y="429" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/dominican_republic.ogg">
+  <Shape name="D" pixmapfile="geography/northamerica/dominican_republic.png" x="700" y="429" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/dominican_republic.ogg">
         <_tooltip>Dominican Republic</_tooltip>
   </Shape>
-  <Shape name="E" pixmapfile="geography/northamerica/greenland.png" x="442" y="79" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/greenland.ogg">
+  <Shape name="E" pixmapfile="geography/northamerica/greenland.png" x="442" y="79" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/greenland.ogg">
         <_tooltip>Greenland</_tooltip>
   </Shape>
-  <Shape name="F" pixmapfile="geography/northamerica/haiti.png" x="663" y="429" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/haiti.ogg">
+  <Shape name="F" pixmapfile="geography/northamerica/haiti.png" x="663" y="429" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/haiti.ogg">
         <_tooltip>Haiti</_tooltip>
   </Shape>
-  <Shape name="G" pixmapfile="geography/northamerica/iceland.png" x="528" y="48" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/iceland.ogg">
+  <Shape name="G" pixmapfile="geography/northamerica/iceland.png" x="528" y="48" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/iceland.ogg">
         <_tooltip>Iceland</_tooltip>
   </Shape>
-  <Shape name="H" pixmapfile="geography/northamerica/jamaica.png" x="620" y="438" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/jamaica.ogg">
+  <Shape name="H" pixmapfile="geography/northamerica/jamaica.png" x="620" y="438" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/jamaica.ogg">
         <_tooltip>Jamaica</_tooltip>
   </Shape>
-  <Shape name="I" pixmapfile="geography/northamerica/mexico.png" x="255" y="434" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/mexico.ogg">
+  <Shape name="I" pixmapfile="geography/northamerica/mexico.png" x="255" y="434" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/mexico.ogg">
         <_tooltip>Mexico</_tooltip>
   </Shape>
-  <Shape name="J" pixmapfile="geography/northamerica/usa.png" x="323" y="366" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/usa.ogg">
+  <Shape name="J" pixmapfile="geography/northamerica/usa.png" x="323" y="366" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/usa.ogg">
         <_tooltip>United States of America</_tooltip>
   </Shape>
-  <Shape name="K" pixmapfile="geography/northamerica/alaska.png" x="156" y="92" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/alaska.ogg">
+  <Shape name="K" pixmapfile="geography/northamerica/alaska.png" x="156" y="92" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/alaska.ogg">
         <_tooltip>Alaska</_tooltip>
   </Shape>
   <Shape name="1" pixmapfile="geography/northamerica/north_america.png" type="SHAPE_BACKGROUND" x="425" y="260" zoomx="1" zoomy="1" position="0"/>

Modified: branches/GCOMPRIS_8_3/boards/geography/board2_1.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography/board2_1.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography/board2_1.xml.in	Wed Nov 19 21:43:04 2008
@@ -3,46 +3,46 @@
   <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER">
     <_name>South America</_name>
   </Title>
-  <Shape name="A" pixmapfile="geography/southamerica/argentina.png" x="410" y="380" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/argentina.ogg">
+  <Shape name="A" pixmapfile="geography/southamerica/argentina.png" x="410" y="380" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/argentina.ogg">
         <_tooltip>Argentina</_tooltip>
   </Shape>
-  <Shape name="B" pixmapfile="geography/southamerica/bolivia.png" x="390" y="224" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/bolivia.ogg">
+  <Shape name="B" pixmapfile="geography/southamerica/bolivia.png" x="390" y="224" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/bolivia.ogg">
         <_tooltip>Bolivia</_tooltip>
   </Shape>
-  <Shape name="C" pixmapfile="geography/southamerica/brazil.png" x="453" y="203" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/brazil.ogg">
+  <Shape name="C" pixmapfile="geography/southamerica/brazil.png" x="453" y="203" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/brazil.ogg">
         <_tooltip>Brazil</_tooltip>
   </Shape>
-  <Shape name="D" pixmapfile="geography/southamerica/chile.png" x="375" y="369" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/chile.ogg">
+  <Shape name="D" pixmapfile="geography/southamerica/chile.png" x="375" y="369" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/chile.ogg">
         <_tooltip>Chile</_tooltip>
   </Shape>
-  <Shape name="E" pixmapfile="geography/southamerica/colombia.png" x="314" y="81" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/colombia.ogg">
+  <Shape name="E" pixmapfile="geography/southamerica/colombia.png" x="314" y="81" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/colombia.ogg">
         <_tooltip>Colombia</_tooltip>
   </Shape>
-  <Shape name="F" pixmapfile="geography/southamerica/ecuador.png" x="279" y="128" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/ecuador.ogg">
+  <Shape name="F" pixmapfile="geography/southamerica/ecuador.png" x="279" y="128" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/ecuador.ogg">
         <_tooltip>Ecuador</_tooltip>
   </Shape>
-  <Shape name="G" pixmapfile="geography/southamerica/french_guiana.png" x="454" y="77" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/french_guiana.ogg">
+  <Shape name="G" pixmapfile="geography/southamerica/french_guiana.png" x="454" y="77" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/french_guiana.ogg">
         <_tooltip>French Guiana</_tooltip>
   </Shape>
-  <Shape name="H" pixmapfile="geography/southamerica/guyana.png" x="413" y="72" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/guyana.ogg">
+  <Shape name="H" pixmapfile="geography/southamerica/guyana.png" x="413" y="72" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/guyana.ogg">
         <_tooltip>Guyana</_tooltip>
   </Shape>
-  <Shape name="I" pixmapfile="geography/southamerica/panama.png" x="263" y="54" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/panama.ogg">
+  <Shape name="I" pixmapfile="geography/southamerica/panama.png" x="263" y="54" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/panama.ogg">
         <_tooltip>Panama</_tooltip>
   </Shape>
-  <Shape name="J" pixmapfile="geography/southamerica/paraguay.png" x="428" y="270" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/paraguay.ogg">
+  <Shape name="J" pixmapfile="geography/southamerica/paraguay.png" x="428" y="270" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/paraguay.ogg">
         <_tooltip>Paraguay</_tooltip>
   </Shape>
-  <Shape name="K" pixmapfile="geography/southamerica/peru.png" x="305" y="178" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/peru.ogg">
+  <Shape name="K" pixmapfile="geography/southamerica/peru.png" x="305" y="178" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/peru.ogg">
         <_tooltip>Peru</_tooltip>
   </Shape>
-  <Shape name="L" pixmapfile="geography/southamerica/suriname.png" x="434" y="77" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/suriname.ogg">
+  <Shape name="L" pixmapfile="geography/southamerica/suriname.png" x="434" y="77" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/suriname.ogg">
         <_tooltip>Suriname</_tooltip>
   </Shape>
-  <Shape name="M" pixmapfile="geography/southamerica/uruguay.png" x="452" y="333" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/uruguay.ogg">
+  <Shape name="M" pixmapfile="geography/southamerica/uruguay.png" x="452" y="333" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/uruguay.ogg">
         <_tooltip>Uruguay</_tooltip>
   </Shape>
-  <Shape name="N" pixmapfile="geography/southamerica/venezuela.png" x="357" y="66" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/venezuela.ogg">
+  <Shape name="N" pixmapfile="geography/southamerica/venezuela.png" x="357" y="66" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/venezuela.ogg">
         <_tooltip>Venezuela</_tooltip>
   </Shape>
   <Shape name="1" pixmapfile="geography/southamerica/south_america.png" type="SHAPE_BACKGROUND" x="420" y="260" zoomx="1" zoomy="1" position="0"/>

Modified: branches/GCOMPRIS_8_3/boards/geography/board3_0.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography/board3_0.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography/board3_0.xml.in	Wed Nov 19 21:43:04 2008
@@ -3,55 +3,55 @@
   <Title x="270" y="40" justification="GTK_JUSTIFY_CENTER">
     <_name>Western Europe</_name>
   </Title>
-  <Shape name="E" pixmapfile="geography/europe/austria.png" x="443" y="328" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/austria.ogg">
+  <Shape name="E" pixmapfile="geography/europe/austria.png" x="443" y="328" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/austria.ogg">
         <_tooltip>Austria</_tooltip>
   </Shape>
-  <Shape name="O" pixmapfile="geography/europe/belgium.png" x="335" y="286" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/belgium.ogg">
+  <Shape name="O" pixmapfile="geography/europe/belgium.png" x="335" y="286" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/belgium.ogg">
         <_tooltip>Belgium</_tooltip>
   </Shape>
-  <Shape name="B" pixmapfile="geography/europe/denmark.png" x="399" y="203" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/denmark.ogg">
+  <Shape name="B" pixmapfile="geography/europe/denmark.png" x="399" y="203" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/denmark.ogg">
         <_tooltip>Denmark</_tooltip>
   </Shape>
-  <Shape name="A" pixmapfile="geography/europe/finland.png" x="554" y="75" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/finland.ogg">
+  <Shape name="A" pixmapfile="geography/europe/finland.png" x="554" y="75" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/finland.ogg">
         <_tooltip>Finland</_tooltip>
   </Shape>
-  <Shape name="D" pixmapfile="geography/europe/france.png" x="312" y="351" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/france.ogg">
+  <Shape name="D" pixmapfile="geography/europe/france.png" x="312" y="351" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/france.ogg">
         <_tooltip>France</_tooltip>
   </Shape>
-  <Shape name="H" pixmapfile="geography/europe/germany.png" x="405" y="277" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/germany.ogg">
+  <Shape name="H" pixmapfile="geography/europe/germany.png" x="405" y="277" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/germany.ogg">
         <_tooltip>Germany</_tooltip>
   </Shape>
-  <Shape name="F" pixmapfile="geography/europe/iceland.png" x="141" y="54" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/iceland.ogg">
+  <Shape name="F" pixmapfile="geography/europe/iceland.png" x="141" y="54" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/iceland.ogg">
         <_tooltip>Iceland</_tooltip>
   </Shape>
-  <Shape name="R" pixmapfile="geography/europe/ireland.png" x="186" y="249" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/ireland.ogg">
+  <Shape name="R" pixmapfile="geography/europe/ireland.png" x="186" y="249" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/ireland.ogg">
         <_tooltip>Ireland</_tooltip>
   </Shape>
-  <Shape name="I" pixmapfile="geography/europe/italy.png" x="439" y="417" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/italy.ogg">
+  <Shape name="I" pixmapfile="geography/europe/italy.png" x="439" y="417" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/italy.ogg">
         <_tooltip>Italy</_tooltip>
   </Shape>
-  <Shape name="L" pixmapfile="geography/europe/luxembourg.png" type="SHAPE_BACKGROUND" x="354" y="298" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/luxembourg.ogg">
+  <Shape name="L" pixmapfile="geography/europe/luxembourg.png" type="SHAPE_BACKGROUND" x="354" y="298" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/luxembourg.ogg">
         <_tooltip>Luxembourg</_tooltip>
   </Shape>
-  <Shape name="N" pixmapfile="geography/europe/netherland.png" x="342" y="261" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/netherland.ogg">
+  <Shape name="N" pixmapfile="geography/europe/netherland.png" x="342" y="261" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/netherland.ogg">
         <_tooltip>The Netherlands</_tooltip>
   </Shape>
-  <Shape name="M" pixmapfile="geography/europe/norway.png" x="462" y="85" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/norway.ogg">
+  <Shape name="M" pixmapfile="geography/europe/norway.png" x="462" y="85" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/norway.ogg">
         <_tooltip>Norway</_tooltip>
   </Shape>
-  <Shape name="C" pixmapfile="geography/europe/portugal.png" x="182" y="453" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/portugal.ogg">
+  <Shape name="C" pixmapfile="geography/europe/portugal.png" x="182" y="453" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/portugal.ogg">
         <_tooltip>Portugal</_tooltip>
   </Shape>
-  <Shape name="P" pixmapfile="geography/europe/spain.png" x="252" y="448" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/spain.ogg">
+  <Shape name="P" pixmapfile="geography/europe/spain.png" x="252" y="448" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/spain.ogg">
         <_tooltip>Spain</_tooltip>
   </Shape>
-  <Shape name="Q" pixmapfile="geography/europe/sweden.png" x="467" y="118" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/sweden.ogg">
+  <Shape name="Q" pixmapfile="geography/europe/sweden.png" x="467" y="118" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/sweden.ogg">
         <_tooltip>Sweden</_tooltip>
   </Shape>
-  <Shape name="J" pixmapfile="geography/europe/switz.png" x="383" y="341" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/switz.ogg">
+  <Shape name="J" pixmapfile="geography/europe/switz.png" x="383" y="341" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/switz.ogg">
         <_tooltip>Switzerland</_tooltip>
   </Shape>
-  <Shape name="G" pixmapfile="geography/europe/united_kingdom.png" x="241" y="226" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/united_kingdom.ogg">
+  <Shape name="G" pixmapfile="geography/europe/united_kingdom.png" x="241" y="226" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/united_kingdom.ogg">
         <_tooltip>United Kingdom</_tooltip>
   </Shape>
   <Shape name="Z" pixmapfile="geography/europe/europe.png" type="SHAPE_BACKGROUND" x="450" y="260" zoomx="1" zoomy="1" position="0"/>

Modified: branches/GCOMPRIS_8_3/boards/geography/board3_1.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography/board3_1.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography/board3_1.xml.in	Wed Nov 19 21:43:04 2008
@@ -3,70 +3,70 @@
   <Title x="280" y="40" justification="GTK_JUSTIFY_CENTER">
     <_name>Eastern Europe</_name>
   </Title>
-  <Shape name="A" pixmapfile="geography/europe/albania.png" x="505" y="431" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/albania.ogg">
+  <Shape name="A" pixmapfile="geography/europe/albania.png" x="505" y="431" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/albania.ogg">
       <_tooltip>Albania</_tooltip>
   </Shape>
-  <Shape name="B" pixmapfile="geography/europe/belarus.png" x="577" y="239" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/belarus.ogg">
+  <Shape name="B" pixmapfile="geography/europe/belarus.png" x="577" y="239" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/belarus.ogg">
       <_tooltip>Belarus</_tooltip>
   </Shape>
-  <Shape name="C" pixmapfile="geography/europe/bosnia_herzegovina.png" x="470" y="388" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/bosnia_herzegovina.ogg">
+  <Shape name="C" pixmapfile="geography/europe/bosnia_herzegovina.png" x="470" y="388" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/bosnia_herzegovina.ogg">
       <_tooltip>Bosnia Herzegovina</_tooltip>
   </Shape>
-  <Shape name="D" pixmapfile="geography/europe/bulgaria.png" x="567" y="404" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/bulgaria.ogg">
+  <Shape name="D" pixmapfile="geography/europe/bulgaria.png" x="567" y="404" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/bulgaria.ogg">
       <_tooltip>Bulgaria</_tooltip>
   </Shape>
-  <Shape name="E" pixmapfile="geography/europe/croatia.png" x="454" y="375" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/croatia.ogg">
+  <Shape name="E" pixmapfile="geography/europe/croatia.png" x="454" y="375" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/croatia.ogg">
       <_tooltip>Croatia</_tooltip>
   </Shape>
-  <Shape name="G" pixmapfile="geography/europe/czech.png" x="438" y="294" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/czech.ogg">
+  <Shape name="G" pixmapfile="geography/europe/czech.png" x="438" y="294" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/czech.ogg">
       <_tooltip>Czech Republic</_tooltip>
   </Shape>
-  <Shape name="H" pixmapfile="geography/europe/estonia.png" x="528" y="167" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/estonia.ogg">
+  <Shape name="H" pixmapfile="geography/europe/estonia.png" x="528" y="167" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/estonia.ogg">
       <_tooltip>Estonia</_tooltip>
   </Shape>
-  <Shape name="I" pixmapfile="geography/europe/hungary.png" x="487" y="336" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/hungary.ogg">
+  <Shape name="I" pixmapfile="geography/europe/hungary.png" x="487" y="336" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/hungary.ogg">
       <_tooltip>Hungary</_tooltip>
   </Shape>
-  <Shape name="J" pixmapfile="geography/europe/latvia.png" x="531" y="193" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/latvia.ogg">
+  <Shape name="J" pixmapfile="geography/europe/latvia.png" x="531" y="193" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/latvia.ogg">
       <_tooltip>Latvia</_tooltip>
   </Shape>
-  <Shape name="K" pixmapfile="geography/europe/lithuania.png" x="524" y="218" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/lithuania.ogg">
+  <Shape name="K" pixmapfile="geography/europe/lithuania.png" x="524" y="218" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/lithuania.ogg">
       <_tooltip>Lithuania</_tooltip>
   </Shape>
-  <Shape name="L" pixmapfile="geography/europe/macedonia.png" x="524" y="421" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/macedonia.ogg">
+  <Shape name="L" pixmapfile="geography/europe/macedonia.png" x="524" y="421" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/macedonia.ogg">
       <_tooltip>Macedonia</_tooltip>
   </Shape>
-  <Shape name="M" pixmapfile="geography/europe/moldova.png" x="596" y="339" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/moldova.ogg">
+  <Shape name="M" pixmapfile="geography/europe/moldova.png" x="596" y="339" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/moldova.ogg">
       <_tooltip>Moldova</_tooltip>
   </Shape>
-  <Shape name="N" pixmapfile="geography/europe/poland.png" x="474" y="264" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/poland.ogg">
+  <Shape name="N" pixmapfile="geography/europe/poland.png" x="474" y="264" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/poland.ogg">
       <_tooltip>Poland</_tooltip>
   </Shape>
-  <Shape name="O" pixmapfile="geography/europe/romania.png" x="558" y="355" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/romania.ogg">
+  <Shape name="O" pixmapfile="geography/europe/romania.png" x="558" y="355" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/romania.ogg">
       <_tooltip>Romania</_tooltip>
   </Shape>
-  <Shape name="P" pixmapfile="geography/europe/russia.png" x="631" y="189" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/russia.ogg">
+  <Shape name="P" pixmapfile="geography/europe/russia.png" x="631" y="189" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/russia.ogg">
       <_tooltip>Russia</_tooltip>
   </Shape>
-  <Shape name="Q" pixmapfile="geography/europe/serbia_montenegro.png" x="510" y="385" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/serbia_montenegro.ogg">
+  <Shape name="Q" pixmapfile="geography/europe/serbia_montenegro.png" x="510" y="385" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/serbia_montenegro.ogg">
       <_tooltip>Serbia Montenegro</_tooltip>
   </Shape>
-  <Shape name="R" pixmapfile="geography/europe/slovakia.png" x="488" y="314" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/slovakia.ogg">
+  <Shape name="R" pixmapfile="geography/europe/slovakia.png" x="488" y="314" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/slovakia.ogg">
       <_tooltip>Slovak Republic</_tooltip>
   </Shape>
-  <Shape name="S" pixmapfile="geography/europe/slovenia.png" x="432" y="351" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/slovenia.ogg">
+  <Shape name="S" pixmapfile="geography/europe/slovenia.png" x="432" y="351" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/slovenia.ogg">
       <_tooltip>Slovenia</_tooltip>
   </Shape>
-  <Shape name="T" pixmapfile="geography/europe/turkey.png" x="677" y="466" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/turkey.ogg">
+  <Shape name="T" pixmapfile="geography/europe/turkey.png" x="677" y="466" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/turkey.ogg">
       <_tooltip>Turkey</_tooltip>
   </Shape>
-  <Shape name="U" pixmapfile="geography/europe/ukraine.png" x="626" y="318" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/ukraine.ogg">
+  <Shape name="U" pixmapfile="geography/europe/ukraine.png" x="626" y="318" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/ukraine.ogg">
       <_tooltip>Ukraine</_tooltip>
   </Shape>
-  <Shape name="V" pixmapfile="geography/europe/greece.png" x="550" y="472" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/greece.ogg">
+  <Shape name="V" pixmapfile="geography/europe/greece.png" x="550" y="472" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/greece.ogg">
       <_tooltip>Greece</_tooltip>
   </Shape>
-  <Shape name="F" pixmapfile="geography/europe/cyprus.png" type="SHAPE_BACKGROUND" x="683" y="521" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/cyprus.ogg">
+  <Shape name="F" pixmapfile="geography/europe/cyprus.png" type="SHAPE_BACKGROUND" x="683" y="521" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/cyprus.ogg">
       <_tooltip>Cyprus</_tooltip>
   </Shape>
   <Shape name="Z" pixmapfile="geography/europe/europe.png" type="SHAPE_BACKGROUND"

Modified: branches/GCOMPRIS_8_3/boards/geography/board4_0.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography/board4_0.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography/board4_0.xml.in	Wed Nov 19 21:43:04 2008
@@ -5,135 +5,135 @@
          <_name>Northern Africa</_name>
     </Title>
 
-<Shape name="A" pixmapfile="geography/africa/algeria.png" sound="sounds/$LOCALE/geography/africa/algeria.ogg" x="286" y="150" position="0">
+<Shape name="A" pixmapfile="geography/africa/algeria.png" sound="voices/$LOCALE/geography/africa/algeria.ogg" x="286" y="150" position="0">
 	<_tooltip>Algeria</_tooltip>
 </Shape>
 
-<Shape name="B" pixmapfile="geography/africa/benin.png" sound="sounds/$LOCALE/geography/africa/benin.ogg" x="275" y="341" position="0">
+<Shape name="B" pixmapfile="geography/africa/benin.png" sound="voices/$LOCALE/geography/africa/benin.ogg" x="275" y="341" position="0">
 	<_tooltip>Benin</_tooltip>
 </Shape>
 
-<Shape name="C" pixmapfile="geography/africa/burkina_faso.png" sound="sounds/$LOCALE/geography/africa/burkina_faso.ogg" x="236" y="310" position="0">
+<Shape name="C" pixmapfile="geography/africa/burkina_faso.png" sound="voices/$LOCALE/geography/africa/burkina_faso.ogg" x="236" y="310" position="0">
 	<_tooltip>Burkina Faso</_tooltip>
 </Shape>
 
-<Shape name="D" pixmapfile="geography/africa/cameroon.png" sound="sounds/$LOCALE/geography/africa/cameroon.ogg" x="383" y="377" position="0">
+<Shape name="D" pixmapfile="geography/africa/cameroon.png" sound="voices/$LOCALE/geography/africa/cameroon.ogg" x="383" y="377" position="0">
 	<_tooltip>Cameroon</_tooltip>
 </Shape>
 
-<Shape name="E" pixmapfile="geography/africa/central_african_republic.png" sound="sounds/$LOCALE/geography/africa/central_african_republic.ogg" x="465" y="370" position="0">
+<Shape name="E" pixmapfile="geography/africa/central_african_republic.png" sound="voices/$LOCALE/geography/africa/central_african_republic.ogg" x="465" y="370" position="0">
 	<_tooltip>Central African Republic</_tooltip>
 </Shape>
 
-<Shape name="F" pixmapfile="geography/africa/chad.png" sound="sounds/$LOCALE/geography/africa/chad.ogg" x="446" y="281" position="0">
+<Shape name="F" pixmapfile="geography/africa/chad.png" sound="voices/$LOCALE/geography/africa/chad.ogg" x="446" y="281" position="0">
 	<_tooltip>Chad</_tooltip>
 </Shape>
 
-<Shape name="G" pixmapfile="geography/africa/djibouti.png" sound="sounds/$LOCALE/geography/africa/djibouti.ogg" x="684" y="324" position="0">
+<Shape name="G" pixmapfile="geography/africa/djibouti.png" sound="voices/$LOCALE/geography/africa/djibouti.ogg" x="684" y="324" position="0">
 	<_tooltip>Djibouti</_tooltip>
 </Shape>
 
-<Shape name="H" pixmapfile="geography/africa/egypt.png" sound="sounds/$LOCALE/geography/africa/egypt.ogg" x="559" y="164" position="0">
+<Shape name="H" pixmapfile="geography/africa/egypt.png" sound="voices/$LOCALE/geography/africa/egypt.ogg" x="559" y="164" position="0">
 	<_tooltip>Egypt</_tooltip>
 </Shape>
 
-<Shape name="I" pixmapfile="geography/africa/equatorial_guinea.png" sound="sounds/$LOCALE/geography/africa/equatorial_guinea.ogg" x="373" y="436" position="0">
+<Shape name="I" pixmapfile="geography/africa/equatorial_guinea.png" sound="voices/$LOCALE/geography/africa/equatorial_guinea.ogg" x="373" y="436" position="0">
 	<_tooltip>Equatorial Guinea</_tooltip>
 </Shape>
 
-<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="sounds/$LOCALE/geography/africa/ethiopia.ogg" x="662" y="356" position="0">
+<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="voices/$LOCALE/geography/africa/ethiopia.ogg" x="662" y="356" position="0">
 	<_tooltip>Ethiopia</_tooltip>
 </Shape>
 
-<Shape name="erytrea" pixmapfile="geography/africa/eritrea.png" sound="sounds/$LOCALE/geography/eritrea.ogg" x="655" y="293" zoomx="1" zoomy="1" position="0">
+<Shape name="erytrea" pixmapfile="geography/africa/eritrea.png" sound="voices/$LOCALE/geography/eritrea.ogg" x="655" y="293" zoomx="1" zoomy="1" position="0">
 <_tooltip>Eritrea</_tooltip>
 </Shape>
 
-<Shape name="K" pixmapfile="geography/africa/gabon.png" sound="sounds/$LOCALE/geography/africa/gabon.ogg" x="388" y="462" position="0">
+<Shape name="K" pixmapfile="geography/africa/gabon.png" sound="voices/$LOCALE/geography/africa/gabon.ogg" x="388" y="462" position="0">
 	<_tooltip>Gabon</_tooltip>
 </Shape>
 
-<Shape name="L" pixmapfile="geography/africa/ganbia.png" sound="sounds/$LOCALE/geography/africa/gambia.ogg" x="101" y="290" position="0">
+<Shape name="L" pixmapfile="geography/africa/ganbia.png" sound="voices/$LOCALE/geography/africa/gambia.ogg" x="101" y="290" position="0">
 	<_tooltip>Gambia</_tooltip>
 </Shape>
 
-<Shape name="M" pixmapfile="geography/africa/ghana.png" sound="sounds/$LOCALE/geography/africa/ghana.ogg" x="237" y="355" position="0">
+<Shape name="M" pixmapfile="geography/africa/ghana.png" sound="voices/$LOCALE/geography/africa/ghana.ogg" x="237" y="355" position="0">
 	<_tooltip>Ghana</_tooltip>
 </Shape>
 
-<Shape name="N" pixmapfile="geography/africa/guinea_bissau.png" sound="sounds/$LOCALE/geography/africa/guinea_bissau.ogg" x="103" y="306" position="0">
+<Shape name="N" pixmapfile="geography/africa/guinea_bissau.png" sound="voices/$LOCALE/geography/africa/guinea_bissau.ogg" x="103" y="306" position="0">
 	<_tooltip>Guinea Bissau</_tooltip>
 </Shape>
 
-<Shape name="O" pixmapfile="geography/africa/guinea.png" sound="sounds/$LOCALE/geography/africa/guinea.ogg" x="137" y="325" position="0">
+<Shape name="O" pixmapfile="geography/africa/guinea.png" sound="voices/$LOCALE/geography/africa/guinea.ogg" x="137" y="325" position="0">
 	<_tooltip>Guinea</_tooltip>
 </Shape>
 
-<Shape name="P" pixmapfile="geography/africa/ivory_coast.png" sound="sounds/$LOCALE/geography/africa/ivory_coast.ogg" x="192" y="356" position="0">
+<Shape name="P" pixmapfile="geography/africa/ivory_coast.png" sound="voices/$LOCALE/geography/africa/ivory_coast.ogg" x="192" y="356" position="0">
 	<_tooltip>Ivory Coast</_tooltip>
 </Shape>
 
-<Shape name="Q" pixmapfile="geography/africa/liberia.png" sound="sounds/$LOCALE/geography/africa/liberia.ogg" x="152" y="366" position="0">
+<Shape name="Q" pixmapfile="geography/africa/liberia.png" sound="voices/$LOCALE/geography/africa/liberia.ogg" x="152" y="366" position="0">
 	<_tooltip>Liberia</_tooltip>
 </Shape>
 
-<Shape name="R" pixmapfile="geography/africa/libya.png" sound="sounds/$LOCALE/geography/africa/libya.ogg" x="432" y="173" position="0">
+<Shape name="R" pixmapfile="geography/africa/libya.png" sound="voices/$LOCALE/geography/africa/libya.ogg" x="432" y="173" position="0">
 	<_tooltip>Libya</_tooltip>
 </Shape>
 
-<Shape name="S" pixmapfile="geography/africa/mali.png" sound="sounds/$LOCALE/geography/africa/mali.ogg" x="219" y="250" position="0">
+<Shape name="S" pixmapfile="geography/africa/mali.png" sound="voices/$LOCALE/geography/africa/mali.ogg" x="219" y="250" position="0">
 	<_tooltip>Mali</_tooltip>
 </Shape>
 
-<Shape name="T" pixmapfile="geography/africa/mauritania.png" sound="sounds/$LOCALE/geography/africa/mauritania.ogg" x="161" y="211" position="0">
+<Shape name="T" pixmapfile="geography/africa/mauritania.png" sound="voices/$LOCALE/geography/africa/mauritania.ogg" x="161" y="211" position="0">
 	<_tooltip>Mauritania</_tooltip>
 </Shape>
 
-<Shape name="U" pixmapfile="geography/africa/moroco.png" sound="sounds/$LOCALE/geography/africa/moroco.ogg" x="212" y="101" position="0">
+<Shape name="U" pixmapfile="geography/africa/moroco.png" sound="voices/$LOCALE/geography/africa/moroco.ogg" x="212" y="101" position="0">
 	<_tooltip>Morocco</_tooltip>
 </Shape>
 
-<Shape name="V" pixmapfile="geography/africa/nigeria.png" sound="sounds/$LOCALE/geography/africa/nigeria.ogg" x="341" y="344" position="0">
+<Shape name="V" pixmapfile="geography/africa/nigeria.png" sound="voices/$LOCALE/geography/africa/nigeria.ogg" x="341" y="344" position="0">
 	<_tooltip>Nigeria</_tooltip>
 </Shape>
 
-<Shape name="W" pixmapfile="geography/africa/niger.png" sound="sounds/$LOCALE/geography/africa/niger.ogg" x="338" y="256" position="0">
+<Shape name="W" pixmapfile="geography/africa/niger.png" sound="voices/$LOCALE/geography/africa/niger.ogg" x="338" y="256" position="0">
 	<_tooltip>Niger</_tooltip>
 </Shape>
 
-<Shape name="X" pixmapfile="geography/africa/rwanda.png" sound="sounds/$LOCALE/geography/africa/rwanda.ogg" x="565" y="474" position="0">
+<Shape name="X" pixmapfile="geography/africa/rwanda.png" sound="voices/$LOCALE/geography/africa/rwanda.ogg" x="565" y="474" position="0">
 	<_tooltip>Rwanda</_tooltip>
 </Shape>
 
-<Shape name="Y" pixmapfile="geography/africa/senegal.png" sound="sounds/$LOCALE/geography/africa/senegal.ogg" x="106" y="277" position="0">
+<Shape name="Y" pixmapfile="geography/africa/senegal.png" sound="voices/$LOCALE/geography/africa/senegal.ogg" x="106" y="277" position="0">
 	<_tooltip>Senegal</_tooltip>
 </Shape>
 
-<Shape name="Z" pixmapfile="geography/africa/sierra_leone.png" sound="sounds/$LOCALE/geography/africa/sierra_leone.ogg" x="133" y="340" position="0">
+<Shape name="Z" pixmapfile="geography/africa/sierra_leone.png" sound="voices/$LOCALE/geography/africa/sierra_leone.ogg" x="133" y="340" position="0">
 	<_tooltip>Sierra Leone</_tooltip>
 </Shape>
 
-<Shape name="AA" pixmapfile="geography/africa/somalia.png" sound="sounds/$LOCALE/geography/africa/somalia.ogg" x="720" y="396" position="0">
+<Shape name="AA" pixmapfile="geography/africa/somalia.png" sound="voices/$LOCALE/geography/africa/somalia.ogg" x="720" y="396" position="0">
 	<_tooltip>Somalia</_tooltip>
 </Shape>
 
-<Shape name="AB" pixmapfile="geography/africa/sudan.png" sound="sounds/$LOCALE/geography/africa/sudan.ogg" x="557" y="306" position="0">
+<Shape name="AB" pixmapfile="geography/africa/sudan.png" sound="voices/$LOCALE/geography/africa/sudan.ogg" x="557" y="306" position="0">
 	<_tooltip>Sudan</_tooltip>
 </Shape>
 
-<Shape name="AC" pixmapfile="geography/africa/togo.png" sound="sounds/$LOCALE/geography/africa/togo.ogg" x="258" y="348" position="0">
+<Shape name="AC" pixmapfile="geography/africa/togo.png" sound="voices/$LOCALE/geography/africa/togo.ogg" x="258" y="348" position="0">
 	<_tooltip>Togo</_tooltip>
 </Shape>
 
-<Shape name="AD" pixmapfile="geography/africa/tunisia.png" sound="sounds/$LOCALE/geography/africa/tunisia.ogg" x="367" y="92" position="0">
+<Shape name="AD" pixmapfile="geography/africa/tunisia.png" sound="voices/$LOCALE/geography/africa/tunisia.ogg" x="367" y="92" position="0">
 	<_tooltip>Tunisia</_tooltip>
 </Shape>
 
-<Shape name="AE" pixmapfile="geography/africa/uganda.png" sound="sounds/$LOCALE/geography/africa/uganda.ogg" x="587" y="436" position="0">
+<Shape name="AE" pixmapfile="geography/africa/uganda.png" sound="voices/$LOCALE/geography/africa/uganda.ogg" x="587" y="436" position="0">
 	<_tooltip>Uganda</_tooltip>
 </Shape>
 
-<Shape name="AF" pixmapfile="geography/africa/western_sahara.png" sound="sounds/$LOCALE/geography/africa/western_sahara.ogg" x="148" y="170" position="0">
+<Shape name="AF" pixmapfile="geography/africa/western_sahara.png" sound="voices/$LOCALE/geography/africa/western_sahara.ogg" x="148" y="170" position="0">
 	<_tooltip>Western Sahara</_tooltip>
 </Shape>
 

Modified: branches/GCOMPRIS_8_3/boards/geography/board4_1.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography/board4_1.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography/board4_1.xml.in	Wed Nov 19 21:43:04 2008
@@ -5,83 +5,83 @@
          <_name>Southern Africa</_name>
     </Title>
 
-<Shape name="A" pixmapfile="geography/africa/angola.png" sound="sounds/$LOCALE/geography/africa/angola.ogg" x="327" y="210" position="0">
+<Shape name="A" pixmapfile="geography/africa/angola.png" sound="voices/$LOCALE/geography/africa/angola.ogg" x="327" y="210" position="0">
 	<_tooltip>Angola</_tooltip>
 </Shape>
 
-<Shape name="C" pixmapfile="geography/africa/botswana.png" sound="sounds/$LOCALE/geography/africa/botswana.ogg" x="388" y="317" position="0">
+<Shape name="C" pixmapfile="geography/africa/botswana.png" sound="voices/$LOCALE/geography/africa/botswana.ogg" x="388" y="317" position="0">
 	<_tooltip>Botswana</_tooltip>
 </Shape>
 
-<Shape name="D" pixmapfile="geography/africa/burundi.png" sound="sounds/$LOCALE/geography/africa/burundi.ogg" x="444" y="137" position="0">
+<Shape name="D" pixmapfile="geography/africa/burundi.png" sound="voices/$LOCALE/geography/africa/burundi.ogg" x="444" y="137" position="0">
 	<_tooltip>Burundi</_tooltip>
 </Shape>
 
-<Shape name="E" pixmapfile="geography/africa/democratic_republic_of_congo.png" sound="sounds/$LOCALE/geography/africa/democratic_republic_of_congo.ogg" x="364" y="136" position="0">
+<Shape name="E" pixmapfile="geography/africa/democratic_republic_of_congo.png" sound="voices/$LOCALE/geography/africa/democratic_republic_of_congo.ogg" x="364" y="136" position="0">
 	<_tooltip>Democratic Republic of Congo</_tooltip>
 </Shape>
 
-<Shape name="F" pixmapfile="geography/africa/equatorial_guinea.png" sound="sounds/$LOCALE/geography/africa/equatorial_guinea.ogg" x="253" y="82" position="0">
+<Shape name="F" pixmapfile="geography/africa/equatorial_guinea.png" sound="voices/$LOCALE/geography/africa/equatorial_guinea.ogg" x="253" y="82" position="0">
 	<_tooltip>Equatorial Guinea</_tooltip>
 </Shape>
 
-<Shape name="G" pixmapfile="geography/africa/gabon.png" sound="sounds/$LOCALE/geography/africa/gabon.ogg" x="266" y="108" position="0">
+<Shape name="G" pixmapfile="geography/africa/gabon.png" sound="voices/$LOCALE/geography/africa/gabon.ogg" x="266" y="108" position="0">
 	<_tooltip>Gabon</_tooltip>
 </Shape>
 
-<Shape name="H" pixmapfile="geography/africa/kenya.png" sound="sounds/$LOCALE/geography/africa/kenya.ogg" x="521" y="93" position="0">
+<Shape name="H" pixmapfile="geography/africa/kenya.png" sound="voices/$LOCALE/geography/africa/kenya.ogg" x="521" y="93" position="0">
 	<_tooltip>Kenya</_tooltip>
 </Shape>
 
-<Shape name="I" pixmapfile="geography/africa/lesotho.png" sound="sounds/$LOCALE/geography/africa/lesotho.ogg" x="424" y="385" position="0">
+<Shape name="I" pixmapfile="geography/africa/lesotho.png" sound="voices/$LOCALE/geography/africa/lesotho.ogg" x="424" y="385" position="0">
 	<_tooltip>Lesotho</_tooltip>
 </Shape>
 
-<Shape name="J" pixmapfile="geography/africa/madagascar.png" sound="sounds/$LOCALE/geography/africa/madagascar.ogg" x="596" y="287" position="0">
+<Shape name="J" pixmapfile="geography/africa/madagascar.png" sound="voices/$LOCALE/geography/africa/madagascar.ogg" x="596" y="287" position="0">
 	<_tooltip>Madagascar</_tooltip>
 </Shape>
 
-<Shape name="K" pixmapfile="geography/africa/malawi.png" sound="sounds/$LOCALE/geography/africa/malawi.ogg" x="482" y="231" position="0">
+<Shape name="K" pixmapfile="geography/africa/malawi.png" sound="voices/$LOCALE/geography/africa/malawi.ogg" x="482" y="231" position="0">
 	<_tooltip>Malawi</_tooltip>
 </Shape>
 
-<Shape name="L" pixmapfile="geography/africa/mozambique.png" sound="sounds/$LOCALE/geography/africa/mozambique.ogg" x="493" y="283" position="0">
+<Shape name="L" pixmapfile="geography/africa/mozambique.png" sound="voices/$LOCALE/geography/africa/mozambique.ogg" x="493" y="283" position="0">
 	<_tooltip>Mozambique</_tooltip>
 </Shape>
 
-<Shape name="M" pixmapfile="geography/africa/namibia.png" sound="sounds/$LOCALE/geography/africa/namibia.ogg" x="328" y="319" position="0">
+<Shape name="M" pixmapfile="geography/africa/namibia.png" sound="voices/$LOCALE/geography/africa/namibia.ogg" x="328" y="319" position="0">
 	<_tooltip>Namibia</_tooltip>
 </Shape>
 
-<Shape name="N" pixmapfile="geography/africa/republic_of_congo.png" sound="sounds/$LOCALE/geography/africa/republic_of_congo.ogg" x="296" y="100" position="0">
+<Shape name="N" pixmapfile="geography/africa/republic_of_congo.png" sound="voices/$LOCALE/geography/africa/republic_of_congo.ogg" x="296" y="100" position="0">
 	<_tooltip>Republic of Congo</_tooltip>
 </Shape>
 
-<Shape name="O" pixmapfile="geography/africa/rwanda.png" sound="sounds/$LOCALE/geography/africa/rwanda.ogg" x="445" y="120" position="0">
+<Shape name="O" pixmapfile="geography/africa/rwanda.png" sound="voices/$LOCALE/geography/africa/rwanda.ogg" x="445" y="120" position="0">
 	<_tooltip>Rwanda</_tooltip>
 </Shape>
 
-<Shape name="P" pixmapfile="geography/africa/south_africa.png" sound="sounds/$LOCALE/geography/africa/south_africa.ogg" x="391" y="375" position="0">
+<Shape name="P" pixmapfile="geography/africa/south_africa.png" sound="voices/$LOCALE/geography/africa/south_africa.ogg" x="391" y="375" position="0">
 	<_tooltip>South Africa</_tooltip>
 </Shape>
 
-<Shape name="Q" pixmapfile="geography/africa/swaziland.png" sound="sounds/$LOCALE/geography/africa/swaziland.ogg" x="447" y="357" position="0">
+<Shape name="Q" pixmapfile="geography/africa/swaziland.png" sound="voices/$LOCALE/geography/africa/swaziland.ogg" x="447" y="357" position="0">
 	<_tooltip>Swaziland</_tooltip>
 </Shape>
 
-<Shape name="R" pixmapfile="geography/africa/tanzania.png" sound="sounds/$LOCALE/geography/africa/tanzania.ogg" x="492" y="161" position="0">
+<Shape name="R" pixmapfile="geography/africa/tanzania.png" sound="voices/$LOCALE/geography/africa/tanzania.ogg" x="492" y="161" position="0">
 	<_tooltip>Tanzania</_tooltip>
 </Shape>
 
-<Shape name="S" pixmapfile="geography/africa/uganda.png" sound="sounds/$LOCALE/geography/africa/uganda.ogg" x="465" y="83" position="0">
+<Shape name="S" pixmapfile="geography/africa/uganda.png" sound="voices/$LOCALE/geography/africa/uganda.ogg" x="465" y="83" position="0">
 	<_tooltip>Uganda</_tooltip>
 </Shape>
 
-<Shape name="T" pixmapfile="geography/africa/zambia.png" sound="sounds/$LOCALE/geography/africa/zambia.ogg" x="420" y="227" position="0">
+<Shape name="T" pixmapfile="geography/africa/zambia.png" sound="voices/$LOCALE/geography/africa/zambia.ogg" x="420" y="227" position="0">
 	<_tooltip>Zambia</_tooltip>
 </Shape>
 
-<Shape name="U" pixmapfile="geography/africa/zimbabwe.png" sound="sounds/$LOCALE/geography/africa/zimbabwe.ogg" x="427" y="284" position="0">
+<Shape name="U" pixmapfile="geography/africa/zimbabwe.png" sound="voices/$LOCALE/geography/africa/zimbabwe.ogg" x="427" y="284" position="0">
 	<_tooltip>Zimbabwe</_tooltip>
 </Shape>
 

Modified: branches/GCOMPRIS_8_3/boards/geography/board4_2.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography/board4_2.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography/board4_2.xml.in	Wed Nov 19 21:43:04 2008
@@ -3,120 +3,120 @@
 <Title y="40" x="200" justification="GTK_JUSTIFY_CENTER">
 <_name>Africa</_name>
 </Title>
-<Shape name="afrique_sud" pixmapfile="geography/afrique/south_africa.png" sound="sounds/$LOCALE/geography/south_africa.ogg" x="525" y="469" zoomx="1" zoomy="1" position="0"><_tooltip>South Africa</_tooltip>
+<Shape name="afrique_sud" pixmapfile="geography/afrique/south_africa.png" sound="voices/$LOCALE/geography/south_africa.ogg" x="525" y="469" zoomx="1" zoomy="1" position="0"><_tooltip>South Africa</_tooltip>
 </Shape>
-<Shape name="algerie" pixmapfile="geography/afrique/algeria.png" sound="sounds/$LOCALE/geography/algeria.ogg" x="386" y="72" zoomx="1" zoomy="1" position="0">
+<Shape name="algerie" pixmapfile="geography/afrique/algeria.png" sound="voices/$LOCALE/geography/algeria.ogg" x="386" y="72" zoomx="1" zoomy="1" position="0">
 <_tooltip>Algeria</_tooltip>
 </Shape>
-<Shape name="angola" pixmapfile="geography/afrique/angola.png" sound="sounds/$LOCALE/geography/angola.ogg" x="486" y="354" zoomx="1" zoomy="1" position="0">
+<Shape name="angola" pixmapfile="geography/afrique/angola.png" sound="voices/$LOCALE/geography/angola.ogg" x="486" y="354" zoomx="1" zoomy="1" position="0">
 <_tooltip>Angola</_tooltip>
 </Shape>
-<Shape name="benin" pixmapfile="geography/afrique/benin.png" sound="sounds/$LOCALE/geography/benin.ogg" x="391" y="206" zoomx="1" zoomy="1" position="0">
+<Shape name="benin" pixmapfile="geography/afrique/benin.png" sound="voices/$LOCALE/geography/benin.ogg" x="391" y="206" zoomx="1" zoomy="1" position="0">
 <_tooltip>Benin</_tooltip>
 </Shape>
-<Shape name="botswana" pixmapfile="geography/afrique/botswana.png" sound="sounds/$LOCALE/geography/botswana.ogg" x="526" y="428" zoomx="1" zoomy="1" position="0">
+<Shape name="botswana" pixmapfile="geography/afrique/botswana.png" sound="voices/$LOCALE/geography/botswana.ogg" x="526" y="428" zoomx="1" zoomy="1" position="0">
 <_tooltip>Botswana</_tooltip>
 </Shape>
-<Shape name="burkina" pixmapfile="geography/afrique/burkina.png" sound="sounds/$LOCALE/geography/burkina.ogg" x="366" y="184" zoomx="1" zoomy="1" position="0">
+<Shape name="burkina" pixmapfile="geography/afrique/burkina.png" sound="voices/$LOCALE/geography/burkina.ogg" x="366" y="184" zoomx="1" zoomy="1" position="0">
 <_tooltip>Burkina Faso</_tooltip>
 </Shape>
-<Shape name="cameroon" pixmapfile="geography/afrique/cameroon.png" sound="sounds/$LOCALE/geography/cameroon.ogg" x="455" y="223" zoomx="1" zoomy="1" position="0">
+<Shape name="cameroon" pixmapfile="geography/afrique/cameroon.png" sound="voices/$LOCALE/geography/cameroon.ogg" x="455" y="223" zoomx="1" zoomy="1" position="0">
 <_tooltip>Cameroon</_tooltip>
 </Shape>
-<Shape name="congo" pixmapfile="geography/afrique/congo.png" sound="sounds/$LOCALE/geography/congo.ogg" x="470" y="274" zoomx="1" zoomy="1" position="0">
+<Shape name="congo" pixmapfile="geography/afrique/congo.png" sound="voices/$LOCALE/geography/congo.ogg" x="470" y="274" zoomx="1" zoomy="1" position="0">
 <_tooltip>Democratic Republic of Congo</_tooltip>
 </Shape>
-<Shape name="cote_ivoire" pixmapfile="geography/afrique/ivory_coast.png" sound="sounds/$LOCALE/geography/ivory_coast.ogg" x="343" y="218" zoomx="1" zoomy="1" position="0">
+<Shape name="cote_ivoire" pixmapfile="geography/afrique/ivory_coast.png" sound="voices/$LOCALE/geography/ivory_coast.ogg" x="343" y="218" zoomx="1" zoomy="1" position="0">
 <_tooltip>Ivory Coast</_tooltip>
 </Shape>
-<Shape name="egypte" pixmapfile="geography/afrique/egypt.png" sound="sounds/$LOCALE/geography/egypt.ogg" x="558" y="84" zoomx="1" zoomy="1" position="0">
+<Shape name="egypte" pixmapfile="geography/afrique/egypt.png" sound="voices/$LOCALE/geography/egypt.ogg" x="558" y="84" zoomx="1" zoomy="1" position="0">
 <_tooltip>Egypt</_tooltip>
 </Shape>
-<Shape name="erythree" pixmapfile="geography/afrique/eritrea.png" sound="sounds/$LOCALE/geography/eritrea.ogg" x="621" y="164" zoomx="1" zoomy="1" position="0">
+<Shape name="erythree" pixmapfile="geography/afrique/eritrea.png" sound="voices/$LOCALE/geography/eritrea.ogg" x="621" y="164" zoomx="1" zoomy="1" position="0">
 <_tooltip>Eritrea</_tooltip>
 </Shape>
-<Shape name="ethiopie" pixmapfile="geography/afrique/ethiopia.png" sound="sounds/$LOCALE/geography/ethiopia.ogg" x="627" y="207" zoomx="1" zoomy="1" position="0">
+<Shape name="ethiopie" pixmapfile="geography/afrique/ethiopia.png" sound="voices/$LOCALE/geography/ethiopia.ogg" x="627" y="207" zoomx="1" zoomy="1" position="0">
 <_tooltip>Ethiopia</_tooltip>
 </Shape>
-<Shape name="gabon" pixmapfile="geography/afrique/gabon.png" sound="sounds/$LOCALE/geography/gabon.ogg" x="449" y="279" zoomx="1" zoomy="1" position="0">
+<Shape name="gabon" pixmapfile="geography/afrique/gabon.png" sound="voices/$LOCALE/geography/gabon.ogg" x="449" y="279" zoomx="1" zoomy="1" position="0">
 <_tooltip>Gabon</_tooltip>
 </Shape>
-<Shape name="ghana" pixmapfile="geography/afrique/ghana.png" sound="sounds/$LOCALE/geography/ghana.ogg" x="368" y="215" zoomx="1" zoomy="1" position="0">
+<Shape name="ghana" pixmapfile="geography/afrique/ghana.png" sound="voices/$LOCALE/geography/ghana.ogg" x="368" y="215" zoomx="1" zoomy="1" position="0">
 <_tooltip>Ghana</_tooltip>
 </Shape>
-<Shape name="guinee" pixmapfile="geography/afrique/guinea.png" sound="sounds/$LOCALE/geography/guinee.ogg" x="307" y="200" zoomx="1" zoomy="1" position="0">
+<Shape name="guinee" pixmapfile="geography/afrique/guinea.png" sound="voices/$LOCALE/geography/guinee.ogg" x="307" y="200" zoomx="1" zoomy="1" position="0">
 <_tooltip>Guinea</_tooltip>
 </Shape>
-<Shape name="kenya" pixmapfile="geography/afrique/kenya.png" sound="sounds/$LOCALE/geography/kenya.ogg" x="612" y="270" zoomx="1" zoomy="1" position="0">
+<Shape name="kenya" pixmapfile="geography/afrique/kenya.png" sound="voices/$LOCALE/geography/kenya.ogg" x="612" y="270" zoomx="1" zoomy="1" position="0">
 <_tooltip>Kenya</_tooltip>
 </Shape>
-<Shape name="liberia" pixmapfile="geography/afrique/liberia.png" sound="sounds/$LOCALE/geography/liberia.ogg" x="317" y="226" zoomx="1" zoomy="1" position="0">
+<Shape name="liberia" pixmapfile="geography/afrique/liberia.png" sound="voices/$LOCALE/geography/liberia.ogg" x="317" y="226" zoomx="1" zoomy="1" position="0">
 <_tooltip>Liberia</_tooltip>
 </Shape>
-<Shape name="libye" pixmapfile="geography/afrique/libya.png" sound="sounds/$LOCALE/geography/libya.ogg" x="481" y="85" zoomx="1" zoomy="1" position="0">
+<Shape name="libye" pixmapfile="geography/afrique/libya.png" sound="voices/$LOCALE/geography/libya.ogg" x="481" y="85" zoomx="1" zoomy="1" position="0">
 <_tooltip>Libya</_tooltip>
 </Shape>
-<Shape name="madagascar" pixmapfile="geography/afrique/madagascar.png" sound="sounds/$LOCALE/geography/madagascar.ogg" x="662" y="402" zoomx="1" zoomy="1" position="0">
+<Shape name="madagascar" pixmapfile="geography/afrique/madagascar.png" sound="voices/$LOCALE/geography/madagascar.ogg" x="662" y="402" zoomx="1" zoomy="1" position="0">
 <_tooltip>Madagascar</_tooltip>
 </Shape>
-<Shape name="malawi" pixmapfile="geography/afrique/malawi.png" sound="sounds/$LOCALE/geography/malawi.ogg" x="587" y="362" zoomx="1" zoomy="1" position="0">
+<Shape name="malawi" pixmapfile="geography/afrique/malawi.png" sound="voices/$LOCALE/geography/malawi.ogg" x="587" y="362" zoomx="1" zoomy="1" position="0">
 <_tooltip>Malawi</_tooltip>
 </Shape>
-<Shape name="mali" pixmapfile="geography/afrique/mali.png" sound="sounds/$LOCALE/geography/mali.ogg" x="352" y="145" zoomx="1" zoomy="1" position="0">
+<Shape name="mali" pixmapfile="geography/afrique/mali.png" sound="voices/$LOCALE/geography/mali.ogg" x="352" y="145" zoomx="1" zoomy="1" position="0">
 <_tooltip>Mali</_tooltip>
 </Shape>
-<Shape name="maroc" pixmapfile="geography/afrique/moroco.png" sound="sounds/$LOCALE/geography/moroco.ogg" x="321" y="69" zoomx="1" zoomy="1" position="0">
+<Shape name="maroc" pixmapfile="geography/afrique/moroco.png" sound="voices/$LOCALE/geography/moroco.ogg" x="321" y="69" zoomx="1" zoomy="1" position="0">
 <_tooltip>Morocco</_tooltip>
 </Shape>
-<Shape name="mauritanie" pixmapfile="geography/afrique/mauritania.png" sound="sounds/$LOCALE/geography/mauritania.ogg" x="309" y="124" zoomx="1" zoomy="1" position="0">
+<Shape name="mauritanie" pixmapfile="geography/afrique/mauritania.png" sound="voices/$LOCALE/geography/mauritania.ogg" x="309" y="124" zoomx="1" zoomy="1" position="0">
 <_tooltip>Mauritania</_tooltip>
 </Shape>
-<Shape name="mozambique" pixmapfile="geography/afrique/mozambique.png" sound="sounds/$LOCALE/geography/mozambique.ogg" x="594" y="403" zoomx="1" zoomy="1" position="0">
+<Shape name="mozambique" pixmapfile="geography/afrique/mozambique.png" sound="voices/$LOCALE/geography/mozambique.ogg" x="594" y="403" zoomx="1" zoomy="1" position="0">
 <_tooltip>Mozambique</_tooltip>
 </Shape>
-<Shape name="namibie" pixmapfile="geography/afrique/namibia.png" sound="sounds/$LOCALE/geography/namibia.ogg" x="487" y="432" zoomx="1" zoomy="1" position="0">
+<Shape name="namibie" pixmapfile="geography/afrique/namibia.png" sound="voices/$LOCALE/geography/namibia.ogg" x="487" y="432" zoomx="1" zoomy="1" position="0">
 <_tooltip>Namibia</_tooltip>
 </Shape>
-<Shape name="niger" pixmapfile="geography/afrique/niger.png" sound="sounds/$LOCALE/geography/niger.ogg" x="426" y="147" zoomx="1" zoomy="1" position="0">
+<Shape name="niger" pixmapfile="geography/afrique/niger.png" sound="voices/$LOCALE/geography/niger.ogg" x="426" y="147" zoomx="1" zoomy="1" position="0">
 <_tooltip>Niger</_tooltip>
 </Shape>
-<Shape name="nigeria" pixmapfile="geography/afrique/nigeria.png" sound="sounds/$LOCALE/geography/nigeria.ogg" x="431" y="207" zoomx="1" zoomy="1" position="0">
+<Shape name="nigeria" pixmapfile="geography/afrique/nigeria.png" sound="voices/$LOCALE/geography/nigeria.ogg" x="431" y="207" zoomx="1" zoomy="1" position="0">
 <_tooltip>Nigeria</_tooltip>
 </Shape>
-<Shape name="ouganda" pixmapfile="geography/afrique/uganda.png" sound="sounds/$LOCALE/geography/uganda.ogg" x="576" y="260" zoomx="1" zoomy="1" position="0">
+<Shape name="ouganda" pixmapfile="geography/afrique/uganda.png" sound="voices/$LOCALE/geography/uganda.ogg" x="576" y="260" zoomx="1" zoomy="1" position="0">
 <_tooltip>Uganda</_tooltip>
 </Shape>
-<Shape name="rep_centrafrique" pixmapfile="geography/afrique/rep_centrafrique.png" sound="sounds/$LOCALE/geography/central_african_republic.ogg" x="507" y="222" zoomx="1" zoomy="1" position="0">
+<Shape name="rep_centrafrique" pixmapfile="geography/afrique/rep_centrafrique.png" sound="voices/$LOCALE/geography/central_african_republic.ogg" x="507" y="222" zoomx="1" zoomy="1" position="0">
 <_tooltip>Central African Republic</_tooltip>
 </Shape>
-<Shape name="rep_congo" pixmapfile="geography/afrique/rep_congo.png" sound="sounds/$LOCALE/geography/democratic_republic_of_congo.ogg" x="510" y="299" zoomx="1" zoomy="1" position="0">
+<Shape name="rep_congo" pixmapfile="geography/afrique/rep_congo.png" sound="voices/$LOCALE/geography/democratic_republic_of_congo.ogg" x="510" y="299" zoomx="1" zoomy="1" position="0">
 <_tooltip>Democratic Republic of Congo</_tooltip>
 </Shape>
-<Shape name="senegal" pixmapfile="geography/afrique/senegal.png" sound="sounds/$LOCALE/geography/senegal.ogg" x="288" y="169" zoomx="1" zoomy="1" position="0">
+<Shape name="senegal" pixmapfile="geography/afrique/senegal.png" sound="voices/$LOCALE/geography/senegal.ogg" x="288" y="169" zoomx="1" zoomy="1" position="0">
 <_tooltip>Senegal</_tooltip>
 </Shape>
-<Shape name="somalie" pixmapfile="geography/afrique/somalia.png" sound="sounds/$LOCALE/geography/somalia.ogg" x="661" y="234" zoomx="1" zoomy="1" position="0">
+<Shape name="somalie" pixmapfile="geography/afrique/somalia.png" sound="voices/$LOCALE/geography/somalia.ogg" x="661" y="234" zoomx="1" zoomy="1" position="0">
 <_tooltip>Somalia</_tooltip>
 </Shape>
-<Shape name="sudan" pixmapfile="geography/afrique/soudan.png" sound="sounds/$LOCALE/geography/soudan.ogg" x="561" y="179" zoomx="1" zoomy="1" position="0">
+<Shape name="sudan" pixmapfile="geography/afrique/soudan.png" sound="voices/$LOCALE/geography/soudan.ogg" x="561" y="179" zoomx="1" zoomy="1" position="0">
 <_tooltip>Sudan</_tooltip>
 </Shape>
-<Shape name="tanzanie" pixmapfile="geography/afrique/tanzania.png" sound="sounds/$LOCALE/geography/tanzania.ogg" x="592" y="315" zoomx="1" zoomy="1" position="0">
+<Shape name="tanzanie" pixmapfile="geography/afrique/tanzania.png" sound="voices/$LOCALE/geography/tanzania.ogg" x="592" y="315" zoomx="1" zoomy="1" position="0">
 <_tooltip>Tanzania</_tooltip>
 </Shape>
-<Shape name="tchad" pixmapfile="geography/afrique/chad.png" sound="sounds/$LOCALE/geography/chad.ogg" x="492" y="162" zoomx="1" zoomy="1" position="0">
+<Shape name="tchad" pixmapfile="geography/afrique/chad.png" sound="voices/$LOCALE/geography/chad.ogg" x="492" y="162" zoomx="1" zoomy="1" position="0">
 <_tooltip>Chad</_tooltip>
 </Shape>
-<Shape name="togo" pixmapfile="geography/afrique/togo.png" sound="sounds/$LOCALE/geography/togo.ogg" x="381" y="211" zoomx="1" zoomy="1" position="0">
+<Shape name="togo" pixmapfile="geography/afrique/togo.png" sound="voices/$LOCALE/geography/togo.ogg" x="381" y="211" zoomx="1" zoomy="1" position="0">
 <_tooltip>Togo</_tooltip>
 </Shape>
-<Shape name="tunisie" pixmapfile="geography/afrique/tunisia.png" sound="sounds/$LOCALE/geography/tunisia.ogg" x="433" y="33" zoomx="1" zoomy="1" position="0">
+<Shape name="tunisie" pixmapfile="geography/afrique/tunisia.png" sound="voices/$LOCALE/geography/tunisia.ogg" x="433" y="33" zoomx="1" zoomy="1" position="0">
 <_tooltip>Tunisia</_tooltip>
 </Shape>
-<Shape name="zambie" pixmapfile="geography/afrique/zambia.png" sound="sounds/$LOCALE/geography/zambia.ogg" x="549" y="363" zoomx="1" zoomy="1" position="0">
+<Shape name="zambie" pixmapfile="geography/afrique/zambia.png" sound="voices/$LOCALE/geography/zambia.ogg" x="549" y="363" zoomx="1" zoomy="1" position="0">
 <_tooltip>Zambia</_tooltip>
 </Shape>
-<Shape name="zimbabwe" pixmapfile="geography/afrique/zimbabwe.png" sound="sounds/$LOCALE/geography/zimbabwe.ogg" x="555" y="403" zoomx="1" zoomy="1" position="0">
+<Shape name="zimbabwe" pixmapfile="geography/afrique/zimbabwe.png" sound="voices/$LOCALE/geography/zimbabwe.ogg" x="555" y="403" zoomx="1" zoomy="1" position="0">
 <_tooltip>Zimbabwe</_tooltip>
 </Shape>
 <Shape name="zz" zoomx="1" zoomy="1" y="260" x="480" type="SHAPE_BACKGROUND" position="0" pixmapfile="geography/afrique/africa.png"/></ShapeGame>

Modified: branches/GCOMPRIS_8_3/boards/geography_country/board1_0.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography_country/board1_0.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography_country/board1_0.xml.in	Wed Nov 19 21:43:04 2008
@@ -5,70 +5,70 @@
          <_name>Regions of France</_name>
     </Title>
 
-<Shape name="A" pixmapfile="geography_country/france_region/alsace.png" sound="sounds/$LOCALE/france_region/alsace.ogg" x="585" y="149" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="A" pixmapfile="geography_country/france_region/alsace.png" sound="voices/$LOCALE/france_region/alsace.ogg" x="585" y="149" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Alsace</tooltip>
 </Shape>
-<Shape name="B" pixmapfile="geography_country/france_region/aquitaine.png" sound="sounds/$LOCALE/france_region/aquitaine.ogg" x="317" y="371" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="B" pixmapfile="geography_country/france_region/aquitaine.png" sound="voices/$LOCALE/france_region/aquitaine.ogg" x="317" y="371" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Aquitaine</tooltip>
 </Shape>
-<Shape name="C" pixmapfile="geography_country/france_region/auvergne.png" sound="sounds/$LOCALE/france_region/auvergne.ogg" x="443" y="293" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="C" pixmapfile="geography_country/france_region/auvergne.png" sound="voices/$LOCALE/france_region/auvergne.ogg" x="443" y="293" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Auvergne</tooltip>
 </Shape>
-<Shape name="D" pixmapfile="geography_country/france_region/basse-normandie.png" sound="sounds/$LOCALE/france_region/basse-normandie.ogg" x="315" y="115" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="D" pixmapfile="geography_country/france_region/basse-normandie.png" sound="voices/$LOCALE/france_region/basse-normandie.ogg" x="315" y="115" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Basse Normandie</tooltip>
 </Shape>
-<Shape name="E" pixmapfile="geography_country/france_region/bourgogne.png" sound="sounds/$LOCALE/france_region/bourgogne.ogg" x="473" y="207" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="E" pixmapfile="geography_country/france_region/bourgogne.png" sound="voices/$LOCALE/france_region/bourgogne.ogg" x="473" y="207" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Bourgogne</tooltip>
 </Shape>
-<Shape name="F" pixmapfile="geography_country/france_region/bretagne.png" sound="sounds/$LOCALE/france_region/bretagne.ogg" x="226" y="158" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="F" pixmapfile="geography_country/france_region/bretagne.png" sound="voices/$LOCALE/france_region/bretagne.ogg" x="226" y="158" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Bretagne</tooltip>
 </Shape>
-<Shape name="G" pixmapfile="geography_country/france_region/centre.png" sound="sounds/$LOCALE/france_region/centre.ogg" x="383" y="188" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="G" pixmapfile="geography_country/france_region/centre.png" sound="voices/$LOCALE/france_region/centre.ogg" x="383" y="188" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Centre</tooltip>
 </Shape>
-<Shape name="H" pixmapfile="geography_country/france_region/champagne-ardenne.png" sound="sounds/$LOCALE/france_region/champagne-ardenne.ogg" x="487" y="120" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="H" pixmapfile="geography_country/france_region/champagne-ardenne.png" sound="voices/$LOCALE/france_region/champagne-ardenne.ogg" x="487" y="120" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Champagne Ardenne</tooltip>
 </Shape>
-<Shape name="I" pixmapfile="geography_country/france_region/corse.png" sound="sounds/$LOCALE/france_region/corse.ogg" x="662" y="472" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="I" pixmapfile="geography_country/france_region/corse.png" sound="voices/$LOCALE/france_region/corse.ogg" x="662" y="472" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Corse</tooltip>
 </Shape>
-<Shape name="J" pixmapfile="geography_country/france_region/franche-conte.png" sound="sounds/$LOCALE/france_region/franche-conte.ogg" x="542" y="212" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="J" pixmapfile="geography_country/france_region/franche-conte.png" sound="voices/$LOCALE/france_region/franche-conte.ogg" x="542" y="212" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Franche ComtÃ</tooltip>
 </Shape>
-<Shape name="K" pixmapfile="geography_country/france_region/haute-normandie.png" sound="sounds/$LOCALE/france_region/haute-normandie.ogg" x="363" y="95" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="K" pixmapfile="geography_country/france_region/haute-normandie.png" sound="voices/$LOCALE/france_region/haute-normandie.ogg" x="363" y="95" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Normandie</tooltip>
 </Shape>
-<Shape name="L" pixmapfile="geography_country/france_region/ile-de-france.png" sound="sounds/$LOCALE/france_region/ile-de-france.ogg" x="415" y="132" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="L" pixmapfile="geography_country/france_region/ile-de-france.png" sound="voices/$LOCALE/france_region/ile-de-france.ogg" x="415" y="132" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Ile de France</tooltip>
 </Shape>
-<Shape name="M" pixmapfile="geography_country/france_region/languedoc-roussillon.png" sound="sounds/$LOCALE/france_region/languedoc-roussillon.ogg" x="443" y="404" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="M" pixmapfile="geography_country/france_region/languedoc-roussillon.png" sound="voices/$LOCALE/france_region/languedoc-roussillon.ogg" x="443" y="404" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Languedoc Roussillon</tooltip>
 </Shape>
-<Shape name="N" pixmapfile="geography_country/france_region/limousin.png" sound="sounds/$LOCALE/france_region/limousin.ogg" x="384" y="294" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="N" pixmapfile="geography_country/france_region/limousin.png" sound="voices/$LOCALE/france_region/limousin.ogg" x="384" y="294" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Limousin</tooltip>
 </Shape>
-<Shape name="O" pixmapfile="geography_country/france_region/lorraine.png" sound="sounds/$LOCALE/france_region/lorraine.ogg" x="540" y="127" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="O" pixmapfile="geography_country/france_region/lorraine.png" sound="voices/$LOCALE/france_region/lorraine.ogg" x="540" y="127" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Lorraine</tooltip>
 </Shape>
-<Shape name="P" pixmapfile="geography_country/france_region/midi-pyrenees.png" sound="sounds/$LOCALE/france_region/midi-pyrenees.ogg" x="380" y="396" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="P" pixmapfile="geography_country/france_region/midi-pyrenees.png" sound="voices/$LOCALE/france_region/midi-pyrenees.ogg" x="380" y="396" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Midi PyrÃnÃes</tooltip>
 </Shape>
-<Shape name="Q" pixmapfile="geography_country/france_region/nord-pas-de-calais.png" sound="sounds/$LOCALE/france_region/nord-pas-de-calais.ogg" x="427" y="33" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="Q" pixmapfile="geography_country/france_region/nord-pas-de-calais.png" sound="voices/$LOCALE/france_region/nord-pas-de-calais.ogg" x="427" y="33" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Nord Pas de Calais</tooltip>
 </Shape>
-<Shape name="R" pixmapfile="geography_country/france_region/pays-de-la-loire.png" sound="sounds/$LOCALE/france_region/pays-de-la-loire.ogg" x="300" y="199" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="R" pixmapfile="geography_country/france_region/pays-de-la-loire.png" sound="voices/$LOCALE/france_region/pays-de-la-loire.ogg" x="300" y="199" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Pays de la Loire</tooltip>
 </Shape>
-<Shape name="S" pixmapfile="geography_country/france_region/picardie.png" sound="sounds/$LOCALE/france_region/picardie.ogg" x="424" y="83" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="S" pixmapfile="geography_country/france_region/picardie.png" sound="voices/$LOCALE/france_region/picardie.ogg" x="424" y="83" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Picardie</tooltip>
 </Shape>
-<Shape name="T" pixmapfile="geography_country/france_region/poitou-charentes.png" sound="sounds/$LOCALE/france_region/poitou-charentes.ogg" x="321" y="269" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="T" pixmapfile="geography_country/france_region/poitou-charentes.png" sound="voices/$LOCALE/france_region/poitou-charentes.ogg" x="321" y="269" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Poitou Charentes</tooltip>
 </Shape>
-<Shape name="U" pixmapfile="geography_country/france_region/provence-alpes-cote_d_azur.png" sound="sounds/$LOCALE/france_region/provence-alpes-cote_d_azur.ogg" x="543" y="379" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="U" pixmapfile="geography_country/france_region/provence-alpes-cote_d_azur.png" sound="voices/$LOCALE/france_region/provence-alpes-cote_d_azur.ogg" x="543" y="379" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Provence Alpes CÃte d'Azur</tooltip>
 </Shape>
-<Shape name="V" pixmapfile="geography_country/france_region/rhone-alpes.png" sound="sounds/$LOCALE/france_region/rhone-alpes.ogg" x="520" y="312" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="V" pixmapfile="geography_country/france_region/rhone-alpes.png" sound="voices/$LOCALE/france_region/rhone-alpes.ogg" x="520" y="312" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>RhÃne Alpes</tooltip>
 </Shape>
 <Shape name="1" pixmapfile="geography_country/france_region/france-regions.png" type="SHAPE_BACKGROUND" x="420" y="260" zoomx="0.660000" zoomy="0.660000" position="0"/>

Modified: branches/GCOMPRIS_8_3/boards/geography_country/board7_0.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography_country/board7_0.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography_country/board7_0.xml.in	Wed Nov 19 21:43:04 2008
@@ -2,59 +2,59 @@
 <ShapeGame><!-- Created with GcomprisShapegame gimp script -->
   <title justification="GTK_JUSTIFY_CENTER" x="600" y="495">
     <_name>Counties of Brazil</_name></title>
-  <shape name="Distrito Federal" pixmapfile="geography_country/brazil/Distrito_Federal.png" position="0" sound="sounds/$LOCALE/geography/brazil/Distrito_Federal.png" x="471.5" y="276.5">
+  <shape name="Distrito Federal" pixmapfile="geography_country/brazil/Distrito_Federal.png" position="0" sound="voices/$LOCALE/geography/brazil/Distrito_Federal.png" x="471.5" y="276.5">
     <tooltip>Distrito Federal</tooltip></shape>
-  <shape name="Sergipe" pixmapfile="geography_country/brazil/Sergipe.png" position="0" sound="sounds/$LOCALE/geography/brazil/Sergipe.png" x="586.0" y="219.0">
+  <shape name="Sergipe" pixmapfile="geography_country/brazil/Sergipe.png" position="0" sound="voices/$LOCALE/geography/brazil/Sergipe.png" x="586.0" y="219.0">
     <tooltip>Sergipe</tooltip></shape>
-  <shape name="Alagoas" pixmapfile="geography_country/brazil/Alagoas.png" position="0" sound="sounds/$LOCALE/geography/brazil/Alagoas.png" x="592.5" y="207.5">
+  <shape name="Alagoas" pixmapfile="geography_country/brazil/Alagoas.png" position="0" sound="voices/$LOCALE/geography/brazil/Alagoas.png" x="592.5" y="207.5">
     <tooltip>Alagoas</tooltip></shape>
-  <shape name="Rio de Janeiro" pixmapfile="geography_country/brazil/Rio_de_Janeiro.png" position="0" sound="sounds/$LOCALE/geography/brazil/Rio_de_Janeiro.png" x="528.0" y="346.5">
+  <shape name="Rio de Janeiro" pixmapfile="geography_country/brazil/Rio_de_Janeiro.png" position="0" sound="voices/$LOCALE/geography/brazil/Rio_de_Janeiro.png" x="528.0" y="346.5">
     <tooltip>Rio de Janeiro</tooltip></shape>
-  <shape name="EspÃrito Santo" pixmapfile="geography_country/brazil/Espirito_Santo.png" position="0" sound="sounds/$LOCALE/geography/brazil/Espirito_Santo.png" x="549.0" y="319.5">
+  <shape name="EspÃrito Santo" pixmapfile="geography_country/brazil/Espirito_Santo.png" position="0" sound="voices/$LOCALE/geography/brazil/Espirito_Santo.png" x="549.0" y="319.5">
     <tooltip>EspÃrito Santo</tooltip></shape>
-  <shape name="Rio Grande do Norte" pixmapfile="geography_country/brazil/Rio_Grande_do_Norte.png" position="0" sound="sounds/$LOCALE/geography/brazil/Rio_Grande_do_Norte.png" x="594.5" y="164.0">
+  <shape name="Rio Grande do Norte" pixmapfile="geography_country/brazil/Rio_Grande_do_Norte.png" position="0" sound="voices/$LOCALE/geography/brazil/Rio_Grande_do_Norte.png" x="594.5" y="164.0">
     <tooltip>Rio Grande do Norte</tooltip></shape>
-  <shape name="ParaÃba" pixmapfile="geography_country/brazil/Paraiba.png" position="0" sound="sounds/$LOCALE/geography/brazil/Paraiba.png" x="592.0" y="180.0">
+  <shape name="ParaÃba" pixmapfile="geography_country/brazil/Paraiba.png" position="0" sound="voices/$LOCALE/geography/brazil/Paraiba.png" x="592.0" y="180.0">
     <tooltip>ParaÃba</tooltip></shape>
-  <shape name="Santa Catarina" pixmapfile="geography_country/brazil/Santa_Catarina.png" position="0" sound="sounds/$LOCALE/geography/brazil/Santa_Catarina.png" x="435.0" y="410.0">
+  <shape name="Santa Catarina" pixmapfile="geography_country/brazil/Santa_Catarina.png" position="0" sound="voices/$LOCALE/geography/brazil/Santa_Catarina.png" x="435.0" y="410.0">
     <tooltip>Santa Catarina</tooltip></shape>
-  <shape name="Pernambuco" pixmapfile="geography_country/brazil/Pernambuco.png" position="0" sound="sounds/$LOCALE/geography/brazil/Pernambuco.png" x="579.0" y="194.0">
+  <shape name="Pernambuco" pixmapfile="geography_country/brazil/Pernambuco.png" position="0" sound="voices/$LOCALE/geography/brazil/Pernambuco.png" x="579.0" y="194.0">
     <tooltip>Pernambuco</tooltip></shape>
-  <shape name="AmapÃ" pixmapfile="geography_country/brazil/Amapa.png" position="0" sound="sounds/$LOCALE/geography/brazil/Amapa.png" x="423.0" y="80.0">
+  <shape name="AmapÃ" pixmapfile="geography_country/brazil/Amapa.png" position="0" sound="voices/$LOCALE/geography/brazil/Amapa.png" x="423.0" y="80.0">
     <tooltip>AmapÃ</tooltip></shape>
-  <shape name="CearÃ" pixmapfile="geography_country/brazil/Ceara.png" position="0" sound="sounds/$LOCALE/geography/brazil/Ceara.png" x="562.5" y="158.0">
+  <shape name="CearÃ" pixmapfile="geography_country/brazil/Ceara.png" position="0" sound="voices/$LOCALE/geography/brazil/Ceara.png" x="562.5" y="158.0">
     <tooltip>CearÃ</tooltip></shape>
-  <shape name="Acre" pixmapfile="geography_country/brazil/Acre.png" position="0" sound="sounds/$LOCALE/geography/brazil/Acre.png" x="226.0" y="203.0">
+  <shape name="Acre" pixmapfile="geography_country/brazil/Acre.png" position="0" sound="voices/$LOCALE/geography/brazil/Acre.png" x="226.0" y="203.0">
     <tooltip>Acre</tooltip></shape>
-  <shape name="ParanÃ" pixmapfile="geography_country/brazil/Parana.png" position="0" sound="sounds/$LOCALE/geography/brazil/Parana.png" x="432.5" y="376.5">
+  <shape name="ParanÃ" pixmapfile="geography_country/brazil/Parana.png" position="0" sound="voices/$LOCALE/geography/brazil/Parana.png" x="432.5" y="376.5">
     <tooltip>ParanÃ</tooltip></shape>
-  <shape name="Roraima" pixmapfile="geography_country/brazil/Roraima.png" position="0" sound="sounds/$LOCALE/geography/brazil/Roraima.png" x="320.5" y="76.5">
+  <shape name="Roraima" pixmapfile="geography_country/brazil/Roraima.png" position="0" sound="voices/$LOCALE/geography/brazil/Roraima.png" x="320.5" y="76.5">
     <tooltip>Roraima</tooltip></shape>
-  <shape name="RondÃnia" pixmapfile="geography_country/brazil/Rondonia.png" position="0" sound="sounds/$LOCALE/geography/brazil/Rondonia.png" x="309.0" y="221.0">
+  <shape name="RondÃnia" pixmapfile="geography_country/brazil/Rondonia.png" position="0" sound="voices/$LOCALE/geography/brazil/Rondonia.png" x="309.0" y="221.0">
     <tooltip>RondÃnia</tooltip></shape>
-  <shape name="SÃo Paulo" pixmapfile="geography_country/brazil/Sao_Paulo.png" position="0" sound="sounds/$LOCALE/geography/brazil/Sao_Paulo.png" x="464.0" y="352.5">
+  <shape name="SÃo Paulo" pixmapfile="geography_country/brazil/Sao_Paulo.png" position="0" sound="voices/$LOCALE/geography/brazil/Sao_Paulo.png" x="464.0" y="352.5">
     <tooltip>SÃo Paulo</tooltip></shape>
-  <shape name="PiauÃ" pixmapfile="geography_country/brazil/Piaui.png" position="0" sound="sounds/$LOCALE/geography/brazil/Piaui.png" x="521.5" y="175.5">
+  <shape name="PiauÃ" pixmapfile="geography_country/brazil/Piaui.png" position="0" sound="voices/$LOCALE/geography/brazil/Piaui.png" x="521.5" y="175.5">
     <tooltip>PiauÃ</tooltip></shape>
-  <shape name="Tocantins" pixmapfile="geography_country/brazil/Tocantins.png" position="0" sound="sounds/$LOCALE/geography/brazil/Tocantins.png" x="465.5" y="203.5">
+  <shape name="Tocantins" pixmapfile="geography_country/brazil/Tocantins.png" position="0" sound="voices/$LOCALE/geography/brazil/Tocantins.png" x="465.5" y="203.5">
     <tooltip>Tocantins</tooltip></shape>
-  <shape name="Rio Grande do Sul" pixmapfile="geography_country/brazil/Rio_Grande_do_Sul.png" position="0" sound="sounds/$LOCALE/geography/brazil/Rio_Grande_do_Sul.png" x="409.0" y="442.5">
+  <shape name="Rio Grande do Sul" pixmapfile="geography_country/brazil/Rio_Grande_do_Sul.png" position="0" sound="voices/$LOCALE/geography/brazil/Rio_Grande_do_Sul.png" x="409.0" y="442.5">
     <tooltip>Rio Grande do Sul</tooltip></shape>
-  <shape name="MaranhÃo" pixmapfile="geography_country/brazil/Maranhao.png" position="0" sound="sounds/$LOCALE/geography/brazil/Maranhao.png" x="500.5" y="162.5">
+  <shape name="MaranhÃo" pixmapfile="geography_country/brazil/Maranhao.png" position="0" sound="voices/$LOCALE/geography/brazil/Maranhao.png" x="500.5" y="162.5">
     <tooltip>MaranhÃo</tooltip></shape>
-  <shape name="GoiÃs" pixmapfile="geography_country/brazil/Goias.png" position="0" sound="sounds/$LOCALE/geography/brazil/Goias.png" x="451.0" y="279.5">
+  <shape name="GoiÃs" pixmapfile="geography_country/brazil/Goias.png" position="0" sound="voices/$LOCALE/geography/brazil/Goias.png" x="451.0" y="279.5">
     <tooltip>GoiÃs</tooltip></shape>
-  <shape name="Mato Grosso do Sul" pixmapfile="geography_country/brazil/Mato_Grosso_do_Sul.png" position="0" sound="sounds/$LOCALE/geography/brazil/Mato_Grosso_do_Sul.png" x="398.0" y="331.0">
+  <shape name="Mato Grosso do Sul" pixmapfile="geography_country/brazil/Mato_Grosso_do_Sul.png" position="0" sound="voices/$LOCALE/geography/brazil/Mato_Grosso_do_Sul.png" x="398.0" y="331.0">
     <tooltip>Mato Grosso do Sul</tooltip></shape>
-  <shape name="Bahia" pixmapfile="geography_country/brazil/Bahia.png" position="0" sound="sounds/$LOCALE/geography/brazil/Bahia.png" x="534.0" y="250.5">
+  <shape name="Bahia" pixmapfile="geography_country/brazil/Bahia.png" position="0" sound="voices/$LOCALE/geography/brazil/Bahia.png" x="534.0" y="250.5">
     <tooltip>Bahia</tooltip></shape>
-  <shape name="Minas Gerais" pixmapfile="geography_country/brazil/Minas_Gerais.png" position="0" sound="sounds/$LOCALE/geography/brazil/Minas_Gerais.png" x="497.0" y="308.5">
+  <shape name="Minas Gerais" pixmapfile="geography_country/brazil/Minas_Gerais.png" position="0" sound="voices/$LOCALE/geography/brazil/Minas_Gerais.png" x="497.0" y="308.5">
     <tooltip>Minas Gerais</tooltip></shape>
-  <shape name="Mato Grosso" pixmapfile="geography_country/brazil/Mato_Grosso.png" position="0" sound="sounds/$LOCALE/geography/brazil/Mato_Grosso.png" x="382.5" y="243.0">
+  <shape name="Mato Grosso" pixmapfile="geography_country/brazil/Mato_Grosso.png" position="0" sound="voices/$LOCALE/geography/brazil/Mato_Grosso.png" x="382.5" y="243.0">
     <tooltip>Mato Grosso</tooltip></shape>
-  <shape name="ParÃ" pixmapfile="geography_country/brazil/Para.png" position="0" sound="sounds/$LOCALE/geography/brazil/Para.png" x="419.0" y="139.5">
+  <shape name="ParÃ" pixmapfile="geography_country/brazil/Para.png" position="0" sound="voices/$LOCALE/geography/brazil/Para.png" x="419.0" y="139.5">
     <tooltip>ParÃ</tooltip></shape>
-  <shape name="Amazonas" pixmapfile="geography_country/brazil/Amazonas.png" position="0" sound="sounds/$LOCALE/geography/brazil/Amazonas.png" x="282.0" y="143.0">
+  <shape name="Amazonas" pixmapfile="geography_country/brazil/Amazonas.png" position="0" sound="voices/$LOCALE/geography/brazil/Amazonas.png" x="282.0" y="143.0">
     <tooltip>Amazonas</tooltip></shape>
   <shape name="background" pixmapfile="geography_country/brazil/background.png" position="0" type="SHAPE_BACKGROUND" x="399.5" y="260.0">
     <tooltip>background</tooltip></shape>

Modified: branches/GCOMPRIS_8_3/boards/geography_country/board8_0.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography_country/board8_0.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography_country/board8_0.xml.in	Wed Nov 19 21:43:04 2008
@@ -2,32 +2,32 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title justification="GTK_JUSTIFY_CENTER" x="600" y="495">
 <name>Regions of Canada</name></title>
-<shape name="Prince Edward Island" pixmapfile="geography_country/canada_region/prince_edward_island.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Prince_Edward_Island.ogg" x="682.0" y="388.5">
+<shape name="Prince Edward Island" pixmapfile="geography_country/canada_region/prince_edward_island.png" position="0" sound="voices/$LOCALE/geography/canada_region/Prince_Edward_Island.ogg" x="682.0" y="388.5">
 <tooltip>Prince Edward Island</tooltip></shape>
-<shape name="Nova Scotia" pixmapfile="geography_country/canada_region/nova_scotia.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Nova_Scotia.ogg" x="693.0" y="401.0">
+<shape name="Nova Scotia" pixmapfile="geography_country/canada_region/nova_scotia.png" position="0" sound="voices/$LOCALE/geography/canada_region/Nova_Scotia.ogg" x="693.0" y="401.0">
 <tooltip>Nova Scotia</tooltip></shape>
-<shape name="New Brunswick" pixmapfile="geography_country/canada_region/new_brunswick.png" position="0" sound="sounds/$LOCALE/geography/canada_region/New_Brunswick.ogg" x="650.5" y="399.5">
+<shape name="New Brunswick" pixmapfile="geography_country/canada_region/new_brunswick.png" position="0" sound="voices/$LOCALE/geography/canada_region/New_Brunswick.ogg" x="650.5" y="399.5">
 <tooltip>New Brunswick</tooltip></shape>
-<shape name="Newfoundland and Labrador" pixmapfile="geography_country/canada_region/newfoundland_and_labrador.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Newfoundland_and_Labrador.ogg" x="676.5" y="311.5">
+<shape name="Newfoundland and Labrador" pixmapfile="geography_country/canada_region/newfoundland_and_labrador.png" position="0" sound="voices/$LOCALE/geography/canada_region/Newfoundland_and_Labrador.ogg" x="676.5" y="311.5">
 <tooltip>Newfoundland and Labrador</tooltip></shape>
-<shape name="Quebec" pixmapfile="geography_country/canada_region/quebec.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Quebec.ogg" x="585.0" y="346.5">
+<shape name="Quebec" pixmapfile="geography_country/canada_region/quebec.png" position="0" sound="voices/$LOCALE/geography/canada_region/Quebec.ogg" x="585.0" y="346.5">
 <tooltip>Quebec</tooltip></shape>
-<shape name="Ontario" pixmapfile="geography_country/canada_region/ontario.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Ontario.ogg" x="470.5" y="412.5">
+<shape name="Ontario" pixmapfile="geography_country/canada_region/ontario.png" position="0" sound="voices/$LOCALE/geography/canada_region/Ontario.ogg" x="470.5" y="412.5">
 <tooltip>Ontario</tooltip></shape>
-<shape name="Manitoba" pixmapfile="geography_country/canada_region/manitoba.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Manitoba.ogg" x="353.0" y="359.0">
+<shape name="Manitoba" pixmapfile="geography_country/canada_region/manitoba.png" position="0" sound="voices/$LOCALE/geography/canada_region/Manitoba.ogg" x="353.0" y="359.0">
 <tooltip>Manitoba</tooltip></shape>
-<shape name="Saskatchewan" pixmapfile="geography_country/canada_region/saskatchewan.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Saskatchewan.ogg" x="263.0" y="354.0">
+<shape name="Saskatchewan" pixmapfile="geography_country/canada_region/saskatchewan.png" position="0" sound="voices/$LOCALE/geography/canada_region/Saskatchewan.ogg" x="263.0" y="354.0">
 <tooltip>Saskatchewan</tooltip></shape>
-<shape name="Alberta" pixmapfile="geography_country/canada_region/alberta.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Alberta.ogg" x="200.5" y="340.5">
+<shape name="Alberta" pixmapfile="geography_country/canada_region/alberta.png" position="0" sound="voices/$LOCALE/geography/canada_region/Alberta.ogg" x="200.5" y="340.5">
 <tooltip>Alberta</tooltip></shape>
-<shape name="Nunavut" pixmapfile="geography_country/canada_region/nunavut.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Nunavut.ogg" x="390.0" y="163.0">
+<shape name="Nunavut" pixmapfile="geography_country/canada_region/nunavut.png" position="0" sound="voices/$LOCALE/geography/canada_region/Nunavut.ogg" x="390.0" y="163.0">
 <tooltip>Nunavut</tooltip></shape>
-<shape name="Northwest Territories" pixmapfile="geography_country/canada_region/northwest_territories.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Northwest_Territories.ogg" x="228.5" y="192.5">
+<shape name="Northwest Territories" pixmapfile="geography_country/canada_region/northwest_territories.png" position="0" sound="voices/$LOCALE/geography/canada_region/Northwest_Territories.ogg" x="228.5" y="192.5">
 <tooltip>Northwest Territories</tooltip></shape>
-<shape name="British Columbia" pixmapfile="geography_country/canada_region/british_columbia.png" position="0" sound="sounds/$LOCALE/geography/canada_region/British_Columbia.ogg" x="114.5" y="308.5">
+<shape name="British Columbia" pixmapfile="geography_country/canada_region/british_columbia.png" position="0" sound="voices/$LOCALE/geography/canada_region/British_Columbia.ogg" x="114.5" y="308.5">
 <tooltip>British Columbia</tooltip></shape>
-<shape name="Yukon" pixmapfile="geography_country/canada_region/yukon.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Yukon.ogg" x="107.5" y="196.0">
+<shape name="Yukon" pixmapfile="geography_country/canada_region/yukon.png" position="0" sound="voices/$LOCALE/geography/canada_region/Yukon.ogg" x="107.5" y="196.0">
 <tooltip>Yukon</tooltip></shape>
-<shape name="background" pixmapfile="geography_country/canada_region/background.png" position="0" sound="sounds/$LOCALE/geography/canada_region/background.ogg" type="SHAPE_BACKGROUND" x="412" y="260.0">
+<shape name="background" pixmapfile="geography_country/canada_region/background.png" position="0" sound="voices/$LOCALE/geography/canada_region/background.ogg" type="SHAPE_BACKGROUND" x="412" y="260.0">
 <tooltip>background</tooltip></shape>
 </ShapeGame>

Modified: branches/GCOMPRIS_8_3/boards/geography_country/board9_0.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography_country/board9_0.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography_country/board9_0.xml.in	Wed Nov 19 21:43:04 2008
@@ -2,70 +2,70 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title justification="GTK_JUSTIFY_CENTER" x="600" y="495">
 <name>Mexico</name></title>
-<shape name="Aguascalientes" pixmapfile="geography_country/mexico/aguascalientes.png" position="0" sound="sounds/$LOCALE/geography/mexico/Aguascalientes.ogg" x="382.0" y="316.5">
+<shape name="Aguascalientes" pixmapfile="geography_country/mexico/aguascalientes.png" position="0" sound="voices/$LOCALE/geography/mexico/Aguascalientes.ogg" x="382.0" y="316.5">
 <tooltip>Aguascalientes</tooltip></shape>
-<shape name="Colima" pixmapfile="geography_country/mexico/colima.png" position="0" sound="sounds/$LOCALE/geography/mexico/Colima.ogg" x="339.0" y="394.5">
+<shape name="Colima" pixmapfile="geography_country/mexico/colima.png" position="0" sound="voices/$LOCALE/geography/mexico/Colima.ogg" x="339.0" y="394.5">
 <tooltip>Colima</tooltip></shape>
-<shape name="Baja California Sur" pixmapfile="geography_country/mexico/baja_california_sur.png" position="0" sound="sounds/$LOCALE/geography/mexico/Baja_California_Sur.ogg" x="152.0" y="211.0">
+<shape name="Baja California Sur" pixmapfile="geography_country/mexico/baja_california_sur.png" position="0" sound="voices/$LOCALE/geography/mexico/Baja_California_Sur.ogg" x="152.0" y="211.0">
 <tooltip>Baja California Sur</tooltip></shape>
-<shape name="Baja California Norte" pixmapfile="geography_country/mexico/baja_california_norte.png" position="0" sound="sounds/$LOCALE/geography/mexico/Baja_California_Norte.ogg" x="103.5" y="76.5">
+<shape name="Baja California Norte" pixmapfile="geography_country/mexico/baja_california_norte.png" position="0" sound="voices/$LOCALE/geography/mexico/Baja_California_Norte.ogg" x="103.5" y="76.5">
 <tooltip>Baja California Norte</tooltip></shape>
-<shape name="Campeche" pixmapfile="geography_country/mexico/campeche.png" position="0" sound="sounds/$LOCALE/geography/mexico/Campeche.ogg" x="668.5" y="384.0">
+<shape name="Campeche" pixmapfile="geography_country/mexico/campeche.png" position="0" sound="voices/$LOCALE/geography/mexico/Campeche.ogg" x="668.5" y="384.0">
 <tooltip>Campeche</tooltip></shape>
-<shape name="Chihuahua" pixmapfile="geography_country/mexico/chihuahua.png" position="0" sound="sounds/$LOCALE/geography/mexico/Chihuahua.ogg" x="299.5" y="133.5">
+<shape name="Chihuahua" pixmapfile="geography_country/mexico/chihuahua.png" position="0" sound="voices/$LOCALE/geography/mexico/Chihuahua.ogg" x="299.5" y="133.5">
 <tooltip>Chihuahua</tooltip></shape>
-<shape name="Chiapas" pixmapfile="geography_country/mexico/chiapas.png" position="0" sound="sounds/$LOCALE/geography/mexico/Chiapas.ogg" x="640.0" y="464.0">
+<shape name="Chiapas" pixmapfile="geography_country/mexico/chiapas.png" position="0" sound="voices/$LOCALE/geography/mexico/Chiapas.ogg" x="640.0" y="464.0">
 <tooltip>Chiapas</tooltip></shape>
-<shape name="Coahuila" pixmapfile="geography_country/mexico/coahuila.png" position="0" sound="sounds/$LOCALE/geography/mexico/Coahuila.ogg" x="397.0" y="179.5">
+<shape name="Coahuila" pixmapfile="geography_country/mexico/coahuila.png" position="0" sound="voices/$LOCALE/geography/mexico/Coahuila.ogg" x="397.0" y="179.5">
 <tooltip>Coahuila</tooltip></shape>
-<shape name="Distrito Federal" pixmapfile="geography_country/mexico/distrito_federal.png" position="0" sound="sounds/$LOCALE/geography/mexico/Distrito_Federal.ogg" x="464.0" y="390.5">
+<shape name="Distrito Federal" pixmapfile="geography_country/mexico/distrito_federal.png" position="0" sound="voices/$LOCALE/geography/mexico/Distrito_Federal.ogg" x="464.0" y="390.5">
 <tooltip>Distrito Federal</tooltip></shape>
-<shape name="Durango" pixmapfile="geography_country/mexico/durango.png" position="0" sound="sounds/$LOCALE/geography/mexico/Durango.ogg" x="327.0" y="245.0">
+<shape name="Durango" pixmapfile="geography_country/mexico/durango.png" position="0" sound="voices/$LOCALE/geography/mexico/Durango.ogg" x="327.0" y="245.0">
 <tooltip>Durango</tooltip></shape>
-<shape name="Estado de Mexico" pixmapfile="geography_country/mexico/estado_de_mexico.png" position="0" sound="sounds/$LOCALE/geography/mexico/Estado_de_Mexico.ogg" x="454.5" y="388.0">
+<shape name="Estado de Mexico" pixmapfile="geography_country/mexico/estado_de_mexico.png" position="0" sound="voices/$LOCALE/geography/mexico/Estado_de_Mexico.ogg" x="454.5" y="388.0">
 <tooltip>Estado de Mexico</tooltip></shape>
-<shape name="Guanajuato" pixmapfile="geography_country/mexico/guanajuato.png" position="0" sound="sounds/$LOCALE/geography/mexico/Guanajuato.ogg" x="418.5" y="347.0">
+<shape name="Guanajuato" pixmapfile="geography_country/mexico/guanajuato.png" position="0" sound="voices/$LOCALE/geography/mexico/Guanajuato.ogg" x="418.5" y="347.0">
 <tooltip>Guanajuato</tooltip></shape>
-<shape name="Guerrero" pixmapfile="geography_country/mexico/guerrero.png" position="0" sound="sounds/$LOCALE/geography/mexico/Guerrero.ogg" x="440.0" y="436.0">
+<shape name="Guerrero" pixmapfile="geography_country/mexico/guerrero.png" position="0" sound="voices/$LOCALE/geography/mexico/Guerrero.ogg" x="440.0" y="436.0">
 <tooltip>Guerrero</tooltip></shape>
-<shape name="Hidalgo" pixmapfile="geography_country/mexico/hidalgo.png" position="0" sound="sounds/$LOCALE/geography/mexico/Hidalgo.ogg" x="469.5" y="356.0">
+<shape name="Hidalgo" pixmapfile="geography_country/mexico/hidalgo.png" position="0" sound="voices/$LOCALE/geography/mexico/Hidalgo.ogg" x="469.5" y="356.0">
 <tooltip>Hidalgo</tooltip></shape>
-<shape name="Jalisco" pixmapfile="geography_country/mexico/jalisco.png" position="0" sound="sounds/$LOCALE/geography/mexico/Jalisco.ogg" x="352.5" y="346.5">
+<shape name="Jalisco" pixmapfile="geography_country/mexico/jalisco.png" position="0" sound="voices/$LOCALE/geography/mexico/Jalisco.ogg" x="352.5" y="346.5">
 <tooltip>Jalisco</tooltip></shape>
-<shape name="Michoacan" pixmapfile="geography_country/mexico/michoacan.png" position="0" sound="sounds/$LOCALE/geography/mexico/Michoacan.ogg" x="394.0" y="393.0">
+<shape name="Michoacan" pixmapfile="geography_country/mexico/michoacan.png" position="0" sound="voices/$LOCALE/geography/mexico/Michoacan.ogg" x="394.0" y="393.0">
 <tooltip>Michoacan</tooltip></shape>
-<shape name="Morelos" pixmapfile="geography_country/mexico/morelos.png" position="0" sound="sounds/$LOCALE/geography/mexico/Morelos.ogg" x="465.0" y="405.0">
+<shape name="Morelos" pixmapfile="geography_country/mexico/morelos.png" position="0" sound="voices/$LOCALE/geography/mexico/Morelos.ogg" x="465.0" y="405.0">
 <tooltip>Morelos</tooltip></shape>
-<shape name="Nayarit" pixmapfile="geography_country/mexico/nayarit.png" position="0" sound="sounds/$LOCALE/geography/mexico/Nayarit.ogg" x="321.5" y="318.0">
+<shape name="Nayarit" pixmapfile="geography_country/mexico/nayarit.png" position="0" sound="voices/$LOCALE/geography/mexico/Nayarit.ogg" x="321.5" y="318.0">
 <tooltip>Nayarit</tooltip></shape>
-<shape name="Nuevo Leon" pixmapfile="geography_country/mexico/nuevo_leon.png" position="0" sound="sounds/$LOCALE/geography/mexico/Nuevo_Leon.ogg" x="445.0" y="225.0">
+<shape name="Nuevo Leon" pixmapfile="geography_country/mexico/nuevo_leon.png" position="0" sound="voices/$LOCALE/geography/mexico/Nuevo_Leon.ogg" x="445.0" y="225.0">
 <tooltip>Nuevo Leon</tooltip></shape>
-<shape name="Oaxaca" pixmapfile="geography_country/mexico/oaxaca.png" position="0" sound="sounds/$LOCALE/geography/mexico/Oaxaca.ogg" x="538.0" y="444.5">
+<shape name="Oaxaca" pixmapfile="geography_country/mexico/oaxaca.png" position="0" sound="voices/$LOCALE/geography/mexico/Oaxaca.ogg" x="538.0" y="444.5">
 <tooltip>Oaxaca</tooltip></shape>
-<shape name="Puebla" pixmapfile="geography_country/mexico/puebla.png" position="0" sound="sounds/$LOCALE/geography/mexico/Puebla.ogg" x="494.5" y="387.0">
+<shape name="Puebla" pixmapfile="geography_country/mexico/puebla.png" position="0" sound="voices/$LOCALE/geography/mexico/Puebla.ogg" x="494.5" y="387.0">
 <tooltip>Puebla</tooltip></shape>
-<shape name="Queretaro" pixmapfile="geography_country/mexico/queretaro.png" position="0" sound="sounds/$LOCALE/geography/mexico/Queretaro.ogg" x="446.5" y="348.0">
+<shape name="Queretaro" pixmapfile="geography_country/mexico/queretaro.png" position="0" sound="voices/$LOCALE/geography/mexico/Queretaro.ogg" x="446.5" y="348.0">
 <tooltip>Queretaro</tooltip></shape>
-<shape name="Quintana Roo" pixmapfile="geography_country/mexico/quintana_roo.png" position="0" sound="sounds/$LOCALE/geography/mexico/Quintana_Roo.ogg" x="734.0" y="365.5">
+<shape name="Quintana Roo" pixmapfile="geography_country/mexico/quintana_roo.png" position="0" sound="voices/$LOCALE/geography/mexico/Quintana_Roo.ogg" x="734.0" y="365.5">
 <tooltip>Quintana Roo</tooltip></shape>
-<shape name="San Luis Potosi" pixmapfile="geography_country/mexico/san_luis_potosi.png" position="0" sound="sounds/$LOCALE/geography/mexico/San_Luis_Potosi.ogg" x="433.5" y="294.5">
+<shape name="San Luis Potosi" pixmapfile="geography_country/mexico/san_luis_potosi.png" position="0" sound="voices/$LOCALE/geography/mexico/San_Luis_Potosi.ogg" x="433.5" y="294.5">
 <tooltip>San Luis Potosi</tooltip></shape>
-<shape name="Sinaloa" pixmapfile="geography_country/mexico/sinaloa.png" position="0" sound="sounds/$LOCALE/geography/mexico/Sinaloa.ogg" x="264.0" y="240.0">
+<shape name="Sinaloa" pixmapfile="geography_country/mexico/sinaloa.png" position="0" sound="voices/$LOCALE/geography/mexico/Sinaloa.ogg" x="264.0" y="240.0">
 <tooltip>Sinaloa</tooltip></shape>
-<shape name="Sonora" pixmapfile="geography_country/mexico/sonora.png" position="0" sound="sounds/$LOCALE/geography/mexico/Sonora.ogg" x="179.0" y="107.0">
+<shape name="Sonora" pixmapfile="geography_country/mexico/sonora.png" position="0" sound="voices/$LOCALE/geography/mexico/Sonora.ogg" x="179.0" y="107.0">
 <tooltip>Sonora</tooltip></shape>
-<shape name="Tabasco" pixmapfile="geography_country/mexico/tabasco.png" position="0" sound="sounds/$LOCALE/geography/mexico/Tabasco.ogg" x="629.5" y="417.5">
+<shape name="Tabasco" pixmapfile="geography_country/mexico/tabasco.png" position="0" sound="voices/$LOCALE/geography/mexico/Tabasco.ogg" x="629.5" y="417.5">
 <tooltip>Tabasco</tooltip></shape>
-<shape name="Tamaulipas" pixmapfile="geography_country/mexico/tamaulipas.png" position="0" sound="sounds/$LOCALE/geography/mexico/Tamaulipas.ogg" x="473.5" y="239.0">
+<shape name="Tamaulipas" pixmapfile="geography_country/mexico/tamaulipas.png" position="0" sound="voices/$LOCALE/geography/mexico/Tamaulipas.ogg" x="473.5" y="239.0">
 <tooltip>Tamaulipas</tooltip></shape>
-<shape name="Tlaxcala" pixmapfile="geography_country/mexico/tlaxcala.png" position="0" sound="sounds/$LOCALE/geography/mexico/Tlaxcala.ogg" x="487.0" y="385.0">
+<shape name="Tlaxcala" pixmapfile="geography_country/mexico/tlaxcala.png" position="0" sound="voices/$LOCALE/geography/mexico/Tlaxcala.ogg" x="487.0" y="385.0">
 <tooltip>Tlaxcala</tooltip></shape>
-<shape name="Veracruz" pixmapfile="geography_country/mexico/veracruz.png" position="0" sound="sounds/$LOCALE/geography/mexico/Veracruz.ogg" x="540.0" y="374.5">
+<shape name="Veracruz" pixmapfile="geography_country/mexico/veracruz.png" position="0" sound="voices/$LOCALE/geography/mexico/Veracruz.ogg" x="540.0" y="374.5">
 <tooltip>Veracruz</tooltip></shape>
-<shape name="Yucatan" pixmapfile="geography_country/mexico/yucatan.png" position="0" sound="sounds/$LOCALE/geography/mexico/Yucatan.ogg" x="711.0" y="340.5">
+<shape name="Yucatan" pixmapfile="geography_country/mexico/yucatan.png" position="0" sound="voices/$LOCALE/geography/mexico/Yucatan.ogg" x="711.0" y="340.5">
 <tooltip>Yucatan</tooltip></shape>
-<shape name="Zacatecas" pixmapfile="geography_country/mexico/zacatecas.png" position="0" sound="sounds/$LOCALE/geography/mexico/Zacatecas.ogg" x="379.0" y="286.5">
+<shape name="Zacatecas" pixmapfile="geography_country/mexico/zacatecas.png" position="0" sound="voices/$LOCALE/geography/mexico/Zacatecas.ogg" x="379.0" y="286.5">
 <tooltip>Zacatecas</tooltip></shape>
-<shape name="background" pixmapfile="geography_country/mexico/background.png" position="0" sound="sounds/$LOCALE/geography/mexico/background.ogg" type="SHAPE_BACKGROUND" x="413.5" y="259.5">
+<shape name="background" pixmapfile="geography_country/mexico/background.png" position="0" sound="voices/$LOCALE/geography/mexico/background.ogg" type="SHAPE_BACKGROUND" x="413.5" y="259.5">
 <tooltip>background</tooltip></shape>
 </ShapeGame>

Modified: branches/GCOMPRIS_8_3/src/boards/submarine.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/submarine.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/submarine.c	Wed Nov 19 21:43:04 2008
@@ -1642,6 +1642,9 @@
 static void submarine_explosion() {
   GdkPixbuf *pixmap = NULL;
 
+  if (submarine_destroyed)
+    return;
+
   submarine_destroyed = TRUE;
   gamewon = FALSE;
   gc_sound_play_ogg("sounds/crash.wav", NULL);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]