Here is a new set of Catalan translation for review:
http://puna.upf.edu/0054-Doc-ca-Translation-of-vocal-of-Notation-manual.patch -- Walter Garcia-Fontes L'Hospitalet de Llobregat |
Le 15/12/2017 à 15:00, Walter Garcia-Fontes a écrit :
> Here is a new set of Catalan translation for review: > > http://puna.upf.edu/0054-Doc-ca-Translation-of-vocal-of-Notation-manual.patch > I cannot push it as is : in Documentation/ca/notation.bigtexi.log : WARNING: Unable to find node 'Elaborar cançons senzillas' in book learning. and, from Documentation/ca/ (stable/2.20)]$ git grep -n 'Elaborar cançons' learning/common-notation.itely:1039:* Elaborar cançons senzilles:: learning/common-notation.itely:1045:@node Elaborar cançons senzilles learning/common-notation.itely:1046:@subsection Elaborar cançons senzilles learning/fundamental.itely:341:@code{\addlyrics} de @ref{Elaborar cançons senzilles}. notation/vocal.itely:69:@rlearning{Elaborar cançons senzilles}. notation/vocal.itely:95:@rlearning{Elaborar cançons senzillas}. Please take the habit to check the log-files (warnings about snippets and internals may be of no importance) and amend your patch. I'll take care of it on Tuesday (not available before). By the way, your patch introduced trailing spaces. Cheers , Jean-Charles |
Thanks Jean Charles,
It looks that no matter how long I work in this (it has been already 5 or 6 years), I never get to produce clean patches all the time. I swear I revised the logs and, apart from the snippets warnings, I couldn't see any of these errors. And the compilation finished without any errors. The trailing white spaces are also puzzling, I use emacs and I have configured all possible controls to avoid that. Anyway, I'll try again. Best, Walter * Jean-Charles Malahieude, [hidden email] [15/12/17 21:02]: > Le 15/12/2017 à 15:00, Walter Garcia-Fontes a écrit : > > Here is a new set of Catalan translation for review: > > > > http://puna.upf.edu/0054-Doc-ca-Translation-of-vocal-of-Notation-manual.patch > > > > I cannot push it as is : > > in Documentation/ca/notation.bigtexi.log : > > WARNING: Unable to find node 'Elaborar cançons senzillas' in book learning. > > > and, from Documentation/ca/ > > (stable/2.20)]$ git grep -n 'Elaborar cançons' > learning/common-notation.itely:1039:* Elaborar cançons senzilles:: > learning/common-notation.itely:1045:@node Elaborar cançons senzilles > learning/common-notation.itely:1046:@subsection Elaborar cançons senzilles > learning/fundamental.itely:341:@code{\addlyrics} de @ref{Elaborar cançons > senzilles}. > notation/vocal.itely:69:@rlearning{Elaborar cançons senzilles}. > notation/vocal.itely:95:@rlearning{Elaborar cançons senzillas}. > > > Please take the habit to check the log-files (warnings about snippets and > internals may be of no importance) and amend your patch. > I'll take care of it on Tuesday (not available before). > > By the way, your patch introduced trailing spaces. > > Cheers , > Jean-Charles -- Walter Garcia-Fontes mailto: [hidden email] - http://puna.upf.edu Departament d'Economia i Empresa - http://www.econ.upf.edu Universitat Pompeu Fabra Ramon Trias Fargas 25-27, 08005 Barcelona, Spain Tel. +34 93 542 2722 - Fax. +34 93 542 1746 |
Le 16/12/2017 à 10:29, Walter Garcia-Fontes a écrit :
> Thanks Jean Charles, > > It looks that no matter how long I work in this (it has been already 5 > or 6 years), I never get to produce clean patches all the time. I swear I > revised the logs and, apart from the snippets warnings, I couldn't see > any of these errors. And the compilation finished without any > errors. That's right, but in NR 2.1.1 – Referències per a música vocal, if you click on Manual de aprenentatge: Elaborar cançons senzillas. you'll notice that /learning/elaborar-cancons-senzillas.ca.html#elaborar-can_00e7ons-senzillas doesn't exist. Note that the spelling differs with the first item (Gairebé tots els estils de música vocal utilitzen text escrit com a lletra. Hi ha una introducció a aquesta notació a Elaborar cançons senzilles.) Here is the tail of Documentation/ca/notation.bigtexi.log: WARNING: Unable to find node 'Expressions' in book snippets. WARNING: Unable to find node 'Elaborar cançons senzillas' in book learning. WARNING: Unable to find node 'Música vocal' in book snippets. WARNING: Unable to find node 'Keep contexts alive' in book notation. WARNING: Unable to find node 'Música vocal' in book snippets. WARNING: Unable to find node 'Chord notacion' in book notation. WARNING: Unable to find node 'Chord notacion' in book notation. WARNING: Unable to find node 'Música vocal' in book snippets. WARNING: Unable to find node 'Música vocal' in book snippets. WARNING: Unable to find node 'Música vocal' in book snippets. WARNING: Unable to find node 'Música vocal' in book snippets. WARNING: Unable to find node 'Modifying context plugins' in book notation. WARNING: Unable to find node 'Expressions' in book snippets. WARNING: Unable to find node 'Altures' in book snippets. WARNING: Unable to find node 'Arpegi' in book internals. I don't care about warnings dealing with "book snippets" or "book internals". 'Modifying context plugins' in book notation. This is normal since it hasn't yet been translated; same case for 'Keep contexts alive'. But book learning has been translated… I must have skidded on the keyboard! > The trailing white spaces are also puzzling, I use emacs and I > errors. The trailing white spaces are also puzzling, I use emacs and I > have configured all possible controls to avoid that. > I've added this line in my .emacs: (add-hook 'before-save-hook 'delete-trailing-whitespace) I've to leave now. Cheers, Jean-Charles |
In reply to this post by Walter Garcia-Fontes
* Jean-Charles Malahieude, [hidden email] [16/12/17 12:05]:
> Le 16/12/2017 à 10:29, Walter Garcia-Fontes a écrit : > > Thanks Jean Charles, > > > > It looks that no matter how long I work in this (it has been already 5 > > or 6 years), I never get to produce clean patches all the time. I swear I > > revised the logs and, apart from the snippets warnings, I couldn't see > > any of these errors. And the compilation finished without any > > errors. > > That's right, but in NR 2.1.1 – Referències per a música vocal, if > you click on > > Manual de aprenentatge: Elaborar cançons senzillas. > > you'll notice that > /learning/elaborar-cancons-senzillas.ca.html#elaborar-can_00e7ons-senzillas > doesn't exist. Note that the spelling differs with the first item > (Gairebé tots els estils de música vocal utilitzen text escrit com a > lletra. Hi ha una introducció a aquesta notació a Elaborar cançons > senzilles.) > > Here is the tail of Documentation/ca/notation.bigtexi.log: > > WARNING: Unable to find node 'Expressions' in book snippets. > WARNING: Unable to find node 'Elaborar cançons senzillas' in book learning. > WARNING: Unable to find node 'Música vocal' in book snippets. > WARNING: Unable to find node 'Keep contexts alive' in book notation. > WARNING: Unable to find node 'Música vocal' in book snippets. > WARNING: Unable to find node 'Chord notacion' in book notation. > WARNING: Unable to find node 'Chord notacion' in book notation. > WARNING: Unable to find node 'Música vocal' in book snippets. > WARNING: Unable to find node 'Música vocal' in book snippets. > WARNING: Unable to find node 'Música vocal' in book snippets. > WARNING: Unable to find node 'Música vocal' in book snippets. > WARNING: Unable to find node 'Modifying context plugins' in book notation. > WARNING: Unable to find node 'Expressions' in book snippets. > WARNING: Unable to find node 'Altures' in book snippets. > WARNING: Unable to find node 'Arpegi' in book internals. > > I don't care about warnings dealing with "book snippets" or "book > internals". > > 'Modifying context plugins' in book notation. This is normal since > it hasn't yet been translated; same case for 'Keep contexts alive'. > > But book learning has been translated… I must have skidded on the keyboard! > > > > The trailing white spaces are also puzzling, I use emacs and I > > errors. The trailing white spaces are also puzzling, I use emacs and I > > have configured all possible controls to avoid that. > > > > I've added this line in my .emacs: > > (add-hook 'before-save-hook 'delete-trailing-whitespace) Thanks, the error is clear. What I wonder is why I don't see it when I finish the compilation. I'm translating complete chapters, so as it's normal that I get a lot of errors when I start compiling. For those the compilation aborts until I clean all of them. I keep revising the logs until I don't see any more and the compilation finishes without any error. Then, just in case, the build tree and compile everythingfrom scratch. At this point I don't see any error. But still, I send the patches and the errors pop again and I look stupid as if I didn't revise my logs. I also have that line in my .emacs since long ago. But don't worry, I will persist, I'm not too far away of finishing this translation. Best and thanks, Walter -- Walter Garcia-Fontes L'Hospitalet de Llobregat |
Il giorno sab 16 dic 2017 alle 18:38, Walter Garcia-Fontes <[hidden email]> ha scritto: > > > What I wonder is why I don't see it when I > finish the compilation. I'm translating complete > chapters, so as it's normal that I get a lot of > errors when I start compiling. For those the > compilation aborts until I clean all of them. > I keep revising the logs until I don't see any > more and the compilation finishes without any > error. Then, just in case, the build tree and > compile everythingfrom scratch. At this point > I don't see any error. But still, I send the > patches and the errors pop again and I look stupid > as if I didn't revise my logs. > I can only guess that: 1. you did not commit the changes which fixed the errors 2. or you committed the fixes without using the --amend option, so two patch files are generated and you shared only the first patch (not the second containing the fixes) (but you should use `git commit --amend` and send a single patch file) |
* Federico Bruni, [hidden email] [17/12/17 08:54]:
> 1. you did not commit the changes which fixed the errors > 2. or you committed the fixes without using the --amend option, so > two patch files are generated and you shared only the first patch > (not the second containing the fixes) > > (but you should use `git commit --amend` and send a single patch file) Thanks Federico, I think there is another thing I'm doing wrong. Let me explain my steps and see if we can figure where I'm screwing up. Once I compile in my branch and I'm sure the compilation finishes without any errors and I revise the logs and I only see the snippets and repeated nodes warnings, I do the following. I commit my changes, I checkout the translation branch and "git pull" to make sure it is up to date. It was for this patch. I went back to my branch, and I issued: git format-patch origin These created to my surprise: 0001-Doc-ja-update-LM.patch 0002-Bump-version-to-2.19.80-for-stable-prereleases.patch 0003-Doc-ca-Catalan-translation-of-the-notation-manual-ex.patch 0004-Web-Add-a-new-document-to-what-We-Wrote-list.patch 0005-Doc-es-update-Notation-Simultaneous.patch 0006-Web-es-update-Introduction.patch 0007-Doc-es-update-one-texidoc.patch 0008-Doc-ja-update-Usage.patch 0009-Doc-ja-fix-cindex-in-NR.patch 0010-Fix-issue-5110-Don-t-use-fixed-color-for-LyricHyphen.patch 0011-Doc-typo-in-Changes-and-Notation-Text.patch 0012-Doc-fr-updates-NR-and-Changes.patch 0013-Doc-it-update.patch 0014-Doc-run-translation-update.patch 0015-Reorganize-entries-for-2.20-release.patch 0016-Doc-ja-update-NR-Musical-notation.patch 0017-Doc-ja-update-NR-partially-to-fix-compilation-errors.patch 0018-More-improvements-to-Changes.tely-items.patch 0019-Doc-it-fix-wrong-italian-sentence.patch 0020-Changes.tely-fix-whitespace-and-semi-colons.patch 0021-Issue-5171-Self_alignment_interface-aligned_on_self-.patch 0022-Issue-5175-Update-URW-OTF-files.patch 0023-Issue-5137-1-Doc-Add-how-to-change-the-notation-font.patch 0024-Issue-5137-2-Doc-Add-how-to-use-set-global-fonts-for.patch 0025-Register-Merge_rests_engraver.patch 0026-Doc-Add-section-on-SVG-to-Contributor.patch 0027-Issue-5195-Don-t-segfault-on-c-1.patch 0028-Standardize-format-of-in_color.patch 0029-Issue-5191-EG-a-bit-of-grob-transformer-documentatio.patch 0030-Typo.patch 0031-Issue-5197-Include-direction-marker-in-post-event-lo.patch 0032-Issue-5180-Require-version-statement-in-main-file.patch 0033-Define-ly-music-error.patch 0034-Issue-5203-Don-t-let-event-chord-reduce-bomb-on-empt.patch 0035-Issue-5200-display-lily-tests.ly-Remove-unused-lily-.patch 0036-Issue-5205-chordmode-c-sus-should-be-c-f-g-not-c-g-g.patch 0037-Issue-5204-Remove-white-space-from-storePredefinedDi.patch 0038-Issue-5206-Remove-apostroph-in-backend-options-of-ge.patch 0039-Pitches.itely-Typo-Harmonia-Sacra-not-Harmonica-Sacr.patch 0040-Doc-fr-updates-changes-and-NR.patch 0041-Release-bump-VERSION_DEVEL.patch 0042-PO-update-template.patch 0043-Release-update-news.patch 0044-Release-bump-Welcome-versions.patch 0045-PO-fetch-es-fr-it-and-ja-from-FTP.patch 0046-Doc-es-update-all-except-Changes-which-is-too-hard-f.patch 0047-Doc-es-mark-Changes-as-up-to-date-until-it-is-actual.patch 0048-PO-fetch-Dutch-from-FTP.patch 0049-Changes.tely-Typo-fix-TexInfo-markup.patch 0050-Doc-ja-update-NR-Spcialist-notation.patch 0051-Doc-ja-minor-changes-relevant-to-terms-of-ancient-no.patch 0052-Doc-ja-fix-some-compilation-errors.patch 0053-Doc-fr-fix-commit-IDs.patch 0054-Doc-ca-Translation-of-vocal-of-Notation-manual.patch Then I submitted 0054, which is what I think Jean-Claude tried to apply. But up there I see also a previous patch of mine which was already merged some months ago. How come I'm getting all these patches? Just to make sure, I saved all the files changed in my last round of changes, cloned a new git repository, created a new personal branch, merged all the saved changes, created a clean compilation, made sure my branch was up to date, created the patches, and again, I'm getting all these old patches. I think that is the problem I'm having, somehow all these previous patches are not applied in my repository, even if I start from scratch. Thanks again and sorry for the fuzz, Walter -- Walter Garcia-Fontes L'Hospitalet de Llobregat |
On Sun, Dec 17, 2017 at 1:32 PM, Walter Garcia-Fontes <[hidden email]> wrote: > * Federico Bruni, [hidden email] [17/12/17 08:54]: >> 1. you did not commit the changes which fixed the errors >> 2. or you committed the fixes without using the --amend option, so >> two patch files are generated and you shared only the first patch >> (not the second containing the fixes) >> >> (but you should use `git commit --amend` and send a single patch >> file) > > Thanks Federico, > > I think there is another thing I'm doing wrong. Let me explain my > steps and see if we can figure where I'm screwing up. > > Once I compile in my branch and I'm sure the compilation finishes > without any errors and I revise the logs and I only see the snippets > and repeated nodes warnings, I do the following. I commit my changes, > I checkout the translation branch and "git pull" to make sure it is up > to date. It was for this patch. I went back to my branch, and I > issued: > > git format-patch origin > > These created to my surprise: > No surprise, you should specify the remote branch you want to compare to. In your case it's translation: git format-patch origin/translation The syntax is: git format-patch <since> which will generate all the patch files of commits following <since>. Note that origin and origin/translation point to different commits, as you can see with these commands: git show origin git show origin/translation |
* Federico Bruni, [hidden email] [17/12/17 13:51]:
> No surprise, you should specify the remote branch you want to compare to. In > your case it's translation: > > git format-patch origin/translation Thanks again, I was suspecting it was something stupid on my part. Here is the new patch: http://puna.upf.edu/catalan_dec2017.zip Happy break to all who take it! -- Walter Garcia-Fontes L'Hospitalet de Llobregat |
Free forum by Nabble | Edit this page |