italian website PATCH

classic Classic list List threaded Threaded
24 messages Options
12
Reply | Threaded
Open this post in threaded view
|

italian website PATCH

Federico Bruni-2
Hi all,

can anyone please have a look at the attached patch?

It's the italian translation of the website.
I made it two months ago, but unfortunately I didn't know I should have asked for feedback here (instead I wrote personally to John, sorry again for the nuisance).
I forgot to add the name of the proofreader (Luca Rossetto Casal), I'll do it afterwards.

Thanks,
Federico

0001-Web-it-add-italian-translation.patch (128K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Francisco Vila
Federico,

2010/6/16 Federico Bruni <[hidden email]>:

> Hi all,
>
> can anyone please have a look at the attached patch?
>
> It's the italian translation of the website.
> I made it two months ago, but unfortunately I didn't know I should have
> asked for feedback here (instead I wrote personally to John, sorry again for
> the nuisance).
> I forgot to add the name of the proofreader (Luca Rossetto Casal), I'll do
> it afterwards.

I'll give it a look in a few hours.  In the meantime, could you test
whether your patch applies cleanly to the latest HEAD of the
lilypond/translation branch? Thanks.

--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Federico Bruni-2
Hi Francisco,

thanks for your help so far.
I put translations list in CC.

2010/6/16 Francisco Vila <paconet.org@gmail.com>
2010/6/16 Francisco Vila <paconet.org@gmail.com>:
> 2010/6/16 Francisco Vila <paconet.org@gmail.com>:
>> I'll give it a look in a few hours.  In the meantime, could you test
>> whether your patch applies cleanly to the latest HEAD of the
>> lilypond/translation branch? Thanks.
>
> Unfortunately it does not apply, there is a problem in the file
> scripts/build/website_post.py
>
> Hopefully pulling and rebasing from the commit which includes your
> patch, will put your work on top as I said before.  Then try to format
> a new one from this.
>
> Alternatively, tell me which commit is your patch based on, and I'll
> try to do those tasks.

Well. Here is the situation. I've applied and pushed your patch except
the part which affects to the file I mentioned. Now the problem is
that 'make website' gives warnings.  Could you try to solve them?


I'm trying...
 
They are:

** Node following `Notazione' in menu `Uso' and in sectionning
`Utilizzo' differ
** `Utilizzo' doesn't appear in menus
** `Manuali' is up for `Utilizzo', but has no menu entry for this node
** No node following `Utilizzo' in menu, but `Frammenti di codice'
follows in sectionning
** Node following `Pubblicazioni' in menu `Vecchie notizie' and in
sectionning `Notizie vecchie' differ
** `Notizie vecchie' doesn't appear in menus
** `Comunità' is up for `Notizie vecchie', but has no menu entry for this node

This should be fixed.
Just some nodes having two different names at the same time.

The following errors about unknown commands are a mystery to me.
Can anyone give me a clue?

 
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
217)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
227)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
236)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
246)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
259)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
261)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
263)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
275)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
284)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
298)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
307)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
318)
** Unknown command with braces `@exampleImage' (in
/home/fravd/source/lilypond/Documentation/it/web/introduction.itexi l.
329)
** Unknown command with braces `@rweb' (in
/home/fravd/source/lilypond/Documentation/it/web/download.itexi l. 211
in @divClass)
** Unknown command with braces `@rweb' (in
/home/fravd/source/lilypond/Documentation/it/web/download.itexi l. 307
in @divClass)
** Unknown command `@help' (left as is) (in
/home/fravd/source/lilypond/Documentation/it/web/download.itexi l.
330)
** Unknown command with braces `@rweb' (in
/home/fravd/source/lilypond/Documentation/it/web/download.itexi l. 464
in @divClass)
*** Unknown node in menu entry `Uso' (in
/home/fravd/source/lilypond/Documentation/it/web/manuals.itexi l. 132
in @divEnd)
** Unknown command `@help' (left as is) (in
/home/fravd/source/lilypond/Documentation/it/web/manuals.itexi l. 514)
*** Undefined node `Vecchie notizie' in @ref (in
/home/fravd/source/lilypond/Documentation/it/web/community.itexi l.
40)
*** Unknown node in menu entry `Vecchie notizie' (in
/home/fravd/source/lilypond/Documentation/it/web/community.itexi l.
55)
** Unknown command with braces `@rweb' (in
/home/fravd/source/lilypond/Documentation/it/web/community.itexi l.
410 in @divClass)

