On Fri, 2007-08-03 at 01:05 +0200, lars wrote: > Hi, > > > Na Thu, Aug 02, 2007 at 08:39:30AM +0200, Christian Perrier > > <[EMAIL PROTECTED]> pisal(a): > > > For this we would need to have something that does that update *and* > > > updates Pootle statistics or solves conflicts just like the "Update" > > > link does inside Pootle. > > > > hmm, afaik Pootle does not resolve VCS conflicts, or have i missed > > something? :) > > I thought so, too. But then Friedel pointed me to the function > "updatepofile" in "projects.py". VCS and pootle changes are merged there.
Correct. At the moment what happens is that conflicts, which in this case are different translations in VC and on Pootle checkout, are managed by firstly preferring the version in the VC and secondly turning the Pootle translation into a suggestion. If we can get the VC stuff out of Pootle and into the toolkit we then we can at least start to create such a generic tool. Such a tool would actually be useful for many translators as VC conflicts are really of no use in the l10n world. -- Dwayne Bailey Translate.org.za +27-12-460-1095 (w) +27-83-443-7114 (cell) ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Translate-pootle mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/translate-pootle
