--047d7b33d5d614eabd04d98c9522
Content-Type: text/plain; charset=ISO-8859-1

* 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.

--047d7b33d5d614eabd04d98c9522
Content-Type: text/html; charset=ISO-8859-1

<div dir="ltr">* Otherwise bring all changes from SVN. In case of conflicts, select<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

the version in Translatewiki. Except if the message was marked as<br>
discarded (i2), then select the SVN version.</blockquote><div><br></div><div style>I do not fully understand this: &quot;message marked as discarded&quot;, because, afaik, a standard po file has no mean to keep this information in it.</div>
</div><br></div></div>

--047d7b33d5d614eabd04d98c9522--