On Tue, Oct 22, 2002, Nicolas Huillard wrote: > There was a merge problem when Mike merged the 1_2 branch to the main > trunk,
Hmm, that merge was done almost a month ago (and I'm sorry if I broke something) ;-) revision 1.34 date: 2002/10/18 11:46:13; author: nhuillard; state: Exp; lines: +31 -32 Several updates. Some were lost as of '1.33 2002/09/26 15:27:11 nordstrom' ? ---------------------------- revision 1.33 date: 2002/09/26 15:27:11; author: nordstrom; state: Exp; lines: +42 -26 Merged with release branch BTW, yesterday, when I merged several branches (some local ones, too) I made sure to not change any existing strings in fr.rcp (I did add a few new strings, though.) > These changes could be included in some 1.2.1 release if there is one (not > so urgent, but I wouldn't like the errors to spread around the world for > months). Well, if there are errors in 1.2 (and the fr.rcp file in the 1.2 branch is different from the one in the main trunk) then you shouldn't blame me for them; I haven't touched the French translation in the 1.2 branch since you checked in a new version Oct 3 ;-) revision 1.28.2.9 date: 2002/10/03 15:26:48; author: nhuillard; state: Exp; lines: +4 -5 Finished translating "$$PREFS: HELP" I thought that *was* the translation intended for the 1.2 release... /Mike _______________________________________________ plucker-dev mailing list [EMAIL PROTECTED] http://lists.rubberchicken.org/mailman/listinfo/plucker-dev
