From 56ae67a978f359697a7906dbcd5de6911673714c Mon Sep 17 00:00:00 2001
From: Romain Goffe <romain.goffe@gmail.com>
Date: Thu, 11 Aug 2011 02:10:19 +0200
Subject: [PATCH] start translation of "musicnote" environments

Conflicts:

	songs/Les_Cowboys_Fringants/Plus_rien.sg
---
 songs/Jacques_Higelin/Tombe_du_ciel.sg                   | 9 +++++----
 songs/Les_Cowboys_Fringants/Plus_rien.sg                 | 2 +-
 songs/MC_Solaar/Caroline.sg                              | 3 ++-
 songs/Oldelaf_et_Monsieur_D/Trahis.sg                    | 3 ++-
 .../Me_and_Julio_down_by_the_schoolyard.sg               | 3 ++-
 songs/The_Nightwatchman/California_s_dark.sg             | 6 ++++--
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/songs/Jacques_Higelin/Tombe_du_ciel.sg b/songs/Jacques_Higelin/Tombe_du_ciel.sg
index 2e61f185..302935d5 100644
--- a/songs/Jacques_Higelin/Tombe_du_ciel.sg
+++ b/songs/Jacques_Higelin/Tombe_du_ciel.sg
@@ -71,15 +71,16 @@
     Trafiquants d'import-export
   \endchorus
 
- \musicnote{transposer d'une tierce}
-
- \beginchorus
+  \musicnote[english]{transpose by a third}
+  \musicnote[french]{transposer d'une tierce}
+  
+  \beginchorus
     Tomber d'en haut, comme les petites gouttes d'eau
     Que j'entends tomber
     Dehors, par la f'nêtre
     Quand je m'endors le cœur en fête
   \endchorus
-
+  
   \beginchorus
     Poseur de girouettes
     Du haut du clocher
diff --git a/songs/Les_Cowboys_Fringants/Plus_rien.sg b/songs/Les_Cowboys_Fringants/Plus_rien.sg
index 69a09766..07ec2622 100644
--- a/songs/Les_Cowboys_Fringants/Plus_rien.sg
+++ b/songs/Les_Cowboys_Fringants/Plus_rien.sg
@@ -14,7 +14,7 @@
   \beginverse*
     \musicnote{\Pattern 1 : \nolyrics{\[Dm F C G]}}
   \endverse
-  
+
   \beginverse
     Il \[Dm]ne reste que quelques minutes à ma vie
     Tout \[F]au plus quelques heures je sens que je faiblis
diff --git a/songs/MC_Solaar/Caroline.sg b/songs/MC_Solaar/Caroline.sg
index 11744e59..b55c3fd5 100644
--- a/songs/MC_Solaar/Caroline.sg
+++ b/songs/MC_Solaar/Caroline.sg
@@ -10,7 +10,8 @@
   \gtab{G}{320003}
   \gtab{Em}{022000}
 
-  \musicnote{intro : Am C G Em}
+  \musicnote[english]{intro : Am C G Em}
+  \musicnote[french]{intro : Lam Do Sol Mim}
 
   \beginverse
     \[Am]J'étais cool, assis sur un banc. C'était au printemps
diff --git a/songs/Oldelaf_et_Monsieur_D/Trahis.sg b/songs/Oldelaf_et_Monsieur_D/Trahis.sg
index af7c8069..31b476f3 100644
--- a/songs/Oldelaf_et_Monsieur_D/Trahis.sg
+++ b/songs/Oldelaf_et_Monsieur_D/Trahis.sg
@@ -10,7 +10,8 @@
   \gtab{E}{022100}
   \gtab{C#}{4:X02220}
 
-  \musicnote{intro : F{\shrp}m D A E \rep{2}}
+  \musicnote[english]{intro : F{\shrp}m D A E \rep{2}}
+  \musicnote[french]{intro : Fa{\shrp}m Ré La Mi \rep{2}}
 
   \beginverse
     \[F#m]{Tu as} eu une \[D]{si riche} car\[A]riè\[E]re
diff --git a/songs/Simon_Garfunkel/Me_and_Julio_down_by_the_schoolyard.sg b/songs/Simon_Garfunkel/Me_and_Julio_down_by_the_schoolyard.sg
index 24cfb7ca..482ca922 100644
--- a/songs/Simon_Garfunkel/Me_and_Julio_down_by_the_schoolyard.sg
+++ b/songs/Simon_Garfunkel/Me_and_Julio_down_by_the_schoolyard.sg
@@ -10,7 +10,8 @@
   \gtab{D}{XX0232}
   \gtab{F}{1:022100}
 
-  \musicnote{intro: G C G D \rep{2}}
+  \musicnote[english]{intro: G C G D \rep{2}}
+  \musicnote[french]{intro: Sol Do Sol Ré \rep{2}}
 
   \beginverse
     The \[G]mama pajama rolled out of bed
diff --git a/songs/The_Nightwatchman/California_s_dark.sg b/songs/The_Nightwatchman/California_s_dark.sg
index 46d542f6..24e15de9 100644
--- a/songs/The_Nightwatchman/California_s_dark.sg
+++ b/songs/The_Nightwatchman/California_s_dark.sg
@@ -45,7 +45,8 @@
     We've come for what's ours
   \endverse
 
-  \musicnote{power chords}
+  \musicnote[english]{power chords}
+  \musicnote[french]{power chords}
 
   \beginverse
     Come stand among the rattlesnakes
@@ -61,7 +62,8 @@
     We pray the sun will come up
   \endverse
 
-  \musicnote{standard chords}
+  \musicnote[english]{standard chords}
+  \musicnote[french]{accords usuels}
 
   \beginverse
     For something walks across these fields