--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com

Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Federico Bruni-2
I've commited the changes made two days ago (which hopefully will fix the warnings of 'make website').
Then I run git pull -r

But I have conflicts (see below).
Also, how can I add the last few changes to the existing patch?

Thanks for your help

#######################################################################


First, rewinding head to replay your work on top of it...
Applying: Web-it: add italian translation
Using index info to reconstruct a base tree...
<stdin>:2107: trailing whitespace.
delle funzionalità tipografiche più avanzate, come la ripartizione di travature
<stdin>:3404: trailing whitespace.
Quasi tutte le funzionalità di formattazione usate internamente sono
<stdin>:365: new blank line at EOF.
+
<stdin>:1265: new blank line at EOF.
+
<stdin>:2944: new blank line at EOF.
+
warning: 5 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging Documentation/it/web/community.itexi
CONFLICT (add/add): Merge conflict in Documentation/it/web/community.itexi
Auto-merging Documentation/it/web/download.itexi
CONFLICT (add/add): Merge conflict in Documentation/it/web/download.itexi
Auto-merging Documentation/it/web/introduction.itexi
CONFLICT (add/add): Merge conflict in Documentation/it/web/introduction.itexi
Auto-merging Documentation/it/web/manuals.itexi
CONFLICT (add/add): Merge conflict in Documentation/it/web/manuals.itexi
Auto-merging scripts/build/website_post.py
CONFLICT (content): Merge conflict in scripts/build/website_post.py
Failed to merge in the changes.
Patch failed at 0001 Web-it: add italian translation

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Francisco Vila
2010/6/18 Federico Bruni <[hidden email]>:
> I've commited the changes made two days ago (which hopefully will fix the
> warnings of 'make website').
> Then I run git pull -r
>
> But I have conflicts (see below).

You'll have to resolve them. Need advice on this? If it's not in the
CG, we can talk about it here.

Basically, it's choosing one off both alternatives marked with
<<<<<<<< in your files, then committing the result.

> Also, how can I add the last few changes to the existing patch?

You don't modify existing patches; rather you create new ones.

 git format-patch <from>..<until>

--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Federico Bruni-2
Hi Francisco,

2010/6/18 Francisco Vila <paconet.org@gmail.com>
2010/6/18 Federico Bruni <[hidden email]>:
> I've commited the changes made two days ago (which hopefully will fix the
> warnings of 'make website').
> Then I run git pull -r
>
> But I have conflicts (see below).

You'll have to resolve them. Need advice on this? If it's not in the
CG, we can talk about it here.

Basically, it's choosing one off both alternatives marked with
<<<<<<<< in your files, then committing the result.


The CG points to a section of the git-merge manual.
I'm reading it but I can't understand how can I see these differences marked with <<<<<<<<<<<<<
Hint?
 
> Also, how can I add the last few changes to the existing patch?

You don't modify existing patches; rather you create new ones.

 git format-patch <from>..<until>


ok, so I'll create a second patch when I have fixed the conflicts of the first one... right?

Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Francisco Vila
2010/6/18 Federico Bruni <[hidden email]>:

>> Basically, it's choosing one off both alternatives marked with
>> <<<<<<<< in your files, then committing the result.
>>
>
> The CG points to a section of the git-merge manual.
> I'm reading it but I can't understand how can I see these differences marked
> with <<<<<<<<<<<<<
> Hint?

They are in the conflicting file, search for "<<<<" and you'll
probably be directed to it.  Once found, choose one block or another,
as in

           Here are lines that are either unchanged from the common
           ancestor, or cleanly resolved because only one side changed.
           <<<<<<< yours:sample.txt
           Conflict resolution is hard;
           let's go shopping.
           =======
           Git makes conflict resolution easy.
           >>>>>>> theirs:sample.txt
           And here is another line that is cleanly resolved or unmodified.


[taken from git merge --help]

Remove the '<<<<<...'  '=====...' and '>>>>>...' lines, and leave only
one of the in between line blocks.

--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Francisco Vila
In reply to this post by Federico Bruni-2
2010/6/18 Federico Bruni <[hidden email]>:
>> You don't modify existing patches; rather you create new ones.
>>
>>  git format-patch <from>..<until>
>>
>
> ok, so I'll create a second patch when I have fixed the conflicts of the
> first one... right?

