- There were a lot of bad formatted xml string in the menus for the help.

	  When a line is split on several lines, the  xml:space="preserve" was missing
	  in numerous places. It means that many translations was missing.
	- Fixed some bad English thanks to Clytie.

36 files changed, 154 insertions, 182 deletions

diff --git a/ChangeLog b/ChangeLog
index 58f67bd..c23dcbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2006-10-19  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	- There were a lot of bad formatted xml string in the menus for the help.
+	  When a line is split on several lines, the  xml:space="preserve" was missing
+	  in numerous places. It means that many translations was missing.
+	- Fixed some bad English thanks to Clytie.
+
+	* boards/algebra_guesscount.xml.in:
+	* boards/babyshapes.xml.in:
+	* boards/bargame.xml.in:
+	* boards/canal_lock.xml.in:
+	* boards/chess_computer.xml.in:
+	* boards/chess_movelearn.xml.in:
+	* boards/chess_partyend.xml.in:
+	* boards/chronos.xml.in:
+	* boards/connect4.xml.in:
+	* boards/enumerate.xml.in:
+	* boards/erase.xml.in:
+	* boards/erase_clic.xml.in:
+	* boards/erase_double_clic.xml.in:
+	* boards/fifteen.xml.in:
+	* boards/gnumch-factors.xml.in:
+	* boards/hanoi_real.xml.in:
+	* boards/imageid.xml.in:
+	* boards/leftright.xml.in:
+	* boards/magic_hat_plus.xml.in:
+	* boards/melody.xml.in:
+	* boards/missing_letter.xml.in:
+	* boards/money.xml.in:
+	* boards/money_cents.xml.in:
+	* boards/paintings.xml.in:
+	* boards/paratrooper.xml.in:
+	* boards/redraw.xml.in:
+	* boards/redraw_symmetrical.xml.in:
+	* boards/scalesboard.xml.in:
+	* boards/searace1player.xml.in:
+	* boards/sudoku.xml.in:
+	* boards/superbrain.xml.in:
+	* boards/target.xml.in:
+	* boards/watercycle.xml.in:
+	* src/boards/chess.c: (gnuchess_died), (start_board):
+	* src/gcompris/gcompris.c:
+
 2006-10-18  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	- Updated windows makefiles
diff --git a/boards/algebra_guesscount.xml.in b/boards/algebra_guesscount.xml.in
index 5ac4b99..e5fd63b 100644
--- a/boards/algebra_guesscount.xml.in
+++ b/boards/algebra_guesscount.xml.in
@@ -10,12 +10,8 @@
 	 boarddir="algebra_guesscount">
 	 <_title>Find the series of correct operations that matches the given answer</_title>
 	 <_description>Work out the right combination of numbers and operations to match the given value</_description>
-
-	<_prerequisite>The four arithmetic operations. Combine several
-arithmetic operations.</_prerequisite>
-
+	<_prerequisite>The four arithmetic operations. Combine several arithmetic operations.</_prerequisite>
 	<_goal>Deploy a strategy to arrange a set of arithmetic operations to match a given value.</_goal>
-
 	<_manual>At the top of the board area, choose the numbers and arithmetic operators that give the specified result. You can deselect a number or operator by clicking on it again.</_manual>
 	 <_credit>Animal pictures come from the Animal Photography Page of Ralf Schmode (http://schmode.net/). Ralf has kindly permitted Gcompris to include his pictures. Thanks a lot, Ralf.
 	 </_credit>
diff --git a/boards/babyshapes.xml.in b/boards/babyshapes.xml.in
index b2386db..74c84fb 100644
--- a/boards/babyshapes.xml.in
+++ b/boards/babyshapes.xml.in
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="babyshapes"
-	 type="shapegame" 
+	 type="shapegame"
 	 section="/discovery/miscelaneous"
-	 icon="boardicons/babyshapes.png" 
+	 icon="boardicons/babyshapes.png"
 	 difficulty="1"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr) / Andre Connes (andre.connes@toulouse.iufm.fr)"
 	 boarddir="babyshapes">
 	 <_title>Complete the puzzle</_title>
 	 <_description>Drag and Drop the shapes on their respective targets</_description>
 	 <_prerequisite>Good mouse-control</_prerequisite>
-	<_credit>The dog is provided by Andre Connes and released under the GPL
-	</_credit>
+	<_credit>The dog is provided by Andre Connes and released under the GPL</_credit>
 	<_manual>Complete the puzzle by dragging each piece from the set of pieces on the left, to the matching space in the puzzle.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/bargame.xml.in b/boards/bargame.xml.in
index e687581..22f95e6 100644
--- a/boards/bargame.xml.in
+++ b/boards/bargame.xml.in
@@ -12,9 +12,7 @@
 	 <_description>Don't use the last ball</_description>
 	 <_prerequisite>Brain</_prerequisite>
 	 <_goal>Logic-training activity</_goal>
