On Wed, Mar 08, 2006 at 02:10:07PM +0100, Sven Schreiber wrote:
Thanks for your help; just for clarification, do you mean "don't wait
too long"
Yes.
or do you mean "commit first, not checking for updates before
that"?
The safest procedure with respect to the risk of conflicts is:
- cvs update
- make your local changes
- cvs commit
minimizing the time elapsed between the steps.
I will do that tonight, I'm using poedit on win (basically the
only
choice...).
If you are using poedit, all you have to do is to open your "old" de.po file
(the
one not modified by the latest cvs update operation, a copy of which should have
been saved by your cvs client as ".#de.po.REVISION") and then select
"Catalog ->
Update from POT file" in poedit's menu, and select the latest revision of
"gretl.pot" as the POT file.
This way, you'll merge the new strings coming from the latest POT file into your
old working copy (preserving your old not-yet-committed translations).
Then you can fix the fuzzy and new strings, update the catalog version ("Catalog
-> Settings") to 1.5.1, save the result as de.po and commit it.
Could there arise any further problems if yet another de.po
update appears in the meantime, before I can merge the changes?
In principle that could happen, and you'd just have to do a cvs update before
doing the things I mentioned above (the key point is to keep a copy of your
"old" not-yet-committed po file); in practice, Allin said that there won't
be
any string changes until the release of 1.5.1, so don't worry! :-)
Cri
--
GPG/PGP Key-Id 0x943A5F0E -
http://www.linux.it/~cri/cri.asc
Free software, free society -
http://www.fsfeurope.org