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

List:       kde-i18n-doc
Subject:    Re: Errors?
From:       Stephan Kulow <coolo () kde ! org>
Date:       2000-01-05 12:33:42
[Download RAW message or body]

Marko Rosic wrote:
> 
> msgid ""
> msgstr ""
> <<<<<<< kdelibs.po
> "Project-Id-Version: PACKAGE VERSION\n"
> "POT-Creation-Date: 1999-12-06 00:59+0100\n"
> "PO-Revision-Date: 1999-12-30 20:22+0100\n"
> "Last-Translator: Strahinja Radi<E6> <rstraxy@sezampro.yu>\n"
> "Language-Team: Serbian <LL@kde.org.yu>\n"
> =======
> "Project-Id-Version: kdelibs\n"
> "POT-Creation-Date: 1999-12-30 00:53+0100\n"
> "PO-Revision-Date: 1999-08-23 12:57+0100\n"
> "Last-Translator: Marko Rocic <roske@mainstream.co.yu>\n"
> "Language-Team: Serbian <sr@li.org>\n"
> >>>>>>> 1.21
> "MIME-Version: 1.0\n"
> "Content-Type: text/plain; charset=iso-8859-2\n"
> "Content-Transfer-Encoding: ENCODING\n"
> 
> What does this mean? Which do I need to delete?
> 
Depends. The portion between <<<<<< and ====== is your version
and the one between ===== and >>>>>> is the one in CVS. I would
say merge them :)

Greetings, Stephan

-- 
Programmers, heed this: If someone starts asking you about
agricultural genomes, it's likely time to get a handler. 
                                zdnet.com about Torvalds

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