[gcompris] merge beth master branch commit 5a26ef13

[Bruno Coudoin <bcoudoin src gnome org>]

commit b025722c1b40fb05fbb5654c041292a5076792ca
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun Sep 9 11:16:43 2012 +0200

    merge beth master branch commit 5a26ef13
    
    updated docs and fixed type
    https://github.com/bethmhadley/GCompris/commit/5a26ef135c6684925390aa18dfc2a6c3bf8ad16e

 .../piano_composition.xml.in                       |    4 +-
 .../piano_composition/melodies.desktop.in          |   61 ++++++++++++++-----
 2 files changed, 48 insertions(+), 17 deletions(-)
---
diff --git a/src/piano_composition-activity/piano_composition.xml.in b/src/piano_composition-activity/piano_composition.xml.in
index e18b260..25e8e99 100644
--- a/src/piano_composition-activity/piano_composition.xml.in
+++ b/src/piano_composition-activity/piano_composition.xml.in
@@ -45,7 +45,9 @@ The following keyboard bindings work in this activity:
         <credit>
         Thank you to Bruno Coudoin for his mentorship.
         Thank you to Olivier Samyn for his contribution to improving the note design and coloring.
-        Thank you to Federico Mena who inspired me with his wonderful enthusiasm for my music projects at GUADEC. Thank you also for his contribution of the Elephant Song.
+        Thank you to Federico Mena who inspired me with his wonderful enthusiasm for my music projects at GUADEC. 
+        Thank you to all contributors of children's songs from around the world, especially the GNOME community. Learn more about these
+        melodies and who contributed them here: https://live.gnome.org/GComprisMelodies
         </credit>
   </Board>
   <Data directory=""/>
diff --git a/src/piano_composition-activity/resources/piano_composition/melodies.desktop.in b/src/piano_composition-activity/resources/piano_composition/melodies.desktop.in
index e0d6679..afcc61b 100644
--- a/src/piano_composition-activity/resources/piano_composition/melodies.desktop.in
+++ b/src/piano_composition-activity/resources/piano_composition/melodies.desktop.in
@@ -115,7 +115,7 @@ melody = trebleClef A8 A8 A8 B8 A4 F#4 A8 A8 A8 B8 A8 G8 F#4 F#8 E8 F#8 E8 D8 D8
 [21]
 title = LÃnc, lÃnc, eszterlÃnc
 _origin = Hungary, Children's Song
-lyrics = LÃnc, lÃnc, eszterlÃnc, / eszterlÃnci cÃrna, / cÃrna volna, selyem volna, / mÃgis kifordulna. / PÃnz volna karika, karika, / forduljon ki Marika, / MarikÃnak lÃnca.
+lyrics = LÃnc, lÃnc, eszterlÃnc,/ eszterlÃnci cÃrna,/ cÃrna volna, selyem volna,/ mÃgis kifordulna. / PÃnz volna karika, karika,/ forduljon ki Marika,/ MarikÃnak lÃnca.
 melody = trebleClef A4 B4 A8 A8 F#4 A8 A8 A8 B8 A4 F#4 A8 A8 A8 B8 A8 G8 F#8 E8 F#8 E8 F#8 E8 D4 D4 A4 A8 A8 A8 2D8 A4 A8 G8 F#8 E8 D8 2D8 A4 A8 G8 F#8 E8 D4 D4
 
 [22]
@@ -133,46 +133,75 @@ melody = trebleClef A2 A4 F#4 G2 E2 D4 E4 E4 E4 E2 D2 F4 F4 E4 F4 G2 E2 F4 F4 E4
 [24]
 title = Jack and Jill
 _origin = Britain
-lyrics = Jack and Jill went up the hill / To fetch a pail of water. / Jack fell down and broke his crown, / And Jill came tumbling after
+lyrics = Jack and Jill went up the hill / To fetch a pail of water. / Jack fell down and broke his crown,/ And Jill came tumbling after
 melody = trebleClef C4 C8 D4 D8 E4 E8 F4 F8 G4 G8 A4 A8 B2 2C2 2C4 2C8 B4 B8 A4 A8 G4 G8 F4 F8 E4 E8 D2 C2
 
 [25]
 title = WlazÅ kotek na pÅotek
 _origin = Poland
