Re: Git-patch: spanish WAS: /index.es.html has funny titles?
Daniel Tonda wrote: > Greetings: > > Just reporting, that I finally did the pull and here's a surprise, it > didn't complain! > > $ git pull git://git.sv.gnu.org/lilypond.git/ web/master: > Generating pack... > Done counting 120 objects. > Result has 91 objects. > Deltifying 91 objects. > 100% (91/91) done > Unpacking 91 objects > Total 91, written 91 (delta 71), reused 0 (delta 0) > 100% (91/91) done > Trying really trivial in-index merge... > Wonderful. > In-index merge > de/install/getting-started.html|4 > de/switch/testimonials.html| 195 > +--- > es/install/getting-started.html|4 > fr/install/getting-started.html|4 > nl/install/getting-started.html|4 > site/devel/participating/bug-meister.html | 39 ++-- > site/devel/participating/build-meister.html| 29 --- > site/devel/participating/call-for-help.html| 38 +--- > site/devel/participating/documentation-adding.html | 18 -- > site/devel/participating/localization.html |4 > site/devel/participating/release-meister.html | 25 +-- > site/install/getting-started.html |4 > site/install/older-versions.html |6 - > site/news.ihtml| 20 +- > site/old-news.html | 20 ++ > site/sponsor/options.html |4 > 16 files changed, 217 insertions(+), 201 deletions(-) > > > Whoa!!! Looks good. > I went to the website to check that the patches looked ok, and there's > 2.11.9??? > > (the patches are just fine). > > I downloaded the 2.11.8 yesterday! > > Fast, fast, fast... > > Now a question, since the website is going to be mainly maintining and > checking it for typos or additions, I'd like to start on the tutorial, > is it also managed by git? Yes. I haven't documented the user manual translation yet, so may I suggest you to update the web site translation first? I still get fatal: bad object abb073a5a9b3a050525017ef595428c334bcfd9f errors when running 'make LANG=es check-translation', so please fix it first before doing anything. If you don't know how to fix, the safest way is to take a committish from before the first Spanish translation (run git-log and scroll until you find the last commit before "Add Spanish translation"), then write this committish in all files giving a 'fatal: bad object' warning, then check the translation as usual -- all should be explained in README; please complain if it's not clear! Oh, let me tell you which files 'fatal: bad object abb073a5a9b3a050525017ef595428c334bcfd9f' is returned for these pages: es/about/automated-engraving/benchmarking.html es/about/automated-engraving/conclusion.html es/about/automated-engraving/divide-and-conquer.html es/about/automated-engraving/engraving.html es/about/automated-engraving/formatting-architecture.html es/about/automated-engraving/implementing-notation.html es/about/automated-engraving/implementing-typography.html es/about/automated-engraving/index.html es/about/automated-engraving/input-format.html es/about/automated-engraving/introduction.html es/about/automated-engraving/problem-statement.html es/about/automated-engraving/schubert.html es/about/automated-engraving/scoring-esthetics.html es/about/automated-engraving/software.html es/about/automated-engraving/typography-features.html es/about/automated-engraving/big-page.html es/about/faq.html es/about/pubs.html es/install/cygwin.html es/documentation.html Besides that, big-pages.html is generated by a script from all pages of the essay, so it should be ignored (not committed, not translated, and not updated). I've enabled the big page generation for German and Spanish in GNUmakefile. I've also removed the dirty page es/about/automated-engraving/applications.html Before translating the tutorial, LilyPond's es.po should be revised too. Cheers -- John Mandereau <[EMAIL PROTECTED]> ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Git-patch: spanish WAS: /index.es.html has funny titles?
Greetings: Just reporting, that I finally did the pull and here's a surprise, it didn't complain! $ git pull git://git.sv.gnu.org/lilypond.git/ web/master: Generating pack... Done counting 120 objects. Result has 91 objects. Deltifying 91 objects. 100% (91/91) done Unpacking 91 objects Total 91, written 91 (delta 71), reused 0 (delta 0) 100% (91/91) done Trying really trivial in-index merge... Wonderful. In-index merge de/install/getting-started.html|4 de/switch/testimonials.html| 195 +--- es/install/getting-started.html|4 fr/install/getting-started.html|4 nl/install/getting-started.html|4 site/devel/participating/bug-meister.html | 39 ++-- site/devel/participating/build-meister.html| 29 --- site/devel/participating/call-for-help.html| 38 +--- site/devel/participating/documentation-adding.html | 18 -- site/devel/participating/localization.html |4 site/devel/participating/release-meister.html | 25 +-- site/install/getting-started.html |4 site/install/older-versions.html |6 - site/news.ihtml| 20 +- site/old-news.html | 20 ++ site/sponsor/options.html |4 16 files changed, 217 insertions(+), 201 deletions(-) Whoa!!! I went to the website to check that the patches looked ok, and there's 2.11.9??? (the patches are just fine). I downloaded the 2.11.8 yesterday! Fast, fast, fast... Now a question, since the website is going to be mainly maintining and checking it for typos or additions, I'd like to start on the tutorial, is it also managed by git? Daniel Tonda C. 2007/1/5, Johannes Schindelin <[EMAIL PROTECTED]>: Hi, On Fri, 5 Jan 2007, John Mandereau wrote: > Daniel Tonda wrote: > > > > Should I do the pull after the modifications? > > Yes, and it might tell you that you have to merge. I don't think that it will tell you that you have to merge: you have no uncommitted files. It will realize that you have progressed since last pulling (or branching), and that upstream has progressed, too, and perform a merge itself (that is what pull does: fetch _and_ merge). Then it will find that the changes are already in, and be happy. However, do not expect the commit id to be the same as the upstream commit id: Your line of development _is_ different, even if the resulting _tree_ is not, so from now on you will have a side branch from the upstream. But that is okay, since it reflects reality. Ciao, Dscho -- Daniel Tonda C. ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Git-patch: spanish WAS: /index.es.html has funny titles?
Hi, On Fri, 5 Jan 2007, John Mandereau wrote: > Daniel Tonda wrote: > > > > Should I do the pull after the modifications? > > Yes, and it might tell you that you have to merge. I don't think that it will tell you that you have to merge: you have no uncommitted files. It will realize that you have progressed since last pulling (or branching), and that upstream has progressed, too, and perform a merge itself (that is what pull does: fetch _and_ merge). Then it will find that the changes are already in, and be happy. However, do not expect the commit id to be the same as the upstream commit id: Your line of development _is_ different, even if the resulting _tree_ is not, so from now on you will have a side branch from the upstream. But that is okay, since it reflects reality. Ciao, Dscho ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Git-patch: spanish WAS: /index.es.html has funny titles?
Daniel Tonda wrote: > I think this mail got lost somewhere, so I'm re-sending. Sorry, it was "lost" in my private mailbox, I overlooked it. Please send future translation updates only to this list. > After talking to Franciso where he agreed that the titles were > misunderstood i modified the index file and the did: > > $ git-update-index es/index.html > $ git-commit -m "message" > $ git format-patch HEAD^ Patch applied. > The last command gave me what appears to be a diff of the modified > version against the old one, which I attach as a gzipped file so as > not to mangle the coding. > > Should I do the pull after the modifications? Yes, and it might tell you that you have to merge. Cheers -- John Mandereau <[EMAIL PROTECTED]> ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Git-patch: spanish WAS: /index.es.html has funny titles?
I think this mail got lost somewhere, so I'm re-sending. === After talking to Franciso where he agreed that the titles were misunderstood i modified the index file and the did: $ git-update-index es/index.html $ git-commit -m "message" $ git format-patch HEAD^ The last command gave me what appears to be a diff of the modified version against the old one, which I attach as a gzipped file so as not to mangle the coding. Should I do the pull after the modifications? -- Daniel Tonda C. 0001-message.txt.gz Description: GNU Zip compressed data ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: /index.es.html has funny titles?
Daniel Tonda Castillo wrote: > Jan Nieuwenhuizen escribió: > > Hi Daniel, > > > > Congratulations on finishing the Spanish site, we now have 4 complete > > translations! > > > > You're probably working on this (saw your git efforts), but to a > > non-spanish speaker as myself this looks a bit funny > > lilypond.org/web/index.es.html (divider lines by me) > > > >Sumérjase en ... de LilyPond > >--- > >la Etiqueta de la impresión de música > > > > Wher the English site has: > > > >Dive into ... |Ms. Manners > >the LilyPond|of Music Printing > > > Francisco also commented on that. The way it is displayed in english > seems that one reads the title as: > > Dive into... The LilyPond Ms. Manners of Music Printing, yes? No, you're mistaken. Have a more careful look at the layout of lilypond.org front page. There are two distinct columns, with two distincts titles: "Dive into... The LilyPond" for the 1st column, and "Ms. Manners of Music Printing" for the 2nd column. Greetings -- John Mandereau <[EMAIL PROTECTED]> ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: /index.es.html has funny titles?
Jan Nieuwenhuizen escribió: Hi Daniel, Congratulations on finishing the Spanish site, we now have 4 complete translations! You're probably working on this (saw your git efforts), but to a non-spanish speaker as myself this looks a bit funny lilypond.org/web/index.es.html (divider lines by me) Sumérjase en ... de LilyPond --- la Etiqueta de la impresión de música Wher the English site has: Dive into ... |Ms. Manners the LilyPond|of Music Printing Francisco also commented on that. The way it is displayed in english seems that one reads the title as: Dive into... The LilyPond Ms. Manners of Music Printing, yes? The order of the words in Spanish, would be: Sumérjase.. en la etiqueta de LilyPond de la impresión de música. It also could be said: Sumérjase... en la etiqueta de la impresión musical de LilyPond. Ms. Manners is akin to "etiquette" (there's no such thing as Ms. Manners in Spanish). We're working on a better way of putting it. It seems that the titles of the two columns are printed over both columns? Jan. begin:vcard fn:Daniel Tonda Castillo n:Tonda Castillo;Daniel email;internet:[EMAIL PROTECTED] version:2.1 end:vcard ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
/index.es.html has funny titles?
Hi Daniel, Congratulations on finishing the Spanish site, we now have 4 complete translations! You're probably working on this (saw your git efforts), but to a non-spanish speaker as myself this looks a bit funny lilypond.org/web/index.es.html (divider lines by me) Sumérjase en ... de LilyPond --- la Etiqueta de la impresión de música Wher the English site has: Dive into ... |Ms. Manners the LilyPond|of Music Printing It seems that the titles of the two columns are printed over both columns? Jan. -- Jan Nieuwenhuizen <[EMAIL PROTECTED]> | GNU LilyPond - The music typesetter http://www.xs4all.nl/~jantien | http://www.lilypond.org ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
