Merged translations with upstream *.pot files