assetml removal. need more test.

9 files changed, 195 insertions, 195 deletions

diff --git a/boards/geography/board1_0.xml.in b/boards/geography/board1_0.xml.in
index bca25b4..2691f2b 100644
--- a/boards/geography/board1_0.xml.in
+++ b/boards/geography/board1_0.xml.in
@@ -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="geography/africa">
+  <Shape name="A" pixmapfile="geography/continents/africa.png" x="433" y="318" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/america">
+  <Shape name="B" pixmapfile="geography/continents/america.png" x="232" y="251" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/antartica">
+  <Shape name="D" pixmapfile="geography/continents/antartica.png" x="370" y="465" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/asia">
+  <Shape name="C" pixmapfile="geography/continents/asia.png" x="595" y="211" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/europe">
+    <Shape name="E" pixmapfile="geography/continents/europa.png" x="430" y="156" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/oceania">
+  <Shape name="F" pixmapfile="geography/continents/oceania.png" x="695" y="398" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/oceania.ogg">
         <_tooltip>Oceania</_tooltip>
   </Shape>
   <Shape name="1" pixmapfile="geography/continents/back.png" type="SHAPE_BACKGROUND"
diff --git a/boards/geography/board2_0.xml.in b/boards/geography/board2_0.xml.in
index 1e7a1d2..cbff255 100644
--- a/boards/geography/board2_0.xml.in
+++ b/boards/geography/board2_0.xml.in
@@ -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="geography/bahamas">
+  <Shape name="A" pixmapfile="geography/northamerica/bahamas.png" x="399" y="443" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/canada">
+  <Shape name="B" pixmapfile="geography/northamerica/canada.png" x="349" y="182" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/cuba">
+  <Shape name="C" pixmapfile="geography/northamerica/cuba.png" x="595" y="400" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/dominican_republic">
+  <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">
         <_tooltip>Dominican Republic</_tooltip>
   </Shape>
-  <Shape name="E" pixmapfile="geography/northamerica/greenland.png" x="442" y="79" zoomx="1" zoomy="1" position="0" sound="geography/greenland">
+  <Shape name="E" pixmapfile="geography/northamerica/greenland.png" x="442" y="79" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/haiti">
+  <Shape name="F" pixmapfile="geography/northamerica/haiti.png" x="663" y="429" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/iceland">
+  <Shape name="G" pixmapfile="geography/northamerica/iceland.png" x="528" y="48" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/jamaica">
+  <Shape name="H" pixmapfile="geography/northamerica/jamaica.png" x="620" y="438" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/mexico">
+  <Shape name="I" pixmapfile="geography/northamerica/mexico.png" x="255" y="434" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/usa">
+  <Shape name="J" pixmapfile="geography/northamerica/usa.png" x="323" y="366" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/alaska">
+  <Shape name="K" pixmapfile="geography/northamerica/alaska.png" x="156" y="92" zoomx="1" zoomy="1" position="0" sound="sounds/$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"/>
diff --git a/boards/geography/board2_1.xml.in b/boards/geography/board2_1.xml.in
index 8416c4f..ab6902e 100644
--- a/boards/geography/board2_1.xml.in
+++ b/boards/geography/board2_1.xml.in
@@ -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="geography/argentina">
+  <Shape name="A" pixmapfile="geography/southamerica/argentina.png" x="410" y="380" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/bolivia">
+  <Shape name="B" pixmapfile="geography/southamerica/bolivia.png" x="390" y="224" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/brazil">
+  <Shape name="C" pixmapfile="geography/southamerica/brazil.png" x="453" y="203" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/chile">
+  <Shape name="D" pixmapfile="geography/southamerica/chile.png" x="375" y="369" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/colombia">
+  <Shape name="E" pixmapfile="geography/southamerica/colombia.png" x="314" y="81" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/ecuador">
+  <Shape name="F" pixmapfile="geography/southamerica/ecuador.png" x="279" y="128" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/french_guiana">
+  <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">
         <_tooltip>French Guiana</_tooltip>
   </Shape>
-  <Shape name="H" pixmapfile="geography/southamerica/guyana.png" x="413" y="72" zoomx="1" zoomy="1" position="0" sound="geography/guyana">
+  <Shape name="H" pixmapfile="geography/southamerica/guyana.png" x="413" y="72" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/panama">
+  <Shape name="I" pixmapfile="geography/southamerica/panama.png" x="263" y="54" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/paraguay">
+  <Shape name="J" pixmapfile="geography/southamerica/paraguay.png" x="428" y="270" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/peru">
+  <Shape name="K" pixmapfile="geography/southamerica/peru.png" x="305" y="178" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/suriname">
+  <Shape name="L" pixmapfile="geography/southamerica/suriname.png" x="434" y="77" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/uruguay">
+  <Shape name="M" pixmapfile="geography/southamerica/uruguay.png" x="452" y="333" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/venezuela">
+  <Shape name="N" pixmapfile="geography/southamerica/venezuela.png" x="357" y="66" zoomx="1" zoomy="1" position="0" sound="sounds/$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"/>
diff --git a/boards/geography/board3_0.xml.in b/boards/geography/board3_0.xml.in
index 33708c9..39c0acd 100644
--- a/boards/geography/board3_0.xml.in
+++ b/boards/geography/board3_0.xml.in
@@ -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="geography/austria">
+  <Shape name="E" pixmapfile="geography/europe/austria.png" x="443" y="328" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/belgium">
+  <Shape name="O" pixmapfile="geography/europe/belgium.png" x="335" y="286" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/denmark">
+  <Shape name="B" pixmapfile="geography/europe/denmark.png" x="399" y="203" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/finland">
+  <Shape name="A" pixmapfile="geography/europe/finland.png" x="554" y="75" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/france">
+  <Shape name="D" pixmapfile="geography/europe/france.png" x="312" y="351" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/germany">
+  <Shape name="H" pixmapfile="geography/europe/germany.png" x="405" y="277" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/iceland">
+  <Shape name="F" pixmapfile="geography/europe/iceland.png" x="141" y="54" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/ireland">
+  <Shape name="R" pixmapfile="geography/europe/ireland.png" x="186" y="249" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/italy">
+  <Shape name="I" pixmapfile="geography/europe/italy.png" x="439" y="417" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/luxembourg">
+  <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">
         <_tooltip>Luxembourg</_tooltip>
   </Shape>
