translation file list cleanup.

	Removed translation of german region, just the map title is translated.

6 files changed, 48 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 78c33b3..f354d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2006-03-05  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	translation file list cleanup.
+	Removed translation of german region, just the map title is translated.
+
+	* boards/awele.xml.in:
+	* boards/geography/board6_0.xml.in:
+	* boards/magic_hat_minus.xml.in:
+	* boards/magic_hat_plus.xml.in:
+	* po/POTFILES.in:
+
+2006-03-05  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	Moved awele and magic_hat out of experimental. Added them for translation.
+	* boards/awele.xml.in:
+	* boards/magic_hat_minus.xml.in:
+	* boards/magic_hat_plus.xml.in:
+	* po/POTFILES.in:
+
 2006-03-03  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	- removed many warnings
diff --git a/boards/awele.xml.in b/boards/awele.xml.in
index 0fda2b6..ae8548c 100644
--- a/boards/awele.xml.in
+++ b/boards/awele.xml.in
@@ -3,7 +3,7 @@
   <Board
 	 name="awele"
 	 type="awele"
-	 section="/experimental"
+	 section="/strategy"
 	 difficulty="2"
 	 icon="boardicons/awele.png"
 	 author="Frédéric Mazzarol"
diff --git a/boards/geography/board6_0.xml.in b/boards/geography/board6_0.xml.in
index e883a9a..28d566c 100644
--- a/boards/geography/board6_0.xml.in
+++ b/boards/geography/board6_0.xml.in
@@ -3,21 +3,21 @@
   <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER">
     <_name>Deutschland Bundesländer</_name>
   </Title>
