Re: Patch for xds.in files

On Wed, Dec 29, 2004 at 05:14:27PM +0100, Geert Stappers wrote:
> On Wed, Dec 29, 2004 at 11:19:46AM +0100, [email protected] wrote:
 [ stuff for list administrator,
   should be explaining why message came an unusual way on the ML ]
> > From: Michèle Garoche <[email protected]>
> > To: Conglomerate Development <[email protected]>
> > Subject: Patch for xds.in files
now using that subject line

> > Date: Wed, 29 Dec 2004 11:19:32 +0100
> > X-Mailer: Apple Mail (2.619)
> > 
> > Hello,
> > 
> > Here's a patch which allows to get the strings (either English or 
> > translated ones) for the files in dispspecs when launching conglomerate 
> > with other languages than English. (At the moment the strings are all 
> > translated as untitled, for example in preferences, which is not of 
> > great help).
> > 
> > The patch contains changes for Makefile.am in dispspecs, POTFILES.in in 
> > po, and elimination of fuzzy strings in fr.po.
> > 
> > Though it makes 98 fuzzy strings (but only in added xds.in files) and 
> > about 200 untranslated ones, that's not a big deal, since it works 
> > perfectly without translated them.
> > 
> > The process is to remove the corresponding .xds files from the tree, 
> > put in place the here below .xds.in files, and apply the patch.
Done.

> > Only one xds file remains (release.xds),
> > as I was not sure if it should be transformed.
> > 
> > 
 [patch and the new  .xds.in files ]
> > Michèle
> > <http://micmacfr.homeunix.org>
> 
> The various attachments are in my mailbox.
> 
> I will apply the patch without fr.po.
> There are too much auto generated changes in that file.

And applying the patch on fr.po resulted in

patching file po/fr.po
Hunk #1 FAILED at 8.
Hunk #2 succeeded at 1244 with fuzz 2 (offset 1227 lines).
Hunk #3 FAILED at 1379.
Hunk #4 FAILED at 1411.
Hunk #5 FAILED at 1427.
Hunk #6 FAILED at 1439.
Hunk #7 FAILED at 1451.
Hunk #8 FAILED at 1486.
Hunk #9 FAILED at 1508.
Hunk #10 FAILED at 1516.
Hunk #11 FAILED at 1545.
Hunk #12 FAILED at 1561.
Hunk #13 FAILED at 1569.
Hunk #14 FAILED at 1582.
Hunk #15 FAILED at 1599.
Hunk #16 FAILED at 1617.
Hunk #17 FAILED at 1633.
Hunk #18 FAILED at 1651.
Hunk #19 FAILED at 1664.
Hunk #20 FAILED at 1680.
Hunk #21 FAILED at 1692.
Hunk #22 FAILED at 1724.
Hunk #23 FAILED at 1744.
Hunk #24 FAILED at 1789.
Hunk #25 FAILED at 1797.
Hunk #26 FAILED at 1813.
Hunk #27 FAILED at 1842.
Hunk #28 FAILED at 1870.
Hunk #29 FAILED at 1899.
Hunk #30 FAILED at 1932.
Hunk #31 FAILED at 1946.
Hunk #32 FAILED at 1958.
Hunk #33 FAILED at 2040.
Hunk #34 FAILED at 2049.
Hunk #35 FAILED at 2077.
Hunk #36 FAILED at 2098.
Hunk #37 FAILED at 2118.
Hunk #38 FAILED at 2130.
Hunk #39 FAILED at 2217.
Hunk #40 FAILED at 3821.
Hunk #41 FAILED at 3865.
Hunk #42 FAILED at 3909.
Hunk #43 FAILED at 3990.
Hunk #45 succeeded at 3266 with fuzz 2 (offset 144 lines).
Hunk #46 FAILED at 3280.
Hunk #47 FAILED at 3410.
Hunk #48 FAILED at 3478.
Hunk #49 succeeded at 3362 with fuzz 2.
Hunk #50 FAILED at 3448.
Hunk #51 FAILED at 3494.
Hunk #52 FAILED at 4221.
Hunk #53 FAILED at 4290.
Hunk #54 FAILED at 4391.
Hunk #55 succeeded at 4457 (offset 7 lines).
Hunk #56 FAILED at 4486.
Hunk #57 succeeded at 4593 with fuzz 2 (offset 35 lines).
Hunk #58 FAILED at 5219.
Hunk #59 FAILED at 5231.
53 out of 59 hunks FAILED -- saving rejects to file po/fr.po.rej


CVS has now a outdated po/fr.po.
Please send a new version.
Sorry for screwing up.


Cheers
Geert Stappers
-- 
Worst harm is done with the best intensions  :-(

_______________________________________________
Conglomerate-devel mailing list
[email protected]
http://lists.copyleft.no/mailman/listinfo/conglomerate-devel

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFB1P4TOSINbgwa/7sRAo1zAKCWU8e9NM722YYdnUoHJxvB8wwi0gCeN6WK
ReMT5xQqFyIpLPjKEv4vGsk=
=kqHk
-----END PGP SIGNATURE-----