Merge branch 'lilypond/translation' into staging

diff --combined Documentation/snippets/formatting-lyrics-syllables.ly
index e6fe2e6c34e42a82adc41c399d0fc4e790660e82,4fe20bb4047c0ac84d193704f234bf00a0bbee03..3a1d963b33ee0d895e776ab1ff6f236dc7fd3036
--- 1/Documentation/snippets/formatting-lyrics-syllables.ly
--- 2/Documentation/snippets/formatting-lyrics-syllables.ly
+++ b/Documentation/snippets/formatting-lyrics-syllables.ly
@@@ -7,16 -7,16 +7,24 @@@
  \version "2.14.0"
  
  \header {
+ %% Translation of GIT committish: 5a7301fc350ffc3ab5bd3a2084c91666c9e9a549
+   texidoces = "
+ Es posible usar el modo de marcado para dar formato a sílabas
+ individuales dentro de la letra.
+ 
+ "
+   doctitlees = "Dar formato a sílabas de la letra"
+ 
    lsrtags = "text, vocal-music"
  
 +%% Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
 +  texidoces = "
 +Es posible usar el modo de marcado para dar formato a sílabas
 +individuales dentro de la letra.
 +
 +"
 +  doctitlees = "Dar formato a sílabas de la letra"
 +
  %%%    Translation of GIT committish: f86f00c1a8de0f034ba48506de2801c074bd5422
    texidocde = "
  Textbeschriftungsmodus kann eingesetzt werden, um individuelle Silben im Gesangstext
@@@ -24,7 -24,6 +32,7 @@@ zu formatieren
  
  "
    doctitlede = "Silben im Gesangstext formatieren"
 +
  %%  Translation of GIT committish: d9d1da30361a0bcaea1ae058eb1bc8dd3a5b2e4c
    texidocfr = "
  Le mode markup permet d'individualiser la mise en forme de certaines syllabes.

diff --combined Documentation/translations.itexi
index 3b93db01071b57903b4ea9bd92d4a5b7a882dc20,937a88bd4b9104261989967ebce80856cb552b34..58f80293ef73218f9eeac930f678aabdab8a1126
--- 1/Documentation/translations.itexi
--- 2/Documentation/translations.itexi
+++ b/Documentation/translations.itexi
@@@ -16,7 -16,7 +16,7 @@@ td { border: 1px solid black; text-alig
  
  @end html
  @end ifhtml
- @emph{Last updated Fri Feb 24 11:51:46 UTC 2012
+ @emph{Last updated Sat Feb 25 23:32:38 UTC 2012
  }
  @multitable @columnfractions  0.5 0.5
  
@@@ -108,11 -108,11 +108,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -588,11 -588,11 +588,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -876,11 -876,11 +876,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -1632,11 -1632,11 +1632,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -1908,11 -1908,11 +1908,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -2158,11 -2158,11 +2158,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -2421,11 -2421,11 +2421,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -2868,11 -2868,11 +2868,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -3411,11 -3411,11 +3411,11 @@@ translate
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">up to date</span>
++<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
--up to date
++
  @end ifnothtml
  @tab Yoshiki Sawada
  @*
@@@ -3461,11 -3461,11 +3461,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -3517,6 -3517,6 +3517,7 @@@ Jean-Charles Malahieud
  @end ifnothtml
  @*
  
++@end ifnothtml
  @ifhtml
  
  @html
@@@ -3551,11 -3551,11 +3552,11 @@@ translate
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">up to date</span>
++<span style="background-color: #68ff28">partially up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
--up to date
++partially up to date
  @end ifnothtml
  @tab Federico Bruni
  @*
@@@ -3569,6 -3569,6 +3570,54 @@@
  @ifnothtml
  Luca Rossetto Casel
  @end ifnothtml
++@tab Francisco Vila
++@*
++
++@ifhtml
++
++@html
++<span style="background-color: #1fff1f">translated</span>
++@end html
++@end ifhtml
++@ifnothtml
++translated
++@end ifnothtml
++@*
++
++@ifhtml
++
++@html
++<span style="background-color: #1fff1f">up to date</span>
++@end html
++@end ifhtml
++@ifnothtml
++up to date
++@end ifnothtml
++@tab Valentin Villenave
++@*
++Jean-Charles Malahieude
++@*
++
++@ifhtml
++
++@html
++<small>Jean-Charles Malahieude</small>
++@end html
++@end ifhtml
++@ifnothtml
++Jean-Charles Malahieude
++@end ifnothtml
++@*
++
++@ifhtml
++
++@html
++<small>John Mandereau</small>
++@end html
++@end ifhtml
++@ifnothtml
++John Mandereau
++@end ifnothtml
  @*
  
  @ifhtml
@@@ -3617,11 -3617,11 +3666,11 @@@ translate
  @ifhtml
  
  @html
--<span style="background-color: #68ff28">partially up to date</span>
++<span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
--partially up to date
++up to date
  @end ifnothtml
  @item
  1.3 Expressive marks
@@@ -3644,11 -3644,11 +3693,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -3816,11 -3816,11 +3865,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -3872,6 -3872,6 +3921,7 @@@ John Manderea
  @end ifnothtml
  @*
  
++@end ifnothtml
  @ifhtml
  
  @html
@@@ -3888,7 -3888,7 +3938,7 @@@
  @end html
  @end ifhtml
  @ifnothtml
--translated
++not translated
  @end ifnothtml
  @*
  
@@@ -3938,13 -3938,13 +3988,13 @@@ not translate
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">up to date</span>
++<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
--up to date
++
  @end ifnothtml
--@tab Yoshiki Sawada
++@tab Francisco Vila
  @*
  
  @ifhtml
@@@ -3977,26 -3977,26 +4027,27 @@@ up to dat
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">translated</span>
++<small>Jean-Charles Malahieude</small>
  @end html
  @end ifhtml
  @ifnothtml
--translated
++Jean-Charles Malahieude
  @end ifnothtml
  @*
  
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
  
++@end ifnothtml
  @ifhtml
  
  @html
@@@ -4038,11 -4038,11 +4089,11 @@@ Jean-Charles Malahieud
  @ifhtml
  
  @html
--<small>John Mandereau</small>
++<small>Luca Rossetto Casel</small>
  @end html
  @end ifhtml
  @ifnothtml
--John Mandereau
++Luca Rossetto Casel
  @end ifnothtml
  @*
  
@@@ -4058,11 -4058,11 +4109,11 @@@
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">translated</span>
++<span style="background-color: #d0f0f8">not translated</span>
  @end html
  @end ifhtml
  @ifnothtml
--translated
++not translated
  @end ifnothtml
  @*
  
@@@ -4151,26 -4151,26 +4202,27 @@@ partially up to dat
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">translated</span>
++<small>John Mandereau</small>
  @end html
  @end ifhtml
  @ifnothtml
--translated
++John Mandereau
  @end ifnothtml
  @*
  
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
 -<span style="background-color: #1fff1f">up to date</span>
++<small></small>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
  
++@end ifnothtml
  @ifhtml
  
  @html
@@@ -4219,11 -4219,11 +4271,11 @@@ John Manderea
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">translated</span>
++<span style="background-color: #d0f0f8">not translated</span>
  @end html
  @end ifhtml
  @ifnothtml
--translated
++not translated
  @end ifnothtml
  @*
  
@@@ -4248,6 -4248,6 +4300,11 @@@ up to dat
  @ifnothtml
  Luca Rossetto Casel
  @end ifnothtml
++@item
++2.6 Wind instruments
++@*
++(319)
++@tab Till Paala
  @*
  
  @ifhtml
@@@ -4273,13 -4273,13 +4330,13 @@@ not translate
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">up to date</span>
++<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
--up to date
++
  @end ifnothtml
--@tab Yoshiki Sawada
++@tab Francisco Vila
  @*
  
  @ifhtml
@@@ -4312,11 -4312,11 +4369,11 @@@ up to dat
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">translated</span>
++<small>Jean-Charles Malahieude</small>
  @end html
  @end ifhtml
  @ifnothtml
--translated
++Jean-Charles Malahieude
  @end ifnothtml
  @*
  
@@@ -4329,28 -4329,28 +4386,25 @@@
  @ifnothtml
  up to date
  @end ifnothtml
--@tab Francisco Vila
  @*
  
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">translated</span>
++<small></small>
  @end html
  @end ifhtml
  @ifnothtml
--translated
--@end ifnothtml
--@*
  
++@end ifnothtml
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">up to date</span>
++<span style="background-color: #1fff1f">translated</span>
  @end html
  @end ifhtml
  @ifnothtml
--up to date
++translated
  @end ifnothtml
  @tab Jean-Charles Malahieude
  @*
@@@ -4435,11 -4435,11 +4489,11 @@@ translate
  @ifhtml
  
  @html
--<span style="background-color: #1fff1f">up to date</span>
++<span style="background-color: #25fe1f">partially up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
--up to date
++partially up to date
  @end ifnothtml
  @item
  1.8 Text
@@@ -4462,11 -4462,11 +4516,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -4773,11 -4773,11 +4827,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -5289,11 -5289,11 +5343,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -5582,11 -5582,11 +5636,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #1fff1f">up to date</span>
+ <span style="background-color: #25fe1f">partially up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- up to date
+ partially up to date
  @end ifnothtml
  @item
  2.6 Wind instruments
@@@ -5609,11 -5609,11 +5663,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -5688,11 -5688,11 +5742,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #25fe1f">partially up to date</span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- partially up to date
+ up to date
  @end ifnothtml
  @tab Federico Bruni
  @*
@@@ -5774,22 -5774,22 +5828,8 @@@ partially up to dat
  @end html
  @end ifhtml
  @ifnothtml
--translated
--@end ifnothtml
--@*
  
--@ifhtml
--
--@html
--<span style="background-color: #1fff1f">up to date</span>
--@end html
--@end ifhtml
--@ifnothtml
--up to date
  @end ifnothtml
--@tab Francisco Vila
--@*
--
  @ifhtml
  
  @html
@@@ -6251,11 -6251,11 +6291,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -6412,11 -6412,11 +6452,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -6535,7 -6535,7 +6575,7 @@@ up to dat
  @item
  4 Spacing issues
  @*
- (11112)
+ (11141)
  @tab Till Paala
  @*
  
@@@ -6553,11 -6553,11 +6593,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -6694,11 -6694,11 +6734,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -6751,22 -6751,22 +6791,22 @@@ Gilles Thibaul
  @ifhtml
  
  @html
- <span style="background-color: #dfef77">partially translated (99 %)</span>
+ <span style="background-color: #1fff1f">translated</span>
  @end html
  @end ifhtml
  @ifnothtml
- partially translated (99 %)
+ translated
  @end ifnothtml
  @*
  
  @ifhtml
  
  @html
- <span style="background-color: #25fe1f">partially up to date</span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- partially up to date
+ up to date
  @end ifnothtml
  @tab Federico Bruni
  @*
@@@ -6892,11 -6892,11 +6932,11 @@@ Jean-Charles Malahieud
  @ifhtml
  
  @html
- <span style="background-color: #dfef77">partially translated (84 %)</span>
+ <span style="background-color: #dfef77">partially translated (89 %)</span>
  @end html
  @end ifhtml
  @ifnothtml
- partially translated (84 %)
+ partially translated (89 %)
  @end ifnothtml
  @*
  
@@@ -8809,11 -8809,11 +8849,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -9315,11 -9315,11 +9355,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -9581,11 -9581,11 +9621,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -9854,11 -9854,11 +9894,11 @@@ translate
  @ifhtml
  
  @html
 -<span style="background-color: #1fff1f">up to date</span>
 +<span style="background-color: #d587ff"></span>
  @end html
  @end ifhtml
  @ifnothtml
 -up to date
 +
  @end ifnothtml
  @tab Francisco Vila
  @*
@@@ -10396,11 -10396,11 +10436,11 @@@ translate
  @ifhtml
  
  @html
- <span style="background-color: #d587ff"></span>
+ <span style="background-color: #1fff1f">up to date</span>
  @end html
  @end ifhtml
  @ifnothtml
- 
+ up to date
  @end ifnothtml
  @tab Francisco Vila
  @*