At last I got my Cygwin running properly. But alas, the images where not handled properly:

1. The image addresses are not "translated". All images are in English. 2. Paragraphs containing tags are not translated but the whole text occurs in English.

There are no image references in the POT files although there are in the src xml files.

When running "autogen.sh" I get the following warnings: WARNING: cannot find dblatex(1); dot(1); docbook2odf(1); WARNING: unrecognized options: --enable-maintainer-mode

I'm running the command "make -f Makefile.GNU {html-no/xml-no/validate-no}on gimp-help-2 revision 2817. Using svn and Poedit/Notepad++ together with Cygwin.

I know I'm able to write the missing addresses etc. into the xml-no files by hand, but as I understand it's a must having the po files in proper condition as these files are the source for the xml files used for making the html files .

Do I have to install some other packages or running some to me unknown commands?
(I tried to follow some of the threads in this forum about the image problems, but found no answers).

Kolbjoern

julien skreiv:

Hi Kolbjoern,

I am not the most qualified to answer you; here are some remarks, helping somebody else can bring better:

At last I got my Cygwin running properly. But alas, the images where not handled properly:

1. The image addresses are not "translated". All images are in English. 2. Paragraphs containing tags are not translated but the whole text occurs in English.

Worse: Some of the paragraphs containing guiicon tags are translated, some not. I have to work on it.

There are no image references in the POT files although there are in the src xml files.

When running "autogen.sh" I get the following warnings: WARNING: cannot find dblatex(1); dot(1); docbook2odf(1);

Because they are not installed on your system.

Yes, I know. Mentioned it in case the lack had something to do with the errors. I don't know what the "dot" does. Have to figure it out and eventually how to install it.

WARNING: unrecognized options: --enable-maintainer-mode

I don't know

I'm running the command "make -f Makefile.GNU {html-no/xml-no/validate-no}on gimp-help-2 revision 2817. Using svn and Poedit/Notepad++ together with Cygwin.

svn? We are no longer using svn but git...

I thought the building of the pot, xml and html files was independent of git/svn?
BTW: are there any tutorials explaining the use of git? If I get rid of these problems I have to move to git.

When I have weird problems with making html, I run 'make clean' and then rebuild files.

Oh yes, I've "cleaned" several times. It looks like the pot files are not properly build. I think I have to figure out how the process works, i.e. how the pot files and the xml files are build. Still some work to do ;-) Thank you a lot for answering, Julien.

Kolbjoern

Julien

Kolbjørn Stuestøl skreiv:

julien skreiv:

Hi Kolbjoern,

I am not the most qualified to answer you; here are some remarks, helping somebody else can bring better:

At last I got my Cygwin running properly. But alas, the images where not handled properly:

1. The image addresses are not "translated". All images are in English. 2. Paragraphs containing tags are not translated but the whole text occurs in English.

Worse: Some of the paragraphs containing guiicon tags are translated, some not. I have to work on it.

There are no image references in the POT files although there are in the src xml files.

When running "autogen.sh" I get the following warnings: WARNING: cannot find dblatex(1); dot(1); docbook2odf(1);

Because they are not installed on your system.

Yes, I know. Mentioned it in case the lack had something to do with the errors. I don't know what the "dot" does. Have to figure it out and eventually how to install it.

WARNING: unrecognized options: --enable-maintainer-mode

I don't know

I'm running the command "make -f Makefile.GNU {html-no/xml-no/validate-no}on gimp-help-2 revision 2817. Using svn and Poedit/Notepad++ together with Cygwin.

svn? We are no longer using svn but git...

I thought the building of the pot, xml and html files was independent of git/svn?
BTW: are there any tutorials explaining the use of git? If I get rid of these problems I have to move to git.

Forget the BTW part. I found some sites on the net. Are now running the command "git clone git://git.gnome.org/gimp-help-2". With near 70 000 objects it will take some time with my slow speed connection ;-)
Kolbjoern

When I have weird problems with making html, I run 'make clean' and then rebuild files.

Oh yes, I've "cleaned" several times. It looks like the pot files are not properly build. I think I have to figure out how the process works, i.e. how the pot files and the xml files are build. Still some work to do ;-) Thank you a lot for answering, Julien.

Kolbjoern

Julien

Thank you Ulf
Looks nice.
I'll give it a try during the week end - I hope. (There is a life outside GIMP as well ...)
Kolbjoern

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Mittwoch, 6. Mai 2009, 21:15): [...]

There are no image references in the POT files although there are in the src xml files.

Ok, let's start with this problem:

Does $ tools/xml2po src/introduction/whats-new.xml produce image references?

Most likely it won't, but if it does, what about $ tools/xml2po src/introduction/whats-new.xml | > msguniq | msgcat --width=79 -
and
$ touch -c src/introduction/whats-new.xml # if necessary $ make -f Makefile.GNU pot/introduction.pot

If the first command does not produce image references, try $ grep 'submodes_path =' tools/xml2po This command should tell you where 'xml2po' expects to find its docbook module (e.g. /usr/share/xml2po).

Check if the module exists, e.g. $ ls /usr/share/xml2po/docbook.py

I'm pretty sure you won't find it there, so you'll have to find out where this file is installed. I don't know how to do it with Cygwin, maybe
$ locate docbook.py | grep xml2po

Then you can a) create a link, e.g.
$ ln -s /path/to/modules/of/xml2po /usr/share/xml/ b) set a proper environment variable, e.g. (with bash): $ export PYTHONPATH=/path/to/modules/of/xml2po

Maybe you will have to change the above commands to make them work under Cygwin, but I can't help you there (Linux-only user...).

Bye, Ulf

------------------------------------------------------------------------

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Mittwoch, 6. Mai 2009, 21:15): [...]

There are no image references in the POT files although there are in the src xml files.

Ok, let's start with this problem:

Does $ tools/xml2po src/introduction/whats-new.xml produce image references?

In a way, but the image paths are not valid Output:
Warning: image file
'src/introduction/images/using/empty-image-window.png' not found. Warning: image file
'src/introduction/images/using/scroll-beyond-border.png' not found. ...
The actual images are in the 'images/C/using' path so the 'src/introduction/' part of the path should be omitted?

Most likely it won't, but if it does, what about $ tools/xml2po src/introduction/whats-new.xml | > msguniq | msgcat --width=79 -

The same warnings as above

and
$ touch -c src/introduction/whats-new.xml # if necessary $ make -f Makefile.GNU pot/introduction.pot

