Merge branch 'master' into lilypond/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 a24492195c03a4e05a9e7e0f731a1c74f1b2193e..102d670e2efb5e9de5a3586011b8bc521cb7380b 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
@@ -7,20 +7,9 @@
 \version "2.14.0"
 
 \header {
-%% Translation of GIT committish: 4077120c18ac1dc490501b3d7d5886bc93e61a42
-  texidocit = "
-Ecco il modello di un semplice lead sheet che include melodia, testo, accordi e
-diagrammi dei tasti.
-
-"
-  doctitleit = "Modello di rigo singolo con note testo accordi e tasti"
-
   lsrtags = "vocal-music, chords, template"
 
-
-
-
-%% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
+%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Esta plantilla facilita la preparación de una canción con melodía,
 letra y acordes.
@@ -34,6 +23,15 @@ letra y acordes.
 これは旋律、単語、コードを持つ歌曲の楽譜のためのテンプレートです。
 "
 
+%% Translation of GIT committish: c3b519f0dd5ff0f8ccfc9a39ed1fe8df8b43741c
+  texidocit = "
+Ecco il modello di un comune spartito semplificato (lead sheet): include
+linea melodica, testo vocale, sigle degli accordi e relativi diagrammi
+per chitarra.
+
+"
+  doctitleit = "Modello di rigo singolo con note testo accordi e tasti"
+
 %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
   texidocde = "
 Mit diesem Beispiel können Sie einen Song mit Melodie,
@@ -43,9 +41,9 @@ Text und Akkorden schreiben.
   doctitlede = "Vorlage für eine Notenzeile mit Noten Text und Akkorden"
 
 
-%% Translation of GIT committish: ceb0afe7d4d0bdb3d17b9d0bff7936bb2a424d16
+%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
   texidocfr = "
-Ce cannevas comporte tous les éléments d'une chanson : la mélodie,
+Ce cannevas comporte tous les éléments d'une chanson@tie{}: la mélodie,
 les paroles, les accords.
 
 "