-  <Shape name="N" pixmapfile="geography/europe/netherland.png" x="342" y="261" zoomx="1" zoomy="1" position="0" sound="geography/netherland">
+  <Shape name="N" pixmapfile="geography/europe/netherland.png" x="342" y="261" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/norway">
+  <Shape name="M" pixmapfile="geography/europe/norway.png" x="462" y="85" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/portugal">
+  <Shape name="C" pixmapfile="geography/europe/portugal.png" x="182" y="453" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/spain">
+  <Shape name="P" pixmapfile="geography/europe/spain.png" x="252" y="448" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/sweden">
+  <Shape name="Q" pixmapfile="geography/europe/sweden.png" x="467" y="118" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/switz">
+  <Shape name="J" pixmapfile="geography/europe/switz.png" x="383" y="341" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/united_kingdom">
+  <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">
         <_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"/>
diff --git a/boards/geography/board3_1.xml.in b/boards/geography/board3_1.xml.in
index 20b08b3..81dec06 100644
--- a/boards/geography/board3_1.xml.in
+++ b/boards/geography/board3_1.xml.in
@@ -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="geography/albania">
+  <Shape name="A" pixmapfile="geography/europe/albania.png" x="505" y="431" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/belarus">
+  <Shape name="B" pixmapfile="geography/europe/belarus.png" x="577" y="239" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/bosnia_herzegovina">
+  <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">
       <_tooltip>Bosnia Herzegovina</_tooltip>
   </Shape>
-  <Shape name="D" pixmapfile="geography/europe/bulgaria.png" x="567" y="404" zoomx="1" zoomy="1" position="0" sound="geography/bulgaria">
+  <Shape name="D" pixmapfile="geography/europe/bulgaria.png" x="567" y="404" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/croatia">
+  <Shape name="E" pixmapfile="geography/europe/croatia.png" x="454" y="375" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/czech">
+  <Shape name="G" pixmapfile="geography/europe/czech.png" x="438" y="294" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/estonia">
+  <Shape name="H" pixmapfile="geography/europe/estonia.png" x="528" y="167" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/hungary">
+  <Shape name="I" pixmapfile="geography/europe/hungary.png" x="487" y="336" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/latvia">
+  <Shape name="J" pixmapfile="geography/europe/latvia.png" x="531" y="193" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/lithuania">
+  <Shape name="K" pixmapfile="geography/europe/lithuania.png" x="524" y="218" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/macedonia">
+  <Shape name="L" pixmapfile="geography/europe/macedonia.png" x="524" y="421" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/moldova">
+  <Shape name="M" pixmapfile="geography/europe/moldova.png" x="596" y="339" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/poland">
+  <Shape name="N" pixmapfile="geography/europe/poland.png" x="474" y="264" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/romania">
+  <Shape name="O" pixmapfile="geography/europe/romania.png" x="558" y="355" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/russia">
+  <Shape name="P" pixmapfile="geography/europe/russia.png" x="631" y="189" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/serbia_montenegro">
+  <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">
       <_tooltip>Serbia Montenegro</_tooltip>
   </Shape>
-  <Shape name="R" pixmapfile="geography/europe/slovakia.png" x="488" y="314" zoomx="1" zoomy="1" position="0" sound="geography/slovakia">
+  <Shape name="R" pixmapfile="geography/europe/slovakia.png" x="488" y="314" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/slovenia">
+  <Shape name="S" pixmapfile="geography/europe/slovenia.png" x="432" y="351" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/turkey">
+  <Shape name="T" pixmapfile="geography/europe/turkey.png" x="677" y="466" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/ukraine">
+  <Shape name="U" pixmapfile="geography/europe/ukraine.png" x="626" y="318" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/greece">
+  <Shape name="V" pixmapfile="geography/europe/greece.png" x="550" y="472" zoomx="1" zoomy="1" position="0" sound="sounds/$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="geography/cyprus">
+  <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">
       <_tooltip>Cyprus</_tooltip>
   </Shape>
   <Shape name="Z" pixmapfile="geography/europe/europe.png" type="SHAPE_BACKGROUND"
diff --git a/boards/geography/board4_0.xml.in b/boards/geography/board4_0.xml.in
index 4f1587e..452c659 100644
--- a/boards/geography/board4_0.xml.in
+++ b/boards/geography/board4_0.xml.in
@@ -5,133 +5,133 @@
          <_name>Northern Africa</_name>
     </Title>
 
-<Shape name="A" pixmapfile="geography/africa/algeria.png" sound="africa/algeria" x="286" y="150" position="0">
+<Shape name="A" pixmapfile="geography/africa/algeria.png" sound="sounds/$LOCALE/geography/africa/algeria.ogg" x="286" y="150" position="0">
 	<_tooltip>Algeria</_tooltip>
 </Shape>
 
-<Shape name="B" pixmapfile="geography/africa/benin.png" sound="africa/benin" x="275" y="341" position="0">
+<Shape name="B" pixmapfile="geography/africa/benin.png" sound="sounds/$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="africa/burkina_faso" x="236" y="310" position="0">
+<Shape name="C" pixmapfile="geography/africa/burkina_faso.png" sound="sounds/$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="africa/cameroon" x="383" y="377" position="0">
+<Shape name="D" pixmapfile="geography/africa/cameroon.png" sound="sounds/$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="africa/central_african_republic" x="465" y="370" position="0">
+<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">
 	<_tooltip>Central African Republic</_tooltip>
 </Shape>
 
-<Shape name="F" pixmapfile="geography/africa/chad.png" sound="africa/chad" x="446" y="281" position="0">
+<Shape name="F" pixmapfile="geography/africa/chad.png" sound="sounds/$LOCALE/geography/africa/chad.ogg" x="446" y="281" position="0">
 	<_tooltip>Chad</_tooltip>
 </Shape>
 
