Guillaume Gardet <guillaume.gardet@free.fr> 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