[Localization] Pootle commit error

[Sayamindu Dasgupta]

Fixed (did not find any errors in memorize - the file seem to have
been committed). Labyrinth was also fixed as well.
Thanks for reporting the bugs :-)
Sayamindu


On Sun, Nov 1, 2009 at 6:49 PM, Korakurider <korakurider at gmail.com> wrote:
> Hello.
> I get errors when push Japaneses translations from Pootle.  Please investigate.
> Thanks in advance.
> /Korakurider
>
> For Read EText:
> ------
> [GIT] pull failed (['git', '--git-dir',
> u'/srv/pootle/checkouts/honey/readetexts/.git', 'pull']): error: Entry
> 'po/ReadETexts.pot' not uptodate. Cannot merge. fatal: merging of
> trees e96b6382a31c80450be7ff34154192e2421229fe and
> fbe0a938db9609d4771aec3733540c13bf727907 failed Merge with strategy
> recursive failed.
> ------
>
> For memorize:
> ------
> [GIT] commit of ('/srv/pootle/checkouts/honey/memorize', 'po/ja.po')
> failed: # On branch master # Changed but not updated: # (use "git add
> <file>..." to update what will be committed) # #        modified:
> po/Memorize.pot #       modified: po/af.po #    modified: po/am.po # modified:
> po/ar.po #      modified: po/ay.po #    modified: po/bg.po #    modified:
> po/bi.po # modified: po/bn.po # modified: po/bn_IN.po # modified:
> po/ca.po #      modified: po/cpp.po # modified: po/cs.po #      modified:
> po/dz.po #      modified: po/el.po #    modified: po/en.po # modified:
> po/fa.po #      modified: po/fa_AF.po # modified: po/ff.po #    modified:
> po/gu.po # modified: po/ha.po # modified: po/he.po #    modified:
> po/hi.po #      modified: po/ht.po # modified: po/hu.po #       modified:
> po/ig.po #      modified: po/is.po #    modified: po/it.po #    modified:
> po/km.po #      modified: po/ko.po #    modified: po/mg.po #    modified:
> po/mk.po #      modified: po/ml.po #    modified: po/mr.po #    modified:
> po/ms.po #      modified: po/mvo.po #   modified: po/na.po #    modified:
> po/nb.po #      modified: po/ne.po #    modified: po/pa.po #    modified:
> po/pap.po #     modified: po/pis.po #   modified: po/pl.po #    modified:
> po/ps.po #      modified: po/pt.po #    modified: po/pt_BR.po # modified:
> po/qu.po #      modified: po/ro.po #    modified: po/ru.po #    modified:
> po/rw.po #      modified: po/sd.po #    modified: po/si.po #    modified:
> po/sk.po #      modified: po/sl.po #    modified: po/sq.po #    modified:
> po/sv.po #      modified: po/sw.po #    modified: po/ta.po #    modified:
> po/te.po #      modified: po/th.po #    modified: po/tpi.po #   modified:
> po/tr.po #      modified: po/ug.po #    modified: po/ur.po #    modified:
> po/wa.po #      modified: po/yo.po #    modified: po/zh_CN.po # modified:
> po/zh_TW.po # no changes added to commit (use "git add" and/or "git
> commit -a")
> ------
>



-- 
Sayamindu Dasgupta
[http://sayamindu.randomink.org/ramblings]