Re: GIT pull error
It now works properly with the command: git pull git://git.sv.gnu.org/lilypond.git/ web/master:web/master Daniel Tonda C. Karl Hammar wrote: [EMAIL PROTECTED]: Sorry. Now I actually checked: the url is http://git.sv.gnu.org/r/lilypond.git (Note that not only http://; is new, but also /r/). Ok, so I update this file: $ grep URL .git/remotes/origin URL: http://git.sv.gnu.org/r/lilypond.git $ in my local copy, $ git-pull Fetching refs/heads/master from http://git.sv.gnu.org/r/lilypond.git using http got 6ba19b9f48c1ce10adb30a69557ce38b8a073785 walk 6ba19b9f48c1ce10adb30a69557ce38b8a073785 ... and things works again. Regards /Karl ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel 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
Re: Updated spanish translation
Greetings: After the update what do you recommend that the spanish translation team tackle? Daniel Tonda C. John Mandereau escribió: Le lundi 08 janvier 2007 à 04:03 -0600, Daniel Tonda Castillo a écrit : Second: There's a typo in site/about/automated-engraving/input-format.html . Where it says: The above is another expression, and therefore, it many combined again with a simultaneous expression (in this case, a half note). Probably should read: The above is another expression, and therefore, it may be combined again with a simultaneous expression (in this case, a half note). Thanks, fixed. Greetings -- Anyone who has had a bull by the tail knows five or six more things than someone who hasn't. -- Mark Twain 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
Re: Translators' git-tips
This is a very concise and excellent quick git for us mere translators. Daniel Tonda C. Jean-Charles escribió: For proofreading, commenting... before sharing on the wiki Jean-Charles = CREATE A LOCAL REPOSITORY = 1- Create the directory and jump in it mkdir Git-Repo ; cd Git-Repo 2- download a copy of the remote repository git init-db git fetch git://git.sv.gnu.org/soft.git/ branch:branch where branch:branch means name of the remote branch delimiter (:) name for the local copy of this branch 3- create my bench in this workshop git checkout -b mybranch branch where mybranch represents an alias for my personal work on the local repository. This way, I leave the local copy intact. = UPDATING THE LOCAL COPY OF THE REPOSITORY = git pull git://git.sv.gnu.org/soft.git/ branch:branch where branch:branch means name of the remote branch delimiter (:) name for the local copy of this branch ADDING A BRAND NEW FILE (TO MY WORKING COPY) git add THE_NEW_FILE == MY BENCH IN THE LILYPOND.ORG SITE WORKSHOP == 1- I update the local workshop, in order to take in account what others have changed, before working on anything. git pull git://git.sv.gnu.org/lilypond.git/ web/master:web/master 2- I check that the already online translations correspond to the riginal version; I hate subtitles. cd GIT/web/ ; emacs M-X compile make LANG=fr check-translation = details everything that is not synchron, like: diff --git a/site/about/automated-engraving/input-format.html b/site/about/automated-engraving/input-format.html index 3f314ef..4e6af1d 100644 --- a/site/about/automated-engraving/input-format.html +++ b/site/about/automated-engraving/input-format.html @@ -30,7 +30,7 @@ typable, e.g., c'4 d'8 /pre Are a quarter note C1 and eighth note D1, as in this example: -p align=center +p align=center img src=@[EMAIL PROTECTED] p THE FILE /site/about/automated-engraving/input-format.html HAS BEEN MODIFIED AT LINE 30. IT IS MY DUTY TO UPDATE THE FILE CALLED /fr/about/automated-engraving/input-format.html. I OPEN IT: C-x C-f /fr/about/automated-engraving/input-format.html. BECAUSE OF MY POOR EYES, I PREFER ACCENTS TO HTML CODING: M-x html-accents I SEARCH A LINE AROUND THE THIRTIETH THAT CORRESPONDS TO A FRENCH VERSION. IT IS NUMBER 31: c'4 d'8 /pre sont un do noire et un ré croche, comme dans cet exemplenbsp;: /p I MODIFY WHAT HAS TO BE: double quote where it belongs I ENCODE ACCENTS INTO HTML BEFORE SAVING: M-x accents-html C-x C-s I OPEN A CONSOLE AND GENERATE A REVISION NUMBER THAT I WILL COPY INTO THE FILE /fr/about/automated-engraving/input-format.html. [EMAIL PROTECTED] web]$ git-rev-parse web/master 78aeb69f041a646876af8d863d34eeecf505f39b I COPY THIS 40 CHARACTERS STRING INTO EMACS'S SCRATCH BUFFER, ESPECIALLY IF I HAVE MADE MANY MODIFICATIONS, SAVE THE FILE WITH ITS NEW REVISION SCORE: C-x C-s AND CLOSE IT: C-x k I CHECK THAT THERE HAS BEEN NO DISTURBANCE SINCE MY LAST VISIT: M-X compile make LANG=fr check-translation WHICH ANSWERS ME: cd /home/jcharles/GIT/web/ make LANG=fr check-translation python scripts/check-translation.py fr/about/automated-engraving/benchmarking.html fr/about/automated-engraving/conclusion.html fr/about/automated-engraving/divide-and-conquer.html fr/about/automated-engraving/engraving.html fr/about/automated-engraving/formatting-architecture.html fr/about/automated-engraving/implementing-notation.html fr/about/automated-engraving/implementing-typography.html fr/about/automated-engraving/index.html fr/about/automated-engraving/input-format.html fr/about/automated-engraving/introduction.html fr/about/automated-engraving/problem-statement.html fr/about/automated-engraving/schubert.html fr/about/automated-engraving/scoring-esthetics.html fr/about/automated-engraving/software.html fr/about/automated-engraving/typography-features.html fr/about/browser-language.html fr/about/faq.html fr/about/features.html fr/about/index.html fr/about/name.html fr/about/pubs.html fr/about/thanks.html fr/documentation.html fr/index.html fr/install/cygwin.html fr/install/getting-started.html fr/install/index.html fr/install/macos.html fr/install/using.html fr/sponsor/index.html fr/sponsor/natura.html fr/sponsor/options.html fr/switch/advantages.html fr/switch/howto.html fr/switch/index.html fr/switch/new-notation.html fr/switch/testimonials.html fr/switch/tour.html Compilation finished at Sat Jan 6 22:17:34 I CONSIDER THIS AS GOOD NEWS. M-x git-status Select directory: ~/GIT/web/ IT TELLS ME: Directory:
Re: Felicidades
Manuel escribió:
Hola, Daniel, ¿cómo anda todo eso por esas bellas tierras?
Con lo de
\version 2.11.11
PERC = \relative {
}
Estaba haciendo otra cosa y lo pegué por accidente y luego lo envié,
erróneamente, estaba viendo doble de lo cansado ya. Disculpas...
me mataste. No tengo ni la más remota idea de lo que será PERC = y
tampoco lo encontré en el tutorial (yo estoy todavía con 2.10.0 por
cobarde). Me rindo con armas y bagajes.
Te cuento que siguiendo el enlace que puso Claus Rogge llegué hasta acá:
http://cdbaby.com/cd/aishaduo
¿Qué te parece?
Como veo tu tutorial está muy bien, es un starter-kit, y digo que
así está bien. Hay muchas cosas que se necesitan para lo de lilypond,
y eso, una guía super sencilla que intrigue al usuario está muy bien y
hacía falta.
Te seguiré contando. Magnífico tu correo a
la lista.
Espero no haber caído gordo...
Mirá, como siempre en la vida, en todas partes se cuecen habas y cada
cual tiene sus pareceres. Pienso que un programa como Lily es una
especie de destornillador para el que lo quiera usar: cada uno sabrá
qué tornillos quiere poner o sacar. Una excelente herramienta. Para
hacerla hubo que saber música y programación, y tener talento. Bueno,
al que da lo que tiene, no se le pida más. Para curar, un médico. Para
enseñar, nosotros.
Es que a menudo en el mundo linux o en el mundo de desarrolladores, los
que hacen el programa, creen que saben lo que el usuario necesita.
Sí, lo del \repeat no me tiene del todo convencido. Pero eso se puede
dejar o volver a cambiar. Más me preocupa no poder reducir el ramaño
de las imágenes. Recién terminé de subirlas todas. Lo de los ejemplos
no me parece nada mal como vos lo pusiste, creo que ocupando todo el
ancho de la línea está bien, el lector ve que de acá hasta acá es un
ejemplo de código Lily, por lo que a mí respecta se puede dejar así. A
tu juicio.
Tienes razón.
\repeat
{
Un gran abrazo,
Manuel
}
;-)
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
Spanish translation update
Just in case the translation update got list among the huge threads, I resend in bz2 all the patches. Daniel Tonda C. -- I'll burn my books. -- Christopher Marlowe patches-2007-01-09.tar.bz2 Description: application/bzip 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
Re: Fixed bad committish and es.po in spanish web site
John Mandereau escribió: Le dimanche 07 janvier 2007 à 03:40 -0600, Daniel Tonda Castillo a écrit : Daniel Tonda Castillo escribió: John Mandereau escribió: Daniel Tonda wrote: I changed the committish ids for files showing a bad committish when doing: make LANG=es check-translation Looks good. Your next work on lilypond.org is certainly the translation update: make LANG=es check-translation shows a 1200 lines diff! ¿What do you mean by translation update? Haven't you read the whole README? You have finished the web site translation, this is very cool. Recently, the English pages have changed a lot, so you should update the Spanish translation as explained in the README. That's not urgent, but it is important. I estimate it is good to run make LANG=es check-translation once or twice a week: if you don't have time to immediately update the translation, it at least shows you waht should be updated. Sorry, I did read but should go back to it now and then, to remember it. I did that and indeed there's a bunch of diffs which I will attack. When the command shows no output, then the whole thing is updated? Before translating the tutorial, LilyPond's es.po should be revised too. I did some revising of es.po also, are there any special considerations for es.po? I was talking about _LilyPond_'s es.po, not _lilypond.org_'s one. You can check out Git LilyPond sources to get it. ¿Oh, you mean the one from the program? ¿Is that also in git? I'm sorry I'm just git cloning it with instructions from: http://lilypond.org/web/devel/. :) Yes. So, I suppose you're working on master branch, which is used to release the development series. I've just finished the revision/translation of es.po for the lilypond program. I was wondering how to test it in my sistem but ignor how to do it. I'm running ubuntu. I ran msgfmt through es.po and es_MX.po (for now the same file), and converted it to lilypond.mo, and copied it to /usr/local/lilypond/usr/share/locale/es*/LC_MESSAGES/lilypond.mo. Ran lilypond and made some error cases to see if the messages appeared in spanish but alas, messages come in english so I suppose I'm doing things incorrectly, for the moment. Got it, have to place lilypond.mo in /usr/share/locale/es/LC_MESSAGES/ Is lilypond --help output in Spanish? Which editor do you use for the .po? Maybe Spanish messages don't appear because you have to remove unwanted fuzzy marks (KBabel should do this automatically when you edit entries), or you may need to compile LilyPond. Anyway, it should work in the next released Mac OS X, Linux and FreeBSD GUB binaries. About es.po for lilypond, should it be in ISO-8859-1 or in UTF-8 encoding? I compiled the es.po first as UTF-8 and the terminal shows weird strings in Ubuntu. Then I compiled the es.po as ISO-8859-1 and then the terminal appeared correctly, so I guess for now, I will use ISO-8859-1. I'm supposing UTF because most *.po are in UTF-8 in the lilypond source. I attach two patches from git format-patch HEAD^, first is the revision/translation of pending messages, and second is the conversion to UTF-8. .po files have to be in UTF-8. AFAICT LilyPond always uses UTF-8. I've applied your patches. I'm puzzled why you added an identical es_MX.po file, though; do you plan to make differences between them? Cheers Ok, for the moment let's remove es_MX.po, and I'll work only in es.po. After compiling it and placing it in the proper location I tried some lilypond code that would show errors to see the output in spanish and it looks great so far. I also fixed some strings which overlapped in the standard xterm size, so I'm attaching the diff. Daniel Tonda C. 0001-Fixed-some-strings-in-es.po.txt.gz Description: GNU Zip compressed data 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
Re: Fixed bad committish and es.po in spanish web site
John Mandereau escribió: Daniel Tonda wrote: I changed the committish ids for files showing a bad committish when doing: make LANG=es check-translation Looks good. Your next work on lilypond.org is certainly the translation update: make LANG=es check-translation shows a 1200 lines diff! ¿What do you mean by translation update? I've also removed the dirty page es/about/automated-engraving/applications.html So whatever is done to this page is of no consequence from now on? It might become an untracked file when you pull; in this case, just rm it. If it's still in your repository after that, rm it and do commit -a. Ok, doing the pull. Before translating the tutorial, LilyPond's es.po should be revised too. I did some revising of es.po also, are there any special considerations for es.po? I was talking about _LilyPond_'s es.po, not _lilypond.org_'s one. You can check out Git LilyPond sources to get it. ¿Oh, you mean the one from the program? ¿Is that also in git? I attach the diffs, for the bad committish and es.po. Thanks, applied. Cheers -- Nada mas difícil, pero nada mas precioso que el saber decidirse. -- Napoleón Bonaparte. (1769-1821) Emperador francés. 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
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
Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish
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ó: 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... es/sponsor/index.html: needs merge es/sponsor/options.html: needs merge es/switch/howto.html: needs merge fatal: you need to resolve your current index first Nope. Merging HEAD with 745ee84ea5b583686e53dc2628e5067492997773 Merging: afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f message 745ee84ea5b583686e53dc2628e5067492997773 Resolving conflicts with [EMAIL PROTECTED]:/srv/git/lilypond.git#web/master found 1 common ancestor(s): ac5da2c7e90f10ce8a680b275d1e33b10462c4ea Merge branch 'web/master' of git://git.sv.gnu.org/lilypond into web/master git-read-tree: fatal: you need to resolve your current index first No merge strategy handled the merge. git-rev-list shows one thing, and git-rev-parse another: git-rev-list HEAD | head -1 afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f git-rev-parse web/master 745ee84ea5b583686e53dc2628e5067492997773 Which would be the best way to handle this? Should I just start over? Before the pull and as the last thing, I did the commit -m with no files and got the vim edition of which files would be commited, etc. So I commented thos to be committed (in the es/ directory) and saved the file. git-status didn't show any uncommitted files after that. Did you have any uncommitted local changes before merging? i.e. did git status complained about Changed but not updated files? If not, that's already a good thing. Then, for each file git-pull reported a conflict about, open it in a text editor, go to the conflict zones (marked with , === and ), merge the 2 versions manually, junk any conflict mark and save the file, then run git update-index on this file. After all that, commit and the merge should be complete. However, it seems according to git-pull output that you haven't committed files in es/sponsor/; you should add them or run git-update-index on them before resolving other conflicts. Try to report the result of your experiments. It might work better than restarting from scratch. Here's the output of the git-pull: Ok, here goes a session of git: git pull git://git.sv.gnu.org/lilypond.git/ web/master:web/master Trying really trivial in-index merge... fatal: Untracked working tree file '.gitignore' would be overwritten by merge. Nope. Merging HEAD with 745ee84ea5b583686e53dc2628e5067492997773 Merging: afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f message 745ee84ea5b583686e53dc2628e5067492997773 Resolving conflicts with [EMAIL PROTECTED]:/srv/git/lilypond.git#web/master found 1 common ancestor(s): ac5da2c7e90f10ce8a680b275d1e33b10462c4ea Merge branch 'web/master' of git://git.sv.gnu.org/lilypond into web/master git-read-tree: fatal: Untracked working tree file '.gitignore' would be overwritten by merge. No merge strategy handled the merge. === Now git-status reports this: # # Updated but not checked in: # (will commit) # #deleted: .gitignore #deleted: GNUmakefile #deleted: README #deleted: TRANSLATION #deleted: colors.css #deleted: de/about/faq.html #deleted: de/about/index.html #deleted: de/contact.ihtml #deleted: de/index.html #deleted: de/install/cygwin.html #deleted: de/install/getting-started.html #deleted: de/install/index.html #deleted: de/install/macos.html #deleted: de/install/using.html #deleted: de/startevim.sh #deleted: de/switch/advantages.html #deleted: de/switch/howto.html #deleted: de/switch/index.html #deleted: de/switch/testimonials.html #deleted: de/switch/tour.html #deleted: es/about/automated-engraving/applications.html #deleted: es/about/automated-engraving/benchmarking.html #deleted: es/about/automated-engraving/big-page.html #deleted: es/about/automated-engraving/conclusion.html #deleted: es/about/automated-engraving/divide-and-conquer.html #deleted: es/about/automated-engraving/engraving.html #deleted: es/about/automated-engraving/formatting-architecture.html #deleted: es/about/automated-engraving/implementing-notation.html #deleted: es/about/automated-engraving/implementing-typography.html #deleted: es/about/automated-engraving/index.html #deleted: es/about/automated-engraving/input-format.html #deleted: es/about/automated-engraving/introduction.html #deleted: es/about/automated-engraving/problem-statement.html #deleted: es/about/automated-engraving
Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish
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/sponsor/options.html: needs merge es/switch/howto.html: needs merge fatal: you need to resolve your current index first Nope. Merging HEAD with 745ee84ea5b583686e53dc2628e5067492997773 Merging: afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f message 745ee84ea5b583686e53dc2628e5067492997773 Resolving conflicts with [EMAIL PROTECTED]:/srv/git/lilypond.git#web/master found 1 common ancestor(s): ac5da2c7e90f10ce8a680b275d1e33b10462c4ea Merge branch 'web/master' of git://git.sv.gnu.org/lilypond into web/master git-read-tree: fatal: you need to resolve your current index first No merge strategy handled the merge. git-rev-list shows one thing, and git-rev-parse another: git-rev-list HEAD | head -1 afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f git-rev-parse web/master 745ee84ea5b583686e53dc2628e5067492997773 Which would be the best way to handle this? Should I just start over? Daniel Tonda C. 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
GIT errors?
After finishing the priority 3 files which already have been sent, I tried to do a pull to merge everything and get the newest web site. Locally there were no errors when committing, this seems to have happened after putting a different committish after the first commit. After a bunch of errors concerning merge, I thought to start over again in a new directory, just to keep the original files I translated intact. So i went to the savanah place listed on the wiki at: http://lilypondwiki.tuxfamily.org/index.php?title=Translations_HOWTO to start translating and get a fresh source. I got too many errors and gave up. Here's a recap of what went on: = Following instructions here: http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=README;hb=web/master $ git fetch git://git.sv.gnu.org/lilypond.git/ web/master:web/master I do a ls -a and all I get is: $ . $ .. $ .git Shouldn't something live here besides .git? Now the next item: $ git checkout -b myweb web/master fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree. Use '--' to separate paths from revisions fatal: Not a valid object name HEAD $ git log fatal: bad default revision 'HEAD' So I'm stopping all git stuff because the instructions seem to be incorrect. Daniel Tonda C. 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
Re: Priority 1 Translation of web site to spanish
John Mandereau wrote: Le vendredi 29 décembre 2006 à 04:51 -0600, Daniel Tonda a écrit : Hello: I'm attaching a bzipped tarball containing the priority 1 items in the TRANSLATION document, following the instructions on the wiki. Great, I've committed and pushed to web/master. Han-Wen and/or Jan may still add some stuff so that the translation really comes online. The instructions on the wiki are only intended to give useful hints and to avoid reading full git documentation. That's not been achieved yet, as there are more useful git/cg commands than with cvs. Anyway, the Translations HOWTO is a complement to README and TRANSLATION, which are the official instructions. From what I gather, so far if no write acces is provided, the most important git commands would seem to be clone and patch, but patch is still not clear for me yet. Thanks to Manuel, who pointed out some mistakes in the beginner's tutorial i went over the web site again and revised some stuff. What do you mean? What have you exactly revised? Ortographic errors in the spanish version which I thought was finished but was not. Yes, that looks good. The committish number is in fact the checksum of the last commit, so it is not associated to any particular file. After you made sure the translation is up to date (ie you checked against the English pages or you updated translations according to 'make LANG=es chack-translation' output), the most simple thing to do is to copy the last committish into the concerned translated files. Btw, isn't scripts/rev-to-commit.py intended to automate this work? So all the website if there are no commits would have the same committish? When and if you upload, the next time I would do git-clone again and It will overwrite whatever I did with what is on the server? What's the Spanish for 'Spanish'? It could be used in the 'Other languages' menu preferably to the English 'Spanish' ;-) Ok, the spanish for spanish is: Español. Another nitpick: are you the only translator or are you in a team? All translators should be credited in about/thanks#website. There's Francisco Vila also. 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
Re: Priority 1 Translation of web site to spanish
Han-Wen Nienhuys wrote: Daniel Tonda Castillo escreveu: The instructions on the wiki are only intended to give useful hints and to avoid reading full git documentation. That's not been achieved yet, as there are more useful git/cg commands than with cvs. Anyway, the Translations HOWTO is a complement to README and TRANSLATION, which are the official instructions. From what I gather, so far if no write acces is provided, the most important git commands would seem to be clone and patch, but patch is still not clear for me yet. I don't mind providing write access, but I think it's best if you get a little comfortable with using GIT first. You are indeed a wise man, ¡I'd probably wreak havoc! I've also taken the liberty of adding Franciso and myself to the thanks.html page for the spanish translation in the phase 2 documents, which I'll mail shortly. Daniel Tonda C. 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
Re: Priority 1 Translation of web site to spanish
John Mandereau wrote:
Daniel Tonda Castillo wrote:
John Mandereau wrote:
[...]
From what I gather, so far if no write acces is provided, the most
important git commands would seem to be clone and patch, but patch is
still not clear for me yet.
No, you only use clone to initially clone the repository, then you do
git-pull to update (see Johannes Schindelin's message sent today at
18:01 for a good explanation, or wait for me to update the README file).
Ok, now in the original README:
After translating I do:
git-add whatever file has been translated
git commit -m 'add file' file
scripts/check-translation.py file
Yes, that looks good. The committish number is in fact the checksum of
the last commit, so it is not associated to any particular file. After
you made sure the translation is up to date (ie you checked against the
English pages or you updated translations according to 'make LANG=es
chack-translation' output), the most simple thing to do is to copy the
last committish into the concerned translated files. Btw, isn't
scripts/rev-to-commit.py intended to automate this work?
So all the website if there are no commits would have the same committish?
Yes. My last question was asked to the developers.
When and if you upload, the next time I would do git-clone again and It
will overwrite whatever I did with what is on the server?
No. First, it is git-pull; in fact you should first commit your changes
to your local copy of the repository, so there isn't any conflict when
you update from the sv.gnu.org repository. To be precise, you should do
the following commands at top of the source directory:
git-add po/es.po
... and do the same for every new file (do 'git-status' to see which
files are untracked, deleted, or changed and not committed).
Then do
git-pull origin
It should fetch the remote repository (ie update the local copy of the
remote branch, called 'origin'), then merge the 'origin' branch into
'master' ('master' is the local branch you work on).
You can list the branches with 'git-show-branch'.
ok
Thanks. The translation is online; can you check whether the pages are
OK (ideally you should see translated pages automagically when visiting
lilypond.org with your browser),
¡Looks great!
and can you please write a short
announcement in Spanish, which will be added to the news section?
Announcement:
-
¡Ya está disponible la versión en español del sitio web de LilyPond!
-
Thanks in advance,
Daniel Tonda C.
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
Re: Priority 2 Translation of web site to spanish
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 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
About dangling directory for priority 3 files
For the priority 3 files, the TRANSLATION document show these: 3 sponsor/ 3 about/automated-engraving/ http://lilypond.org/web/about/automated-engraving/ 3 about/faq.html -- http://lilypond.org/web/about/faq.html 3 about/pubs.html -- http://lilypond.org/web/about/pubs.html 3 documentation.html -- http://lilypond.org/web/documentation.html 3 install/cygwin.html -- http://lilypond.org/web/install/cygwin.html When there's a path without any file like in sponsor/ ¿which file is it referring to, the whole directory or the index.html file? Thanks! 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
Re: Help with git and LilyPond Tutorial
It seems to be more concise, and I'll try it later on. ¡Thanks! Daniel Tonda C. 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
Re: Help with git and LilyPond Tutorial
Ok, here is an example for one of the files I've translated so far: $ git add es/install/macos.html $ git commit -m 'add file' es/install/macos.html Before all this happened, to get the full documentation I followed all instructions: mkdir web ; cd web git init-db touch empty ; git add empty ; git commit -m 'empty' empty git pull git://git.sv.gnu.org/lilypond.git/ web/master: git repack. So after finishing the first phase (all files marked as priority 1), I thought the safe thing to do was commit all translations to git. But the commands in the README are not very helpful. It says to do: SUBMIT TO GIT git push If you do not have GIT write access, send patches to your translation sponsor, or the the lilypond-user list. I also read the man page for git push and found out it confuses me more than it helps. It talks about refs/head but I have no clue what that is supposed to mean. I even got an account at savannah and can log in via the browser, but only in view mode. I tried the different incantations of ssh+git... commands and get this: git push ssh+git://[EMAIL PROTECTED]/srv/git/lilypond.git/ Permission denied (publickey). fatal: unexpected EOF So I probably have the refs part absent. Is there a specific sequence of commands one must do to get this working? Since the translation to spanish doesn't exist do I have to create a branch (i.e. es)? Or would it be preferable to pack the created documents in a tarball and send them to the devel list? I'm sorry to pester you so much, but git seems to really be rocket science. Daniel Tonda C. So I thought I'd use the command as shown above, which of course I now know doesn't work. I looked in Johannes Schindelin wrote: Hi, On Tue, 26 Dec 2006, Daniel Tonda wrote: After each modification I have done: git add es/file git commit -m 'add file' es/file You could -- in theory -- provide a little bit more specific commit messages... After finishing the translation session I've tried: git push I get the following output: $ git push fatal: 'origin': unable to chdir or not a git archive fatal: unexpected EOF It means that the default upstream server (origin) is not set in your setup. You should rather do something like $ git push [EMAIL PROTECTED]:directory master:refs/heads/remote-branch where [EMAIL PROTECTED]:directory is the upstream host, and remote-branch is the name you want your work to be visible after the push. I don't know what these settings are for LilyPond in your case, sorry. But once you have them, you can set the default (so that git push works) with $ git repo-config remote.origin.url [EMAIL PROTECTED]:directory $ git repo-config remote.origin.push master:refs/heads/remote-branch Hth, Dscho 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