-	 <_manual>Place balls in the holes. You win if the computer has to place the last ball.
-If you want Tux to begin, just click on him.
-         </_manual>
+	 <_manual>Place balls in the holes. You win if the computer has to place the last ball. If you want Tux to begin, just click on him.</_manual>
   </Board>
 </GCompris>
 
diff --git a/boards/canal_lock.xml.in b/boards/canal_lock.xml.in
index 0c68eb9..321c951 100644
--- a/boards/canal_lock.xml.in
+++ b/boards/canal_lock.xml.in
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="canal_lock"
-	 type="canal_lock" 
+	 type="canal_lock"
 	 section="/experience"
-	 icon="boardicons/canal_lock.png" 
+	 icon="boardicons/canal_lock.png"
 	 difficulty="2"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="">
 	 <_title>Operate a canal lock</_title>
 	 <_description>Tux is in trouble, and needs to take his boat through a lock. Help Tux and find out how a canal lock works.</_description>
-	 <_manual>You are in charge of the canal lock.
-Open the gates and the locks in the right order, so Tux can
-travel through the gates in both directions.
-	 </_manual>
+	 <_manual>You are in charge of the canal lock. Open the gates and the locks in the right order, so Tux can travel through the gates in both directions.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/chess_computer.xml.in b/boards/chess_computer.xml.in
index 0b6374d..89ff5dc 100644
--- a/boards/chess_computer.xml.in
+++ b/boards/chess_computer.xml.in
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="chess_computer"
-	 type="chess" 
+	 type="chess"
 	 section="/strategy/chess"
-	 mode="computer" 
-	 icon="boardicons/chess_computer.png" 
+	 mode="computer"
+	 icon="boardicons/chess_computer.png"
 	 difficulty="2"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="">
@@ -14,7 +14,6 @@
 	 <_prerequisite>Mouse-manipulation</_prerequisite>
 	 <_goal></_goal>
 	 <_manual></_manual>
-	 <_credit>The chess engine is from gnuchess.
-	 </_credit>
+	 <_credit>The chess engine is from gnuchess.</_credit>
   </Board>
 </GCompris>
diff --git a/boards/chess_movelearn.xml.in b/boards/chess_movelearn.xml.in
index b8378c2..da3e00f 100644
--- a/boards/chess_movelearn.xml.in
+++ b/boards/chess_movelearn.xml.in
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="chess_movelearn"
-	 type="chess" 
+	 type="chess"
 	 section="/strategy/chess"
-	 mode="movelearn" 
-	 icon="boardicons/chess_movelearn.png" 
+	 mode="movelearn"
+	 icon="boardicons/chess_movelearn.png"
 	 difficulty="2"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="">
@@ -14,7 +14,6 @@
 	 <_prerequisite>Mouse-manipulation</_prerequisite>
 	 <_goal></_goal>
 	 <_manual></_manual>
-	 <_credit>The chess engine is from gnuchess.
-	 </_credit>
+	 <_credit>The chess engine is from gnuchess.</_credit>
   </Board>
 </GCompris>
diff --git a/boards/chess_partyend.xml.in b/boards/chess_partyend.xml.in
index 3032a5c..60a5001 100644
--- a/boards/chess_partyend.xml.in
+++ b/boards/chess_partyend.xml.in
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="chess_partyend"
-	 type="chess" 
+	 type="chess"
 	 section="/strategy/chess"
-	 mode="partyend" 
-	 icon="boardicons/chess_partyend.png" 
+	 mode="partyend"
+	 icon="boardicons/chess_partyend.png"
 	 difficulty="2"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="">
@@ -14,7 +14,6 @@
 	 <_prerequisite>Mouse-manipulation</_prerequisite>
 	 <_goal></_goal>
 	 <_manual></_manual>
-	 <_credit>The chess engine is from gnuchess.
-	 </_credit>
+	 <_credit>The chess engine is from gnuchess.</_credit>
   </Board>
 </GCompris>
diff --git a/boards/chronos.xml.in b/boards/chronos.xml.in
index 495e45e..d363ea7 100644
--- a/boards/chronos.xml.in
+++ b/boards/chronos.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
-	 name="chronos" 
-	 type="shapegame" 
+  <Board
+	 name="chronos"
+	 type="shapegame"
 	 section="/discovery/miscelaneous"
-	 icon="boardicons/chronos.png" 
+	 icon="boardicons/chronos.png"
 	 mandatory_sound_file="sounds/chronos/space/1.ogg"
 	 difficulty="1"
 	 author="José Jorge (jjorge@free.fr)"
@@ -14,11 +14,7 @@
 	 <_manual>Pick from the pictures on the left and put them on the red dots</_manual>
 	 <_goal>Sort the pictures into the order that tells the story</_goal>
 	 <_prerequisite>Tell a short story</_prerequisite>