-lyrics = WlazÅ kotek na pÅotek i mruga, / Åadna to piosenka nie dÅuga. / Nie dÅuga, nie krÃtka, lecz w sam raz, / ZaÅpiewaj koteczku jeszcze raz.
+lyrics = WlazÅ kotek na pÅotek i mruga,/ Åadna to piosenka nie dÅuga. / Nie dÅuga, nie krÃtka, lecz w sam raz,/ ZaÅpiewaj koteczku jeszcze raz.
 melody = trebleClef G4 E4 E4 F4 D4 D4 C8 E8 G2 G4 E4 E4 F4 D4 D4 C8 E8 C2
 
 [26]
 title = ÎÎÎÎÎÏÎÎÎ ÎÎÏ ÎÎÎÏÏÏ
 _origin = Greece
-lyrics = ÎÎÎÎÎÏÎÎÎ ÎÎÏ ÎÎÎÏÏÏ, / ÎÎÎÎÎ ÎÎÏ ÎÎ ÏÎÏÏÎÏÏ, / ÎÎ ÏÎÎÎÎÎÏ ÏÏÎ ÏÏÎÎÎÎÏ / ÎÎ ÎÎÎÎÎÎÏ ÎÏÎÎÎÎÏÎ, / ÎÏÎÎÎÎÏÎ ÏÏÎÏÎÎÎÎÏÎ / ÎÎÏ ÎÎÎÏ ÏÎ ÏÏÎÎÎÏÎ.
+lyrics = ÎÎÎÎÎÏÎÎÎ ÎÎÏ ÎÎÎÏÏÏ,/ ÎÎÎÎÎ ÎÎÏ ÎÎ ÏÎÏÏÎÏÏ,/ ÎÎ ÏÎÎÎÎÎÏ ÏÏÎ ÏÏÎÎÎÎÏ / ÎÎ ÎÎÎÎÎÎÏ ÎÏÎÎÎÎÏÎ,/ ÎÏÎÎÎÎÏÎ ÏÏÎÏÎÎÎÎÏÎ / ÎÎÏ ÎÎÎÏ ÏÎ ÏÏÎÎÎÏÎ.
 melody = trebleClef C4 C4 G4 G4 A4 A4 G2 F4 F4 E4 E4 D4 D4 C2 G4 G4 F4 F4 E4 E4 D2 G4 G4 F4 F4 E4 E4 D2 C4 C4 G4 G4 A4 A4 G2 F4 F4 E4 E4 D4 D4 C1
 
 [27]
 title = ÎÏÎÏÎÎ, ÏÎÎÎÎÎÎÎ
 _origin = Greece
-lyrics = ÎÏÎÏÎÎ, ÏÎÎÎÎÎÎÎ, / ÎÎ ÎÎÏÎÎÏÎ ÏÎÏÎÎÎÎ, / ÎÎ' Î ÎÎÏÎÏ ÏÎ ÏÏÎ ÎÏÎÎ / Î' Î ÎÏÎÎ ÏÎÏ ÎÎÎÎÎÏÎÏÎÎ / ÎÎÏÏÎÎÏÏÎ ÎÎ ÏÎ ÎÎÎÎ. / "'ÎÎÎ ÎÎÏÎ ÎÎÏ ÎÎ ÏÎÏ / ÎÎÏ ÎÎ ÏÎÏ ÏÎÎ / ÎÎÏÏÏÎÏÎÎÎ, / ÎÎÎ ÏÎÏ ÏÎÏÎÎÎÏ ÏÎÎ ÎÏÎÎ."
+lyrics = ÎÏÎÏÎÎ, ÏÎÎÎÎÎÎÎ,/ ÎÎ ÎÎÏÎÎÏÎ ÏÎÏÎÎÎÎ,/ ÎÎ' Î ÎÎÏÎÏ ÏÎ ÏÏÎ ÎÏÎÎ / Î' Î ÎÏÎÎ ÏÎÏ ÎÎÎÎÎÏÎÏÎÎ / ÎÎÏÏÎÎÏÏÎ ÎÎ ÏÎ ÎÎÎÎ. / "'ÎÎÎ ÎÎÏÎ ÎÎÏ ÎÎ ÏÎÏ / ÎÎÏ ÎÎ ÏÎÏ ÏÎÎ / ÎÎÏÏÏÎÏÎÎÎ,/ ÎÎÎ ÏÎÏ ÏÎÏÎÎÎÏ ÏÎÎ ÎÏÎÎ."
 melody = trebleClef D8 G8 G8 G8 A8 A8 G8 G8 D8 G8 G8 G8 A8 A8 G8 G8 D8 G8 G8 G8 A8 A8 G8 G8 D8 G8 G8 G8 A8 A8 G8 G8
 