-<Shape name="G" pixmapfile="geography/africa/djibouti.png" sound="africa/djibouti" x="684" y="324" position="0">
+<Shape name="G" pixmapfile="geography/africa/djibouti.png" sound="sounds/$LOCALE/geography/africa/djibouti.ogg" x="684" y="324" position="0">
 	<_tooltip>Djibouti</_tooltip>
 </Shape>
 
-<Shape name="H" pixmapfile="geography/africa/egypt.png" sound="africa/egypt" x="559" y="164" position="0">
+<Shape name="H" pixmapfile="geography/africa/egypt.png" sound="sounds/$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="africa/equatorial_guinea" x="373" y="436" position="0">
+<Shape name="I" pixmapfile="geography/africa/equatorial_guinea.png" sound="sounds/$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="africa/ethiopia" x="662" y="338" position="0">
+<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="sounds/$LOCALE/geography/africa/ethiopia.ogg" x="662" y="338" position="0">
 	<_tooltip>Ethiopia</_tooltip>
 </Shape>
 
-<Shape name="K" pixmapfile="geography/africa/gabon.png" sound="africa/gabon" x="388" y="462" position="0">
+<Shape name="K" pixmapfile="geography/africa/gabon.png" sound="sounds/$LOCALE/geography/africa/gabon.ogg" x="388" y="462" position="0">
 	<_tooltip>Gabon</_tooltip>
 </Shape>
 
-<Shape name="L" pixmapfile="geography/africa/ganbia.png" sound="africa/gambia" x="101" y="290" position="0">
+<Shape name="L" pixmapfile="geography/africa/ganbia.png" sound="sounds/$LOCALE/geography/africa/gambia.ogg" x="101" y="290" position="0">
 	<_tooltip>Gambia</_tooltip>
 </Shape>
 
-<Shape name="M" pixmapfile="geography/africa/ghana.png" sound="africa/ghana" x="237" y="355" position="0">
+<Shape name="M" pixmapfile="geography/africa/ghana.png" sound="sounds/$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="africa/guinea_bissau" x="103" y="306" position="0">
+<Shape name="N" pixmapfile="geography/africa/guinea_bissau.png" sound="sounds/$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="africa/guinea" x="137" y="325" position="0">
+<Shape name="O" pixmapfile="geography/africa/guinea.png" sound="sounds/$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="africa/ivory_coast" x="192" y="356" position="0">
+<Shape name="P" pixmapfile="geography/africa/ivory_coast.png" sound="sounds/$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="africa/liberia" x="152" y="366" position="0">
+<Shape name="Q" pixmapfile="geography/africa/liberia.png" sound="sounds/$LOCALE/geography/africa/liberia.ogg" x="152" y="366" position="0">
 	<_tooltip>Liberia</_tooltip>
 </Shape>
 
-<Shape name="R" pixmapfile="geography/africa/libya.png" sound="africa/libya" x="432" y="173" position="0">
+<Shape name="R" pixmapfile="geography/africa/libya.png" sound="sounds/$LOCALE/geography/africa/libya.ogg" x="432" y="173" position="0">
 	<_tooltip>Libya</_tooltip>
 </Shape>
 
-<Shape name="S" pixmapfile="geography/africa/mali.png" sound="africa/mali" x="219" y="250" position="0">
+<Shape name="S" pixmapfile="geography/africa/mali.png" sound="sounds/$LOCALE/geography/africa/mali.ogg" x="219" y="250" position="0">
 	<_tooltip>Mali</_tooltip>
 </Shape>
 
-<Shape name="T" pixmapfile="geography/africa/mauritania.png" sound="africa/mauritania" x="161" y="211" position="0">
+<Shape name="T" pixmapfile="geography/africa/mauritania.png" sound="sounds/$LOCALE/geography/africa/mauritania.ogg" x="161" y="211" position="0">
 	<_tooltip>Mauritania</_tooltip>
 </Shape>
 
-<Shape name="U" pixmapfile="geography/africa/moroco.png" sound="africa/moroco" x="212" y="101" position="0">
+<Shape name="U" pixmapfile="geography/africa/moroco.png" sound="sounds/$LOCALE/geography/africa/moroco.ogg" x="212" y="101" position="0">
 	<_tooltip>Morocco</_tooltip>
 </Shape>
 
-<Shape name="V" pixmapfile="geography/africa/nigeria.png" sound="africa/nigeria" x="341" y="344" position="0">
+<Shape name="V" pixmapfile="geography/africa/nigeria.png" sound="sounds/$LOCALE/geography/africa/nigeria.ogg" x="341" y="344" position="0">
 	<_tooltip>Nigeria</_tooltip>
 </Shape>
 
-<Shape name="W" pixmapfile="geography/africa/niger.png" sound="africa/niger" x="338" y="256" position="0">
+<Shape name="W" pixmapfile="geography/africa/niger.png" sound="sounds/$LOCALE/geography/africa/niger.ogg" x="338" y="256" position="0">
 	<_tooltip>Niger</_tooltip>
 </Shape>
 
-<Shape name="X" pixmapfile="geography/africa/rwanda.png" sound="africa/rwanda" x="565" y="474" position="0">
+<Shape name="X" pixmapfile="geography/africa/rwanda.png" sound="sounds/$LOCALE/geography/africa/rwanda.ogg" x="565" y="474" position="0">
 	<_tooltip>Rwanda</_tooltip>
 </Shape>
 
-<Shape name="Y" pixmapfile="geography/africa/senegal.png" sound="africa/senegal" x="106" y="277" position="0">
+<Shape name="Y" pixmapfile="geography/africa/senegal.png" sound="sounds/$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="africa/sierra_leone" x="133" y="340" position="0">
+<Shape name="Z" pixmapfile="geography/africa/sierra_leone.png" sound="sounds/$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="africa/somalia" x="720" y="396" position="0">
+<Shape name="AA" pixmapfile="geography/africa/somalia.png" sound="sounds/$LOCALE/geography/africa/somalia.ogg" x="720" y="396" position="0">
 	<_tooltip>Somalia</_tooltip>
 </Shape>
 
