> hmm, afaik Pootle does not resolve VCS conflicts, or have i missed > something? :)
I wasn't clear, sorry. I was not talking about conflicts internal to the VCS but conflicts between the version in the repository and what is in Pootle. ------------------------------------------------------------------------- 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 Translate-pootle@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/translate-pootle