[Jo Christer Øiongen]

diff -u -r1.7 -r1.8 --- kcron.po 22 Aug 2002 21:03:41 -0000 1.7 +++ kcron.po 27 Aug 2002 07:00:55 -0000 1.8 @@ -1,18 +1,29 @@ +# translation of kcron.po to Norwegian +# translation of kcron.po to Norwegian_bokmaal # Norwegian translation KDE Admin/kcron. # Copyright (C) 2000 Hans Petter Bieker # Hans Petter Bieker bieker@kde.org, 2000. +# Jo Øiongen jo-oiongen@sensewave.com, 2002 msgid "" msgstr "" -"Project-Id-Version: KDE ADMIN/kcron\n" +"<<<<<<< kcron.po" +"Project-Id-Version: kcron\n" +"POT-Creation-Date: 2002-07-22 02:53+0200\n" +"PO-Revision-Date: 2002-08-25 15:16+0200\n" +"Last-Translator: Jo Øiongen jo-oiongen@sensewave.com\n" +"Language-Team: Norwegian i18n-nb@lister.ping.uio.no\n" +"=======" +"Project-Id-Version: kcron\n" "POT-Creation-Date: 2002-08-16 03:08+0200\n" -"PO-Revision-Date: 2002-05-05 13:51GMT+1\n" -"Last-Translator: Knut Yrvin knuty@objectware.no\n" +"PO-Revision-Date: 2002-08-25 15:16+0200\n" +"Last-Translator: Jo Øiongen jo-oiongen@sensewave.com\n" "Language-Team: Norwegian i18n-nb@lister.ping.uio.no\n" +">>>>>>> 1.6" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "number1@realityx.net\n"

Dette er en CVS-konflikt. De bør aldri sjekkes inn. Du oppdager slike før du sjekker dem inn hvis du ser igjennom endringene ved hjelp av 'cvs diff -u' først.

Jeg tror oversetterhåndboka har noen avsnitt om CVS-konflikter.