Thanks to Ronny Standtke for these bug reports.

	* Thanks to Ronny Standtke for these bug reports.

	* boards/chronos/board4_3.xml.in: removed hardcoded translations
	* boards/doubleentry/board3_0.xml.in: fixed call to audio voices.
	  FIXME: works only with LATIN country.
	* src/boards/python/algorithm.py: Fixed the skip of a level after the call to the help.
	* src/boards/shapegame.c: (shapegame_init_canvas),
	(find_closest_shape), (item_event_drag): fixed, it was missing a X offset coming from
	the box of shapes on the left. It was mostly visible in the doubleentry activity where
	it was not easy to spot the target.


svn path=/trunk/; revision=2915

2 files changed, 10 insertions, 15 deletions

diff --git a/boards/chronos/board4_3.xml.in b/boards/chronos/board4_3.xml.in
index 8058a36..e608062 100644
--- a/boards/chronos/board4_3.xml.in
+++ b/boards/chronos/board4_3.xml.in
@@ -2,11 +2,6 @@
 <ShapeGame>
   <Title y="50" x="150" justification="GTK_JUSTIFY_CENTER">
     <_name>Cars</_name>
-    <name xml:lang="de">Die Automobil</name>
-    <name xml:lang="es">L' automóvil</name>
-    <name xml:lang="it">La macchina</name>
-    <name xml:lang="nl">De auto</name>
-    <name xml:lang="fr">L'automobile</name>
   </Title>
   <Shape zoomy="1" zoomx="1" y="276" x="233"  position="0" pixmapfile="chronos/images/renault1899.png" name="G"/>
   <Title y="399" x="233" justification="GTK_JUSTIFY_CENTER">
@@ -20,4 +15,4 @@
   <Title y="490" x="580" justification="GTK_JUSTIFY_CENTER">
     <_name>1955 Citroën ds 19</_name>
   </Title>
-</ShapeGame>
\ No newline at end of file
+</ShapeGame>
diff --git a/boards/doubleentry/board3_0.xml.in b/boards/doubleentry/board3_0.xml.in
index 920dd57..ea0a519 100644
--- a/boards/doubleentry/board3_0.xml.in
+++ b/boards/doubleentry/board3_0.xml.in
@@ -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="alphabet/c alphabet/1"/>
-  <Shape name="B" pixmapfile="doubleentry/d-entry_banane_2.png"  x="321" y="325"  zoomx="1" zoomy="1" position="0" sound="alphabet/c alphabet/2"/>
-  <Shape name="C" pixmapfile="doubleentry/d-entry_banane_3.png"  x="418" y="325"  zoomx="1" zoomy="1" position="0" sound="alphabet/c alphabet/3"/>
+  <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"/>
   <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="alphabet/a alphabet/1"/>
-  <Shape name="E" pixmapfile="doubleentry/d-entry_pomme_2.png"   x="321" y="170"  zoomx="1" zoomy="1" position="0" sound="alphabet/a alphabet/2"/>
-  <Shape name="F" pixmapfile="doubleentry/d-entry_pomme_3.png"   x="418" y="170"  zoomx="1" zoomy="1" position="0" sound="alphabet/a alphabet/3"/>
+  <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="asounds/$LOCALE/lphabet/U0061.ogg sounds/$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="alphabet/b alphabet/1"/>
-  <Shape name="H" pixmapfile="doubleentry/d-entry_galette_2.png" x="321" y="245"  zoomx="1" zoomy="1" position="0" sound="alphabet/b alphabet/2"/>
-  <Shape name="I" pixmapfile="doubleentry/d-entry_galette_3.png" x="418" y="245"  zoomx="1" zoomy="1" position="0" sound="alphabet/b alphabet/3"/>
+  <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"/>
 </ShapeGame>