Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish

2007-01-03 Thread John Mandereau
Daniel Tonda Castillo wrote: > The funny thins is that before I did any pull, everything worked out > just fine. This might be a problem due to my using cogito in ubuntu > I'll try to compile a newer version of git and use that instead. In the > meantime what are your suggestions? If you don't

Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish

2007-01-03 Thread Daniel Tonda Castillo
The funny thins is that before I did any pull, everything worked out just fine. This might be a problem due to my using cogito in ubuntu. I'll try to compile a newer version of git and use that instead. In the meantime what are your suggestions? Daniel Tonda C. John Mandereau escribió: Dani

Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish

2007-01-03 Thread John Mandereau
Daniel Tonda Castillo wrote: > I get a lot of merge errors, after the git-pull: > > git-rev-parse web/master > 745ee84ea5b583686e53dc2628e5067492997773 > [EMAIL PROTECTED]: lilypond]$ git pull > git://git.sv.gnu.org/lilypond.git/ web/master:web/master > Trying really trivial in-index merge... > e

Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish

2007-01-02 Thread Daniel Tonda Castillo
I get a lot of merge errors, after the git-pull: git-rev-parse web/master 745ee84ea5b583686e53dc2628e5067492997773 [EMAIL PROTECTED]: lilypond]$ git pull git://git.sv.gnu.org/lilypond.git/ web/master:web/master Trying really trivial in-index merge... es/sponsor/index.html: needs merge es/sponso

Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish

2007-01-02 Thread John Mandereau
Daniel Tonda wrote: > I'm sorry but I made a mistake concerning the title of the second mail: > "Priority 2 Translation of web site to spanish" > > It was supposed to be for the: > Priority 3 Translation of web site to spanish > > I attach it again just in c

Re: Priority 2 Translation of web site to spanish

2007-01-02 Thread Daniel Tonda
Ok, thanks! 2007/1/2, John Mandereau <[EMAIL PROTECTED]>: Daniel Tonda wrote: > I've finished the priority 3 files for the lilypond-web site: > > According to the mail I sent about dangling directory, the files should be: > > es/sponsor/index.html > es/sponsor/natura.html > es/sponsor/options.ht

Re: Priority 2 Translation of web site to spanish

2007-01-02 Thread John Mandereau
Daniel Tonda wrote: > I've finished the priority 3 files for the lilypond-web site: > > According to the mail I sent about dangling directory, the files should be: > > es/sponsor/index.html > es/sponsor/natura.html > es/sponsor/options.html > es/about/automated-engraving/applications.html > es/ab

Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish

2006-12-30 Thread Daniel Tonda
I'm sorry but I made a mistake concerning the title of the second mail: "Priority 2 Translation of web site to spanish" It was supposed to be for the: Priority 3 Translation of web site to spanish I attach it again just in case it went unnoticed because of the title. My ap

Re: Priority 2 Translation of web site to spanish

2006-12-30 Thread Johannes Schindelin
Hi, On Sat, 30 Dec 2006, Daniel Tonda wrote: > ¿The commitish id has changed for these files, this is the expected > behaviour? Yes. A commit in git is sort of a tag: It contains everything which makes up a revision. So, if you say "git commit", you actually construct a new state from the _wh

Priority 2 Translation of web site to spanish

2006-12-30 Thread Daniel Tonda
I've finished the priority 3 files for the lilypond-web site: According to the mail I sent about dangling directory, the files should be: es/sponsor/index.html es/sponsor/natura.html es/sponsor/options.html es/about/automated-engraving/applications.html es/about/automated-engraving/benchmarking.

Priority 2 Translation of web site to spanish

2006-12-29 Thread Daniel Tonda
For some reason, this mail was rejected, so I'll send it again. - This is the translation of phase 2 documents from the web site. From the TRANSLATION file, there's only four files

Re: Priority 2 Translation of web site to spanish

2006-12-29 Thread Daniel Tonda Castillo
Hi! This is the translation of phase 2 documents from the web site. From the TRANSLATION file, there's only four files, ¿that is correct? Daniel Tonda C. Priority_2_translation_es-2006-12-29.tar.bz2 Description: application/bzip begin:vcard fn:Daniel Tonda Castillo n:Tonda Castillo;Daniel ema