-	 <_credit>Moon photo is copyright NASA.
-The space sounds come from Tuxpaint and Vegastrike which are released under the GPL license.
-The transportation images are copyright Franck Doucet.
-Dates of Transportation are based on those found in &lt;http://www.wikipedia.org&gt;.
-</_credit>
+	 <_credit>Moon photo is copyright NASA. The space sounds come from Tuxpaint and Vegastrike which are released under the GPL license. The transportation images are copyright Franck Doucet. Dates of Transportation are based on those found in &lt;http://www.wikipedia.org&gt;.</_credit>
   </Board>
 </GCompris>
 
diff --git a/boards/connect4.xml.in b/boards/connect4.xml.in
index 1eb314c..86894dd 100644
--- a/boards/connect4.xml.in
+++ b/boards/connect4.xml.in
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
   <Board type="python:connect4"
-         section="/strategy" 
-	 name="connect4" 
-         icon="boardicons/connect4.png" 
-	 difficulty="2" 
-         boarddir="connect4" 
+         section="/strategy"
+	 name="connect4"
+         icon="boardicons/connect4.png"
+	 difficulty="2"
+         boarddir="connect4"
 	 author="Laurent Lacheny (laurent.lacheny@wanadoo.fr)">
          <_title>Connect 4</_title>
          <_description>Arrange four coins in a row</_description>
 	<_prerequisite>Mouse-manipulation</_prerequisite>
-	<_goal xml:space="preserve">Create a line of 4 pieces either horizontally (lying down)
-or vertically (standing up)</_goal>
+	<_goal>Create a line of 4 pieces either horizontally (lying down) or vertically (standing up)</_goal>
 	<_manual>Click anywhere in the line where you want to drop a piece</_manual>
         <_credit>Laurent Lacheny. Images and Artificial Intelligence taken from project 4stattack by Jeroen Vloothuis. The original project can be found on &lt;http://forcedattack.sourceforge.net&gt;</_credit>
   </Board>
diff --git a/boards/enumerate.xml.in b/boards/enumerate.xml.in
index d19530e..b51e6bd 100644
--- a/boards/enumerate.xml.in
+++ b/boards/enumerate.xml.in
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="enumerate"
-	 type="enumerate" 
+	 type="enumerate"
 	 section="/math/numeration"
-	 icon="boardicons/enumerate.png" 
+	 icon="boardicons/enumerate.png"
 	 difficulty="1"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)">
 	 <_title>Count the items</_title>
 	 <_description>Place the items in the best way to count them</_description>
 	<_goal>Numeration training</_goal>
 	<_prerequisite>Basic enumeration</_prerequisite>
-	<_manual>
-First, properly organize the items so that you can count them.
-Then, select the item you want to answer in the bottom right area.
-Enter the answer with the keyboard and press the OK button or 
-the 'Enter' key.</_manual>
+	<_manual>First, properly organize the items so that you can count them. Then, select the item you want to answer in the bottom right area. Enter the answer with the keyboard and press the OK button or the 'Enter' key.</_manual>
   </Board>
   <Data directory=""/>
 </GCompris>
diff --git a/boards/erase.xml.in b/boards/erase.xml.in
index c7812c8..5520d73 100644
--- a/boards/erase.xml.in
+++ b/boards/erase.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="erase"
 	 type="erase"
 	 section="/computer/mouse"
-	 icon="boardicons/erase.png" 
+	 icon="boardicons/erase.png"
 	 difficulty="1"
 	 mode="normal"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
@@ -13,9 +13,7 @@
 	 <_description>Move the mouse to erase the area and discover the background</_description>
 	<_prerequisite>Mouse-manipulation</_prerequisite>
 	<_goal>Motor-coordination</_goal>
