...

...

...

...

"DT" == Danny Terweij writes:

DT> I see (new checkins) that many lines are changed at the DT> mailman.po file (Bouncer Patch). How to merge the new DT> mailman.po(latest cvs b4+) with my mailman-work.po(b4) ? I DT> did serveral translations and i do not want it to be lost :( Did you get CVS conflicts? Hopefully if so you didn't get a lot of them, but if you did you'll need to resolve them manually in an editor. Here's an entry from the cvs manual that helps explain the process of resolving conflicts: http://www.cvshome.org/docs/manual/cvs_10.html#SEC86 -Barry

...

...

...

...

"DT" == Danny Terweij writes:

>> Did you get CVS conflicts? Hopefully if so you didn't get a >> lot of them, but if you did you'll need to resolve them >> manually in an editor. Here's an entry from the cvs manual >> that helps explain the process of resolving conflicts: >> http://www.cvshome.org/docs/manual/cvs_10.html#SEC86 DT> Well, this is what i do : Get the latest CVS version. Copy DT> the mailman.po to /tmp/vertaal.po and i edit vertaal.po for DT> translations. (I am editing with the Crimson Editor (win32)) DT> Then i do : msgfmt vertaal.po cp vertaal.po DT> /usr/local/mailman/messages/nl/LC_MESSAGES/mailman.po cp DT> messages.mo DT> /usr/local/mailman/messages/nl/LC_MESSAGES/mailman.mo DT> But when a big change occurs at the CVS version then i do not DT> know how to merge it.. (if there is a way). DT> Maybe i do this at a wrong way.. but it works fine for me DT> (till big changes as now). It's the "big changes" that are exactly the reason why you probably want to edit mailman.po in its cvs location. Those big changes usually boil down to easily resolvable differences that cvs can automatically merge for you. -Barry

...

...

...

...

"DT" == Danny Terweij writes:

DT> Okay, so i must just edit the mailman.po file at the cvs DT> location? Then my edit's and the new cvs chanhes are merged? Usually, yes. Once in a while you'll get conflicts that have to be manually resolved, but for this file, that should be extremely rare. DT> Damn.. that's easy :) I am windows euh.. Microshit minded :) I agree, that's a problem. :) DT> Okay, then i loose my latest changes and start over :) Maybe not! Just move your file back into its cvs location and do another cvs update. See if cvs can do the merge. -Barry

Here's another approach, that I think you might want to try, Danny: Merge your working catalog with the catalog Barry generated. You do this by using the msgmerge utility: msgmerge -o <new-po-file> mailman.pot So if the file you are working on is called mailman-work.po, first do a cvs update in nl/LC_MESSAGES (this shouldn't overwrite your work, but you can save your mailman-work.po somewhere else, for safety), then also in nl/LC_MESSAGES, type: msgmerge -o mailman.po mailman-work.po ../../mailman.pot This should overwrite the newly checked out mailman.po with your latest translation merged with the new mailman.pot and is probably what you want! :D On Tue, 2002-10-29 at 22:20, Barry A. Warsaw wrote:

...

...

...

...

...

"DT" == Danny Terweij writes:

DT> I see (new checkins) that many lines are changed at the DT> mailman.po file (Bouncer Patch). How to merge the new DT> mailman.po(latest cvs b4+) with my mailman-work.po(b4) ? I DT> did serveral translations and i do not want it to be lost :(

Did you get CVS conflicts? Hopefully if so you didn't get a lot of them, but if you did you'll need to resolve them manually in an editor. Here's an entry from the cvs manual that helps explain the process of resolving conflicts:

http://www.cvshome.org/docs/manual/cvs_10.html#SEC86

-Barry

_______________________________________________ Mailman-i18n mailing list Mailman-i18n@python.org http://mail.python.org/mailman/listinfo/mailman-i18n

-- Mvh Daniel Buchmann, Systemteknisk Avdeling, BIBSYS, NTNU. Tlf. 73 59 02 14

From: "Barry A. Warsaw"

Ah, good suggestion, thanks Daniel.

Yeah this worked! Thanx both of you! Now i can upgrade my b4 to b4+ :) Danny.

From: "Barry A. Warsaw"

...

...

...

...

...

"DT" == Danny Terweij writes:

DT> Okay, so i must just edit the mailman.po file at the cvs DT> location? Then my edit's and the new cvs changes are merged?

Usually, yes. Once in a while you'll get conflicts that have to be manually resolved, but for this file, that should be extremely rare.

Okay, i have /users/mailman-cvs/ I do: cvs -d:pserver:anonymous@cvs.mailman.sourceforge.net:/cvsroot/mailman login cvs -z3 -d:pserver:anonymous@cvs.mailman.sourceforge.net:/cvsroot/mailman co mailman Edit some translations at /users/mailman-cvs/mailman/messages/nl/LC_MESSAGES/mailman.po Then do this again: cvs -d:pserver:anonymous@cvs.mailman.sourceforge.net:/cvsroot/mailman login cvs -z3 -d:pserver:anonymous@cvs.mailman.sourceforge.net:/cvsroot/mailman co mailman Then i got : cvs server: Updating mailman/messages/ko cvs server: Updating mailman/messages/ko/LC_MESSAGES cvs server: Updating mailman/messages/nl cvs server: Updating mailman/messages/nl/LC_MESSAGES cvs checkout: move away mailman/messages/nl/LC_MESSAGES/mailman.mo; it is in the way C mailman/messages/nl/LC_MESSAGES/mailman.mo cvs checkout: move away mailman/messages/nl/LC_MESSAGES/mailman.po; it is in the way C mailman/messages/nl/LC_MESSAGES/mailman.po cvs server: Updating mailman/messages/no cvs server: Updating mailman/messages/no/LC_MESSAGES So my edit file is deleted and replaced with cvs version? Maybe i still do something wrong :) Danny.

On Wed, 2002-10-30 at 22:32, Martin von Loewis wrote:

...

So my edit file is deleted and replaced with cvs version?

Yes.

Hmm... I don't think so. If you do "cvs update", yes then the file is messed up, but since Danny did "cvs checkout", nothing happened to his file, I think..

You still can reproduce the sequence of actions, by:

- checking out an old tree, with 'cvs co -D"last month" mailman', - copying your .po file over the CVS one, - updating to the current tree, with 'cvs up -A' (-A to remove the date tag)

Or, you can: - check out the current CVS tree to a new location, let's say /users/mailman-CVS - delete mailman.mo and mailman.po from /users/mailman-CVS/mailman/messages/nl/LC_MESSAGES - copy your translation (which you said were at /users/mailman-cvs/mailman/messages/nl/LC_MESSAGES/mailman.po) to /users/mailman-CVS/mailman/messages/nl/LC_MESSAGES/current.po - change directory to /users/mailman-CVS/mailman/messages/nl/LC_MESSAGES - run this command: msgmerge -o mailman.po current.po ../../mailman.pot - and then this one, to generate the binary catalog: msgfmt -o mailman.mo mailman.po Hope this helps. :)