Walter:<br>Pootle generate the pot file from the sources he takes from git.<br>You can read <a href="http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices" target="_blank">http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices</a><br>
and <a href="http://wiki.sugarlabs.org/go/Translation_Team/Workflow">http://wiki.sugarlabs.org/go/Translation_Team/Workflow</a><br><br>Gonzalo<br><br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
I don't understand how the .pot file can represent a conflict. Pootle<br>
is suppose to pull .pot files from git, not push to git.<br>
<br>
-walter<br>
<div class="im">><br></div></blockquote></div><br>