We have two .po files, each from different branches of a piece of software.
We need to combine these into a single .po file.
There are duplicates between the two
you can use poedit. To merge your current po-file, you must to open it and click:
Poedit will show you new & obsolete strings