Problems with gedit translations while merging gnome-2-0-0 into HEAD

[Paolo Maggi <maggi athena polito it>]

Hi,
    today I've merged gnome-2-0-0 branch of gedit into HEAD and I have 
had conflicts while merging de.po, fr.po and ja.po.

es.po, ko.po, vi.po and wa.po files have been merged without problems.

Please, check if they are ok.

Note that CVS HEAD will be used for gnome 2.0.1 development, while the 
gnome-2-0-0 branch is dead.

Thanks for you help.

Ciao

Paolo