-<Shape name="AB" pixmapfile="geography/africa/sudan.png" sound="africa/sudan" x="557" y="306" position="0">
+<Shape name="AB" pixmapfile="geography/africa/sudan.png" sound="sounds/$LOCALE/geography/africa/sudan.ogg" x="557" y="306" position="0">
 	<_tooltip>Sudan</_tooltip>
 </Shape>
 
-<Shape name="AC" pixmapfile="geography/africa/togo.png" sound="africa/togo" x="258" y="348" position="0">
+<Shape name="AC" pixmapfile="geography/africa/togo.png" sound="sounds/$LOCALE/geography/africa/togo.ogg" x="258" y="348" position="0">
 	<_tooltip>Togo</_tooltip>
 </Shape>
 
-<Shape name="AD" pixmapfile="geography/africa/tunisia.png" sound="africa/tunisia" x="367" y="92" position="0">
+<Shape name="AD" pixmapfile="geography/africa/tunisia.png" sound="sounds/$LOCALE/geography/africa/tunisia.ogg" x="367" y="92" position="0">
 	<_tooltip>Tunisia</_tooltip>
 </Shape>
 
-<Shape name="AE" pixmapfile="geography/africa/uganda.png" sound="africa/uganda" x="587" y="436" position="0">
+<Shape name="AE" pixmapfile="geography/africa/uganda.png" sound="sounds/$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="africa/western_sahara" x="148" y="170" position="0">
+<Shape name="AF" pixmapfile="geography/africa/western_sahara.png" sound="sounds/$LOCALE/geography/africa/western_sahara.ogg" x="148" y="170" position="0">
 	<_tooltip>Western Sahara</_tooltip>
 </Shape>
 
-<Shape name="1" pixmapfile="geography/africa/north_africa.png" type="SHAPE_BACKGROUND" sound="Undefined" x="420" y="260" position="0"/>
+<Shape name="1" pixmapfile="geography/africa/north_africa.png" type="SHAPE_BACKGROUND" x="420" y="260" position="0"/>
 </ShapeGame>
diff --git a/boards/geography/board4_1.xml.in b/boards/geography/board4_1.xml.in
index b60a383..d98aec3 100644
--- a/boards/geography/board4_1.xml.in
+++ b/boards/geography/board4_1.xml.in
@@ -5,85 +5,85 @@
          <_name>Southern Africa</_name>
     </Title>
 
-<Shape name="A" pixmapfile="geography/africa/angola.png" sound="africa/angola" x="327" y="210" position="0">
+<Shape name="A" pixmapfile="geography/africa/angola.png" sound="sounds/$LOCALE/geography/africa/angola.ogg" x="327" y="210" position="0">
 	<_tooltip>Angola</_tooltip>
 </Shape>
 
-<Shape name="C" pixmapfile="geography/africa/botswana.png" sound="africa/botswana" x="388" y="317" position="0">
+<Shape name="C" pixmapfile="geography/africa/botswana.png" sound="sounds/$LOCALE/geography/africa/botswana.ogg" x="388" y="317" position="0">
 	<_tooltip>Botswana</_tooltip>
 </Shape>
 
-<Shape name="D" pixmapfile="geography/africa/burundi.png" sound="africa/burundi" x="444" y="137" position="0">
+<Shape name="D" pixmapfile="geography/africa/burundi.png" sound="sounds/$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="africa/democratic_republic_of_congo" x="364" y="136" position="0">
+<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">
 	<_tooltip>Democratic Republic of Congo</_tooltip>
 </Shape>
 
-<Shape name="F" pixmapfile="geography/africa/equatorial_guinea.png" sound="africa/equatorial_guinea" x="253" y="82" position="0">
+<Shape name="F" pixmapfile="geography/africa/equatorial_guinea.png" sound="sounds/$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="africa/gabon" x="266" y="108" position="0">
+<Shape name="G" pixmapfile="geography/africa/gabon.png" sound="sounds/$LOCALE/geography/africa/gabon.ogg" x="266" y="108" position="0">
 	<_tooltip>Gabon</_tooltip>
 </Shape>
 
-<Shape name="H" pixmapfile="geography/africa/kenya.png" sound="africa/kenya" x="521" y="93" position="0">
+<Shape name="H" pixmapfile="geography/africa/kenya.png" sound="sounds/$LOCALE/geography/africa/kenya.ogg" x="521" y="93" position="0">
 	<_tooltip>Kenya</_tooltip>
 </Shape>
 
-<Shape name="I" pixmapfile="geography/africa/lesotho.png" sound="africa/lesotho" x="424" y="385" position="0">
+<Shape name="I" pixmapfile="geography/africa/lesotho.png" sound="sounds/$LOCALE/geography/africa/lesotho.ogg" x="424" y="385" position="0">
 	<_tooltip>Lesotho</_tooltip>
 </Shape>
 
-<Shape name="J" pixmapfile="geography/africa/madagascar.png" sound="africa/madagascar" x="596" y="287" position="0">
+<Shape name="J" pixmapfile="geography/africa/madagascar.png" sound="sounds/$LOCALE/geography/africa/madagascar.ogg" x="596" y="287" position="0">
 	<_tooltip>Madagascar</_tooltip>
 </Shape>
 
-<Shape name="K" pixmapfile="geography/africa/malawi.png" sound="africa/malawi" x="482" y="231" position="0">
+<Shape name="K" pixmapfile="geography/africa/malawi.png" sound="sounds/$LOCALE/geography/africa/malawi.ogg" x="482" y="231" position="0">
 	<_tooltip>Malawi</_tooltip>
 </Shape>
 
-<Shape name="L" pixmapfile="geography/africa/mozambique.png" sound="africa/mozambique" x="493" y="283" position="0">
+<Shape name="L" pixmapfile="geography/africa/mozambique.png" sound="sounds/$LOCALE/geography/africa/mozambique.ogg" x="493" y="283" position="0">
 	<_tooltip>Mozambique</_tooltip>
 </Shape>
 
