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
error: Your local changes to the following files would be overwritten by
Please, commit your changes or stash them before you can merge.
I've tried to stag the files using "git add <file>" for every file it
report problems, but I had no success with that.
I'm sorry for annoying you with my newbie git problems.
On Wed, Sep 12, 2012 at 1:03 PM, Ulf-D. Ehlert <ud...@web.de> wrote:
> 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
> > stuck with this problem.
> You'll find source file with
> $ grep -nr gimp-introduction-whats-new src/
> src/introduction/whats-new.xml:9:<sect1 id="...">
> We use one po file per directory, so po/es/introduction.po contains
> all messages of src/introduction/*.xml, including the text of
> Die Erfindung der Sünde
> war eine große Sünde
> wider die Menschheit.
> -- Michael Schmidt-Salomon
> gimp-docs-list mailing list
*Please avoid sending me Word or PowerPoint attachments.
gimp-docs-list mailing list