- Fixed africa maps. Removed too tiny country in the whole africa map. Fixed missing

	  country pixmaps. Closes sourceforge GCompris bug#1538043.

	- Added -Werror as a global option. Fixed all warnings. I may have introduced bugs during this
	  process.

	- click_on_letter: re-added the spoken instruction click on the letter
	- algebra: re-added the spoken numbers.

18 files changed, 11 insertions, 34 deletions

diff --git a/boards/geography/africa/angola.png b/boards/geography/africa/angola.png
index 319de99..98e7438 100644
--- a/boards/geography/africa/angola.png
+++ b/boards/geography/africa/angola.png
diff --git a/boards/geography/africa/eritrea.png b/boards/geography/africa/eritrea.png
new file mode 100644
index 0000000..6029dda
--- /dev/null
+++ b/boards/geography/africa/eritrea.png
diff --git a/boards/geography/africa/ethiopia.png b/boards/geography/africa/ethiopia.png
index 1cb87b7..3853af1 100644
--- a/boards/geography/africa/ethiopia.png
+++ b/boards/geography/africa/ethiopia.png
diff --git a/boards/geography/africa/north_africa.png b/boards/geography/africa/north_africa.png
index 9dd7411..350b5e2 100644
--- a/boards/geography/africa/north_africa.png
+++ b/boards/geography/africa/north_africa.png
diff --git a/boards/geography/africa/north_africa.xcf b/boards/geography/africa/north_africa.xcf
deleted file mode 100644
index d738c66..0000000
--- a/boards/geography/africa/north_africa.xcf
+++ /dev/null
diff --git a/boards/geography/africa/sudan.png b/boards/geography/africa/sudan.png
index 358161f..48a0bac 100644
--- a/boards/geography/africa/sudan.png
+++ b/boards/geography/africa/sudan.png
diff --git a/boards/geography/afrique/africa.png b/boards/geography/afrique/africa.png
index b3411d2..e2d97c3 100644
--- a/boards/geography/afrique/africa.png
+++ b/boards/geography/afrique/africa.png
diff --git a/boards/geography/afrique/burundi.png b/boards/geography/afrique/burundi.png
deleted file mode 100644
index 0b14e90..0000000
--- a/boards/geography/afrique/burundi.png
+++ /dev/null
diff --git a/boards/geography/afrique/djibouti.png b/boards/geography/afrique/djibouti.png
deleted file mode 100644
index a73ebac..0000000
--- a/boards/geography/afrique/djibouti.png
+++ /dev/null
diff --git a/boards/geography/afrique/equatorial_guinea.png b/boards/geography/afrique/equatorial_guinea.png
deleted file mode 100644
index fa09139..0000000
--- a/boards/geography/afrique/equatorial_guinea.png
+++ /dev/null
diff --git a/boards/geography/afrique/gambia.png b/boards/geography/afrique/gambia.png
deleted file mode 100644
index 8b0a66a..0000000
--- a/boards/geography/afrique/gambia.png
+++ /dev/null
diff --git a/boards/geography/afrique/guinea_bissau.png b/boards/geography/afrique/guinea_bissau.png
deleted file mode 100644
index 2b4dd8c..0000000
--- a/boards/geography/afrique/guinea_bissau.png
+++ /dev/null
diff --git a/boards/geography/afrique/lesotho.png b/boards/geography/afrique/lesotho.png
deleted file mode 100644
index 0858e51..0000000
--- a/boards/geography/afrique/lesotho.png
+++ /dev/null
diff --git a/boards/geography/afrique/rwanda.png b/boards/geography/afrique/rwanda.png
deleted file mode 100644
index 51237c3..0000000
--- a/boards/geography/afrique/rwanda.png
+++ /dev/null
diff --git a/boards/geography/afrique/sierra_leone.png b/boards/geography/afrique/sierra_leone.png
deleted file mode 100644
index 0e0e8a9..0000000
--- a/boards/geography/afrique/sierra_leone.png
+++ /dev/null
diff --git a/boards/geography/afrique/swaziland.png b/boards/geography/afrique/swaziland.png
deleted file mode 100644
index 6a0011a..0000000
--- a/boards/geography/afrique/swaziland.png
+++ /dev/null
diff --git a/boards/geography/board4_0.xml.in b/boards/geography/board4_0.xml.in
index 452c659..9279c7d 100644
--- a/boards/geography/board4_0.xml.in
+++ b/boards/geography/board4_0.xml.in
@@ -41,10 +41,14 @@
 	<_tooltip>Equatorial Guinea</_tooltip>
 </Shape>
 
