To me it looks like a merge is necessary. AFAIK you could just try to build the package locally, running 'debuild' and see if the .pot file is available after the build.
To me it looks like a merge is necessary. AFAIK you could just try to build the package locally, running 'debuild' and see if the .pot file is available after the build.