On Tue, Sep 11, 2012 at 05:57:24PM +0200, Guiu Rocafort wrote:

Hey list !

I've been translating the spanish documentation. I attach the patch with the changes I made.

Thanks. I have committed your patch and also checked if the resulting XML files are valid (no errors). Great work! :-)

I also have a question, i've been trying to find what .po file contains the gimp-introduction-whats-new.html text, but I'm not able to find it. I would have translated and revised more of the manual, but unfortunately I'm stuck with this problem.

You'll find source file with

$ grep -nr gimp-introduction-whats-new src/ src/introduction/whats-new.xml:9:
...

We use one po file per directory, so po/es/introduction.po contains all messages of src/introduction/*.xml, including the text of gimp-introduction-whats-new.html.

Ulf

Die Erfindung der Snde
war eine groe Snde
wider die Menschheit.
		-- Michael Schmidt-Salomon
_______________________________________________
gimp-docs-list mailing list
gimp-docs-list@gnome.org
https://mail.gnome.org/mailman/listinfo/gimp-docs-list

On Thu, Sep 13, 2012 at 02:45:37PM +0200, Guiu Rocafort wrote:

Hi, after sending the patch I'm not able to do "git pull" anymore in the gimp-help-2 repository. The error it throws is the next:

"guiu@guiu-N50Vc:~/src/gimp-help-2$ git pull Updating 2817d87..0f50720
error: Your local changes to the following files would be overwritten by merge:
po/es/dialogs.po
po/es/filters/render.po
po/es/introduction.po
po/es/toolbox/transform.po
Please, commit your changes or stash them before you can merge. Aborting "

I've tried to stag the files using "git add " for every file it report problems, but I had no success with that. I'm sorry for annoying you with my newbie git problems.

You can try

1) git add po/es git commit -m "Your commit message" git pull --rebase
git format-patch -1 # not sure about the "-1" or
2) git diff > your_saved_changes.patch # paranoia... git stash
git pull
git stash apply # don't know: can this fail? git stash drop # only if "apply" succeeded or
3) git diff > your_saved_changes.patch git checkout po/es
git pull
patch -p1 < your_saved_changes.patch

If some command failes or something goes wrong, git prints an error message and usually a useful tip.

"git help " prints detailed infos about the specified git command ("man git-command" should do the same).

But note that I'm a git newbie too...

HTH, Ulf

Mitraut denen, die da sagen, dass Gott auf ihrer Seite steht.
Sie sind nur so nah ihrem Gott, weil sie so fern dem Menschen sind.
		-- Michael Schmidt-Salomon
_______________________________________________
gimp-docs-list mailing list
gimp-docs-list@gnome.org
https://mail.gnome.org/mailman/listinfo/gimp-docs-list

Before git pulling, you must commit your changes to your local repository: /git commit -a -m "myCommit"/

You can also, if you don't want to accumulate commits, clean your sand box with
/git checkout /for every file./
/The file will return to its previous state, before your changes/./ Then git pull will update your file.

If you even though want to save you changes, you quand use /git stash/
Your files will be saved and then return to their previous state. Please run /man git-stash/ for more information about this command.

Julien

Hi, after sending the patch I'm not able to do "git pull" anymore in the gimp-help-2 repository. The error it throws is the next:

"guiu@guiu-N50Vc:~/src/gimp-help-2$ git pull Updating 2817d87..0f50720
error: Your local changes to the following files would be overwritten by merge:
po/es/dialogs.po
po/es/filters/render.po
po/es/introduction.po
po/es/toolbox/transform.po
Please, commit your changes or stash them before you can merge. Aborting "

I've tried to stag the files using "git add " for every file it report problems, but I had no success with that. I'm sorry for annoying you with my newbie git problems.

Guiu Rocafort