Re: [Gretl-users] Getting ready for 1.5.1

On Wed, Mar 08, 2006 at 12:19:06AM +0100, Sven Schreiber wrote: Yes, to avoid conflicts it's best practice to commit changes as soon as they are finalized. In principle you could dig into the file and manually examine all the sections marked with <<<<< ... ===== ... as it's explained in http://cvsbook.red-bean.com/cvsbook.html#Detecting%20And%20Resolving%20Co... But in the case of .po files that's not convenient, because typically you'll have to deal with LOTS of changes (and most changes have to do with comments). So I suggest to use the "merge" feature of your favourite po editor (e.g. poedit, kbabel...) to automatically transfer the new translated strings from your old working copy (the cvs client should have saved a copy as ".#de.po.revision") to the newer cvs revision. If you are using a simple text editor to edit po files, you can use the "msgmerge" command line utility (from the "gettext" package), like this: msgmerge your_original_working_copy.po cvs_copy.po > output.po output.po will have the same structure of the newer cvs po file and will include the translations you had in your original working copy (and perhaps some new and fuzzy strings to translate). Cri -- GPG/PGP Key-Id 0x943A5F0E - http://www.linux.it/~cri/cri.asc Free software, free society - http://www.fsfeurope.org