-	 <_manual>
-Move the mouse until all the blocks disappear.
-	 </_manual>
+	 <_manual>Move the mouse until all the blocks disappear.</_manual>
 	 <_credit>Animal pictures are taken from the Animal Photography Page of Ralf Schmode (&lt;http://schmode.net/&gt;) and from LE BERRE Daniel. These people kindly gave GCompris the authorization to include their pictures. Thanks a lot, both of you.</_credit>
   </Board>
 </GCompris>
diff --git a/boards/erase_clic.xml.in b/boards/erase_clic.xml.in
index d65750f..253952d 100644
--- a/boards/erase_clic.xml.in
+++ b/boards/erase_clic.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="erase_clic"
 	 type="erase"
 	 section="/computer/mouse"
-	 icon="boardicons/erase_clic.png" 
+	 icon="boardicons/erase_clic.png"
 	 difficulty="1"
 	 mode="clic"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
@@ -14,7 +14,6 @@
 	<_prerequisite>Mouse-manipulation</_prerequisite>
 	<_goal>Motor-coordination</_goal>
 	 <_manual>Click the mouse on rectangles until all the blocks disappear.</_manual>
-	 <_credit>Animal pictures come from the Animal Photography Page of Ralf Schmode (http://schmode.net/). Ralf has kindly permitted Gcompris to include his pictures. Thanks a lot, Ralf.
-	 </_credit>
+	 <_credit>Animal pictures come from the Animal Photography Page of Ralf Schmode (http://schmode.net/). Ralf has kindly permitted Gcompris to include his pictures. Thanks a lot, Ralf.</_credit>
   </Board>
 </GCompris>
diff --git a/boards/erase_double_clic.xml.in b/boards/erase_double_clic.xml.in
index 4c1189c..1926070 100644
--- a/boards/erase_double_clic.xml.in
+++ b/boards/erase_double_clic.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="erase_double_clic"
 	 type="erase"
 	 section="/computer/mouse"
-	 icon="boardicons/erase_double_clic.png" 
+	 icon="boardicons/erase_double_clic.png"
 	 difficulty="2"
 	 mode="double_clic"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
@@ -14,7 +14,6 @@
 	<_prerequisite>Mouse-manipulation</_prerequisite>
 	<_goal>Motor-coordination</_goal>
 	 <_manual>Double-click the mouse on rectangles until all the blocks disappear.</_manual>
-	 <_credit>Animal pictures come from the Animal Photography Page of Ralf Schmode (http://schmode.net/). Ralf has kindly permitted Gcompris to include his pictures. Thanks a lot, Ralf.
-	 </_credit>
+	 <_credit>Animal pictures come from the Animal Photography Page of Ralf Schmode (http://schmode.net/). Ralf has kindly permitted Gcompris to include his pictures. Thanks a lot, Ralf.</_credit>
   </Board>
 </GCompris>
diff --git a/boards/fifteen.xml.in b/boards/fifteen.xml.in
index a83c3f7..811ac32 100644
--- a/boards/fifteen.xml.in
+++ b/boards/fifteen.xml.in
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="fifteen"
 	 type="fifteen"
 	 section="/puzzle"
-	 icon="boardicons/fifteen.png" 
+	 icon="boardicons/fifteen.png"
 	 difficulty="5"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="">
-  <keywords>
-    <_keyword>anticipate</_keyword>
-    <_keyword>move</_keyword>
-    <_keyword>slide</_keyword>
-    <_keyword>logical</_keyword>
-    <_keyword>Samuel Loyd</_keyword>
-    <_keyword>puzzle</_keyword>
-    <_keyword>taquin</_keyword>
-  </keywords>
 	 <_title>The fifteen game</_title>
 	 <_description>Move each item to make an increasing series: from the smallest to the largest</_description>
 	<_prerequisite>Mouse-manipulation</_prerequisite>
diff --git a/boards/gnumch-factors.xml.in b/boards/gnumch-factors.xml.in
index ce2649f..7e54388 100644
--- a/boards/gnumch-factors.xml.in
+++ b/boards/gnumch-factors.xml.in
@@ -13,7 +13,6 @@
          <_description>Guide the Number Muncher to all the factors of the number at the top of the screen.</_description>
          <_prerequisite></_prerequisite>
          <_goal>Learn about factors and multiples.</_goal>
-         <_manual>The factors of a number are all the numbers that divide that number evenly. For example, the factors of 6 are 1, 2, 3 and 6. 4 is not a factor of 6 because 6 cannot be divided into 4 equal pieces. If one number is a multiple of a second number, then the second number is a factor of the first number. You can think of multiples as families, and factors are the people in those families. So 1, 2, 3 and 6 all fit into the 6 family, but 4 belongs to another family.
-Use the arrow keys to navigate around the board and to avoid the Troggles. Press the spacebar to eat a number.</_manual>
+         <_manual>The factors of a number are all the numbers that divide that number evenly. For example, the factors of 6 are 1, 2, 3 and 6. 4 is not a factor of 6 because 6 cannot be divided into 4 equal pieces. If one number is a multiple of a second number, then the second number is a factor of the first number. You can think of multiples as families, and factors are the people in those families. So 1, 2, 3 and 6 all fit into the 6 family, but 4 belongs to another family. Use the arrow keys to navigate around the board and to avoid the Troggles. Press the spacebar to eat a number.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/hanoi_real.xml.in b/boards/hanoi_real.xml.in
index eaa6bce..e524e05 100644
--- a/boards/hanoi_real.xml.in
+++ b/boards/hanoi_real.xml.in
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="hanoi_real"
 	 type="hanoi_real"
 	 section="/puzzle"
-	 icon="boardicons/hanoi_real.png" 
+	 icon="boardicons/hanoi_real.png"
 	 difficulty="3"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="">
 	 <_title>The Tower of Hanoi</_title>
 	 <_description>Reproduce the tower on the right side</_description>
 	<_prerequisite>Mouse manipulation</_prerequisite>
-	<_goal>The object of the game is to move the entire stack to another peg, obeying the following rules:
-	* only one disc may be moved at a time
-	* no disc may be placed atop a smaller disc</_goal>
+	<_goal xml:space="preserve">The object of the game is to move the entire stack to another peg, obeying the following rules:
+* only one disc may be moved at a time
+* no disc may be placed atop a smaller disc</_goal>
 	<_manual>Drag and Drop the top pieces only from one peg to another, to reproduce the tower on the right in the empty space on the left.</_manual>
 	 <_credit>The puzzle was invented by the French mathematician Edouard Lucas in 1883. There is a legend about a Hindu temple whose priests were constantly engaged in moving a set of 64 discs according to the rules of the Tower of Hanoi puzzle. According to the legend, the world would end when the priests finished their work. The puzzle is therefore also known as the Tower of Brahma puzzle. It is not clear whether Lucas invented this legend or was inspired by it. (source Wikipedia &lt;http://en.wikipedia.org/wiki/Tower_of_hanoi&gt;)
 	 </_credit>
diff --git a/boards/imageid.xml.in b/boards/imageid.xml.in
index 69ad499..ab9a05b 100644
--- a/boards/imageid.xml.in
+++ b/boards/imageid.xml.in
@@ -10,7 +10,7 @@
 	 boarddir="imageid">
 	 <_title>Reading practice</_title>
 	 <_description>Practice reading by finding the word matching an image</_description>
- <_prerequisite>Reading</_prerequisite>
+	 <_prerequisite>Reading</_prerequisite>
 	<_manual>Click on the word corresponding to the printed image.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/leftright.xml.in b/boards/leftright.xml.in
index f08944b..871e362 100644
--- a/boards/leftright.xml.in
+++ b/boards/leftright.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="leftright"
 	 type="leftright"
 	 section="/discovery/miscelaneous"
@@ -10,8 +10,7 @@
 	 boarddir="leftright">
 	 <_title>Find your left and right hands</_title>
 	 <_description>Determine if a hand is a right or a left hand</_description>
-	<_goal>Distinguish right and left hands from different points of view.
-Spatial representation</_goal>
+	<_goal>Distinguish right and left hands from different points of view. Spatial representation</_goal>
 	<_prerequisite>None</_prerequisite>
 	<_manual>You can see a hand: is it a left hand or a right hand? Click on the red button on the left, or the green button on the right.</_manual>
   </Board>
diff --git a/boards/magic_hat_plus.xml.in b/boards/magic_hat_plus.xml.in
index eae0efc..29a7939 100644
--- a/boards/magic_hat_plus.xml.in
+++ b/boards/magic_hat_plus.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="magic_hat_plus"
 	 type="magic_hat"
 	 section="/math/numeration"
-	 icon="boardicons/magic_hat_plus.png" 
+	 icon="boardicons/magic_hat_plus.png"
 	 difficulty="2"
 	 mode="plus"
 	 author="Marc BRUN"
@@ -13,9 +13,7 @@
 	 <_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 or close it. Under the hat, how many stars  
-can you see moving around? Count carefully. :) Click in the bottom- 
-right area to input your answer.</_manual>
+	 <_manual>Click on the hat to open or close it. Under the hat, how many stars can you see moving around? Count carefully. :) Click in the bottom-right area to input your answer.</_manual>
 	 <_credit></_credit>
   </Board>
 </GCompris>
diff --git a/boards/melody.xml.in b/boards/melody.xml.in
index 7c39fc8..ea6ffb9 100644
--- a/boards/melody.xml.in
+++ b/boards/melody.xml.in
@@ -13,8 +13,6 @@
 	 <_description>Repeat a melody</_description>
 	<_prerequisite>Move and click the mouse</_prerequisite>
 	<_goal>Ear-training activity</_goal>
-	<_manual>Listen to the sound sequence played,
-and repeat it by clicking on the elements.
-You can listen again by clicking on the repeat button.</_manual>
+	<_manual>Listen to the sound sequence played, and repeat it by clicking on the elements. You can listen again by clicking on the repeat button.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/missing_letter.xml.in b/boards/missing_letter.xml.in
index 7a48f39..92f73c4 100644
--- a/boards/missing_letter.xml.in
+++ b/boards/missing_letter.xml.in
@@ -12,8 +12,6 @@
 	 <_description>Fill in the missing letter</_description>
 	<_prerequisite>Word reading</_prerequisite>
 	<_goal>Training reading skills</_goal>
-	<_manual>An object is displayed in the main area, and an
-incomplete word is printed under the picture. Select the missing
-letter to complete the word.</_manual>
+	<_manual>An object is displayed in the main area, and an incomplete word is printed under the picture. Select the missing letter to complete the word.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/money.xml.in b/boards/money.xml.in
index 499db45..9e2addb 100644
--- a/boards/money.xml.in
+++ b/boards/money.xml.in
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="money"
-	 type="money" 
+	 type="money"
 	 section="/math/numeration"
-	 icon="boardicons/money.png" 
+	 icon="boardicons/money.png"
 	 difficulty="2"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="">
 	 <_title>Money</_title>
 	 <_description>Practice money usage</_description>
-	<_prerequisite>Can count</_prerequisite>
-	<_goal>You must buy the different items and give the exact price.
-At higher levels, several items are displayed, and you must first calculate the
-total price.</_goal>
+	 <_prerequisite>Can count</_prerequisite>
+	 <_goal>You must buy the different items and give the exact price. At higher levels, several items are displayed, and you must first calculate the total price.</_goal>
 	 <_manual>Click on the coins or paper money at the bottom of the screen to pay. If you want to remove a coin or note, click on it on the upper screen area.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/money_cents.xml.in b/boards/money_cents.xml.in
index 178dcd6..093ef97 100644
--- a/boards/money_cents.xml.in
+++ b/boards/money_cents.xml.in
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="money_cents"
-	 type="money" 
+	 type="money"
 	 section="/math/numeration"
-	 icon="boardicons/money_cents.png" 
-	 mode="WITH_CENTS" 
+	 icon="boardicons/money_cents.png"
+	 mode="WITH_CENTS"
 	 difficulty="3"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="">
 	 <_title>Money</_title>
 	 <_description>Practice money usage including cents</_description>
-	<_prerequisite>Can count</_prerequisite>
-	<_goal>You must buy the different items and give the exact price.
-At higher levels, several items are displayed, and you must first calculate the
-total price.</_goal>
+	 <_prerequisite>Can count</_prerequisite>
+	 <_goal>You must buy the different items and give the exact price. At higher levels, several items are displayed, and you must first calculate the total price.</_goal>
 	 <_manual>Click on the coins or paper money at the bottom of the screen to pay. If you want to remove a coin or note, click on it on the upper screen area.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/paintings.xml.in b/boards/paintings.xml.in
index d51230d..2ad62f8 100644
--- a/boards/paintings.xml.in
+++ b/boards/paintings.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="paintings"
-	 type="shapegame" 
+	 type="shapegame"
 	 section="/puzzle"
-	 icon="boardicons/shapegame.png" 
+	 icon="boardicons/shapegame.png"
 	 difficulty="1"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="paintings">
@@ -12,7 +12,6 @@
 	 <_description>Drag and Drop the items to rebuild the original paintings</_description>
 	<_prerequisite>Mouse-manipulation: movement, drag and drop</_prerequisite>
 	<_goal>Spatial representation</_goal>
-	<_manual>Drag the image parts from the box on the left to
-create a painting on the main board.</_manual>
+	<_manual>Drag the image parts from the box on the left to create a painting on the main board.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/paratrooper.xml.in b/boards/paratrooper.xml.in
index 4e44a7c..b06bab1 100644
--- a/boards/paratrooper.xml.in
+++ b/boards/paratrooper.xml.in
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="paratrooper"
-	 type="paratrooper" 
+	 type="paratrooper"
 	 section="/experience"
-	 icon="boardicons/tuxpara.png" 
+	 icon="boardicons/tuxpara.png"
 	 difficulty="1"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)">
 	 <_title>Parachutist</_title>
 	 <_description>Help Tux the parachutist land safely</_description>
 	 <_prerequisite>This board is game-oriented. No specific skills are needed to play.</_prerequisite>
 	 <_goal>In this game, Tux the parachutist needs help to land safely on the fishing boat. He needs to allow for the wind direction and speed.</_goal>
-	 <_manual>Hit any key or click on the plane to make Tux jump. Hit another key
-or click on Tux to open the parachute.</_manual>
+	 <_manual>Hit any key or click on the plane to make Tux jump. Hit another key or click on Tux to open the parachute.</_manual>
   </Board>
   <Data directory=""/>
 </GCompris>
diff --git a/boards/redraw.xml.in b/boards/redraw.xml.in
index bbe6306..0323e69 100644
--- a/boards/redraw.xml.in
+++ b/boards/redraw.xml.in
@@ -10,11 +10,9 @@
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="">
 	 <_title>Redraw the given item</_title>
-	 <_description>Copy a drawing from the box on the right
-into the box on the left.</_description>
+	 <_description>Copy a drawing from the box on the right into the box on the left.</_description>
 	<_prerequisite></_prerequisite>
-	<_goal>Copy a drawing from the box on the right
-into the box on the left.</_goal>
+	<_goal>Copy a drawing from the box on the right into the box on the left.</_goal>
 	<_manual>First, select the proper tool from the toolbar. Then drag the mouse to create objects. When you are done, click on the OK button. Errors will be marked with a little red cross. The order of objects (above/under) is not important but be careful not to end up with unwanted objects under others.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/redraw_symmetrical.xml.in b/boards/redraw_symmetrical.xml.in
index 54846e4..fc65843 100644
--- a/boards/redraw_symmetrical.xml.in
+++ b/boards/redraw_symmetrical.xml.in
@@ -12,8 +12,7 @@
 	 <_title>Mirror the given item</_title>
 	 <_description>Copy the mirror image of an object from the box on the right into the box on the left.</_description>
 	<_prerequisite></_prerequisite>
-	 <_goal>Copy the mirror image of an object from the box
-on the right into the box on the left.</_goal>
+	 <_goal>Copy the mirror image of an object from the box on the right into the box on the left.</_goal>
 	<_manual>First, select the proper tool from the toolbar. Then drag the mouse to create objects. When you are done, click on the OK button. A little red cross will show you where something isn't right yet. The order of objects (above/under) is not important but be careful not to end up with unwanted objects under others.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/scalesboard.xml.in b/boards/scalesboard.xml.in
index 3152747..a8743b7 100644
--- a/boards/scalesboard.xml.in
+++ b/boards/scalesboard.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="scalesboard"
-	 type="shapegame" 
+	 type="shapegame"
 	 section="/math/algebramenu"
-	 icon="boardicons/scalesicon.png" 
+	 icon="boardicons/scalesicon.png"
 	 difficulty="2"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="scales">
@@ -12,9 +12,7 @@
 	 <_description>Drag and Drop masses to balance the scales</_description>
 	<_goal>Mental calculation, arithmetic equality</_goal>
 	<_prerequisite></_prerequisite>
-	<_manual>To balance the scales, move the masses on the left side.
-The masses can be arranged in any order.
-</_manual>
+	<_manual>To balance the scales, move the masses on the left side. The masses can be arranged in any order.</_manual>
 	<_credit>The painting is an original painting created by Virginie MOREAU (virginie.moreau@free.fr) in 2001. Its name is 'Spices Seller in Egypt'. It is released under the GPL licence.</_credit>
   </Board>
 </GCompris>
diff --git a/boards/searace1player.xml.in b/boards/searace1player.xml.in
index f075074..a92dbf0 100644
--- a/boards/searace1player.xml.in
+++ b/boards/searace1player.xml.in
@@ -10,8 +10,7 @@
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="searace">
 	 <_title>Sea race (Single Player)</_title>
-	 <_description>Give good instructions to your ship in order to be first
-in the race.</_description>
+	 <_description>Give good instructions to your ship in order to be first in the race.</_description>
 	<_prerequisite></_prerequisite>
 	<_goal>In this activity, you will learn how to enter commands into a computer. Even if the language is extremely basic, you learn here how to think ahead and construct a program. This activity can be used to introduce the programming concept to children.</_goal>
 	<_manual>In the text entry, enter one command per line, to control your boat. Commands supported are displayed between the two entry areas. The 'left' and 'right' commands must be followed by an angle in degrees. The angle value is also called a 'parameter' to the left or right command. By default 45 degrees is used. The 'forward' command accepts a distance parameter. By default 1 is used. For example: left 90 => Make a perpendicular left turn forward 10 => Go forward for 10 units (as displayed on the ruler). The goal is to reach the right of the screen (the red line). When done, you can try to improve your program and start a new race with the same weather conditions by using the retry button. You can click and drag your mouse anywhere on the map to get a measurement in distance and angle. Going to the next level will give you more complex weather conditions.</_manual>
diff --git a/boards/sudoku.xml.in b/boards/sudoku.xml.in
index a6bac78..831489b 100644
--- a/boards/sudoku.xml.in
+++ b/boards/sudoku.xml.in
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="sudoku"
-	 type="python:sudoku" 
+	 type="python:sudoku"
 	 section="/puzzle"
-	 icon="boardicons/sudoku.png" 
+	 icon="boardicons/sudoku.png"
 	 difficulty="4"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="">
 	 <_title>Sudoku, place unique symbols in a square.</_title>
-	 <_description>Symbols must be unique in a row,
-in a column, and (if defined) each region.</_description>
+	 <_description>Symbols must be unique in a row, in a column, and (if defined) each region.</_description>
 	<_prerequisite>Completing the puzzle requires patience and logical ability</_prerequisite>
 	<_goal>The aim of the puzzle is to enter a symbol or numeral from 1 through 9 in each cell of a grid, most frequently a 9x9 grid made up of 3x3 subgrids (called 'regions'), starting with various symbols or numerals given in some cells (the 'givens'). Each row, column and region must contain only one instance of each symbol or numeral (Source &lt;http://en.wikipedia.org/wiki/Sudoku&gt;).</_goal>
-	 <_manual>For the first level with colored symbols, drag symbols on the left to their target position.
-For the higher levels, click on an empty square to give it the keyboard focus. Then enter a possible letter or number. GCompris will not let you enter invalid data.
-	 </_manual>
+	 <_manual>For the first level with colored symbols, drag symbols on the left to their target position. For the higher levels, click on an empty square to give it the keyboard focus. Then enter a possible letter or number. GCompris will not let you enter invalid data.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/superbrain.xml.in b/boards/superbrain.xml.in
index 9e60a15..fecfb3a 100644
--- a/boards/superbrain.xml.in
+++ b/boards/superbrain.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="superbrain"
-	 type="superbrain" 
+	 type="superbrain"
 	 section="/puzzle"
-	 icon="boardicons/superbrain.png" 
+	 icon="boardicons/superbrain.png"
 	 difficulty="2"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="">
@@ -12,12 +12,6 @@
 	 <_description>Tux has hidden several items. Find them again in the correct order</_description>
 	<_prerequisite></_prerequisite>
 	<_goal>Tux has hidden several items. Find them again in the correct order</_goal>
-	 <_manual>
-Click on the items until you find what you think is the correct answer.
-Then, click on the OK button in the control bar.
-In the lower levels, Tux gives you an indication if you found a hiding place
-by marking the item with a black box.
-You can use the right mouse button to flip the colors in the opposite order.
-	 </_manual>
+	 <_manual>Click on the items until you find what you think is the correct answer. Then, click on the OK button in the control bar. In the lower levels, Tux gives you an indication if you found a hiding place by marking the item with a black box. You can use the right mouse button to flip the colors in the opposite order.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/target.xml.in b/boards/target.xml.in
index 4e6972f..ee17cf1 100644
--- a/boards/target.xml.in
+++ b/boards/target.xml.in
@@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="target"
-	 type="target" 
+	 type="target"
 	 section="/math/algebramenu"
-	 mode="" 
+	 mode=""
 	 difficulty="2"
-	 icon="boardicons/target.png" 
+	 icon="boardicons/target.png"
 	 author="Bruno Coudoin (bruno.coudoin@free.fr)"
 	 boarddir="target">
 	 <_title>Practice addition with a target game</_title>
 	 <_description>Hit the target and count your points</_description>
-	<_prerequisite>Can move the mouse, can read numbers and count 
-up to 15 for the first level</_prerequisite>
+	<_prerequisite>Can move the mouse, can read numbers and count up to 15 for the first level</_prerequisite>
 	<_goal>Throw darts at a target and count your score.</_goal>
-	<_manual>Check the wind speed and direction, and
-then click on the target to launch a dart.
-When you all your darts are thrown, a window appears asking you to count
-your score. Enter the score with the keyboard then press
-the Enter key or the OK button.</_manual>
+	<_manual>Check the wind speed and direction, and then click on the target to launch a dart. When you all your darts are thrown, a window appears asking you to count your score. Enter the score with the keyboard then press the Enter key or the OK button.</_manual>
   </Board>
 </GCompris>
diff --git a/boards/watercycle.xml.in b/boards/watercycle.xml.in
index 8cffc72..2bab6d4 100644
--- a/boards/watercycle.xml.in
+++ b/boards/watercycle.xml.in
@@ -12,8 +12,6 @@
 	 <_description>Tux has come back from a long fishing party on his boat. Bring the water system back up so he can take a shower.</_description>
 	<_prerequisite></_prerequisite>
 	<_goal>Learn the water cycle</_goal>
-	<_manual>Click on different active elements : sun, cloud, water pump station,
-and water cleanup station, in order to reactivate the entire water system.
-When the system is back up and Tux is in the shower, push the shower button for him.</_manual>
+	<_manual>Click on different active elements : sun, cloud, water pump station, and water cleanup station, in order to reactivate the entire water system. When the system is back up and Tux is in the shower, push the shower button for him.</_manual>
   </Board>
 </GCompris>
diff --git a/src/boards/chess.c b/src/boards/chess.c
index 76e974b..8bb8625 100644
--- a/src/boards/chess.c
+++ b/src/boards/chess.c
@@ -180,7 +180,7 @@ static void pause_board (gboolean pause)
 void gnuchess_died(int signum)
 {
   gnuchess_pid = 0;
-  gc_dialog(_("Error: The external program gnuchess died unexpectingly"), gc_board_stop);
+  gc_dialog(_("Error: The external program gnuchess died unexpectedly"), gc_board_stop);
 }
 
 /*
@@ -195,7 +195,7 @@ static void start_board (GcomprisBoard *agcomprisBoard)
   signal(SIGPIPE, gnuchess_died);
   if (!g_file_test (GNUCHESS, G_FILE_TEST_EXISTS))
     {
-    gc_dialog(_("Error: The external program gnuchess is mandatory\nto play chess in gcompris.\n"
+    gc_dialog(_("Error: The external program gnuchess is required\nto play chess in gcompris.\n"
 		"Find this program on http://www.rpmfind.net or in your\nGNU/Linux distribution\n"
 		"And check it is located here: "GNUCHESS),
 	      gc_board_stop);
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index 270eb1e..8bafc6b 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -220,7 +220,7 @@ static struct poptOption options[] = {
       " Data are always taken from the web server."), NULL},
 
   {"cache-dir", '\0', POPT_ARG_STRING, &popt_cache_dir, 0,
-   N_("In server mode, where is the cache directory to avoid useless downloads."), NULL},
+   N_("In server mode, specify the cache directory used to avoid useless downloads."), NULL},
 
 #ifndef WIN32	/* Not supported on windows */
   POPT_AUTOHELP