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

[lilypond.git] / Documentation / snippets / anglican-psalm-template.ly

diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly
index ac0b797a2ca4dc54b9166c0d24275782c3cb62cf..f3a01a7cc8a6961897c478a3a34c13e7f0ff6cc2 100644 (file)
--- a/Documentation/snippets/anglican-psalm-template.ly
+++ b/Documentation/snippets/anglican-psalm-template.ly
@@ -1,11 +1,50 @@
-%% 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.31"
+\version "2.14.0"
 
 \header {
+%% Translation of GIT committish: 4077120c18ac1dc490501b3d7d5886bc93e61a42
+  texidocit = "
+Questo modello presenta un modo di impostare un salmo anglicano.  Mostra
+anche come le strofe possono essere aggiunte come testo separato al di sotto
+della musica.  Le due strofe sono scritte con stili diversi per illustrare
+le varie possibilità.
+
+"
+  doctitleit = "Modello per salmo anglicano"
+
   lsrtags = "vocal-music, template"
 
+
+
+
+%% Translation of GIT committish: 144cd434d02e6d90b2fb738eeee99119a7c5e1d2
+
+  texidocde = "
+Diese Vorlage zeigt eine Art, anglikanische Psalmengesänge zu setzen.  Hier
+wird auch gezeigt, wie Strophen als einfacher Text unter den Noten hinzugefügt
+werden können.  Zwei Strophen sind in unterschiedlicher Weise notiert um mehr
+Möglichkeiten darzustellen.
+"
+  doctitlede = "Vorlage für anglikanischen Psalm"
+
+
+%% Translation of GIT committish: 092f85605dcea69efff5ef31de4ff100346d6ef8
+
+  texidocfr = "
+Cet exemple illustre la manière de présenter un cantique tel qu'on le
+trouve dans l'église anglicane.  Vous noterez comment sont ajoutés les
+couplets indépendamment de la musique.  Dans le but de vous montrer
+plusieurs styles, comparez le code des deux couplets.
+
+"
+  doctitlefr = "Psalmodie anglicane"
+
+
   texidoc = "
 This template shows one way of setting out an Anglican psalm chant. It
 also shows how the verses may be added as stand-alone text under the
@@ -115,14 +154,17 @@ tick = \markup {
         }
         \null
         \line {
-          \hspace #2.5 2. Let us come before his presence \tick with
+          \hspace #2.5 8. Today if ye will hear his voice *
+        }
+        \line {
+          \concat { \bold hard en }
+          \tick not your \tick hearts : as in the pro-
         }
         \line {
-          thanks \tick giving * and shew ourselves
-          \tick glad in \tick
+          vocation * and as in the \bold day of tempt- \tick
         }
         \line {
-          him with psalms.
+          -ation \tick in the \tick wilderness.
         }
       }
     }