MERGE gcompris_7-4 UNTESTED

MERGE gcompris_7-4
UNTESTED

35 files changed, 25 insertions, 1 deletions

diff --git a/boards/geography/Makefile.am b/boards/geography/Makefile.am
index 04631c8..2158bb7 100644
--- a/boards/geography/Makefile.am
+++ b/boards/geography/Makefile.am
@@ -10,7 +10,8 @@ xml_in_files = \
 	board4_0.xml.in \
 	board4_1.xml.in \
 	board4_2.xml.in \
-	board5_0.xml.in
+	board5_0.xml.in \
+	board6_0.xml.in
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
diff --git a/boards/geography/board6_0.xml.in b/boards/geography/board6_0.xml.in
new file mode 100644
index 0000000..e883a9a
--- /dev/null
+++ b/boards/geography/board6_0.xml.in
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ShapeGame>
+  <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="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/geography/germany_region/back.png b/boards/geography/germany_region/back.png
new file mode 100644
index 0000000..0f04112
--- /dev/null
+++ b/boards/geography/germany_region/back.png
diff --git a/boards/geography/germany_region/baden-wuerttemberg.png b/boards/geography/germany_region/baden-wuerttemberg.png
new file mode 100644
index 0000000..b7e3655
--- /dev/null
+++ b/boards/geography/germany_region/baden-wuerttemberg.png
diff --git a/boards/geography/germany_region/bayern.png b/boards/geography/germany_region/bayern.png
new file mode 100644
index 0000000..3d8ac57
--- /dev/null
+++ b/boards/geography/germany_region/bayern.png
diff --git a/boards/geography/germany_region/berlin.png b/boards/geography/germany_region/berlin.png
new file mode 100644
index 0000000..3d6e583
--- /dev/null
+++ b/boards/geography/germany_region/berlin.png
diff --git a/boards/geography/germany_region/brandenburg.png b/boards/geography/germany_region/brandenburg.png
new file mode 100644
index 0000000..5ca64f4
--- /dev/null
+++ b/boards/geography/germany_region/brandenburg.png
diff --git a/boards/geography/germany_region/bremen.png b/boards/geography/germany_region/bremen.png
new file mode 100644
index 0000000..a5b5538
--- /dev/null
+++ b/boards/geography/germany_region/bremen.png
diff --git a/boards/geography/germany_region/hamburg.png b/boards/geography/germany_region/hamburg.png
new file mode 100644
index 0000000..786b692
--- /dev/null
+++ b/boards/geography/germany_region/hamburg.png
diff --git a/boards/geography/germany_region/hessen.png b/boards/geography/germany_region/hessen.png
new file mode 100644
index 0000000..5b65cff
--- /dev/null
+++ b/boards/geography/germany_region/hessen.png
diff --git a/boards/geography/germany_region/mecklenburg-vorpommern.png b/boards/geography/germany_region/mecklenburg-vorpommern.png
new file mode 100644
index 0000000..9715939
--- /dev/null
+++ b/boards/geography/germany_region/mecklenburg-vorpommern.png
diff --git a/boards/geography/germany_region/niedersachsen.png b/boards/geography/germany_region/niedersachsen.png
new file mode 100644
index 0000000..f2d9291
--- /dev/null
+++ b/boards/geography/germany_region/niedersachsen.png
diff --git a/boards/geography/germany_region/nordrhein-westfalen.png b/boards/geography/germany_region/nordrhein-westfalen.png
new file mode 100644
index 0000000..bf7cb1f
--- /dev/null
+++ b/boards/geography/germany_region/nordrhein-westfalen.png
diff --git a/boards/geography/germany_region/rheinland-pfalz.png b/boards/geography/germany_region/rheinland-pfalz.png
new file mode 100644
index 0000000..28b5c70
--- /dev/null
+++ b/boards/geography/germany_region/rheinland-pfalz.png
diff --git a/boards/geography/germany_region/saarland.png b/boards/geography/germany_region/saarland.png
new file mode 100644
index 0000000..9b8ba42
--- /dev/null
+++ b/boards/geography/germany_region/saarland.png
diff --git a/boards/geography/germany_region/sachsen-anhalt.png b/boards/geography/germany_region/sachsen-anhalt.png
new file mode 100644
index 0000000..ee18f2e
--- /dev/null
+++ b/boards/geography/germany_region/sachsen-anhalt.png
diff --git a/boards/geography/germany_region/sachsen.png b/boards/geography/germany_region/sachsen.png
new file mode 100644
index 0000000..7b63f3d
--- /dev/null
+++ b/boards/geography/germany_region/sachsen.png
diff --git a/boards/geography/germany_region/schleswig_holstein.png b/boards/geography/germany_region/schleswig_holstein.png
new file mode 100644
index 0000000..9e1ee61
--- /dev/null
+++ b/boards/geography/germany_region/schleswig_holstein.png
diff --git a/boards/geography/germany_region/target_baden-wuerttemberg.png b/boards/geography/germany_region/target_baden-wuerttemberg.png
new file mode 100644
index 0000000..3b44695
--- /dev/null
+++ b/boards/geography/germany_region/target_baden-wuerttemberg.png
diff --git a/boards/geography/germany_region/target_bayern.png b/boards/geography/germany_region/target_bayern.png
new file mode 100644
index 0000000..92da698
--- /dev/null
+++ b/boards/geography/germany_region/target_bayern.png
diff --git a/boards/geography/germany_region/target_berlin.png b/boards/geography/germany_region/target_berlin.png
new file mode 100644
index 0000000..bbcbc1f
--- /dev/null
+++ b/boards/geography/germany_region/target_berlin.png
diff --git a/boards/geography/germany_region/target_brandenburg.png b/boards/geography/germany_region/target_brandenburg.png
new file mode 100644
index 0000000..bce5bff
--- /dev/null
+++ b/boards/geography/germany_region/target_brandenburg.png
diff --git a/boards/geography/germany_region/target_bremen.png b/boards/geography/germany_region/target_bremen.png
new file mode 100644
index 0000000..e15957a
--- /dev/null
+++ b/boards/geography/germany_region/target_bremen.png
diff --git a/boards/geography/germany_region/target_hamburg.png b/boards/geography/germany_region/target_hamburg.png
new file mode 100644
index 0000000..6759e88
--- /dev/null
+++ b/boards/geography/germany_region/target_hamburg.png
diff --git a/boards/geography/germany_region/target_hessen.png b/boards/geography/germany_region/target_hessen.png
new file mode 100644
index 0000000..dbddb77
--- /dev/null
+++ b/boards/geography/germany_region/target_hessen.png
diff --git a/boards/geography/germany_region/target_mecklenburg-vorpommern.png b/boards/geography/germany_region/target_mecklenburg-vorpommern.png
new file mode 100644
index 0000000..766550d
--- /dev/null
+++ b/boards/geography/germany_region/target_mecklenburg-vorpommern.png
diff --git a/boards/geography/germany_region/target_niedersachsen.png b/boards/geography/germany_region/target_niedersachsen.png
new file mode 100644
index 0000000..c865066
--- /dev/null
+++ b/boards/geography/germany_region/target_niedersachsen.png
diff --git a/boards/geography/germany_region/target_nordrhein-westfalen.png b/boards/geography/germany_region/target_nordrhein-westfalen.png
new file mode 100644
index 0000000..5f1cec0
--- /dev/null
+++ b/boards/geography/germany_region/target_nordrhein-westfalen.png
diff --git a/boards/geography/germany_region/target_rheinland-pfalz.png b/boards/geography/germany_region/target_rheinland-pfalz.png
new file mode 100644
index 0000000..248002f
--- /dev/null
+++ b/boards/geography/germany_region/target_rheinland-pfalz.png
diff --git a/boards/geography/germany_region/target_saarland.png b/boards/geography/germany_region/target_saarland.png
new file mode 100644
index 0000000..ad46e5d
--- /dev/null
+++ b/boards/geography/germany_region/target_saarland.png
diff --git a/boards/geography/germany_region/target_sachsen-anhalt.png b/boards/geography/germany_region/target_sachsen-anhalt.png
new file mode 100644
index 0000000..0b76de1
--- /dev/null
+++ b/boards/geography/germany_region/target_sachsen-anhalt.png
diff --git a/boards/geography/germany_region/target_sachsen.png b/boards/geography/germany_region/target_sachsen.png
new file mode 100644
index 0000000..678d1d1
--- /dev/null
+++ b/boards/geography/germany_region/target_sachsen.png
diff --git a/boards/geography/germany_region/target_schleswig_holstein.png b/boards/geography/germany_region/target_schleswig_holstein.png
new file mode 100644
index 0000000..2b8222d
--- /dev/null
+++ b/boards/geography/germany_region/target_schleswig_holstein.png
diff --git a/boards/geography/germany_region/target_thueringen.png b/boards/geography/germany_region/target_thueringen.png
new file mode 100644
index 0000000..3b0795c
--- /dev/null
+++ b/boards/geography/germany_region/target_thueringen.png
diff --git a/boards/geography/germany_region/thueringen.png b/boards/geography/germany_region/thueringen.png
new file mode 100644
index 0000000..d361bbf
--- /dev/null
+++ b/boards/geography/germany_region/thueringen.png