Images refs in the pot file unchanged: #. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all. #: src/introduction/whats-new.xml:45(None) msgid ""
"@@image: 'images/using/empty-image-window.png'; md5=THIS FILE DOESN'T EXIST"
msgstr ""

If the first command does not produce image references, try $ grep 'submodes_path =' tools/xml2po

Output:
submodes_path = "/usr/share/xml2po"

This command should tell you where 'xml2po' expects to find its docbook module (e.g. /usr/share/xml2po).

Check if the module exists, e.g. $ ls /usr/share/xml2po/docbook.py

Output:
/usr/share/xml2po/docbook.py

I'm pretty sure you won't find it there, so you'll have to find out where this file is installed. I don't know how to do it with Cygwin, maybe
$ locate docbook.py | grep xml2po

No output, i.e. not found ;-)
I also tried 'locate -c docbook.py' and 'locate -c xml2po'. Both returned '0'.

Then you can
a) create a link, e.g.
$ ln -s /path/to/modules/of/xml2po /usr/share/xml/

Command:
ln -s /usr/share/xml2po /usr/share/xml/ Output:
ln: creating symbolic link `/usr/share/xml/xml2po': File exists

b) set a proper environment variable, e.g. (with bash): $ export PYTHONPATH=/path/to/modules/of/xml2po

Command:
export PYTHONPATH=/usr/share/xml2po
No output (of cource)

Running
touch -c src/introduction/whats-new.xml and then make -f Makefile.GNU pot/introduction.pot gave the same result as before.

Maybe you will have to change the above commands to make them work under Cygwin, but I can't help you there (Linux-only user...).

Is there any way to check out that a command is fulfilled with success? Cygwin is *supposed* to emulate Linux and, as in Linux, the commands are sometimes a bit difficult to recognize. So I run lots of "info ..." commands searching for help on the commands, but I have to know what to search for ;-)

Tried:
touch -c src/introduction/whats-new.xml make -f Makefile.GNU -d pot/introduction.pot >test-pot.txt and got 27 MB of text, but not how the pot file is build. Are there any way to follow the making of the pot file(s) step by step/line by line?

Thank you a lot for your excellent help. You are a brilliant teacher/helper/tutor.
Have a nice week end
Kolbjoern

Bye,
Ulf

------------------------------------------------------------------------

Thank you for answering :-)
As you may observe, I have lots to learn but I follow your suggestions and advises as far as I can.
As the "src/introduction/whats-new.xml" has no "Norwegian" images I used the commands on po/no/menu.po instead. Still no "Norwegian" images in the xml-no files and (of course) not in the the html files either.

The question boils down to: How to automatic add the necessary foreign image addresses into the xml files?
I.e. change the address '' to
''.
Room for further experimentations i think.

Kolbjoern

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Sonntag, 10. Mai 2009, 13:54):

Ulf-D. Ehlert skreiv:

Does
$ tools/xml2po src/introduction/whats-new.xml produce image references?

In a way, but the image paths are not valid Output:
Warning: image file
'src/introduction/images/using/empty-image-window.png' not found.

That's ok. We suppress these warnings in the Makefile(s) (see definition of "xml2pot" in Makefile.GNU).

The actual images are in the 'images/C/using' path so the 'src/introduction/' part of the path should be omitted?

Yes. The standard xml2po program expects the same directory structure for XML and HTML (no subdirectories).

If we decide to use our own patched version of 'xml2po' instead of the standard xml2po program, we can try to change the code so that the image files are found and the md5sums are generated (or we can also remove this feature).

Images refs in the pot file unchanged: #. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all. #: src/introduction/whats-new.xml:45(None) msgid ""
"@@image: 'images/using/empty-image-window.png'; md5=THIS FILE DOESN'T EXIST"
msgstr ""

So there *are* image references in the POT files?

If the first command does not produce image references,

Apparently it did, so there was no need to try the following commands.

Output:
submodes_path = "/usr/share/xml2po"

Check if the module exists, e.g.
$ ls /usr/share/xml2po/docbook.py

Output:
/usr/share/xml2po/docbook.py

Everything is fine, the required module exists...

No output, i.e. not found ;-)
I also tried 'locate -c docbook.py' and 'locate -c xml2po'. Both returned '0'.

... so you didn't need to look for that file, you had already found it! (BTW, it seems that you locate database is not initialized (man updatedb); according to the man page, with "-c" option you will get only the number of matches, not the list of files.)

Command:
ln -s /usr/share/xml2po /usr/share/xml/ Output:
ln: creating symbolic link `/usr/share/xml/xml2po': File exists

File exists, of course!

export PYTHONPATH=/usr/share/xml2po

You don't need this, the module is just where xml2po expects it.

Is there any way to check out that a command is fulfilled with success? Cygwin is *supposed* to emulate Linux and, as in Linux, the commands are sometimes a bit difficult to recognize. So I run lots of "info ..." commands searching for help on the commands, but I have to know what to search for ;-)

From the Advanced Bash-Scripting Guide:

"Every command returns an exit status (sometimes referred to as a return status or exit code). A successful command returns a 0, while an unsuccessful one returns a non-zero value that usually can be interpreted as an error code. Well-behaved UNIX commands, programs, and utilities return a 0 exit code upon successful completion..."

You can always get the exit code of the last executed command with

$ echo $?

Try $ true; echo $?; false; echo $?

Tried:
touch -c src/introduction/whats-new.xml make -f Makefile.GNU -d pot/introduction.pot >test-pot.txt and got 27 MB of text, but not how the pot file is build.

The "-d" option produces many debugging messages.

Are there
any way to follow the making of the pot file(s) step by step/line by line?

Try
$ make -f Makefile.GNU -n pot/introduction.pot or
$ make -f Makefile.GNU pot/introduction.pot VERBOSE=2 or read the Makefile.GNU (search for "xml2pot").

Bye, Ulf

------------------------------------------------------------------------

julien skreiv:

Hi,

As the "src/introduction/whats-new.xml" has no "Norwegian" images I used the commands on po/no/menu.po instead. Still no "Norwegian" images in the xml-no files and (of course) not in the the html files either.

There is no longer localised image names in localised xml files. 'make html-no' searches for the image in images/no first. If 'make' doesn't find it, it takes the English image in C. In this new system, localised images must have exactly the same name as the English ones.

Julien

Thank you :-)
This simplifies the problem a lot - I hope. Now I have to figure out what make does exactly when creating the image files, or perhaps someone can tell me. Kolbjoern

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Montag, 11. Mai 2009, 23:19):

