Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / snippets / piano-template-with-melody-and-lyrics.ly

diff --git a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
index 48fbd2739606bb4df63a9c040ddd2f7394eae6e2..22e7db3854a4a76f44fa95bab3b49fd9dc6322fc 100644 (file)
--- a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
@@ -1,12 +1,25 @@
-%% 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.10"
+\version "2.15.2"
 
 \header {
+%% Translation of GIT committish: 4077120c18ac1dc490501b3d7d5886bc93e61a42
+  texidocit = "
+Ecco un tipico formato per canzoni: un rigo con la melodia e il testo,
+e l'accompagnamento per pianoforte sotto.
+
+"
+  doctitleit = "Modello per pianoforte con melodia e testo"
+
   lsrtags = "vocal-music, keyboards, template"
 
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+
+
+%% Translation of GIT committish: 615cbf212fdaf0b220b3330da417d0c3602494f2
   texidoces = "
 He aquí el típico formato dde una canción: un pentagrama con la
 melodía y la letra, y el acompañamiento de piano por debajo.
@@ -14,11 +27,13 @@ melodía y la letra, y el acompañamiento de piano por debajo.
 "
   doctitlees = "Plantilla de piano con melodía y letra"
 
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+
+%% Translation of GIT committish: fa1aa6efe68346f465cfdb9565ffe35083797b86
   texidocja = "
 これは一般的な歌曲のフォーマットです: 旋律と歌詞を持つ譜表と、その下にピアノ伴奏譜があります。
 "
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
   texidocde = "
 Das nächste Beispiel ist typisch für ein Lied: Im oberen System die
 Melodie mit Text, darunter Klavierbegleitung.
@@ -26,7 +41,8 @@ Melodie mit Text, darunter Klavierbegleitung.
 
   doctitlede = "Vorlage für Klavier und Gesangsstimme"
 
-%% Translation of GIT committish: 9ba35398048fdf1ca8c83679c7c144b1fd48e75b
+
+%% Translation of GIT committish: ceb0afe7d4d0bdb3d17b9d0bff7936bb2a424d16
   texidocfr = "
 Il s'agit du format classique pour le chant : une portée pour la mélodie
 et les paroles au-dessus de l'accompagnement au piano.
@@ -80,7 +96,7 @@ lower = \relative c {
     >>
   >>
   \layout {
-    \context { \RemoveEmptyStaffContext }
+    \context { \Staff \RemoveEmptyStaves }
   }
   \midi { }
 }