[gcompris] imageid, reworked to use images from lang/words

[Bruno Coudoin <bcoudoin src gnome org>]

commit 0a95546f77426724515bfbce08b3eadf0ac6f2ad
Author: Bruno Coudoin <bcoudoin gcompris net>
Date:   Sun Oct 20 16:03:25 2013 +0200

    imageid, reworked to use images from lang/words

 src/imageid-activity/resources/imageid/Makefile.am |   12 ++++++------
 src/imageid-activity/resources/imageid/apple.png   |    1 +
 src/imageid-activity/resources/imageid/avion.png   |  Bin 12883 -> 0 bytes
 src/imageid-activity/resources/imageid/ball.png    |    1 +
 src/imageid-activity/resources/imageid/ballon.png  |  Bin 22158 -> 0 bytes
 src/imageid-activity/resources/imageid/bed.png     |  Bin 4855 -> 51 bytes
 .../resources/imageid/board1.xml.in                |    6 +++---
 .../resources/imageid/board2.xml.in                |    6 +++---
 src/imageid-activity/resources/imageid/cake.png    |  Bin 25569 -> 52 bytes
 src/imageid-activity/resources/imageid/car.png     |  Bin 10973 -> 51 bytes
 .../resources/imageid/cartable.png                 |  Bin 59035 -> 0 bytes
 src/imageid-activity/resources/imageid/chien.png   |  Bin 34676 -> 0 bytes
 src/imageid-activity/resources/imageid/dog.png     |    1 +
 src/imageid-activity/resources/imageid/fish.png    |  Bin 18127 -> 52 bytes
 src/imageid-activity/resources/imageid/house.png   |    1 +
 src/imageid-activity/resources/imageid/maison.png  |  Bin 31108 -> 0 bytes
 src/imageid-activity/resources/imageid/plane.png   |    1 +
 src/imageid-activity/resources/imageid/pomme.png   |  Bin 15335 -> 0 bytes
 .../resources/imageid/school_bag.png               |    1 +
 19 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/src/imageid-activity/resources/imageid/Makefile.am 
b/src/imageid-activity/resources/imageid/Makefile.am
index b144526..8cdd9c2 100644
--- a/src/imageid-activity/resources/imageid/Makefile.am
+++ b/src/imageid-activity/resources/imageid/Makefile.am
@@ -18,19 +18,19 @@ $(xml_DATA): %.xml: %.xml.in
 
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/imageid
 img_DATA = \
-       avion.png \
-       ballon.png \
+       plane.png \
+       ball.png \
        banana.png \
        bed.png \
        bottle.png \
        cake.png \
        car.png \
-       cartable.png \
-       chien.png \
+       school_bag.png \
+       dog.png \
        fish.png \
        imageid-bg.svgz \
-       maison.png \
-       pomme.png
+       house.png \
+       apple.png
 
 EXTRA_DIST = $(img_DATA) ${xml_in_files}
 CLEANFILES = $(xml_DATA)
diff --git a/src/imageid-activity/resources/imageid/apple.png 
b/src/imageid-activity/resources/imageid/apple.png
new file mode 120000
index 0000000..2f46e4b
--- /dev/null
+++ b/src/imageid-activity/resources/imageid/apple.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/apple.png
\ No newline at end of file
diff --git a/src/imageid-activity/resources/imageid/ball.png b/src/imageid-activity/resources/imageid/ball.png
new file mode 120000
index 0000000..2427e89
--- /dev/null
+++ b/src/imageid-activity/resources/imageid/ball.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/ball.png
\ No newline at end of file
diff --git a/src/imageid-activity/resources/imageid/bed.png b/src/imageid-activity/resources/imageid/bed.png
deleted file mode 100644
index 80d16c1..0000000
Binary files a/src/imageid-activity/resources/imageid/bed.png and /dev/null differ
diff --git a/src/imageid-activity/resources/imageid/bed.png b/src/imageid-activity/resources/imageid/bed.png
new file mode 120000
index 0000000..fccc6ac
--- /dev/null
+++ b/src/imageid-activity/resources/imageid/bed.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/bed.png
\ No newline at end of file
diff --git a/src/imageid-activity/resources/imageid/board1.xml.in 
b/src/imageid-activity/resources/imageid/board1.xml.in
index d527fd2..80a6658 100644
--- a/src/imageid-activity/resources/imageid/board1.xml.in
+++ b/src/imageid-activity/resources/imageid/board1.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ImageId>
   <Board>
-       <pixmapfile>imageid/cartable.png</pixmapfile>
+       <pixmapfile>imageid/school_bag.png</pixmapfile>
        <_good>satchel</_good>
        <_bad>cheese</_bad>
        <_bad>house</_bad>
@@ -13,13 +13,13 @@
        <_bad>book</_bad>
   </Board>
   <Board>