As the "src/introduction/whats-new.xml" has no "Norwegian" images I used the commands on po/no/menu.po instead. Still no "Norwegian" images in the xml-no files and (of course) not in the the html files either.

As Julien told you, there must be a corresponding localized image file with the same name. In this special example (.../whats-new.xml) there is no such localized image file:

bash> sed -e '/fileref/!d' -e 's/.*"\(.*\)".*/\1/' \ src/introduction/whats-new.xml | \ while read fileref; do \
c=${fileref/images/images\/C}; \
no=${fileref/images/images\/no}; \ ls -l $c $no; \
done

Check your images with

bash> make -f Makefile.GNU check-images-no

You may also try

find images/C -name .git -prune -o -type f -print | \ while read english; do \
norwegian=${english/C/no}; \
test -e $norwegian \
&& echo "FOUND $norwegian" \
|| echo "NO $norwegian"; \
done

to see which localized images exist.

The question boils down to:
How to automatic add the necessary foreign image addresses into the xml files?

No, the way how to add localized images has changed: if you have an English image file
images/C/some/where/imagefile.png
just provide a localized file in "images/no": images/no/some/where/imagefile.png
(same name, same subdirectories).
The XML source files will refer to this file as

I.e. change the address '' to
''.

Wrong, no changes to the xml files, no translations, just add a localized image and make will do the rest.

This mail dropped in after I answered Julien. I'll of course try your suggestions. I think the error lies somewhere in my maps or perhaps in the new line command(s). Thank you
Kolbjoern

Bye,
Ulf

------------------------------------------------------------------------

Hi, Ulf (and others)
A bit further on the road :-)

I tried all your suggestions, and a lot more, and found that in the command you mentioned

sed -e '/fileref/!d' -e 's/.*"\(.*\)".*/\1/' \ src/introduction/whats-new.xml | \ while read fileref; do \
c=${fileref/images/images\/C}; \
no=${fileref/images/images\/no}; \ ls -l $c $no; \
done

(with src/introduction/whats-new.xml replaced with files containing "no" images) it seems that images marked in the src/-. xml files as

turns out OK and recognize the "no" image files:

(output:) -rwx------+ 1 Kolbjørn Ingen 5124 May 8 19:34 images/C/filters/options-logo-3d-outline.png -rwx------+ 1 Kolbjørn Ingen 5913 May 8 19:36 images/no/filters/options-logo-3d-outline.png

but the images coded as

returned ls: cannot access JPG: No such file or directory …

Some suggestions for where and what I have to change without rewriting all src/???.xml files?
I have (as you may have understood :-) ) very little experience in this sort of programming..

Kolbjoern

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Montag, 11. Mai 2009, 23:19):

As the "src/introduction/whats-new.xml" has no "Norwegian" images I used the commands on po/no/menu.po instead. Still no "Norwegian" images in the xml-no files and (of course) not in the the html files either.

As Julien told you, there must be a corresponding localized image file with the same name. In this special example (.../whats-new.xml) there is no such localized image file:

bash> sed -e '/fileref/!d' -e 's/.*"\(.*\)".*/\1/' \ src/introduction/whats-new.xml | \ while read fileref; do \
c=${fileref/images/images\/C}; \
no=${fileref/images/images\/no}; \ ls -l $c $no; \
done

Check your images with

bash> make -f Makefile.GNU check-images-no

You may also try

find images/C -name .git -prune -o -type f -print | \ while read english; do \
norwegian=${english/C/no}; \
test -e $norwegian \
&& echo "FOUND $norwegian" \
|| echo "NO $norwegian"; \
done

to see which localized images exist.

The question boils down to:
How to automatic add the necessary foreign image addresses into the xml files?

No, the way how to add localized images has changed: if you have an English image file
images/C/some/where/imagefile.png
just provide a localized file in "images/no": images/no/some/where/imagefile.png
(same name, same subdirectories).
The XML source files will refer to this file as

I.e. change the address '' to
''.

Wrong, no changes to the xml files, no translations, just add a localized image and make will do the rest.

Bye, Ulf

------------------------------------------------------------------------

I was a bit optimistic, but false alarm :-[

Yes, the commands mentioned below are working as I wrote yesterday, but when running
make -f Makedile.GNU html-no

there is still no "no" images addresses generated. Sorry for confusing you.

Kolbjoern

------------------------------------------------------------------------

Kolbjørn Stuestøl skreiv:

Hi, Ulf (and others)
A bit further on the road :-)

I tried all your suggestions, and a lot more, and found that in the command you mentioned

sed -e '/fileref/!d' -e 's/.*"\(.*\)".*/\1/' \ src/introduction/whats-new.xml | \ while read fileref; do \
c=${fileref/images/images\/C}; \
no=${fileref/images/images\/no}; \ ls -l $c $no; \
done

(with src/introduction/whats-new.xml replaced with files containing "no" images) it seems that images marked in the src/-. xml files as

turns out OK and recognize the "no" image files:

(output:) -rwx------+ 1 Kolbjørn Ingen 5124 May 8 19:34 images/C/filters/options-logo-3d-outline.png -rwx------+ 1 Kolbjørn Ingen 5913 May 8 19:36 images/no/filters/options-logo-3d-outline.png

but the images coded as

returned ls: cannot access JPG: No such file or directory …

Some suggestions for where and what I have to change without rewriting all src/???.xml files?
I have (as you may have understood :-) ) very little experience in this sort of programming..

Kolbjoern

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Montag, 11. Mai 2009, 23:19):

As the "src/introduction/whats-new.xml" has no "Norwegian" images I used the commands on po/no/menu.po instead. Still no "Norwegian" images in the xml-no files and (of course) not in the the html files either.

As Julien told you, there must be a corresponding localized image file with the same name. In this special example (.../whats-new.xml) there is no such localized image file:

bash> sed -e '/fileref/!d' -e 's/.*"\(.*\)".*/\1/' \ src/introduction/whats-new.xml | \ while read fileref; do \
c=${fileref/images/images\/C}; \
no=${fileref/images/images\/no}; \ ls -l $c $no; \
done

Check your images with

bash> make -f Makefile.GNU check-images-no

You may also try

find images/C -name .git -prune -o -type f -print | \ while read english; do \
norwegian=${english/C/no}; \
test -e $norwegian \
&& echo "FOUND $norwegian" \
|| echo "NO $norwegian"; \
done

to see which localized images exist.

The question boils down to:
How to automatic add the necessary foreign image addresses into the xml files?

