From: Francisco Vila Date: Thu, 1 Mar 2012 12:59:42 +0000 (+0100) Subject: Merge branch 'lilypond/translation' into staging X-Git-Tag: release/2.15.32-1~18 X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=e885a8cabc8335f1c46c48e92d4048e9d258cd10 Merge branch 'lilypond/translation' into staging --- e885a8cabc8335f1c46c48e92d4048e9d258cd10 diff --cc Documentation/snippets/formatting-lyrics-syllables.ly index e6fe2e6c34,4fe20bb404..3a1d963b33 --- a/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 diff --cc Documentation/translations.itexi index 3b93db0107,937a88bd4b..58f80293ef --- a/Documentation/translations.itexi +++ b/Documentation/translations.itexi @@@ -3411,11 -3411,11 +3411,11 @@@ translate @ifhtml @html --up to date ++ @end html @end ifhtml @ifnothtml --up to date ++ @end ifnothtml @tab Yoshiki Sawada @* @@@ -3517,6 -3517,6 +3517,7 @@@ Jean-Charles Malahieud @end ifnothtml @* ++@end ifnothtml @ifhtml @html @@@ -3551,11 -3551,11 +3552,11 @@@ translate @ifhtml @html --up to date ++partially up to date @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 ++translated ++@end html ++@end ifhtml ++@ifnothtml ++translated ++@end ifnothtml ++@* ++ ++@ifhtml ++ ++@html ++up to date ++@end html ++@end ifhtml ++@ifnothtml ++up to date ++@end ifnothtml ++@tab Valentin Villenave ++@* ++Jean-Charles Malahieude ++@* ++ ++@ifhtml ++ ++@html ++Jean-Charles Malahieude ++@end html ++@end ifhtml ++@ifnothtml ++Jean-Charles Malahieude ++@end ifnothtml ++@* ++ ++@ifhtml ++ ++@html ++John Mandereau ++@end html ++@end ifhtml ++@ifnothtml ++John Mandereau ++@end ifnothtml @* @ifhtml @@@ -3617,11 -3617,11 +3666,11 @@@ translate @ifhtml @html --partially up to date ++up to date @end html @end ifhtml @ifnothtml --partially up to date ++up to date @end ifnothtml @item 1.3 Expressive marks @@@ -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 --up to date ++ @end html @end ifhtml @ifnothtml --up to date ++ @end ifnothtml --@tab Yoshiki Sawada ++@tab Francisco Vila @* @ifhtml @@@ -3977,11 -3977,11 +4027,11 @@@ up to dat @ifhtml @html --translated ++Jean-Charles Malahieude @end html @end ifhtml @ifnothtml --translated ++Jean-Charles Malahieude @end ifnothtml @* @@@ -3997,6 -3997,6 +4047,7 @@@ up to dat @tab Francisco Vila @* ++@end ifnothtml @ifhtml @html @@@ -4038,11 -4038,11 +4089,11 @@@ Jean-Charles Malahieud @ifhtml @html --John Mandereau ++Luca Rossetto Casel @end html @end ifhtml @ifnothtml --John Mandereau ++Luca Rossetto Casel @end ifnothtml @* @@@ -4058,11 -4058,11 +4109,11 @@@ @ifhtml @html --translated ++not translated @end html @end ifhtml @ifnothtml --translated ++not translated @end ifnothtml @* @@@ -4151,18 -4151,18 +4202,18 @@@ partially up to dat @ifhtml @html --translated ++John Mandereau @end html @end ifhtml @ifnothtml --translated ++John Mandereau @end ifnothtml @* @ifhtml @html - -up to date ++ @end html @end ifhtml @ifnothtml @@@ -4171,6 -4171,6 +4222,7 @@@ up to dat @tab Francisco Vila @* ++@end ifnothtml @ifhtml @html @@@ -4219,11 -4219,11 +4271,11 @@@ John Manderea @ifhtml @html --translated ++not translated @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 --up to date ++ @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 --translated ++Jean-Charles Malahieude @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 --translated ++ @end html @end ifhtml @ifnothtml --translated --@end ifnothtml --@* ++@end ifnothtml @ifhtml @html --up to date ++translated @end html @end ifhtml @ifnothtml --up to date ++translated @end ifnothtml @tab Jean-Charles Malahieude @* @@@ -4435,11 -4435,11 +4489,11 @@@ translate @ifhtml @html --up to date ++partially up to date @end html @end ifhtml @ifnothtml --up to date ++partially up to date @end ifnothtml @item 1.8 Text @@@ -5774,22 -5774,22 +5828,8 @@@ partially up to dat @end html @end ifhtml @ifnothtml --translated --@end ifnothtml --@* --@ifhtml -- --@html --up to date --@end html --@end ifhtml --@ifnothtml --up to date @end ifnothtml --@tab Francisco Vila --@* -- @ifhtml @html