Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / Documentation / snippets / lyrics-old-spacing-settings.ly

diff --git a/Documentation/snippets/lyrics-old-spacing-settings.ly b/Documentation/snippets/lyrics-old-spacing-settings.ly
index 4cb66f6e507cae585463c96f6766ba447bfea2f3..d27f8ee5d424a651ff4dd69a0f89af5657bc92d2 100644 (file)
--- a/Documentation/snippets/lyrics-old-spacing-settings.ly
+++ b/Documentation/snippets/lyrics-old-spacing-settings.ly
@@ -1,18 +1,50 @@
-% Do not edit this file; it is automatically
+% DO NOT EDIT this file manually; it is automatically
 % generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
 % This file is in the public domain.
-%% Note: this file works from version 2.13.47
-\version "2.13.47"
+%% Note: this file works from version 2.14.0
+\version "2.14.0"
 
 \header {
+%% Translation of GIT committish: 27b1197f3bae8512c14d946752cd3e40e7c76016
+  doctitlede = "Textverteilung wie in Version 2.12 für neuere Versionen"
+
+  texidocde = "
+Die vertikale Maschine für die Platzverteilung wurde für die Version 2.14
+verändert.  Das kann dazu führen, dass Gesangstext unterschiedlich
+verteilt wird.  Es ist möglich, die Eigenschaften der @code{Lyric}-
+und @code{Staff}-Kontexte so einzustellen, dass die Platzverteilung
+wie in der Version 2.12 arbeitet.
+"
+
+
+%% Translation of GIT committish: c1d5bb448321d688185e0c6b798575d4c325ae80
+  texidocfr = "
+La version 2.14 a donné naissance à un nouveau moteur pour l'espacement
+vertical des paroles.  Celles-ci peuvent donc se retrouver positionnées
+différemment.  Le moteur adoptera les usages de la version 2.12 une fois
+que vous aurez réglé certaines propriétés des contextes @code{Lyric} et
+@code{Staff}.
+
+"
+
+  doctitlefr = "Espacement des paroles selon les pratiques de la version 2.12"
+
+
   lsrtags = "vocal-music"
+
+  doctitle = "Obtaining 2.12 lyrics spacing in newer versions"
+
   texidoc = "
 The vertical spacing engine changed for version 2.14.  This can
 cause lyrics to be spaced differently.  It is possible to set
 properties for @code{Lyric} and @code{Staff} contexts to get the
 spacing engine to behave as it did in version 2.12.
 "
-}
+} % begin verbatim
+
 
 global = {
   \key d \major