No, the way how to add localized images has changed: if you have an English image file
images/C/some/where/imagefile.png
just provide a localized file in "images/no": images/no/some/where/imagefile.png
(same name, same subdirectories).
The XML source files will refer to this file as

I.e. change the address '' to
''.

Wrong, no changes to the xml files, no translations, just add a localized image and make will do the rest.

Bye, Ulf

------------------------------------------------------------------------

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Donnerstag, 28. Mai 2009, 20:41):

but when running
make -f Makedile.GNU html-no

there is still no "no" images addresses generated.

There are no "no" (or "C", "en", "de", ...) image addresses in your HTML files.

Your HTML file contains
and in your HTML directory you have
html/no/images/filters/options-logo-3d-outline.png which is a link to
images/no/filters/options-logo-3d-outline.png if this file exists, or to
images/C/filters/options-logo-3d-outline.png otherwise.

When running
make -f Makedile.GNU html-no
you should get a messages
*** Copying images (no) ...
which is displayed when a program for creating the correct links is started.

Thank you
You are an excellent teacher :-)
I'll rebuild my copies and follow your tutorials step by step. Perhaps I have mashed it up on my way to the html files. BTW I had lots of fun when trying out your commands (previous mail), and learned a lot.
(I'm still a bit busy with other things, but there must be some time left for this work in between.)
From a thankfull
Kolbjoern

Bye,
Ulf

------------------------------------------------------------------------

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Donnerstag, 28. Mai 2009, 20:41):

but when running
make -f Makedile.GNU html-no

there is still no "no" images addresses generated.

There are no "no" (or "C", "en", "de", ...) image addresses in your HTML files.

Your HTML file contains

Yes

and in your HTML directory you have html/no/images/filters/options-logo-3d-outline.png

Only a pointer to "xml/no/images" (the hint when holding the mouse pointer over the short cut: "../../xml/no/images").

The xml/no/images is a catalog containing the normal image folders /dialogs, filters, glossary etc. but the image names are pointers. In this catalog the
xml/no/images/filters/options-logo-3d-outline.png points (hint: "../../../../images/no/filters/options-logo-3d-outline.png") to the "real" image:
(root) images/no/options-logo-3d-outline.png.

Opening the html files in the web browser (tried Firefox, Opera and MSIE 8) shows no images at all (neither "no" nor "C").

which is a link to
images/no/filters/options-logo-3d-outline.png if this file exists, or to
images/C/filters/options-logo-3d-outline.png otherwise.

Does this means that the html has to select between them? In case: how? Oh, perhaps a style sheet not read by my computer/program?

When running
make -f Makedile.GNU html-no
you should get a messages
*** Copying images (no) ...
which is displayed when a program for creating the correct links is started.

Oh, yes

Bye,
Ulf

I tried the whole procedure using language codes "no" and "nn". Same result. Actually I am working on language code "nn". (Added "nn" to Makefile.GNU). Copied all "no" stuff and renamed the copies to "nn". As discussed earlier the lang code "no" in "gimp help" actually should be changed to "nn" to fulfill the GNU and others recommendations.
This time I did it the following way: 1. updated the gimp-help-2 files (git pull) 2. copied the files to a new location 3. run autogen.sh --without-gimp on the copy 3. copied my po/no files into it, replacing the downloaded (and outdated) "no" files.
4. run make -f Makefile.GNU html-no (or html-nn) 5. opens the html files in web browser (Firefox). No images at all shows up in the browser.

As told before, I am using Cygwin on Windows XP.

Kolbjoern

------------------------------------------------------------------------

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Freitag, 29. Mai 2009, 21:41):

and in your HTML directory you have html/no/images/filters/options-logo-3d-outline.png

Only a pointer to "xml/no/images" (the hint when holding the mouse pointer over the short cut: "../../xml/no/images").

My fault. I skipped this step in my description.

You are right, html/no/images is a link to ../../xml/en/images. But it makes no difference - at least, it should not make a difference...

The xml/no/images is a catalog containing the normal image folders /dialogs, filters, glossary etc. but the image names are pointers.

Yes, that's ok.

In this catalog the
xml/no/images/filters/options-logo-3d-outline.png points (hint: "../../../../images/no/filters/options-logo-3d-outline.png") to the "real" image:
(root) images/no/options-logo-3d-outline.png.

Can you open the image file clicking on the link xml/no/images/filters/options-logo-3d-outline.png?

Yes.

Opening the html files in the web browser (tried Firefox, Opera and MSIE 8) shows no images at all (neither "no" nor "C").

Is it possible that Cygwin doesn't handle links correctly?

What happens when you replace e.g. 'script-fu-3d-outline-logo-alpha.html' with
'images/filters/options-logo-3d-outline.png' in the browser's URL bar?

No.
"... /html/no/script-fu-3d-outline-logo-alpha.html": opens the html page in browser
"... /html/no/images/filters/options-logo-3d-outline.png": did not find the file
Also tried "... /xml/nn/images/filters/apply_lens-options.png": did not find the file

Can you open the image file clicking on the link html/no/images/filters/options-logo-3d-outline.png?

No such contents in the html/no/images. This is still a link to the xml/no/images

Do you have a "readlink" command (package: core-utils)? If yes, what is the output of following commands: $ readlink html/no/images/filters/options-logo-3d-outline.png

../../../../images/nn/filters/options-logo-3d-outline.png

$ readlink -e html/no/images/filters/options-logo-3d-outline.png

/bin/gimp-help-git-work/trunk/gimp-help-2/images/no/filters/options-logo-3d-outline.png i.e. full path to the image file (from the Cygwin root)

Does this means that the html has to select between them? In case: how? Oh, perhaps a style sheet not read by my computer/program?

No, the selection is made by the build process:

Of course.
If a "no" image exists the pointer points to it, otherwise to the "C" image?
So the problem lies somewhere in the building of the links/pointers?

$ make [-f Makefile.GNU] xml/no/images *** Copying images (no) ... 1482 (no: 478)

I've just tried it, and it worked for me. Chapter "16.2. 3D-omriss" contains some language-independent images and the localized screenshot of the filter's dialog window.

I get, however, many xslt warnings: No localization exists for "no" or "". Using default "nn".

It's due to your add in the Makefile.GNU some time ago: $(cmd) test "$*" = "no" && lang="nn" || lang="$*"; \ …

I think we should try to replace "no" with "nn" to get rid of them: - replace "no" in configure and Makefiles,

Yes.

- move/rename "no" directories to "nn" ,

