From kde-i18n-doc  Fri Dec 22 16:04:04 2000
From: Wolfram Diestel <wolfram () steloj ! de>
Date: Fri, 22 Dec 2000 16:04:04 +0000
To: kde-i18n-doc
Subject: Re: desktop.po corrupt during auto merge
X-MARC-Message: https://marc.info/?l=kde-i18n-doc&m=97750136909457

Je Fri, 22 Dec 2000, Wang Jian skribis:

>The desktop.po file of zh_CN.GB2312 has been corrupted many times. The
>problem is during the merge the msgstr's width is rearranged and some
>translation is corrupted.

For normal source files the merge would be ok and could be
corrected by hand deleting either the first or the second
part of

>>>>>>>>>>>>>>>>>>
one version
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
another version
<<<<<<<<<<<<<<<<<<

But because of the arbitrary order of the messages in po files
the manually correction is very painful. If you are sure that
you are the only one working on a file (i.e. the other version is made
by CVS_SILENT script) you can do the following:

mv my.po my.po.sec
cvs update
mv my.po.sec my.po
cvs ci -m"..." my.po

this simply ignores the changes made by CVS_SILENT. They
will be merged in again the next time it runs.

Hope that helps,
  Wolfram.

--=20
Wolfram Diestel <wolfram@steloj.de> http://www.steloj.de/