-<Shape name="M" pixmapfile="geography/africa/namibia.png" sound="africa/namibia" x="328" y="319" position="0">
+<Shape name="M" pixmapfile="geography/africa/namibia.png" sound="sounds/$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="africa/republic_of_congo" x="296" y="100" position="0">
+<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">
 	<_tooltip>Republic of Congo</_tooltip>
 </Shape>
 
-<Shape name="O" pixmapfile="geography/africa/rwanda.png" sound="africa/rwanda" x="445" y="120" position="0">
+<Shape name="O" pixmapfile="geography/africa/rwanda.png" sound="sounds/$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="africa/south_africa" x="391" y="375" position="0">
+<Shape name="P" pixmapfile="geography/africa/south_africa.png" sound="sounds/$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="africa/swaziland" x="447" y="357" position="0">
+<Shape name="Q" pixmapfile="geography/africa/swaziland.png" sound="sounds/$LOCALE/geography/africa/swaziland.ogg" x="447" y="357" position="0">
 	<_tooltip>Swaziland</_tooltip>
 </Shape>
 
-<Shape name="R" pixmapfile="geography/africa/tanzania.png" sound="africa/tanzania" x="492" y="161" position="0">
+<Shape name="R" pixmapfile="geography/africa/tanzania.png" sound="sounds/$LOCALE/geography/africa/tanzania.ogg" x="492" y="161" position="0">
 	<_tooltip>Tanzania</_tooltip>
 </Shape>
 
-<Shape name="S" pixmapfile="geography/africa/uganda.png" sound="africa/uganda" x="465" y="83" position="0">
+<Shape name="S" pixmapfile="geography/africa/uganda.png" sound="sounds/$LOCALE/geography/africa/uganda.ogg" x="465" y="83" position="0">
 	<_tooltip>Uganda</_tooltip>
 </Shape>
 
-<Shape name="T" pixmapfile="geography/africa/zambia.png" sound="africa/zambia" x="420" y="227" position="0">
+<Shape name="T" pixmapfile="geography/africa/zambia.png" sound="sounds/$LOCALE/geography/africa/zambia.ogg" x="420" y="227" position="0">
 	<_tooltip>Zambia</_tooltip>
 </Shape>
 
-<Shape name="U" pixmapfile="geography/africa/zimbabwe.png" sound="africa/zimbabwe" x="427" y="284" position="0">
+<Shape name="U" pixmapfile="geography/africa/zimbabwe.png" sound="sounds/$LOCALE/geography/africa/zimbabwe.ogg" x="427" y="284" position="0">
 	<_tooltip>Zimbabwe</_tooltip>
 </Shape>
 
-<Shape name="1" pixmapfile="geography/africa/all_south_africa.png" type="SHAPE_BACKGROUND" sound="Undefined" x="420" y="260" position="0"/>
+<Shape name="1" pixmapfile="geography/africa/all_south_africa.png" type="SHAPE_BACKGROUND" x="420" y="260" position="0"/>
 </ShapeGame>
diff --git a/boards/geography/board4_2.xml.in b/boards/geography/board4_2.xml.in
index 22b97f1..8153daa 100644
--- a/boards/geography/board4_2.xml.in
+++ b/boards/geography/board4_2.xml.in
@@ -3,147 +3,147 @@
 <Title y="40" x="200" justification="GTK_JUSTIFY_CENTER">
 <_name>Africa</_name>
 </Title>
-<Shape name="afrique_sud" pixmapfile="geography/afrique/south_africa.png" sound="geography/south_africa" 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="sounds/$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="geography/algeria" x="386" y="72" zoomx="1" zoomy="1" position="0">
+<Shape name="algerie" pixmapfile="geography/afrique/algeria.png" sound="sounds/$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="geography/angola" x="486" y="354" zoomx="1" zoomy="1" position="0">
+<Shape name="angola" pixmapfile="geography/afrique/angola.png" sound="sounds/$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="geography/benin" x="391" y="206" zoomx="1" zoomy="1" position="0">
+<Shape name="benin" pixmapfile="geography/afrique/benin.png" sound="sounds/$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="geography/botswana" x="526" y="428" zoomx="1" zoomy="1" position="0">
+<Shape name="botswana" pixmapfile="geography/afrique/botswana.png" sound="sounds/$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="geography/burkina" x="366" y="184" zoomx="1" zoomy="1" position="0">
+<Shape name="burkina" pixmapfile="geography/afrique/burkina.png" sound="sounds/$LOCALE/geography/burkina.ogg" x="366" y="184" zoomx="1" zoomy="1" position="0">
 <_tooltip>Burkina Faso</_tooltip>
 </Shape>
-<Shape name="burundi" pixmapfile="geography/afrique/burundi.png" sound="geography/burundi" x="561" y="295" zoomx="1" zoomy="1" position="0">
+<Shape name="burundi" pixmapfile="geography/afrique/burundi.png" sound="sounds/$LOCALE/geography/burundi.ogg" x="561" y="295" zoomx="1" zoomy="1" position="0">
 <_tooltip>Burundi</_tooltip>
 </Shape>
-<Shape name="cameroon" pixmapfile="geography/afrique/cameroon.png" sound="geography/cameroon" x="455" y="223" zoomx="1" zoomy="1" position="0">
+<Shape name="cameroon" pixmapfile="geography/afrique/cameroon.png" sound="sounds/$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="geography/congo" x="470" y="274" zoomx="1" zoomy="1" position="0">
+<Shape name="congo" pixmapfile="geography/afrique/congo.png" sound="sounds/$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="geography/ivory_coast" x="343" y="218" zoomx="1" zoomy="1" position="0">
+<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">
 <_tooltip>Ivory Coast</_tooltip>
 </Shape>