Rename

- anything else?

Renaming quickreference/po/no.po to nn.po Nothing else.

(I have not checked all my images whether they are updated or not, but all my po files are (mostly) up to date so if necessary I send them. Private and zipped of course)

Have a nice weekend Kolbjoern

Bye,
Ulf

------------------------------------------------------------------------

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Samstag, 30. Mai 2009, 18:50):

Can you open the image file clicking on the link html/no/images/filters/options-logo-3d-outline.png?

No such contents in the html/no/images. This is still a link to the xml/no/images

Yes, but you should be able to ignore this and enter html/no/images as if it was a real folder (but it's probably not important, so forget it).

[...] gimp-help-2/html/nn/images/filters/options-logo-3d-outline.png returns "File not found"

[...] gimp-help-2/html/nn/images.lnk gives a frame in the browser's window containing the full file name and a clickable link named "Up one nivau" (or what it would be in English). Clicking on it opens a list showing all the files in the html/nn folder including the images.lnk as links. (As in ftp listings). Clicking on the images.lnk opens the first page again. Not the xml/images as I expected. Clicking on the html links opens the file in the browser.

Do you have a "readlink" command (package: core-utils)? If yes, what is the output of following commands: $ readlink html/no/images/filters/options-logo-3d-outline.png

../../../../images/nn/filters/options-logo-3d-outline.png

Oops, really ".../images/nn"? (should be ".../images/no")

Yes. (I was working on "nn" and forgot to change. Same for "nn" and "no")

If a "no" image exists the pointer points to it, otherwise to the "C" image?

Yes.

So the problem lies somewhere in the building of the links/pointers?

No, apparently the links are correct.

So let's summarize: o the html files contain correct image references o these images files are links to existings image files o you can open an image file even if it's a link (to xml/no/images/...)
o the readlink utility shows that the links are no dead links o you cannot open the image (a link) via the browser's URL bar o all your browsers do not display the images

Hmm, if this summary is correct (and remember that I haven't any clue about Windows or Cygwin, so maybe this is a silly question): is it possible that there's a global option somewhere which prevents all browsers from dereferencing links?

Your list is correct.
The links from the xml catalog works fine from any browser i have tried. The links through html/nn/images.lnk does not work.

I think this must be a "global" Windows probblem.

Can you check with a simple test html file whether or not your browsers can read links to images (and links to links to images) which definitely exist?

I'm already working on it, and I think your question is not at all silly but relevant. It is a possibility that something prevents the links from carrying properties (options) with them, or that the options must have a certain, very specific, format.

Yesterday I made a html page (in Nvu web editor). Also tried Microsofts Front page 2000, but this editor rejected all links. Again: Perhaps a special Windows problem?

Adding the image link file:///C:/cygwin/bin/gimp/work/gimp-help-2/xml/nn/images/dialogs/examples/border-selection-01.png.lnk and the image
file:///C:/cygwin/bin/gimp/work/gimp-help-2/images/nn/dialogs/examples/border-selection-01.png is displayed in the browser.
So the links from the xml/nn/images works fine.

On the other side, I have not yet found any way to get the browser recognize the call linked from html/nn/images.lnk. I'll try again this evening.

Another solution seems to use one link only by copying the xml/[lang]/images to the html/[lang] and omit the html/[lang]/images.lnk? (Perhaps changing the relative addresses). Yes I know that copying images is time consuming.

(All the link files has ".lnk" added although this are not showing up in my file browser).

I'll try digging some deeper in the Windows stuff although this is not my occupation.
If I stumble over a solution I'll mail it immediately.

I get, however, many xslt warnings: No localization exists for "no" or "". Using default "nn".

It's due to your add in the Makefile.GNU some time ago: $(cmd) test "$*" = "no" && lang="nn" || lang="$*"; \ …

Yes, without these changes we would probably get 'Using default "en".'

I think we should try to replace "no" with "nn" to get rid of them: - replace "no" in configure and Makefiles,

Yes.

- move/rename "no" directories to "nn" ,

Rename

- anything else?

Renaming quickreference/po/no.po to nn.po Nothing else.

Ok, do you change it?

I have not the permission to commit (git push?) my files, so perhaps you do it for me?

Kolbjoern

Bye,
Ulf

------------------------------------------------------------------------

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Dienstag, 2. Juni 2009, 14:31):

I have not the permission to commit (git push?) my files, so perhaps you do it for me?

I have tried it (once more with git problems) - please check it.

Don't understand
On my computer I did these changes:

- added "nn" in configure.ac, Makefile.am, and Makefile.GNU - added copy of po/no and named it po/nn - added copy of images/no and named it images/nn - added copy of "quickreference/po/no.po" -> "quickreference/po/nn.po"

As there will be no "no" files left when you rename them, I do not understand why it should not work renaming instead of naming copies.
BTW: It looks like Windows are restricted on .lnk files because of the intruder problem. I'm working on it, but no solution so far. Kolbjoern

Bye,
Ulf

------------------------------------------------------------------------

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Dienstag, 2. Juni 2009, 22:56):

Ulf-D. Ehlert skreiv:
Don't understand
On my computer I did these changes:

- added "nn" in configure.ac, Makefile.am, and Makefile.GNU - added copy of po/no and named it po/nn - added copy of images/no and named it images/nn - added copy of "quickreference/po/no.po" -> "quickreference/po/nn.po"

As there will be no "no" files left when you rename them, I do not understand why it should not work renaming instead of naming copies.

I used the the 'git mv' to move (rename) some files and directories, but I had to do it several times due to some problems with git. And then I had to delete and commit non-existing (moved) files to make git happy. So I'm not sure what you will get with a 'git pull'...

Understand.
I tried "git pull" and got
"error: Entry 'Makefile.GNU' not uptodate. Cannot merge". (also for Makefile.am and configure.ac)
Deleted the files in my copy and all seamed to be OK for a while, but then it stopped again.
"error: Untracked working tree file 'images/nn/dialogs/brushes-buttons.png' would be overwritten by merge". Folders image/nn/dialogs and images/nn/filters downloaded normally. Folder po/no deleted, no new po/nn folder. Folder quickreference/po/no.po deleted. No nn.po

Did not try anymore. Created a new folder and used git clone. "git pull" returned "Already up-to-date." Now I'm going to make a copy of the catalog and try out all the commands again. It's late so it have to wait until tomorrow.

And, of course, I might have forgotten something or introduced a new, interesting bug. :-|