Yes but firstly focus on

  - making a commit after which 'git status' does not show weird messasges
  - make sure you are in the right branch
  - git pull -r

and if everything goes well, make a patch.

--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Francisco Vila
In reply to this post by Federico Bruni-2
2010/6/18 Federico Bruni <[hidden email]>:
> First, rewinding head to replay your work on top of it...
> Applying: Web-it: add italian translation
> Using index info to reconstruct a base tree...
> <stdin>:2107: trailing whitespace.
> delle funzionalità tipografiche più avanzate, come la ripartizione di
> travature

Remove the trailing space og the line 2107.

> <stdin>:3404: trailing whitespace.
> Quasi tutte le funzionalità di formattazione usate internamente sono

Same.

> <stdin>:365: new blank line at EOF.
> +

Go to line 365 of the patch; the file diff that starts at this point
adds a blank line at the end of the file (many lines downwards).

> <stdin>:1265: new blank line at EOF.
> +

Same.

Alternatively to the git mess you could eventually enter, you could do
the following.

 -- Save your modified files the way you think they should be, with safe names.
 -- Git reset --hard to a revision just before your changes.
 -- Git pull to update your tree
 -- Copy your modified files back to their original names
 -- Commit these differences
 -- Make a patch from this.

When I don't understand what's happening (more often than not), this
method usually works.

The problem would be: if someone modified any lines after your
changes, these modifications would be lost. That's what git was
invented for :-)


--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Federico Bruni-2
In reply to this post by Francisco Vila


2010/6/18 Francisco Vila <paconet.org@gmail.com>
2010/6/18 Federico Bruni <[hidden email]>:
>> You don't modify existing patches; rather you create new ones.
>>
>>  git format-patch <from>..<until>
>>
>
> ok, so I'll create a second patch when I have fixed the conflicts of the
> first one... right?

Yes but firstly focus on

 - making a commit after which 'git status' does not show weird messasges
 - make sure you are in the right branch
 - git pull -r

and if everything goes well, make a patch.


Ok, I've fixed the conflicts in the files.

Then I
run git rebase --continue and Git applyed the two commits I made (see the output below).

Is it OK? Should I just create the second patch for the second commit?

Should I use 'git format-patch origin'?


###############################


fede@debian:~/lilypond-translation$ git status
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#    both added:         Documentation/it/web/community.itexi
#    both added:         Documentation/it/web/download.itexi
#    both added:         Documentation/it/web/introduction.itexi
#    both added:         Documentation/it/web/manuals.itexi
#    both modified:      scripts/build/website_post.py
#
no changes added to commit (use "git add" and/or "git commit -a")
fede@debian:~/lilypond-translation$ git add .
fede@debian:~/lilypond-translation$ git status
# Not currently on any branch.
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#    modified:   Documentation/it/web/community.itexi
#    modified:   Documentation/it/web/download.itexi
#    modified:   Documentation/it/web/manuals.itexi
#    modified:   scripts/build/website_post.py
#
fede@debian:~/lilypond-translation$ git rebase --continue
Applying: Web-it: add italian translation
Applying: Web-it: fixed some errors about node names
fede@debian:~/lilypond-translation$ git status
# On branch lilypond/translation
# Your branch is ahead of 'origin/lilypond/translation' by 2 commits.
#
nothing to commit (working directory clean)
Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Francisco Vila
2010/6/18 Federico Bruni <[hidden email]>:

> fede@debian:~/lilypond-translation$ git status
> # On branch lilypond/translation
> # Your branch is ahead of 'origin/lilypond/translation' by 2 commits.
> #
> nothing to commit (working directory clean)

For your work consisting of two commits on top, do

  git format-patch -2

--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Federico Bruni-2


2010/6/18 Francisco Vila <paconet.org@gmail.com>
2010/6/18 Federico Bruni <[hidden email]>:

> fede@debian:~/lilypond-translation$ git status
> # On branch lilypond/translation
> # Your branch is ahead of 'origin/lilypond/translation' by 2 commits.
> #
> nothing to commit (working directory clean)

For your work consisting of two commits on top, do

 git format-patch -2


Ok, done.

I've tried 'make website ' (after deleting out-website) but I still get these warnings.
I thaught I had fixed the node names problem... but there's still something wrong.
The main problem is 'unknown command..': what does it mean?