-<Shape name="djibouti" pixmapfile="geography/afrique/djibouti.png" sound="geography/djibouti" x="637" y="185" zoomx="1" zoomy="1" position="0">
+<Shape name="djibouti" pixmapfile="geography/afrique/djibouti.png" sound="sounds/$LOCALE/geography/djibouti.ogg" x="637" y="185" zoomx="1" zoomy="1" position="0">
 <_tooltip>Djibouti</_tooltip>
 </Shape>
-<Shape name="egypte" pixmapfile="geography/afrique/egypt.png" sound="geography/egypt" x="558" y="84" zoomx="1" zoomy="1" position="0">
+<Shape name="egypte" pixmapfile="geography/afrique/egypt.png" sound="sounds/$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="geography/eritrea" x="621" y="164" zoomx="1" zoomy="1" position="0">
+<Shape name="erythree" pixmapfile="geography/afrique/eritrea.png" sound="sounds/$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="geography/ethiopia" x="627" y="207" zoomx="1" zoomy="1" position="0">
+<Shape name="ethiopie" pixmapfile="geography/afrique/ethiopia.png" sound="sounds/$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="geography/gabon" x="449" y="279" zoomx="1" zoomy="1" position="0">
+<Shape name="gabon" pixmapfile="geography/afrique/gabon.png" sound="sounds/$LOCALE/geography/gabon.ogg" x="449" y="279" zoomx="1" zoomy="1" position="0">
 <_tooltip>Gabon</_tooltip>
 </Shape>
-<Shape name="gambie" pixmapfile="geography/afrique/gambia.png" sound="geography/gambia" x="283" y="176" zoomx="1" zoomy="1" position="0">
+<Shape name="gambie" pixmapfile="geography/afrique/gambia.png" sound="sounds/$LOCALE/geography/gambia.ogg" x="283" y="176" zoomx="1" zoomy="1" position="0">
 <_tooltip>Gambia</_tooltip>
 </Shape>
-<Shape name="ghana" pixmapfile="geography/afrique/ghana.png" sound="geography/ghana" x="368" y="215" zoomx="1" zoomy="1" position="0">
+<Shape name="ghana" pixmapfile="geography/afrique/ghana.png" sound="sounds/$LOCALE/geography/ghana.ogg" x="368" y="215" zoomx="1" zoomy="1" position="0">
 <_tooltip>Ghana</_tooltip>
 </Shape>
-<Shape name="guinee" pixmapfile="geography/afrique/guinee.png" sound="geography/guinee" x="307" y="200" zoomx="1" zoomy="1" position="0">
+<Shape name="guinee" pixmapfile="geography/afrique/guinee.png" sound="sounds/$LOCALE/geography/guinee.ogg" x="307" y="200" zoomx="1" zoomy="1" position="0">
 <_tooltip>Guinea</_tooltip>
 </Shape>
-<Shape name="guinee_bissau" pixmapfile="geography/afrique/guinea_bissau.png" sound="geography/guinea_bissau" x="283" y="188" zoomx="1" zoomy="1" position="0">
+<Shape name="guinee_bissau" pixmapfile="geography/afrique/guinea_bissau.png" sound="sounds/$LOCALE/geography/guinea_bissau.ogg" x="283" y="188" zoomx="1" zoomy="1" position="0">
 <_tooltip>Guinea Bissau</_tooltip>
 </Shape>
-<Shape name="guinee_equat" pixmapfile="geography/afrique/equatorial_guinea.png" sound="geography/equatorial_guinea" x="441" y="260" zoomx="1" zoomy="1" position="0">
+<Shape name="guinee_equat" pixmapfile="geography/afrique/equatorial_guinea.png" sound="sounds/$LOCALE/geography/equatorial_guinea.ogg" x="441" y="260" zoomx="1" zoomy="1" position="0">
 <_tooltip>Equatorial Guinea</_tooltip>
 </Shape>
-<Shape name="kenya" pixmapfile="geography/afrique/kenya.png" sound="geography/kenya" x="612" y="270" zoomx="1" zoomy="1" position="0">
+<Shape name="kenya" pixmapfile="geography/afrique/kenya.png" sound="sounds/$LOCALE/geography/kenya.ogg" x="612" y="270" zoomx="1" zoomy="1" position="0">
 <_tooltip>Kenya</_tooltip>
 </Shape>
-<Shape name="lesotho" pixmapfile="geography/afrique/lesotho.png" sound="geography/lesotho" x="545" y="478" zoomx="1" zoomy="1" position="0">
+<Shape name="lesotho" pixmapfile="geography/afrique/lesotho.png" sound="sounds/$LOCALE/geography/lesotho.ogg" x="545" y="478" zoomx="1" zoomy="1" position="0">
 <_tooltip>Lesotho</_tooltip>
 </Shape>
-<Shape name="liberia" pixmapfile="geography/afrique/liberia.png" sound="geography/liberia" x="317" y="226" zoomx="1" zoomy="1" position="0">
+<Shape name="liberia" pixmapfile="geography/afrique/liberia.png" sound="sounds/$LOCALE/geography/liberia.ogg" x="317" y="226" zoomx="1" zoomy="1" position="0">
 <_tooltip>Liberia</_tooltip>
 </Shape>
-<Shape name="libye" pixmapfile="geography/afrique/libye.png" sound="geography/libya" x="481" y="85" zoomx="1" zoomy="1" position="0">
+<Shape name="libye" pixmapfile="geography/afrique/libye.png" sound="sounds/$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="geography/madagascar" x="662" y="402" zoomx="1" zoomy="1" position="0">
+<Shape name="madagascar" pixmapfile="geography/afrique/madagascar.png" sound="sounds/$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="geography/malawi" x="587" y="362" zoomx="1" zoomy="1" position="0">
+<Shape name="malawi" pixmapfile="geography/afrique/malawi.png" sound="sounds/$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="geography/mali" x="352" y="145" zoomx="1" zoomy="1" position="0">
+<Shape name="mali" pixmapfile="geography/afrique/mali.png" sound="sounds/$LOCALE/geography/mali.ogg" x="352" y="145" zoomx="1" zoomy="1" position="0">
 <_tooltip>Mali</_tooltip>
 </Shape>
