Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / snippets / forcing-horizontal-shift-of-notes.ly

diff --git a/Documentation/snippets/forcing-horizontal-shift-of-notes.ly b/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
index 28b5b2bc243b7211d9b5df455095fcaa1cbe94d0..1fc1bd2ebe9e681a61e653bc98be92b729e8dd58 100644 (file)
--- a/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
+++ b/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
@@ -1,12 +1,15 @@
-%% 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.4"
+\version "2.14.0"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
 
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+%% Translation of GIT committish: 8b93de6ce951b7b14bc7818f31019524295b990f
 
  doctitlees = "Forzar el desplazamiento horizontal de las notas"
 
@@ -18,7 +21,7 @@ texidoces = "
 "
 
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
   texidocde = "
 Wenn es zu Zusammenstößen kommt, kann mit folgender Lösung eine andere
 Position manuell eingestellt werden.  Die Einheiten hier sind
@@ -27,6 +30,17 @@ Notenlinienzwischenräume.
 "
   doctitlede = "Horizontale Verschiebung von Noten erzwingen"
 
+%% Translation of GIT committish: 1baa2adf57c84e8d50e6907416eadb93e2e2eb5c
+  texidocfr = "
+Quand LilyPond est dépassé, la propriété @code{force-hshift} de l'objet
+@code{NoteColumn}, et des silences à hauteur déterminée, peuvent
+s'avérer utiles pour dicter au programme les choix de placement.  On
+travaille ici en espace de portée.
+
+"
+  doctitlefr = "Décalage horizontal forcé"
+
+
   texidoc = "
 When the typesetting engine cannot cope, the following syntax can be
 used to override typesetting decisions. The units of measure used here