On Wo, 2008-11-12 at 17:31 -0800, Asheesh Laroia wrote: > Furthermore, this issue isn't strictly related to DVCSs, I think. > Doesn't > conflict2suggest.py handle this in the general case?
Hallo Asheesh conflict2suggest.py is really for handling conflicts caused by msgmerge where the units will contain #-#-#-#-# markers with different conflicting translations all indicated in one translations. This is really unrelated to version control conflicts where the file format is (possibly) broken by an update clashing with local changes. > (BTW: Hi all, I'm new to the list. I'm working on > internationalization at > Creative Commons and spending a lot of time lately talking to Wil > Clouser > of Mozilla on #pootle, where my nick is paulproteus.) You are very welcome on the list. We are now making some good progress with the Mozootle merge. We'll probably be making some big calls for testing in the next while. I should also mention that Asheesh has provided an initial script for migrating the users database from the current Pootle .prefs system to the Mozootle users database. Thanks a lot for that. Keep well Friedel -- Recently on my blog: http://translate.org.za/blogs/friedel/en/content/blurred-vision-beeld ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Translate-pootle mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/translate-pootle
