Leandro Santiago, il 03/10/2010 17:08, scrisse:
> Hello to all.
>
> Every time I update the efl svn tree, conflicts happen in the
> translation files. I don't change these files here, but they are
> always broken.
>
> Conflict discovered in 'e/po/zh_CN.po'.
> Selecione (p) postpone, (df) diff-full, (e) edit,
> (mc) mine-conflict, (tc) theirs-conflict,
> (s) show all options:
either give the "tc" command or delete that file from your disk and re-update
to let it download a good copy from the repository.
--
Massimo Maiurana massimo<at>ragusa.linux.it
http://massimo.solira.org GPG keyID #7044D601
Creare l'uomo fu un'idea bizzarra e originale,
ma aggiungere la pecora fu una tautologia.
[Mark Twain]
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
enlightenment-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-users
