From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Fri, 29 Jul 2011 09:31:45 +0000 (+0200)
Subject: Merge branch 'lilypond/translation'
X-Git-Tag: release/2.15.7-1~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9a7759a2afdfa3e0d5b88cf02576d8fcb7fcaab7;p=lilypond.git

Merge branch 'lilypond/translation'

Conflicts:
	Documentation/snippets/string-quartet-template-with-separate-parts.ly
---

9a7759a2afdfa3e0d5b88cf02576d8fcb7fcaab7
diff --cc Documentation/snippets/string-quartet-template-with-separate-parts.ly
index c2bf8c0185,bf82a3cea0..786c53729c
--- a/Documentation/snippets/string-quartet-template-with-separate-parts.ly
+++ b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
@@@ -30,69 -30,9 +30,6 @@@ Non dimenticare di togliere i commenti 
    lsrtags = "unfretted-strings, template"
  
  
 -
--
--
  %% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
    texidoces = "
  El fragmento de código @qq{Plantilla de cuarteto de cuerda} produce un