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

[lilypond.git] / Documentation / snippets / stand-alone-two-column-markup.ly

diff --git a/Documentation/snippets/stand-alone-two-column-markup.ly b/Documentation/snippets/stand-alone-two-column-markup.ly
index 202049d6a5fba8b2f2b9678dde7de36baf353cdf..be3f37c94ad724aeec88d474fa68ce0120d1f566 100644 (file)
--- a/Documentation/snippets/stand-alone-two-column-markup.ly
+++ b/Documentation/snippets/stand-alone-two-column-markup.ly
@@ -1,21 +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.4"
+\version "2.14.0"
 
 \header {
-%% Translation of GIT committish: c2e8b1d6d671dbfc138f890cbc7e9882b7be2761
-  texidocfr = "
-L'utilisation de la commande @code{\\markup} permet de distribuer un bloc
-de texte indépendant sur plusieurs colonnes.
-
-"
-  doctitlefr = "Bloc de texte indépendant sur deux colonnes"
-
-
   lsrtags = "text"
 
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+%% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
   texidoces = "
 Los textos independientes se pueden disponer en varias columnas
 utilizando instrucciones @code{\\markup}:
@@ -23,7 +17,8 @@ utilizando instrucciones @code{\\markup}:
 "
   doctitlees = "Elemento de marcado de texto independiente en dos columnas"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
   texidocde = "
 Isolierter Text kann in mehreren Spalten mit @code{\\markup}-Befehlen
 angeordnet werden:
@@ -31,6 +26,15 @@ angeordnet werden:
 "
   doctitlede = "Isolierter Text in zwei Spalten"
 
+%% Translation of GIT committish: 548ef200973bd3d46ea75c5498461d9e5f168334
+  texidocfr = "
+L'utilisation de la commande @code{\\markup} permet de distribuer un bloc
+de texte indépendant sur plusieurs colonnes.
+
+"
+  doctitlefr = "Bloc de texte indépendant sur deux colonnes"
+
+
   texidoc = "
 Stand-alone text may be arranged in several columns using
 @code{\\markup} commands: