Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / snippets / single-staff-template-with-notes,-lyrics,-and-chords.ly

diff --git a/Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly b/Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly
index 569c8fd59a3082bc979fa55978b253dba48a641f..3cdf85b1defd139806831d8bc005d340df469ea6 100644 (file)
--- a/Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly
+++ b/Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly
@@ -1,42 +1,27 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.1"
+\version "2.18.0"
 
 \header {
-  lsrtags = "vocal-music, chords, template"
-
-%% Translation of GIT committish: 7e2910d2bc6167b10cfe328eb17a5f710f2a515a
-  texidoces = "
-Esta plantilla facilita la preparación de una canción con melodía,
-letra y acordes.
-
-"
-  doctitlees = "Plantilla de pentagrama único con música, letra y acordes"
-  
-%% Translation of GIT committish: 17633f6b8681af86230aa84597fe7561e98c91d6
-  texidocde = "
-Mit diesem Beispiel können Sie einen Song mit Melodie, 
-Text und Akkorden schreiben.
-"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-これは旋律、単語、コードを持つ歌曲の楽譜のためのテンプレートです。
-"
+  lsrtags = "chords, really-simple, template, vocal-music"
 
   texidoc = "
 This template allows the preparation of a song with melody, words, and
-chords. 
+chords.
 
 "
-  doctitle = "Single staff template with notes, lyrics, and chords"
+  doctitle = "Single staff template with notes lyrics and chords"
 } % begin verbatim
 
 melody = \relative c' {
   \clef treble
   \key c \major
   \time 4/4
-  
+
   a4 b c d
 }
 
@@ -60,4 +45,3 @@ harmonies = \chordmode {
   \layout { }
   \midi { }
 }
-