Guillaume Gardet writes:

Cannot remember how to deal with update-desktop-files-conflicts.fr.po

Could you help me, please?

That's a good question. I think these are the files, where we (coolo) track if upstream translations and our translations differ. As long as we (I) merge with upstream, their translations will winn. That's why it is desirable that sync your translation (SVN) with upstream in one or the other direction. In other words: To avoid work and frustration it is always highly recommended that you check the conflicts file first and work with upstream. I hope this helps :)

Le 15/01/2013 10:52, Karl Eichwalder a écrit :

...

I just pulled in fresh update-desktop-files*.pot from factory for OS 12.3 and merged them.

-- Karl Eichwalder SUSE LINUX Products GmbH R&D / Documentation Maxfeldstraße 5 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org

Guillaume Gardet writes:

So, there is no file where openSUSE translation are except in this conflict file. (when there are conflicts, of courses). That's it ?

Should we update this file (or others) to match the translations and remove conflicts?

The conflicts file exists just for your information--with every merge it will get overridden. For every message listed there, you have basically two possibilities: 1/ If you think the upstream translation is better, use it in the corresponding u-d-f*.po file. 2/ If you prefer your translation (SVN), it would be the best, if you would try to submit your translation to the upstream project. Otherwise you must wait until we stop merging; from that point in time on our translations from the regular update-desktop-files*.po will win. -- Karl Eichwalder SUSE LINUX Products GmbH R&D / Documentation Maxfeldstraße 5 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org