-       <pixmapfile>imageid/maison.png</pixmapfile>
+       <pixmapfile>imageid/house.png</pixmapfile>
        <_good>house</_good>
        <_bad>book</_bad>
        <_bad>bag</_bad>
   </Board>
   <Board>
-       <pixmapfile>imageid/pomme.png</pixmapfile>
+       <pixmapfile>imageid/apple.png</pixmapfile>
        <_good>apple</_good>
        <_bad>pear</_bad>
        <_bad>cow</_bad>
diff --git a/src/imageid-activity/resources/imageid/board2.xml.in 
b/src/imageid-activity/resources/imageid/board2.xml.in
index 6311049..30a5c3c 100644
--- a/src/imageid-activity/resources/imageid/board2.xml.in
+++ b/src/imageid-activity/resources/imageid/board2.xml.in
@@ -22,7 +22,7 @@
        <_bad>bottle</_bad>
   </Board>
   <Board>
-       <pixmapfile>imageid/ballon.png</pixmapfile>
+       <pixmapfile>imageid/ball.png</pixmapfile>
        <_good>ball</_good>
        <_bad>boat</_bad>
        <_bad>bottle</_bad>
@@ -37,7 +37,7 @@
        <_bad>cat</_bad>
   </Board>
   <Board>
-       <pixmapfile>imageid/chien.png</pixmapfile>
+       <pixmapfile>imageid/dog.png</pixmapfile>
        <_good>dog</_good>
        <_bad>cat</_bad>
        <_bad>bottle</_bad>
@@ -51,7 +51,7 @@
        <_bad>boat</_bad>
   </Board>
   <Board>
-       <pixmapfile>imageid/avion.png</pixmapfile>
+       <pixmapfile>imageid/plane.png</pixmapfile>
        <_good>plane</_good>
        <_bad>boat</_bad>
        <_bad>car</_bad>
diff --git a/src/imageid-activity/resources/imageid/cake.png b/src/imageid-activity/resources/imageid/cake.png
deleted file mode 100644
index f8cceed..0000000
Binary files a/src/imageid-activity/resources/imageid/cake.png and /dev/null differ
diff --git a/src/imageid-activity/resources/imageid/cake.png b/src/imageid-activity/resources/imageid/cake.png
new file mode 120000
index 0000000..c6ce024
--- /dev/null
+++ b/src/imageid-activity/resources/imageid/cake.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/cake.png
\ No newline at end of file
diff --git a/src/imageid-activity/resources/imageid/car.png b/src/imageid-activity/resources/imageid/car.png
deleted file mode 100644
index de8128e..0000000
Binary files a/src/imageid-activity/resources/imageid/car.png and /dev/null differ
diff --git a/src/imageid-activity/resources/imageid/car.png b/src/imageid-activity/resources/imageid/car.png
new file mode 120000
index 0000000..a2bb217
--- /dev/null
+++ b/src/imageid-activity/resources/imageid/car.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/car.png
\ No newline at end of file
diff --git a/src/imageid-activity/resources/imageid/dog.png b/src/imageid-activity/resources/imageid/dog.png
new file mode 120000
index 0000000..adac4da
--- /dev/null
+++ b/src/imageid-activity/resources/imageid/dog.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/dog.png
\ No newline at end of file
diff --git a/src/imageid-activity/resources/imageid/fish.png b/src/imageid-activity/resources/imageid/fish.png
deleted file mode 100644
index a94cc02..0000000
Binary files a/src/imageid-activity/resources/imageid/fish.png and /dev/null differ
diff --git a/src/imageid-activity/resources/imageid/fish.png b/src/imageid-activity/resources/imageid/fish.png
new file mode 120000
index 0000000..9093a3e
--- /dev/null
+++ b/src/imageid-activity/resources/imageid/fish.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/fish.png
\ No newline at end of file
diff --git a/src/imageid-activity/resources/imageid/house.png 
b/src/imageid-activity/resources/imageid/house.png
new file mode 120000
index 0000000..65d80a9
--- /dev/null
+++ b/src/imageid-activity/resources/imageid/house.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/house.png
\ No newline at end of file
diff --git a/src/imageid-activity/resources/imageid/plane.png 
b/src/imageid-activity/resources/imageid/plane.png
new file mode 120000
index 0000000..8a4ffd9
--- /dev/null
+++ b/src/imageid-activity/resources/imageid/plane.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/plane.png
\ No newline at end of file
diff --git a/src/imageid-activity/resources/imageid/school_bag.png 
b/src/imageid-activity/resources/imageid/school_bag.png
new file mode 120000
index 0000000..e82b910
--- /dev/null
+++ b/src/imageid-activity/resources/imageid/school_bag.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/school_bag.png
\ No newline at end of file