-  <Shape name="A1" pixmapfile="geography/germany_region/baden-wuerttemberg.png" targetfile="geography/germany_region/target_baden-wuerttemberg.png" x="240.5" y="422.5" zoomx="1" zoomy="1" position="0"><_tooltip>Baden-Württemberg</_tooltip></Shape>
-  <Shape name="A2" pixmapfile="geography/germany_region/bayern.png" targetfile="geography/germany_region/target_bayern.png" x="342" y="406.5" zoomx="1" zoomy="1" position="0"><_tooltip>Bayern</_tooltip></Shape>
-  <Shape name="A3" pixmapfile="geography/germany_region/berlin.png" targetfile="geography/germany_region/target_berlin.png" x="429" y="175.5" zoomx="1" zoomy="1" position="0"><_tooltip>Berlin</_tooltip></Shape>
-  <Shape name="A4" pixmapfile="geography/germany_region/brandenburg.png" targetfile="geography/germany_region/target_brandenburg.png" x="403" y="178" zoomx="1" zoomy="1" position="0"><_tooltip>Brandenburg</_tooltip></Shape>
-  <Shape name="A5" pixmapfile="geography/germany_region/bremen.png" targetfile="geography/germany_region/target_bremen.png" x="215.5" y="130.5" zoomx="1" zoomy="1" position="0"><_tooltip>Bremen</_tooltip></Shape>
-  <Shape name="A6" pixmapfile="geography/germany_region/hamburg.png" targetfile="geography/germany_region/target_hamburg.png" x="285" y="121.5" zoomx="1" zoomy="1" position="0"><_tooltip>Hamburg</_tooltip></Shape>
-  <Shape name="A7" pixmapfile="geography/germany_region/hessen.png" targetfile="geography/germany_region/target_hessen.png" x="242.5" y="303.5" zoomx="1" zoomy="1" position="0"><_tooltip>Hessen</_tooltip></Shape>
-  <Shape name="A8" pixmapfile="geography/germany_region/mecklenburg-vorpommern.png" targetfile="geography/germany_region/target_mecklenburg-vorpommern.png" x="379.5" y="91" zoomx="1" zoomy="1" position="0"><_tooltip>Mecklenburg-Vorpommern</_tooltip></Shape>
-  <Shape name="A9" pixmapfile="geography/germany_region/niedersachsen.png" targetfile="geography/germany_region/target_niedersachsen.png" x="248.5" y="151" zoomx="1" zoomy="1" position="0"><_tooltip>Niedersachsen</_tooltip></Shape>
-  <Shape name="A10" pixmapfile="geography/germany_region/nordrhein-westfalen.png" targetfile="geography/germany_region/target_nordrhein-westfalen.png" x="188.5" y="244.5" zoomx="1" zoomy="1" position="0"><_tooltip>Nordrhein-Westfalen</_tooltip></Shape>
-  <Shape name="A11" pixmapfile="geography/germany_region/rheinland-pfalz.png" targetfile="geography/germany_region/target_rheinland-pfalz.png" x="171" y="339" zoomx="1" zoomy="1" position="0"><_tooltip>Rheinland-Pfalz</_tooltip></Shape>
-  <Shape name="A12" pixmapfile="geography/germany_region/saarland.png" targetfile="geography/germany_region/target_saarland.png" x="152" y="377" zoomx="1" zoomy="1" position="0"><_tooltip>Saarland</_tooltip></Shape>
-  <Shape name="A13" pixmapfile="geography/germany_region/sachsen-anhalt.png" targetfile="geography/germany_region/target_sachsen-anhalt.png" x="358" y="211.5" zoomx="1" zoomy="1" position="0"><_tooltip>Sachsen-Anhalt</_tooltip></Shape>
-  <Shape name="A14" pixmapfile="geography/germany_region/sachsen.png" targetfile="geography/germany_region/target_sachsen.png" x="422" y="277" zoomx="1" zoomy="1" position="0"><_tooltip>Sachsen</_tooltip></Shape>
-  <Shape name="A15" pixmapfile="geography/germany_region/schleswig_holstein.png" targetfile="geography/germany_region/target_schleswig_holstein.png" x="274.5" y="72.5" zoomx="1" zoomy="1" position="0"><_tooltip>Schleswig-Holstein</_tooltip></Shape>
-  <Shape name="A16" pixmapfile="geography/germany_region/thueringen.png" targetfile="geography/germany_region/target_thueringen.png" x="333.5" y="277" zoomx="1" zoomy="1" position="0"><_tooltip>Thüringen</_tooltip></Shape>
+  <Shape name="A1" pixmapfile="geography/germany_region/baden-wuerttemberg.png" targetfile="geography/germany_region/target_baden-wuerttemberg.png" x="240.5" y="422.5" zoomx="1" zoomy="1" position="0"><tooltip>Baden-Württemberg</tooltip></Shape>
+  <Shape name="A2" pixmapfile="geography/germany_region/bayern.png" targetfile="geography/germany_region/target_bayern.png" x="342" y="406.5" zoomx="1" zoomy="1" position="0"><tooltip>Bayern</tooltip></Shape>
+  <Shape name="A3" pixmapfile="geography/germany_region/berlin.png" targetfile="geography/germany_region/target_berlin.png" x="429" y="175.5" zoomx="1" zoomy="1" position="0"><tooltip>Berlin</tooltip></Shape>
+  <Shape name="A4" pixmapfile="geography/germany_region/brandenburg.png" targetfile="geography/germany_region/target_brandenburg.png" x="403" y="178" zoomx="1" zoomy="1" position="0"><tooltip>Brandenburg</tooltip></Shape>
+  <Shape name="A5" pixmapfile="geography/germany_region/bremen.png" targetfile="geography/germany_region/target_bremen.png" x="215.5" y="130.5" zoomx="1" zoomy="1" position="0"><tooltip>Bremen</tooltip></Shape>
+  <Shape name="A6" pixmapfile="geography/germany_region/hamburg.png" targetfile="geography/germany_region/target_hamburg.png" x="285" y="121.5" zoomx="1" zoomy="1" position="0"><tooltip>Hamburg</tooltip></Shape>
+  <Shape name="A7" pixmapfile="geography/germany_region/hessen.png" targetfile="geography/germany_region/target_hessen.png" x="242.5" y="303.5" zoomx="1" zoomy="1" position="0"><tooltip>Hessen</tooltip></Shape>
+  <Shape name="A8" pixmapfile="geography/germany_region/mecklenburg-vorpommern.png" targetfile="geography/germany_region/target_mecklenburg-vorpommern.png" x="379.5" y="91" zoomx="1" zoomy="1" position="0"><tooltip>Mecklenburg-Vorpommern</tooltip></Shape>
+  <Shape name="A9" pixmapfile="geography/germany_region/niedersachsen.png" targetfile="geography/germany_region/target_niedersachsen.png" x="248.5" y="151" zoomx="1" zoomy="1" position="0"><tooltip>Niedersachsen</tooltip></Shape>
+  <Shape name="A10" pixmapfile="geography/germany_region/nordrhein-westfalen.png" targetfile="geography/germany_region/target_nordrhein-westfalen.png" x="188.5" y="244.5" zoomx="1" zoomy="1" position="0"><tooltip>Nordrhein-Westfalen</tooltip></Shape>
+  <Shape name="A11" pixmapfile="geography/germany_region/rheinland-pfalz.png" targetfile="geography/germany_region/target_rheinland-pfalz.png" x="171" y="339" zoomx="1" zoomy="1" position="0"><tooltip>Rheinland-Pfalz</tooltip></Shape>
+  <Shape name="A12" pixmapfile="geography/germany_region/saarland.png" targetfile="geography/germany_region/target_saarland.png" x="152" y="377" zoomx="1" zoomy="1" position="0"><tooltip>Saarland</tooltip></Shape>
+  <Shape name="A13" pixmapfile="geography/germany_region/sachsen-anhalt.png" targetfile="geography/germany_region/target_sachsen-anhalt.png" x="358" y="211.5" zoomx="1" zoomy="1" position="0"><tooltip>Sachsen-Anhalt</tooltip></Shape>
+  <Shape name="A14" pixmapfile="geography/germany_region/sachsen.png" targetfile="geography/germany_region/target_sachsen.png" x="422" y="277" zoomx="1" zoomy="1" position="0"><tooltip>Sachsen</tooltip></Shape>
+  <Shape name="A15" pixmapfile="geography/germany_region/schleswig_holstein.png" targetfile="geography/germany_region/target_schleswig_holstein.png" x="274.5" y="72.5" zoomx="1" zoomy="1" position="0"><tooltip>Schleswig-Holstein</tooltip></Shape>
+  <Shape name="A16" pixmapfile="geography/germany_region/thueringen.png" targetfile="geography/germany_region/target_thueringen.png" x="333.5" y="277" zoomx="1" zoomy="1" position="0"><tooltip>Thüringen</tooltip></Shape>
   <Shape name="1" pixmapfile="geography/germany_region/back.png" type="SHAPE_BACKGROUND" x="300" y="258.5" zoomx="1" zoomy="1" position="0"/>
 </ShapeGame>
