Re: Problems with ca.po

[earthur]

> What branch of a2ps is this?

OK, silly question, how do I tell which branch I'm working
on???

% cvs status
   :
===================================================================
File: ca.po             Status: File had conflicts on merge

   Working revision:    1.9
   Repository revision: 1.9     /cvsroot/a2ps/a2ps/po/ca.po,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
> Is this msgfmt the same as in your report?  (/usr/local/bin/msgfmt)?

Yes, I have the same version of msgfmt:

% /usr/local/bin/msgfmt --version
msgfmt (GNU gettext) 0.11.5
Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Written by Ulrich Drepper.
% which msgfmt
/usr/local/bin/msgfmt

> What do you have in ca.po?
> 
> | src/a2ps-4.13/po % head -20 ca.po                                nostromo 
> Err 
> 1
> | # Missatges en català per a a2ps.
> | # Copyright (c) 1997, 98 Miquel Àngel Varó i Giner
> | # Miquel Àngel Varó i Giner <address@hidden>, 1998.
> | #
> | msgid ""
> | msgstr ""
> | "Project-Id-Version: a2ps 4.7.21\n"
> | "POT-Creation-Date: 2002-09-03 23:46+0200\n"
> | "PO-Revision-Date: 1999-01-11 15:57+01:00\n"
> | "Last-Translator: Miquel Àngel Varó i Giner <address@hidden>\n"
> | "Language-Team: Catalan <address@hidden>\n"
> | "MIME-Version: 1.0\n"
> | "Content-Type: text/plain; charset=ISO-8859-1\n"
> | "Content-Transfer-Encoding: 8-bit\n"
> | 
> | #: src/buffer.c:68
> | msgid "any type"
> | msgstr "qualsevol"
> | 
> | #: src/delegate.c:137 lib/confg.c:268 lib/encoding.c:530 lib/encoding.c:576

% head -20 ca.po
# Missatges en català per a a2ps.
# Copyright (c) 1997, 98 Miquel Àngel Varó i Giner
# Miquel Àngel Varó i Giner <address@hidden>, 1998.
#
msgid ""
msgstr ""
"Project-Id-Version: a2ps 4.7.21\n"
<<<<<<< ca.po
"POT-Creation-Date: 2002-09-04 12:02-0400\n"
=======
"POT-Creation-Date: 2002-09-19 19:07+0200\n"
>>>>>>> 1.9
"PO-Revision-Date: 1999-01-11 15:57+01:00\n"
"Last-Translator: Miquel Àngel Varó i Giner <address@hidden>\n"
"Language-Team: Catalan <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"

#: src/buffer.c:62


Thanks,
/Ed