Doc-fr: po/fr.po, prevent conflict on further merge

Ease merging of master into lilypond/translation, by parts.

diff --git a/Documentation/po/fr.po b/Documentation/po/fr.po
index 168f02ac1d10b2dbda362279e805d9c8cc13dcc6..13cfa692721d1deedc4f0f586d2853210ed1671a 100644 (file)
--- a/Documentation/po/fr.po
+++ b/Documentation/po/fr.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the lilypond package.
 #
 # John Mandereau <john.mandereau@free.fr>, 2006-2008,
-# Jean-Charles Malahieude <lilyfan@orange.fr>, 2008.
+# Jean-Charles Malahieude <lilyfan@orange.fr>, 2006-2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-22 22:40+0200\n"
-"PO-Revision-Date: 2009-02-15 13:17+0100\n"
-"Last-Translator: Jean-Charles Malahieude <lolyfan-AT-wanadoo-DOT-fr>\n"
+"PO-Revision-Date: 2009-06-06 14:37+0200\n"
+"Last-Translator: Jean-Charles Malahieude <lilyfan-AT-orange-DOT-fr>\n"
 "Language-Team: Français <lilypond-user-fr@gnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3413,9 +3413,8 @@ msgid "mpdolce"
 msgstr "mpdolce"
 
 #. Documentation/user/working.itely:335 (variable)
-#, fuzzy
 msgid "inst"
-msgstr "Lignes"
+msgstr "instr"
 
 #. @node in Documentation/user/working.itely
 #. @chapter in Documentation/user/working.itely
@@ -3739,15 +3738,14 @@ msgstr "Partition pour chœur SATB avec alignement des contextes"
 #. @appendixsec in Documentation/es/user/templates.itely
 #. @node in Documentation/de/user/templates.itely
 #. @appendixsec in Documentation/de/user/templates.itely
-#, fuzzy
 msgid "Orchestral templates"
-msgstr "Modèles pour claviers"
+msgstr "Modèles pour orchestre"
 
 #. @appendixsubsec in Documentation/user/templates.itely
 #. @appendixsubsec in Documentation/es/user/templates.itely
 #. @appendixsubsec in Documentation/de/user/templates.itely
 msgid "Orchestra, choir and piano"
-msgstr ""
+msgstr "Orchestre, chœur et piano"
 
 #. @node in Documentation/user/templates.itely
 #. @appendixsec in Documentation/user/templates.itely
@@ -3848,9 +3846,8 @@ msgstr "xelatex"
 
 #. Documentation/user/scheme-tutorial.itely:257 (variable)
 #. Documentation/user/programming-interface.itely:135 (variable)
-#, fuzzy
 msgid "tempoPadded"
-msgstr "tempoMarque"
+msgstr "tempoDecale"
 
 #. Documentation/user/scheme-tutorial.itely:276 (variable)
 msgid "pattern"
@@ -4726,9 +4723,8 @@ msgstr "Le système de gravure musicale"
 #. @appendix in Documentation/es/user/lilypond.tely
 #. @node in Documentation/de/user/lilypond.tely
 #. @appendix in Documentation/de/user/lilypond.tely
-#, fuzzy
 msgid "LilyPond grammar"
-msgstr "Index des commandes LilyPond"
+msgstr "La grammaire de LilyPond"
 
 #. @node in Documentation/user/lilypond.tely
 #. @appendix in Documentation/user/lilypond.tely
@@ -5589,7 +5585,7 @@ msgstr "sfzp"
 
 #. Documentation/user/expressive.itely:447 (variable)
 msgid "mfEspress"
-msgstr ""
+msgstr "mfEspress"
 
 #. Documentation/user/expressive.itely:449 (variable)
 msgid "roundFdynamic"
@@ -5601,7 +5597,7 @@ msgstr "nuanceFcadre"
 
 #. Documentation/user/expressive.itely:451 (variable)
 msgid "mfEspressDynamic"
-msgstr ""
+msgstr "mfEspressNuance"
 
 #. @node in Documentation/user/expressive.itely
 #. @section in Documentation/user/expressive.itely
@@ -9059,28 +9055,28 @@ msgstr "Modification de l'espacement"
 
 #. Documentation/user/changing-defaults.itely:446 (variable)
 msgid "keepVoicesAlive"
-msgstr ""
+msgstr "maintienVoixActives"
 
 #. Documentation/user/changing-defaults.itely:448 (context id)
 #. Documentation/user/changing-defaults.itely:454 (context id)
 #. Documentation/user/changing-defaults.itely:462 (context id)
 #. Documentation/user/changing-defaults.itely:464 (context id)
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #. Documentation/user/changing-defaults.itely:448 (comment)
 msgid "Keep Voice \\\"A\\\" alive for 5 bars"
-msgstr ""
+msgstr "Maintient la Voix \\\"A\\\" active sur 5 mesures"
 
 #. Documentation/user/changing-defaults.itely:449 (context id)
 #. Documentation/user/changing-defaults.itely:458 (context id)
 #. Documentation/user/changing-defaults.itely:463 (context id)
 msgid "B"
-msgstr ""
+msgstr "B"
 
 #. Documentation/user/changing-defaults.itely:449 (comment)
 msgid "Keep Voice \\\"B\\\" alive for 5 bars"
-msgstr ""
+msgstr "Maintient la Voix \\\"B\\\" active sur 5 mesures"
 
 #. Documentation/user/changing-defaults.itely:484 (variable)
 #. Documentation/user/changing-defaults.itely:495 (context id)
@@ -9089,24 +9085,22 @@ msgstr ""
 #. Documentation/user/changing-defaults.itely:506 (context id)
 #. Documentation/user/changing-defaults.itely:528 (variable)
 #. Documentation/user/changing-defaults.itely:544 (context id)
