Merge branch 'master' into translation

[lilypond.git] / Documentation / snippets / avoiding-collisions-with-chord-fingerings.ly

diff --git a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
index ecf971d9ec0392f9eddfecce20a3e7f3017db5b7..d4867310441f6b493fe3af660e8e844bee2a5b4c 100644 (file)
--- a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
+++ b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
@@ -1,10 +1,28 @@
-%% 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.2"
 
 \header {
-  lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, chords, tweaks-and-overrides, rhythms"
+
+%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
+
+  texidoces = "
+
+Las digitaciones y números de cuerda que se aplican a las notas
+individuales evitan automáticamente las barras y las plicas de las
+figuras, pero esto no es cierto de forma predeterminada para las
+digitaciones y números de cuerda que se aplican sobre notas
+individuales de acordes.  El ejemplo siguiente muestra cómo se puede
+sobreescribir este comportamiento predeterminado.
+
+"
+  doctitlees = "Evitar colisiones con digitaciones de acordes"
+
 
   texidoc = "
 Fingerings and string numbers applied to individual notes will
@@ -17,6 +35,7 @@ overridden.
   doctitle = "Avoiding collisions with chord fingerings"
 } % begin verbatim
 
+
 \relative c' {
   \set fingeringOrientations = #'(up)
   \set stringNumberOrientations = #'(up)