Re: What's in git.git (stable frozen)

From: Christian Stimming <stimming@tuhh.de>
Date: Jan 7, 2008, 22:05 UTC
Message-ID: <200801072305.59425.stimming@tuhh.de>
In-Reply-To: <18306.41093.376963.228802@cargo.ozlabs.ibm.com>

Am Montag, 7. Januar 2008 22:58 schrieb Paul Mackerras:

Show 7 quoted lines

> I'd like you to do a pull from the gitk.git master branch, but it
> looks to me like there will be a conflict on the Makefile.
> Unfortunately the Makefile that Christian Stimming gave me along with
> the i18n changes is quite different from the one you currently have in
> the gitk-git subdirectory.  I'm not quite sure what to suggest since
> it isn't clear to me exactly what Christian's Makefile (which doesn't
> actually work) is trying to do.

The Makefile from me was merely a placeholder where the i18n programs should work, but it was clear that the installation rules need to be defined differently anyway.

> I guess the best thing would be to 
> copy your Makefile over and then add the i18n stuff.

Yes. I've just sent you a patch that does exactly this - that was what I thought, too.

> Apart from the i18n changes, there is one more commit (b039f0a6) that
> improves the appearance slightly when running under Tk8.5.

Are you going to release a i18n-enabled gitk sometime soon? If yes, you should consider notifying the translator(s) a few days in advance so that they can finalize their translations, in case they want to avoid a half-translated program to be shipped. Thanks a lot.

Christian