-<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="sounds/$LOCALE/geography/africa/ethiopia.ogg" x="662" y="338" position="0">
+<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="sounds/$LOCALE/geography/africa/ethiopia.ogg" x="662" y="356" position="0">
 	<_tooltip>Ethiopia</_tooltip>
 </Shape>
 
+<Shape name="erytrea" pixmapfile="geography/africa/eritrea.png" sound="sounds/$LOCALE/geography/eritrea.ogg" x="655" y="293" zoomx="1" zoomy="1" position="0">
+<_tooltip>Eritrea</_tooltip>
+</Shape>
+
 <Shape name="K" pixmapfile="geography/africa/gabon.png" sound="sounds/$LOCALE/geography/africa/gabon.ogg" x="388" y="462" position="0">
 	<_tooltip>Gabon</_tooltip>
 </Shape>
diff --git a/boards/geography/board4_2.xml.in b/boards/geography/board4_2.xml.in
index c011231..1dffee9 100644
--- a/boards/geography/board4_2.xml.in
+++ b/boards/geography/board4_2.xml.in
@@ -20,9 +20,6 @@
 <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="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="sounds/$LOCALE/geography/cameroon.ogg" x="455" y="223" zoomx="1" zoomy="1" position="0">
 <_tooltip>Cameroon</_tooltip>
 </Shape>
@@ -32,9 +29,6 @@
 <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="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="sounds/$LOCALE/geography/egypt.ogg" x="558" y="84" zoomx="1" zoomy="1" position="0">
 <_tooltip>Egypt</_tooltip>
 </Shape>
@@ -47,31 +41,19 @@
 <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="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="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="sounds/$LOCALE/geography/guinee.ogg" x="307" y="200" zoomx="1" zoomy="1" position="0">
+<Shape name="guinee" pixmapfile="geography/afrique/guinea.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="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="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="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="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="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="sounds/$LOCALE/geography/libya.ogg" x="481" y="85" zoomx="1" zoomy="1" position="0">
+<Shape name="libye" pixmapfile="geography/afrique/libya.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="sounds/$LOCALE/geography/madagascar.ogg" x="662" y="402" zoomx="1" zoomy="1" position="0">
@@ -83,7 +65,7 @@
 <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="sounds/$LOCALE/geography/moroco.ogg" x="321" y="69" zoomx="1" zoomy="1" position="0">
+<Shape name="maroc" pixmapfile="geography/afrique/moroco.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="sounds/$LOCALE/geography/mauritania.ogg" x="309" y="124" zoomx="1" zoomy="1" position="0">
@@ -92,7 +74,7 @@
 <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="sounds/$LOCALE/geography/namibia.ogg" x="487" y="432" zoomx="1" zoomy="1" position="0">
+<Shape name="namibie" pixmapfile="geography/afrique/namibia.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="sounds/$LOCALE/geography/niger.ogg" x="426" y="147" zoomx="1" zoomy="1" position="0">
@@ -110,20 +92,14 @@
 <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="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="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="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="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="sounds/$LOCALE/geography/mali.ogg" x="561" y="179" zoomx="1" zoomy="1" position="0">
-<_tooltip>Mali</_tooltip>
+<Shape name="soudan" pixmapfile="geography/afrique/soudan.png" sound="sounds/$LOCALE/geography/soudan.ogg" x="561" y="179" zoomx="1" zoomy="1" position="0">
+<_tooltip>Soudan</_tooltip>
 </Shape>
 <Shape name="tanzanie" pixmapfile="geography/afrique/tanzania.png" sound="sounds/$LOCALE/geography/tanzania.ogg" x="592" y="315" zoomx="1" zoomy="1" position="0">
 <_tooltip>Tanzania</_tooltip>
@@ -143,7 +119,4 @@
 <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="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>