-<Shape name="maroc" pixmapfile="geography/afrique/maroc.png" sound="geography/moroco" x="321" y="69" zoomx="1" zoomy="1" position="0">
+<Shape name="maroc" pixmapfile="geography/afrique/maroc.png" sound="sounds/$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="geography/mauritania" x="309" y="124" zoomx="1" zoomy="1" position="0">
+<Shape name="mauritanie" pixmapfile="geography/afrique/mauritania.png" sound="sounds/$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="geography/mozambique" x="594" y="403" zoomx="1" zoomy="1" position="0">
+<Shape name="mozambique" pixmapfile="geography/afrique/mozambique.png" sound="sounds/$LOCALE/geography/mozambique.ogg" x="594" y="403" zoomx="1" zoomy="1" position="0">
 <_tooltip>Mozambique</_tooltip>
 </Shape>
-<Shape name="namibie" pixmapfile="geography/afrique/namibie.png" sound="geography/namibia" x="487" y="432" zoomx="1" zoomy="1" position="0">
+<Shape name="namibie" pixmapfile="geography/afrique/namibie.png" sound="sounds/$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="geography/niger" x="426" y="147" zoomx="1" zoomy="1" position="0">
+<Shape name="niger" pixmapfile="geography/afrique/niger.png" sound="sounds/$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="geography/nigeria" x="431" y="207" zoomx="1" zoomy="1" position="0">
+<Shape name="nigeria" pixmapfile="geography/afrique/nigeria.png" sound="sounds/$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="geography/uganda" x="576" y="260" zoomx="1" zoomy="1" position="0">
+<Shape name="ouganda" pixmapfile="geography/afrique/uganda.png" sound="sounds/$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="geography/central_african_republic" x="507" y="222" zoomx="1" zoomy="1" position="0">
+<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">
 <_tooltip>Central African Republic</_tooltip>
 </Shape>
-<Shape name="rep_congo" pixmapfile="geography/afrique/rep_congo.png" sound="geography/democratic_republic_of_congo" x="510" y="299" zoomx="1" zoomy="1" position="0">
+<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">
 <_tooltip>Democratic Republic of Congo</_tooltip>
 </Shape>
-<Shape name="rwanda" pixmapfile="geography/afrique/rwanda.png" sound="geography/rwanda" x="562" y="284" zoomx="1" zoomy="1" position="0">
+<Shape name="rwanda" pixmapfile="geography/afrique/rwanda.png" sound="sounds/$LOCALE/geography/rwanda.ogg" x="562" y="284" zoomx="1" zoomy="1" position="0">
 <_tooltip>Rwanda</_tooltip>
 </Shape>
-<Shape name="senegal" pixmapfile="geography/afrique/senegal.png" sound="geography/senegal" x="288" y="169" zoomx="1" zoomy="1" position="0">
+<Shape name="senegal" pixmapfile="geography/afrique/senegal.png" sound="sounds/$LOCALE/geography/senegal.ogg" x="288" y="169" zoomx="1" zoomy="1" position="0">
 <_tooltip>Senegal</_tooltip>
 </Shape>
-<Shape name="sierra_leone" pixmapfile="geography/afrique/sierra_leone.png" sound="geography/sierra_leone" x="303" y="211" zoomx="1" zoomy="1" position="0">
+<Shape name="sierra_leone" pixmapfile="geography/afrique/sierra_leone.png" sound="sounds/$LOCALE/geography/sierra_leone.ogg" x="303" y="211" zoomx="1" zoomy="1" position="0">
 <_tooltip>Sierra Leone</_tooltip>
 </Shape>
-<Shape name="somalie" pixmapfile="geography/afrique/somalia.png" sound="geography/somalia" x="661" y="234" zoomx="1" zoomy="1" position="0">
+<Shape name="somalie" pixmapfile="geography/afrique/somalia.png" sound="sounds/$LOCALE/geography/somalia.ogg" x="661" y="234" zoomx="1" zoomy="1" position="0">
 <_tooltip>Somalia</_tooltip>
 </Shape>
-<Shape name="mali" pixmapfile="geography/afrique/mali.png" sound="geography/mali" x="561" y="179" zoomx="1" zoomy="1" position="0">
+<Shape name="mali" pixmapfile="geography/afrique/mali.png" sound="sounds/$LOCALE/geography/mali.ogg" x="561" y="179" zoomx="1" zoomy="1" position="0">
 <_tooltip>Mali</_tooltip>
 </Shape>
-<Shape name="tanzanie" pixmapfile="geography/afrique/tanzania.png" sound="geography/tanzania" x="592" y="315" zoomx="1" zoomy="1" position="0">
+<Shape name="tanzanie" pixmapfile="geography/afrique/tanzania.png" sound="sounds/$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="geography/chad" x="492" y="162" zoomx="1" zoomy="1" position="0">
+<Shape name="tchad" pixmapfile="geography/afrique/chad.png" sound="sounds/$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="geography/togo" x="381" y="211" zoomx="1" zoomy="1" position="0">
+<Shape name="togo" pixmapfile="geography/afrique/togo.png" sound="sounds/$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="geography/tunisia" x="433" y="33" zoomx="1" zoomy="1" position="0">
+<Shape name="tunisie" pixmapfile="geography/afrique/tunisia.png" sound="sounds/$LOCALE/geography/tunisia.ogg" x="433" y="33" zoomx="1" zoomy="1" position="0">
 <_tooltip>Tunisia</_tooltip>
 </Shape>
-<Shape name="zambie" pixmapfile="geography/afrique/zambie.png" sound="geography/zambia" x="549" y="363" zoomx="1" zoomy="1" position="0">
+<Shape name="zambie" pixmapfile="geography/afrique/zambie.png" sound="sounds/$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="geography/zimbabwe" x="555" y="403" zoomx="1" zoomy="1" position="0">
+<Shape name="zimbabwe" pixmapfile="geography/afrique/zimbabwe.png" sound="sounds/$LOCALE/geography/zimbabwe.ogg" x="555" y="403" zoomx="1" zoomy="1" position="0">
 <_tooltip>Zimbabwe</_tooltip>
 </Shape>
