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

List:       kde-i18n-doc
Subject:    Re: Please do not use automated translation systems nor external
From:       Stanislav Visnovsky <visnovsky () nenya ! ms ! mff ! cuni ! cz>
Date:       2002-11-25 12:37:08
[Download RAW message or body]

On Fri, 22 Nov 2002, Thomas Diehl wrote:

> Am Freitag, 22. November 2002 18:54 schrieb Erik K. Pedersen:
> 
> ... and they often do not work with KBabel which has big problems with version 
> conflicts. (Apart from very simple header conflicts it often just refuses to 
> load them). I must admit that I usually don't have (or take) the time myself 
> to go after such conflicts which already arise when I check out a file in the 
> morning and commit it back in the early afternoon. I just copy my translation 
> over and do so with the files others send to me. This is, of course, not 
> ideal but it is the only thing I can do in the little time I have.

ATM, you can resolve conflicts using Cervisia using "cervisia --resolve"
command, for example from Catalog manager (by user-defined commands).

Stanislav

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