The funny thing about that error is the language code da (instead of de). Sounds like some sort of error on the back-end of things hooking Pootle up to git.<br><br>In git the PO file for German looks more-or-less okay.<br>
<br><a href="http://git.sugarlabs.org/pippy/mainline/blobs/master/po/de.po">http://git.sugarlabs.org/pippy/mainline/blobs/master/po/de.po</a><br><br>There has been some work on getting Pootle synched up to current status with POT files as discussed in this thread:<br>
<a href="http://lists.sugarlabs.org/archive/sugar-devel/2011-January/029502.html" target="_blank">http://lists.sugarlabs.org/archive/sugar-devel/2011-January/029502.html</a><br><br>It may be related to those issues.<br><br>
cjl<br><br><div class="gmail_quote">On Tue, Jan 18, 2011 at 3:53 AM, Markus Schlager <span dir="ltr"><<a href="mailto:m.slg@gmx.de">m.slg@gmx.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Cannot commit fructose->pippy.po:<br>
<br>
---8X---------------------<br>
Failed to commit file: [GIT] pull failed (['git', '--git-dir',<br>
'/var/lib/pootle/checkouts/fructose/pippy-activity/.git', 'pull']): error:<br>
Entry 'po/da.po' not uptodate. Cannot merge.<br>
---X8---------------------<br>
<div><div></div><div class="h5"><br>
Markus<br>
_______________________________________________<br>
Localization mailing list<br>
<a href="mailto:Localization@lists.laptop.org">Localization@lists.laptop.org</a><br>
<a href="http://lists.laptop.org/listinfo/localization" target="_blank">http://lists.laptop.org/listinfo/localization</a><br>
</div></div></blockquote></div><br>