BTW: It looks like Windows are restricted on .lnk files because of the intruder problem. I'm working on it, but no solution so far.

If you don't find a solution, we can change the Makefile(s) and copy rather than link files on Windows/Cygwin.

I thought it was a Windows problem independent of Cygwin. What happens when running the Linux build html files in Windows? Have mailed the problem to another forum hoping some Windows people knows. No answer yet. Kolbjørn

Bye,
Ulf


------------------------------------------------------------------------

I have not found the only person in the world (it seems) who knows how to use parameters in .lnk files called from html.

Instead I experimented a bit with other solutions.

The simplest I found was to copy xml/nn/images to html/nn and change all image calls in the html code to be links (shortcuts) by adding a ".lnk" prefix to the names af the image files. (Example: become and so forth). (The ".lnk" does not shows up in the (Windows) file browser, but does have to be added to get it work).

So, if it does not disturb the project in any way, would it be a solution to do so for all?
Make the Makefile.GNU or whatever
1. copy the xml/lang/images to the html/lang/ 2. adding ".lnk" to the image file names in the html

BTW: To add all the ".lnk"'s I write my first Python program to do the job, or more correctly: I modified some programs found on the net. Had to download the Python manual too. So perhaps I'll start programming ;-)

Kolbjoern

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Mittwoch, 10. Juni 2009, 23:38):

I have not found the only person in the world (it seems) who knows how to use parameters in .lnk files called from html.

What are .lnk files?

Files that links (points) to other files instead of containing the "real" file. (Also called "shortcuts"). A file "myImage.png.lnk" may for example point to the real image file "myImage.png". The ".lnk" don't show up in the browser, but they are there.

Instead I experimented a bit with other solutions.

The simplest I found was to copy xml/nn/images to html/nn and change all image calls in the html code to be links (shortcuts) by adding a ".lnk" prefix to the names af the image files. (Example: become and so forth).
(The ".lnk" does not shows up in the (Windows) file browser, but does have to be added to get it work).

So, if it does not disturb the project in any way, would it be a solution to do so for all?

IMHO this can't be right. After all, this seems to be a weird problem (bug?) in Windows/Cygwin only.

Some others with this or similar problem(s)? Would be simpler to trace the problem if I know whether it is a Windows or a Cygwin error. For now it looks to me as it is a Windows problem, but I am not sure.

Make the Makefile.GNU or whatever 1. copy the xml/lang/images to the html/lang/ 2. adding ".lnk" to the image file names in the html

I still think my suggestion is better (cleaner):

o for non-Windows/Cygwin: don't change anything; o for Windows/Cygwin:
1. try hardlinks rather than symlinks for linking image files xml/LL/images/... -> images/{common,C,LL}/... and leave the symlink
html/LL/images -> ../../xml/LL/images; 2. if this doesn't work, copy image files instead of linking; 3. if this doesn't work, hardlink/copy image files xml/LL/images -> html/LL/images; 4. if this doesn't work, format harddisk and/or insert an Ubuntu (or any other Linux distribution) CD/DVD ;-)

We can do this e.g. using conditionals in the Makefile: ifeq ($(CYGWIN),1)
special commands
else
normal commands
endif
and adding a command line option to "tools/make_image_links.pl" to control which method should be used for linking (symlink, hardlink, copy).

Thank you.
I'll give it a try. Perhaps I have to download the gettext manual too ;-) . At first I have to figure out the difference between the hard links and sym links and how to handle them in Windows. The summer is not the best time for working on the computer. Long days, short nights. Time for outdoor living and to be a social creature.

I'm an optimist, so in parallel to working on the link problem I have nearly finished my updated Norwegian translation. If my po files works well in a Linux environment I could perhaps use my solution mentioned above and send my po files + my image files to someone committing them for me?

BTW: To add all the ".lnk"'s I write my first Python program to do the job, or more correctly: I modified some programs found on the net. Had to download the Python manual too. So perhaps I'll start programming ;-)

Good idea! :-)

In fact is was fun, but resulted in a lot of extra reading as I am not used to the "Linux way of thinking" and all the letters or words with - and -- in front. Some not even logical abridgments. (As I had an exact problem I dropped many of the tutorials and so forth. The hard way of learning. Not recommended!).

Thank you for helping Kolbjoern

Bye,
Ulf

------------------------------------------------------------------------

I'm in a pause in a meeting just now (nothing to do with computing), but will have a look at your solutions as far as possible. Perhaps I will pray to be reincarnated as a programmer in my next life :-\ . It is real fun, but alas time consuming at my stage and may be even more if I get hooked.

Kolbjoern

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Montag, 15. Juni 2009, 00:13):

Ulf-D. Ehlert skreiv:

What are .lnk files?

Files that links (points) to other files instead of containing the "real" file. (Also called "shortcuts"). A file "myImage.png.lnk" may for example point to the real image file "myImage.png". The ".lnk" don't show up in the browser, but they are there.

So .lnk files are symlinks, and apparently there are two kinds of symlinks, since the 'ln -s' command under Cygwin creates also symlinks - is this correct?

Maybe here is the problem: Windows expects Windows-like symlinks (.lnk files) and can't handle Linux-like symlinks created by 'make' under Cygwin? Then you have to start your browsers using Cygwin?

I'll give it a try.

I have changed the Perl script we use to create links to images files and have committed it to a new branch (try 'git branch -a'). (Use 'grep -A3 -B6 make_image_links Makefile.GNU' so see how the script is used with 'make'.)

Now you can use it also for making hardlinks or copying files.

