Merge branch 'master' into lilypond/translation

[lilypond.git] / input / texidocs / beams-across-line-breaks.texidoc

diff --git a/input/texidocs/beams-across-line-breaks.texidoc b/input/texidocs/beams-across-line-breaks.texidoc
index 3bbab2dfc962bc87c72db71d23e08386b1c832e5..c5f0b8125b9d5de3071fd7861844b9be3645ddaf 100644 (file)
--- a/input/texidocs/beams-across-line-breaks.texidoc
+++ b/input/texidocs/beams-across-line-breaks.texidoc
@@ -1,3 +1,4 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
   texidoces = "
 Normalmente están prohibidos los saltos de línea si las barras
 atraviesan las líneas divisorias.  Se puede cambiar este
@@ -5,3 +6,22 @@ comportamiento como se muestra aquí:
 
 "
   doctitle = "Barras que atraviesan saltos de línea"
+  
+%% Translation of GIT committish: 6ce7f350682dfa99af97929be1dec6b9f1cbc01a
+  
+texidocde = "
+Zeilenumbrüche sind normalerweise während Balken verboten.  Das kann geändert
+werden.
+
+"
+  doctitlede = "Balken über Zeilenumbrüche"
+
+
+%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
+  
+  texidocfr = "
+Il est normalement impensable qu'un saut de ligne tombe au milieu d'une
+ligature.  LilyPond permet néanmoins de l'obtenir.
+
+"
+  doctitlefr = "Ligature au moment d'un saut de ligne"