-<Shape name="zwaziland" pixmapfile="geography/afrique/swaziland.png" sound="geography/swaziland" x="565" y="455" zoomx="1" zoomy="1" position="0">
+<Shape name="zwaziland" pixmapfile="geography/afrique/swaziland.png" sound="sounds/$LOCALE/geography/swaziland.ogg" x="565" y="455" zoomx="1" zoomy="1" position="0">
 <_tooltip>Swaziland</_tooltip>
 </Shape>
 <Shape name="zz" zoomx="1" zoomy="1" y="260" x="480" type="SHAPE_BACKGROUND" position="0" pixmapfile="geography/afrique/africa.png"/></ShapeGame>
diff --git a/boards/geography/board5_0.xml.in b/boards/geography/board5_0.xml.in
index 705d272..b0cdc0d 100644
--- a/boards/geography/board5_0.xml.in
+++ b/boards/geography/board5_0.xml.in
@@ -5,71 +5,71 @@
          <_name>Regions of France</_name>
     </Title>
 
-<Shape name="A" pixmapfile="geography/france_region/alsace.png" sound="france_region/alsace" x="585" y="149" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="A" pixmapfile="geography/france_region/alsace.png" sound="sounds/$LOCALE/geography/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/france_region/aquitaine.png" sound="france_region/aquitaine" x="317" y="371" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="B" pixmapfile="geography/france_region/aquitaine.png" sound="sounds/$LOCALE/geography/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/france_region/auvergne.png" sound="france_region/auvergne" x="443" y="293" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="C" pixmapfile="geography/france_region/auvergne.png" sound="sounds/$LOCALE/geography/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/france_region/basse-normandie.png" sound="france_region/basse-normandie" x="315" y="115" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="D" pixmapfile="geography/france_region/basse-normandie.png" sound="sounds/$LOCALE/geography/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/france_region/bourgogne.png" sound="france_region/bourgogne" x="473" y="207" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="E" pixmapfile="geography/france_region/bourgogne.png" sound="sounds/$LOCALE/geography/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/france_region/bretagne.png" sound="france_region/bretagne" x="226" y="158" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="F" pixmapfile="geography/france_region/bretagne.png" sound="sounds/$LOCALE/geography/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/france_region/centre.png" sound="france_region/centre" x="383" y="188" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="G" pixmapfile="geography/france_region/centre.png" sound="sounds/$LOCALE/geography/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/france_region/champagne-ardenne.png" sound="france_region/champagne-ardenne" x="487" y="120" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="H" pixmapfile="geography/france_region/champagne-ardenne.png" sound="sounds/$LOCALE/geography/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/france_region/corse.png" sound="france_region/corse" x="662" y="472" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="I" pixmapfile="geography/france_region/corse.png" sound="sounds/$LOCALE/geography/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/france_region/franche-conte.png" sound="france_region/franche-conte" x="542" y="212" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="J" pixmapfile="geography/france_region/franche-conte.png" sound="sounds/$LOCALE/geography/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/france_region/haute-normandie.png" sound="france_region/haute-normandie" x="363" y="95" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="K" pixmapfile="geography/france_region/haute-normandie.png" sound="sounds/$LOCALE/geography/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/france_region/ile-de-france.png" sound="france_region/ile-de-france" x="415" y="132" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="L" pixmapfile="geography/france_region/ile-de-france.png" sound="sounds/$LOCALE/geography/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/france_region/languedoc-roussillon.png" sound="france_region/languedoc-roussillon" x="443" y="404" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="M" pixmapfile="geography/france_region/languedoc-roussillon.png" sound="sounds/$LOCALE/geography/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/france_region/limousin.png" sound="france_region/limousin" x="384" y="294" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="N" pixmapfile="geography/france_region/limousin.png" sound="sounds/$LOCALE/geography/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/france_region/lorraine.png" sound="france_region/lorraine" x="540" y="127" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="O" pixmapfile="geography/france_region/lorraine.png" sound="sounds/$LOCALE/geography/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/france_region/midi-pyrenees.png" sound="france_region/midi-pyrenees" x="380" y="396" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="P" pixmapfile="geography/france_region/midi-pyrenees.png" sound="sounds/$LOCALE/geography/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/france_region/nord-pas-de-calais.png" sound="france_region/nord-pas-de-calais" x="427" y="33" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="Q" pixmapfile="geography/france_region/nord-pas-de-calais.png" sound="sounds/$LOCALE/geography/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/france_region/pays-de-la-loire.png" sound="france_region/pays-de-la-loire" x="300" y="199" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="R" pixmapfile="geography/france_region/pays-de-la-loire.png" sound="sounds/$LOCALE/geography/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/france_region/picardie.png" sound="france_region/picardie" x="424" y="83" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="S" pixmapfile="geography/france_region/picardie.png" sound="sounds/$LOCALE/geography/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/france_region/poitou-charentes.png" sound="france_region/poitou-charentes" x="321" y="269" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="T" pixmapfile="geography/france_region/poitou-charentes.png" sound="sounds/$LOCALE/geography/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/france_region/provence-alpes-cote_d_azur.png" sound="france_region/provence-alpes-cote_d_azur" x="543" y="379" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="U" pixmapfile="geography/france_region/provence-alpes-cote_d_azur.png" sound="sounds/$LOCALE/geography/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/france_region/rhone-alpes.png" sound="france_region/rhone-alpes" x="520" y="312" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="V" pixmapfile="geography/france_region/rhone-alpes.png" sound="sounds/$LOCALE/geography/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/france_region/france-regions.png" type="SHAPE_BACKGROUND" sound="Undefined" x="420" y="260" zoomx="0.660000" zoomy="0.660000" position="0"/>
+<Shape name="1" pixmapfile="geography/france_region/france-regions.png" type="SHAPE_BACKGROUND" x="420" y="260" zoomx="0.660000" zoomy="0.660000" position="0"/>
 </ShapeGame>