You may want to knock on wood and try: 1a) $ rm -rf xml/no/images/*
$ tools/make_image_links.pl -v --mode=symlink images/C \ xml/no/images
1b) same as above (don't forget to remove xml/no/images/*), but replace "symlink" with "hardlink" (then check the image files with and without browser) 1c) same as above, with "copy" instead of "hardlink" 2) $ rm html/no/images # this was still a symlink $ mkdir -v html/no/images
2a) $ tools/make_image_links.pl -v --mode=symlink images/C \ html/no/images
(check the image files with and without browser) 2b) $ rm -rf html/no/images/*
$ tools/... like above, with "hardlink" instead of "symlink" 2c) same as above, with "copy" instead of "hardlink" (Note that I skipped the images/common files.)

Maybe also try 1b) and 1c) with a .lnk file html/no/images.lnk?

At first I have to figure out the difference between the hard links and sym links

You can consider a hard link more or less as the name of a file or directory.
Making another hard link with 'ln old new' just means creating another name for the same file. Both links are equal in any respect except the path/name.

and how to handle them in Windows.

Try the above tests and see what happens.

The summer is not the best time for working on the computer. Long days, short nights. Time for outdoor living and to be a social creature.

Right! :-)

Some not even logical abridgments.

Then you should check "The UNIX-HATERS Handbook"! ;-)

Bye, Ulf

------------------------------------------------------------------------

Ulf-D. Ehlert skreiv:

I have changed the Perl script we use to create links to images files and have committed it to a new branch (try 'git branch -a').

What command(s) do I need to download the files from this branch? "git clone", "pull" etc. did not work.
(I'm lazy ;-) Easier to ask here than reading the manual) Kolbjoern

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Dienstag, 16. Juni 2009, 10:42):

Ulf-D. Ehlert skreiv:

I have changed the Perl script we use to create links to images files and have committed it to a new branch (try 'git branch -a').

What command(s) do I need to download the files from this branch? "git clone", "pull" etc. did not work. (I'm lazy ;-) Easier to ask here than reading the manual)

Don't know (never tried it - I'm lazy, too), but according to http://github.com/guides/git-cheat-sheet

Nice site. Wasn't aware of it.

you should try
git fetch origin [remote-branch]:[new-local-branch] here:
git fetch origin cygwin-windows-quirks:cygwin-windows-quirks (or just
git fetch origin cygwin-windows-quirks?)

Both works, but the only new file I get is an updating of gimp-help-2/.git/FETCH_HEAD. No other files in my folders.

An alternative seems to be
git fetch
and then
git checkout -b cygwin-windows-quirks origin/cygwin-windows-quirks

Perhaps I forgot the "-b" or missed something during copying, but the final result was that lots of files in my working copy of gimp-help-2 where deleted or changed!
I stopped thinking and run the git clone command to get a new copy.

Could you mail me the file instead?

I am not very eager at the moment to spend more time on the git commands. Better using it on the Cygwin/Windows problem.

Kolbjoern

Ulf

SOLVED

Your (Ulf) suggestions works with "hardlink" and "copy"!

Run (using the updated tools/make_image_links.pl): $ tools/make_image_links.pl -v --mode=hardlink images/C xml/nn/images and then
$ tools/make_image_links.pl -v --mode=hardlink images/C html/nn/images I also run
$ tools/make_image_links.pl -v --mode=hardlink images/common html/nn/images to get the common images in place.

(To run "copy" I replaced the "hardlink" wit "copy".)

This resulted in html files pointing to LANG (here "nn") images when they exist, otherwise to C images. Just as supposed. I have not figured out which one of the methods is the be recommended, hardlink or copy. To me they seems to be equal.

I still do not know how to pass arguments through a link file in Windows, but don't care anymore. Perhaps when the days get shorter and nothing else to do …

In Windows the link files has the prefix ".lnk" added to the file name. This prefix do not shows up in the file listing. In the html files the call is set to "brushes-buttons.png", but the *real* name of the selected file is "brushes-buttons.png.lnk". Result: File not found. The symbolic links does not work satisfying in Windows. Or more correct: I have not found a way to get them work, if they does.

It was a very long way to the goal. But I have learned a lot! Now I have to celebrate in one way or other.

Well done, Ulf.

From a grateful Kolbjørn

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Freitag, 19. Juni 2009, 17:34):

SOLVED

No, we still have to adapt the Makefile(s) to Cygin/Windows.

Forgot it. :-[

To the work: I did the following in Cygwin to get a working copy of the image files in html/nn:
1. $ tools/make_image_links.pl -v --mode=hardlink images/C html/nn/images 2. $ tools/make_image_links.pl -v --mode=hardlink images/common html/nn/images (to get the rest of the images)

The functions are copying the images directly from images/nn or from images/C if no "translated" image exists. The image files made in xml/nn are not used. (I deleted them to prove the theory. It worked.)

Copied the html catalog and run it on a different computer not even in a network. All worked as on the original machine.

I have not found a way to figure out whether an image file is a real file or a hardlink. They looks alike in the file browser and all other places I am able to list them. (See below).

Your (Ulf) suggestions works with "hardlink" and "copy"!

Did it also work with "html/LL/images" being a link to "../../xml/LL/images", or only when you linked/copied the files directly to the html directory?

(I can add a simple test for Cygwin using an autoconf macro and then modify the relevant Makefile commands accordingly, but I have to know which parts of the Makefile to change.)

I have no idea how to test for Cygwin. Assume you know a clever way :-) .

This resulted in html files pointing to LANG (here "nn") images when they exist, otherwise to C images. Just as supposed. I have not figured out which one of the methods is the be recommended, hardlink or copy. To me they seems to be equal.

Using hardlinks seems to be better, since this way we won't create new files and copy several MByes of data, instead just directory entries are added or updated (at least, under Linux). Don't know if hardlinks are portable, though (but it looks like hardlinks are even more portable than symlinks),

I have found very little relevant stuff about links in Windows. The nearest I came from Microsoft is
http://msdn.microsoft.com/en-us/library/aa365006(VS.85).aspx Seems that hard links in Windows are treated like copies instead of as links. At least before Windows Vista. Symbolic links is only available as such in Vista. Perhaps Microsoft is learning (stealing?) from Linux? .
The image files are portable in the sense that they may be used on a different computer.
Have not finished the "The UNIX-HATERS Handbook", so perhaps I misunderstood your questions a bit.
BTW: The book learned me a lot. Not to be a Unix hater, but why I got those annoying error messages and to avoid some of them.

Had a thunderstorm today. I'm not using any kind of electronics in such weather. Therefore a bit late.
Kolbjoern

Bye,
Ulf

------------------------------------------------------------------------

Just checking my mail.
Looks like I have some computer work to do this night too. I'll give a reply when checked your suggestions. (Ulf and Roman: I'm living nearly as far south as possible in Norway, so no midnight sun.)
Kolbjoern

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Mittwoch, 24. Juni 2009, 22:15):

Ulf-D. Ehlert skreiv:

Try './config.guess' (an automake script).

Output No such file ...

It should be automatically created whenever you run autogen.sh (or automake) if "configure.ac" contains that AC_CANONICAL_BUILD macro. On my (Linux) PC it's a link like "missing" or "install-sh": config.guess -> /usr/share/automake-1.10/config.guess

Looks like it has to be applied
to the master branch (or better a local branch based on master) with 'git am'.

Patch'ing your (mailed) make_image_links.pl with this command $ patch -p0 make_image_links.pl cygwin-windows-quirks.patch Output:
patching file make_image_links.pl
Hunk #1 FAILED at 14.
Hunk #2 FAILED at 87.
Hunk #3 FAILED at 103.
...
Did I used wrong command?

Yes.
a) try "git am" (and "git help am"); b) using "patch" you have to strip the leading "a/" and "b/" from the path names with "patch -p1 < filename.patch" (try "grep -A1 '^---' filename.patch" to see the names of the files that will be patched).

Perhaps a better idea to send the finished file?

Too late. ;-)

Tried run $ make -f Makefile.GNU html-nn

For testing this autotools-based feature you have to use the autotools-created Makefile, not Makefile.GNU.

You will notice that my patch doesn't change Makefile.GNU. If evrything works I will add the changes to Makefile.GNU too (probably based on the result of "uname -s").

The command
$ tools/make_image_links.pl -v --mode=hardlink images/C html/nn/images works with your mailed make_image_links.pl file and the corrupted one. I have to delete the html/nn/image(.lnk) before running this ro avoid error messages. Don't know why.

Removing existing files before creating new files/links is done when the script is called by 'make' (look at the Makefile commands near "make_image_links.pl").

(Today is one of the summer days we dream of all the winter, so very little computer or other work today. The sun is still shining.

How long are your summer days now, 24 hours?

Bye, Ulf

------------------------------------------------------------------------

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Mittwoch, 24. Juni 2009, 22:15):

Ulf-D. Ehlert skreiv:

Try './config.guess' (an automake script).

Output No such file ...

It should be automatically created whenever you run autogen.sh (or automake) if "configure.ac" contains that AC_CANONICAL_BUILD macro. On my (Linux) PC it's a link like "missing" or "install-sh": config.guess -> /usr/share/automake-1.10/config.guess

Yes it is in that branch. "missing" is installed as a shortcut to "C:\cygwin\usr\share\automake-1.10\missing" when running autogen.sh.

Looks like it has to be applied
to the master branch (or better a local branch based on master) with 'git am'.

Patch'ing your (mailed) make_image_links.pl with this command $ patch -p0 make_image_links.pl cygwin-windows-quirks.patch Output:
patching file make_image_links.pl
Hunk #1 FAILED at 14.
Hunk #2 FAILED at 87.
Hunk #3 FAILED at 103.
...
Did I used wrong command?

Yes.
a) try "git am" (and "git help am"); b) using "patch" you have to strip the leading "a/" and "b/" from the path names with "patch -p1 < filename.patch" (try "grep -A1 '^---' filename.patch" to see the names of the files that will be patched).

Got no time this evening to read all the "git help am" options and figure out which ones to use in this case. Looking forward to try the commands you mentioned. As mentioned before I am not used to the Linux jargon, although I am learning a bit every day now.

Perhaps a better idea to send the finished file?

Too late. ;-)

Tried run $ make -f Makefile.GNU html-nn

For testing this autotools-based feature you have to use the autotools-created Makefile, not Makefile.GNU.

You will notice that my patch doesn't change Makefile.GNU. If evrything works I will add the changes to Makefile.GNU too (probably based on the result of "uname -s").

The command
$ tools/make_image_links.pl -v --mode=hardlink images/C html/nn/images works with your mailed make_image_links.pl file and the corrupted one. I have to delete the html/nn/image(.lnk) before running this ro avoid error messages. Don't know why.

Removing existing files before creating new files/links is done when the script is called by 'make' (look at the Makefile commands near "make_image_links.pl").

Suppose that I had to remove the file manually is because the real name of the file is "images.lnk". The link problem again. Does not matter at all. Just curiosity.

(Today is one of the summer days we dream of all the winter, so very little computer or other work today. The sun is still shining.

How long are your summer days now, 24 hours?

18 hours sun.

Kolbjoern

Bye,
Ulf

------------------------------------------------------------------------

Roman Joost skreiv:

On Wed, Jul 01, 2009 at 06:18:12PM +0200, Ulf-D. Ehlert wrote:

Kolbjørn Stuestøl (Dienstag, 30. Juni 2009, 23:15):

Had some spare minutes tonight and tried your suggestions. 1. Copied the patch file to the gimp-help-2 on my working copy. 2. Copied the make_image_links.pl you mailed to gimp-help-2/tools 3. Ran: $ git am < cygwin-windows-quirks.patch 4. Output from Cygwin:
…
…
[../] gimp-help-2/.git/rebase-apply/patch:24: trailing whitespace. " -v | --verbose print number of image files\n" . error: tools/make_image_links.pl: does not match index Patch failed at 0001.

2. conflicts with 3.

The following procedure should work: 1. git checkout master
2. git checkout -b new-master-copy
3. git am cygwin-windows-quirks.patch 4. git diff ORIG_HEAD

You could also do:

git diff master..

Exactly the same result running both suggestions. (error: tools/make_image_links.pl: does not match index).

It's always a matter how the branch was created. In Ulfs example, the branch is created on the basis of the local master. Your local master is also a branch and could differ from the master branch at the GNOME repository (origin/master).

My local copy differs only in that I have replaced the original "tools/make_image_links.pl" from the GIMP repository with the "make_image_links.pl" Ulf mailed to me. The rest of the files are a updated with the command "git pull".

To use git am it looks like I have to find a way to incorporate the local "tools/make_image_links.pl" into index on my local copy.

I'm working on it, trying to understand the git help files and reading about git on the web etc.
I also am updating my translations, using Ulf's changes in the make_image_links.pl to get the image files copied as hardlinks into the html folder. The changes works well, but I have to write the commands manually.

That's why you have to pull and rebase now and then.

I "git pull" whenever "git log" tells that the GIMP repository has been changed.
Kolbjoern

Cheers,

------------------------------------------------------------------------

Ulf-D. Ehlert skreiv:

Kolbjørn Stuestøl (Donnerstag, 2. Juli 2009, 23:36):

Exactly the same result running both suggestions. (error: tools/make_image_links.pl: does not match index).

Then you have changed this file in the master branch, and so you first have to revert your changes ('git checkout HEAD' or 'git checkout tools/make_image_links.pl').

My local copy differs only in that I have replaced the original "tools/make_image_links.pl" from the GIMP repository with the "make_image_links.pl" Ulf mailed to me. The rest of the files are a updated with the command "git pull".

The patch contains these changes, that's why it doesn't work your way.

Thank you. I'll try it during the weekend (I hope). Kolbjoern

Ulf

------------------------------------------------------------------------