how to merge po files from different versions of Gallery

Hi,
my problem is a bit strange, but anyway I dare to ask...
My case is the following: I make the Italian translation for G2. I send it to the sourceforge tracker. Probably developers are very busy, so they commit my files some time after... During the "parking time" my files become out of date, so when they are committed to cvs, they are incomplete.
Here's finally my question: is there a way to merge my work with the files on CVS? In this way I could update my translation on the tracker without waiting for commit...

I'm pretty sure this is a stupid newbie question... but I'm an newbie!

Thanks a lot.