+[28]
+title = ÐÐÑÐÐÑ ÑÑÑÐÐÑÐÐÐ
+_origin = Ukraine
+lyrics = ÐÐÑÐÐÑ ÑÑÑÐÐÑÐÐÐ,/ ÐÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐ,/ ÐÐÑÐÑ ÐÐÐÐÑÐÑÐÐ,/ ÐÐ ÑÐÐÐ ÐÐ ÑÐÑÑ! / ÐÐ ÑÐÐÐ ÐÐ ÑÐÑÑ,/ ÐÐ ÐÑÐÐ ÐÐÑÑÑÐ! / ÐÐÑÑ ÐÑÐÐ ÑÐÐÑÐ,/ ÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐ. / ÐÐ ÐÐ ÐÐÑÐ ÐÐÑÐÐÑÐ,/ ÐÐ ÐÐÑÐÐÑ ÐÑÑÐÐÑÐ. / Ð-Ð, ÐÑÐÑ!
+melody = trebleClef C4 F4 G4 Bb8 Ab8 G4 F4 C4 F4 G4 Bb8 Ab8 G2 F2 Bb4 Bb4 Bb4 Ab4 G2 F2 Bb4 Bb4 Bb4 Ab4 G2 F2 C4 F4 G4 Bb8 Ab8 G8 F8 G4 F2 
 
+[29]
+title = Baa, Baa, Blacksheep
+_origin = Britain
+lyrics = Baa, baa, black sheep, / Have you any wool? / Yes, sir, yes, sir, / Three bags full; / One for the master, / And one for the dame, / And one for the little boy / Who lives down the lane
+melody = trebleClef G4 G4 2D4 2D4 2E8 2E8 2E8 2E8 2D2 2C4 2C4 B4 B4 A4 A4 G2 2D4 2D8 2D8 2C4 2C4 B4 B8 B8 A2 2D4 2D8 2D8 2C8 2C8 2C8 2C8 B4 B8 B8 A2
 
+[30]
+title = A la rueda de San Miguel
+_origin = Mexico
+lyrics = A la rueda, a la rueda de San Miguel / Todos traen su caja de miel. / A lo maduro, a lo maduro / Que se voltee (nombre del niÃo) de burro.
+melody = trebleClef G4 G4 2C4 G4 2C4 G8 G8 2C4 2D4 2E2 2C4 2D4 2E2 2C4 2C4 2D4 2D8 2D8 G4 G8 G8 2C2
 
+[31]
+title = Arroz con leche
+_origin = Mexico
+lyrics = Arroz con leche / me quiero casar / con una mexicana / de la capital.
+melody = trebleClef C8 F2 A8 F4 F8 C8 F4 F8 A8 G2 A8 Bb8 A8 G8 F8 E4 E8 C8 D4 E8 E8 F4
 
+[32]
+title = Los pollitos dicen
+_origin = Mexico
+lyrics = Los pollitos dicen / pÃo pÃo pÃo / cuando tienen hambre / cuando tienen frÃo
+melody = trebleClef A8 E8 A8 B8 2C#4 2C#4 B8 2D8 2C#8 B8 A4 A4 A8 G#8 F#8 E8 B4 B4 E8 E8 F#8 G#8 A4 A4 
 
+[33]
+title = Dale dale dale
+_origin = Mexican song to break a piÃata
+lyrics = Dale dale dale / no pierdas el tino / porque si lo pierdes / pierdes el camino
+melody = trebleClef G8 G8 G8 E8 A4 A4 B8 B8 B8 G8 2C4 2C4 G8 G8 G8 E8 A4 A4 B8 B8 B8 G8 2C2
 
+[34]
+title = Kolme varista
+_origin = Finland
+lyrics = Kolme varista istui aidalla. Silivati seilaa, silivati seilaa, yksi lensi pois. Kaksi varista istui aidalla. Silivati seilaa, silivati seilaa, yksi lensi pois. Yksi varis vain istui aidalla. Silivati seilaa, silivati seilaa, sekin lensi pois.
+melody = trebleClef A4 Bb4 A8 F2 D1 A4 D4 2C4 Bb4 G1 A8 A8 A8 G8 E4 G4 A8 A8 A8 G8 E4 G4 A2 G8 F4 E4 D4
 
 
-
-
-
-
-
-
-
-
-
-
-
+[35]
+title = Humpty Dumpty
+_origin = Britain
+lyrics = Humpty Dumpty sat on a wall, / Humpty Dumpty had a great fall. / All the king's horses and all the king's men / Couldn't put Humpty together again
+melody = trebleClef E4 G8 F4 A8 G8 A8 B8 2C2 E4 G8 F4 A8 G8 F8 E8 D2 E8 E8 G8 F8 F8 A8 G8 A8 B8 2C4 2C8 2E8 2E8 2C8 2F4 2E8 2D8 2C8 B8 2C2