new changes

[Boris Becker]

I accidentally made translations to a version without doing an update first.
When I try to update, I get a conflict error, which I cannot resolve with a 
merge.
I separated all the changes in another file, which can be poedited.
I am now copying and pasting the changes from one file to the other.
Is there a way to merge those changes with the curren po file ?
I mean by tags.

Regards

Domingo Becker