Merge branch 'fixedmerge' into HEAD

[lilypond.git] / Documentation / snippets / changing-chord-separator.ly

diff --git a/Documentation/snippets/changing-chord-separator.ly b/Documentation/snippets/changing-chord-separator.ly
index df58cf2f0c7978a57075430a21ac94b8933178eb..167b892a783191cb67d2833e86c49bb470336d41 100644 (file)
--- a/Documentation/snippets/changing-chord-separator.ly
+++ b/Documentation/snippets/changing-chord-separator.ly
@@ -1,12 +1,15 @@
-%% Do not edit this file; it is automatically
+%% DO NOT EDIT this file manually; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
 %% This file is in the public domain.
-\version "2.13.20"
+\version "2.14.0"
 
 \header {
   lsrtags = "chords"
 
-%% Translation of GIT committish: e0aa246e0ed1a86dc41a99ab79bff822d3320aa7
+%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Se puede establecer el separador entre las distintas partes del
 nombre de un acorde para que sea cualquier elemento de marcado.
@@ -18,11 +21,19 @@ nombre de un acorde para que sea cualquier elemento de marcado.
 %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
   texidocde = "
 Der Trenner zwischen unterschiedlichen Teilen eines Akkordsymbols kann
-beliebeiger Text sein.
+beliebiger Text sein.
 
 "
   doctitlede = "Akkordsymboltrenner verändern"
 
+%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
+  texidocfr = "
+Le séparateur de termes d'un chiffrage peut adopter n'importe quelle
+forme à l'aide d'un @emph{markup}.
+
+"
+  doctitlefr = "Personnalisation du séparateur d'accords"
+
   texidoc = "
 The separator between different parts of a chord name can be set to any
 markup.