[Sugar-devel] Conflicts in pootle
walter.bender at gmail.com
Wed Jan 12 10:43:49 EST 2011
On Wed, Jan 12, 2011 at 10:24 AM, Gonzalo Odiard <gonzalo at laptop.org> wrote:
> Pootle generate the pot file from the sources he takes from git.
> You can read
> and http://wiki.sugarlabs.org/go/Translation_Team/Workflow
My mistake. I have screwed this up on all of my projects. What is the
best way to resolve the conflicts?
>> I don't understand how the .pot file can represent a conflict. Pootle
>> is suppose to pull .pot files from git, not push to git.
More information about the Sugar-devel