From kde-i18n-doc  Thu Jan 19 12:33:51 2012
From: mvillarino <mvillarino () kde-espana ! es>
Date: Thu, 19 Jan 2012 12:33:51 +0000
To: kde-i18n-doc
Subject: Re: svn update = libknetworkmanager.po conflict
Message-Id: <CAGOKLE-oq7vrYq7wyCLqF=v6jDtHXDs69pCOZGRMkQqbDZeV1Q () mail ! gmail ! com>
X-MARC-Message: https://marc.info/?l=kde-i18n-doc&m=132697661715524

> > Conflict discovered in 'extragear-base/libknetworkmanager.po'.
> > Select: (p) postpone, (df) diff-full, (e) edit,
> > =A0 =A0 =A0 =A0 (mc) mine-conflict, (tc) theirs-conflict,
> > =A0 =A0 =A0 =A0 (s) show all options: p
> >
> > I pressed 'p' as you can see.
> > What's next? and how can I fix this problem?!
> > This commit is so important:
>
> A safe way is to enter tc, which means that you accept the changes made i=
n the
> file on the svn-server and delete the changes you made in the same lines =
on
> your side. After having done so, you just start lokalize again and open t=
his
> .po file and enter <Ctrl>+<Alt>+B, which means that you are using your
> Translation Memory, where your previous translations are stored, to bring=
 back
> most of these translations. Some of them might be marked fuzzy, so you ha=
ve to
> check these translations. This is my preferred way of dealing with this
> situation.
En Thu, 19 Jan 2012 11:39:15 +0100, Freek de Kruijf
<f.de.kruijf@gmail.com> escribi=F3:

>> Conflict discovered in 'extragear-base/libknetworkmanager.po'.
>> Select: (p) postpone, (df) diff-full, (e) edit,
>>         (mc) mine-conflict, (tc) theirs-conflict,
>>         (s) show all options: p
>>
[...]
> A safe way is to enter tc, which means that you accept the changes made
> in the
> file on the svn-server and delete the changes you made in the same lines
> on
> your side.

I have one script, which you can find in
http://websvn.kde.org/trunk/l10n-support/gl/coordinator_helper_scripts/
that does (as far as I have experienced) this job for you. However,
not that way, but by first updating templates/ then using (mc) and
then with a msgmerge (afair).

The bad part (not so bad) is that it is supposed to work if and only
it you started your local kde localization project by getting it with
the script http://websvn.kde.org/trunk/l10n-support/gl/trasno_firsttime.sh
which assumes you are using svn+ssh AND (this is the bad part) it
touches your $PATH at the /.bashrc level AND gives you a fixed,
pre-established directory layout.


Sorry if this reply is received  twice.

BRGDS - Marce Villarino