tutorial italian translation - Chapter 3

[marco-giordano]

Italian translation of tutorial chapter 3

[samaaron]

This is looking great. When you've finished with the translation and would like it merged, could you possibly rebase the pull request so that it only contains modifications to the translation files (rather than merges).

Thanks for your fantastic work! :-)

[petterreinholdtsen]

You might find the patch from pull request #870 interesting too.

[samaaron]

Hi there,

is there any chance you could rebase these changes onto master so I can pull them in? :-)

[marco-giordano]

Hi Sam, I'm sorry but we are being very busy in these times so I haven't been able to get things done. Can you help me on how I can do a rebase?

[petterreinholdtsen]

I had a look at the rebase, and it is not going to be easy. I tested this:

1. git clone https://github.com/marco-giordano/sonic-pi sonic-pi-italian-tutorial
2. cd sonic-pi-italian-tutorial/
3. git remote add upstream https://github.com/samaaron/sonic-pi.git
4. git fetch upstream
5. git checkout -b testrebase
6. git pull --rebase upstream master

The result was a lot of conflicts, and I doubt this is a good way forward. These kind of problems would be avoided if the tutorial translations are maintained as PO files, for example the way I propose it in pull request #870.

I suspect a better approach is to cherry-pick the relevant patches from your master branch and apply it on top of the latest upstream master branch.

[petterreinholdtsen]

As far as I can tell, only commit 2edc0f9 is missing in the upstream master branch.

[hzulla]

@marco-giordano

Thank you very much for this.

I'm currently moving the translation to Weblate, see #1184.

Weblate will make translating Sonic Pi a whole lot easier.

Your additions in this pull request will be imported. (The import is a semi-automated process and will require a proofreading afterwards, but your great work so far will not be lost!)

@samaaron - this pull request can be closed, Marco's content has been imported in my local work branch and will move to Weblate later.

Thanks again!