[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    Re: Translation Methods comparsion
From:       mvillarino <mvillarino () kde-espana ! es>
Date:       2013-04-04 18:27:53
Message-ID: CAGOKLE9ft5fbO831HzKv0tDhEWznu=UVBGukWO2f4-L+arr8OA () mail ! gmail ! com
[Download RAW message or body]

2013/4/4 Lasse Liehu <lasse.liehu@gmail.com>

> On 4 April 2013 20:48, mvillarino <mvillarino@kde-espana.es> wrote:
> > * 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.
> [...]
> "i1) Add a command to lokalize alternate translation view, to be able
> to discard an alternative. If it is used, the online tool should be
> notified to not use mine conflict on svn up."
>

Discarding conflicts by cherry-picking each particular conflict is not what
I was thinking about, despite you can try this using external diff and
merge tools (chapter 7 of the red book is some six chapters after where I
stopped reading), so if you try it I can not help much.
I think adding the relevant informations via comments to the file to commit
into kde svn is not a good idea, as they would accumulate volatile
informations soon. Maybe adding it into files used for primary sync and
sending them back to trWiki could do the job.

Please note there is a situation not considered previously: a file with
contribution both from the online tool and from a desktop cat tool user.

[Attachment #3 (text/html)]

<div dir="ltr"><div><br></div><div class="gmail_extra"><div \
class="gmail_quote">2013/4/4 Lasse Liehu <span dir="ltr">&lt;<a \
href="mailto:lasse.liehu@gmail.com" \
target="_blank">lasse.liehu@gmail.com</a>&gt;</span><br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"> <div class="HOEnZb"><div class="h5">On 4 April 2013 20:48, \
mvillarino &lt;<a href="mailto:mvillarino@kde-espana.es">mvillarino@kde-espana.es</a>&gt; \
wrote:<br> &gt; * Otherwise bring all changes from SVN. In case of conflicts, \
select<br> &gt;&gt;<br>
&gt;&gt; the version in Translatewiki. Except if the message was marked as<br>
&gt;&gt; discarded (i2), then select the SVN version.<br></div></div>
<div class="HOEnZb"><div class="h5">[...]<br>
&quot;i1) Add a command to lokalize alternate translation view, to be able<br>
to discard an alternative. If it is used, the online tool should be<br>
notified to not use mine conflict on svn up.&quot;<br>
</div></div></blockquote></div><br></div><div class="gmail_extra" style>Discarding \
conflicts by cherry-picking each particular conflict is not what I was thinking \
about, despite you can try this using external diff and merge tools (chapter 7 of the \
red book is some six chapters after where I stopped reading), so if you try it I can \
not help much.</div> <div class="gmail_extra" style>I think adding the relevant \
informations via comments to the file to commit into kde svn is not a good idea, as \
they would accumulate volatile informations soon. Maybe adding it into files used for \
primary sync and sending them back to trWiki could do the job.</div> <div \
class="gmail_extra" style><br></div><div class="gmail_extra" style>Please note there \
is a situation not considered previously: a file with contribution both from the \
online tool and from a desktop cat tool user.</div> </div>



[prev in list] [next in list] [prev in thread] [next in thread]