I need your help to fix this... and now I'm leaving, we'll see tonight.

#######################################################################

Initializing settings for web site: [it]
*** Undefined node `Notizie vecchie' in @ref (l. 119 in @divClass)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 217)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 227)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 236)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 246)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 259)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 261)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 263)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 275)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 284)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 298)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 307)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 318)
** Unknown command with braces `@exampleImage' (in /home/fede/lilypond-translation/Documentation/it/web/introduction.itexi l. 329)
** Unknown command with braces `@rweb' (in /home/fede/lilypond-translation/Documentation/it/web/download.itexi l. 211 in @divClass)
** Unknown command with braces `@rweb' (in /home/fede/lilypond-translation/Documentation/it/web/download.itexi l. 307 in @divClass)
** Unknown command `@help' (left as is) (in /home/fede/lilypond-translation/Documentation/it/web/download.itexi l. 330)
** Unknown command with braces `@rweb' (in /home/fede/lilypond-translation/Documentation/it/web/download.itexi l. 464 in @divClass)
** Unknown command `@help' (left as is) (in /home/fede/lilypond-translation/Documentation/it/web/manuals.itexi l. 514)
** Unknown command with braces `@rweb' (in /home/fede/lilypond-translation/Documentation/it/web/community.itexi l. 410 in @divClass)
mass-link.py
Initializing settings for web site: [nl]
mass-link.py
cp /home/fede/lilypond-translation/Documentation/css/*.css out-website/website/
mkdir -p out-website/website/pictures/
cp Documentation/pictures/out-www//* out-website/website/pictures/
cp: cannot stat `Documentation/pictures/out-www//*': No such file or directory
make[1]: *** [website-pictures] Error 1
make[1]: Leaving directory `/home/fede/lilypond-translation'
make: *** [website] Error 2

Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Francisco Vila
2010/6/18 Federico Bruni <[hidden email]>:
> Ok, done.
>
> I've tried 'make website ' (after deleting out-website) but I still get
> these warnings.
> I thaught I had fixed the node names problem... but there's still something
> wrong.
> The main problem is 'unknown command..': what does it mean?

exampleImage is a macro. We have our macros defined in
LANG/macros.itexi as you can see from the output of

  git grep exampleImage

I can see the exampleImage macro defined in all LANGs except 'it';
therefore, you should copy and translate that macro definition to your
macros.itexi file.

  @macro exampleImage{IMAGE-FILE}
  ...

Don't forget to fill in the committish in web.texi

--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Federico Bruni-2
Hi,

'make website' gives me two errors now


Initializing settings for web site: [it]
** Unknown command `@help' (left as is)
(in /home/fede/lilypond-translation/Documentation/it/web/download.itexi
l. 330)
mass-link.py
Initializing settings for web site: [nl]
mass-link.py
cp /home/fede/lilypond-translation/Documentation/css/*.css
out-website/website/
mkdir -p out-website/website/pictures/
cp Documentation/pictures/out-www//* out-website/website/pictures/
cp: cannot stat `Documentation/pictures/out-www//*': No such file or
directory
make[1]: *** [website-pictures] Error 1
make[1]: Leaving directory `/home/fede/lilypond-translation'
make: *** [website] Error 2


ERROR 1:
Why the command is 'cp Documentation/pictures/out-www//*
out-website/website/pictures/'?
I guess the first path is wrong...

The result is that I have no images in the website.


ERROR 2:
where is @help macro defined?
Is it defined? Or the problem is somewhere else?
Maybe I can just comment it out?

Thanks,
Federico



Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Federico Bruni-2
Il giorno lun, 21/06/2010 alle 22.12 +0200, Federico Bruni ha scritto:
> Hi,
>
> 'make website' gives me two errors now


Attached is the complete output of 'make website'.
Just in case it helps...

website-log.txt (17K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Francisco Vila
In reply to this post by Federico Bruni-2
2010/6/21 Federico Bruni <[hidden email]>:

> Hi,
>
> 'make website' gives me two errors now
>
>
> Initializing settings for web site: [it]
> ** Unknown command `@help' (left as is)
> (in /home/fede/lilypond-translation/Documentation/it/web/download.itexi
> l. 330)
> mass-link.py
> Initializing settings for web site: [nl]
> mass-link.py
> cp /home/fede/lilypond-translation/Documentation/css/*.css
> out-website/website/
> mkdir -p out-website/website/pictures/
> cp Documentation/pictures/out-www//* out-website/website/pictures/
> cp: cannot stat `Documentation/pictures/out-www//*': No such file or
> directory
> make[1]: *** [website-pictures] Error 1
> make[1]: Leaving directory `/home/fede/lilypond-translation'
> make: *** [website] Error 2

> ERROR 1:
> Why the command is 'cp Documentation/pictures/out-www//*
> out-website/website/pictures/'?
> I guess the first path is wrong...
>
> The result is that I have no images in the website.

I think that images for website are created with 'make doc', therefore
you maybe should make doc first.


>
>
> ERROR 2:
> where is @help macro defined?
> Is it defined? Or the problem is somewhere else?
> Maybe I can just comment it out?

$ git grep "macro help{"
Documentation/de/macros.itexi:@macro help{TEXT}
Documentation/es/macros.itexi:@macro help{TEXT}
Documentation/fr/macros.itexi:@macro help{TEXT}
Documentation/ja/macros.itexi:@macro help{TEXT}
Documentation/macros.itexi:@macro help{TEXT}
Documentation/nl/macros.itexi:@macro help{TEXT}

This is the same problem we had with the other macros.  Just copy it
[and translate it if necessary] to your macros.itexi


> Thanks,
> Federico
>
>



--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Federico Bruni-2
Il giorno lun, 21/06/2010 alle 23.27 +0200, Francisco Vila ha scritto:
> > The result is that I have no images in the website.
>
> I think that images for website are created with 'make doc', therefore
> you maybe should make doc first.
>

I've tried but 'make doc' gives errors.
I dont' have time to investigate it now.

> >
> >
> > ERROR 2:
> > where is @help macro defined?
> > Is it defined? Or the problem is somewhere else?
> > Maybe I can just comment it out?
>
> $ git grep "macro help{"

Ok... I had tried 'git grep @help', that's why I could not find anything
useful.

So now 'make website' works fine (except for the images problem, but
this is because I didn't run 'make doc' first).

What's the next step?

This is my status:

fede@debian:~/lilypond-translation$ git status
# On branch lilypond/translation
# Your branch is ahead of 'origin/lilypond/translation' by 6 commits.
#
nothing to commit (working directory clean)

And my patches situation is a total mess.
I have five patches: two starting with 0001, two starting with 0002 and
one with 0003.
After the last commit I didn't create any patch.

What do you recommend me to do?

First pull, right? Should I really rebase? (the doc says translators
shouldn't rebase...)
Then make the 6th patch?


Thanks again, goodnight

Federico



Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Francisco Vila
2010/6/22 Federico Bruni <[hidden email]>:

> What do you recommend me to do?
>
> First pull, right? Should I really rebase? (the doc says translators
> shouldn't rebase...)
> Then make the 6th patch?

If you are sure of which ones are your own commits, and I think yes,
then make a patches that follow the logic

  git format-patch <since>..<until>

and discard all other existing patches.  Patches can be named whatever
you like to, that is, 0001-etc can be renamed to xxx1. etc to make
them easily distinguishable from the new ones you create. Or, move
them to a folder.

--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Francisco Vila
2010/6/22 Francisco Vila <[hidden email]>:

> 2010/6/22 Federico Bruni <[hidden email]>:
>
>> What do you recommend me to do?
>>
>> First pull, right? Should I really rebase? (the doc says translators
>> shouldn't rebase...)
>> Then make the 6th patch?
>
> If you are sure of which ones are your own commits, and I think yes,
> then make a patches that follow the logic
>
>  git format-patch <since>..<until>
>
> and discard all other existing patches.  Patches can be named whatever
> you like to, that is, 0001-etc can be renamed to xxx1. etc to make
> them easily distinguishable from the new ones you create. Or, move
> them to a folder.

Federico,

did you submit this work? I could have missed it.


--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: italian website PATCH

Federico Bruni-2
Il giorno lun, 28/06/2010 alle 23.42 +0200, Francisco Vila ha scritto:
> Federico,
>
> did you submit this work? I could have missed it.

No, I'm stuck.
Few time and still many doubts about Git.

Maybe we can meet on IRC one of these nights.
Let me know when you are available.

Thanks for your patience :-)

'Night,
Federico



12