Merge branch 'translation' into staging

Conflicts:
	Documentation/de/notation/input.itely

diff --cc Documentation/de/notation/input.itely
index 0675766ead959cc8d7575b5dd81e4c750ba50d1a,7f664bf2c71076b1af903f3230929401ce3bee00..680745a04fc9293511ed82fb7c5e9db760ca3e80
--- 1/Documentation/de/notation/input.itely
--- 2/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
    }
  }

diff --cc Documentation/es/notation/input.itely
Simple merge

diff --cc Documentation/fr/notation/input.itely
Simple merge