From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Thu, 24 May 2012 15:17:47 +0000 (+0200)
Subject: Merge branch 'translation' into staging
X-Git-Tag: release/2.15.40-1~15
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=30339cb3706f6399c84607426988b25f79b4998c;p=lilypond.git

Merge branch 'translation' into staging

Conflicts:
	Documentation/de/notation/input.itely
---

30339cb3706f6399c84607426988b25f79b4998c
diff --cc Documentation/de/notation/input.itely
index 0675766ead,7f664bf2c7..680745a04f
--- a/Documentation/de/notation/input.itely
+++ b/Documentation/de/notation/input.itely
@@@ -1246,10 -1246,10 +1246,10 @@@ Fußnoten für Akkordnoten werden wie f
    \header { tagline = ##f }
    \relative c' {
      <
-     c-\footnote "1" #'(1 . -1.25) "1. C" \default
-     es-\footnote
-        \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" \default
-     g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" } \default
 -    c\footnote "1" #'(1 . -1.25) "1. C"
 -    es\footnote
 -       \markup { \bold "b" } #'(2 . -0.25) "b. Es"
 -    g\footnote "3" #'(2 . 3) \markup { \italic "iii. G" }
++    \footnote "1" #'(1 . -1.25) "1. C" c
++    \footnote
++       \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" es
++    \footnote "3" #'(2 . 3) \markup { \italic "iii. G" } g
      >1
    }
  }