Re: [opensuse-translation] How to resolve conflicts in update-desktop-files-conflicts.fr.po?