diff --git a/boards/magic_hat_minus.xml.in b/boards/magic_hat_minus.xml.in
index 4fc6736..59fb436 100644
--- a/boards/magic_hat_minus.xml.in
+++ b/boards/magic_hat_minus.xml.in
@@ -3,17 +3,17 @@
   <Board 
 	 name="magic_hat_minus"
 	 type="magic_hat"
-	 section="/experimental"
+	 section="/math/numeration"
 	 icon="boardicons/magic_hat_minus.png" 
 	 difficulty="2"
 	 mode="minus"
 	 author="Marc BRUN"
 	 boarddir="">
 	 <_title>The magician hat</_title>
-	 <_description>Compute how many items are under the magic hat after some escaped</_description>
+	 <_description>Count how many items are under the magic hat after some escaped</_description>
 	<_prerequisite>Substraction</_prerequisite>
 	<_goal>Learn substraction</_goal>
-	 <_manual>Look at the magician, he tells you how much stars are under his magic hat. Then, click on the hat to open it. A few stars now escape. Click again on the hat to close it. You have to compute how much are still under the hat. Click on the bottom right frame to give your answer.</_manual>
+	 <_manual>Look at the magician, he tells you how much stars are under his magic hat. Then, click on the hat to open it. A few stars escape. Click again on the hat to close it. You have to count how much are still under the hat. Click on the bottom right area to answer.</_manual>
 	 <_credit></_credit>
   </Board>
 </GCompris>
diff --git a/boards/magic_hat_plus.xml.in b/boards/magic_hat_plus.xml.in
index 81afe9b..d9fe29a 100644
--- a/boards/magic_hat_plus.xml.in
+++ b/boards/magic_hat_plus.xml.in
@@ -3,17 +3,17 @@
   <Board 
 	 name="magic_hat_plus"
 	 type="magic_hat"
-	 section="/experimental"
+	 section="/math/numeration"
 	 icon="boardicons/magic_hat_plus.png" 
 	 difficulty="2"
 	 mode="plus"
 	 author="Marc BRUN"
 	 boarddir="">
 	 <_title>The magician hat</_title>
-	 <_description>Compute how many items are under the magic hat</_description>
+	 <_description>Count how many items are under the magic hat</_description>
 	<_prerequisite>Addition</_prerequisite>
 	<_goal>Learn addition</_goal>
-	 <_manual>Click on the hat to open it. A few stars now comes under the hat. Click again on the hat to close it. You have to compute how much are under the hat. Click on the bottom right frame to give your answer.</_manual>
+	 <_manual>Click on the hat to open it. A few stars now move under the hat. Click again on the hat to close it. You have to count how many are under the hat. Click on the bottom right area to answer.</_manual>
 	 <_credit></_credit>
   </Board>
 </GCompris>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c05d7ca..2d811df 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -95,6 +95,7 @@ boards/geography/board4_0.xml.in
 boards/geography/board4_1.xml.in
 boards/geography/board4_2.xml.in
 boards/geography/board5_0.xml.in
+boards/geography/board6_0.xml.in
 boards/geometry.xml.in
 boards/gletters.xml.in
 boards/gnumch-equality.xml.in
@@ -119,6 +120,8 @@ boards/imagename/board6_0.xml.in
 boards/keyboard.xml.in
 boards/leftright.xml.in
 boards/login.xml.in
+boards/magic_hat_plus.xml.in
+boards/magic_hat_minus.xml.in
 boards/math.xml.in
 boards/maze.xml.in
 boards/maze2DRelative.xml.in
@@ -132,6 +135,7 @@ boards/memory_sound.xml.in
 boards/memory_sound_tux.xml.in
 boards/memory_tux.xml.in
 boards/menu.xml.in
+boards/menu2.xml.in
 boards/miscelaneous.xml.in
 boards/missing_letter.xml.in
 boards/missing_letter/board1.xml.in
@@ -220,6 +224,7 @@ src/boards/machpuzzle.c
 src/boards/maze.c
 src/boards/memory.c
 src/boards/menu.c
+src/boards/menu2.c
 src/boards/missingletter.c
 src/boards/money.c
 src/boards/paratrooper.c
@@ -264,6 +269,7 @@ src/boards/target.c
 src/boards/traffic.c
 src/boards/wordsgame.c
 src/gcompris/about.c
+src/gcompris/bar.c
 src/gcompris/board.c
 src/gcompris/board_config.c
 src/gcompris/bonus.c