Merge branch 'lilypond/translation' of /home/lilycvs/git/lily/ into lilypond/translation

* 'lilypond/translation' of /home/lilycvs/git/lily/:
  Updates to match latest changes in originals
  Update French docs
  Typo

diff --git a/Documentation/es/user/basic-notation.itely b/Documentation/es/user/basic-notation.itely
index 03b8ba64bc4abab0f4424230647f0cd8371d33a3..0b0b512d5505b8c11a19db4933f7a135bdb30f90 100644 (file)
--- a/Documentation/es/user/basic-notation.itely
+++ b/Documentation/es/user/basic-notation.itely
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: 90541cc59a99d0b53baccedc0327748b760fce68
+    Translation of GIT committish: 4d9a81ea05bea52229dd9045b9eceecd64dbe61d
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -3284,6 +3284,11 @@ consulte @ref{Bar lines} para ver más información.
 
 @seealso
 
+Referencia del programa: @internalsref{VoltaBracket},
+@internalsref{RepeatedMusic},
+@internalsref{VoltaRepeatedMusic} y
+@internalsref{UnfoldedRepeatedMusic}.
+
 Ejemplos:
 
 Normalmente los corchetes para la repetición sólo se imprimen sobre el

diff --git a/Documentation/es/user/tutorial.itely b/Documentation/es/user/tutorial.itely
index 9562585ae11863527864488c3c4fcb5d24f0019b..e40ab3ad2d73312fdebaded426cad53b3fcf25ef 100644 (file)
--- a/Documentation/es/user/tutorial.itely
+++ b/Documentation/es/user/tutorial.itely
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: 338edaf1ad2b64605dcdeadb37b4cf17f98fc81a
+    Translation of GIT committish: 4d9a81ea05bea52229dd9045b9eceecd64dbe61d
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -998,10 +998,11 @@ crea una expresión musical mayor.  Es semejante al signo
 menos de las matemáticas.  La fórmula @math{(4+5)} es una expresión, por tanto
 @math{-(4+5)} es una expresión más amplia.
 
-Las indicaciones de compás escritas en un pentagrama afecta al resto, pero
+Las indicaciones de compás escritas en un pentagrama afectan al
+resto de ellos@footnote{Este comportamiento se puede cambiar si uno lo desea; consulte
+@ref{Polymetric notation} para ver más detalles.}. En cambio,
 la armadura de la tonalidad de un pentagrama @emph{no} afecta a los otros
-pentagramas@footnote{Este comportamiento se puede cambiar si uno lo desea; consulte
-@ref{Changing defaults} para ver más detalles.}.
+pentagramas.
 
 @lilypond[quote,ragged-right,verbatim]
 \relative c'' {

diff --git a/Documentation/fr/user/basic-notation.itely b/Documentation/fr/user/basic-notation.itely
index 1e3b5543ed560ce0237d7daba294f208341986b3..8ba46f8cfe0eb2ab718f1b98baec9e35f9abba6b 100644 (file)
--- a/Documentation/fr/user/basic-notation.itely
+++ b/Documentation/fr/user/basic-notation.itely
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
 @c This file is part of lilypond.tely
 @ignore
-    Translation of GIT committish: a4cf6aed7bf79f3cc1892dbc92b642b2514c1674
+    Translation of GIT committish: 71b67137f76fa4e8aede58299630369f616004d9
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -3376,6 +3376,14 @@ Consultez @ref{Bar lines} pour plus d'informations.
 
 @seealso
 
+Program reference: @internalsref{VoltaBracket},
+@internalsref{RepeatedMusic},
+@internalsref{VoltaRepeatedMusic}, et
+@internalsref{UnfoldedRepeatedMusic}.
+
+
+Examples
+
 Les crochets précédant une reprise s'impriment d'ordinaire seulement
 au-dessus de la portée du haut.  On peut ajuster cela en déplaçant le
 graveur @code{Volta_engraver} vers les contextes de portée

diff --git a/Documentation/fr/user/tutorial.itely b/Documentation/fr/user/tutorial.itely
index ca39890f13d29d3057160a37b275d03c09bc382a..1748a44b78c13ef85c226967730605e9bd6e989e 100644 (file)
--- a/Documentation/fr/user/tutorial.itely
+++ b/Documentation/fr/user/tutorial.itely
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
 @c This file is part of lilypond.tely
 @ignore
-   Translation of GIT committish: 27af34a245b02a6b89c9af3becefcfe676b2e19d
+   Translation of GIT committish: 71b67137f76fa4e8aede58299630369f616004d9
 
    When revising a translation, copy the HEAD committish of the
    version that you are working on.  See TRANSLATION for details.
@@ -1077,10 +1077,10 @@ comparaison, cela ressemble au signe @qq{moins} en mathématiques.  La
 formule @math{(4+5)} est une expression, donc @math{-(4+5)} est une plus
 grosse expression.
 
-Les chiffres de mesure figurant sur une portée affectent toutes les
-autres portées ; en revanche l'armure d'une portée n'affectera
-@emph{pas} les autres portées.@footnote{Ce comportement peut être
-modifié si nécessaire : voir pour cela @ref{Changing defaults}.}.
+Les chiffres de métrique indiqués sur une portée affectent toutes les
+autres portées@footnote{Ce comportement peut être modifié si nécessaire,
+voir @ref{Polymetric notation}.}.  En revanche l'armure d'une portée
+n'affecte @emph{pas} les autres portées.
 
 @lilypond[quote,ragged-right,verbatim]
 \relative c'' {

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 34688a3ebe7f63e124f2af4c886fd592840d5c03..47ca1e436887f2aa8679a6f548bfd165f16b662c 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -3285,8 +3285,6 @@ see @ref{Bar lines} for more information.
 
 @seealso
 
-@seealso
-
 Program reference: @internalsref{VoltaBracket},
 @internalsref{RepeatedMusic},
 @internalsref{VoltaRepeatedMusic}, and