* Otherwise bring all changes from SVN. In case of conflicts, select

the version in Translatewiki. Except if the message was marked as
discarded (i2), then select the SVN version.

I do not fully understand this: "message marked as discarded", because, afaik, a standard po file has no mean to keep this information in it.