-#, fuzzy
 msgid "accompaniment"
-msgstr "accent"
+msgstr "accompagnement"
 
 #. Documentation/user/changing-defaults.itely:485 (variable)
 #. Documentation/user/changing-defaults.itely:534 (variable)
-#, fuzzy
 msgid "words"
-msgstr "coupletparoles"
+msgstr "mots"
 
 #. Documentation/user/changing-defaults.itely:492 (comment)
 msgid "Keep Voice \\\"melody\\\" alive for 4 bars"
-msgstr ""
+msgstr "Maintient la Voix \\\"melodie\\\" active sur 4 mesures"
 
 #. Documentation/user/changing-defaults.itely:523 (comment)
 #. Documentation/user/changing-defaults.itely:525 (comment)
 msgid "skip a bar"
-msgstr ""
+msgstr "saute une mesure"
 
 #. Documentation/user/changing-defaults.itely:2142 (comment)
 msgid "increase the length of the tie"
@@ -9269,9 +9263,8 @@ msgstr "Contextes de bas niveau - les voix"
 #. @subsection in Documentation/es/user/changing-defaults.itely
 #. @node in Documentation/de/user/changing-defaults.itely
 #. @subsection in Documentation/de/user/changing-defaults.itely
-#, fuzzy
 msgid "Keeping contexts alive"
-msgstr "Création d'un contexte"
+msgstr "Conservation d'un contexte"
 
 #. @node in Documentation/user/changing-defaults.itely
 #. @subsection in Documentation/user/changing-defaults.itely
@@ -10767,9 +10760,8 @@ msgid "Center-align bar numbers"
 msgstr "Alignement au centre des numéros de mesure"
 
 #. input/lsr/aligning-bar-numbers.ly:42 (comment)
-#, fuzzy
 msgid "Left-align bar numbers"
-msgstr "Alignement au centre des numéros de mesure"
+msgstr "Alignement à gauche des numéros de mesure"
 
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:73 (comment)
 msgid "the RehearsalMark will be centered above the KeySignature"
@@ -12274,94 +12266,76 @@ msgid "...or to cover just whitespace"
 msgstr ""
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:40 (variable)
-#, fuzzy
 msgid "fluteMusic"
-msgstr "laMusique"
+msgstr "fluteMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:41 (variable)
-#, fuzzy
 msgid "oboeMusic"
-msgstr "SopMusique"
+msgstr "hautboisMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:42 (variable)
-#, fuzzy
 msgid "clarinetMusic"
-msgstr "clarinette"
+msgstr "clarinetteMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:43 (variable)
-#, fuzzy
 msgid "bassoonMusic"
-msgstr "basseMusique"
+msgstr "bassonMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:44 (variable)
-#, fuzzy
 msgid "trumpetMusic"
-msgstr "laMusique"
+msgstr "trompetteMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:45 (variable)
-#, fuzzy
 msgid "tromboneMusic"
-msgstr "SopUnMusique"
+msgstr "tromboneMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:46 (variable)
-#, fuzzy
 msgid "hornIMusic"
-msgstr "sopranoMusique"
+msgstr "corMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:47 (variable)
-#, fuzzy
 msgid "hornIIMusic"
-msgstr "sopranoMusique"
+msgstr "corIIMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:48 (variable)
-#, fuzzy
 msgid "percussionMusic"
-msgstr "Percussions"
+msgstr "percussionMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:51 (variable)
-#, fuzzy
 msgid "altoIMusic"
-msgstr "altoMusique"
+msgstr "altoIMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:52 (variable)
-#, fuzzy
 msgid "altoILyrics"
-msgstr "altusParoles"
+msgstr "altoIParoles"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:53 (variable)
-#, fuzzy
 msgid "altoIIMusic"
-msgstr "altoMusique"
+msgstr "altoIIMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:54 (variable)
-#, fuzzy
 msgid "altoIILyrics"
-msgstr "altusParoles"
+msgstr "altoIIParoles"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:57 (variable)
-#, fuzzy
 msgid "pianoRHMusic"
-msgstr "sopranoMusique"
+msgstr "pianoMDMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:58 (variable)
-#, fuzzy
 msgid "pianoLHMusic"
-msgstr "sopranoMusique"
+msgstr "pianoMGMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:59 (variable)
-#, fuzzy
 msgid "violinIMusic"
-msgstr "violon"
+msgstr "violonIMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:60 (variable)
-#, fuzzy
 msgid "violinIIMusic"
-msgstr "violon"
+msgstr "violonIIMusique"
 
 #. input/lsr/orchestra-choir-and-piano-template.ly:61 (variable)
-#, fuzzy
 msgid "violaMusic"
-msgstr "mgMusique"
+msgstr "violaMusique"
 
 #. input/lsr/percussion-beaters.ly:18 (variable)
 msgid "stick"
@@ -12624,17 +12598,15 @@ msgstr "original"
 # ça vient directement de l'italien comme appogiature
 # ça c'est ben vrai !
 #. input/lsr/redefining-grace-note-global-defaults.ly:34 (variable)
-#, fuzzy
 msgid "startAcciaccaturaMusic"
-msgstr "acciaccature"
+msgstr ""
 
 # ça existe ce terme en français ?
 # ça vient directement de l'italien comme appogiature
 # ça c'est ben vrai !
 #. input/lsr/redefining-grace-note-global-defaults.ly:40 (variable)
-#, fuzzy
 msgid "stopAcciaccaturaMusic"
-msgstr "acciaccature"
+msgstr ""
 
 #. input/lsr/removing-the-first-empty-line.ly:59 (comment)
 msgid "To use the setting globally, uncomment the following line:"