--- enscript-1.6.4.orig/debian/control +++ enscript-1.6.4/debian/control @@ -0,0 +1,17 @@ +Source: enscript +Section: text +Priority: optional +Maintainer: Tim Retout +Build-Depends: libpaper-dev, gettext, debhelper (>= 5.0.0), flex, quilt, autotools-dev +Standards-Version: 3.7.2 + +Package: enscript +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: genscript +Replaces: genscript +Suggests: gv | postscript-viewer, lpr +Description: Converts ASCII text to Postscript, HTML, RTF or Pretty-Print + Enscript converts ASCII files to PostScript, HTML, RTF or Pretty-Print + and stores generated output to a file or sends it directly to the printer. +Tag: implemented-in::c, interface::commandline, role::program, scope::utility, special::completely-tagged, use::converting, use::printing, use::text-formatting, works-with-format::html, works-with-format::plaintext, works-with-format::postscript, works-with::text --- enscript-1.6.4.orig/debian/copyright +++ enscript-1.6.4/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Sven Rudolph in +November 1995. From June 1997 on it was maintained by +Hartmut Koptein and since January 2003 by +Michael Fedrowitz . + +It was downloaded from 'http://www.iki.fi/mtr/genscript/'. + +Upstream Author: Markku Rossi + +libpaper support was added by Hartmut Koptein . + +additional highlighting rules (licensed under the GPL) by: +Brent Fulgham +Julien Lemoine +Sean Hinde + +Copyright: + + Copyright (c) 1995-2003 Markku Rossi. + + Enscript is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + Enscript is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + +On Debian systems the complete text of the GNU General Public License can +be found in '/usr/share/common-licenses/GPL'. --- enscript-1.6.4.orig/debian/rules +++ enscript-1.6.4/debian/rules @@ -0,0 +1,62 @@ +#!/usr/bin/make -f + +CFLAGS = -g +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O2 +endif + +patch: patch-stamp +patch-stamp: + ln -sf debian/patches + quilt push -a || test $$? = 2 + touch $@ + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + ln -sf /usr/share/misc/config.sub /usr/share/misc/config.guess . + CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc + touch $@ + +build-indep: +build build-arch: build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) + touch $@ + +clean: + dh_testdir + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean config.log config.status config.h config.sub config.guess Makefile \ + stamp-h stamp-h1 po/enscript.pot po/*.gmo states/over + quilt pop -a -R || test $$? = 2 + rm -f patches patch-stamp build-stamp configure-stamp + rm -rf .pc + +install: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install prefix=$(CURDIR)/debian/enscript/usr sysconfdir=$(CURDIR)/debian/enscript/etc + +binary-indep: +binary binary-arch: configure build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installman debian/over.1 debian/mkafmmap.1 + dh_installinfo docs/enscript.info + dh_link usr/share/doc/enscript/FAQ.html usr/share/doc/enscript/index.html + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +.PHONY: configure build-arch build-indep build clean install binary-arch binary-indep binary --- enscript-1.6.4.orig/debian/mkafmmap.1 +++ enscript-1.6.4/debian/mkafmmap.1 @@ -0,0 +1,34 @@ +.TH MKAFMMAP 1 "May 10, 2004" +.\" +.SH NAME +mkafmmap \- creates font map for AFM files +.\" +.SH SYNOPSIS +.B mkafmmap +.RI [ options ] " files" ... +.\" +.SH DESCRIPTION +The \fBmkafmmap\fP command will generate a font map file reading all the AFM +files given in the command line. By default it will write the map to a file +named \fBfont.map\fP, a different filename can be specified with the +\fB\-\-output\-file\fP options. Using '\fB\-\fP' will make the program write +the map to \fBstdout\fP. +.\" +.SH OPTIONS +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.B \-v, \-\-version +Show version of program. +.TP +.B \-p, \-\-output\-file=NAME +Print output to file NAME. +.\" +.SH SEE ALSO +.BR enscript (1), +.BR states (1). +.\" +.SH AUTHOR +This manual page was written by Lucas Wall , +for the Debian project (but may be used by others). --- enscript-1.6.4.orig/debian/docs +++ enscript-1.6.4/debian/docs @@ -0,0 +1,8 @@ +docs/*.html +*.txt +AUTHORS +NEWS +README +README.ESCAPES +THANKS +TODO --- enscript-1.6.4.orig/debian/over.1 +++ enscript-1.6.4/debian/over.1 @@ -0,0 +1,29 @@ +.TH OVER 1 "Jan 16, 2000" "OVER" "OVER" + +.SH NAME +over \- pretty print and scroll source code on terminal + +.SH SYNOPSIS +over [FILE]... + +.SH DECRIPTION +Pretty print source code in the FILEs. The language is guessed with the +\f3states\f1 program and \f3enscript\f1 is used to do the formatting. +The highlighting rules are defined in +`/usr/share/enscript/hl/enscript.st'. + +The FILEs are paged through \f3less\f1 for more convenient display. + +.SH FILES + +.nf +.ta 4i +/usr/share/enscript/hl/enscript.st rules for various languages +.fi + +.SH SEE ALSO +enscript(1), states(1) + +.SH AUTHOR +Markku Rossi + --- enscript-1.6.4.orig/debian/changelog +++ enscript-1.6.4/debian/changelog @@ -0,0 +1,345 @@ +enscript (1.6.4-13) unstable; urgency=high + + * debian/patches/506261-buffer-overflows: New patch by Werner Fink to fix + buffer overflows: CVE-2008-3863, CVE-2008-4306. (Closes: #506261) + * Urgency set to "high" for RC security bugfix. + + -- Tim Retout Wed, 19 Nov 2008 22:45:35 +0000 + +enscript (1.6.4-12) unstable; urgency=low + + * New maintainer. (Closes: #413482) + * Bump debhelper compatibility level to 5. + * Don't ignore "make distclean" errors. + * Support highlighting multi-line preprocessor statements. (Closes: #264097) + * Fix highlighting of .idl files containing preprocessor statements. + (Closes: #443182) + * Fix highlighting of quotes in shell scripts. (Closes: #373649) + * Fix highlighting of JavaScript regexes. (Closes: #331298) + * Fix double free when using --toc option. (Closes: #397537) + + -- Tim Retout Sat, 27 Oct 2007 00:16:37 +0100 + +enscript (1.6.4-11) unstable; urgency=low + + * sliceprint: fix enscript call (program was completely broken), and + complete manpage (Closes: #393791). + + -- Christoph Berg Wed, 25 Oct 2006 02:21:08 +0200 + +enscript (1.6.4-10) unstable; urgency=low + + * New maintainer (Closes: #349321). + * Add debtags to debian/control. + * Use quilt for patches. + * Use make distclean, maintainer-clean-am wiped out too much. + * Hilight wrapped function lists in changelog mode correctly (thanks to + Daniel Leidert for the patch, Closes: #339938). + * Include ruby hilighting (Closes: #147116). + * Never include gecos in ps output (Closes: #344750). + * Fix some grammar (Closes: #276219). + * Translate fuzzy strings in de.po. + + -- Christoph Berg Sun, 8 Oct 2006 00:14:56 +0200 + +enscript (1.6.4-9) unstable; urgency=low + + * QA upload. + * Automatically update config.sub and config.guess from autotools-dev. + Closes: #342408. + * po/de.po: Apply correction from Christoph Berg. Closes: #315114. + * debian/watch: Update; thanks to Bart Martens. Closes: #354359. + * Conforms to Standards version 3.6.2. + + -- Matej Vela Tue, 7 Mar 2006 07:10:49 +0100 + +enscript (1.6.4-8) unstable; urgency=low + + * Orphaned. + + -- Michael Fedrowitz Sun, 22 Jan 2006 11:46:18 +0100 + +enscript (1.6.4-7) unstable; urgency=low + + * Fixed building with gcc4. Thanks to Andreas Jochens for the patch. + (Closes: #292990) + * strdup return values from libpaper to prevent double frees. + (Closes: #289724, #294342) + * Suggest lpr. (Closes: #287296) + + -- Michael Fedrowitz Sun, 13 Feb 2005 20:58:37 +0100 + +enscript (1.6.4-6) unstable; urgency=high + + * [SECURITY] Applied the following patches from the Debian Security Team: + - [CAN-2004-1184] Corrected handling of user supplied input (filename, + title) when executing shell commands. + - [CAN-2004-1185] Commented out code that will permit EPS files to be + provided as arbitrary programs to be executed. + - [CAN-2004-1186] Fixed buffer overflows. + + -- Michael Fedrowitz Thu, 20 Jan 2005 20:00:21 +0100 + +enscript (1.6.4-5) unstable; urgency=low + + * Additional highlighting rules submitted by Brent Fulgham. Thanks a lot! + (Closes: #279037) + * Updated copyright file for the above. + * Removed ghostview from suggests. + + -- Michael Fedrowitz Sun, 28 Nov 2004 19:05:30 +0100 + +enscript (1.6.4-4) unstable; urgency=low + + * Added mkafmmap manpage by Lucas Wall. Thanks a lot! (Closes: #248390) + * Added "last" to tcl keywords. (Closes: #225979) + * Removed useless menu file. + + -- Michael Fedrowitz Mon, 31 May 2004 14:20:42 +0200 + +enscript (1.6.4-3) unstable; urgency=low + + * Perl highlighting fixes. (Closes: #221513, #222123) + * More manpage typos. (Closes: #222075) + + -- Michael Fedrowitz Sun, 7 Dec 2003 12:05:37 +0100 + +enscript (1.6.4-2) unstable; urgency=low + + * Comment out install-info calls in docs/Makefile.in to avoid shipping + /usr/share/info/dir.gz as a quick fix until I manage to get things to + work with the latest automake. (Closes: #220956) + + -- Michael Fedrowitz Sun, 16 Nov 2003 14:04:40 +0100 + +enscript (1.6.4-1) unstable; urgency=low + + * New upstream release. + * Standards-Version 3.6.1 (no changes required). + * Added Eiffel syntax highlighting by Julien LEMOINE. (Closes: #218851) + * Updated year in copyright file. + + -- Michael Fedrowitz Sat, 8 Nov 2003 21:56:26 +0100 + +enscript (1.6.3-5) unstable; urgency=low + + * Standards-Version 3.5.10 (no changes required). + * Change AppendCtrlD to allow appending ^D without trailing newline. + (Closes: #88893) + * Fix another mistake in the manpage. (Closes: #197980) + + -- Michael Fedrowitz Sun, 6 Jul 2003 17:49:04 +0200 + +enscript (1.6.3-4) unstable; urgency=low + + * Standards-Version 3.5.9 (no changes required). + * Convert to dpatch. + * Fix to build with flex 2.5.31. + + -- Michael Fedrowitz Thu, 1 May 2003 18:15:23 +0200 + +enscript (1.6.3-3) unstable; urgency=low + + * Update copyright file. + * Various corrections to the manpages. (Closes: #61505, #177565) + * New media definitions "borrowed" from CUPS. (Closes: #74332) + * Make media names case insensitive. (Closes: #177692) + * Remove ghostscript from suggests and prefer gv to ghostview. + * Remove generated file states/over when cleaning. + + -- Michael Fedrowitz Fri, 24 Jan 2003 16:42:19 +0100 + +enscript (1.6.3-2) unstable; urgency=low + + * New maintainer. (Closes: #176931) + * Standards-Version 3.5.8: + - Support DEB_BUILD_OPTIONS. + - Build depend on debhelper (>= 4.1.0) to get rid of /usr/doc link. + * Rewrote debian/rules using debhelper v4. + * Apply a patch from Chris Halls to make -w work. + (Closes: #141642, #149979, #160633) + * Apply a patch from John West to fix a typo in perl.st. + (Closes: #151055, #169835) + * Apply a patch from Andras Bali to improve changelog.st. (Closes: #140528) + * Apply a patch from Thomas Roessler to improve mail.st. (Closes: #147648) + * Acknowledge NMUs. (Closes: #48043, #55388, #58990, #76310, #79684, + #113362, #122566, #135076, #135997, #136001, #140066, #140542) + + -- Michael Fedrowitz Fri, 17 Jan 2003 14:59:32 +0100 + +enscript (1.6.3-1.1) unstable; urgency=low + + * Non maintainer upload + * Add build dep to flex (Closes: #140066) + + -- Benjamin Drieu Wed, 3 Apr 2002 16:12:21 +0200 + +enscript (1.6.3-1) unstable; urgency=low + + * NMU (closes: #136001) + * New upstream + * Use I18N date now (closes: #135076) + * Add LC_CTYPE to I18N code (closes: #76310, #79684) + * Use "$@" arguments and pager in over (closes: #48043) + * Added build-dependencies (closes: #122566) + * Added man page for over (closes: #55388) + * Fixed type in man page for enscript (closes: #113362) + * Install info dir entry (closes: #135997) + * Menu entry and man page position match (closes: #58990) + * Updated Standards-Version to 3.5.2 + + -- Michael Piefel Tue, 19 Mar 2002 11:22:37 +0100 + +enscript (1.6.2-4) unstable; urgency=low + + * Lintian fixes for usr/doc and usr/share + + -- Hartmut Koptein Thu, 21 Oct 1999 13:13:23 +0200 + + +enscript (1.6.2-3) unstable; urgency=low + + * Updated Standards-Version to 3.0.1.1 + + -- Hartmut Koptein Tue, 7 Sep 1999 00:50:00 +0200 + + +enscript (1.6.2-2) unstable; urgency=low + + * arrgs; the new i386 autobuilder is great + * fixed -$(MAKE), reported by James; Fixes: Bug#38719 + + -- Hartmut Koptein Tue, 1 Jun 1999 20:20:53 +0200 + + +enscript (1.6.2-1) unstable; urgency=low + + * New upstream version + * changes for the menu system + + -- Hartmut Koptein Thu, 29 Apr 1999 21:34:24 +0200 + + +enscript (1.6.1-1) unstable; urgency=low + + * New upstream version 1.6.1 + * This version fix the -U2 output; Fixes: Bug#24278 + + -- Hartmut Koptein Tue, 7 Jul 1998 20:44:46 +0200 + + +enscript (1.6.0-1) unstable; urgency=low + + * New upstream version 1.6.0 + + -- Hartmut Koptein Thu, 2 Jul 1998 13:10:29 +0200 + + +enscript (1.5.5-1) unstable; urgency=low + + * Upgraded to new upstream version 1.5.5 + * Little grammatic correction + * Converted debian/rules to debhelper + * Removed double media entries for new libpaper + + -- Hartmut Koptein Tue, 19 May 1998 22:25:15 +0200 + + +enscript (1.5.0-8) frozen unstable; urgency=low + + * added postrm script for update-menus + * added double media entries in enscript.cfg (for papersize) + + -- Hartmut Koptein Mon, 30 Mar 1998 02:30:46 +0200 + + +enscript (1.5.0-7) frozen unstable; urgency=low + + * added menu file (man, html) + * include the orig file + + -- Hartmut Koptein Tue, 24 Mar 1998 05:26:47 +0100 + + +enscript (1.5.0-6) frozen; urgency=low + + * must go to frozen + + -- Hartmut Koptein Tue, 17 Mar 1998 04:13:40 +0100 + + +enscript (1.5.0-5) unstable; urgency=low + + * uncommented default media in enscript.cfg + * Standards Version: 2.4.0.0 + * removed ansi2krn manpage; fixes: Bug#17832, Bug#17941, Bug#19586 + * fixes from lintin report + * arch compile error; must be fixed by the arch maintainer; fixes: Bug#19302 + + -- Hartmut Koptein Tue, 17 Mar 1998 04:09:35 +0100 + + +enscript (1.5.0-4) unstable; urgency=low + + * use libpaperg insted of libpaper; Fixes: Bug#15274, Bug#15373 + * border (first) line should be fixed with previous version; Fixes: Bug#5387 + * added files in /usr/doc/enscript; Fixes: Bug#14221 + + -- Hartmut Koptein Thu, 27 Nov 1997 22:47:36 +0100 + + +enscript (1.5.0-3) unstable; urgency=low + + * use LIBPAPER (Bug#3169, Bug#13564) + * change path definitions in man pages (Bug#14223, Bug#14226) + + -- Hartmut Koptein Mon, 17 Nov 1997 20:34:46 +0100 + + +enscript (1.5.0-2) unstable; urgency=low + + * Build for libc6 + * Maintainer change + + -- Hartmut Koptein Mon, 18 Aug 1997 01:42:58 +0200 + + +enscript (1.5.0-1) unstable; urgency=low + + * new upstream version + + -- Sven Rudolph Thu, 6 Mar 1997 16:59:53 +0100 + + +enscript (1.4.0-2) unstable; urgency=low + + * debian/conffiles: fixed permission (Bug#4662) + * converted to new source package format + + -- Sven Rudolph Thu, 3 Oct 1996 23:34:43 +0200 + + +Sun Jul 28 23:28:02 1996 Sven Rudolph + + * updated to upstream version 1.4.0 + * debian.control: added Priority: optional + Conflicts: genscript + Replaces: genscript + * debian.rules: added multi-architecture support + + +Mon Apr 29 18:02:03 1996 Sven Rudolph + + * upgraded to upstream version 1.3.2 + + +Thu Nov 23 23:27:13 1995 Sven Rudolph + + * 1.2.20-2 released + * rebuilt for elf + + +Wed Nov 15 01:20:24 1995 Sven Rudolph + + * 1.2.20-1 released + * created new Debian GNU/Linux package maintenance system files --- enscript-1.6.4.orig/debian/watch +++ enscript-1.6.4/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://www.codento.com/people/mtr/genscript/ .*/enscript-(.*)\.tar\.gz --- enscript-1.6.4.orig/debian/compat +++ enscript-1.6.4/debian/compat @@ -0,0 +1 @@ +5 --- enscript-1.6.4.orig/debian/patches/397537-fix-toc-double-free +++ enscript-1.6.4/debian/patches/397537-fix-toc-double-free @@ -0,0 +1,18 @@ +Remove unneeded fclose() in --toc code, which was causing a double free. + -- Tim Retout Sat, 27 Oct 2007 00:07:21 +0100 + +Index: enscript-1.6.4/src/main.c +=================================================================== +--- enscript-1.6.4.orig/src/main.c 2007-10-28 20:59:00.000000000 +0000 ++++ enscript-1.6.4/src/main.c 2007-10-28 21:01:11.000000000 +0000 +@@ -1736,8 +1736,8 @@ + is_close (&is); + } + +- /* Clean up toc file. */ +- fclose (toc_fp); ++ /* Cleanup done in is_close, above. ++ fclose (toc_fp); */ + } + + /* Give trailer a chance to dump itself. */ --- enscript-1.6.4.orig/debian/patches/08_flex +++ enscript-1.6.4/debian/patches/08_flex @@ -0,0 +1,256 @@ +## 08_flex.dpatch by Michael Fedrowitz +## DP: fix for building with flex 2.5.31 +diff -urNad /home/michael/debian/enscript-1.6.4/states/lex.l enscript-1.6.4/states/lex.l +--- /home/michael/debian/enscript-1.6.4/states/lex.l 2003-03-05 08:26:33.000000000 +0100 ++++ enscript-1.6.4/states/lex.l 2003-11-08 21:06:59.000000000 +0100 +@@ -43,111 +43,7 @@ + + %% + +-"/*" { eat_comment (); } +-[ \t\r\f] { ; } +-\n { linenum++; } +- +-\" { yylval.node = node_alloc (nSTRING); +- yylval.node->u.str.data +- = read_string (&yylval.node->u.str.len); +- return tSTRING; +- } +- +-'[^\\]' { yylval.node = node_alloc (nINTEGER); +- yylval.node->u.integer = yytext[1]; +- return tINTEGER; +- } +- +-'\\.' { yylval.node = node_alloc (nINTEGER); +- switch (yytext[2]) +- { +- case 'n': +- yylval.node->u.integer = '\n'; +- break; +- +- case 't': +- yylval.node->u.integer = '\t'; +- break; +- +- case 'v': +- yylval.node->u.integer = '\v'; +- break; +- +- case 'b': +- yylval.node->u.integer = '\b'; +- break; +- +- case 'r': +- yylval.node->u.integer = '\r'; +- break; +- +- case 'f': +- yylval.node->u.integer = '\f'; +- break; +- +- case 'a': +- yylval.node->u.integer = '\a'; +- break; +- +- default: +- yylval.node->u.integer = yytext[2]; +- break; +- } +- +- return tINTEGER; +- } +- +-\/ { yylval.node = node_alloc (nREGEXP); +- read_regexp (yylval.node); +- return tREGEXP; +- } +- +-"BEGIN" { return tBEGIN; } +-"END" { return tEND; } +-"div" { return tDIV; } +-"else" { return tELSE; } +-"extends" { return tEXTENDS; } +-"for" { return tFOR; } +-"if" { return tIF; } +-"local" { return tLOCAL; } +-"namerules" { return tNAMERULES; } +-"return" { return tRETURN; } +-"start" { return tSTART; } +-"startrules" { return tSTARTRULES; } +-"state" { return tSTATE; } +-"sub" { return tSUB; } +-"while" { return tWHILE; } +- +-"==" { return tEQ; } +-"!=" { return tNE; } +-"<=" { return tLE; } +-">=" { return tGE; } +-"&&" { return tAND; } +-"||" { return tOR; } +-"++" { return tPLUSPLUS; } +-"--" { return tMINUSMINUS; } +-"+=" { return tADDASSIGN; } +-"-=" { return tSUBASSIGN; } +-"*=" { return tMULASSIGN; } +-"div=" { return tDIVASSIGN; } +- +-{real} { yylval.node = node_alloc (nREAL); +- yylval.node->u.real = atof (yytext); +- return tREAL; +- } +-{integer} { yylval.node = node_alloc (nINTEGER); +- yylval.node->u.integer = atoi (yytext); +- return tINTEGER; +- } +-{symbol} { yylval.node = node_alloc (nSYMBOL); +- yylval.node->u.sym = xstrdup (yytext); +- return tSYMBOL; +- } +- +-. { return yytext[0]; } +- +-%% +- ++%{ +-static void ++void + eat_comment () + { +@@ -175,13 +71,6 @@ + yyerror (_("error: EOF in comment")); + } + +- +-int +-yywrap () +-{ +- return 1; +-} +- +-static char * ++char * + read_string (len_return) + unsigned int *len_return; +@@ -292,7 +188,7 @@ + } + + +-static void ++void + read_regexp (node) + Node *node; + { +@@ -421,6 +310,112 @@ + node->u.re.data = buf2; + node->u.re.len = bufpos; + } ++%} ++ ++"/*" { eat_comment (); } ++[ \t\r\f] { ; } ++\n { linenum++; } ++ ++\" { yylval.node = node_alloc (nSTRING); ++ yylval.node->u.str.data ++ = read_string (&yylval.node->u.str.len); ++ return tSTRING; ++ } ++ ++'[^\\]' { yylval.node = node_alloc (nINTEGER); ++ yylval.node->u.integer = yytext[1]; ++ return tINTEGER; ++ } ++ ++'\\.' { yylval.node = node_alloc (nINTEGER); ++ switch (yytext[2]) ++ { ++ case 'n': ++ yylval.node->u.integer = '\n'; ++ break; ++ ++ case 't': ++ yylval.node->u.integer = '\t'; ++ break; ++ ++ case 'v': ++ yylval.node->u.integer = '\v'; ++ break; ++ ++ case 'b': ++ yylval.node->u.integer = '\b'; ++ break; ++ ++ case 'r': ++ yylval.node->u.integer = '\r'; ++ break; ++ ++ case 'f': ++ yylval.node->u.integer = '\f'; ++ break; ++ ++ case 'a': ++ yylval.node->u.integer = '\a'; ++ break; ++ ++ default: ++ yylval.node->u.integer = yytext[2]; ++ break; ++ } ++ ++ return tINTEGER; ++ } ++ ++\/ { yylval.node = node_alloc (nREGEXP); ++ read_regexp (yylval.node); ++ return tREGEXP; ++ } ++ ++"BEGIN" { return tBEGIN; } ++"END" { return tEND; } ++"div" { return tDIV; } ++"else" { return tELSE; } ++"extends" { return tEXTENDS; } ++"for" { return tFOR; } ++"if" { return tIF; } ++"local" { return tLOCAL; } ++"namerules" { return tNAMERULES; } ++"return" { return tRETURN; } ++"start" { return tSTART; } ++"startrules" { return tSTARTRULES; } ++"state" { return tSTATE; } ++"sub" { return tSUB; } ++"while" { return tWHILE; } ++ ++"==" { return tEQ; } ++"!=" { return tNE; } ++"<=" { return tLE; } ++">=" { return tGE; } ++"&&" { return tAND; } ++"||" { return tOR; } ++"++" { return tPLUSPLUS; } ++"--" { return tMINUSMINUS; } ++"+=" { return tADDASSIGN; } ++"-=" { return tSUBASSIGN; } ++"*=" { return tMULASSIGN; } ++"div=" { return tDIVASSIGN; } ++ ++{real} { yylval.node = node_alloc (nREAL); ++ yylval.node->u.real = atof (yytext); ++ return tREAL; ++ } ++{integer} { yylval.node = node_alloc (nINTEGER); ++ yylval.node->u.integer = atoi (yytext); ++ return tINTEGER; ++ } ++{symbol} { yylval.node = node_alloc (nSYMBOL); ++ yylval.node->u.sym = xstrdup (yytext); ++ return tSYMBOL; ++ } ++ ++. { return yytext[0]; } ++ ++%% + + + /* --- enscript-1.6.4.orig/debian/patches/05_manpages +++ enscript-1.6.4/debian/patches/05_manpages @@ -0,0 +1,72 @@ +## 05_manpages.dpatch by Michael Fedrowitz +## DP: manpage corrections +diff -urNad /home/michael/debian/enscript-1.6.4/docs/enscript.man enscript-1.6.4/docs/enscript.man +--- /home/michael/debian/enscript-1.6.4/docs/enscript.man 2003-12-07 11:20:34.000000000 +0100 ++++ enscript-1.6.4/docs/enscript.man 2003-12-07 11:33:16.000000000 +0100 +@@ -60,7 +60,7 @@ + [\f3\-T \f2tabsize\f1] + [\f3\-u\f1[\f2text\f1]] + [\f3\-U \f2num\f1] +-[\f3\-W \f2language\f1] ++[\f3\-w \f2language\f1] + [\f3\-X \f2encoding\f1] + [\f2filename\f1 ...] + +@@ -118,7 +118,7 @@ + The header string \f2header\f1 can contain the same formatting escapes + which can be specified for the \f3%Format\f1 directives in the user + defined fancy headers. For example, the following option prints the +-file name, current data and page numbers: ++file name, current date and page numbers: + + \f3enscript \-\-header='$n %W Page $% of $=' *.c\f1 + +@@ -179,7 +179,7 @@ + .B enscript \-\-help\-highlight + + The highlighting rules are defined in the +-`@DATADIR@/enscript/st/*.st' files which can be edited to create ++`@DATADIR@/enscript/hl/*.st' files which can be edited to create + highlighting definitions for new languages. + + \f3Note!\f1 You can not use your own input filters with this option. +@@ -375,7 +375,7 @@ + .B \-V, \-\-version + Print \f3enscript\f1 version information and exit. + .TP 8 +-.B \-W \f1[\f2lang\f1]\f3, \-\-language\f1[\f3=\f2lang\f1]\f3 ++.B \-w \f1[\f2lang\f1]\f3, \-\-language\f1[\f3=\f2lang\f1]\f3 + Generate output for the language \f2lang\f1. The possible values for + \f2lang\f1 are: + .RS 8 +@@ -595,7 +595,7 @@ + .TP 8 + .B \-\-style=\f2style\f3 + Set the highlighting style to \f2style\f1. The possible values are: +-\f3a2ps\f1, \f3emacs\f1, \f3emacs-verbose\f1, \f3ifh\f1, and ++\f3a2ps\f1, \f3emacs\f1, \f3emacs_verbose\f1, \f3ifh\f1, and + \f3msvc\f1. + .TP 8 + .B \-\-swap\-even\-page\-margins +@@ -1333,7 +1333,7 @@ + My default code printing command: gaudy header, two columns, + landscape, code highlighting, 2-up printing. + .TP 8 +-\f3enscript \-E \-\-color \-Whtml \-\-toc -pfoo.html *.h *.c\f1 ++\f3enscript \-E \-\-color \-whtml \-\-toc -pfoo.html *.h *.c\f1 + A nice HTML report of your project's C source files. + + .SH ENVIRONMENT VARIABLES +diff -urNad /home/michael/debian/enscript-1.6.4/docs/Makefile.in enscript-1.6.4/docs/Makefile.in +--- /home/michael/debian/enscript-1.6.4/docs/Makefile.in 2003-03-05 08:40:06.000000000 +0100 ++++ enscript-1.6.4/docs/Makefile.in 2003-12-07 11:20:34.000000000 +0100 +@@ -280,7 +280,8 @@ + mostlyclean-aminfo: + -rm -f enscript.aux enscript.cp enscript.cps enscript.fn enscript.ky \ + enscript.log enscript.pg enscript.tmp enscript.toc \ +- enscript.tp enscript.vr enscript.dvi enscript.pdf enscript.ps ++ enscript.tp enscript.vr enscript.dvi enscript.pdf enscript.ps \ ++ enscript.1 states.1 + + maintainer-clean-aminfo: + list='$(INFO_DEPS)'; for i in $$list; do \ --- enscript-1.6.4.orig/debian/patches/fix-duplicate-intl-in-makefile +++ enscript-1.6.4/debian/patches/fix-duplicate-intl-in-makefile @@ -0,0 +1,16 @@ +This is a hack to fix "make distclean". + -- Tim Retout + +Index: enscript/Makefile.in +=================================================================== +--- enscript.orig/Makefile.in 2007-10-21 22:03:34.000000000 +0100 ++++ enscript/Makefile.in 2007-10-21 22:03:55.000000000 +0100 +@@ -172,7 +172,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + +-SUBDIRS = intl m4 compat afm afmlib lib scripts intl src po states docs w32 ++SUBDIRS = m4 compat afm afmlib lib scripts intl src po states docs w32 + + EXTRA_DIST = config.rpath README.ESCAPES README.DOS ABOUT-NLS THANKS ascii.txt \ + asciifise.txt asciidkno.txt 88591.txt 88592.txt 88593.txt 88594.txt \ --- enscript-1.6.4.orig/debian/patches/373649-fix-shell-quote-highlighting +++ enscript-1.6.4/debian/patches/373649-fix-shell-quote-highlighting @@ -0,0 +1,138 @@ +Fix highlighting of quotes in shell scripts. + +Original patch for sh and ksh by Shawn McMahon . + + -- Tim Retout Thu, 25 Oct 2007 23:27:15 +0100 + +diff --git a/states/hl/bash.st b/states/hl/bash.st +index a99eac0..6b61577 100644 +--- a/states/hl/bash.st ++++ b/states/hl/bash.st +@@ -22,6 +22,17 @@ state bash extends HighlightEntry + string_face (false); + } + ++ /* Ignore escaped quote marks */ ++ /\\\"/ { ++ language_print ($0); ++ } ++ /\\\'/ { ++ language_print ($0); ++ } ++ /\\\`/ { ++ language_print ($0); ++ } ++ + /* Excutable script. */ + /^#!/ { + reference_face (true); +diff --git a/states/hl/csh.st b/states/hl/csh.st +index 553b1d7..34e2a37 100644 +--- a/states/hl/csh.st ++++ b/states/hl/csh.st +@@ -22,6 +22,17 @@ state csh extends HighlightEntry + string_face (false); + } + ++ /* Ignore escaped quote marks */ ++ /\\\"/ { ++ language_print ($0); ++ } ++ /\\\'/ { ++ language_print ($0); ++ } ++ /\\\`/ { ++ language_print ($0); ++ } ++ + /* Excutable script. From sh */ + /^#!/ { + reference_face (true); +diff --git a/states/hl/ksh.st b/states/hl/ksh.st +index 41b039d..17c7219 100644 +--- a/states/hl/ksh.st ++++ b/states/hl/ksh.st +@@ -26,6 +26,17 @@ state ksh extends HighlightEntry + string_face (false); + } + ++ /* Ignore escaped quote marks */ ++ /\\\"/ { ++ language_print ($0); ++ } ++ /\\\'/ { ++ language_print ($0); ++ } ++ /\\\`/ { ++ language_print ($0); ++ } ++ + /* Excutable script. */ + /^#!/ { + reference_face (true); +diff --git a/states/hl/sh.st b/states/hl/sh.st +index c0b7d3c..b034f16 100644 +--- a/states/hl/sh.st ++++ b/states/hl/sh.st +@@ -22,6 +22,17 @@ state sh extends HighlightEntry + string_face (false); + } + ++ /* Ignore escaped quote marks */ ++ /\\\"/ { ++ language_print ($0); ++ } ++ /\\\'/ { ++ language_print ($0); ++ } ++ /\\\`/ { ++ language_print ($0); ++ } ++ + /* Excutable script. */ + /^#!/ { + reference_face (true); +diff --git a/states/hl/tcsh.st b/states/hl/tcsh.st +index c9ec499..d3475b4 100644 +--- a/states/hl/tcsh.st ++++ b/states/hl/tcsh.st +@@ -22,6 +22,17 @@ state tcsh extends HighlightEntry + string_face (false); + } + ++ /* Ignore escaped quote marks */ ++ /\\\"/ { ++ language_print ($0); ++ } ++ /\\\'/ { ++ language_print ($0); ++ } ++ /\\\`/ { ++ language_print ($0); ++ } ++ + /* Excutable script. From sh */ + /^#!/ { + reference_face (true); +diff --git a/states/hl/zsh.st b/states/hl/zsh.st +index 64be45e..a367f7f 100644 +--- a/states/hl/zsh.st ++++ b/states/hl/zsh.st +@@ -22,6 +22,17 @@ state zsh extends HighlightEntry + string_face (false); + } + ++ /* Ignore escaped quote marks */ ++ /\\\"/ { ++ language_print ($0); ++ } ++ /\\\'/ { ++ language_print ($0); ++ } ++ /\\\`/ { ++ language_print ($0); ++ } ++ + /* Excutable script. */ + /^#!/ { + reference_face (true); --- enscript-1.6.4.orig/debian/patches/04_highlighting +++ enscript-1.6.4/debian/patches/04_highlighting @@ -0,0 +1,1213 @@ +## 04_highlighting.dpatch by Michael Fedrowitz +## DP: highlighting rules fixes and improvements +diff -urNad enscript-1.6.4/states/hl/changelog.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/changelog.st +--- enscript-1.6.4/states/hl/changelog.st 2003-03-05 08:26:33.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/changelog.st 2004-11-28 18:56:38.000000000 +0100 +@@ -43,7 +43,7 @@ + } + + /* File descriptions without function names. */ +- /(^\t\* )([^ :]+)(:)/ { ++ /(^\t\* )([^:]+)(:)/ { + language_print ($1); + + function_name_face (true); +diff -urNad enscript-1.6.4/states/hl/dylan.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/dylan.st +--- enscript-1.6.4/states/hl/dylan.st 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/dylan.st 2004-11-28 18:56:38.000000000 +0100 +@@ -0,0 +1,124 @@ ++/** ++ * Name: dylan ++ * Description: Dylan Programming Language template for Enscript. ++ * Author: Brent Fulgham ++ * (based on the Scheme version by Markku Rossi ) ++ */ ++ ++dylan_mod_re = ++/* Definition Modifiers ++ (build-re '(abstract block concrete constant class domain exception exclude ++ export function functional generic handler import inherited inline ++ instance interface library macro method open primary sealed sideways ++ singleton slot subclass variable virtual)) ++ */ ++ /\b(subclass|abstract|block|c(on(crete|stant)|lass)|domain\ ++|ex(c(eption|lude)|port)|f(unction(|al))|generic|handler\ ++|i(n(herited|line|stance|terface)|mport)|library|m(acro|ethod)\ ++|open|primary|sealed|si(deways|ngleton)|slot\ ++|v(ariable|irtual))\b/; ++ ++state dylan extends HighlightEntry ++{ ++ BEGIN { ++ /* ++ * Modify regexp character syntax so that we can distinguish all ++ * dylan symbols. ++ */ ++ extras = list ('!', '$', '%', '&', '*', '/', ':', ++ '=', '?', '~', '^', '.', '+', '-'); ++ for (i = 0; i < length (extras); i = i + 1) ++ regexp_syntax (extras[i], 'w'); ++ } ++ ++ /* Modifiers */ ++ dylan_mod_re { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* Types */ ++ /<\w+>/ { ++ type_face (true); ++ language_print ($0); ++ type_face (false); ++ } ++ ++ /* Symbols */ ++ /#\"/ { ++ string_face (true); ++ language_print ($0); ++ call (c_string); ++ string_face (false); ++ } ++ ++ /* Comments. */ ++ /\/\// { ++ comment_face (true); ++ language_print ($0); ++ call (eat_one_line); ++ comment_face (false); ++ } ++ /\/\*/ { ++ comment_face (true); ++ language_print ($0); ++ call (eat_one_line); ++ comment_face (false); ++ } ++ ++ /* String constants. */ ++ /\"/ { ++ string_face (true); ++ language_print ($0); ++ call (c_string); ++ string_face (false); ++ } ++ ++ /* Character constants. */ ++ /'.*'/ { ++ string_face (true); ++ language_print ($0); ++ string_face (false); ++ } ++ ++ /* Keywords. ++ "=>" + ++ (build-re '(above afterwards begin below by case cleanup create ++ define end else elseif finally for from if in let local otherwise rename ++ select signal then to unless until use variable virtual when while ++ */ ++ /=>|\b(a(bove|fterwards)|b(e(gin|low)|y)|c(ase|leanup|reate)\ ++|define|else(|if)|end|f(inally|or|rom)|i[fn]|l(et|ocal)|otherwise\ ++|rename|s(elect|ignal)|t(hen|o)|u(n(less|til)|se)|wh(en|ile))\b/ { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ /* ':'-names, Emacs highlights these, so do we. */ ++ /([ \t])([!\$%&\*\/:<=>\?~_^a-zA-Z0-9.+\-]*:)/ { ++ language_print ($1); ++ reference_face (true); ++ language_print ($2); ++ reference_face (false); ++ } ++ ++ /* Function faces */ ++ /([ \t]*)(\w+[^:])([ \t]*\([ \t]*)/ { ++ language_print ($1); ++ function_name_face(true); ++ face_on(face_bold_italic); ++ language_print ($2); ++ face_off(face_bold_italic); ++ function_name_face(false); ++ language_print ($3); ++ } ++} ++ ++ ++/* ++Local variables: ++mode: c ++End: ++*/ +diff -urNad enscript-1.6.4/states/hl/eiffel.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/eiffel.st +--- enscript-1.6.4/states/hl/eiffel.st 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/eiffel.st 2004-11-28 18:56:38.000000000 +0100 +@@ -0,0 +1,132 @@ ++/** ++ * Name: eiffel ++ * Description: Eiffel programming language. ++ * Author: Julien Lemoine ++ * Brent Fulgham ++ */ ++ ++eiffel_types = ++/* Types */ ++ /\b(ABSTRACT_(FRACTION|INTEGER)|ANY|AR(GUMENTS|RAY(|2|3|ED_COLLECTION))\ ++|BASIC_(DIRECTORY|TIME)|BINARY_FILE_(READ|WRITE)|BIT_(N|STRING)|BOOLEAN\ ++|CHARACTER(|_CONSTANTS)|CLOCK|COLLECTION(|2|3|_SORTER)|COMPARABLE\ ++|COUNTER|DICTIONARY(|_NODE)|D(IRECTORY|OUBLE)|EXCEPTIONS|FILE(|_TOOLS)\ ++|FIXED_ARRAY(|2|3)|GE(NERAL|N_RAND)|HASH(ABLE|_TABLE_SIZE)|INPUT_STREAM\ ++|INTEGER(|_8|_16|_32|_64|_FRACTION|_GENERAL)\ ++|ITERATOR(|_ON_(COLLECTION|DICTIONARY(_ITEMS|_KEYS)|LINKED_LIST|SET\ ++|STRING|TWO_WAY_LINKED_LIST|UNICODE_STRING))\ ++|LARGE(|_NEGATIVE|_POSITIVE)_INTEGER|LINK(|2|ED(_COLLECTION|_LIST))\ ++|MATH_CONSTANTS|MEMO(|RY)|MICROSECOND_TIME|MINI_PARSER_BUFFER\ ++|MIN_STAND|MUTABLE_BIG_INTEGER|NATIVE_ARRAY|NULL_(INPUT|OUTPUT)\ ++|NUMBER(|_FRACTION|_TOOLS)|NUMERIC|OUTPUT_STREAM|PLATFORM|POINTER\ ++|REAL|REVERSE_COLLECTION_SORTER|SAFE_EQUAL|SCOOP_UTILITIES|SET(|_NODE)\ ++|SMALL_INTEGER|STD_(ERROR|FILE_(READ|READ_WRITE|WRITE)|INPUT(|_OUTPUT)\ ++|OUTPUT|RAND)|STRING(|_HANDLER)|SYSTEM|TIME(|_IN_(ENGLISH|FRENCH|GERMAN\ ++|ITALIAN|SOME_LANGUAGE|SPANISH))|TWO_WAY_LINKED_LIST\ ++|UNICODE_STRING(|_HANDLER)|UTF8_PARSER)\b/; ++ ++eiffel_keywords = ++/* Keywords */ ++ /\b(agent|a(ll|lias)|and|as(|sign)|check|class|convert|create|Current|debug\ ++|deferred|do|else(|if)|en(d|sure)|ex(panded|port|ternal)|False\ ++|feature|fro(m|zen)|if|implies|in(dexing|fix|herit|spect|variant)\ ++|is|like|local|loop|not|o(r|bsolete|ld|nce)|prefix|Precursor|pure\ ++|re(define|ference|name|quire|scue|try)|Result|separate|then|True\ ++|TUPLE|un(define|til)|creation)\b/; ++ ++state eiffel extends HighlightEntry ++{ ++ ++ /* One line comments. */ ++ /\-\-/ { ++ comment_face (true); ++ language_print ($0); ++ call (eat_one_line); ++ comment_face (false); ++ } ++ ++ /* Keywords. */ ++ eiffel_keywords { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ /* Types. */ ++ eiffel_types { ++ type_face (true); ++ language_print ($0); ++ type_face (false); ++ } ++ ++ /* String constants. */ ++ /\"/ { ++ string_face (true); ++ language_print ($0); ++ call (c_string); ++ string_face (false); ++ } ++ ++ /* Character constants. */ ++ /'.'|'\\\\.'/ { ++ string_face (true); ++ language_print ($0); ++ string_face (false); ++ } ++ ++ /* Symbols, etc. */ ++ /:=|==|<=|>=|=|!=|\/=|!|!!/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* Type declarations */ ++ /([ \t])*([a-zA-Z]+[, \ta-zA-Z0-9_]*):[^=]/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ ++ /* ++ * Function definitions, with args ++ * fct_name (args...) is ++ */ ++ /^([ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*)(\([ \t]*[ \ta-z,A-Z_0-9]+)(:[ \ta-zA-Z0-9_\[\]]+)?(\)[ \t]*)(:[ \ta-zA-Z0-9_\[\]]+)?([ \t]+is)[ \t]*$/ { ++ function_name_face (true); ++ face_on(face_bold_italic); ++ language_print ($1); ++ face_off(face_bold_italic); ++ function_name_face (false); ++ language_print ($2); ++ type_face (true); ++ language_print ($3); ++ type_face (false); ++ language_print ($4); ++ type_face (true); ++ language_print ($5); ++ type_face (false); ++ keyword_face (true); ++ language_print ($6); ++ keyword_face (false); ++ language_print ($7); ++ } ++ ++ /* ++ * Function definitions, without args ++ * fct_name is ++ */ ++ /^([ \t]*[a-zA-Z_][a-zA-Z_0-9]*)([ \t]*)(is)[ \t]*$/ { ++ function_name_face (true); ++ face_on(face_bold_italic); ++ language_print ($1); ++ face_off(face_bold_italic); ++ function_name_face (false); ++ language_print(" "); ++ keyword_face (true); ++ language_print ($3); ++ keyword_face (false); ++ } ++ ++} +diff -urNad enscript-1.6.4/states/hl/enscript.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/enscript.st +--- enscript-1.6.4/states/hl/enscript.st 2003-03-05 09:31:31.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/enscript.st 2004-11-28 18:56:38.000000000 +0100 +@@ -474,12 +474,17 @@ + /\.m$/ matlab; + /\.(mpl|mp|maple)$/ maple; + /\.(scm|scheme)$/ scheme; ++ /\.e$/ eiffel; ++ /\.erl$/ erlang; + /\b\.emacs$|\.el$/ elisp; + /\.ad(s|b|a)$/ ada; + /\.[Ss]$/ asm; ++ /\.sml$/ sml; + /\.st$/ states; ++ /\.lua$/ lua; + /(M|m)akefile.*/ makefile; + /\.(MOD|DEF|mi|md)$/ modula_2; ++ /\.oz$/ oz; + /\.tcl$/ tcl; + /\.(v|vh)$/ verilog; + /\.html?$/ html; +diff -urNad enscript-1.6.4/states/hl/erlang.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/erlang.st +--- enscript-1.6.4/states/hl/erlang.st 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/erlang.st 2004-11-28 18:56:38.000000000 +0100 +@@ -0,0 +1,161 @@ ++/** ++ * Name: erlang ++ * Description: Erlang programming language. ++ * Author: Sean Hinde ++ */ ++ ++ ++/* Erlang atom: ([a-z][a-zA-Z0-9_]*|\'[^\n]*\') */ ++ ++state erlang extends HighlightEntry ++{ ++ /* Comments */ ++ /%/ { ++ comment_face (true); ++ language_print ($0); ++ call (eat_one_line); ++ comment_face (false); ++ } ++ ++ /* String constants. */ ++ /\"/ { ++ string_face (true); ++ language_print ($0); ++ call (c_string); ++ string_face (false); ++ } ++ ++ /* Special -record(rec_name, {}). pre-processor case */ ++ /(-record)(\([ \t]*)([a-z][a-zA-Z0-9_]*|\'[^\n]*\')/ { ++ reference_face (true); ++ language_print ($1); ++ reference_face (false); ++ language_print ($2); ++ type_face (true); ++ language_print ($3); ++ type_face (false); ++ } ++ ++ /* Special -define(Alter, "Hello"). pre-processor case */ ++ /(-define)(\([ ++\t]*)([a-z][a-zA-Z0-9_]*|\'[^\n]*\'|[A-Z_][a-zA-Z0-9_]*)/ { ++ reference_face (true); ++ language_print ($1); ++ reference_face (false); ++ language_print ($2); ++ builtin_face (true); ++ language_print ($3); ++ builtin_face (false); ++ } ++ ++ /* Pre-processor lines. */ ++ /^-([a-z][a-zA-Z0-9_]*)/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* Defines */ ++ /(\?)([a-z][a-zA-Z0-9_]*|\'[^\n]*\'|[A-Z_][a-zA-Z0-9_]*)/ { ++ language_print ($1); ++ builtin_face (true); ++ language_print ($2); ++ builtin_face (false); ++ } ++ ++ /* Records */ ++ /(#)([a-z][a-zA-Z0-9_]*|\'[^\n]*\')/ { ++ language_print ($1); ++ type_face (true); ++ language_print ($2); ++ type_face (false); ++ } ++ ++ /* Keywords. ++ '(after begin case try catch end fun if of receive when) ++ Regexp taken from emacs Erlang mode R9C ++ */ ++ /\b(a(fter|ndalso)|begin|c(atch|ase)\ ++|end|fun|if|o(f|relse)|receive|try|when\ ++|query)\b/ { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ /* Guards. ++ Regexp taken from emacs Erlang mode R9C ++ */ ++ /\b((is_)*(atom|function|binary|constant|float\ ++|integer|list|number|p(id|ort)\ ++|re(ference|cord)|tuple))\b/ { ++ builtin_face (true); ++ language_print ($0); ++ builtin_face (false); ++ } ++ ++ /* Built in functions */ ++ ++/\b(a(bs|live|pply|tom_to_list)\ ++|binary_to_(list|term)\ ++|concat_binary|d(ate|isconnect_node)\ ++|e(lement|rase|xit)\ ++|float(|_to_list)\ ++|g(arbage_collect|et(|_keys)|roup_leader)\ ++|h(alt|d)\ ++|i(nte(ger_to_list|rnal_bif)|s_alive)\ ++|l(ength|i(nk|st_to_(atom|binary|float|integer\ ++|pid|tuple)))\ ++|make_ref|no(de(|_(link|unlink)|s)|talive)\ ++|open_port\ ++|p(id_to_list|rocess(_(flag|info)|es)|ut)\ ++|r(egister(|ed)|ound)\ ++|s(e(lf|telement)|ize\ ++|p(awn(|_link)|lit_binary)|tatistics)\ ++|t(erm_to_binary|hrow|ime|l\ ++|r(ace|unc)|uple_to_list)\ ++|un(link|register)|whereis)\b/ { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ /* ++ * Function definitions. ++ */ ++ /^([a-z][a-zA-Z0-9_]*|'[^\n]*')/ { ++ function_name_face (true); ++ language_print ($1); ++ function_name_face (false); ++ language_print ($2); ++ } ++ ++ /* Atom like strings */ ++ /('[^\n]*')/ { ++ string_face (true); ++ language_print ($0); ++ string_face (false); ++ } ++ ++ /* Characters */ ++ /(\$.)/ { ++ string_face (true); ++ language_print ($0); ++ string_face (false); ++ } ++ ++ /* Variable Names */ ++ /* /([\{\(\,\[ \t]+)([A-Z_][a-zA-Z0-9_]*)/ { */ ++ /([^a-z0-9_\"])([A-Z_][a-zA-Z0-9_]*)/ { ++ language_print ($1); ++ variable_name_face (true); ++ language_print ($2); ++ variable_name_face (false); ++ } ++} ++ ++/* ++Local variables: ++mode: erlang ++End: ++*/ +diff -urNad enscript-1.6.4/states/hl/forth.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/forth.st +--- enscript-1.6.4/states/hl/forth.st 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/forth.st 2004-11-28 18:56:38.000000000 +0100 +@@ -0,0 +1,96 @@ ++/** ++ * Name: forth ++ * Description: Forth Programming Language. ++ * Author: Brent Fulgham ++ */ ++ ++forth_builtins = ++/* builtins */ ++ /\b(abort|bye|c(atch|o(ld|ntext))|d(rop|up)|f(d(rop|up)|nip|o(r(get|th)|ver)|rot\ ++|s(eal|wap)|tuck)|include|l(ink|oad)|n(ip|eeds)|o(rder|ver)|pick|ro(ll|t)|swap|t(hrow|uck)\ ++|within|2(drop|nip|dup|over|tuck|swap|rot)|3dup|4dup\ ++)\b/; ++ ++forth_types = ++/* types */ ++ /\b(base|c(ell|har)|decimal|float|hex)\b/; ++ ++forth_keywords = ++/* keywords */ ++ /\b(a(bs|gain|head|lso|nd)|begin|c(ase|onstant)|d(abs|efinitions|m(ax|in)|negate|o(|ne))\ ++|e(lse|nd(|case|if|of)|xit)|f(a(bs|cos(|h)|log|sin(|h)|tan(|2|h))|cos(|h)|exp(|m1)|l(n(|p1)\ ++|o(g|or)|s(in(|cos|h)|qrt)|tan(|h))|m(ax|in)|negate|or|round|sqrt)|h(ere|old)|i(f|nvert)\ ++|l(eave|oop)|m(ax|in|od)|n(e(gate|xt)|ot)|o(f|nly|r)|r(epeat|oot)|s(eal|ign)|then\ ++|un(til|loop)|v(ariable|oc(abulary|s))|while|xor\ ++)\b/; ++ ++state forth extends HighlightEntry ++{ ++ /* Comments. */ ++ /\\\\/ { ++ comment_face (true); ++ language_print ($0); ++ call (eat_one_line); ++ comment_face (false); ++ } ++ ++ /* keywords. */ ++ forth_keywords { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ /* Types. */ ++ forth_types { ++ type_face (true); ++ language_print ($0); ++ type_face (false); ++ } ++ ++ /* Builtins support */ ++ forth_builtins { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* String constants. */ ++ /\"/ { ++ string_face (true); ++ language_print ($0); ++ call (c_string); ++ string_face (false); ++ } ++ ++ /* character constants. */ ++ /'.'|'\\\\.'/ { ++ string_face (true); ++ language_print ($0); ++ string_face (false); ++ } ++ ++ /* symbols, etc. */ ++ />|>=|<=|<>|!|\+|\-|\^|\/|\*|\|/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* ++ * function definitions, with args ++ * fct_name (args...) is ++ */ ++ /^(:[ \t]+)([^ ^\t]+)([ \t]*)/ { ++ keyword_face (true); ++ language_print ($1); ++ keyword_face (false); ++ function_name_face (true); ++ face_on(face_bold_italic); ++ language_print ($2); ++ face_off(face_bold_italic); ++ function_name_face (false); ++ language_print ($3); ++ } ++} ++ +diff -urNad enscript-1.6.4/states/hl/icon.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/icon.st +--- enscript-1.6.4/states/hl/icon.st 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/icon.st 2004-11-28 18:56:38.000000000 +0100 +@@ -0,0 +1,93 @@ ++/** ++ * Name: icon ++ * Description: Icon Programming Language. ++ * Author: Brent Fulgham ++ */ ++ ++icon_builtins = ++/* Builtins */ ++ /\b(break|create|default|fail|initial|l(ink|ocal)|not|s(tatic|uspend))\b/; ++ ++icon_types = ++/* Types */ ++ /\b(char|error|function|integer|proc|procedure|real|variable)\b/; ++ ++icon_keywords = ++/* Keywords */ ++ /\b(a(bs|cos|ny|rgs|sin|tan)|b(al|y)|c(a(llout|se)|enter|hdir|lose|o(llect|py|s)|set)\ ++|d(e(lay|lete|tab|isplay|tor)|o)|e(lse|n(d|tab)|rrorclear|very|xit|xp)|f(ind|lush)\ ++|get(|ch|che|env)|i(and|com|f|mage|nsert|or|shift|xor)|k(bhit|ey)|l(eft|ist|o(adfunc|g))\ ++|m(a(ny|p|tch)|ember|ove)|n(ame|ext|umeric)|o(f|pen|rd)|p(op|os|ull|ush|ut)\ ++|r(e(ad(|s)|move|name|p(eat|l)|turn|verse)|ight|tod|unerr)|s(ave|eek|eq|et|in|ort(|f)\ ++|qrt|top|tring|ystem)|t(a(b(|le)|n)|hen|o|rim|ype)|u(ntil|pto)|w(h(ere|ile)|rite(|s))\ ++)\b/; ++ ++state icon extends HighlightEntry ++{ ++ /* Comments. */ ++ /#/ { ++ comment_face (true); ++ language_print ($0); ++ call (eat_one_line); ++ comment_face (false); ++ } ++ ++ /* Keywords. */ ++ icon_keywords { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ /* Types. */ ++ icon_types { ++ type_face (true); ++ language_print ($0); ++ type_face (false); ++ } ++ ++ /* Structure support */ ++ icon_builtins { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* String constants. */ ++ /\"/ { ++ string_face (true); ++ language_print ($0); ++ call (c_string); ++ string_face (false); ++ } ++ ++ /* Character constants. */ ++ /'.'|'\\\\.'/ { ++ string_face (true); ++ language_print ($0); ++ string_face (false); ++ } ++ ++ /* Symbols, etc. */ ++ />|>=|:=|<=|#|=+|!|::|\+|\-|\^|\/|\*|\|/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* ++ * Function definitions, with args ++ * fct_name (args...) is ++ */ ++ /([ \t]*procedure[ \t]+)(\w+)([ \t]*)/ { ++ keyword_face (true); ++ language_print ($1); ++ keyword_face (false); ++ function_name_face (true); ++ face_on(face_bold_italic); ++ language_print ($2); ++ face_off(face_bold_italic); ++ function_name_face (false); ++ language_print ($3); ++ } ++} +diff -urNad enscript-1.6.4/states/hl/lua.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/lua.st +--- enscript-1.6.4/states/hl/lua.st 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/lua.st 2004-11-28 18:56:38.000000000 +0100 +@@ -0,0 +1,91 @@ ++/** ++ * Name: lua ++ * Description: Lua Programming Language template for Enscript. ++ * Author: Brent Fulgham ++ */ ++ ++lua_builtins = ++/* Builtins */ ++ /\b(assert|call|foreach|globals|print|require|to(number|string))\b/; ++ ++lua_keywords = ++/* Keywords */ ++ /\b(and|break|do|e(nd|lse(|if))|f(alse|or|unction)|i(f|n)|local\ ++|or|n(il|ot)|re(peat|turn)|t(hen|rue)|until|while\ ++)\b/; ++ ++state lua extends HighlightEntry ++{ ++ ++ /* One line comments. */ ++ /\-\-|^#!/ { ++ comment_face (true); ++ language_print ($0); ++ call (eat_one_line); ++ comment_face (false); ++ } ++ ++ /* Keywords. */ ++ lua_keywords { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ /* Types. */ ++ lua_builtins { ++ type_face (true); ++ language_print ($0); ++ type_face (false); ++ } ++ ++ /* String constants. */ ++ /\"/ { ++ string_face (true); ++ language_print ($0); ++ call (c_string); ++ string_face (false); ++ } ++ ++ /* Character constants. */ ++ /'.'|'\\\\.'/ { ++ string_face (true); ++ language_print ($0); ++ string_face (false); ++ } ++ ++ /* Symbols, etc. */ ++ /+|-|\*|=|!=|==|<|>|<=|>=|~=|!/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* Class references */ ++ /([ \t])*([a-zA-Z]+[, \ta-zA-Z0-9_]*):[^=]/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* ++ * Function definitions, with args ++ * function fct_name (args...) ++ */ ++ /^([ \t]*function[ \t]+)([a-zA-Z_][a-zA-Z_:0-9]*)([ \t]*)(\([^)]*\)[ \t]*)[ \t]*$/ { ++ keyword_face (true); ++ language_print ($1); ++ keyword_face (false); ++ function_name_face (true); ++ face_on(face_bold_italic); ++ language_print ($2); ++ face_off(face_bold_italic); ++ function_name_face (false); ++ language_print(" "); ++ language_print ($3); ++ keyword_face (true); ++ language_print ($4); ++ keyword_face (false); ++ } ++ ++} +diff -urNad enscript-1.6.4/states/hl/mail.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/mail.st +--- enscript-1.6.4/states/hl/mail.st 2003-03-05 08:26:33.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/mail.st 2004-11-28 18:56:38.000000000 +0100 +@@ -27,7 +27,7 @@ + END { + comment_face (true); + } +- /:/ { ++ /[ \t:]/ { + language_print ($0); + return; + } +diff -urNad enscript-1.6.4/states/hl/Makefile.in /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/Makefile.in +--- enscript-1.6.4/states/hl/Makefile.in 2003-03-05 08:40:07.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/Makefile.in 2004-11-28 18:59:30.000000000 +0100 +@@ -188,7 +188,8 @@ + matlab.st nroff.st objc.st outline.st pascal.st passthrough.st perl.st \ + postscript.st python.st pyrex.st rfc.st scheme.st sh.st skill.st \ + sql.st states.st synopsys.st tcl.st tcsh.st tex.st vba.st verilog.st \ +-vhdl.st vrml.st wmlscript.st zsh.st ++vhdl.st vrml.st wmlscript.st zsh.st eiffel.st erlang.st dylan.st oz.st \ ++lua.st oberon2.st icon.st smalltalk.st forth.st sml.st + + + states = $(misc) $(styles) $(languages) $(highlightings) +diff -urNad enscript-1.6.4/states/hl/oberon2.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/oberon2.st +--- enscript-1.6.4/states/hl/oberon2.st 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/oberon2.st 2004-11-28 18:56:38.000000000 +0100 +@@ -0,0 +1,111 @@ ++/** ++ * Name: oberon2 ++ * Description: Oberon 2 Programming Language. ++ * Author: Brent Fulgham ++ */ ++ ++oberon2_builtins = ++/* Builtins */ ++ /\b(CONST|IMPORT)\b/; ++ ++oberon2_types = ++/* Types */ ++ /\b(ARRAY|B(OOLEAN|YTE)|CHAR|INTEGER|LONG(|INT|REAL)|MODULE|NIL\ ++|P(OINTER|ROCEDURE)|RE(AL|CORD)|SHORT(|INT))\b/; ++ ++oberon2_keywords = ++/* Keywords */ ++ /\b(A(BS|ND|SH)|BEGIN|C(A(P|SE)|HR)|D(O|EC|IV)\ ++|E(LS(E|IF)|N(D|TIER)|X(CL|IT))|F(ALSE|OR)|HALT|I(F|S|N(|C(|L)))\ ++|L(EN|OOP)|M(AX|IN|OD)|NEW|O(F|DD|R(|D))|S(ET|IZE)|T(HEN|O|RUE|YPE)\ ++|UNTIL|RE(PEAT|TURN)|VAR|W(HILE|ITH))\b/; ++ ++state oberon2_comment extends Highlight ++{ ++ /\*\)/ { ++ language_print ($0); ++ return; ++ } ++} ++ ++state oberon2 extends HighlightEntry ++{ ++ /* Comments. */ ++ /\(\*/ { ++ comment_face (true); ++ language_print ($0); ++ call (oberon2_comment); ++ comment_face (false); ++ } ++ ++ /* Keywords. */ ++ oberon2_keywords { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ /* Types. */ ++ oberon2_types { ++ type_face (true); ++ language_print ($0); ++ type_face (false); ++ } ++ ++ /* Structure support */ ++ oberon2_builtins { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* String constants. */ ++ /\"/ { ++ string_face (true); ++ language_print ($0); ++ call (c_string); ++ string_face (false); ++ } ++ ++ /* Character constants. */ ++ /'.'|'\\\\.'/ { ++ string_face (true); ++ language_print ($0); ++ string_face (false); ++ } ++ ++ /* Symbols, etc. */ ++ /\->|>|>=|:=|<=|#|=|!|::|\+|\-|\^|\/|\*|\|/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* ++ * Function definitions, with args ++ * fct_name (args...) is ++ */ ++ /([ \t]*PROCEDURE[ \t]+)(\w+)([ \t]*)/ { ++ keyword_face (true); ++ language_print ($1); ++ keyword_face (false); ++ function_name_face (true); ++ face_on(face_bold_italic); ++ language_print ($2); ++ face_off(face_bold_italic); ++ function_name_face (false); ++ language_print ($3); ++ } ++ ++ /([ \t]*END[ \t]+)(\w+)([ \t]*[;\.])/ { ++ keyword_face (true); ++ language_print ($1); ++ keyword_face (false); ++ function_name_face (true); ++ face_on(face_bold_italic); ++ language_print ($2); ++ face_off(face_bold_italic); ++ function_name_face (false); ++ language_print ($3); ++ } ++} +diff -urNad enscript-1.6.4/states/hl/oz.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/oz.st +--- enscript-1.6.4/states/hl/oz.st 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/oz.st 2004-11-28 18:56:38.000000000 +0100 +@@ -0,0 +1,89 @@ ++/** ++ * Name: oz ++ * Description: Mozart/Oz Programming Language. ++ * Author: Brent Fulgham ++ */ ++ ++oz_builtins = ++/* Builtins */ ++ /\b(export|import|local|require)\b/; ++ ++oz_types = ++/* Types */ ++ /\b(attr|c(lass|atch)|f(eat|unctor)|nil|prop|raise|try)\b/; ++ ++oz_keywords = ++/* Keywords */ ++ /\b(at|c(ase|hoice|ond)|d(e(clare|fine)|o|is)|e(lse(|case|if|of)|nd)\ ++|f(inally|or|rom|un)|i(f|n)|lock|meth|not|o(f|r)|p(repare|roc)|then\ ++|thread)\b/; ++ ++state oz extends HighlightEntry ++{ ++ ++ /* Comments. */ ++ /%/ { ++ comment_face (true); ++ language_print ($0); ++ call (eat_one_line); ++ comment_face (false); ++ } ++ ++ /* Keywords. */ ++ oz_keywords { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ /* Types. */ ++ oz_types { ++ type_face (true); ++ language_print ($0); ++ type_face (false); ++ } ++ ++ /* Structure support */ ++ oz_builtins { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* String constants. */ ++ /\"/ { ++ string_face (true); ++ language_print ($0); ++ call (c_string); ++ string_face (false); ++ } ++ ++ /* Character constants. */ ++ /'.'|'\\\\.'/ { ++ string_face (true); ++ language_print ($0); ++ string_face (false); ++ } ++ ++ /* Symbols, etc. */ ++ /\.\.|=[=]|<\-|\\=|\|/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* ++ * Function definitions, with args ++ * fct_name (args...) is ++ */ ++ /([ \t]*\{)(\w+)([\. \t]*)/ { ++ language_print ($1); ++ function_name_face (true); ++ face_on(face_bold_italic); ++ language_print ($2); ++ face_off(face_bold_italic); ++ function_name_face (false); ++ language_print ($3); ++ } ++ ++} +diff -urNad enscript-1.6.4/states/hl/perl.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/perl.st +--- enscript-1.6.4/states/hl/perl.st 2003-03-05 08:32:09.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/perl.st 2004-11-28 18:56:38.000000000 +0100 +@@ -60,6 +60,11 @@ + + state perl extends HighlightEntry + { ++ /* stuff after $# is a variable, not a comment */ ++ /\$#\w+/ { ++ language_print ($0); ++ } ++ + /* Comments. */ + /#.*$/ { + comment_face (true); +@@ -127,7 +132,6 @@ + + /* Variables */ + /[$%@&]+\w+/ { +- keyword_face (false); + language_print ($0); + } + +diff -urNad enscript-1.6.4/states/hl/smalltalk.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/smalltalk.st +--- enscript-1.6.4/states/hl/smalltalk.st 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/smalltalk.st 2004-11-28 18:56:38.000000000 +0100 +@@ -0,0 +1,80 @@ ++/** ++ * Name: Smalltalk ++ * Description: Smalltalk Programming Language. ++ * Author: Brent Fulgham ++ */ ++ ++smalltalk_keywords = ++/* Keywords */ ++ /\b(class|false|inspect|isNil|new|nil|not(|Nil)|out|s(elf|uper)|true\ ++|do|whileTrue|whileFalse|ifTrue|ifFalse|put|to|at|add|new\ ++|for)\b/ ; ++ ++state smalltalk_quot_string extends Highlight ++{ ++ /\\\\./ { ++ language_print ($0); ++ } ++ /[\']/ { ++ language_print ($0); ++ return; ++ } ++} ++ ++state smalltalk extends HighlightEntry ++{ ++ ++ /* Comments. */ ++ /\"/ { ++ comment_face (true); ++ language_print ($0); ++ call (c_string); ++ comment_face (false); ++ } ++ ++ /* Keywords. */ ++ smalltalk_keywords { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ /* Declarations */ ++ /[ \t]*\|.*\|/ { ++ type_face (true); ++ language_print ($0); ++ type_face (false); ++ } ++ ++ /* String constants. */ ++ /[\']/ { ++ string_face (true); ++ language_print ($0); ++ call (smalltalk_quot_string); ++ string_face (false); ++ } ++ ++ /* Symbols, etc. */ ++ /:=|>|>=|==|<=|<>|=|!|::|@|\+|\-|\^|\/|\*|\||\[|\]/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* ++ * Function definitions, with args ++ * fct_name (args...) is ++ */ ++ /([ \t]*)(\w+)(:[ \t]*)/ { ++ keyword_face (true); ++ language_print ($1); ++ keyword_face (false); ++ function_name_face (true); ++ face_on(face_bold); ++ language_print ($2); ++ face_off(face_bold); ++ function_name_face (false); ++ language_print ($3); ++ } ++ ++} +diff -urNad enscript-1.6.4/states/hl/sml.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/sml.st +--- enscript-1.6.4/states/hl/sml.st 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/sml.st 2004-11-28 18:56:38.000000000 +0100 +@@ -0,0 +1,101 @@ ++/** ++ * Name: sml ++ * Description: Standard ML Programming Language. ++ * Author: Brent Fulgham ++ */ ++ ++sml_builtins = ++/* Builtins */ ++ /\b(functor|lambda|s(ig(|nature)|truct(|ure))|NONE|SOME)\b/; ++ ++sml_types = ++/* Types */ ++ /\b(\'(a|b|c|d)|array|bool|char|int|list|real|string|unit|vector|word)\b/; ++ ++sml_keywords = ++/* Keywords */ ++ /\b(a(bs(traction|type)|nd(|also)|s|toi)|before|c(ase|oncat)|d(o|atatype)\ ++|e(lse|nd|qtype|xception)|f(n|un(|sig))|handle|i(f|n(|clude|fix|fixr))\ ++|l(et|ocal)|nonfix|o(|f|p(|en)|relse|verload)|print|r(aise|ec|ef)|sharing\ ++|t(hen|ype)|val|w(h(ere|ile)|ith(|type)))\b/ ; ++ ++state sml_comment extends Highlight ++{ ++ /\*\)/ { ++ language_print ($0); ++ return; ++ } ++} ++ ++state sml extends HighlightEntry ++{ ++ ++ /* Comments. */ ++ /\(\*/ { ++ comment_face (true); ++ language_print ($0); ++ call (sml_comment); ++ comment_face (false); ++ } ++ ++ /* Keywords. */ ++ sml_keywords { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ /* Types. */ ++ sml_types { ++ type_face (true); ++ language_print ($0); ++ type_face (false); ++ } ++ ++ /* Structure support */ ++ sml_builtins { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* String constants. */ ++ /\"/ { ++ string_face (true); ++ language_print ($0); ++ call (c_string); ++ string_face (false); ++ } ++ ++ /* Character constants. */ ++ /'.'|'\\\\.'/ { ++ string_face (true); ++ language_print ($0); ++ string_face (false); ++ } ++ ++ /* Symbols, etc. */ ++ /:=|>|>=|==|<=|<>|=|!|::|@|\+|\-|\^|\/|\*|\||\b(quot|rem|div|mod\ ++|hd|tl)\b/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++ /* ++ * Function definitions, with args ++ * fct_name (args...) is ++ */ ++ /([ \t]*f[u]n[ \t]+)(\w+)([ \t]*)/ { ++ keyword_face (true); ++ language_print ($1); ++ keyword_face (false); ++ function_name_face (true); ++ face_on(face_bold_italic); ++ language_print ($2); ++ face_off(face_bold_italic); ++ function_name_face (false); ++ language_print ($3); ++ } ++ ++} +diff -urNad enscript-1.6.4/states/hl/tcl.st /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/tcl.st +--- enscript-1.6.4/states/hl/tcl.st 2003-03-05 08:26:33.000000000 +0100 ++++ /tmp/dpep.xDf0k6/enscript-1.6.4/states/hl/tcl.st 2004-11-28 18:56:38.000000000 +0100 +@@ -128,7 +128,7 @@ + |e(ntry|of|rror|v(al|ent)|x(ec|it|pr))\ + |f(blocked|configure|ile(|event|name)|lush|o(cus|nt|r(|each|mat))|rame)\ + |g(ets|lob(|al)|r(ab|id))|history|i(f|mage|n(cr|fo|terp))|join\ +-|l(a(bel|ppend)|i(brary|n(dex|sert)|st(|box))|length|o(ad|se|wer)\ ++|l(a(bel|ppend|st)|i(brary|n(dex|sert)|st(|box))|length|o(ad|se|wer)\ + |r(ange|eplace)|s(earch|ort))\ + |me(nu(|button)|ssage)|op(en|tion(|s))\ + |p(ack(|age)|hoto|id|kg_mkIndex|lace|roc|uts|wd)\ --- enscript-1.6.4.orig/debian/patches/331298-javascript-regex-highlighting +++ enscript-1.6.4/debian/patches/331298-javascript-regex-highlighting @@ -0,0 +1,32 @@ +Fix JavaScript regex highlighting. + -- Tim Retout Fri, 26 Oct 2007 00:09:50 +0100 + +diff --git a/states/hl/javascript.st b/states/hl/javascript.st +index 3344dce..57f91a4 100644 +--- a/states/hl/javascript.st ++++ b/states/hl/javascript.st +@@ -105,6 +105,24 @@ state javascript_internal extends Highlight + from_html_terminator = $0; + return; + } ++ ++ /* Regexes */ ++ /\// { ++ string_face (true); ++ language_print ($0); ++ call (javascript_regex); ++ string_face (false); ++ } ++} ++ ++state javascript_regex { ++ /\\\\\\\// { ++ language_print ($0); ++ } ++ /\\\// { ++ language_print ($0); ++ return; ++ } + } + + state javascript extends HighlightEntry --- enscript-1.6.4.orig/debian/patches/06_debian +++ enscript-1.6.4/debian/patches/06_debian @@ -0,0 +1,60 @@ +## 06_debian.dpatch by Michael Fedrowitz +## DP: debian specific changes +diff -urNad /home/michael/debian/enscript-1.6.4/docs/Makefile.in enscript-1.6.4/docs/Makefile.in +--- /home/michael/debian/enscript-1.6.4/docs/Makefile.in 2003-11-16 14:02:57.000000000 +0100 ++++ enscript-1.6.4/docs/Makefile.in 2003-11-16 14:04:27.000000000 +0100 +@@ -249,14 +249,14 @@ + + uninstall-info-am: + $(PRE_UNINSTALL) +- @if (install-info --version && \ +- install-info --version | grep -i -v debian) >/dev/null 2>&1; then \ +- list='$(INFO_DEPS)'; \ +- for file in $$list; do \ +- echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \ +- install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \ +- done; \ +- else :; fi ++# @if (install-info --version && \ ++# install-info --version | grep -i -v debian) >/dev/null 2>&1; then \ ++# list='$(INFO_DEPS)'; \ ++# for file in $$list; do \ ++# echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \ ++# install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \ ++# done; \ ++# else :; fi + @$(NORMAL_UNINSTALL) + @list='$(INFO_DEPS)'; \ + for file in $$list; do \ +@@ -440,14 +440,14 @@ + done; \ + done + @$(POST_INSTALL) +- @if (install-info --version && \ +- install-info --version | grep -i -v debian) >/dev/null 2>&1; then \ +- list='$(INFO_DEPS)'; \ +- for file in $$list; do \ +- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ +- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ +- done; \ +- else : ; fi ++# @if (install-info --version && \ ++# install-info --version | grep -i -v debian) >/dev/null 2>&1; then \ ++# list='$(INFO_DEPS)'; \ ++# for file in $$list; do \ ++# echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ ++# install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ ++# done; \ ++# else : ; fi + install-man: install-man1 + + installcheck-am: +diff -urNad /home/michael/debian/enscript-1.6.4/states/over.in enscript-1.6.4/states/over.in +--- /home/michael/debian/enscript-1.6.4/states/over.in 2003-03-05 08:26:33.000000000 +0100 ++++ enscript-1.6.4/states/over.in 2003-11-16 14:02:57.000000000 +0100 +@@ -2,4 +2,4 @@ + + librarydir=@LIBRARYDIR@ + +-enscript -E -p- --quiet --language=overstrike $* 2>&1 | less ++enscript -E -p- --quiet --language=overstrike "$@" 2>&1 | sensible-pager --- enscript-1.6.4.orig/debian/patches/03_misc +++ enscript-1.6.4/debian/patches/03_misc @@ -0,0 +1,63 @@ +## 03_misc.dpatch by Michael Fedrowitz +## DP: miscellaneous bug fixes +diff -urNad /home/michael/debian/enscript-1.6.4/compat/regex.c enscript-1.6.4/compat/regex.c +--- /home/michael/debian/enscript-1.6.4/compat/regex.c 2003-03-05 08:26:17.000000000 +0100 ++++ enscript-1.6.4/compat/regex.c 2003-11-08 21:02:16.000000000 +0100 +@@ -2400,11 +2400,13 @@ + case ')': + if (syntax & RE_NO_BK_PARENS) goto normal_backslash; + +- if (COMPILE_STACK_EMPTY) +- if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) ++ if (COMPILE_STACK_EMPTY) { ++ if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) { + goto normal_backslash; +- else ++ } else { + FREE_STACK_RETURN (REG_ERPAREN); ++ } ++ } + + handle_close: + if (fixup_alt_jump) +@@ -2420,11 +2422,13 @@ + } + + /* See similar code for backslashed left paren above. */ +- if (COMPILE_STACK_EMPTY) +- if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) ++ if (COMPILE_STACK_EMPTY) { ++ if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) { + goto normal_char; +- else ++ } else { + FREE_STACK_RETURN (REG_ERPAREN); ++ } ++ } + + /* Since we just checked for an empty stack above, this + ``can't happen''. */ +diff -urNad /home/michael/debian/enscript-1.6.4/src/main.c enscript-1.6.4/src/main.c +--- /home/michael/debian/enscript-1.6.4/src/main.c 2003-11-08 21:02:16.000000000 +0100 ++++ enscript-1.6.4/src/main.c 2003-11-08 21:02:16.000000000 +0100 +@@ -2011,7 +2011,7 @@ + int i; + + c = getopt_long (argc, argv, +- "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ", ++ "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ", + long_options, &option_index); + + if (c == -1) +diff -urNad /home/michael/debian/enscript-1.6.4/src/psgen.c enscript-1.6.4/src/psgen.c +--- /home/michael/debian/enscript-1.6.4/src/psgen.c 2003-03-05 08:36:53.000000000 +0100 ++++ enscript-1.6.4/src/psgen.c 2003-11-08 21:02:16.000000000 +0100 +@@ -2581,7 +2581,7 @@ + read_float (InputStream *is, int units, int horizontal) + { + char buf[256]; +- int i, ch; ++ int i, ch = 0; + double val; + + for (i = 0; (i < sizeof (buf) - 1 --- enscript-1.6.4.orig/debian/patches/13_de_correction +++ enscript-1.6.4/debian/patches/13_de_correction @@ -0,0 +1,321 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 13_de_correction.dpatch by Matej Vela +## DP: Apply correction in the German translation. +Index: enscript/po/de.po +=================================================================== +--- enscript.orig/po/de.po 2006-10-07 23:52:38.416800408 +0200 ++++ enscript/po/de.po 2006-10-08 00:01:35.031222616 +0200 +@@ -7,9 +7,9 @@ msgid "" + msgstr "" + "Project-Id-Version: GNU enscript 1.6.2\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 17:10+0200\n" +-"PO-Revision-Date: 1999-04-08 22:13+02:00\n" +-"Last-Translator: Martin von Löwis \n" ++"POT-Creation-Date: 2006-10-07 23:54+0200\n" ++"PO-Revision-Date: 2006-10-08 00:01+0200\n" ++"Last-Translator: Christoph Berg \n" + "Language-Team: German \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=ISO-8859-1\n" +@@ -168,7 +168,7 @@ msgid "couldn't get passwd entry for uid + msgstr "Kein Passwort-Eintrag für UID=%d zu bekommen: %s." + + #: src/main.c:1099 +-#, fuzzy, c-format ++#, c-format + msgid "couldn't read config file \"%s/%s\": %s" + msgstr "Kann Konfigurationsdatei »%s/%s« nicht öffnen: %s." + +@@ -303,9 +303,9 @@ msgstr "" + # Mir ist unklar, was diese und die folgenden Meldungen meinen... -ke- + # Vermutlich toc = Table of contents? -mvl- + #: src/main.c:1662 +-#, fuzzy, c-format ++#, c-format + msgid "couldn't create temporary toc file: %s" +-msgstr "Datei für Inhaltsverzeichnis kann nicht angelegt werden: %s." ++msgstr "Temporäre Datei für Inhaltsverzeichnis kann nicht angelegt werden: %s." + + #: src/main.c:1709 + #, c-format +@@ -356,7 +356,7 @@ msgstr " abgelegt in: %s\n" + + #: src/main.c:1805 + #, c-format +-msgid "%d lines were %s\n" ++msgid "%d line(s) were %s\n" + msgstr "%d Zeile(n) wurde(n) %s\n" + + #: src/main.c:1807 +@@ -365,7 +365,7 @@ msgstr "abgeschnitten (»truncated«)" + + #: src/main.c:1807 + msgid "wrapped" +-msgstr "zusammengedrängt (»wrapped«)" ++msgstr "umgebrochen (»wrapped«)" + + #: src/main.c:1813 + #, c-format +@@ -396,9 +396,9 @@ msgid "couldn't create output file \"%s\ + msgstr "Kann Ausgabedatei »%s« nicht anlegen: %s." + + #: src/main.c:1905 +-#, fuzzy, c-format ++#, c-format + msgid "couldn't close output file \"%s\": %s" +-msgstr "Kann Ausgabedatei »%s« nicht anlegen: %s." ++msgstr "Kann Ausgabedatei »%s« nicht schließen: %s." + + #: src/main.c:1963 + #, c-format +@@ -422,9 +422,8 @@ msgid " option %d = \"%s\"\n" + msgstr " Option %d = \"%s\"\n" + + #: src/main.c:2045 +-#, fuzzy + msgid "number of columns must be larger than zero" +-msgstr "Ausrichtung der Datei (»aligment«) muss größer als Null sein" ++msgstr "Zahl der Spalten muss größer als Null sein" + + #: src/main.c:2103 + msgid "file alignment must be larger than zero" +@@ -500,7 +499,7 @@ msgstr "" + " -a, --pages=SEITEN Zahl der zu druckenden Seiten angeben.\n" + " -A, --file-align=ALIGN Verschiedene Eingabedateien auf ALIGN " + "ausrichten.\n" +-" -b, --page-header=KOPF Kopf der Seite setzen.\n" ++" -b, --header=KOPF Kopf der Seite setzen.\n" + " -B, --no-header Keine Kopfzeilen.\n" + " -c, --truncate-lines Lange Zeilen abschneiden (Standardvorgabe ist\n" + " »umbrechen«).\n" +@@ -514,9 +513,9 @@ msgstr "" + " zuschalten.\n" + + #: src/main.c:2555 +-#, fuzzy, c-format ++#, c-format + msgid " -E, --highlight[=LANG] highlight source code\n" +-msgstr " -E, --pretty-print[=LANG] Quelltext schön formatieren.\n" ++msgstr " -E, --highlight[=LANG] Quelltext hervorheben.\n" + + #: src/main.c:2558 + #, c-format +@@ -597,7 +596,7 @@ msgstr "" + " -R, --portrait Im Längsformat (»portrait mode«) drucken.\n" + + #: src/main.c:2592 +-#, fuzzy, c-format ++#, c-format + msgid "" + " -s, --baselineskip=NUM set baselineskip to NUM\n" + " -S, --statusdict=KEY[:VALUE]\n" +@@ -616,25 +615,26 @@ msgid "" + " -Z, --pass-through pass through PostScript and PCL files\n" + " without any modifications\n" + msgstr "" +-" -s, --baselineskip=NUM »baselineskip« auf NUM setzen.\n" ++" -s, --baselineskip=NUM »baselineskip« auf NUM setzen.\n" + " -S, --statusdict=SCHLÜSSEL[:WERT]\n" +-" »statusdict definition« zur Ausgabe\n" +-" weiterreichen.\n" +-" -t, --title=TITEL Titel für erste Seite (»banner page«) angeben.\n" +-" Gibt auch den Namen der Eingabedatei »stdin« " +-"an.\n" +-" -T, --tabsize=NUM Tabulatorbreite auf NUM setzen.\n" +-" -u, --underlay[=TEXT] TEXT unter jeder Seite drucken (Wasserzeichen).\n" +-" -U, --nup=ZAHL Drucke ZAHL logische Seiten auf jede " ++" »statusdict definition« zur Ausgabe\n" ++" weiterreichen.\n" ++" -t, --title=TITEL Titel für erste Seite (»banner page«) angeben.\n" ++" Setzt auch den Namen der Eingabedatei »stdin«.\n" ++" -T, --tabsize=NUM Tabulatorbreite auf NUM setzen.\n" ++" -u, --underlay[=TEXT] TEXT unter jeder Seite drucken " ++"(Wasserzeichen).\n" ++" -U, --nup=ZAHL Drucke ZAHL logische Seiten auf jede " + "Ausgabeseite.\n" +-" -v, --verbose Ausführliche Status-Informationen anzeigen.\n" +-" -V, --version Programmversion anzeigen.\n" +-" -W, --language=SPRACHE Setze Ausgabesprache auf SPRACHE.\n" +-" -X, --encoding=NAME Eingabe-Kodierung NAME benutzen.\n" +-" -z, --no-formfeed Seitenvorschub (»form feed«) nicht " ++" -v, --verbose Ausführliche Status-Informationen anzeigen.\n" ++" -V, --version Programmversion anzeigen.\n" ++" -w, --language=SPRACHE Setze Ausgabesprache auf SPRACHE.\n" ++" -W, --options=APP,OPTION Option OPTION an Hilfsanwendung APP übergeben.\n" ++" -X, --encoding=NAME Eingabe-Kodierung NAME benutzen.\n" ++" -z, --no-formfeed Seitenvorschub (»form feed«) nicht " + "interpretieren.\n" +-" -Z, --pass-through PostScript- und PCL-Dateien ohne\n" +-" Veränderungen weiterreichen.\n" ++" -Z, --pass-through PostScript- und PCL-Dateien ohne\n" ++" Veränderungen weiterreichen.\n" + + #: src/main.c:2610 + #, c-format +@@ -650,9 +650,21 @@ msgid "" + " --h-column-height=HEIGHT set the horizontal column height to HEIGHT\n" + " --help print this help and exit\n" + msgstr "" ++"Lange Optionen ohne Kurzversion\n" ++" --color[=bool] Farbausgabe von states erzeugen lassen.\n" ++" --continuous-page-numbers Zähle Seitenzahlen über Eingabedateien, " ++"Numerierung\n" ++" nicht jeweilse am Dateianfang neu beginnen.\n" ++" --download-font=NAME Font NAME laden.\n" ++" --extended-return-values Aktiviere erweiterte Rückgabewerte.\n" ++" --filter-stdin=NAME NAME, mit dem stdin in Eingabefiltern \n" ++" auftaucht, festlegen.\n" ++" --footer=FOOTER Setze Fußzeile.\n" ++" --h-column-height=HÖHE Setze horizontale Spaltenhöhe auf HÖHE.\n" ++" --help Diese Hilfe anzeigen und beenden.\n" + + #: src/main.c:2621 +-#, fuzzy, c-format ++#, c-format + msgid "" + " --help-highlight describe all supported --highlight languages\n" + " and file formats\n" +@@ -664,19 +676,11 @@ msgid "" + " mark wrapped lines in the output with STYLE\n" + " --non-printable-format=FMT specify how non-printable chars are printed\n" + msgstr "" +-"Lange Optionen ohne Kurzversion\n" +-" --color[=bool] Farbausgabe von states erzeugen lassen.\n" +-" --download-font=NAME Font NAME laden.\n" +-" --filter-stdin=NAME NAME, mit dem stdin in Eingabefiltern \n" +-" auftaucht, festlegen.\n" +-" --help Diese Hilfe anzeigen und beenden.\n" +-" --help-pretty-pring Beschreibe alle von --pretty-print " +-"unterstützten\n" +-" Sprachen.\n" ++" --help-highlight Beschreibe alle von --highlight unterstützten\n" ++" Sprachen und Dateiformate.\n" + " --highlight-bar-gray=ZAHL Graustufe für die Hervorhebungsbalken \n" + " auf ZAHL setzen.\n" + " --list-media Alle bekannten Medien auflisten.\n" +-" --list-options Alle Optionen und deren Werte auflisten.\n" + " --margins=LINKS:RECHTS:OBEN:UNTEN\n" + " Seitenränder einstellen.\n" + " --mark-wrapped-lines[STIL] Markiere umbrochene Zeilen in der Ausgabe \n" +@@ -684,7 +688,7 @@ msgstr "" + " --non-printable-format=FMT Nicht druckbares Format als FMT bestimmen.\n" + + #: src/main.c:2632 +-#, fuzzy, c-format ++#, c-format + msgid "" + " --nup-columnwise layout pages in the N-up printing columnwise\n" + " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" +@@ -696,10 +700,11 @@ msgid "" + " --printer-options=OPTIONS pass extra options to the printer command\n" + " --rotate-even-pages rotate even-numbered pages 180 degrees\n" + msgstr "" +-" --nup-xpad=ZAHL FIXME:set the page x-padding of N-up printing " +-"to NUM\n" +-" --nup-ypad=ZAHL FIXME:set the page y-padding of N-up printing " +-"to NUM\n" ++" --nup-columnwise Seiten im N-up-Druck spaltenweise anordnen.\n" ++" --nup-xpad=ZAHL Sezte Seiten-x-Füllung bei N-up-Druck auf " ++"ZAHL.\n" ++" --nup-ypad=ZAHL Sezte Seiten-y-Füllung bei N-up-Druck auf " ++"ZAHL.\n" + " --page-label-format=FMT Format für Seitenbezeichnung auf FMT setzen.\n" + " --ps-level=LEVEL Von enscript benutztes Postscript-LEVEL \n" + " einstellen.\n" +@@ -708,7 +713,7 @@ msgstr "" + " --rotate-even-pages Geradzahlige Seiten um 180 Grad drehen.\n" + + #: src/main.c:2642 +-#, fuzzy, c-format ++#, c-format + msgid "" + " --slice=NUM print vertical slice NUM\n" + " --style=STYLE use highlight style STYLE\n" +@@ -724,6 +729,8 @@ msgid "" + msgstr "" + " --slice=ZAHL Vertikalen Abschnitt ZAHL drucken.\n" + " --style=STIL Hervorhebungsstil STIL verwenden.\n" ++" --swap-even-page-margins Linke und rechte Ränder auf geraden Seiten\n" ++" tauschen.\n" + " --toc Inhaltsverzeichnis drucken.\n" + " --ul-angle=WINKEL Winkel vom Wasserzeichen auf WINKEL festlegen.\n" + " --ul-font=NAME Wasserzeichen mit Font NAME drucken.\n" +@@ -739,7 +746,7 @@ msgid "" + "Report bugs to mtr@iki.fi.\n" + msgstr "" + "\n" +-"Probleme und Fehler an mtr@iki.fi\n" ++"Probleme und Fehler an mtr@iki.fi senden.\n" + + #: src/psgen.c:324 + #, c-format +@@ -874,9 +881,9 @@ msgstr "Durch %s die Datei »%s« weiterre + + # Mir ist unklar, was diese und die folgenden Meldungen meinen... -ke- + #: src/psgen.c:2817 +-#, fuzzy, c-format ++#, c-format + msgid "couldn't create temporary divert file: %s" +-msgstr "Name für Umleitungsdatei kann nicht erzeugt werden: %s." ++msgstr "Konnte temporäre Umleitungsdatei nicht erzeugten: %s." + + #: src/psgen.c:2834 + #, c-format +@@ -884,9 +891,9 @@ msgid "couldn't rewind divert file: %s" + msgstr "Umleitungsdatei kann nicht zurückgespult werden: %s." + + #: src/util.c:95 +-#, fuzzy, c-format ++#, c-format + msgid "missing argument: %s" +-msgstr "Ungültiges N-up Argument: %d." ++msgstr "Fehlendes Argument: %s." + + #: src/util.c:185 src/util.c:213 + #, c-format +@@ -1128,14 +1135,14 @@ msgstr "" + " -W, --warning=STUFE Warnstufe auf STUFE setzen.\n" + + #: states/prims.c:46 +-#, fuzzy, c-format ++#, c-format + msgid "%s:%d: %s: too few arguments\n" +-msgstr "%s:%d: %s: Ungültiger Argumenttyp.\n" ++msgstr "%s:%d: %s: Nicht genug Argumente.\n" + + #: states/prims.c:56 +-#, fuzzy, c-format ++#, c-format + msgid "%s:%d: %s: too many arguments\n" +-msgstr "%s:%d: %s: Ungültiger Argumenttyp.\n" ++msgstr "%s:%d: %s: Zuviele Argumente.\n" + + #: states/prims.c:109 states/prims.c:129 states/prims.c:255 states/prims.c:428 + #: states/prims.c:903 +@@ -1257,19 +1264,19 @@ msgid "%s:%d: error: expression between + msgstr "%s:%d: Fehler: Ausdruck mit ungültigen Typen.\n" + + #: states/utils.c:867 +-#, fuzzy, c-format ++#, c-format + msgid "%s:%d: error: too few arguments for subroutine\n" +-msgstr "%s: Zu wenig Argumente für Subroutine.\n" ++msgstr "%s:%d: Fehler: Zu wenig Argumente für Subroutine.\n" + + #: states/utils.c:874 +-#, fuzzy, c-format ++#, c-format + msgid "%s:%d: error: too many arguments for subroutine\n" +-msgstr "%s: Zu viele Argumente für Subroutine.\n" ++msgstr "%s:%d: Fehler: Zu viele Argumente für Subroutine.\n" + + #: states/utils.c:928 +-#, fuzzy, c-format ++#, c-format + msgid "%s:%d: error: undefined procedure `%s'\n" +-msgstr "%s: Undefinierte Prozedur »%s«.\n" ++msgstr "%s:%d: Fehler: Undefinierte Prozedur »%s«.\n" + + #: states/utils.c:1020 + #, c-format --- enscript-1.6.4.orig/debian/patches/393791-sliceprint +++ enscript-1.6.4/debian/patches/393791-sliceprint @@ -0,0 +1,63 @@ +enscript (1.6.4-11) unstable; urgency=low + + * sliceprint: fix enscript call (program was completely broken), and + complete manpage (Closes: #393791). + + -- Christoph Berg Wed, 25 Oct 2006 02:21:08 +0200 + +--- enscript-1.6.4.orig/scripts/sliceprint.in ++++ enscript-1.6.4/scripts/sliceprint.in +@@ -27,12 +27,13 @@ + # + + $enscript = "enscript"; ++$ENV{LC_ALL} = "C"; # we parse enscript's output + + $program = $0; + $program =~ s/.*\///g; + + sub usage { +- warn "Usage: $program [ENSCRIPT_OPTION]... [FILE]...\n"; ++ warn "Usage: $program [-oFILE] [ENSCRIPT_OPTION]... [FILE]...\n"; + } + + # Handle arguments. +@@ -67,14 +68,15 @@ + while (1) { + $slice++; + if (defined($output_file)) { +- $cmd = "$enscript" . $args . " --slice=$slice -p" ++ $cmd = "$enscript " . $args . " --slice=$slice -p" + . $output_file . "." . $slice . " " . $files; + } else { +- $cmd = "$enscript" . $args . " --slice=$slice" . $files; ++ $cmd = "$enscript " . $args . " --slice=$slice" . $files; + } + print "printing slice $slice...\n"; + $result = `$cmd 2>&1`; +- if ($result !~ ".*lines were.*") { ++ print $result; ++ if ($result !~ ".*line.* were wrapped.*") { + last; + } + } +only in patch2: +unchanged: +--- enscript-1.6.4.orig/scripts/sliceprint.1 ++++ enscript-1.6.4/scripts/sliceprint.1 +@@ -25,12 +25,12 @@ + sliceprint \- slice documents with long lines. + + .SH SYNOPSIS +-.B sliceprint \f1[\f2enscript_options\f1]\f3 \f1[\f2files\f1]\f3 ++.B sliceprint \f1[\-o\f2file\f1]\f3 \f1[\f2enscript_options\f1]\f3 \f1[\f2files\f1]\f3 + + .SH DESCRIPTION + +-XXX +- ++\f3Sliceprint\f1 is a wrapper around the \f3enscript(1)\f1\ \-\-slice option. ++Output slices are written to \f2file\f1.1, \f2file\f1.2 and so on. + + .SH SEE ALSO + enscript(1) --- enscript-1.6.4.orig/debian/patches/09_appendctrld +++ enscript-1.6.4/debian/patches/09_appendctrld @@ -0,0 +1,41 @@ +## 09_appendctrld.dpatch by Michael Fedrowitz +## DP: Change AppendCtrlD to allow appending ^D without trailing newline. +diff -urNad /home/michael/debian/enscript-1.6.4/docs/enscript.man enscript-1.6.4/docs/enscript.man +--- /home/michael/debian/enscript-1.6.4/docs/enscript.man 2003-11-08 21:07:11.000000000 +0100 ++++ enscript-1.6.4/docs/enscript.man 2003-11-08 21:07:11.000000000 +0100 +@@ -667,9 +667,11 @@ + .B AFMPath: \f2path\f3 + Specifies the search path for the \f2AFM\f1 files. + .TP 8 +-.B AppendCtrlD: \f2bool\f3 ++.B AppendCtrlD: \f2int\f3 + Specify if the Control-D (^D) character should be appended to the end +-of the output. The default value is false (0). ++of the output. A value of 1 will append ^D followed by a newline, a ++value of 2 will omit the trailing newline. The default value is 0 for ++no ^D. + .TP 8 + .B Clean7Bit: \f2bool\f3 + Specify how characters greater than 127 are printed. The valuee true +diff -urNad /home/michael/debian/enscript-1.6.4/src/main.c enscript-1.6.4/src/main.c +--- /home/michael/debian/enscript-1.6.4/src/main.c 2003-11-08 21:07:11.000000000 +0100 ++++ enscript-1.6.4/src/main.c 2003-11-08 21:07:11.000000000 +0100 +@@ -1733,11 +1733,15 @@ + dump_ps_trailer (); + + /* +- * Append ^D to the end of the output? Note! It must be ^D followed ++ * Append ^D to the end of the output? Optionally followed + * by a newline. + */ +- if (ofp != NULL && append_ctrl_D) +- fprintf (ofp, "\004\n"); ++ if (ofp != NULL && append_ctrl_D > 0) ++ { ++ fprintf (ofp, "\004"); ++ if (append_ctrl_D == 1) ++ fprintf (ofp, "\n"); ++ } + } + + /* Close output file. */ --- enscript-1.6.4.orig/debian/patches/11_CAN-2004-1185 +++ enscript-1.6.4/debian/patches/11_CAN-2004-1185 @@ -0,0 +1,27 @@ +## 11_CAN-2004-1185.dpatch by Michael Fedrowitz +## DP: Commented out code that will permit EPS files to be provided as +## DP: arbitrary programs to be executed. [CAN-2004-1185] +## DP: Patch provided by the Debian Security Team. +diff -urNad enscript-1.6.4/src/psgen.c /tmp/dpep.pWFdoz/enscript-1.6.4/src/psgen.c +--- enscript-1.6.4/src/psgen.c 2005-01-20 19:56:16.000000000 +0100 ++++ /tmp/dpep.pWFdoz/enscript-1.6.4/src/psgen.c 2005-01-20 19:56:28.000000000 +0100 +@@ -2385,9 +2385,10 @@ + MESSAGE (2, (stderr, "^@epsf=\"%s\"\n", token->u.epsf.filename)); + + i = strlen (token->u.epsf.filename); ++ /* + if (i > 0 && token->u.epsf.filename[i - 1] == '|') + { +- /* Read EPS data from pipe. */ ++ / * Read EPS data from pipe. * / + token->u.epsf.pipe = 1; + token->u.epsf.filename[i - 1] = '\0'; + token->u.epsf.fp = popen (token->u.epsf.filename, "r"); +@@ -2400,6 +2401,7 @@ + } + } + else ++ */ + { + char *filename; + --- enscript-1.6.4.orig/debian/patches/276219-grammar-fix +++ enscript-1.6.4/debian/patches/276219-grammar-fix @@ -0,0 +1,301 @@ +Index: enscript/src/main.c +=================================================================== +--- enscript.orig/src/main.c 2006-10-08 00:26:25.634616456 +0200 ++++ enscript/src/main.c 2006-10-08 00:26:25.694607336 +0200 +@@ -1802,7 +1802,7 @@ name width\theight\tllx\tlly + if (num_truncated_lines) + { + retval |= 2; +- MESSAGE (0, (stderr, _("%d lines were %s\n"), num_truncated_lines, ++ MESSAGE (0, (stderr, _("%d line(s) were %s\n"), num_truncated_lines, + line_end == LE_TRUNCATE + ? _("truncated") : _("wrapped"))); + } +Index: enscript/po/ca.po +=================================================================== +--- enscript.orig/po/ca.po 2006-10-08 00:26:49.109047800 +0200 ++++ enscript/po/ca.po 2006-10-08 00:27:44.661602528 +0200 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: enscript 1.6.2\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 2002-08-14 12:24+0200\n" + "Last-Translator: Ernest Adrogué Calveras \n" + "Language-Team: Catalan \n" +@@ -358,8 +358,8 @@ msgid " left in %s\n" + msgstr " deixades a %s\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d línies han estat %s\n" + + #: src/main.c:1807 +Index: enscript/po/da.po +=================================================================== +--- enscript.orig/po/da.po 2006-10-08 00:26:49.148041872 +0200 ++++ enscript/po/da.po 2006-10-08 00:27:44.783583984 +0200 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: enscript 1.6.2\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 2002-11-09 10:35+0100\n" + "Last-Translator: Keld Simonsen \n" + "Language-Team: Danish \n" +@@ -351,8 +351,8 @@ msgid " left in %s\n" + msgstr " beholdt i %s\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d linjer blev %s\n" + + #: src/main.c:1807 +Index: enscript/po/en_GB.po +=================================================================== +--- enscript.orig/po/en_GB.po 2006-10-08 00:26:49.227029864 +0200 ++++ enscript/po/en_GB.po 2006-10-08 00:27:45.019548112 +0200 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: enscript 1.6.3\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 2003-01-31 15:32+0000\n" + "Last-Translator: Nigel Titley \n" + "Language-Team: English (British) \n" +@@ -350,8 +350,8 @@ msgid " left in %s\n" + msgstr " left in %s\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d lines were %s\n" + + #: src/main.c:1807 +Index: enscript/po/es.po +=================================================================== +--- enscript.orig/po/es.po 2006-10-08 00:26:49.267023784 +0200 ++++ enscript/po/es.po 2006-10-08 00:27:45.146528808 +0200 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: GNU enscript 1.4.2\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 1997-03-19 23:01+0100\n" + "Last-Translator: L. Marcél Barrero M. \n" + "Language-Team: Spanish \n" +@@ -433,8 +433,8 @@ msgid " left in %s\n" + msgstr " copiadas en %s\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d líneas fueron %s\n" + + #: src/main.c:1807 +Index: enscript/po/fr.po +=================================================================== +--- enscript.orig/po/fr.po 2006-10-08 00:26:49.306017856 +0200 ++++ enscript/po/fr.po 2006-10-08 00:27:45.273509504 +0200 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: GNU enscript 1.6.3\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 2002-11-13 08:00-0500\n" + "Last-Translator: Michel Robitaille \n" + "Language-Team: French \n" +@@ -358,8 +358,8 @@ msgid " left in %s\n" + msgstr " placées dans %s\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d lignes étaient %s\n" + + #: src/main.c:1807 +Index: enscript/po/hr.po +=================================================================== +--- enscript.orig/po/hr.po 2006-10-08 00:26:49.345011928 +0200 ++++ enscript/po/hr.po 2006-10-08 00:27:45.402489896 +0200 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: enscript 1.6.2\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 2002-04-22 00:02+02:00\n" + "Last-Translator: Hrvoje Niksic \n" + "Language-Team: Croatian \n" +@@ -349,8 +349,8 @@ msgid " left in %s\n" + msgstr " ostalo u %s\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d redova su %s\n" + + #: src/main.c:1807 +Index: enscript/po/nl.po +=================================================================== +--- enscript.orig/po/nl.po 2006-10-08 00:26:49.384006000 +0200 ++++ enscript/po/nl.po 2006-10-08 00:27:45.531470288 +0200 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: enscript 1.5.1\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 1997-07-24 22:16 CEST\n" + "Last-Translator: Erick Branderhorst \n" + "Language-Team: Dutch \n" +@@ -348,8 +348,8 @@ msgid " left in %s\n" + msgstr " achtergelaten in %s (FIXME)\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d regels zijn %s\n" + + #: src/main.c:1807 +Index: enscript/po/pt_BR.po +=================================================================== +--- enscript.orig/po/pt_BR.po 2006-10-08 00:26:49.423999920 +0200 ++++ enscript/po/pt_BR.po 2006-10-08 00:27:45.658450984 +0200 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: GNU enscript 1.6.2\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 2000-11-01 14:00+0300\n" + "Last-Translator: Cyro Mendes De Moraes Neto \n" + "Language-Team: Brazilian Portuguese \n" +@@ -351,8 +351,8 @@ msgid " left in %s\n" + msgstr " esquerda em %s\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d linhas onde %s\n" + + #: src/main.c:1807 +Index: enscript/po/ru.po +=================================================================== +--- enscript.orig/po/ru.po 2006-10-08 00:26:49.462993992 +0200 ++++ enscript/po/ru.po 2006-10-08 00:27:45.783431984 +0200 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: enscript 1.6.2\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 1999-04-07 07:30+04:00\n" + "Last-Translator: Oleg S. Tihonov \n" + "Language-Team: Russian \n" +@@ -353,8 +353,8 @@ msgid " left in %s\n" + msgstr " ÚÁÐÉÓÁÎÏ × %s\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d ÓÔÒÏË ÂÙÌÉ %s\n" + + #: src/main.c:1807 +Index: enscript/po/sl.po +=================================================================== +--- enscript.orig/po/sl.po 2006-10-08 00:26:49.501988064 +0200 ++++ enscript/po/sl.po 2006-10-08 00:27:45.907413136 +0200 +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: enscript 1.4.0\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 1996-09-09 22:47 METDST\n" + "Last-Translator: Primoz Peterlin \n" + "Language-Team: Slovenian \n" +@@ -352,8 +352,8 @@ msgid " left in %s\n" + msgstr " ostalo na %s\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d vrstic je bilo %s\n" + + #: src/main.c:1807 +Index: enscript/po/sv.po +=================================================================== +--- enscript.orig/po/sv.po 2006-10-08 00:26:49.541981984 +0200 ++++ enscript/po/sv.po 2006-10-08 00:27:46.038393224 +0200 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: enscript 1.6.3\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 2002-12-15 22:01+0100\n" + "Last-Translator: Martin Sjögren \n" + "Language-Team: Swedish \n" +@@ -351,8 +351,8 @@ msgid " left in %s\n" + msgstr " lämnad i %s\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d rader blev %s\n" + + #: src/main.c:1807 +Index: enscript/po/tr.po +=================================================================== +--- enscript.orig/po/tr.po 2006-10-08 00:26:49.581975904 +0200 ++++ enscript/po/tr.po 2006-10-08 00:27:46.232363736 +0200 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: enscript 1.6.3\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-22 16:58+0200\n" ++"POT-Creation-Date: 2006-10-08 00:27+0200\n" + "PO-Revision-Date: 2002-11-19 15:00+0200\n" + "Last-Translator: Deniz Akkus Kanca \n" + "Language-Team: Turkish \n" +@@ -351,8 +351,8 @@ msgid " left in %s\n" + msgstr " %s'de bırakıldı\n" + + #: src/main.c:1805 +-#, c-format +-msgid "%d lines were %s\n" ++#, fuzzy, c-format ++msgid "%d line(s) were %s\n" + msgstr "%d satır %s\n" + + #: src/main.c:1807 --- enscript-1.6.4.orig/debian/patches/12_CAN-2004-1186 +++ enscript-1.6.4/debian/patches/12_CAN-2004-1186 @@ -0,0 +1,18 @@ +## 12_CAN-2004-1186.dpatch by Michael Fedrowitz +## DP: Fixed buffer overflows. [CAN-2004-1186] +## DP: Patch provided by the Debian Security Team. +diff -urNad enscript-1.6.4/src/psgen.c /tmp/dpep.YoKxRY/enscript-1.6.4/src/psgen.c +--- enscript-1.6.4/src/psgen.c 2005-01-20 19:59:18.000000000 +0100 ++++ /tmp/dpep.YoKxRY/enscript-1.6.4/src/psgen.c 2005-01-20 19:59:30.000000000 +0100 +@@ -2034,8 +2034,9 @@ + else + { + ftail++; +- strncpy (buf, fname, ftail - fname); +- buf[ftail - fname] = '\0'; ++ i = ftail - fname >= sizeof (buf)-1 ? sizeof (buf)-1 : ftail - fname; ++ strncpy (buf, fname, i); ++ buf[i] = '\0'; + } + + if (nup > 1) --- enscript-1.6.4.orig/debian/patches/series +++ enscript-1.6.4/debian/patches/series @@ -0,0 +1,25 @@ +fix-duplicate-intl-in-makefile +01_libpaper +02_i18n +03_misc +04_highlighting +339938-hilight-wrapped-function-list +05_manpages +06_debian +07_media +08_flex +09_appendctrld +10_CAN-2004-1184 +11_CAN-2004-1185 +12_CAN-2004-1186 +344750-no-gecos +276219-grammar-fix +13_de_correction +147116-ruby-hilight +393791-sliceprint +264097-multi-line-preprocessor-highlighting +443182-fix-idl-highlighting +373649-fix-shell-quote-highlighting +331298-javascript-regex-highlighting +397537-fix-toc-double-free +506261-buffer-overflows --- enscript-1.6.4.orig/debian/patches/07_media +++ enscript-1.6.4/debian/patches/07_media @@ -0,0 +1,36 @@ +## 07_media.dpatch by Michael Fedrowitz +## DP: new media definitions taken from CUPS +diff -urNad /home/michael/debian/enscript-1.6.4/lib/enscript.cfg.in enscript-1.6.4/lib/enscript.cfg.in +--- /home/michael/debian/enscript-1.6.4/lib/enscript.cfg.in 2003-11-08 21:06:42.000000000 +0100 ++++ enscript-1.6.4/lib/enscript.cfg.in 2003-11-08 21:06:43.000000000 +0100 +@@ -86,15 +86,23 @@ + + # Media definitions: + # name width height llx lly urx ury +-Media: A3 842 1190 24 24 818 1166 +-Media: A4 595 842 24 24 571 818 +-Media: A5 420 595 24 24 396 571 +-Media: Legal 612 1008 24 24 588 984 +-Media: Letter 612 792 38 24 574 768 ++Media: Letter 612 792 18 36 594 756 ++Media: Legal 612 1008 18 36 594 972 ++Media: Executive 522 756 18 36 504 684 ++Media: Tabloid 792 1224 18 36 774 1188 ++Media: A3 842 1191 18 36 824 1155 ++Media: A4 595 842 18 36 577 806 ++Media: A5 421 595 18 36 403 559 ++Media: B5 516 729 18 36 498 693 ++Media: EnvISOB5 499 709 18 36 463 673 ++Media: Env10 297 684 18 36 279 648 ++Media: EnvC5 459 649 18 36 441 613 ++Media: EnvDL 312 624 18 36 294 588 ++Media: EnvMonarch 279 540 18 36 261 504 + + # HP DeskJet media (DeskJet can't print on the bottom 1/2" of the paper). +-Media: A4dj 595 842 24 50 571 818 +-Media: Letterdj 612 792 24 40 588 768 ++Media: A4dj 595 842 18 50 577 806 ++Media: Letterdj 612 792 18 40 594 756 + + # Spooler option to suppress the job header. + NoJobHeaderSwitch: -h --- enscript-1.6.4.orig/debian/patches/339938-hilight-wrapped-function-list +++ enscript-1.6.4/debian/patches/339938-hilight-wrapped-function-list @@ -0,0 +1,31 @@ +Index: enscript/states/hl/changelog.st +=================================================================== +--- enscript.orig/states/hl/changelog.st 2006-10-07 22:08:46.964125208 +0200 ++++ enscript/states/hl/changelog.st 2006-09-22 18:15:34.000000000 +0200 +@@ -26,7 +26,7 @@ state changelog extends HighlightEntry + } + + /* File descriptions with function names. */ +- /(^\t\* )([^\(]+)(\()([^\)]+)(\):)/ { ++ /(^\t\* )([^\(\n]+)(\()([^\)\n]+)(\)[:\n])/ { + language_print ($1); + + function_name_face (true); +@@ -43,7 +43,7 @@ state changelog extends HighlightEntry + } + + /* File descriptions without function names. */ +- /(^\t\* )([^:]+)(:)/ { ++ /(^\t\* )([^:\n\(]+)([:\n])/ { + language_print ($1); + + function_name_face (true); +@@ -54,7 +54,7 @@ state changelog extends HighlightEntry + } + + /* Function name descriptions without file names. */ +- /(^\t\()([^\)]+)(\):)/ { ++ /(^\t\()([^\)\n]+)(\)[:\n])/ { + language_print ($1); + + keyword_face (true); --- enscript-1.6.4.orig/debian/patches/264097-multi-line-preprocessor-highlighting +++ enscript-1.6.4/debian/patches/264097-multi-line-preprocessor-highlighting @@ -0,0 +1,95 @@ +Add support for highlighting of multi-line C preprocessor statements. + -- Tim Retout Thu, 25 Oct 2007 22:12:33 +0100 + +diff --git a/states/hl/c_ppline.st b/states/hl/c_ppline.st +index 2bde859..b3fcf40 100644 +--- a/states/hl/c_ppline.st ++++ b/states/hl/c_ppline.st +@@ -12,7 +12,7 @@ state c_ppline extends CHighlight + /\/\*/ { + comment_face (true); + language_print ($0); +- call (c_comment); ++ call (c_ppline_comment); + comment_face (false); + } + /* Include line. */ +@@ -51,6 +51,9 @@ state c_ppline extends CHighlight + call (c_ppline_tokensequence); + return; + } ++ /\\\\\n/ { ++ language_print ($0); ++ } + /\n/ { + language_print ($0); + return; +@@ -81,6 +84,9 @@ state c_ppline_include extends CHighlight + call (c_ppline_comments_strings_chars); + return; + } ++ /\\\\\n/ { ++ language_print ($0); ++ } + /\n/ { + language_print ($0); + return; +@@ -106,6 +112,9 @@ state c_ppline_define extends CHighlight + call (c_ppline_comments_strings_chars); + return; + } ++ /\\\\\n/ { ++ language_print ($0); ++ } + /\n/ { + language_print ($0); + return; +@@ -118,7 +127,7 @@ state c_ppline_comments_strings_chars extends CHighlight + /\/\*/ { + comment_face (true); + language_print ($0); +- call (c_comment); ++ call (c_ppline_comment); + comment_face (false); + } + /* String constants. */ +@@ -134,6 +143,9 @@ state c_ppline_comments_strings_chars extends CHighlight + language_print ($0); + string_face (false); + } ++ /\\\\\n/ { ++ language_print ($0); ++ } + /\n/ { + language_print ($0); + return; +@@ -146,7 +158,7 @@ state c_ppline_tokensequence extends CHighlight + /\/\*/ { + comment_face (true); + language_print ($0); +- call (c_comment); ++ call (c_ppline_comment); + comment_face (false); + } + /* String constants. */ +@@ -181,6 +193,20 @@ state c_ppline_tokensequence extends CHighlight + language_print ($0); + variable_name_face (false); + } ++ /\\\\\n/ { ++ language_print ($0); ++ } ++ /\n/ { ++ language_print ($0); ++ return; ++ } ++} ++ ++/* Comments within pre-processor directives need escaped newlines. */ ++state c_ppline_comment extends c_comment { ++ /\\\\\n/ { ++ language_print ($0); ++ } + /\n/ { + language_print ($0); + return; --- enscript-1.6.4.orig/debian/patches/01_libpaper +++ enscript-1.6.4/debian/patches/01_libpaper @@ -0,0 +1,73 @@ +## 01_libpaper.dpatch by Michael Fedrowitz +## DP: libpaper support +diff -urNad enscript-1.6.4/docs/enscript.man /tmp/dpep.dF8HQA/enscript-1.6.4/docs/enscript.man +--- enscript-1.6.4/docs/enscript.man 2003-03-05 08:26:17.000000000 +0100 ++++ /tmp/dpep.dF8HQA/enscript-1.6.4/docs/enscript.man 2005-02-13 20:57:46.000000000 +0100 +@@ -296,7 +296,7 @@ + .TP 8 + .B \-M \f2name\f3, \-\-media=\f2name\f3 + Select an output media \f2name\f1. \f3Enscript\f1's default output +-media is \f3@media@\f1. ++media is determined from libpaper and falls back to \f3@media@\f1. + .TP 8 + .B \-n \f2num\f3, \-\-copies=\f2num\f3 + Print \f2num\f1 copies of each page. +diff -urNad enscript-1.6.4/lib/enscript.cfg.in /tmp/dpep.dF8HQA/enscript-1.6.4/lib/enscript.cfg.in +--- enscript-1.6.4/lib/enscript.cfg.in 2003-03-05 08:26:29.000000000 +0100 ++++ /tmp/dpep.dF8HQA/enscript-1.6.4/lib/enscript.cfg.in 2005-02-13 20:57:46.000000000 +0100 +@@ -48,7 +48,7 @@ + DefaultFancyHeader: enscript + + # Default output media. +-DefaultMedia: @media@ ++# DefaultMedia: @media@ + + # Where output goes as a default: `printer' or `stdout' + DefaultOutputMethod: printer +diff -urNad enscript-1.6.4/src/main.c /tmp/dpep.dF8HQA/enscript-1.6.4/src/main.c +--- enscript-1.6.4/src/main.c 2003-03-05 08:36:32.000000000 +0100 ++++ /tmp/dpep.dF8HQA/enscript-1.6.4/src/main.c 2005-02-13 20:58:19.000000000 +0100 +@@ -24,6 +24,8 @@ + * Boston, MA 02111-1307, USA. + */ + ++#include ++ + #include "gsint.h" + #include "getopt.h" + +@@ -1054,6 +1056,13 @@ + statusdict = strhash_init (); + user_strings = strhash_init (); + ++ /* ++ * Set media (libpaper) before reading config-files ++ */ ++ media_name = (char *) systempapername(); ++ if (media_name == NULL) ++ media_name = (char *) defaultpapername(); ++ media_name = xstrdup (media_name); + + /* + * Read configuration files. +@@ -1238,7 +1247,7 @@ + + /* Output media. */ + for (mentry = media_names; mentry; mentry = mentry->next) +- if (strcmp (media_name, mentry->name) == 0) ++ if (strcasecmp (media_name, mentry->name) == 0) + { + media = mentry; + break; +diff -urNad enscript-1.6.4/src/Makefile.in /tmp/dpep.dF8HQA/enscript-1.6.4/src/Makefile.in +--- enscript-1.6.4/src/Makefile.in 2003-03-05 08:40:07.000000000 +0100 ++++ /tmp/dpep.dF8HQA/enscript-1.6.4/src/Makefile.in 2005-02-13 20:57:46.000000000 +0100 +@@ -187,7 +187,7 @@ + + mkafmmap_SOURCES = mkafmmap.c + +-LDADD = ../afmlib/libafm.a @LIBINTL@ ../compat/libcompat.a -lm ++LDADD = ../afmlib/libafm.a @LIBINTL@ ../compat/libcompat.a -lpaper -lm + enscript_DEPENDENCIES = ../afmlib/libafm.a ../compat/libcompat.a + mkafmmap_DEPENDENCIES = ../afmlib/libafm.a ../compat/libcompat.a + --- enscript-1.6.4.orig/debian/patches/10_CAN-2004-1184 +++ enscript-1.6.4/debian/patches/10_CAN-2004-1184 @@ -0,0 +1,142 @@ +## 10_CAN-2004-1184.dpatch by Michael Fedrowitz +## DP: Corrected handling of user supplied input (filename, title) when +## DP: executing shell commands. [CAN-2004-1184]. +## DP: Patch provided by the Debian Security Team. +diff -urNad enscript-1.6.4/src/gsint.h /tmp/dpep.wZw2uJ/enscript-1.6.4/src/gsint.h +--- enscript-1.6.4/src/gsint.h 2003-03-05 08:37:06.000000000 +0100 ++++ /tmp/dpep.wZw2uJ/enscript-1.6.4/src/gsint.h 2005-01-20 19:54:57.000000000 +0100 +@@ -701,4 +701,9 @@ + */ + void printer_close ___P ((void *context)); + ++/* ++ * Escape filenames for shell usage ++ */ ++char *shell_escape ___P ((const char *fn)); ++ + #endif /* not GSINT_H */ +diff -urNad enscript-1.6.4/src/main.c /tmp/dpep.wZw2uJ/enscript-1.6.4/src/main.c +--- enscript-1.6.4/src/main.c 2005-01-20 19:54:40.000000000 +0100 ++++ /tmp/dpep.wZw2uJ/enscript-1.6.4/src/main.c 2005-01-20 19:54:57.000000000 +0100 +@@ -1556,9 +1556,13 @@ + buffer_append (&cmd, intbuf); + buffer_append (&cmd, " "); + +- buffer_append (&cmd, "-Ddocument_title=\""); +- buffer_append (&cmd, title); +- buffer_append (&cmd, "\" "); ++ buffer_append (&cmd, "-Ddocument_title=\'"); ++ if ((cp = shell_escape (title)) != NULL) ++ { ++ buffer_append (&cmd, cp); ++ free (cp); ++ } ++ buffer_append (&cmd, "\' "); + + buffer_append (&cmd, "-Dtoc="); + buffer_append (&cmd, toc ? "1" : "0"); +@@ -1575,8 +1579,14 @@ + /* Append input files. */ + for (i = optind; i < argc; i++) + { +- buffer_append (&cmd, " "); +- buffer_append (&cmd, argv[i]); ++ char *cp; ++ if ((cp = shell_escape (argv[i])) != NULL) ++ { ++ buffer_append (&cmd, " \'"); ++ buffer_append (&cmd, cp); ++ buffer_append (&cmd, "\'"); ++ free (cp); ++ } + } + + /* And do the job. */ +@@ -1637,7 +1647,7 @@ + buffer_ptr (opts), buffer_len (opts)); + } + +- buffer_append (&buffer, " \"%s\""); ++ buffer_append (&buffer, " \'%s\'"); + + input_filter = buffer_copy (&buffer); + input_filter_stdin = "-"; +diff -urNad enscript-1.6.4/src/util.c /tmp/dpep.wZw2uJ/enscript-1.6.4/src/util.c +--- enscript-1.6.4/src/util.c 2003-03-05 08:26:32.000000000 +0100 ++++ /tmp/dpep.wZw2uJ/enscript-1.6.4/src/util.c 2005-01-20 19:54:57.000000000 +0100 +@@ -1239,6 +1239,8 @@ + + /* Create result. */ + cp = xmalloc (len + 1); ++ if (cp == NULL) ++ return NULL; + for (i = 0, j = 0; string[i]; i++) + switch (string[i]) + { +@@ -1879,6 +1881,7 @@ + char *cmd = NULL; + int cmdlen; + int i, pos; ++ char *cp; + + is->is_pipe = 1; + +@@ -1902,12 +1905,16 @@ + { + case 's': + /* Expand cmd-buffer. */ +- cmdlen += strlen (fname); +- cmd = xrealloc (cmd, cmdlen); ++ if ((cp = shell_escape (fname)) != NULL) ++ { ++ cmdlen += strlen (cp); ++ cmd = xrealloc (cmd, cmdlen); + +- /* Paste filename. */ +- strcpy (cmd + pos, fname); +- pos += strlen (fname); ++ /* Paste filename. */ ++ strcpy (cmd + pos, cp); ++ pos += strlen (cp); ++ free (cp); ++ } + + i++; + break; +@@ -2116,3 +2123,36 @@ + { + return buffer->len; + } ++ ++/* ++ * Escapes the name of a file so that the shell groks it in 'single' ++ * quotation marks. The resulting pointer has to be free()ed when not ++ * longer used. ++*/ ++char * ++shell_escape(const char *fn) ++{ ++ size_t len = 0; ++ const char *inp; ++ char *retval, *outp; ++ ++ for(inp = fn; *inp; ++inp) ++ switch(*inp) ++ { ++ case '\'': len += 4; break; ++ default: len += 1; break; ++ } ++ ++ outp = retval = malloc(len + 1); ++ if(!outp) ++ return NULL; /* perhaps one should do better error handling here */ ++ for(inp = fn; *inp; ++inp) ++ switch(*inp) ++ { ++ case '\'': *outp++ = '\''; *outp++ = '\\'; *outp++ = '\'', *outp++ = '\''; break; ++ default: *outp++ = *inp; break; ++ } ++ *outp = 0; ++ ++ return retval; ++} --- enscript-1.6.4.orig/debian/patches/506261-buffer-overflows +++ enscript-1.6.4/debian/patches/506261-buffer-overflows @@ -0,0 +1,96 @@ +Patch by Werner Fink to address CVE-2008-3863, CVE-2008-4306. +See Debian bug #506261. + +Index: enscript-1.6.4/src/psgen.c +=================================================================== +--- enscript-1.6.4.orig/src/psgen.c 2008-11-19 22:49:31.000000000 +0000 ++++ enscript-1.6.4/src/psgen.c 2008-11-19 22:49:36.000000000 +0000 +@@ -24,6 +24,7 @@ + * Boston, MA 02111-1307, USA. + */ + ++#include + #include "gsint.h" + + /* +@@ -124,7 +125,7 @@ + double xscale; + double yscale; + int llx, lly, urx, ury; /* Bounding box. */ +- char filename[512]; ++ char filename[PATH_MAX]; + char *skipbuf; + unsigned int skipbuf_len; + unsigned int skipbuf_pos; +@@ -135,11 +136,11 @@ + Color bgcolor; + struct + { +- char name[512]; ++ char name[PATH_MAX]; + FontPoint size; + InputEncoding encoding; + } font; +- char filename[512]; ++ char filename[PATH_MAX]; + } u; + }; + +@@ -248,7 +249,7 @@ + static int user_fontp = 0; + + /* The user ^@font{}-defined font. */ +-static char user_font_name[256]; ++static char user_font_name[PATH_MAX]; + static FontPoint user_font_pt; + static InputEncoding user_font_encoding; + +@@ -978,7 +979,8 @@ + FATAL ((stderr, + _("user font encoding can be only the system's default or `ps'"))); + +- strcpy (user_font_name, token.u.font.name); ++ memset (user_font_name, 0, sizeof(user_font_name)); ++ strncpy (user_font_name, token.u.font.name, sizeof(user_font_name) - 1); + user_font_pt.w = token.u.font.size.w; + user_font_pt.h = token.u.font.size.h; + user_font_encoding = token.u.font.encoding; +@@ -1444,7 +1446,7 @@ + buf[i] = ch; + if (i + 1 >= sizeof (buf)) + FATAL ((stderr, _("too long argument for %s escape:\n%.*s"), +- escapes[i].name, i, buf)); ++ escapes[e].name, i, buf)); + } + buf[i] = '\0'; + +@@ -1452,7 +1454,8 @@ + switch (escapes[e].escape) + { + case ESC_FONT: +- strcpy (token->u.font.name, buf); ++ memset (token->u.font.name, 0, sizeof(token->u.font.name)); ++ strncpy (token->u.font.name, buf, sizeof(token->u.font.name) - 1); + + /* Check for the default font. */ + if (strcmp (token->u.font.name, "default") == 0) +@@ -1465,7 +1468,8 @@ + FATAL ((stderr, _("malformed font spec for ^@font escape: %s"), + token->u.font.name)); + +- strcpy (token->u.font.name, cp); ++ memset (token->u.font.name, 0, sizeof(token->u.font.name)); ++ strncpy (token->u.font.name, cp, sizeof(token->u.font.name) - 1); + xfree (cp); + } + token->type = tFONT; +@@ -1544,7 +1548,8 @@ + break; + + case ESC_SETFILENAME: +- strcpy (token->u.filename, buf); ++ memset (token->u.filename, 0, sizeof(token->u.font.name)); ++ strncpy (token->u.filename, buf, sizeof(token->u.filename) - 1); + token->type = tSETFILENAME; + break; + --- enscript-1.6.4.orig/debian/patches/02_i18n +++ enscript-1.6.4/debian/patches/02_i18n @@ -0,0 +1,64 @@ +## 02_i18n.dpatch by Michael Fedrowitz +## DP: i18n fixes +diff -urNad /home/michael/debian/enscript-1.6.4/lib/enscript-color.hdr enscript-1.6.4/lib/enscript-color.hdr +--- /home/michael/debian/enscript-1.6.4/lib/enscript-color.hdr 2003-03-05 08:26:29.000000000 +0100 ++++ enscript-1.6.4/lib/enscript-color.hdr 2003-11-08 21:01:49.000000000 +0100 +@@ -27,8 +27,8 @@ + + % -- code follows this line -- + %%DocumentNeededResources: font Times-Bold Times-Roman +-%Format: moddatestr $W +-%Format: modtimestr $C ++%Format: moddatestr $D{%x} ++%Format: modtimestr $D{%X} + %Format: pagenumstr $% + %Format: pagecountstr /$= + +diff -urNad /home/michael/debian/enscript-1.6.4/lib/enscript.hdr enscript-1.6.4/lib/enscript.hdr +--- /home/michael/debian/enscript-1.6.4/lib/enscript.hdr 2003-03-05 08:26:29.000000000 +0100 ++++ enscript-1.6.4/lib/enscript.hdr 2003-11-08 21:01:49.000000000 +0100 +@@ -25,8 +25,8 @@ + + % -- code follows this line -- + %%DocumentNeededResources: font Times-Bold Times-Roman +-%Format: moddatestr $W +-%Format: modtimestr $C ++%Format: moddatestr $D{%x} ++%Format: modtimestr $D{%X} + %Format: pagenumstr $% + + % Fonts. +diff -urNad /home/michael/debian/enscript-1.6.4/src/main.c enscript-1.6.4/src/main.c +--- /home/michael/debian/enscript-1.6.4/src/main.c 2003-11-08 21:01:48.000000000 +0100 ++++ enscript-1.6.4/src/main.c 2003-11-08 21:01:49.000000000 +0100 +@@ -975,6 +975,8 @@ + */ + #if HAVE_LC_MESSAGES + setlocale (LC_MESSAGES, ""); ++ setlocale (LC_CTYPE, ""); ++ setlocale (LC_TIME, ""); + #endif + #endif + #if ENABLE_NLS +diff -urNad /home/michael/debian/enscript-1.6.4/src/mkafmmap.c enscript-1.6.4/src/mkafmmap.c +--- /home/michael/debian/enscript-1.6.4/src/mkafmmap.c 2003-03-05 08:26:32.000000000 +0100 ++++ enscript-1.6.4/src/mkafmmap.c 2003-11-08 21:01:49.000000000 +0100 +@@ -126,6 +126,7 @@ + #if HAVE_SETLOCALE + #if HAVE_LC_MESSAGES + setlocale (LC_MESSAGES, ""); ++ setlocale (LC_CTYPE, ""); + #endif + #endif + #if ENABLE_NLS +diff -urNad /home/michael/debian/enscript-1.6.4/states/main.c enscript-1.6.4/states/main.c +--- /home/michael/debian/enscript-1.6.4/states/main.c 2003-03-05 08:38:35.000000000 +0100 ++++ enscript-1.6.4/states/main.c 2003-11-08 21:01:49.000000000 +0100 +@@ -202,6 +202,7 @@ + #if HAVE_SETLOCALE + #if HAVE_LC_MESSAGES + setlocale (LC_MESSAGES, ""); ++ setlocale (LC_CTYPE, ""); + #endif + #endif + #if ENABLE_NLS --- enscript-1.6.4.orig/debian/patches/344750-no-gecos +++ enscript-1.6.4/debian/patches/344750-no-gecos @@ -0,0 +1,13 @@ +Index: enscript/src/psgen.c +=================================================================== +--- enscript.orig/src/psgen.c 2006-10-07 23:12:05.733624464 +0200 ++++ enscript/src/psgen.c 2006-10-07 23:13:35.103038248 +0200 +@@ -294,7 +294,7 @@ dump_ps_header () + OUTPUT ((cofp, "%%%%BoundingBox: %d %d %d %d\n", media->llx, media->lly, + media->urx, media->ury)); + OUTPUT ((cofp, "%%%%Title: %s\n", title)); +- OUTPUT ((cofp, "%%%%For: %s\n", passwd->pw_gecos)); ++ /* OUTPUT ((cofp, "%%%%For: %s\n", passwd->pw_gecos)); */ + OUTPUT ((cofp, "%%%%Creator: %s\n", version_string)); + OUTPUT ((cofp, "%%%%CreationDate: %s\n", date_string)); + OUTPUT ((cofp, "%%%%Orientation: %s\n", --- enscript-1.6.4.orig/debian/patches/147116-ruby-hilight +++ enscript-1.6.4/debian/patches/147116-ruby-hilight @@ -0,0 +1,223 @@ +Index: enscript/states/hl/Makefile.in +=================================================================== +--- enscript.orig/states/hl/Makefile.in 2006-10-08 00:08:32.351780248 +0200 ++++ enscript/states/hl/Makefile.in 2006-10-08 00:11:27.060220528 +0200 +@@ -189,7 +189,7 @@ matlab.st nroff.st objc.st outline.st pa + postscript.st python.st pyrex.st rfc.st scheme.st sh.st skill.st \ + sql.st states.st synopsys.st tcl.st tcsh.st tex.st vba.st verilog.st \ + vhdl.st vrml.st wmlscript.st zsh.st eiffel.st erlang.st dylan.st oz.st \ +-lua.st oberon2.st icon.st smalltalk.st forth.st sml.st ++lua.st oberon2.st icon.st smalltalk.st forth.st sml.st ruby.st + + + states = $(misc) $(styles) $(languages) $(highlightings) +Index: enscript/states/hl/ruby.st +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ enscript/states/hl/ruby.st 2006-10-08 00:06:55.340528200 +0200 +@@ -0,0 +1,205 @@ ++/** ++ * Name: ruby ++ * Description: Ruby programming language. ++ * Author: Mike Wilson ++ */ ++ ++state ruby_comment ++{ ++ /\*\\\// { ++ language_print ($0); ++ return; ++ } ++ LANGUAGE_SPECIALS { ++ language_print ($0); ++ } ++} ++ ++state ruby_dquot_string ++{ ++ /\\\\./ { ++ language_print ($0); ++ } ++ /\"/ { ++ language_print ($0); ++ return; ++ } ++ LANGUAGE_SPECIALS { ++ language_print ($0); ++ } ++} ++ ++state ruby_quot_string ++{ ++ /\\\\./ { ++ language_print ($0); ++ } ++ /[\']/ { ++ language_print ($0); ++ return; ++ } ++ LANGUAGE_SPECIALS { ++ language_print ($0); ++ } ++} ++ ++state ruby_bquot_string ++{ ++ /\\\\./ { ++ language_print ($0); ++ } ++ /`/ { ++ language_print ($0); ++ return; ++ } ++ LANGUAGE_SPECIALS { ++ language_print ($0); ++ } ++} ++ ++state ruby ++{ ++ BEGIN { ++ header (); ++ } ++ END { ++ trailer (); ++ } ++ ++ /* Comments. */ ++ /#[^{].*$/ { ++ comment_face (true); ++ language_print ($0); ++ comment_face (false); ++ } ++ ++ /* Ignore escaped quote marks */ ++ /\\\"/ { ++ language_print ($0); ++ } ++ /\\\'/ { ++ language_print ($0); ++ } ++ /\\\`/ { ++ language_print ($0); ++ } ++ ++ /* In cgi files, JavaScript might be imbedded, so we need to look out ++ * for the JavaScript comments, because they might contain something ++ * we don't like, like a contraction (don't, won't, etc.) ++ * We won't put them in comment face, because they are not ruby ++ * comments. ++ */ ++ /\/\// { ++ language_print ($0); ++ call (eat_one_line); ++ } ++ ++ /* String constants. */ ++ /\"/ { ++ string_face (true); ++ language_print ($0); ++ call (ruby_dquot_string); ++ string_face (false); ++ } ++ /[\']/ { ++ string_face (true); ++ language_print ($0); ++ call (ruby_quot_string); ++ string_face (false); ++ } ++ ++ /* Backquoted command string */ ++ /`/ { ++ string_face (true); ++ language_print ($0); ++ call (ruby_bquot_string); ++ string_face (false); ++ } ++ ++ /* Variables globals and instance */ ++ /[$@]\w+/ { ++ variable_name_face (true); ++ language_print ($0); ++ variable_name_face (false); ++ } ++ ++ /* Variables class variable */ ++ /@@\w+/ { ++ variable_name_face (true); ++ language_print ($0); ++ variable_name_face (false); ++ } ++ ++ /([ \t]*)(def)([ \t]+)([^(]*)/ { ++ /* indentation */ ++ language_print ($1); ++ ++ /* def */ ++ keyword_face (true); ++ language_print ($2); ++ keyword_face (false); ++ ++ /* middle */ ++ language_print ($3); ++ ++ /* Function name. */ ++ function_name_face (true); ++ language_print ($4); ++ function_name_face (false); ++ } ++ ++ /* Highlighting ++ --Type face ++ private protected public ++ ++ --Builtin face (I consider these to be somewhat special) ++ alias alias_method attr attr_accessor attr_reader attr_writer ++ module_alias module_function self super ++ ++ --Reference face ++ require include ++ ++ --Keyword face ++ and begin break case class def defined? do else elsif end ++ ensure eval extend false for if in method module next nil not ++ or redo rescue retry return then true undef unless until when ++ while yield ++ */ ++/\\b(private|protected|public)\\b/ { ++ type_face (true); ++ language_print ($0); ++ type_face (false); ++ } ++ ++/\\b(alias|alias_method|attr|attr_(accessor|reader|writer)\\ ++|module_(alias|function)|self|super)\\b/ { ++ builtin_face (true); ++ language_print ($0); ++ builtin_face (false); ++ } ++ ++/\\b(include|require)\\b/ { ++ reference_face (true); ++ language_print ($0); ++ reference_face (false); ++ } ++ ++/\\b(and|begin|break|case|class|def|defined?|do|else|elsif|end|ensure|eval\\ ++|extend|false|for|if|in|method|module|next|nil|not|or|raise|redo|rescue|retry\\ ++|return|then|true|undef|unless|until|when|while|yield)\\b/ { ++ keyword_face (true); ++ language_print ($0); ++ keyword_face (false); ++ } ++ ++ LANGUAGE_SPECIALS { ++ language_print ($0); ++ } ++ ++ /\$[!@&`'+~=\/\\,;.<>_*$?:"]/ { ++ variable_name_face (true); ++ language_print ($0); ++ variable_name_face (false); ++ } ++} --- enscript-1.6.4.orig/debian/patches/443182-fix-idl-highlighting +++ enscript-1.6.4/debian/patches/443182-fix-idl-highlighting @@ -0,0 +1,23 @@ +Fix unresolved implicit dependency of c_ppline.st state on c.st + +Patch by Ivan Chelubeev +Slightly amended by Tim Retout + +diff --git a/states/hl/c_ppline.st b/states/hl/c_ppline.st +index 2bde859..fec44d5 100644 +--- a/states/hl/c_ppline.st ++++ b/states/hl/c_ppline.st +@@ -3,11 +3,10 @@ + * Objective-C highlighting rules. + */ + ++require_state (c); ++ + state c_ppline extends CHighlight + { +- BEGIN { +- require_state (c); +- } + /* Comments within a pre-processor line. */ + /\/\*/ { + comment_face (true); --- enscript-1.6.4.orig/states/lex.c +++ enscript-1.6.4/states/lex.c @@ -1,31 +1,92 @@ -/* A lexical scanner generated by flex */ -/* Scanner skeleton version: - * $Header: /u/mtr/own/CVS/enscript/states/lex.c,v 1.1.1.1 2003/03/05 07:25:52 mtr Exp $ - */ +#line 3 "lex.c" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 33 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ #include +#include +#include +#include +/* end standard C headers. */ -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -#ifdef c_plusplus -#ifndef __cplusplus -#define __cplusplus -#endif +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 #endif +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ -#ifdef __cplusplus +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif -#include -#include +#endif /* ! FLEXINT_H */ -/* Use prototypes in function declarations. */ -#define YY_USE_PROTOS +#ifdef __cplusplus /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST @@ -34,34 +95,17 @@ #if __STDC__ -#define YY_USE_PROTOS #define YY_USE_CONST #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include -#include -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else #define yyconst #endif - -#ifdef YY_USE_PROTOS -#define YY_PROTO(proto) proto -#else -#define YY_PROTO(proto) () -#endif - /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -76,71 +120,75 @@ * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ -#define BEGIN yy_start = 1 + 2 * +#define BEGIN (yy_start) = 1 + 2 * /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ -#define YY_START ((yy_start - 1) / 2) +#define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) +#define YY_NEW_FILE yyrestart(yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ +#ifndef YY_BUF_SIZE #define YY_BUF_SIZE 16384 +#endif + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif extern int yyleng; + extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 -/* The funky do-while in the following #define is used to turn the definition - * int a single C statement (which needs a semi-colon terminator). This - * avoids problems with code like: - * - * if ( condition_holds ) - * yyless( 5 ); - * else - * do_something_else(); - * - * Prior to using the do-while the compiler would get upset at the - * "else" because it interpreted the "if" statement as being all - * done when it reached the ';' after the yyless() call. - */ - -/* Return all but the first 'n' matched characters back to the input stream. */ - + #define YY_LESS_LINENO(n) + +/* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ { \ /* Undo effects of setting up yytext. */ \ - *yy_cp = yy_hold_char; \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = (yy_hold_char); \ YY_RESTORE_YY_MORE_OFFSET \ - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) -#define unput(c) yyunput( c, yytext_ptr ) +#define unput(c) yyunput( c, (yytext_ptr) ) /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want * flex-generated scanners to compile on their own). */ -typedef unsigned int yy_size_t; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef unsigned int yy_size_t; +#endif +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state { FILE *yy_input_file; @@ -177,12 +225,16 @@ */ int yy_at_bol; + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + /* Whether to try to fill the input buffer when we reach the * end of it. */ int yy_fill_buffer; int yy_buffer_status; + #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process @@ -196,28 +248,38 @@ * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ -static YY_BUFFER_STATE yy_current_buffer = 0; +/* Stack of input buffers. */ +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". + * + * Returns the top of the stack, or NULL. */ -#define YY_CURRENT_BUFFER yy_current_buffer +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ + : NULL) +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; - static int yy_n_chars; /* number of characters read into yy_ch_buf */ - - int yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; -static int yy_init = 1; /* whether we need to initialize */ +static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ /* Flag which is used to allow yywrap()'s to do buffer switches @@ -225,66 +287,92 @@ */ static int yy_did_buffer_switch_on_eof; -void yyrestart YY_PROTO(( FILE *input_file )); - -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); -void yy_load_buffer_state YY_PROTO(( void )); -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) - -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); - -static void *yy_flex_alloc YY_PROTO(( yy_size_t )); -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); -static void yy_flex_free YY_PROTO(( void * )); +void yyrestart (FILE *input_file ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); +void yy_delete_buffer (YY_BUFFER_STATE b ); +void yy_flush_buffer (YY_BUFFER_STATE b ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state (void ); + +static void yyensure_buffer_stack (void ); +static void yy_load_buffer_state (void ); +static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); + +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) + +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); + +void *yyalloc (yy_size_t ); +void *yyrealloc (void *,yy_size_t ); +void yyfree (void * ); #define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_is_interactive = is_interactive; \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } #define yy_set_bol(at_bol) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_at_bol = at_bol; \ + if ( ! YY_CURRENT_BUFFER ){\ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + +/* Begin user sect3 */ typedef unsigned char YY_CHAR; + FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; + typedef int yy_state_type; + +extern int yylineno; + +int yylineno = 1; + extern char *yytext; #define yytext_ptr yytext -static yy_state_type yy_get_previous_state YY_PROTO(( void )); -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); -static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); +static yy_state_type yy_get_previous_state (void ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); +static int yy_get_next_buffer (void ); +static void yy_fatal_error (yyconst char msg[] ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ - yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yy_hold_char = *yy_cp; \ + (yytext_ptr) = yy_bp; \ + yyleng = (size_t) (yy_cp - yy_bp); \ + (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ - yy_c_buf_p = yy_cp; + (yy_c_buf_p) = yy_cp; #define YY_NUM_RULES 39 #define YY_END_OF_BUFFER 40 -static yyconst short int yy_accept[114] = +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[114] = { 0, 0, 0, 40, 38, 2, 3, 38, 4, 38, 38, 38, 38, 38, 38, 38, 7, 36, 38, 38, 38, @@ -301,7 +389,7 @@ 37, 19, 0 } ; -static yyconst int yy_ec[256] = +static yyconst flex_int32_t yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, @@ -333,7 +421,7 @@ 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[46] = +static yyconst flex_int32_t yy_meta[46] = { 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 3, 3, 3, @@ -342,7 +430,7 @@ 3, 3, 3, 3, 1 } ; -static yyconst short int yy_base[118] = +static yyconst flex_int16_t yy_base[118] = { 0, 0, 0, 137, 138, 138, 138, 120, 138, 0, 128, 109, 117, 36, 42, 118, 122, 35, 114, 113, 112, @@ -359,7 +447,7 @@ 27, 0, 138, 64, 67, 60, 70 } ; -static yyconst short int yy_def[118] = +static yyconst flex_int16_t yy_def[118] = { 0, 113, 1, 113, 113, 113, 113, 113, 113, 114, 113, 115, 113, 113, 113, 113, 113, 113, 113, 113, 113, @@ -376,7 +464,7 @@ 116, 116, 0, 113, 113, 113, 113 } ; -static yyconst short int yy_nxt[184] = +static yyconst flex_int16_t yy_nxt[184] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 21, @@ -400,7 +488,7 @@ 113, 113, 113 } ; -static yyconst short int yy_chk[184] = +static yyconst flex_int16_t yy_chk[184] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -427,6 +515,9 @@ static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; +extern int yy_flex_debug; +int yy_flex_debug = 0; + /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. */ @@ -436,7 +527,6 @@ #define YY_RESTORE_YY_MORE_OFFSET char *yytext; #line 1 "lex.l" -#define INITIAL 0 #line 2 "lex.l" /* * Lexer for states. @@ -465,7 +555,7 @@ */ /* - * $Id: lex.c,v 1.1.1.1 2003/03/05 07:25:52 mtr Exp $ + * $Id: lex.l,v 1.1.1.1 2003/03/05 07:25:52 mtr Exp $ */ #include "defs.h" @@ -474,7 +564,23 @@ static void eat_comment (); static char *read_string ___P ((unsigned int *len_return)); static void read_regexp ___P ((Node *node)); -#line 478 "lex.yy.c" +#line 568 "lex.c" + +#define INITIAL 0 + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +static int yy_init_globals (void ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -482,65 +588,30 @@ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap YY_PROTO(( void )); +extern "C" int yywrap (void ); #else -extern int yywrap YY_PROTO(( void )); -#endif +extern int yywrap (void ); #endif - -#ifndef YY_NO_UNPUT -static void yyunput YY_PROTO(( int c, char *buf_ptr )); #endif + static void yyunput (int c,char *buf_ptr ); + #ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); +static void yy_flex_strncpy (char *,yyconst char *,int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen YY_PROTO(( yyconst char * )); +static int yy_flex_strlen (yyconst char * ); #endif #ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput YY_PROTO(( void )); -#else -static int input YY_PROTO(( void )); -#endif -#endif - -#if YY_STACK_USED -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -#ifndef YY_NO_PUSH_STATE -static void yy_push_state YY_PROTO(( int new_state )); -#endif -#ifndef YY_NO_POP_STATE -static void yy_pop_state YY_PROTO(( void )); -#endif -#ifndef YY_NO_TOP_STATE -static int yy_top_state YY_PROTO(( void )); -#endif +#ifdef __cplusplus +static int yyinput (void ); #else -#define YY_NO_PUSH_STATE 1 -#define YY_NO_POP_STATE 1 -#define YY_NO_TOP_STATE 1 +static int input (void ); #endif -#ifdef YY_MALLOC_DECL -YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif #endif /* Amount of stuff to slurp up with each read. */ @@ -549,7 +620,6 @@ #endif /* Copy whatever the last rule matched to the standard output. */ - #ifndef ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). @@ -562,9 +632,10 @@ */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( yy_current_buffer->yy_is_interactive ) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ - int c = '*', n; \ + int c = '*'; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -574,9 +645,22 @@ YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ - else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ - && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); + else \ + { \ + errno=0; \ + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(yyin); \ + } \ + }\ +\ + #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -597,12 +681,18 @@ #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) #endif +/* end tables serialization structures and prototypes */ + /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ #ifndef YY_DECL -#define YY_DECL int yylex YY_PROTO(( void )) -#endif +#define YY_DECL_IS_OURS 1 + +extern int yylex (void); + +#define YY_DECL int yylex (void) +#endif /* !YY_DECL */ /* Code executed at the beginning of each rule, after yytext and yyleng * have been set up. @@ -619,116 +709,388 @@ #define YY_RULE_SETUP \ YY_USER_ACTION +/** The main scanner function which does all the work. + */ YY_DECL - { +{ register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; - + #line 44 "lex.l" -#line 632 "lex.yy.c" - if ( yy_init ) - { - yy_init = 0; +void +eat_comment () +{ + int c; -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif + while ((c = input ()) != EOF) + { + if (c == '\n') + linenum++; + else if (c == '*') + { + c = input (); + if (c == '/') + /* All done. */ + return; - if ( ! yy_start ) - yy_start = 1; /* first start state */ + if (c == EOF) + { + yyerror (_("error: EOF in comment")); + break; + } + unput (c); + } + } + yyerror (_("error: EOF in comment")); +} - if ( ! yyin ) - yyin = stdin; +char * +read_string (len_return) + unsigned int *len_return; +{ + char *buf = NULL; + char *buf2; + int buflen = 0; + int bufpos = 0; + int ch; + int done = 0; - if ( ! yyout ) - yyout = stdout; + while (!done) + { + ch = input (); + if (ch == '\n') + linenum++; - if ( ! yy_current_buffer ) - yy_current_buffer = - yy_create_buffer( yyin, YY_BUF_SIZE ); + switch (ch) + { + case EOF: + unexpected_eof: + yyerror (_("error: EOF in string constant")); + done = 1; + break; - yy_load_buffer_state(); - } + case '"': + done = 1; + break; - while ( 1 ) /* loops until end-of-file is reached */ - { - yy_cp = yy_c_buf_p; + case '\\': + ch = input (); + switch (ch) + { + case 'n': + ch = '\n'; + break; - /* Support of yytext. */ - *yy_cp = yy_hold_char; + case 't': + ch = '\t'; + break; - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; + case 'v': + ch = '\v'; + break; - yy_current_state = yy_start; -yy_match: - do - { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; - if ( yy_accept[yy_current_state] ) - { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 114 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - ++yy_cp; - } - while ( yy_base[yy_current_state] != 138 ); + case 'b': + ch = '\b'; + break; -yy_find_action: - yy_act = yy_accept[yy_current_state]; - if ( yy_act == 0 ) - { /* have to back up */ - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; - yy_act = yy_accept[yy_current_state]; - } + case 'r': + ch = '\r'; + break; - YY_DO_BEFORE_ACTION; + case 'f': + ch = '\f'; + break; + case 'a': + ch = '\a'; + break; -do_action: /* This label is used only to access EOF actions. */ + case EOF: + goto unexpected_eof; + break; + default: + if (ch == '0') + { + int i; + int val = 0; - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yy_hold_char; - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; - goto yy_find_action; + for (i = 0; i < 3; i++) + { + ch = input (); + if ('0' <= ch && ch <= '7') + val = val * 8 + ch - '0'; + else + { + unput (ch); + break; + } + } + ch = val; + } + break; + } + /* FALLTHROUGH */ -case 1: -YY_RULE_SETUP -#line 46 "lex.l" -{ eat_comment (); } - YY_BREAK -case 2: -YY_RULE_SETUP -#line 47 "lex.l" -{ ; } + default: + if (bufpos >= buflen) + { + buflen += 1024; + buf = (char *) xrealloc (buf, buflen); + } + buf[bufpos++] = ch; + break; + } + } + + buf2 = (char *) xmalloc (bufpos + 1); + memcpy (buf2, buf, bufpos); + buf2[bufpos] = '\0'; + xfree (buf); + + *len_return = bufpos; + + return buf2; +} + + +void +read_regexp (node) + Node *node; +{ + char *buf = NULL; + char *buf2; + int buflen = 0; + int bufpos = 0; + int ch; + int done = 0; + + while (!done) + { + ch = input (); + switch (ch) + { + case EOF: + unexpected_eof: + yyerror (_("error: EOF in regular expression")); + done = 1; + break; + + case '/': + done = 1; + break; + + case '\\': + ch = input (); + switch (ch) + { + case '\n': + /* Line break. */ + linenum++; + continue; + break; + + case 'n': + ch = '\n'; + break; + + case 'r': + ch = '\r'; + break; + + case 'f': + ch = '\f'; + break; + + case 't': + ch = '\t'; + break; + + case '/': + case '\\': + /* Quote these. */ + break; + + case EOF: + goto unexpected_eof; + break; + + default: + if (ch == '0') + { + int i; + int val = 0; + + for (i = 0; i < 3; i++) + { + ch = input (); + if ('0' <= ch && ch <= '7') + val = val * 8 + ch - '0'; + else + { + unput (ch); + break; + } + } + ch = val; + } + else + { + /* Pass it through. */ + unput (ch); + ch = '\\'; + } + break; + } + /* FALLTHROUGH */ + + default: + if (bufpos >= buflen) + { + buflen += 1024; + buf = (char *) xrealloc (buf, buflen); + } + buf[bufpos++] = ch; + break; + } + } + + /* Possible options. */ + done = 0; + while (!done) + { + ch = input (); + switch (ch) + { + case 'i': + /* Case-insensitive regular expression. */ + node->u.re.flags |= fRE_CASE_INSENSITIVE; + break; + + default: + /* Unknown option => this belongs to the next token. */ + unput (ch); + done = 1; + break; + } + } + + buf2 = (char *) xmalloc (bufpos + 1); + memcpy (buf2, buf, bufpos); + buf2[bufpos] = '\0'; + xfree (buf); + + node->u.re.data = buf2; + node->u.re.len = bufpos; +} + + +#line 993 "lex.c" + + if ( !(yy_init) ) + { + (yy_init) = 1; + +#ifdef YY_USER_INIT + YY_USER_INIT; +#endif + + if ( ! (yy_start) ) + (yy_start) = 1; /* first start state */ + + if ( ! yyin ) + yyin = stdin; + + if ( ! yyout ) + yyout = stdout; + + if ( ! YY_CURRENT_BUFFER ) { + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ); + } + + yy_load_buffer_state( ); + } + + while ( 1 ) /* loops until end-of-file is reached */ + { + yy_cp = (yy_c_buf_p); + + /* Support of yytext. */ + *yy_cp = (yy_hold_char); + + /* yy_bp points to the position in yy_ch_buf of the start of + * the current run. + */ + yy_bp = yy_cp; + + yy_current_state = (yy_start); +yy_match: + do + { + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + if ( yy_accept[yy_current_state] ) + { + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 114 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + ++yy_cp; + } + while ( yy_base[yy_current_state] != 138 ); + +yy_find_action: + yy_act = yy_accept[yy_current_state]; + if ( yy_act == 0 ) + { /* have to back up */ + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + yy_act = yy_accept[yy_current_state]; + } + + YY_DO_BEFORE_ACTION; + +do_action: /* This label is used only to access EOF actions. */ + + switch ( yy_act ) + { /* beginning of action switch */ + case 0: /* must back up */ + /* undo the effects of YY_DO_BEFORE_ACTION */ + *yy_cp = (yy_hold_char); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + goto yy_find_action; + +case 1: +YY_RULE_SETUP +#line 315 "lex.l" +{ eat_comment (); } + YY_BREAK +case 2: +YY_RULE_SETUP +#line 316 "lex.l" +{ ; } YY_BREAK case 3: +/* rule 3 can match eol */ YY_RULE_SETUP -#line 48 "lex.l" +#line 317 "lex.l" { linenum++; } YY_BREAK case 4: YY_RULE_SETUP -#line 50 "lex.l" +#line 319 "lex.l" { yylval.node = node_alloc (nSTRING); yylval.node->u.str.data = read_string (&yylval.node->u.str.len); @@ -736,8 +1098,9 @@ } YY_BREAK case 5: +/* rule 5 can match eol */ YY_RULE_SETUP -#line 56 "lex.l" +#line 325 "lex.l" { yylval.node = node_alloc (nINTEGER); yylval.node->u.integer = yytext[1]; return tINTEGER; @@ -745,7 +1108,7 @@ YY_BREAK case 6: YY_RULE_SETUP -#line 61 "lex.l" +#line 330 "lex.l" { yylval.node = node_alloc (nINTEGER); switch (yytext[2]) { @@ -787,7 +1150,7 @@ YY_BREAK case 7: YY_RULE_SETUP -#line 100 "lex.l" +#line 369 "lex.l" { yylval.node = node_alloc (nREGEXP); read_regexp (yylval.node); return tREGEXP; @@ -795,142 +1158,142 @@ YY_BREAK case 8: YY_RULE_SETUP -#line 105 "lex.l" +#line 374 "lex.l" { return tBEGIN; } YY_BREAK case 9: YY_RULE_SETUP -#line 106 "lex.l" +#line 375 "lex.l" { return tEND; } YY_BREAK case 10: YY_RULE_SETUP -#line 107 "lex.l" +#line 376 "lex.l" { return tDIV; } YY_BREAK case 11: YY_RULE_SETUP -#line 108 "lex.l" +#line 377 "lex.l" { return tELSE; } YY_BREAK case 12: YY_RULE_SETUP -#line 109 "lex.l" +#line 378 "lex.l" { return tEXTENDS; } YY_BREAK case 13: YY_RULE_SETUP -#line 110 "lex.l" +#line 379 "lex.l" { return tFOR; } YY_BREAK case 14: YY_RULE_SETUP -#line 111 "lex.l" +#line 380 "lex.l" { return tIF; } YY_BREAK case 15: YY_RULE_SETUP -#line 112 "lex.l" +#line 381 "lex.l" { return tLOCAL; } YY_BREAK case 16: YY_RULE_SETUP -#line 113 "lex.l" +#line 382 "lex.l" { return tNAMERULES; } YY_BREAK case 17: YY_RULE_SETUP -#line 114 "lex.l" +#line 383 "lex.l" { return tRETURN; } YY_BREAK case 18: YY_RULE_SETUP -#line 115 "lex.l" +#line 384 "lex.l" { return tSTART; } YY_BREAK case 19: YY_RULE_SETUP -#line 116 "lex.l" +#line 385 "lex.l" { return tSTARTRULES; } YY_BREAK case 20: YY_RULE_SETUP -#line 117 "lex.l" +#line 386 "lex.l" { return tSTATE; } YY_BREAK case 21: YY_RULE_SETUP -#line 118 "lex.l" +#line 387 "lex.l" { return tSUB; } YY_BREAK case 22: YY_RULE_SETUP -#line 119 "lex.l" +#line 388 "lex.l" { return tWHILE; } YY_BREAK case 23: YY_RULE_SETUP -#line 121 "lex.l" +#line 390 "lex.l" { return tEQ; } YY_BREAK case 24: YY_RULE_SETUP -#line 122 "lex.l" +#line 391 "lex.l" { return tNE; } YY_BREAK case 25: YY_RULE_SETUP -#line 123 "lex.l" +#line 392 "lex.l" { return tLE; } YY_BREAK case 26: YY_RULE_SETUP -#line 124 "lex.l" +#line 393 "lex.l" { return tGE; } YY_BREAK case 27: YY_RULE_SETUP -#line 125 "lex.l" +#line 394 "lex.l" { return tAND; } YY_BREAK case 28: YY_RULE_SETUP -#line 126 "lex.l" +#line 395 "lex.l" { return tOR; } YY_BREAK case 29: YY_RULE_SETUP -#line 127 "lex.l" +#line 396 "lex.l" { return tPLUSPLUS; } YY_BREAK case 30: YY_RULE_SETUP -#line 128 "lex.l" +#line 397 "lex.l" { return tMINUSMINUS; } YY_BREAK case 31: YY_RULE_SETUP -#line 129 "lex.l" +#line 398 "lex.l" { return tADDASSIGN; } YY_BREAK case 32: YY_RULE_SETUP -#line 130 "lex.l" +#line 399 "lex.l" { return tSUBASSIGN; } YY_BREAK case 33: YY_RULE_SETUP -#line 131 "lex.l" +#line 400 "lex.l" { return tMULASSIGN; } YY_BREAK case 34: YY_RULE_SETUP -#line 132 "lex.l" +#line 401 "lex.l" { return tDIVASSIGN; } YY_BREAK case 35: YY_RULE_SETUP -#line 134 "lex.l" +#line 403 "lex.l" { yylval.node = node_alloc (nREAL); yylval.node->u.real = atof (yytext); return tREAL; @@ -938,7 +1301,7 @@ YY_BREAK case 36: YY_RULE_SETUP -#line 138 "lex.l" +#line 407 "lex.l" { yylval.node = node_alloc (nINTEGER); yylval.node->u.integer = atoi (yytext); return tINTEGER; @@ -946,7 +1309,7 @@ YY_BREAK case 37: YY_RULE_SETUP -#line 142 "lex.l" +#line 411 "lex.l" { yylval.node = node_alloc (nSYMBOL); yylval.node->u.sym = xstrdup (yytext); return tSYMBOL; @@ -954,41 +1317,41 @@ YY_BREAK case 38: YY_RULE_SETUP -#line 147 "lex.l" +#line 416 "lex.l" { return yytext[0]; } YY_BREAK case 39: YY_RULE_SETUP -#line 149 "lex.l" +#line 418 "lex.l" ECHO; YY_BREAK -#line 966 "lex.yy.c" +#line 1329 "lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); YY_RESTORE_YY_MORE_OFFSET - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) { /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called * yylex(). If so, then we have to assure - * consistency between yy_current_buffer and our + * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a * back-up) that will match for the new input source. */ - yy_n_chars = yy_current_buffer->yy_n_chars; - yy_current_buffer->yy_input_file = yyin; - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } /* Note that here we test for yy_c_buf_p "<=" to the position @@ -998,13 +1361,13 @@ * end-of-buffer state). Contrast this with the test * in input(). */ - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) { /* This was really a NUL. */ yy_state_type yy_next_state; - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); /* Okay, we're now positioned to make the NUL * transition. We couldn't have @@ -1017,30 +1380,30 @@ yy_next_state = yy_try_NUL_trans( yy_current_state ); - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_bp = (yytext_ptr) + YY_MORE_ADJ; if ( yy_next_state ) { /* Consume the NUL. */ - yy_cp = ++yy_c_buf_p; + yy_cp = ++(yy_c_buf_p); yy_current_state = yy_next_state; goto yy_match; } else { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); goto yy_find_action; } } - else switch ( yy_get_next_buffer() ) + else switch ( yy_get_next_buffer( ) ) { case EOB_ACT_END_OF_FILE: { - yy_did_buffer_switch_on_eof = 0; + (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap() ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1051,7 +1414,7 @@ * YY_NULL, it'll still work - another * YY_NULL will get returned. */ - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; yy_act = YY_STATE_EOF(YY_START); goto do_action; @@ -1059,30 +1422,30 @@ else { - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; } break; } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = - yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = + (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_match; case EOB_ACT_LAST_MATCH: - yy_c_buf_p = - &yy_current_buffer->yy_ch_buf[yy_n_chars]; + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_find_action; } break; @@ -1093,8 +1456,7 @@ "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of yylex */ - +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1103,21 +1465,20 @@ * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ - -static int yy_get_next_buffer() - { - register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr; +static int yy_get_next_buffer (void) +{ + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = (yytext_ptr); register int number_to_move, i; int ret_val; - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" ); - if ( yy_current_buffer->yy_fill_buffer == 0 ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) { /* We matched a single character, the EOB, so * treat this as a final EOF. @@ -1137,34 +1498,30 @@ /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - yy_current_buffer->yy_n_chars = yy_n_chars = 0; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; else { - int num_to_read = - yy_current_buffer->yy_buf_size - number_to_move - 1; + int num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ -#ifdef YY_USES_REJECT - YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); -#else /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = yy_current_buffer; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = - (int) (yy_c_buf_p - b->yy_ch_buf); + (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { @@ -1177,8 +1534,7 @@ b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size + 2 ); + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); } else /* Can't grow it, we don't own it. */ @@ -1188,35 +1544,35 @@ YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = yy_current_buffer->yy_buf_size - + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; -#endif + } if ( num_to_read > YY_READ_BUF_SIZE ) num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), - yy_n_chars, num_to_read ); + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), (size_t) num_to_read ); - yy_current_buffer->yy_n_chars = yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - if ( yy_n_chars == 0 ) + if ( (yy_n_chars) == 0 ) { if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); + yyrestart(yyin ); } else { ret_val = EOB_ACT_LAST_MATCH; - yy_current_buffer->yy_buffer_status = + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_EOF_PENDING; } } @@ -1224,32 +1580,31 @@ else ret_val = EOB_ACT_CONTINUE_SCAN; - yy_n_chars += number_to_move; - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + (yy_n_chars) += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; return ret_val; - } - +} /* yy_get_previous_state - get the state just before the EOB char was reached */ -static yy_state_type yy_get_previous_state() - { + static yy_state_type yy_get_previous_state (void) +{ register yy_state_type yy_current_state; register char *yy_cp; + + yy_current_state = (yy_start); - yy_current_state = yy_start; - - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1261,30 +1616,23 @@ } return yy_current_state; - } - +} /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - -#ifdef YY_USE_PROTOS -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) -#else -static yy_state_type yy_try_NUL_trans( yy_current_state ) -yy_state_type yy_current_state; -#endif - { + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) +{ register int yy_is_jam; - register char *yy_cp = yy_c_buf_p; + register char *yy_cp = (yy_c_buf_p); register YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1296,80 +1644,73 @@ yy_is_jam = (yy_current_state == 113); return yy_is_jam ? 0 : yy_current_state; - } - +} -#ifndef YY_NO_UNPUT -#ifdef YY_USE_PROTOS -static void yyunput( int c, register char *yy_bp ) -#else -static void yyunput( c, yy_bp ) -int c; -register char *yy_bp; -#endif - { - register char *yy_cp = yy_c_buf_p; + static void yyunput (int c, register char * yy_bp ) +{ + register char *yy_cp; + + yy_cp = (yy_c_buf_p); /* undo effects of setting up yytext */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = yy_n_chars + 2; - register char *dest = &yy_current_buffer->yy_ch_buf[ - yy_current_buffer->yy_buf_size + 2]; + register int number_to_move = (yy_n_chars) + 2; + register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; register char *source = - &yy_current_buffer->yy_ch_buf[number_to_move]; + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; - while ( source > yy_current_buffer->yy_ch_buf ) + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) *--dest = *--source; yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); - yy_current_buffer->yy_n_chars = - yy_n_chars = yy_current_buffer->yy_buf_size; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } *--yy_cp = (char) c; + (yytext_ptr) = yy_bp; + (yy_hold_char) = *yy_cp; + (yy_c_buf_p) = yy_cp; +} - yytext_ptr = yy_bp; - yy_hold_char = *yy_cp; - yy_c_buf_p = yy_cp; - } -#endif /* ifndef YY_NO_UNPUT */ - - +#ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput() + static int yyinput (void) #else -static int input() + static int input (void) #endif - { - int c; - *yy_c_buf_p = yy_hold_char; +{ + int c; + + *(yy_c_buf_p) = (yy_hold_char); - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) { /* yy_c_buf_p now points to the character we want to return. * If this occurs *before* the EOB characters, then it's a * valid NUL; if not, then we've hit the end of the buffer. */ - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) /* This was really a NUL. */ - *yy_c_buf_p = '\0'; + *(yy_c_buf_p) = '\0'; else { /* need more input */ - int offset = yy_c_buf_p - yytext_ptr; - ++yy_c_buf_p; + int offset = (yy_c_buf_p) - (yytext_ptr); + ++(yy_c_buf_p); - switch ( yy_get_next_buffer() ) + switch ( yy_get_next_buffer( ) ) { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() @@ -1383,16 +1724,16 @@ */ /* Reset buffer status. */ - yyrestart( yyin ); + yyrestart(yyin ); - /* fall through */ + /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap() ) + if ( yywrap( ) ) return EOF; - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; #ifdef __cplusplus return yyinput(); @@ -1402,90 +1743,92 @@ } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + offset; + (yy_c_buf_p) = (yytext_ptr) + offset; break; } } } - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ - *yy_c_buf_p = '\0'; /* preserve yytext */ - yy_hold_char = *++yy_c_buf_p; - + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve yytext */ + (yy_hold_char) = *++(yy_c_buf_p); return c; - } - - -#ifdef YY_USE_PROTOS -void yyrestart( FILE *input_file ) -#else -void yyrestart( input_file ) -FILE *input_file; -#endif - { - if ( ! yy_current_buffer ) - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); +} +#endif /* ifndef YY_NO_INPUT */ - yy_init_buffer( yy_current_buffer, input_file ); - yy_load_buffer_state(); +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * + * @note This function does not reset the start condition to @c INITIAL . + */ + void yyrestart (FILE * input_file ) +{ + + if ( ! YY_CURRENT_BUFFER ){ + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ); } + yy_init_buffer(YY_CURRENT_BUFFER,input_file ); + yy_load_buffer_state( ); +} -#ifdef YY_USE_PROTOS -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) -#else -void yy_switch_to_buffer( new_buffer ) -YY_BUFFER_STATE new_buffer; -#endif - { - if ( yy_current_buffer == new_buffer ) +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * + */ + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) +{ + + /* TODO. We should be able to replace this entire function body + * with + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); + */ + yyensure_buffer_stack (); + if ( YY_CURRENT_BUFFER == new_buffer ) return; - if ( yy_current_buffer ) + if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ - *yy_c_buf_p = yy_hold_char; - yy_current_buffer->yy_buf_pos = yy_c_buf_p; - yy_current_buffer->yy_n_chars = yy_n_chars; + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - yy_current_buffer = new_buffer; - yy_load_buffer_state(); + YY_CURRENT_BUFFER_LVALUE = new_buffer; + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ - yy_did_buffer_switch_on_eof = 1; - } - - -#ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) -#else -void yy_load_buffer_state() -#endif - { - yy_n_chars = yy_current_buffer->yy_n_chars; - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; - yyin = yy_current_buffer->yy_input_file; - yy_hold_char = *yy_c_buf_p; - } + (yy_did_buffer_switch_on_eof) = 1; +} +static void yy_load_buffer_state (void) +{ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); +} -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) -#else -YY_BUFFER_STATE yy_create_buffer( file, size ) -FILE *file; -int size; -#endif - { +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * + * @return the allocated buffer state. + */ + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) +{ YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1494,80 +1837,75 @@ /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer( b, file ); + yy_init_buffer(b,file ); return b; - } - +} -#ifdef YY_USE_PROTOS -void yy_delete_buffer( YY_BUFFER_STATE b ) -#else -void yy_delete_buffer( b ) -YY_BUFFER_STATE b; -#endif - { +/** Destroy the buffer. + * @param b a buffer created with yy_create_buffer() + * + */ + void yy_delete_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; - if ( b == yy_current_buffer ) - yy_current_buffer = (YY_BUFFER_STATE) 0; + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yy_flex_free( (void *) b->yy_ch_buf ); + yyfree((void *) b->yy_ch_buf ); - yy_flex_free( (void *) b ); - } - - -#ifndef YY_ALWAYS_INTERACTIVE -#ifndef YY_NEVER_INTERACTIVE -extern int isatty YY_PROTO(( int )); -#endif -#endif - -#ifdef YY_USE_PROTOS -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) -#else -void yy_init_buffer( b, file ) -YY_BUFFER_STATE b; -FILE *file; -#endif + yyfree((void *) b ); +} +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a yyrestart() or at EOF. + */ + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - { - yy_flush_buffer( b ); +{ + int oerrno = errno; + + yy_flush_buffer(b ); b->yy_input_file = file; b->yy_fill_buffer = 1; -#if YY_ALWAYS_INTERACTIVE - b->yy_is_interactive = 1; -#else -#if YY_NEVER_INTERACTIVE - b->yy_is_interactive = 0; -#else - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; -#endif -#endif - } - + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } -#ifdef YY_USE_PROTOS -void yy_flush_buffer( YY_BUFFER_STATE b ) -#else -void yy_flush_buffer( b ) -YY_BUFFER_STATE b; -#endif + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} - { - if ( ! b ) +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * + */ + void yy_flush_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; b->yy_n_chars = 0; @@ -1584,29 +1922,121 @@ b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == yy_current_buffer ) - yy_load_buffer_state(); + if ( b == YY_CURRENT_BUFFER ) + yy_load_buffer_state( ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * + */ +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) +{ + if (new_buffer == NULL) + return; + + yyensure_buffer_stack(); + + /* This block is copied from yy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * + */ +void yypop_buffer_state (void) +{ + if (!YY_CURRENT_BUFFER) + return; + + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); + + if (YY_CURRENT_BUFFER) { + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; + } +} + +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void yyensure_buffer_stack (void) +{ + int num_to_alloc; + + if (!(yy_buffer_stack)) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; + (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + ); + + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; } + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ -#ifndef YY_NO_SCAN_BUFFER -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) -#else -YY_BUFFER_STATE yy_scan_buffer( base, size ) -char *base; -yy_size_t size; -#endif - { - YY_BUFFER_STATE b; + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc + ((yy_buffer_stack), + num_to_alloc * sizeof(struct yy_buffer_state*) + ); + + /* zero only the new slots.*/ + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); + (yy_buffer_stack_max) = num_to_alloc; + } +} +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) +{ + YY_BUFFER_STATE b; + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ return 0; - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); @@ -1620,56 +2050,51 @@ b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer( b ); + yy_switch_to_buffer(b ); return b; - } -#endif - - -#ifndef YY_NO_SCAN_STRING -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) -#else -YY_BUFFER_STATE yy_scan_string( yy_str ) -yyconst char *yy_str; -#endif - { - int len; - for ( len = 0; yy_str[len]; ++len ) - ; - - return yy_scan_bytes( yy_str, len ); - } -#endif +} +/** Setup the input buffer state to scan a string. The next call to yylex() will + * scan from a @e copy of @a str. + * @param yystr a NUL-terminated string to scan + * + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * yy_scan_bytes() instead. + */ +YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +{ + + return yy_scan_bytes(yystr,strlen(yystr) ); +} -#ifndef YY_NO_SCAN_BYTES -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) -#else -YY_BUFFER_STATE yy_scan_bytes( bytes, len ) -yyconst char *bytes; -int len; -#endif - { +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +{ YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; - buf = (char *) yy_flex_alloc( n ); + n = _yybytes_len + 2; + buf = (char *) yyalloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer( buf, n ); + b = yy_scan_buffer(buf,n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -1679,148 +2104,196 @@ b->yy_is_our_buffer = 1; return b; - } -#endif - +} -#ifndef YY_NO_PUSH_STATE -#ifdef YY_USE_PROTOS -static void yy_push_state( int new_state ) -#else -static void yy_push_state( new_state ) -int new_state; +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 #endif - { - if ( yy_start_stack_ptr >= yy_start_stack_depth ) - { - yy_size_t new_size; - yy_start_stack_depth += YY_START_STACK_INCR; - new_size = yy_start_stack_depth * sizeof( int ); +static void yy_fatal_error (yyconst char* msg ) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} - if ( ! yy_start_stack ) - yy_start_stack = (int *) yy_flex_alloc( new_size ); +/* Redefine yyless() so it works in section 3 code. */ - else - yy_start_stack = (int *) yy_flex_realloc( - (void *) yy_start_stack, new_size ); +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + yytext[yyleng] = (yy_hold_char); \ + (yy_c_buf_p) = yytext + yyless_macro_arg; \ + (yy_hold_char) = *(yy_c_buf_p); \ + *(yy_c_buf_p) = '\0'; \ + yyleng = yyless_macro_arg; \ + } \ + while ( 0 ) - if ( ! yy_start_stack ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); - } +/* Accessor methods (get/set functions) to struct members. */ - yy_start_stack[yy_start_stack_ptr++] = YY_START; +/** Get the current line number. + * + */ +int yyget_lineno (void) +{ + + return yylineno; +} - BEGIN(new_state); - } -#endif +/** Get the input stream. + * + */ +FILE *yyget_in (void) +{ + return yyin; +} +/** Get the output stream. + * + */ +FILE *yyget_out (void) +{ + return yyout; +} -#ifndef YY_NO_POP_STATE -static void yy_pop_state() - { - if ( --yy_start_stack_ptr < 0 ) - YY_FATAL_ERROR( "start-condition stack underflow" ); +/** Get the length of the current token. + * + */ +int yyget_leng (void) +{ + return yyleng; +} - BEGIN(yy_start_stack[yy_start_stack_ptr]); - } -#endif +/** Get the current token. + * + */ +char *yyget_text (void) +{ + return yytext; +} -#ifndef YY_NO_TOP_STATE -static int yy_top_state() - { - return yy_start_stack[yy_start_stack_ptr - 1]; - } -#endif +/** Set the current line number. + * @param line_number + * + */ +void yyset_lineno (int line_number ) +{ + + yylineno = line_number; +} -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * + * @see yy_switch_to_buffer + */ +void yyset_in (FILE * in_str ) +{ + yyin = in_str ; +} -#ifdef YY_USE_PROTOS -static void yy_fatal_error( yyconst char msg[] ) -#else -static void yy_fatal_error( msg ) -char msg[]; -#endif - { - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); - } +void yyset_out (FILE * out_str ) +{ + yyout = out_str ; +} +int yyget_debug (void) +{ + return yy_flex_debug; +} +void yyset_debug (int bdebug ) +{ + yy_flex_debug = bdebug ; +} -/* Redefine yyless() so it works in section 3 code. */ +static int yy_init_globals (void) +{ + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from yylex_destroy(), so don't allocate here. + */ + + (yy_buffer_stack) = 0; + (yy_buffer_stack_top) = 0; + (yy_buffer_stack_max) = 0; + (yy_c_buf_p) = (char *) 0; + (yy_init) = 0; + (yy_start) = 0; + +/* Defined in main.c */ +#ifdef YY_STDINIT + yyin = stdin; + yyout = stdout; +#else + yyin = (FILE *) 0; + yyout = (FILE *) 0; +#endif + + /* For future reference: Set errno on error, since we are called by + * yylex_init() + */ + return 0; +} -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n; \ - yy_hold_char = *yy_c_buf_p; \ - *yy_c_buf_p = '\0'; \ - yyleng = n; \ - } \ - while ( 0 ) +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (void) +{ + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + yypop_buffer_state(); + } + + /* Destroy the stack itself. */ + yyfree((yy_buffer_stack) ); + (yy_buffer_stack) = NULL; + + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * yylex() is called, initialization will occur. */ + yy_init_globals( ); + return 0; +} -/* Internal utility routines. */ +/* + * Internal utility routines. + */ #ifndef yytext_ptr -#ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) -#else -static void yy_flex_strncpy( s1, s2, n ) -char *s1; -yyconst char *s2; -int n; -#endif - { +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +{ register int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; - } +} #endif #ifdef YY_NEED_STRLEN -#ifdef YY_USE_PROTOS -static int yy_flex_strlen( yyconst char *s ) -#else -static int yy_flex_strlen( s ) -yyconst char *s; -#endif - { +static int yy_flex_strlen (yyconst char * s ) +{ register int n; for ( n = 0; s[n]; ++n ) ; return n; - } +} #endif - -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { +void *yyalloc (yy_size_t size ) +{ return (void *) malloc( size ); - } +} -#ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, yy_size_t size ) -#else -static void *yy_flex_realloc( ptr, size ) -void *ptr; -yy_size_t size; -#endif - { +void *yyrealloc (void * ptr, yy_size_t size ) +{ /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -1829,301 +2302,18 @@ * as though doing an assignment. */ return (void *) realloc( (char *) ptr, size ); - } - -#ifdef YY_USE_PROTOS -static void yy_flex_free( void *ptr ) -#else -static void yy_flex_free( ptr ) -void *ptr; -#endif - { - free( ptr ); - } - -#if YY_MAIN -int main() - { - yylex(); - return 0; - } -#endif -#line 149 "lex.l" - - -static void -eat_comment () -{ - int c; - - while ((c = input ()) != EOF) - { - if (c == '\n') - linenum++; - else if (c == '*') - { - c = input (); - if (c == '/') - /* All done. */ - return; - - if (c == EOF) - { - yyerror (_("error: EOF in comment")); - break; - } - unput (c); - } - } - yyerror (_("error: EOF in comment")); } - -int -yywrap () +void yyfree (void * ptr ) { - return 1; + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } -static char * -read_string (len_return) - unsigned int *len_return; -{ - char *buf = NULL; - char *buf2; - int buflen = 0; - int bufpos = 0; - int ch; - int done = 0; - - while (!done) - { - ch = input (); - if (ch == '\n') - linenum++; - - switch (ch) - { - case EOF: - unexpected_eof: - yyerror (_("error: EOF in string constant")); - done = 1; - break; - - case '"': - done = 1; - break; - - case '\\': - ch = input (); - switch (ch) - { - case 'n': - ch = '\n'; - break; - - case 't': - ch = '\t'; - break; - - case 'v': - ch = '\v'; - break; - - case 'b': - ch = '\b'; - break; - - case 'r': - ch = '\r'; - break; - - case 'f': - ch = '\f'; - break; - - case 'a': - ch = '\a'; - break; - - case EOF: - goto unexpected_eof; - break; - - default: - if (ch == '0') - { - int i; - int val = 0; - - for (i = 0; i < 3; i++) - { - ch = input (); - if ('0' <= ch && ch <= '7') - val = val * 8 + ch - '0'; - else - { - unput (ch); - break; - } - } - ch = val; - } - break; - } - /* FALLTHROUGH */ - - default: - if (bufpos >= buflen) - { - buflen += 1024; - buf = (char *) xrealloc (buf, buflen); - } - buf[bufpos++] = ch; - break; - } - } - - buf2 = (char *) xmalloc (bufpos + 1); - memcpy (buf2, buf, bufpos); - buf2[bufpos] = '\0'; - xfree (buf); - - *len_return = bufpos; - - return buf2; -} - - -static void -read_regexp (node) - Node *node; -{ - char *buf = NULL; - char *buf2; - int buflen = 0; - int bufpos = 0; - int ch; - int done = 0; - - while (!done) - { - ch = input (); - switch (ch) - { - case EOF: - unexpected_eof: - yyerror (_("error: EOF in regular expression")); - done = 1; - break; +#define YYTABLES_NAME "yytables" - case '/': - done = 1; - break; +#line 418 "lex.l" - case '\\': - ch = input (); - switch (ch) - { - case '\n': - /* Line break. */ - linenum++; - continue; - break; - case 'n': - ch = '\n'; - break; - - case 'r': - ch = '\r'; - break; - - case 'f': - ch = '\f'; - break; - - case 't': - ch = '\t'; - break; - - case '/': - case '\\': - /* Quote these. */ - break; - - case EOF: - goto unexpected_eof; - break; - - default: - if (ch == '0') - { - int i; - int val = 0; - - for (i = 0; i < 3; i++) - { - ch = input (); - if ('0' <= ch && ch <= '7') - val = val * 8 + ch - '0'; - else - { - unput (ch); - break; - } - } - ch = val; - } - else - { - /* Pass it through. */ - unput (ch); - ch = '\\'; - } - break; - } - /* FALLTHROUGH */ - - default: - if (bufpos >= buflen) - { - buflen += 1024; - buf = (char *) xrealloc (buf, buflen); - } - buf[bufpos++] = ch; - break; - } - } - - /* Possible options. */ - done = 0; - while (!done) - { - ch = input (); - switch (ch) - { - case 'i': - /* Case-insensitive regular expression. */ - node->u.re.flags |= fRE_CASE_INSENSITIVE; - break; - - default: - /* Unknown option => this belongs to the next token. */ - unput (ch); - done = 1; - break; - } - } - - buf2 = (char *) xmalloc (bufpos + 1); - memcpy (buf2, buf, bufpos); - buf2[bufpos] = '\0'; - xfree (buf); - - node->u.re.data = buf2; - node->u.re.len = bufpos; -} /* @@ -2131,3 +2321,4 @@ mode: c End: */ + --- enscript-1.6.4.orig/po/nl.po +++ enscript-1.6.4/po/nl.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: enscript 1.5.1\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 1997-07-24 22:16 CEST\n" "Last-Translator: Erick Branderhorst \n" "Language-Team: Dutch \n" @@ -152,85 +153,86 @@ msgid "Unmatched ) or \\)" msgstr "Niet gematchte ) of \\)" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "Geen vorige reguliere expressie" -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N $3% pagina's $4L regels $E $C" -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "kan geen wachtwoord vinden voor uid=%d: %s" -#: src/main.c:1088 +#: src/main.c:1099 #, fuzzy, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "kan configuratie bestand \"%s/%s\" niet openen: %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "" -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "onbekende codering: %s" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "kan AFM bibliotheek niet openen: %s" -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -240,157 +242,158 @@ "naam breed\thoogte\tllx\tlly\turx\tury\n" "------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "weet helemaal niets over media \"%s\"" -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" msgstr "" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "ongeldig pagina label formaat \"%s\"" -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "ongeldig niet-afdrukbaar formaat \"%s\"" -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "ongeldige stijl voor wrapped regel markering: \"%s\"" -#: src/main.c:1338 +#: src/main.c:1349 #, c-format msgid "illegal N-up argument: %d" msgstr "ongeldig N-de argument: %d" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "N-de argument moet een macht van 2 zijn: %d" -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "onjuist gevormde `underlay' positie: %s (FIXME)" -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "onjuiste `underlay' positie: %s (FIXME)" -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" msgstr "" -#: src/main.c:1641 +#: src/main.c:1662 #, fuzzy, c-format msgid "couldn't create temporary toc file: %s" msgstr "kan inhoudsopgave bestand niet aanmaken: %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "kan invoerbestand \"%s\" niet `stat': %s (FIXME)" -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "kan inhoudsopgave bestand niet terugdraaien: %s" -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "Inhoudsopgave" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "geen uitvoer gegenereerd\n" -#: src/main.c:1748 +#: src/main.c:1773 #, c-format msgid "output sent to %s\n" msgstr "uitvoer verzonden naar %s\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "printer" -#: src/main.c:1751 +#: src/main.c:1776 #, c-format msgid "output left in %s\n" msgstr "uitvoer achtergelaten in %s\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d pagina's * %d copien ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr " verzonden naar %s\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " achtergelaten in %s (FIXME)\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d regels zijn %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "ingekort" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "afgebroken" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "%d karakters ontbreken\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "ontbrekende karakter code (decimaal):\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d niet-afdrukbare karakters\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "niet-afdrukbare karakter codes (decimaal):\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "kan printer `%s' niet openen/aansturen: %s (FIXME)" -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "kan uitvoerbestand \"%s\" niet openen: %s" -#: src/main.c:1880 +#: src/main.c:1905 #, fuzzy, c-format msgid "couldn't close output file \"%s\": %s" msgstr "kan uitvoerbestand \"%s\" niet openen: %s" -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -399,7 +402,7 @@ "syntactische fout in optie string %s=\"%s\":\n" "ontbrekende eind-quote: %c" -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" @@ -407,61 +410,61 @@ "let op: didn't process following options voor omgevings-variabele %s: " "(FIXME)\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " optie %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 #, fuzzy msgid "number of columns must be larger than zero" msgstr "bestands alignment moet groter zijn dan nul (FIXME)" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "bestands alignment moet groter zijn dan nul (FIXME)" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "onjuiste font specificatie: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "kan `header' definitie bestand \"%s.hdr\" niet vinden" -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "moet tenminste een regel per pagina printen: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" msgstr "" "%s: ongeldige nieuwe regel karakter specificatie: '%s': verwacht 'n' of 'r'\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "slice moet groter zijn dan nul" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Probeer `%s --help' voor meer informatie.\n" -#: src/main.c:2510 +#: src/main.c:2535 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -502,12 +505,13 @@ "uitvoer\n" " -e, --escapes[=CHAR] zet speciale escape interpretatie aan\n" -#: src/main.c:2530 -#, fuzzy +#: src/main.c:2555 +#, fuzzy, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr " -E, --pretty-print[=LANG] `pretty-print' bron code\n" -#: src/main.c:2533 +#: src/main.c:2558 +#, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -545,7 +549,8 @@ "portrait,\n" " --columns=1\n" -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -581,8 +586,8 @@ " -r, --landscape print in landscape mode\n" " -R, --portrait print in portrait mode\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -619,7 +624,8 @@ " -Z, --pass-through geef PostScript en PCL bestand onveranderd " "door\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -633,8 +639,8 @@ " --help print this help and exit\n" msgstr "" -#: src/main.c:2596 -#, fuzzy +#: src/main.c:2621 +#, fuzzy, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -661,7 +667,8 @@ " --page-label-format=FMT zet pagina label formaat op FMT\n" " --printer-options=OPTIES stuur extra opties naar het printer commando\n" -#: src/main.c:2607 +#: src/main.c:2632 +#, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -674,8 +681,8 @@ " --rotate-even-pages rotate even-numbered pages 180 degrees\n" msgstr "" -#: src/main.c:2617 -#, fuzzy +#: src/main.c:2642 +#, fuzzy, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -697,7 +704,8 @@ " --ul-position=POS zet `underlay's' begin postitie op POS\n" " --ul-style=STIJL print `underlays' met stijl STIJL\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -797,22 +805,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "ongeldige waarde voor ^@bggray escape: %s" -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: kan niet doorsturen (pijpen) naar commando \"%s\": %s (FIXME)\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "kan EPS bestand \"%s\" niet openen: %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "EPS bestand \"%s\" begint niet met \"%%!\" magie (magic FIXME)\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -821,27 +824,27 @@ "EPS bestand \"%s\" bevat onjuiste %%%%BoundingBox regel:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "EPS bestand \"%s\" is geen juist EPS bestand\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" msgstr "doorgeven van alle invoerbestanden voor uitvoertaal `%s'\n" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "passing through %s bestand \"%s\" (FIXME)\n" -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, fuzzy, c-format msgid "couldn't create temporary divert file: %s" msgstr "kan divert bestand `%s' niet aanmaken" -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "kan divert bestand niet opnieuw lezen: %s" @@ -933,70 +936,70 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "kan lettertype beschrijvingsbestand \"%s\" niet openen: %s\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: te lang formaat voor %%D{} `escape'" -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: onbekende `%%' `escape' `%c' (%d)" -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: geen afsluitend `)' voor $() `escape'" -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: te lange variabele naam voor $() `escape'" -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: te lang formaat voor $D{} `escape'" -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: onbekende `$' `escape' `%c' (%d)" -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "onjuiste `float' dimensie: \"%s\"" -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "kan invoerfilter \"%s\" voor bestand \"%s\" niet openen: %s" -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "kan invoerbestand \"%s\" niet openen: %s" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "bestande=%s\n" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "standaarduitvoer" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "%s: kan uitvoerbestand niet openene: \"%s\"" -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 msgid "couldn't create AFM library" msgstr "kan geen AFM bibliotheek aanmaken" -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1016,15 +1019,15 @@ " naar standaarduitvoer.\n" " -V, --version toon versie-informatie\n" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "" -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "" -#: states/lex.l:313 +#: states/lex.l:202 #, fuzzy msgid "error: EOF in regular expression" msgstr "Geen vorige reguliere expressie" @@ -1034,32 +1037,32 @@ msgid "states for GNU %s %s" msgstr "status voor GNU %s %s" -#: states/main.c:254 +#: states/main.c:255 #, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "%s: verkeerde variabele definitie \"%s\"\n" -#: states/main.c:282 +#: states/main.c:283 #, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "%s: kan geen uitvoerbestand aanmaken \"%s\": %s\n" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: onbekend waarschuwingsnivo `%s'\n" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "%s: geen geheugen meer\n" -#: states/main.c:423 +#: states/main.c:424 #, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "%s: kan geen invoerbestand openen `%s': %s\n" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -1068,8 +1071,8 @@ "Aanroep: %s [OPTIE]... [BESTAND]...\n" "Verplichte argument voor lange optie zijn ook verplicht voor korte opties.\n" -#: states/main.c:451 -#, fuzzy +#: states/main.c:452 +#, fuzzy, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1272,6 +1275,10 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "" +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "" +#~ "epsf: kan niet doorsturen (pijpen) naar commando \"%s\": %s (FIXME)\n" + #~ msgid "couldn't create toc file \"%s\": %s" #~ msgstr "kan inhoudsopgave bestand \"%s\" niet aanmaken: %s" --- enscript-1.6.4.orig/po/hr.po +++ enscript-1.6.4/po/hr.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: enscript 1.6.2\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 2002-04-22 00:02+02:00\n" "Last-Translator: Hrvoje Niksic \n" "Language-Team: Croatian \n" @@ -151,85 +152,86 @@ msgid "Unmatched ) or \\)" msgstr "Nesparena ) ili \\)" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "Nedostaje prethodni regularni izraz" -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N $3% stranica $4L redova $E $C" -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "nisam uspio dobiti passwd entry za uid=%d: %s" -#: src/main.c:1088 +#: src/main.c:1099 #, fuzzy, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "nisam uspio otvoriti konfiguracijski spis \"%s/%s\": %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "" -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "nepoznat enkoding: %s" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "nisam uspio otvoriti AFM biblioteku: %s" -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -238,54 +240,55 @@ "poznati mediji\n" "ime sirina\tduljina\tllx\tlly\turx\tury\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "ne znam ni¹ta o mediju \"%s\"" -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" msgstr "" "postavi nove rubove za medij `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "nedopu¹ten format labele stranice \"%s\"" -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "nedopu¹ten neispisiv format \"%s\"" -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "nedopu¹ten stil za oznaku prelomljenog reda: \"%s\"" -#: src/main.c:1338 +#: src/main.c:1349 #, c-format msgid "illegal N-up argument: %d" msgstr "nedopu¹ten N-up argument: %d" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "N-up argument mora biti potencija broja 2: %d" -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "izoblièana pozicija underlaya: %s" -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "nedopu¹ten stil underlaya: %s" -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" @@ -293,105 +296,105 @@ "Osvjetljavanje je podr¾ano za sljedeæe jezike i formate spisa:\n" "\n" -#: src/main.c:1641 +#: src/main.c:1662 #, fuzzy, c-format msgid "couldn't create temporary toc file: %s" msgstr "ne mogu stvoriti ime spisa sa sadr¾ajem: %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "ne mogu statati ulazni spis \"%s\": %s" -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "ne mogu prevrtiti spis sa sadr¾ajem na poèetak: %s" -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "Sadr¾aj" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "nikakav izlaza nije stvoren\n" -#: src/main.c:1748 +#: src/main.c:1773 #, c-format msgid "output sent to %s\n" msgstr "izlaz poslan na %s\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "pisaè" -#: src/main.c:1751 +#: src/main.c:1776 #, c-format msgid "output left in %s\n" msgstr "izlaz ostao u %s\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d stranica * %d kopija ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr " poslano na %s\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " ostalo u %s\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d redova su %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "odsjeèeni" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "prelomljeni" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "%d znakova je nedostajalo\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "kodovi znakova koji nedostaju (decimalni):\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d neispisivih znakova\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "kodovi neispisivih znakova (decimalno):\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "ne mogu otvoriti pisaè `%s': %s" -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "ne mogu stvoriti izlazni spis \"%s\": %s" -#: src/main.c:1880 +#: src/main.c:1905 #, fuzzy, c-format msgid "couldn't close output file \"%s\": %s" msgstr "ne mogu stvoriti izlazni spis \"%s\": %s" -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -400,66 +403,67 @@ "sintaksna gre¹ka u opcijskom nizu %s=\"%s\":\n" "nedostaje kraj citata: %c" -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" -msgstr "upozorenje: nisam procesirao sljedeæe opcije iz okoli¹ne varijable %s:\n" +msgstr "" +"upozorenje: nisam procesirao sljedeæe opcije iz okoli¹ne varijable %s:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " opcija %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 #, fuzzy msgid "number of columns must be larger than zero" msgstr "poravnanje spisa mora biti veæe od nule" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "poravnanje spisa mora biti veæe od nule" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "izoblièena naznaka fonta: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "nisam na¹ao definiciju spisa s headerima \"%s.hdr\"" -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "moram ispisati barem jedan redak po stranici: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" msgstr "%s: nedopu¹tena oznaka novog reda: '%s': oèekivao 'n' ili 'r'\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "odsjeèak mora biti veæi od nule" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Poku¹aj `%s --help' za vi¹e informacija.\n" -#: src/main.c:2510 +#: src/main.c:2535 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -499,12 +503,13 @@ " prenesi definiciju straniènog ureðaja na izlaz\n" " -e, --escapes[=CHAR] omoguæi interpretaciju posebnih escapeova\n" -#: src/main.c:2530 -#, fuzzy +#: src/main.c:2555 +#, fuzzy, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr " -E, --pretty-print[=JEZIK] uljep¹ano ispi¹i izvorni kod\n" -#: src/main.c:2533 +#: src/main.c:2558 +#, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -542,7 +547,8 @@ "portrait,\n" " --columns=1\n" -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -575,8 +581,8 @@ " -r, --landscape ispisuj u \"landscape\" modu\n" " -R, --portrait ispisuj u \"portrait\" modu\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -599,10 +605,12 @@ " -S, --statusdict=KEY[:VALUE]\n" " prenesi statusdict definiciju na izlaz\n" " -t, --title=NASLOV postavi naslov stranice s bannerom na NASLOV.\n" -" Opcija takoðer postavlja ime ulaznog spisa stdin.\n" +" Opcija takoðer postavlja ime ulaznog spisa " +"stdin.\n" " -T, --tabsize=BROJ postavi velièinu tabulatora na BROJ\n" " -u, --underlay[=TEKST] ispi¹i TEKST ispod svake stranice\n" -" -U, --nup=BROJ ispi¹i BROJ logièkih stranica na svakoj izlaznoj\n" +" -U, --nup=BROJ ispi¹i BROJ logièkih stranica na svakoj " +"izlaznoj\n" " -v, --verbose ispisuj ¹to se dogaða\n" " -V, --version ispi¹i broj broj verzije\n" " -W, --language=JEZIK postavi izlazni jezik na JEZIK\n" @@ -611,7 +619,8 @@ " -Z, --pass-through propusti PostScript i PCL spise bez ikakvih " "izmjena\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -625,8 +634,8 @@ " --help print this help and exit\n" msgstr "" -#: src/main.c:2596 -#, fuzzy +#: src/main.c:2621 +#, fuzzy, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -641,7 +650,8 @@ "Long-only options:\n" " --color[=bool] stvori izlaz u boji sa stanjima\n" " --download-font=IME dohvati font IMENA\n" -" --filter-stdin=IME naznaèi kako stdin treba pokazati ulaznom filteru\n" +" --filter-stdin=IME naznaèi kako stdin treba pokazati ulaznom " +"filteru\n" " --h-column-height=VISINA postavi visinu horizontalnog stupca na VISINU.\n" " --help ispi¹i ovaj help i izaði\n" " --help-pretty-print opi¹i sve jezike i formate za koje je\n" @@ -656,8 +666,8 @@ " oznaèi prelomljene linije na izlazu sa STILOM\n" " --non-printable-format=FMT naznaèi kako se ispisuju neispisivi znakovi\n" -#: src/main.c:2607 -#, fuzzy +#: src/main.c:2632 +#, fuzzy, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -669,16 +679,18 @@ " --printer-options=OPTIONS pass extra options to the printer command\n" " --rotate-even-pages rotate even-numbered pages 180 degrees\n" msgstr "" -" --nup-xpad=BROJ postavi stranièni x-padding za N-up ispis na BROJ\n" -" --nup-ypad=BROJ postavi stranièni y-padding za N-up ispis na BROJ\n" +" --nup-xpad=BROJ postavi stranièni x-padding za N-up ispis na " +"BROJ\n" +" --nup-ypad=BROJ postavi stranièni y-padding za N-up ispis na " +"BROJ\n" " --page-label-format=FMT postavi format labele stranice na FMT\n" " --ps-level=NIVO postavi nivo PostScript jezika koji enscript\n" " treba koristiti\n" " --printer-options=OPCIJE propusti dodatne opcije naredbi za ispis\n" " --rotate-even-pages zarotiraj parne stranice za 180 stupnjeva\n" -#: src/main.c:2617 -#, fuzzy +#: src/main.c:2642 +#, fuzzy, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -697,12 +709,14 @@ " --toc ispi¹i sadr¾aj\n" " --ul-angle=KUT postavi kut underlay teksta na KUT\n" " --ul-font=IME ispi¹i underlaye s fontom imena IME\n" -" --ul-gray=BROJ ispi¹i underlaye sa sivom bojom vrijednosti BROJ\n" +" --ul-gray=BROJ ispi¹i underlaye sa sivom bojom vrijednosti " +"BROJ\n" " --ul-position=POLO®AJ postavi poèetni polo¾aj underlaya na POLO®AJ\n" " --ul-style=STIL ispisuj underlaye sa stilom STIL\n" " --word-wrap prelomi duge linije na granicama rijeèi\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -805,22 +819,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "neispravna vrijednost za escape ^@bggrat: %s" -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: ne mogu otvoriti kanal prema naredbi \"%s\": %s\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "ne mogu otvoriti EPS spis \"%s\": %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "EPS spis \"%s\" ne poèinje s èarom \"%%!\"\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -829,27 +838,27 @@ "EPS spis \"%s\" sadr¾i izoblièen redak %%%%BoundingBox:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "EPS spis \"%s\" nije ispravan EPS spis\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" msgstr "prolazim kroz sve ulazne spise za izlazni jezik `%s'\n" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "prolazim kroz %s spis \"%s\"\n" -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, fuzzy, c-format msgid "couldn't create temporary divert file: %s" msgstr "ne mogu stvoriti naziv skretnièkog spisa: %s" -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "ne mogu premotati skretnièki spis: %s" @@ -939,70 +948,70 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "ne mogu otvoriti spis s opisom fonta \"%s\": %s\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: predug format za escape $D{}" -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: nepoznat `%%' escape `%c' (%d)" -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: nema zatvorene ')' za $() escape" -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: predugo ime varijable za $() escape" -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: predug format za $D{} escape" -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: nepoznat `$' escape `%c' (%d)" -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "izoblièena float dimenzija: \"%s\"" -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "ne mogu otvoriti ulazni filter \"%s\" za spis \"%s\": %s" -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "ne mogu otvoriti ulazni spis \"%s\": %s" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "spis=%s\n" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "standardni izlaz" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "%s: ne mogu otvoriti izlazni spis \"%s\"" -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 msgid "couldn't create AFM library" msgstr "ne mogu kreirati AFM biblioteku" -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1020,15 +1029,15 @@ " Ako je SPIS `-', pi¹i na standardni izlaz.\n" " -V, --version ispi¹i broj verzije\n" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "gre¹ka: EOF u komentaru" -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "gre¹ka: EOF u stringovnoj konstanti" -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "gre¹ka: EOF u regularnom izrazu" @@ -1037,32 +1046,32 @@ msgid "states for GNU %s %s" msgstr "stanja za GNU %s %s" -#: states/main.c:254 +#: states/main.c:255 #, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "%s: izoblièena definicija varijable \"%s\"\n" -#: states/main.c:282 +#: states/main.c:283 #, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "%s: ne mogu stvoriti izlazni spis \"%s\": %s\n" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: nepoznat nivo upozorenja `%s'\n" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "%s: ponestalo memorije\n" -#: states/main.c:423 +#: states/main.c:424 #, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "%s: ne mogu otvoriti ulazni spis `%s': %s\n" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -1071,7 +1080,8 @@ "Uporaba: %s [OPCIJA]... [SPIS]...\n" "Ako dugaèka opcija zahtijeva argument, isto vrijedi i za kratku.\n" -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1123,7 +1133,8 @@ #, c-format msgid "" "%s: FATAL ERROR: States version %s or higher is required for this script\n" -msgstr "%s: KOBNA GRE©KA: Stanja verzije %s ili veæe potrebna su ovog skripti\n" +msgstr "" +"%s: KOBNA GRE©KA: Stanja verzije %s ili veæe potrebna su ovog skripti\n" #: states/prims.c:610 states/prims.c:1276 #, c-format @@ -1254,7 +1265,8 @@ #, c-format msgid "%s:%d: error: illegal rvalue for string assignment\n" msgstr "" -"%s:%d: gre¹ka: nedopu¹tena vrijednost s desne strane dodjeljivanja stringova\n" +"%s:%d: gre¹ka: nedopu¹tena vrijednost s desne strane dodjeljivanja " +"stringova\n" "\n" #: states/utils.c:1104 @@ -1277,6 +1289,9 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "%s: autoloadam `%s' iz `%s'\n" +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "epsf: ne mogu otvoriti kanal prema naredbi \"%s\": %s\n" + #~ msgid "couldn't create toc file \"%s\": %s" #~ msgstr "ne mogu stvoriti spis sa sadr¾ajem \"%s\": %s" --- enscript-1.6.4.orig/po/fr.po +++ enscript-1.6.4/po/fr.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU enscript 1.6.3\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 2002-11-13 08:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -151,89 +152,92 @@ msgid "Unmatched ) or \\)" msgstr ") ou \\) non pairé." -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "Aucune expression régulière précédente." -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N $3% pages $4L lignes $E $C" -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "" "Ne peut retrouver une entrée dans le fichier « passwd »\n" "correspondant au Uid=%d: %s." -#: src/main.c:1088 +#: src/main.c:1099 #, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "Ne peut lire le fichier de configuration \"%s/%s\": %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "J'ai aussi essayer parmi les répertoires suivants:" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "\t%s" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "\t../lib" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "\t../../lib" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "" "Cela est probablement une erreur d'installation. SVP, essayer de " "reconstruire:" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "\tmake distclean" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "\t./configure --prefix=PREFIX" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "\tmake" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "\tmake check" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "\tmake install" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" -msgstr "ou initialiser la variable d'environnement `ENSCRIPT_LIBRARY' pour pointer sur la vôtre" +msgstr "" +"ou initialiser la variable d'environnement `ENSCRIPT_LIBRARY' pour pointer " +"sur la vôtre" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "répertoire de librairie" -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "Encodage inconnu: %s" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "Ne peut ouvrir la librairie « AFM »: %s" -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -243,159 +247,163 @@ "nom largeur\thauteur\tllx\tlly\turx\tury\n" "------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "Ne peut reconnaître ce type de médium « %s »." -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" -msgstr "utiliser les arguments pour le média « %s » (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" +msgstr "" +"utiliser les arguments pour le média « %s » (%dx%d): llx=%d, lly=%d, urx=%d, " +"ury=%d\n" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "Le format d'étiquette de page « %s » est illégal." -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "Le format de la chaîne non imprimable « %s » est illégal." -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "style illégal pour le marqueur de ligne bouclée: « %s »" -#: src/main.c:1338 +#: src/main.c:1349 #, c-format msgid "illegal N-up argument: %d" msgstr "argument « N-up » illégal: %d" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "argument « N-up » doit être une puissance de 2: %d" -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "La position sous-jacente de %s est mal composée." -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "Le style sous-jacent %s est illégal." -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" msgstr "" -"Le surlignage est supporté pour les langages et formats de fichiers suivants:\n" +"Le surlignage est supporté pour les langages et formats de fichiers " +"suivants:\n" "\n" -#: src/main.c:1641 +#: src/main.c:1662 #, c-format msgid "couldn't create temporary toc file: %s" msgstr "Ne peut créer un fichier temporarire de table des matières: %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "Ne peut évaluer à l'aide de stat() le fichier fourni « %s »: %s." -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "Ne peut ré-ouvrir le fichier de la table de matières: %s." -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "Table des matières" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "Aucune sortie n'a été produite.\n" -#: src/main.c:1748 +#: src/main.c:1773 #, c-format msgid "output sent to %s\n" msgstr "expédié à %s\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "l'imprimante" -#: src/main.c:1751 +#: src/main.c:1776 #, c-format msgid "output left in %s\n" msgstr " placées dans %s\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d pages x %d copies ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr "expédié à «%s\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " placées dans %s\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d lignes étaient %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "tronquées" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "enroulées" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "%d caractères étaient manquants.\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "Codes de caractère manquants (en décimal):\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d caractères non-imprimables\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "Codes de caractère non imprimables (en décimal):\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "Ne peut accéder à l'imprimante « %s »: %s." -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "Ne peut créer un fichier de sortie « %s »: %s." -#: src/main.c:1880 +#: src/main.c:1905 #, c-format msgid "couldn't close output file \"%s\": %s" msgstr "Ne peut fermer le fichier de sortie « %s »: %s" -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -404,7 +412,7 @@ "Erreur de syntaxe rencontrée dans l'option %s=« %s »:\n" "L'apostrophe terminant la chaîne %c est manquante." -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" @@ -412,61 +420,62 @@ "AVERTISSEMENT: ne peut traiter les options suivantes à partir\n" "des variables d'environnement %s:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " option %d = « %s »\n" -#: src/main.c:2020 +#: src/main.c:2045 msgid "number of columns must be larger than zero" msgstr "nombre de colonnes doit être plus grand que zéro" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "L'alignement de fichier doit être plus grand que zéro." -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "La spécification de la fonte est mal composée: %s." -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "Ne peut trouver le fichier de définition de l'en-tête \"%s.hdr\"." -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "Imprimer au moins une ligne par page: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" msgstr "" "%s: la spécification d'un caractère de saut de ligne est illégale:\n" " « %s »: attendait « n » ou « r »\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "argument mal composé « %s » pour l'option -W, --option: pas de virgule" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" -msgstr "spécification de l'application d'aire doit être un caractère simple: %s" +msgstr "" +"spécification de l'application d'aire doit être un caractère simple: %s" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "la valeur de la tranche doit être plus grande que zéro" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pour en savoir davantage, faites: « %s --help ».\n" -#: src/main.c:2510 +#: src/main.c:2535 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -509,11 +518,13 @@ " -e, --escapes[=CARAC] autoriser l'interprétation des\n" " CARACtères d'échappement (« \\ »)\n" -#: src/main.c:2530 +#: src/main.c:2555 +#, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr " -E, --highlight[=LANG] afficher le code source joliment\n" -#: src/main.c:2533 +#: src/main.c:2558 +#, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -550,7 +561,8 @@ " --lines-per-page=66, --no-header,\n" " --portrait, --columns=1\n" -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -578,15 +590,16 @@ " -o utiliser l'alias pour « -p », « --output »\n" " -O, --missing-characters indiquer les codes de caractères manquants\n" " -p, --output=FICHIER produire la sortie dans un FICHIER. Si\n" -" « - » est utilisé, utiliser la sortie standard.\n" +" « - » est utilisé, utiliser la sortie " +"standard.\n" " -P, --printer=NOM produire la sortie sur l'imprimante\n" " portant le NOM\n" " -q, --quiet, --silent ne pas utiliser le mode bavard\n" " -r, --landscape imprimer en mode paysage\n" " -R, --portrait imprimer en mode portrait\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -626,7 +639,8 @@ " -Z, --pass-through traiter les fichiers Postscript et PCL\n" " sans les modifier\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -643,17 +657,19 @@ " --color[=bool] créer les couleurs de sortie avec états\n" " --continuous-page-numbers compter les numéros de page lors du parcours\n" " du fichier d'entrée. Ne pas recommencer\n" -" la numérotation à partir du début de chaque fichier.\n" +" la numérotation à partir du début de chaque " +"fichier.\n" " --download-font=NOM télécharger la fonte ayant le NOM\n" " --extended-return-values autoriser le retour des valeurs étendues\n" -" --filter-stdin=NOM spécifier comment stdin est affiché sur le filtre d'entrée\n" +" --filter-stdin=NOM spécifier comment stdin est affiché sur le " +"filtre d'entrée\n" " --footer=BAS-DE-PAGE initialiser le bas de page\n" " --h-column-height=HAUTEUR initialiser la HAUTEUR horizontale des " "colonnes\n" " --help afficher l'aide et quitter\n" -#: src/main.c:2596 -#, fuzzy +#: src/main.c:2621 +#, fuzzy, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -679,7 +695,8 @@ " --non-printable-format=FORMAT\n" " utiliser le FORMAT non imprimable\n" -#: src/main.c:2607 +#: src/main.c:2632 +#, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -699,10 +716,13 @@ " --page-label-format=FORMAT utiliser le FORMAT de l'étiquette de page\n" " --ps-level=NIVEAU utiliser le NIVEAU du langage PostScript\n" " que « enscript » peut utiliser\n" -" --printer-options=OPTIONS relayer les options supplémentaires à la commande d'impression\n" -" --rotate-even-pages faire la rotation des pages paires de 180 degrés\n" +" --printer-options=OPTIONS relayer les options supplémentaires à la " +"commande d'impression\n" +" --rotate-even-pages faire la rotation des pages paires de 180 " +"degrés\n" -#: src/main.c:2617 +#: src/main.c:2642 +#, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -732,7 +752,8 @@ " --word-wrap boucler les lignes longues sur des\n" " frontières de mots\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -767,7 +788,9 @@ #: src/psgen.c:979 msgid "user font encoding can be only the system's default or `ps'" -msgstr "L'encodage des fontes usagères ne peut être que celui du système par défaut ou « ps »" +msgstr "" +"L'encodage des fontes usagères ne peut être que celui du système par défaut " +"ou « ps »" #: src/psgen.c:1220 #, c-format @@ -781,7 +804,8 @@ #: src/psgen.c:1352 msgid "malformed ^@epsf escape: no ']' after options" -msgstr "L'échappement ^@epsf mal composée: « ] » non retrouvé après les options." +msgstr "" +"L'échappement ^@epsf mal composée: « ] » non retrouvé après les options." #: src/psgen.c:1364 #, c-format @@ -794,7 +818,8 @@ #: src/psgen.c:1368 msgid "unexpected EOF while scanning ^@epsf escape" -msgstr "Fin de fichier (EOF) inattendue lors de l'examen des échappements ^@epsf" +msgstr "" +"Fin de fichier (EOF) inattendue lors de l'examen des échappements ^@epsf" #: src/psgen.c:1374 msgid "malformed ^@epsf escape: no '{' found" @@ -838,22 +863,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "Valeur invalide pour ^@bggray escape: %s." -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: ne peut faire le relais pour exécuter la commande « %s »: %s\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "Ne peut ouvrir le fichier EPS « %s »: %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "Le fichier EPS « %s » ne débute pas par « %%! » magic.\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -862,27 +882,27 @@ "Le fichier EPS « %s » contient une définition d'encadrement mal composée\n" "de type %%%%BoundingBox rangée:\"%.*s\".\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "Le fichier EPS « %s » est un fichier EPS invalide.\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" msgstr "traitement de tout le fichier pour le langage de sortie « %s »\n" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "Traitement du fichier %s « %s ».\n" -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, c-format msgid "couldn't create temporary divert file: %s" msgstr "Ne peut créer le fichier temporaire de déviation: %s" -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "Ne peut ré-ouvrir le fichier de déviation: %s." @@ -984,70 +1004,70 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "Ne peut ouvrir le fichier de description des fontes « %s »: %s.\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: format trop long l'échappement %%D{}." -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: séquence « %% » d'échappement inconnue « %c » (%d)." -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: « ) » manquante pour l'échappement $()." -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: format trop long pour un échappement $()." -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: format trop long pour un échappement $D{}." -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: séquence « $ » d'échappement inconnue « %c » (%d)." -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "La dimension en point flottant est mal composée: « %s »." -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "Ne peut ouvrir le filtre « %s » pour le fichier « %s »: %s." -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "Ne peut ouvrir le fichier d'entrée « %s »: %s." -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "fichier=%s\n" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "stdout" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "%s: ne peut ouvrir le fichier d'entrée « %s »." -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 msgid "couldn't create AFM library" msgstr "Ne peut ouvrir la librairie AFM." -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1068,15 +1088,15 @@ " sur stdout\n" " -V, --version afficher le nom et la version du logiciel\n" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "ERREUR: fin de fichier EOF dans le commentaire." -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "ERREUR: fin de fichier EOF dans une chaîne de constante" -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "ERREUR: fin de fichier EOF dans l'expression régulière." @@ -1085,32 +1105,32 @@ msgid "states for GNU %s %s" msgstr "états pout GNU %s %s" -#: states/main.c:254 +#: states/main.c:255 #, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "%s: la définition de variable est mal composée: « %s ».\n" -#: states/main.c:282 +#: states/main.c:283 #, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "%s: ne peut créer un fichier de sortie « %s »: %s.\n" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: niveau d'avertissement « %s » inconnu.\n" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "%s: mémoire épuisée.\n" -#: states/main.c:423 +#: states/main.c:424 #, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "%s: ne peut ouvrir le fichier d'entrée « %s »: %s.\n" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -1120,7 +1140,8 @@ "Les arguments obligatoires pour les option de formes longues\n" "le sont aussi pour les options de formes courtes.\n" -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1133,7 +1154,8 @@ " -W, --warning=LEVEL set the warning level to LEVEL\n" msgstr "" " -D, --define=VAR=VALEUR définir la VARiable et lui affecter la VALEUR\n" -" -f, --file=FICHIER lire la définition des états à partir du FICHIER\n" +" -f, --file=FICHIER lire la définition des états à partir du " +"FICHIER\n" " -h, --help afficher l'aide-mémoire\n" " -o, --output=FICHIER sauvegarder la sortie dans le FICHIER\n" " -p, --path=CHEMIN initialiser le CHEMIN de chargement\n" @@ -1172,7 +1194,9 @@ #, c-format msgid "" "%s: FATAL ERROR: States version %s or higher is required for this script\n" -msgstr "%s: ERREUR FATALE: la version %s ou plus récente est requise pour ce script.\n" +msgstr "" +"%s: ERREUR FATALE: la version %s ou plus récente est requise pour ce " +"script.\n" #: states/prims.c:610 states/prims.c:1276 #, c-format @@ -1194,7 +1218,8 @@ #: states/prims.c:700 #, c-format msgid "%s:%d: %s: illegal regexp character syntax: %c\n" -msgstr "%s:%d: %s: syntaxe illégale pour le caractère de l'expression régulière: %c\n" +msgstr "" +"%s:%d: %s: syntaxe illégale pour le caractère de l'expression régulière: %c\n" #: states/prims.c:915 #, c-format @@ -1214,7 +1239,8 @@ #: states/prims.c:1080 #, c-format msgid "%s:%d: %s: no extra options can be specified for %%s\n" -msgstr "%s:%d: %s: aucune option supplémentaire ne peut être spécifié avec %%s.\n" +msgstr "" +"%s:%d: %s: aucune option supplémentaire ne peut être spécifié avec %%s.\n" #: states/prims.c:1089 #, c-format @@ -1304,7 +1330,8 @@ #: states/utils.c:1085 #, c-format msgid "%s:%d: error: illegal rvalue for string assignment\n" -msgstr "%s:%d: ERREUR: affectation de chaîne illégale pour un type « rvalue ».\n" +msgstr "" +"%s:%d: ERREUR: affectation de chaîne illégale pour un type « rvalue ».\n" #: states/utils.c:1104 #, c-format @@ -1326,6 +1353,10 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "%s: autochargement de « %s » à partir de « %s »\n" +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "" +#~ "epsf: ne peut faire le relais pour exécuter la commande « %s »: %s\n" + #~ msgid "couldn't create toc file name: %s" #~ msgstr "Ne peut créer un fichier de table des matières: %s." --- enscript-1.6.4.orig/po/ca.po +++ enscript-1.6.4/po/ca.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: enscript 1.6.2\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 2002-08-14 12:24+0200\n" "Last-Translator: Ernest Adrogué Calveras \n" "Language-Team: Catalan \n" @@ -151,83 +152,83 @@ msgid "Unmatched ) or \\)" msgstr "Signe ) o \\) no correspost" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "Cap expressió regular prèvia" # Comprovar si aquesta cadena és adequada. -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N pàgina $3% de $3= %D{%d/%m/%Y} %T" # buscar una manera resumida -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "" "no s'ha pogut obtenir l'entrada de l'usuari uid=%d en el fitxer passwd: %s" -#: src/main.c:1088 +#: src/main.c:1099 #, fuzzy, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "no s'ha pogut obrir el fitxer de configuració \"%s/%s\": %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "" -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "codificació desconeguda: %s" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "no s'ha pogut obrir la biblioteca AFM: %s" @@ -235,7 +236,8 @@ # els paràmetres llx, llx, urx i ury són els quatre extrems que defineixen # la zona imprimible dins del paper, deuen ser l'abreviació d'alguna cosa # però de moment no ho tradueixo. -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -245,12 +247,12 @@ "nom ample\talçada\tllx\tlly\turx\tury\n" "------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "el suport \"%s\" és desconegut" -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" @@ -258,42 +260,43 @@ "nous valors marginals pel suport `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%" "d\n" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "el format d'etiqueta de pàgina \"%s\" és il·legal" -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "el format de caràcters no-imprimibles \"%s\" és il·legal" -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "l'estil de marca d'ajutstament de línia \"%s\" és il·legal" -#: src/main.c:1338 +#: src/main.c:1349 #, c-format msgid "illegal N-up argument: %d" msgstr "nombre de pàgines lògiques il·legal: %d" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "el nombre de pàgines lògiques ha de ser una potència de 2: %d" -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "la posició del peu de pàgina és incorrecta: %s" -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "l'estil del peu de pàgina és incorrecte: %s" -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" @@ -301,106 +304,106 @@ "Els següents llenguatges i formats suporten ressalt:\n" "\n" -#: src/main.c:1641 +#: src/main.c:1662 #, fuzzy, c-format msgid "couldn't create temporary toc file: %s" msgstr "no s'ha pogut crear el nom del fitxer índex: %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "no s'ha pogut obtenir l'estat del fitxer \"%s\": %s" -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "no s'ha pogut localitzar l'inici del fitxer índex: %s" # o «Taula de Continguts» -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "Índex" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "no s'ha generat res\n" -#: src/main.c:1748 +#: src/main.c:1773 #, c-format msgid "output sent to %s\n" msgstr "la sortida s'ha enviat a %s\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "l'impressora" -#: src/main.c:1751 +#: src/main.c:1776 #, c-format msgid "output left in %s\n" msgstr "la sortida s'ha deixat a %s\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d pàgines * %d còpies ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr " enviades a %s\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " deixades a %s\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d línies han estat %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "tallades" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "ajustades" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "s'han perdut %d caràcters\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "codis dels càracters que s'han perdut (en decimal):\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d caràcters no imprimibles\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "codis dels caràcters no imprimibles (en decimal):\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "no s'ha pogut obrir l'impressora `%s': %s" -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "no s'ha pogut crear el fitxer de sortida \"%s\": %s" -#: src/main.c:1880 +#: src/main.c:1905 #, fuzzy, c-format msgid "couldn't close output file \"%s\": %s" msgstr "no s'ha pogut crear el fitxer de sortida \"%s\": %s" -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -409,66 +412,68 @@ "error de sintaxi a la cadena %s=\"%s\":\n" "falta l'acabament de la cita: %c" -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" -msgstr "atenció: no es processaran les següents opcions de la variable d'entorn %s:\n" +msgstr "" +"atenció: no es processaran les següents opcions de la variable d'entorn %s:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " opció %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 #, fuzzy msgid "number of columns must be larger than zero" msgstr "l'aliniació de fitxer ha de ser un nombre positiu" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "l'aliniació de fitxer ha de ser un nombre positiu" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "tipus de lletra incorrecte: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "no s'ha trobat el fitxer de definicions \"%s.hdr\"" -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "s'ha d'imprimir almenys una línia per pàgina: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" -msgstr "%s: el caràcter de salt-de-línia és il·legal: '%s': s'esperava 'n' o 'r'\n" +msgstr "" +"%s: el caràcter de salt-de-línia és il·legal: '%s': s'esperava 'n' o 'r'\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "el punt d'inici de la secció vertical ha de ser un nombre positiu" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Proveu `%s --help' per obtenir més informació.\n" -#: src/main.c:2510 +#: src/main.c:2535 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -490,7 +495,8 @@ " -e, --escapes[=CHAR] enable special escape interpretation\n" msgstr "" "Sintaxi: %s [OPCIÓ]... [FITXER]...\n" -"Els arguments obligatoris per les opcions llargues també ho són per les curtes.\n" +"Els arguments obligatoris per les opcions llargues també ho són per les " +"curtes.\n" " -# un àlies de l'opció -n, --copies\n" " -1 el mateix que --columns=1\n" " -2 el mateix que --columns=2\n" @@ -499,7 +505,8 @@ " -A, --file-align=ALINEACIÓ alinea diversos fitxers a ALINEACIÓ\n" " -b, --header=ENCAPÇALAMENT defineix l'encapçalament\n" " -B, --no-header omet l'encapçalament\n" -" -c, --truncate-lines talla les línies llargues (per defecte les ajusta)\n" +" -c, --truncate-lines talla les línies llargues (per defecte les " +"ajusta)\n" " -C, --line-numbers[=INICI]\n" " enumera cada una de les línies\n" " -d un àlies de l'opció --printer\n" @@ -508,14 +515,15 @@ " codi PostScript generat\n" " -e, --escapes[=CARÀCTER] interpreta les seqüències especials d'escapada\n" -#: src/main.c:2530 -#, fuzzy +#: src/main.c:2555 +#, fuzzy, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr "" " -E, --pretty-print[=LLENGUATGE]\n" " imprimeix codi font de manera vistosa\n" -#: src/main.c:2533 +#: src/main.c:2558 +#, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -536,7 +544,8 @@ " --columns=1\n" msgstr "" " -f, --font=NOM usa NOM com a tipus de lletra pel document\n" -" -F, --header-font=NOM usa NOM com a tipus de lletra per l'encapçalament\n" +" -F, --header-font=NOM usa NOM com a tipus de lletra per " +"l'encapçalament\n" " -g, --print-anyway res (opció de compatibilitat)\n" " -G el mateix que --fancy-header\n" " --fancy-header[=NOM] fa un encapçalament de pàgina gràfic\n" @@ -553,7 +562,8 @@ "portrait,\n" " --columns=1\n" -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -571,14 +581,17 @@ " -r, --landscape print in landscape mode\n" " -R, --portrait print in portrait mode\n" msgstr "" -" -L, --lines-per-page=NÚM especifica quantes línies imprimir a cada pàgina\n" +" -L, --lines-per-page=NÚM especifica quantes línies imprimir a cada " +"pàgina\n" " -m, --mail envia un missatge electrònic en finalitzar\n" " -M, --media=NOM usa el suport de sortida NOM\n" " -n, --copies=NÚM imprimeix NÚM còpies de cada pàgina\n" " -N, --newline=SL selecciona el caràcter de salt-de-línia. Els\n" -" valors possibles de SL són: n (`\\n') i r (`\\r').\n" +" valors possibles de SL són: n (`\\n') i r (`" +"\\r').\n" " -o un àlies de l'opció --output\n" -" -O, --missing-characters fa una llista amb els caràcters que s'han perdut\n" +" -O, --missing-characters fa una llista amb els caràcters que s'han " +"perdut\n" " -p, --output=FITXER deixa la sortida a FITXER. Si FITXER és `-',\n" " l'envia a la sortida estàndard.\n" " -P, --printer=NOM envia la sortida a l'impressora NOM\n" @@ -586,8 +599,8 @@ " -r, --landscape imprimeix en sentit apaïsat\n" " -R, --portrait imprimeix en sentit normal\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -608,8 +621,10 @@ msgstr "" " -s, --baselineskip=NÚM fixa la distància entre línies en NÚM\n" " -S, --statusdict=NOM[:VALOR]\n" -" passa una definició `statusdict' al codi generat.\n" -" -t, --title=TÍTOL defineix el títol de la tasca d'impressió. També\n" +" passa una definició `statusdict' al codi " +"generat.\n" +" -t, --title=TÍTOL defineix el títol de la tasca d'impressió. " +"També\n" " defineix el nom del fitxer d'entrada stdin.\n" " -T, --tabsize=NÚM fixa la distància de tabulació en NÚM\n" " -u, --underlay[=TEXT] imprimeix TEXT al peu de cada pàgina\n" @@ -622,7 +637,8 @@ " -Z, --pass-through passa fitxers PostScript i PCL sense alterar-" "los\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -636,8 +652,8 @@ " --help print this help and exit\n" msgstr "" -#: src/main.c:2596 -#, fuzzy +#: src/main.c:2621 +#, fuzzy, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -659,7 +675,8 @@ " --help-pretty-print descriu tots els llenguatges i formats " "suportats\n" " per l'opció --pretty-print\n" -" --highlight-bar-gray=NÚM usa un gris NÚM (0 - 1) per les barres de ressalt\n" +" --highlight-bar-gray=NÚM usa un gris NÚM (0 - 1) per les barres de " +"ressalt\n" " --list-media mostra tots els suports coneguts\n" " --list-options mostra totes les opcions i els respectius " "valors\n" @@ -671,8 +688,8 @@ "representar\n" " els caràcters no imprimibles\n" -#: src/main.c:2607 -#, fuzzy +#: src/main.c:2632 +#, fuzzy, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -690,11 +707,12 @@ " --ps-level=NIVELL indica quin nivell del llenguatge PostScript " "ha\n" " d'utilitzar l'enscript\n" -" --printer-options=OPCIONS passa opcions addicionals a l'ordre d'impressió\n" +" --printer-options=OPCIONS passa opcions addicionals a l'ordre " +"d'impressió\n" " --rotate-even-pages gira les pàgines parell 180 graus\n" -#: src/main.c:2617 -#, fuzzy +#: src/main.c:2642 +#, fuzzy, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -711,14 +729,17 @@ " --slice=NÚM imprimeix la secció vertical definida per NÚM\n" " --style=ESTIL usa l'estil de ressalt ESTIL\n" " --toc imprimeix un índex\n" -" --ul-angle=ANGLE defineix l'inclinació del text del peu de pàgina\n" +" --ul-angle=ANGLE defineix l'inclinació del text del peu de " +"pàgina\n" " --ul-font=NOM usa el tipus de lletra NOM pel peu de pàgina\n" -" --ul-gray=NÚM imprimeix el peu de pàgina en gris de valor NÚM\n" +" --ul-gray=NÚM imprimeix el peu de pàgina en gris de valor " +"NÚM\n" " --ul-position=POSICIÓ defineix la posició inicial del peu de pàgina\n" " --ul-style=ESTIL imprimeix el peu de pàgina amb l'estil ESTIL\n" " --word-wrap ajusta les línies llargues a nivell de paraula\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -753,7 +774,8 @@ #: src/psgen.c:979 msgid "user font encoding can be only the system's default or `ps'" -msgstr "la codificació del tipus de lletra només pot ser la predeterminada o `ps'" +msgstr "" +"la codificació del tipus de lletra només pot ser la predeterminada o `ps'" #: src/psgen.c:1220 #, c-format @@ -820,23 +842,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "valor invàlid a la seqüència ^@bggray: %s" -# buscar alterncatives per `open pipe' -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: no s'ha pogut reconduir a l'ordre \"%s\": %s\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "no s'ha pogut obrir el fitxer EPS \"%s\": %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "el fitxer EPS \"%s\" no comença amb la combinació màgica \"%%!\"\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -845,29 +861,29 @@ "el fitxer EPS \"%s\" conté una línia %%%%BoundingBox incorrecta:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "el fitxer EPS \"%s\" no és un fitxer EPS vàlid\n" # estudiar detalladament l'opció -Z -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" msgstr "passant tots els fitxers de l'entrada al llenguatge `%s'\n" # estudiar l'opció -Z -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "passant el fitxer %s \"%s\"\n" -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, fuzzy, c-format msgid "couldn't create temporary divert file: %s" msgstr "no s'ha pogut crear el nom del fitxer temporal: %s" -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "no s'ha pogut localitzar l'inici del fitxer temporal: %s" @@ -960,70 +976,70 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "no s'ha pogut obrir la descripció de tipus de lletra \"%s\": %s\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: format massa llarg a la seqüència d'escapada %%D{}" -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: seqüència d'escapada `%%' desconeguda `%c' (%d)" -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: falta el ')' final a la seqüència $()" -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: nom de variable massa llarg a la seqüència $()" -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: format massa llarg a la seqüència $D{}" -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: seqüència d'escapada `$' desconeguda `%c' (%d)" -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "dimensió de nombres reals incorrecta: \"%s\"" -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "no s'ha pogut obrir el filtre d'entrada \"%s\" pel fitxer \"%s\": %s" -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "no s'ha pogut obrir el fitxer d'entrada \"%s\": %s" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "fitxer=%s\n" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "stdout (sortida estàndard)" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "%s: no s'ha pogut obrir el fitxer de sortida \"%s\"" -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 msgid "couldn't create AFM library" msgstr "no s'ha pogut crear la biblioteca AFM" -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1035,22 +1051,23 @@ " -V, --version print version number\n" msgstr "" "Sintaxi: %s [OPCIÓ]... FITXER...\n" -"Els arguments obligatoris per les opcions llargues també ho són per les curtes.\n" +"Els arguments obligatoris per les opcions llargues també ho són per les " +"curtes.\n" " -h, --help mostra aquesta ajuda i surt\n" " -p, --output-file=NOM escriu la sortida al fitxer NOM (el fitxer per\n" " defecte és font.map). Si NOM és `-', l'envia a la\n" " sortida estàndard.\n" " -V, --version mostra la versió del programa\n" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "error: final de fitxer en un comentari" -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "error: final de fitxer en una cadena constant" -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "error: final de fitxer en una expressió regular" @@ -1059,42 +1076,44 @@ msgid "states for GNU %s %s" msgstr "states pel GNU %s %s" -#: states/main.c:254 +#: states/main.c:255 #, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "%s: definició de variable incorrecta \"%s\"\n" -#: states/main.c:282 +#: states/main.c:283 #, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "%s: no s'ha pogut crear el fitxer de sortida \"%s\": %s\n" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: nivell d'alerta desconegut `%s'\n" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "%s: memòria esgotada\n" -#: states/main.c:423 +#: states/main.c:424 #, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "%s: no s'ha pogut obrir el fitxer d'entrada `%s': %s\n" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Sintaxi: %s [OPCIÓ]... [FITXER]...\n" -"Els arguments obligatoris per les opcions llargues també ho són per les curtes.\n" +"Els arguments obligatoris per les opcions llargues també ho són per les " +"curtes.\n" # path -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1146,7 +1165,8 @@ #, c-format msgid "" "%s: FATAL ERROR: States version %s or higher is required for this script\n" -msgstr "%s: ERROR FATAL: Aquest script requereix la versió d'states %s o superior\n" +msgstr "" +"%s: ERROR FATAL: Aquest script requereix la versió d'states %s o superior\n" #: states/prims.c:610 states/prims.c:1276 #, c-format @@ -1166,7 +1186,8 @@ #: states/prims.c:700 #, c-format msgid "%s:%d: %s: illegal regexp character syntax: %c\n" -msgstr "%s:%d: %s: la sintaxi del caràcter de l'expressió regular és il·legal: %c\n" +msgstr "" +"%s:%d: %s: la sintaxi del caràcter de l'expressió regular és il·legal: %c\n" #: states/prims.c:915 #, c-format @@ -1273,7 +1294,8 @@ #: states/utils.c:1034 #, c-format msgid "%s:%d: error: negative array reference index\n" -msgstr "%s:%d: error: l'índex de referència de la matriu és un nombre negatiu\n" +msgstr "" +"%s:%d: error: l'índex de referència de la matriu és un nombre negatiu\n" #: states/utils.c:1085 #, c-format @@ -1300,6 +1322,10 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "%s: carregant `%s' de `%s'\n" +# buscar alterncatives per `open pipe' +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "epsf: no s'ha pogut reconduir a l'ordre \"%s\": %s\n" + #~ msgid "couldn't create toc file \"%s\": %s" #~ msgstr "no s'ha pogut crear el fitxer índex \"%s\": %s" --- enscript-1.6.4.orig/po/sv.po +++ enscript-1.6.4/po/sv.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: enscript 1.6.3\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 2002-12-15 22:01+0100\n" "Last-Translator: Martin Sjögren \n" "Language-Team: Swedish \n" @@ -151,85 +152,86 @@ msgid "Unmatched ) or \\)" msgstr "Obalanserad ) eller \\)" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "Inget föregående reguljärt uttryck" -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N $3% sidor $4L rader $E $C" -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "kunde inte hämta passwd-post för uid=%d: %s" -#: src/main.c:1088 +#: src/main.c:1099 #, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "kunde inte läsa konfigurationsfilen \"%s/%s\": %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "Jag försökte också med följande kataloger:" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "\t%s" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "\t../lib" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "\t../../lib" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "Det här är förmodligen ett installationsfel. Försök bygga om:" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "\tmake distclean" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "\t./configure --prefix=PREFIX" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "\tmake" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "\tmake check" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "\tmake install" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "eller sätt miljövariabeln \"ENSCRIPT_LIBRARY\" att peka till din" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "bibliotekskatalog." -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "okänd kodning: %s" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "kunde inte öppna AFM-bibliotek: %s" -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -239,53 +241,56 @@ "namn bredd\thöjd\tnvx\tnvy\töhx\töhy\n" "------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "känner inte till något om formatet \"%s\"" -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" -msgstr "sätt nya marginaler för formatet \"%s\" (%d×%d): nvx=%d, nvy=%d, öhx=%d, öhy%d\n" +msgstr "" +"sätt nya marginaler för formatet \"%s\" (%d×%d): nvx=%d, nvy=%d, öhx=%d, öhy%" +"d\n" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "otillåtet sidetikettsformat \"%s\"" -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "otillåtet ej utskrivbart-format \"%s\"" -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "otillåten stil på radbrytningstecken: \"%s\"" -#: src/main.c:1338 +#: src/main.c:1349 #, c-format msgid "illegal N-up argument: %d" msgstr "otillåtet N-upp-argument: %d" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "N-upp-argument måste vara en potens av 2: %d" -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "felutformad underlagsposition: %s" -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "otillåten underlagsstil: %s" -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" @@ -293,105 +298,105 @@ "Syntaxmarkering stöds för följande språk och filformat:\n" "\n" -#: src/main.c:1641 +#: src/main.c:1662 #, c-format msgid "couldn't create temporary toc file: %s" msgstr "kunde inte skapa temporär innehållsfil: %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "kunde inte ta status på indatafilen \"%s\": %s" -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "kunde inte spola tillbaks innehållsfilen: %s" -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "Innehåll" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "ingen utdata genererad\n" -#: src/main.c:1748 +#: src/main.c:1773 #, c-format msgid "output sent to %s\n" msgstr "utdata skickad till %s\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "skrivare" -#: src/main.c:1751 +#: src/main.c:1776 #, c-format msgid "output left in %s\n" msgstr "utdata lämnad i %s\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d sidor * %d kopia ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr " skickad till %s\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " lämnad i %s\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d rader blev %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "avkortade" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "radbrutna" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "%d tecken saknades\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "saknade teckenkoder (decimalt):\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d ej utskrivbara tecken\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "ej utskrivbara teckenkoder (decimalt):\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "kunde inte öppna skrivaren \"%s\": %s" -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "kunde inte skapa utdatafilen \"%s\": %s" -#: src/main.c:1880 +#: src/main.c:1905 #, c-format msgid "couldn't close output file \"%s\": %s" msgstr "kunde inte stänga utdatafilen \"%s\": %s" -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -400,66 +405,66 @@ "syntaxfel i flaggsträngen %s=\"%s\":\n" "saknar slut på citering: %c" -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" msgstr "varning: behandlade inte följande flaggor från miljövariabeln %s:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " flaggan %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 msgid "number of columns must be larger than zero" msgstr "antalet kolumner måste vara större än noll" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "filgrupperingen måste vara större än noll" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "felutformad typsnittsspecifikation: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "kunde inte hitta huvuddefinitionsfil \"%s.hdr\"" -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "måste skriva ut åtminstone en rad per sida: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" msgstr "%s: otillåtet nyradstecken: \"%s\"': väntade \"n\" eller \"r\"\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "" "felformulerat argument \"%s\" till flaggan -W, --option: inget komma funnet" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "specifikation av hjälpapplikation måste vara ett enda tecken: %s" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "skivnumret måste vara större än noll" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prova \"%s --help\" för mer information.\n" -#: src/main.c:2510 +#: src/main.c:2535 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -481,7 +486,8 @@ " -e, --escapes[=CHAR] enable special escape interpretation\n" msgstr "" "Användning: %s [FLAGGA]... [FIL]...\n" -"Obligatoriska argument till långa flaggor är obligatoriska även för de korta.\n" +"Obligatoriska argument till långa flaggor är obligatoriska även för de " +"korta.\n" " -# ett alias för -n, --copies\n" " -1 samma som --columns=1\n" " -2 samma som --columns=2\n" @@ -498,11 +504,13 @@ " ange en sidenhetsdefinition till utdatan\n" " -e, --escapes[=TECKEN] tillåt speciell kontrollsekvenstolkning\n" -#: src/main.c:2530 +#: src/main.c:2555 +#, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr " -E, --highlight[=SPRÅK] Syntaxmarkera källkod\n" -#: src/main.c:2533 +#: src/main.c:2558 +#, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -535,12 +543,14 @@ " -J, ett alias för flaggan --title\n" " -k, --page-prefeed tillåt förmatning av sidor\n" " -K, --no-page-prefeed tillåt inte förmatning av sidor\n" -" -l, --lineprinter simulera en radskrivare, detta är ett alias för:\n" +" -l, --lineprinter simulera en radskrivare, detta är ett alias " +"för:\n" " --lines-per-page=66, --no-header, --" "portrait,\n" " --columns=1\n" -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -558,7 +568,8 @@ " -r, --landscape print in landscape mode\n" " -R, --portrait print in portrait mode\n" msgstr "" -" -L, --lines-per-page=NUM ange antalet rader som ska skrivas på varje sida\n" +" -L, --lines-per-page=NUM ange antalet rader som ska skrivas på varje " +"sida\n" " -m, --mail skicka ett e-post när det är klart\n" " -M, --media=NAMN använd utdataformatet NAMN\n" " -n, --copies=NUM skriv ut NUM kopior av varje sida\n" @@ -573,8 +584,8 @@ " -r, --landscape skriv ut i landskapsläge\n" " -R, --portrait skriv ut i porträttläge\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -612,7 +623,8 @@ " -Z, --pass-through skicka genom PostScript- och PCL-filer utan\n" " några ändringar\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -636,8 +648,8 @@ " --h-column-height=HÖJD sätt den horisontella kolumnhöjden till HÖJD\n" " --help visa denna hjälptexten och avsluta\n" -#: src/main.c:2596 -#, fuzzy +#: src/main.c:2621 +#, fuzzy, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -659,7 +671,8 @@ " markera radbrutna rader i utdatan med STIL\n" " --non-printable-format=FMT ange hur ej utskrivbara tecken ska skrivas ut\n" -#: src/main.c:2607 +#: src/main.c:2632 +#, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -672,9 +685,11 @@ " --rotate-even-pages rotate even-numbered pages 180 degrees\n" msgstr "" " --nup-columnwise lägg ut sidor i kolumner i N-upp-utskrift\n" -" --nup-xpad=NUM sätt sidans x-utfyllning för N-upp-utskrift till\n" +" --nup-xpad=NUM sätt sidans x-utfyllning för N-upp-utskrift " +"till\n" " NUM\n" -" --nup-ypad=NUM sätt sidans y-utfyllning för N-upp-utskrift till\n" +" --nup-ypad=NUM sätt sidans y-utfyllning för N-upp-utskrift " +"till\n" " NUM\n" " --page-label-format=FMT sätt sidetikettsformatet till FMT\n" " --ps-level=NIVÅ sätt PostScript-språknivån som enscript ska\n" @@ -683,7 +698,8 @@ "utskriftskommandot\n" " --rotate-even-pages rotera sidor med jämnt nummer 180°\n" -#: src/main.c:2617 +#: src/main.c:2642 +#, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -709,7 +725,8 @@ " --ul-style=STIL skriv ut underlagor med stilen STIL\n" " --word-wrap radbryt långa rader vid ordgränser\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -812,22 +829,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "ogiltigt värde för kontrollsekvensen ^@bggray: %s" -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: kunde inte öppna rör till kommandot \"%s\": %s\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "kunde inte öppna EPS-filen \"%s\": %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "EPS-filen \"%s\" börjar inte med \"%%!\"-magi\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -836,27 +848,27 @@ "EPS-filen \"%s\" innehåller felutformad %%%%BoundingBox-rad:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "EPS-filen \"%s\" är inte en giltig EPS-fil\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" msgstr "skickar vidare alla indatafiler för utdataspråket \"%s\"\n" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "skickar vidare %s-filen \"%s\"\n" -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, c-format msgid "couldn't create temporary divert file: %s" msgstr "kunde inte skapa temporär omdirigeringsfil: %s" -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "kunde inte spola tillbaks omdirigeringsfilen: %s" @@ -929,7 +941,9 @@ #: src/util.c:896 #, c-format msgid "couldn't open AFM file for font \"%s\", using default\n" -msgstr "kunde inte öppna AFM-fil för typsnittet \"%s\", använder standardalternativet\n" +msgstr "" +"kunde inte öppna AFM-fil för typsnittet \"%s\", använder " +"standardalternativet\n" #: src/util.c:903 #, c-format @@ -946,70 +960,70 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "kunde inte öppna beskrivningsfilen \"%s\" för typsnittet: %s\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: för långt format för %%D{}-kontrollsekvens" -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: okänd \"%%\"-kontrollsekvens \"%c\" (%d)" -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: ingen avslutande \")\" för $()-kontrollsekvens" -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: för långt variabelnamn för $()-kontrollsekvens" -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: för långt format för $D{}-kontrollsekvens" -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: okänd \"$\"-kontrollsekvens \"%c\" (%d)" -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "felutformad flyttalsdimension: \"%s\"" -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "kunde inte öppna indatafiltret \"%s\" för filen \"%s\": %s" -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "kunde inte öppna indatafilen \"%s\": %s" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "fil=%s\n" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "standard ut" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "%s: kunde inte öppna utdatafilen \"%s\"" -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 msgid "couldn't create AFM library" msgstr "kunde inte skapa AFM-bibliotek" -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1021,22 +1035,23 @@ " -V, --version print version number\n" msgstr "" "Användning: %s [FLAGGA]... FIL...\n" -"Obligatoriska argument till långa flaggor är obligatoriska även för de korta.\n" +"Obligatoriska argument till långa flaggor är obligatoriska även för de " +"korta.\n" " -h, --help visa den här hjälptexten och avsluta\n" " -p, --output-file=NAMN skriv utdatan till filen NAMN (standardvalet är\n" " font.map). Om FIL är \"-\" skicka utdatan till\n" " stdandard ut.\n" " -V, --version visa versionsnummer\n" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "fel: filslut inom kommentar" -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "fel: filslut inom strängkonstant" -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "fel: filslut inom reguljärt uttryck" @@ -1045,41 +1060,43 @@ msgid "states for GNU %s %s" msgstr "tillstånd för GNU %s %s" -#: states/main.c:254 +#: states/main.c:255 #, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "%s: felutformad variabeldefinition \"%s\"\n" -#: states/main.c:282 +#: states/main.c:283 #, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "%s: kunde inte skapa utdatafilen \"%s\": %s\n" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: okänd varningsnivå \"%s\"\n" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "%s: minnet slut\n" -#: states/main.c:423 +#: states/main.c:424 #, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "%s: kunde inte öppna indatafilen \"%s\": %s\n" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Användning: %s [FLAGGA]... [FIL]...\n" -"Obligatoriska argument till långa flaggor är obligatoriska även för de korta.\n" +"Obligatoriska argument till långa flaggor är obligatoriska även för de " +"korta.\n" -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1131,7 +1148,9 @@ #, c-format msgid "" "%s: FATAL ERROR: States version %s or higher is required for this script\n" -msgstr "%s: ÖDESDIGERT FEL: Tillstånd av version %s eller över krävs för detta skript\n" +msgstr "" +"%s: ÖDESDIGERT FEL: Tillstånd av version %s eller över krävs för detta " +"skript\n" #: states/prims.c:610 states/prims.c:1276 #, c-format @@ -1283,6 +1302,9 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "%s: läser in \"%s\" automatiskt från \"%s\"\n" +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "epsf: kunde inte öppna rör till kommandot \"%s\": %s\n" + #~ msgid "couldn't create toc file name: %s" #~ msgstr "kunde inte skapa innehållsfilnamn: %s" --- enscript-1.6.4.orig/po/sl.po +++ enscript-1.6.4/po/sl.po @@ -7,7 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: enscript 1.4.0\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 1996-09-09 22:47 METDST\n" "Last-Translator: Primoz Peterlin \n" "Language-Team: Slovenian \n" @@ -153,85 +154,86 @@ msgid "Unmatched ) or \\)" msgstr "" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "" -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "" -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "passwd ne vsebuje podatkov za UID=%d: %s" -#: src/main.c:1088 +#: src/main.c:1099 #, fuzzy, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "konfiguracijske datoteke \"%s/%s\" ni mogoèe odpreti: %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "" -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "neznani kodni nabor: %s" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "knji¾nice AFM ni mogoèe odpreti: %s" -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -241,160 +243,161 @@ "ime ¹irina\tvi¹ina\tLLX\tLLY\tURX\tURY\n" "------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "format papirja \"%s\" je neznan" -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" msgstr "" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "nedovoljena oznaka strani \"%s\"" # POZOR!!! Tole je zelo grdo... -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "nedovoljen non-printable format \"%s\"" -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "" -#: src/main.c:1338 +#: src/main.c:1349 #, fuzzy, c-format msgid "illegal N-up argument: %d" msgstr "nedovoljena izbira: %s" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "" # POZOR!!! -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "slabo oblikovana pozicija podlage: %s" # POZOR!!! -#: src/main.c:1443 +#: src/main.c:1454 #, fuzzy, c-format msgid "illegal underlay style: %s" msgstr "nedovoljen stil podlage: %s" -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" msgstr "" -#: src/main.c:1641 +#: src/main.c:1662 #, fuzzy, c-format msgid "couldn't create temporary toc file: %s" msgstr "preusmerjene izhodne datoteke ni mogoèe zapisati: %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "ni moè priti do podatkov o datoteki \"%s\": %s" -#: src/main.c:1708 +#: src/main.c:1729 #, fuzzy, c-format msgid "couldn't rewind toc file: %s" msgstr "preusmerjene datoteke ni moè vrniti na zaèetek: %s" -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "" -#: src/main.c:1748 +#: src/main.c:1773 #, fuzzy, c-format msgid "output sent to %s\n" msgstr " poslano na %s\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "tiskalnik" -#: src/main.c:1751 +#: src/main.c:1776 #, fuzzy, c-format msgid "output left in %s\n" msgstr " ostalo na %s\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d strani * %d kopij ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr " poslano na %s\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " ostalo na %s\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d vrstic je bilo %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "odrezanih" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "nadaljevanih v naslednji vrstici" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "%d znakov je manjkalo\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "kode manjkajoèih znakov (decimalno):\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d znakov, ki se jih ne da natisniti\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "kode znakov, ki se jih ne da natisniti (decimalno):\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "tiskalnik ,%s' ni dostopen: %s" -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "izhodne datoteke \"%s\" ni mogoèe zapisati: %s" -#: src/main.c:1880 +#: src/main.c:1905 #, fuzzy, c-format msgid "couldn't close output file \"%s\": %s" msgstr "izhodne datoteke \"%s\" ni mogoèe zapisati: %s" -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -403,65 +406,65 @@ "sintaktièna napaka pri izbiri %s=\"%s\":\n" "manjka konèni narekovaj: %c" -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" msgstr "pozor: naslednje izbire v spremenljivki %s niso bile obdelane:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " izbira %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 msgid "number of columns must be larger than zero" msgstr "" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "slabo naveden font: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "datoteke \"%s.hdr\" z definicijo glave ni mogoèe najti" -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "na vsaki strani mora biti vsaj ena vrstica: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" msgstr "%s: ,%s' ni dovoljeni znak za novo vrstico: ,n' ali ,r' sta\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Poskusite ,%s --help' za ob¹irnej¹e informacije.\n" -#: src/main.c:2510 +#: src/main.c:2535 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -498,12 +501,13 @@ " definicijo enote strani posredujemo na izhod\n" " -e, --escapes[=ZNAK] omogoèenje posebnih ube¾nih sekvenc\n" -#: src/main.c:2530 +#: src/main.c:2555 +#, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr "" -#: src/main.c:2533 -#, fuzzy +#: src/main.c:2558 +#, fuzzy, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -533,7 +537,8 @@ " -i, --indent=NUM zamik levega roba NUM znakov\n" " -I, --filter=CMD pri branju vhodnih datotek uporabimo filter " "CMD\n" -" -j, --borders okvirji okoli stolpcev pri odtisu v veè stolpcih\n" +" -j, --borders okvirji okoli stolpcev pri odtisu v veè " +"stolpcih\n" " -k, --page-prefeed omogoèimo ,page prefeed'\n" " -K, --no-page-prefeed onemogoèimo ,page prefeed'\n" " -l, --lineprinter imitacija vrstiènega tiskalnika; sinonim za:\n" @@ -541,8 +546,8 @@ "portrait,\n" " --columns=1\n" -#: src/main.c:2551 -#, fuzzy +#: src/main.c:2576 +#, fuzzy, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -575,8 +580,8 @@ " -r, --landscape podol¾ni odtis\n" " -R, --portrait pokonèni odtis (privzeta izbira)\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -609,7 +614,8 @@ " -Z, --pass-through datoteke v formatu PostScript ali PCL\n" " odtisni brez sprememb\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -623,7 +629,8 @@ " --help print this help and exit\n" msgstr "" -#: src/main.c:2596 +#: src/main.c:2621 +#, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -636,7 +643,8 @@ " --non-printable-format=FMT specify how non-printable chars are printed\n" msgstr "" -#: src/main.c:2607 +#: src/main.c:2632 +#, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -649,7 +657,8 @@ " --rotate-even-pages rotate even-numbered pages 180 degrees\n" msgstr "" -#: src/main.c:2617 +#: src/main.c:2642 +#, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -664,7 +673,8 @@ " --word-wrap wrap long lines from word boundaries\n" msgstr "" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -764,22 +774,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "neveljavna vrednost za ube¾no sekvenco ^@shade: %s" -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: cevi ni mogoèe speljati do ukaza \"%s\": %s\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "datoteke \"%s\" v obliki EPS ni mogoèe odpreti: %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "datoteka \"%s\" v obliki EPS se ne zaène z \"%%!\"\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -788,27 +793,27 @@ "Datoteka \"%s\" v obliki EPS vsebuje nepravilno vrstico %%%%BoundingBox:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "Datoteka \"%s\" ni v obliki EPS\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" msgstr "" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "posredujemo %s datoteko \"%s\"\n" -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, fuzzy, c-format msgid "couldn't create temporary divert file: %s" msgstr "preusmerjene izhodne datoteke ni mogoèe zapisati: %s" -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, fuzzy, c-format msgid "couldn't rewind divert file: %s" msgstr "preusmerjene datoteke ni moè vrniti na zaèetek: %s" @@ -898,71 +903,71 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "datoteke z opisom fonta \"%s\" ni moè odpreti: %s\n" -#: src/util.c:1387 +#: src/util.c:1389 #, fuzzy, c-format msgid "%s: too long format for %%D{} escape" msgstr "%%Format: predolg format za ube¾no sekvenco %%D{}" -#: src/util.c:1472 +#: src/util.c:1474 #, fuzzy, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%%Format: neprepoznana ,%%' ube¾na sekvenca `%c' (%d)" -#: src/util.c:1510 +#: src/util.c:1512 #, fuzzy, c-format msgid "%s: no closing ')' for $() escape" msgstr "%%Format: manjka zaklepaj za ube¾no sekvenco $()" -#: src/util.c:1513 +#: src/util.c:1515 #, fuzzy, c-format msgid "%s: too long variable name for $() escape" msgstr "%%Format: predolgo ime spremenljivke za ube¾no sekvenco $()" -#: src/util.c:1540 +#: src/util.c:1542 #, fuzzy, c-format msgid "%s: too long format for $D{} escape" msgstr "%%Format: predolgo formatno doloèilo za ube¾no sekvenco $D{}" -#: src/util.c:1628 +#: src/util.c:1630 #, fuzzy, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%%Format: neprepoznana ,$' ube¾na sekvenca `%c' (%d)" -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "neustrezne dimenzije: \"%s\"" -#: src/util.c:1936 +#: src/util.c:1943 #, fuzzy, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "vhodnega filtra \"%s\" za datoteko \"%s\" ni moè odpreti: %s" -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "vhodne datoteke \"%s\" ni mogoèe odpreti: %s" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, fuzzy, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "vhodne datoteke \"%s\" ni mogoèe odpreti: %s" -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 #, fuzzy msgid "couldn't create AFM library" msgstr "knji¾nice AFM ni mogoèe odpreti: %s" -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -974,15 +979,15 @@ " -V, --version print version number\n" msgstr "" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "" -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "" -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "" @@ -991,39 +996,40 @@ msgid "states for GNU %s %s" msgstr "" -#: states/main.c:254 +#: states/main.c:255 #, fuzzy, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "neustrezne dimenzije: \"%s\"" -#: states/main.c:282 +#: states/main.c:283 #, fuzzy, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "izhodne datoteke \"%s\" ni mogoèe zapisati: %s" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "" -#: states/main.c:423 +#: states/main.c:424 #, fuzzy, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "vhodne datoteke \"%s\" ni mogoèe odpreti: %s" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1218,6 +1224,9 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "" +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "epsf: cevi ni mogoèe speljati do ukaza \"%s\": %s\n" + #, fuzzy #~ msgid "couldn't create toc file \"%s\": %s" #~ msgstr "izhodne datoteke \"%s\" ni mogoèe zapisati: %s" @@ -1255,8 +1264,10 @@ #~ " --non-printable-format=FMT kako naj se izpi¹ejo non-printable znaki\n" #~ " --page-label-format=FMT doloèimo, kako se izpi¹e oznaka strani\n" #~ " --printer-options=IZBIRE dodatne izbire, ki jih podamo tiskalniku\n" -#~ " --ul-angle=KOT KOT, pod katerim naj se izpi¹e besedilo v podlagi\n" -#~ " --ul-font=IME font, v katerem se izpi¹e besedilo v podlagi\n" +#~ " --ul-angle=KOT KOT, pod katerim naj se izpi¹e besedilo v " +#~ "podlagi\n" +#~ " --ul-font=IME font, v katerem se izpi¹e besedilo v " +#~ "podlagi\n" #~ " --ul-gray=NUM stopnja sivine za besedilo v podlagi (0 - " #~ "1)\n" #~ " --ul-position=POS podlaga naj se zaène na mestu POS\n" --- enscript-1.6.4.orig/po/pt_BR.po +++ enscript-1.6.4/po/pt_BR.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU enscript 1.6.2\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 2000-11-01 14:00+0300\n" "Last-Translator: Cyro Mendes De Moraes Neto \n" "Language-Team: Brazilian Portuguese \n" @@ -151,85 +152,86 @@ msgid "Unmatched ) or \\)" msgstr "Não combina ) ou \\)" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "Sem expressão regular próxima" -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N $3% páginas $4L linhas $E $C" -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "não foi possível obter a contrasenha para uid=%d: %s" -#: src/main.c:1088 +#: src/main.c:1099 #, fuzzy, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "não foi possível abrir o arquivo de configuração \"%s/%s\": %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "" -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "codificação desconhecida: %s" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "não foi possível abrir a biblioteca AFM: %s" -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -239,12 +241,12 @@ "nome largura\taltura\tllx\tlly\turx\tury\n" "------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "nada conhecido sobre o dispositivo \"%s\"" -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" @@ -252,42 +254,43 @@ "configure novas margens para dispositivo `%s' (%dx%d): llx=%d, lly=%d, urx=%" "d, ury=%d\n" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "formato incorreto do rótulo da página \"%s\"" -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "formato incorreto do nao imprimível \"%s\"" -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "estilo ilegal para marcador de linha quebrada: \"%s\"" -#: src/main.c:1338 +#: src/main.c:1349 #, c-format msgid "illegal N-up argument: %d" msgstr "argumento N-up ilegal: %d" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "o arugmento N-up deve ser potência de 2: %d" -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "posição underlay mal elaborada: %s" -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "estilo underlay ilegal: %s" -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" @@ -295,105 +298,105 @@ "O destaque é suportado para os idiomas e formatos a seguir:\n" "\n" -#: src/main.c:1641 +#: src/main.c:1662 #, fuzzy, c-format msgid "couldn't create temporary toc file: %s" msgstr "não foi possível criar o nome do arquivo de índice : %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "não foi possível avaliar arquivo de entrada \"%s\": %s" -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "não foi possível reverter o arquivo de índice: %s" -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "Tabela de Conteúdo" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "saída não gerada\n" -#: src/main.c:1748 +#: src/main.c:1773 #, c-format msgid "output sent to %s\n" msgstr "enviar saída para %s\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "impressora" -#: src/main.c:1751 +#: src/main.c:1776 #, c-format msgid "output left in %s\n" msgstr "saída esquerda em %s\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[%d páginas * %d cópia ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr "enviar para %s\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " esquerda em %s\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d linhas onde %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "truncado" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "envolvido" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "%d caracteres estavam faltando\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "faltando códigos de caractere (decimal):\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d caracteres não imprimíveis\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "códigos caracter(decimal) não imprimíveis:\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "não foi possível abrir impressora `%s': %s" -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "não foi possível criar o arquivo de saída \"%s\": %s" -#: src/main.c:1880 +#: src/main.c:1905 #, fuzzy, c-format msgid "couldn't close output file \"%s\": %s" msgstr "não foi possível criar o arquivo de saída \"%s\": %s" -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -402,66 +405,70 @@ "Erro de sintaxe na string de opção %s=\"%s\":\n" "Faltando fim do trecho: %c" -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" -msgstr "cuidado: não processou as opções a seguir a partir da variável de ambiente %s:\n" +msgstr "" +"cuidado: não processou as opções a seguir a partir da variável de ambiente %" +"s:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " opção %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 #, fuzzy msgid "number of columns must be larger than zero" msgstr "alinhamento de arquivo deve ser maior do que zero" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "alinhamento de arquivo deve ser maior do que zero" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "especificação de fonte mal elaborada: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "não pode encontrar o cabeçalho de definição do arquivo \"%s.hdr\"" -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "deve imprimir pelo menos uma linha por página: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" -msgstr "%s: especificador de caractere de nova linha inválido: '%s': exceto 'n' ou 'r'\n" +msgstr "" +"%s: especificador de caractere de nova linha inválido: '%s': exceto 'n' ou " +"'r'\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "divisão deve ser maior do que zero" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Tente `%s --help' para maiores informações.\n" -#: src/main.c:2510 +#: src/main.c:2535 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -483,7 +490,8 @@ " -e, --escapes[=CHAR] enable special escape interpretation\n" msgstr "" "Uso: %s [OPÇÃO]... [ARQUIVO]...\n" -"Argumentos obrigatórios para opções longas são obrigatórios para opções curtas.\n" +"Argumentos obrigatórios para opções longas são obrigatórios para opções " +"curtas.\n" " -# \t\t\t\t\t\t um alias para opção -n, --copies\n" " -1 mesmo que --columns=1\n" " -2 mesmo que --columns=2\n" @@ -498,15 +506,17 @@ "\t\t\t\t\t\t\t precede cada linha com seu número de linha\n" " -d um alias para opção --printer\n" " -D, --setpagedevice=KEY[:VALUE]\n" -"\t\t\t\t passa uma definição de dispositivo de página para a saída\n" +"\t\t\t\t passa uma definição de dispositivo de página para a " +"saída\n" " -e, --escapes[=CHAR] \t habilita interpretação de escape especial\n" -#: src/main.c:2530 -#, fuzzy +#: src/main.c:2555 +#, fuzzy, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr " -E, --pretty-print[=LANG] código fonte pretty-print\n" -#: src/main.c:2533 +#: src/main.c:2558 +#, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -533,18 +543,22 @@ " \t --fancy-header[=NOME] seleciona cabeçalho de página adernado\n" " -h, --no-job-header \t suprime a página do cabeçalho do trabalho\n" " -H, --highlight-bars=NUM especificar quanto de destaque as barras são\n" -" -i, --indent=NUM \t \t configurar indentação de linha para caracteres NUM\n" -" -I, --filter=CMD \t \t ler arquivos de entrada através do filtro de entrada CMD\n" +" -i, --indent=NUM \t \t configurar indentação de linha para caracteres " +"NUM\n" +" -I, --filter=CMD \t \t ler arquivos de entrada através do filtro de " +"entrada CMD\n" " -j, --borders \t\t\t imprimir bordas ao redor das colunas\n" " -J, \t\t\t\t\t uma opção de alias --title\n" " -k, --page-prefeed \t habilita pré-alimentação de página\n" " -K, --no-page-prefeed \t desabilita pré-alimentação de página\n" -" -l, --lineprinter \t\t simular impressora de linha, este é um alias para:\n" +" -l, --lineprinter \t\t simular impressora de linha, este é um alias " +"para:\n" " --lines-per-page=66, --no-header, --" "portrait,\n" " --columns=1\n" -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -562,7 +576,8 @@ " -r, --landscape print in landscape mode\n" " -R, --portrait print in portrait mode\n" msgstr "" -" -L, --lines-per-page=NUM especificar quantas linhas são impressas em cada página\n" +" -L, --lines-per-page=NUM especificar quantas linhas são impressas em " +"cada página\n" " -m, --mail \t enviar mensagem quando completo\n" " -M, --media=NOME \t\t usar media de saída NAME\n" " -n, --copies=NUM \t\t imprimir cópias NUM para cada página\n" @@ -570,15 +585,16 @@ " \t valores para NL são ('\\') e r (`\\r').\n" " -o \t um alias para opção --output\n" " -O, --missing-characters listar caracteres ausentes\n" -" -p, --output=ARQUIVO \t deixar saída para arquivo FILE. Se FILE for `-',\n" +" -p, --output=ARQUIVO \t deixar saída para arquivo FILE. Se FILE for " +"`-',\n" " deixar saída para stdout.\n" " -P, --printer=NOME \t imprimir saída para impressora NAME\n" " -q, --quiet, --silent estar realmente quieto\n" " -r, --landscape \t\t imprimir em modo paisagem\n" " -R, --portrait \t\t imprimir em modo retrato\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -600,20 +616,24 @@ " -s, --baselineskip=NUM \t configurar baselineskip para NUM\n" " -S, --statusdict=KEY[:VALUE]\n" " \t\t\t\t\t passar uma definição statusdict para a saída\n" -" -t, --title=TITULO \t\t configurar um título de trabalho para a página do TITLE. Opção\n" +" -t, --title=TITULO \t\t configurar um título de trabalho para a página " +"do TITLE. Opção\n" "\t \t\t\t\t configura também o nome do arquivo de entrada stdin.\n" " -T, --tabsize=NUM \t configurar tamanho de tabulador para NUM\n" " -u, --underlay[=TEXTO] \t imprimir TEXT sob cada página\n" -" -U, --nup=NUM \t\t imprimir páginas lógicas NUM em cada página de saída\n" +" -U, --nup=NUM \t\t imprimir páginas lógicas NUM em cada página de " +"saída\n" " -v, --verbose \t\t informa o que se está fazendo\n" " -V, --version \t imprime número da versão\n" " -W, --language=LING. \t configura língua de saída para LANG\n" " -X, --encoding=NOME \t usa codificação de entrada NAME\n" -" -z, --no-formfeed \t não interpreta forma de caracteres de alimentação\n" +" -z, --no-formfeed \t não interpreta forma de caracteres de " +"alimentação\n" " -Z, --pass-through \t passa através do PostScript e arquivos PCL\n" " \t\t sem qualquer modificações\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -627,8 +647,8 @@ " --help print this help and exit\n" msgstr "" -#: src/main.c:2596 -#, fuzzy +#: src/main.c:2621 +#, fuzzy, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -643,7 +663,8 @@ "Somente opções longas:\n" " --color[=bool] \t\t criar cores de saída com estados\n" " --download-font=NOME \t baixar fonte NAME\n" -" -filter-stdin=NOME \t especificar como stding é mostrado ao filtro de entrada\n" +" -filter-stdin=NOME \t especificar como stding é mostrado ao filtro de " +"entrada\n" " --h-column-height=ALTURA configurar a altura da coluna horizontal para " "ALTURA\n" " --help \t\t imprimir esta ajuda e sair\n" @@ -657,10 +678,11 @@ " \t\t\t\t\t ajustar margens de página\n" " --mark-wrapped-lines[ESTILO]\n" " \t\t\t marcar linhas envoltas na saída com ESTILO\n" -" --non-printable-format=FMT especificar como caracteres não imprimíveis são impressos\n" +" --non-printable-format=FMT especificar como caracteres não imprimíveis são " +"impressos\n" -#: src/main.c:2607 -#, fuzzy +#: src/main.c:2632 +#, fuzzy, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -672,16 +694,21 @@ " --printer-options=OPTIONS pass extra options to the printer command\n" " --rotate-even-pages rotate even-numbered pages 180 degrees\n" msgstr "" -" --nup-xpad=NUM \t configurar a página x-padding de impressão N-up para NUM\n" -" --nup-ypad-NUM \t\t configurar a página y-padding de N-up imprimindo para NUM\n" -" --page-label-format=FMT configurar formato do rótulo da página para FMT\n" -" --ps-level=NIVEL \t configurar o nível da linguagem de PostScript que o enscript\n" +" --nup-xpad=NUM \t configurar a página x-padding de impressão N-up " +"para NUM\n" +" --nup-ypad-NUM \t\t configurar a página y-padding de N-up imprimindo " +"para NUM\n" +" --page-label-format=FMT configurar formato do rótulo da página para " +"FMT\n" +" --ps-level=NIVEL \t configurar o nível da linguagem de PostScript " +"que o enscript\n" " \t\t\t\t\t\t deve usar\n" -" --printer-options=OPÇÕES passar opções extras para o comando de impresso\n" +" --printer-options=OPÇÕES passar opções extras para o comando de " +"impresso\n" " --rotate-even-pages \t rotacionar páginas numeradas pare em 180 graus\n" -#: src/main.c:2617 -#, fuzzy +#: src/main.c:2642 +#, fuzzy, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -705,7 +732,8 @@ " --ul-style=STYLE \t imprimir base com estilo STYLE\n" " --word-wrap \t\t envolver linhas longas dos limites de palavras\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -726,7 +754,9 @@ #: src/psgen.c:464 #, c-format msgid "couldn't find header definition file \"%s.hdr\": %s\n" -msgstr "não foi possível encontrar o cabeçalho de definição doarquivo \"%s.hdr\": %s\n" +msgstr "" +"não foi possível encontrar o cabeçalho de definição doarquivo \"%s.hdr\": %" +"s\n" #: src/psgen.c:608 #, c-format @@ -740,7 +770,8 @@ #: src/psgen.c:979 msgid "user font encoding can be only the system's default or `ps'" -msgstr "codificação de fonte de usuário pode ser somente o padrão do sistema ou `ps'" +msgstr "" +"codificação de fonte de usuário pode ser somente o padrão do sistema ou `ps'" #: src/psgen.c:1220 #, c-format @@ -807,22 +838,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "valor inválido para ^@bggray escape: %s" -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: não pôde abrir pipe para comando \"%s\": %s\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "não foi possível abrir o arquivo EPS \"%s\": %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "arquivo EPS \"%s\" não inicia com \"%%!\" mágico\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -831,27 +857,28 @@ "Arquivo EPS \"%s\" contém %%%%BoundingBox mal formados na fila:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "o arquivo \"%s\" não é um arquivo EPS válido\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" -msgstr "passando através de todos os arquivos de entrada para língua de saída '%s'\n" +msgstr "" +"passando através de todos os arquivos de entrada para língua de saída '%s'\n" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "passando através do %s arquivo \"%s\"\n" -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, fuzzy, c-format msgid "couldn't create temporary divert file: %s" msgstr "não pôde criar nome de arquivo de desvio: %s" -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "não pôde regressar ao arquivo de desvio:%s" @@ -924,7 +951,8 @@ #: src/util.c:896 #, c-format msgid "couldn't open AFM file for font \"%s\", using default\n" -msgstr "não foi possível abrir o arquivo AFM para fonte \"%s\", usando o padrão\n" +msgstr "" +"não foi possível abrir o arquivo AFM para fonte \"%s\", usando o padrão\n" #: src/util.c:903 #, c-format @@ -941,70 +969,71 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "não foi possível abrir o arquivo de descrição da fonte \"%s\": %s\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: formato muito longo para saída %%D{}" -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: saída `%%' desconhecida `%c' (%d)" -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: sem encerramento ')' para $() escape" -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: nome de variável muito longa para saída $()" -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: formato muito longo para saída $D{}" -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: saída `$' desconhecida `%c' (%d)" -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "dimensão do flutuante mal feita: \"%s\"" -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" -msgstr "não foi possível abrir o filtro de entrada \"%s\" para o arquivo \"%s\": %s" +msgstr "" +"não foi possível abrir o filtro de entrada \"%s\" para o arquivo \"%s\": %s" -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "não foi possível abrir o arquivo de entrada \"%s\": %s" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "arquivo=%s\n" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "stdout" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "%s: não foi possível abrir o arquivo de saída \"%s\"" -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 msgid "couldn't create AFM library" msgstr "não foi possível criar a biblioteca AFM" -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1016,22 +1045,24 @@ " -V, --version print version number\n" msgstr "" "Uso:%s [OPÇÃO]... ARQUIVO...\n" -"Argumentos obrigatórios para opções longas são obrigatórios para opções curtas também.\n" +"Argumentos obrigatórios para opções longas são obrigatórios para opções " +"curtas também.\n" " -h, --help \t imprimir esta ajuda e sair\n" -" -p, --output-file=NOME imprimir saída para arquivo NAME (arquivo padrão é\n" +" -p, --output-file=NOME imprimir saída para arquivo NAME (arquivo padrão " +"é\n" " \t font.map). Se ARQUIVO for '-', deixar saída para \n" " stdout.\n" " -V, --version imprimir número da versão\n" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "erro: Fim de Arquivo comentado" -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "erro: fim de arquivo na cadeia de caracteres constante" -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "erro: fim de arquivo na expressão regular" @@ -1040,41 +1071,43 @@ msgid "states for GNU %s %s" msgstr "status para GNU %s %s" -#: states/main.c:254 +#: states/main.c:255 #, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "%s: variável de definição mal elaborada \"%s\"\n" -#: states/main.c:282 +#: states/main.c:283 #, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "%s: não foi possível criar o arquivo de saída \"%s\": %s\n" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: nível de cuidado desconhecido `%s'\n" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "%s: falta de memória\n" -#: states/main.c:423 +#: states/main.c:424 #, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "%s: não foi possível abrir o arquivo de entrada `%s': %s\n" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Uso:%s [OPÇÃO]... ARQUIVO...\n" -"Argumentos obrigatórios para opções longas são obrigatórios para opções curtas também.\n" +"Argumentos obrigatórios para opções longas são obrigatórios para opções " +"curtas também.\n" -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1126,7 +1159,9 @@ #, c-format msgid "" "%s: FATAL ERROR: States version %s or higher is required for this script\n" -msgstr "%s: ERRO FATAL: Versão de estados %s ou mail alto é necessário para este script\n" +msgstr "" +"%s: ERRO FATAL: Versão de estados %s ou mail alto é necessário para este " +"script\n" #: states/prims.c:610 states/prims.c:1276 #, c-format @@ -1278,6 +1313,9 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "%s: lendo `%s' de `%s'\n" +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "epsf: não pôde abrir pipe para comando \"%s\": %s\n" + #~ msgid "couldn't create toc file \"%s\": %s" #~ msgstr "não foi possível criar o arquivo de índice \"%s\": %s" --- enscript-1.6.4.orig/po/ru.po +++ enscript-1.6.4/po/ru.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: enscript 1.6.2\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 1999-04-07 07:30+04:00\n" "Last-Translator: Oleg S. Tihonov \n" "Language-Team: Russian \n" @@ -151,87 +152,88 @@ msgid "Unmatched ) or \\)" msgstr "îÅ ÉÍÅÀÝÅÅ ÐÁÒÙ ) ÉÌÉ \\)" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "òÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ ÎÅ ÂÙÌÏ ÚÁÄÁÎÏ ÒÁÎØÛÅ" # msgfmt --statistics -f -c -v -o /dev/null # ×ÙÚÙ×ÁÅÔ ÏÛÉÂËÕ, ×ÅÒÏÑÔÎÏ ÜÔÏ ÏÛÉÂËÁ msgfmt -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N $3% ÓÔÒÁÎÉà $4L ÓÔÒÏË $E $C" -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÐÁÒÏÌØ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÑ Ó uid=%d: %s" -#: src/main.c:1088 +#: src/main.c:1099 #, fuzzy, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ËÏÎÆÉÇÕÒÁÃÉÉ \"%s/%s\": %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "" -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "ËÏÄÉÒÏ×ËÁ %s ÎÅÉÚ×ÅÓÔÎÁ" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ AFM-ÂÉÂÌÉÏÔÅËÕ: %s" -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -241,12 +243,12 @@ "ÉÍÑ ÛÉÒÉÎÁ\t×ÙÓÏÔÁ\tÌÎX\tÌÎY\tÐ×X\tÐ×Y\n" "------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "ÆÏÒÍÁÔ \"%s\" ÎÅÉÚ×ÅÓÔÅÎ" -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" @@ -254,42 +256,43 @@ "ÕÓÔÁÎÏ×ÉÔØ ÎÏ×ÙÅ ÒÁÚÍÅÒÙ ÐÏÌÅÊ ÄÌÑ ÆÏÒÍÁÔÁ `%s' (%dx%d): \n" "ÌÎX=%d, ÌÎY=%d, Ð×X=%d, Ð×Y=%d\n" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÆÏÒÍÁÔ ÍÅÔËÉ ÓÔÒÁÎÉÃÙ \"%s\"" -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÆÏÒÍÁÔ ÄÌÑ ÎÅÐÅÞÁÔÎÙÈ ÓÉÍ×ÏÌÏ× \"%s\"" -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÓÔÉÌØ ÐÏÍÅÔËÉ ÒÁÚÂÉÅÎÉÑ ÓÔÒÏËÉ: \"%s\"" -#: src/main.c:1338 +#: src/main.c:1349 #, c-format msgid "illegal N-up argument: %d" msgstr "ÎÅ×ÅÒÎÏ ÚÁÄÁÎÏ ÞÉÓÌÏ ÌÏÇÉÞÅÓËÉÈ ÓÔÒÁÎÉà ÎÁ ÓÔÒÁÎÉÃÕ: %d" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "ÞÉÓÌÏ ÌÏÇÉÞÅÓËÉÈ ÓÔÒÁÎÉà ÎÁ ÓÔÒÁÎÉÃÕ ÄÏÌÖÎÏ ÂÙÔØ ÓÔÅÐÅÎØÀ 2: %d" -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "ÎÅÐÒÁ×ÉÌØÎÏ ÚÁÄÁÎÁ ÐÏÚÉÃÉÑ ÐÏÄËÌÁÄËÉ: %s" -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÓÔÉÌØ ÐÏÄËÌÁÄËÉ: %s" -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" @@ -297,105 +300,105 @@ "÷ÙÄÅÌÅÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÄÌÑ ÓÌÅÄÕÀÝÉÈ ÑÚÙËÏ× É ÆÏÒÍÁÔÏ× ÆÁÊÌÏ×:\n" "\n" -#: src/main.c:1641 +#: src/main.c:1662 #, fuzzy, c-format msgid "couldn't create temporary toc file: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÉÍÑ ÄÌÑ ÆÁÊÌÁ ÓÏÄÅÒÖÁÎÉÑ: %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÚÎÁÔØ ÓÔÁÔÕÓ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ \"%s\": %s" -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÍÅÓÔÉÔØÓÑ × ÆÁÊÌÅ ÓÏÄÅÒÖÁÎÉÑ: %s" -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "óÏÄÅÒÖÁÎÉÅ" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "×Ù×ÏÄ ÎÅ ÐÒÏÉÚ×ÅÄÅÎ\n" -#: src/main.c:1748 +#: src/main.c:1773 #, c-format msgid "output sent to %s\n" msgstr "×Ù×ÏÄ ÎÁÐÒÁ×ÌÅÎ ÎÁ %s\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "ÐÒÉÎÔÅÒ" -#: src/main.c:1751 +#: src/main.c:1776 #, c-format msgid "output left in %s\n" msgstr "×Ù×ÏÄ ÚÁÐÉÓÁÎ × %s\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d ÓÔÒÁÎÉà * %d ËÏÐÉÊ ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr " ÎÁÐÒÁ×ÌÅÎÏ ÎÁ %s\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " ÚÁÐÉÓÁÎÏ × %s\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d ÓÔÒÏË ÂÙÌÉ %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "ÕÓÅÞÅÎÙ" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "ÒÁÚÂÉÔÙ" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "ÐÒÏÐÕÝÅÎÏ ÓÉÍ×ÏÌÏ×: %d\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "ËÏÄÙ (ÄÅÓÑÔÉÞÎÙÅ) ÐÒÏÐÕÝÅÎÎÙÈ ÓÉÍ×ÏÌÏ×:\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "ÎÅÐÅÞÁÔÎÙÈ ÓÉÍ×ÏÌÏ×: %d\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "ÄÅÓÑÔÉÞÎÙÅ ËÏÄÙ ÎÅÐÅÞÁÔÎÙÈ ÓÉÍ×ÏÌÏ×:\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÒÉÎÔÅÒ `%s': %s" -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ \"%s\": %s" -#: src/main.c:1880 +#: src/main.c:1905 #, fuzzy, c-format msgid "couldn't close output file \"%s\": %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ \"%s\": %s" -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -404,66 +407,68 @@ "ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ × ËÌÀÞÅ %s=\"%s\":\n" "ÎÅÔ ÚÁËÒÙ×ÁÀÝÉÈ ËÁ×ÙÞÅË: %c" -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" -msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÌÅÄÕÀÝÉÅ ËÌÀÞÉ ÉÚ ÐÅÒÅÍÅÎÎÏÊ ÓÒÅÄÙ %s ÎÅ ÂÙÌÉ ÉÓÐÏÌØÚÏ×ÁÎÙ:\n" +msgstr "" +"ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÌÅÄÕÀÝÉÅ ËÌÀÞÉ ÉÚ ÐÅÒÅÍÅÎÎÏÊ ÓÒÅÄÙ %s ÎÅ ÂÙÌÉ " +"ÉÓÐÏÌØÚÏ×ÁÎÙ:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " ËÌÀÞ %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 #, fuzzy msgid "number of columns must be larger than zero" msgstr "ÁÒÇÕÍÅÎÔ ×ÙÒÁ×ÎÉ×ÁÎÉÑ ÆÁÊÌÏ× ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ ÎÕÌÑ" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "ÁÒÇÕÍÅÎÔ ×ÙÒÁ×ÎÉ×ÁÎÉÑ ÆÁÊÌÏ× ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ ÎÕÌÑ" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "ÎÅ×ÅÒÎÏ ÏÐÉÓÁÎ ÛÒÉÆÔ: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÚÁÇÏÌÏ×ÏÞÎÙÊ ÆÁÊÌ \"%s.hdr\"" -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "ÎÅÏÂÈÏÄÉÍÏ ÐÅÞÁÔÁÔØ ÈÏÔÑ ÂÙ ÏÄÎÕ ÓÔÒÏËÕ ÎÁ ËÁÖÄÏÊ ÓÔÒÁÎÉÃÅ: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" msgstr "%s: ÎÅ×ÅÒÎÏ ÚÁÄÁÎ ÓÉÍ×ÏÌ ÎÏ×ÏÊ ÓÔÒÏËÉ: '%s': ÄÏÐÕÓÔÉÍÙ 'n' ÉÌÉ 'r'\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "ÎÏÍÅÒ ÆÒÁÇÍÅÎÔÁ ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ ÎÕÌÑ" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n" -#: src/main.c:2510 +#: src/main.c:2535 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -494,7 +499,8 @@ " -A, --file-align=þéóìï ×ÙÒÁ×ÎÉ×ÁÔØ ×ÈÏÄÎÙÅ ÆÁÊÌÙ ÐÏ þéóìõ ÓÔÒÁÎÉÃ\n" " -b, --header=úáçïìï÷ïë ÚÁÄÁÅÔ úáçïìï÷ïë ÓÔÒÁÎÉÃÙ\n" " -B, --no-header ÎÅ ÐÅÞÁÔÁÔØ ÚÁÇÏÌÏ×ËÉ\n" -" -c, --truncate-lines ÕÓÅËÁÔØ ÄÌÉÎÎÙÅ ÓÔÒÏËÉ (ÐÏ ÕÍÏÌÞÁÎÉÀ ÒÁÚÂÉ×ÁÔØ)\n" +" -c, --truncate-lines ÕÓÅËÁÔØ ÄÌÉÎÎÙÅ ÓÔÒÏËÉ (ÐÏ ÕÍÏÌÞÁÎÉÀ " +"ÒÁÚÂÉ×ÁÔØ)\n" " -C, --line-numbers[=START] ÄÏÂÁ×ÌÑÔØ × ÎÁÞÁÌÏ ÓÔÒÏËÉ ÅÅ ÎÏÍÅÒ\n" " -d ÓÉÎÏÎÉÍ --printer\n" " -D, --setpagedevice=ëìàþ[:úîáþåîéå]\n" @@ -502,12 +508,13 @@ " -e, --escapes[=óéí÷ïì] ÒÁÚÒÅÛÉÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÕÐÒÁ×ÌÑÀÝÉÈ\n" " ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÅÊ\n" -#: src/main.c:2530 -#, fuzzy +#: src/main.c:2555 +#, fuzzy, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr " -E, --pretty-print[=ñúùë] ÐÒÉ×ÌÅËÁÔÅÌØÎÏ ÐÅÞÁÔÁÔØ ÔÅËÓÔ ÐÒÏÇÒÁÍÍÙ\n" -#: src/main.c:2533 +#: src/main.c:2558 +#, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -535,7 +542,8 @@ " -h, --no-job-header ÎÅ ×Ù×ÏÄÉÔØ ÚÁÇÏÌÏ×ÏÞÎÕÀ ÓÔÒÁÎÉÃÕ ÚÁÄÁÎÉÑ\n" " -H, --highlight-bars=þéóìï ÚÁÄÁÅÔ ×ÙÓÏÔÕ ×ÙÄÅÌÑÀÝÉÈ ÐÏÌÏÓ\n" " -i, --indent=þéóìï ÏÔÓÔÕÐÁÔØ ÚÁÄÁÎÎÏÅ þéóìï ÓÉÍ×ÏÌÏ×\n" -" -I, --filter=ëïíáîäá ÉÓÐÏÌØÚÏ×ÁÔØ ëïíáîäõ ÄÌÑ ÐÒÅÄ×ÁÒÉÔÅÌØÎÏÊ ÏÂÒÁÂÏÔËÉ\n" +" -I, --filter=ëïíáîäá ÉÓÐÏÌØÚÏ×ÁÔØ ëïíáîäõ ÄÌÑ ÐÒÅÄ×ÁÒÉÔÅÌØÎÏÊ " +"ÏÂÒÁÂÏÔËÉ\n" " ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n" " -j, --borders ÐÅÞÁÔÁÔØ ÒÁÍËÉ ×ÏËÒÕÇ ËÏÌÏÎÏË\n" " -J, ÓÉÎÏÎÉÍ --title\n" @@ -545,7 +553,8 @@ " --lines-per-page=66, --no-header, --portrait,\n" " --columns=1\n" -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -563,23 +572,26 @@ " -r, --landscape print in landscape mode\n" " -R, --portrait print in portrait mode\n" msgstr "" -" -L, --lines-per-page=þéóìï ÚÁÄÁÅÔ þéóìï ÐÅÞÁÔÁÅÍÙÈ ÓÔÒÏË ÎÁ ËÁÖÄÏÊ ÓÔÒÁÎÉÃÅ\n" +" -L, --lines-per-page=þéóìï ÚÁÄÁÅÔ þéóìï ÐÅÞÁÔÁÅÍÙÈ ÓÔÒÏË ÎÁ ËÁÖÄÏÊ " +"ÓÔÒÁÎÉÃÅ\n" " -m, --mail ÐÏÓÌÁÔØ ÓÏÏÂÝÅÎÉÅ ÐÏ ÏËÏÎÞÁÎÉÉ ÒÁÂÏÔÙ\n" " -M, --media=éíñ ÚÁÄÁÅÔ ÆÏÒÍÁÔ ÄÌÑ ÐÅÞÁÔÉ\n" " -n, --copies=þéóìï ÚÁÄÁÅÔ þéóìï ÐÅÞÁÔÁÅÍÙÈ ËÏÐÉÊ ËÁÖÄÏÊ ÓÔÒÁÎÉÃÙ\n" -" -N, --newline=îó ÚÁÄÁÅÔ ÓÉÍ×ÏÌ ÎÏ×ÏÊ ÓÔÒÏËÉ, ÄÏÐÕÓÔÉÍÙÅ ÚÎÁÞÅÎÉÑ n\n" +" -N, --newline=îó ÚÁÄÁÅÔ ÓÉÍ×ÏÌ ÎÏ×ÏÊ ÓÔÒÏËÉ, ÄÏÐÕÓÔÉÍÙÅ ÚÎÁÞÅÎÉÑ " +"n\n" " (`\\n') É r (`\\r')\n" " -o ÓÉÎÏÎÉÍ --output\n" " -O, --missing-characters ÐÏËÁÚÁÔØ ÐÒÏÐÕÝÅÎÎÙÅ ÓÉÍ×ÏÌÙ\n" -" -p, --output=æáêì ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × ÕËÁÚÁÎÎÙÊ æáêì. åÓÌÉ æáêì ÚÁÄÁÎ\n" +" -p, --output=æáêì ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × ÕËÁÚÁÎÎÙÊ æáêì. åÓÌÉ æáêì " +"ÚÁÄÁÎ\n" " ËÁË -, ÐÅÞÁÔÁÔØ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ\n" " -P, --printer=éíñ ÎÁÐÅÞÁÔÁÔØ ×Ù×ÏÄ ÎÁ ÕËÁÚÁÎÎÏÍ ÐÒÉÎÔÅÒÅ\n" " -q, --quiet, --silent ÎÅ ×Ù×ÏÄÉÔØ ÓÏÏÂÝÅÎÉÊ\n" " -r, --landscape ÐÅÞÁÔÁÔØ ÇÏÒÉÚÏÎÔÁÌØÎÏ (ÒÅÖÉÍ landscape)\n" " -R, --portrait ÐÅÞÁÔÁÔØ ×ÅÒÔÉËÁÌØÎÏ (ÒÅÖÉÍ portrait)\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -612,10 +624,12 @@ " -W, --language=ñúùë ÚÁÄÁÅÔ ñúùë ÄÌÑ ×Ù×ÏÄÁ\n" " -X, --encoding=éíñ ÚÁÄÁÅÔ ËÏÄÉÒÏ×ËÕ ÄÌÑ ×ÈÏÄÁ\n" " -z, --no-formfeed ÉÇÎÏÒÉÒÏ×ÁÔØ ÓÉÍ×ÏÌÙ ÐÅÒÅ×ÏÄÁ ÓÔÒÁÎÉÃÙ\n" -" -Z, --pass-through ÐÒÏÐÕÓËÁÔØ ÂÅÚ ÉÚÍÅÎÅÎÉÊ ×ÈÏÄÎÙÅ ÆÁÊÌÙ × ÆÏÒÍÁÔÁÈ\n" +" -Z, --pass-through ÐÒÏÐÕÓËÁÔØ ÂÅÚ ÉÚÍÅÎÅÎÉÊ ×ÈÏÄÎÙÅ ÆÁÊÌÙ × " +"ÆÏÒÍÁÔÁÈ\n" " PostScript É PCL\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -629,8 +643,8 @@ " --help print this help and exit\n" msgstr "" -#: src/main.c:2596 -#, fuzzy +#: src/main.c:2621 +#, fuzzy, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -648,16 +662,18 @@ " --filter-stdin=éíñ ÚÁÄÁÅÔ ÉÍÑ ÓÔÁÎÄÁÒÔÎÏÇÏ ××ÏÄÁ, ÐÅÒÅÄÁ×ÁÅÍÏÅ\n" " ×ÈÏÄÎÏÍÕ ÆÉÌØÔÒÕ\n" " --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n" -" --help-pretty-print ÏÐÉÓÁÔØ ×ÓÅ ÑÚÙËÉ, ÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ --pretty-print\n" -" --highlight-bar-gray=þéóìï ÐÅÞÁÔÁÔØ ×ÙÄÅÌÑÀÝÉÅ ÐÏÌÏÓÙ ÚÁÄÁÎÎÙÍ ÓÅÒÙÍ Ã×ÅÔÏÍ\n" +" --help-pretty-print ÏÐÉÓÁÔØ ×ÓÅ ÑÚÙËÉ, ÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ --pretty-" +"print\n" +" --highlight-bar-gray=þéóìï ÐÅÞÁÔÁÔØ ×ÙÄÅÌÑÀÝÉÅ ÐÏÌÏÓÙ ÚÁÄÁÎÎÙÍ ÓÅÒÙÍ " +"Ã×ÅÔÏÍ\n" " --list-media ÐÅÒÅÞÉÓÌÉÔØ ×ÓÅ ÉÚ×ÅÓÔÎÙÅ ÆÏÒÍÁÔÙ\n" " --list-options ÐÅÒÅÞÉÓÌÉÔØ ×ÓÅ ËÌÀÞÉ É ÉÈ ÚÎÁÞÅÎÉÑ\n" " --margins=ìå÷:ðòá÷:÷åòè:îéú ÎÁÓÔÒÁÉ×ÁÅÔ ÒÁÚÍÅÒÙ ÐÏÌÅÊ ÓÔÒÁÎÉÃÙ\n" " --mark-wrapped-lines[óôéìø] ÚÁÄÁÅÔ óôéìø ÐÏÍÅÔËÉ ÒÁÚÂÉÔÙÈ ÓÔÒÏË\n" " --non-printable-format=æíô ÕËÁÚÙ×ÁÅÔ, ËÁË ×Ù×ÏÄÉÔØ ÎÅÐÅÞÁÔÎÙÅ ÓÉÍ×ÏÌÙ\n" -#: src/main.c:2607 -#, fuzzy +#: src/main.c:2632 +#, fuzzy, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -669,18 +685,22 @@ " --printer-options=OPTIONS pass extra options to the printer command\n" " --rotate-even-pages rotate even-numbered pages 180 degrees\n" msgstr "" -" --nup-xpad=þéóìï ÕÓÔÁÎÏ×ÉÔØ ÚÁÐÏÌÎÅÎÉÅ ÓÔÒÁÎÉÃÙ ÐÏ x ÐÒÉ ÐÅÞÁÔÉ \n" +" --nup-xpad=þéóìï ÕÓÔÁÎÏ×ÉÔØ ÚÁÐÏÌÎÅÎÉÅ ÓÔÒÁÎÉÃÙ ÐÏ x ÐÒÉ " +"ÐÅÞÁÔÉ \n" " ÎÅÓËÏÌØËÉÈ ÓÔÒÁÎÉà ÎÁ ÌÉÓÔ ÒÁ×ÎÙÍ þéóìõ\n" -" --nup-ypad=þéóìï ÕÓÔÁÎÏ×ÉÔØ ÚÁÐÏÌÎÅÎÉÅ ÓÔÒÁÎÉÃÙ ÐÏ y ÐÒÉ ÐÅÞÁÔÉ \n" +" --nup-ypad=þéóìï ÕÓÔÁÎÏ×ÉÔØ ÚÁÐÏÌÎÅÎÉÅ ÓÔÒÁÎÉÃÙ ÐÏ y ÐÒÉ " +"ÐÅÞÁÔÉ \n" " ÎÅÓËÏÌØËÉÈ ÓÔÒÁÎÉà ÎÁ ÌÉÓÔ ÒÁ×ÎÙÍ þéóìõ\n" " --page-label-format=æíô ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÆÏÒÍÁÔ ÍÅÔËÉ ÓÔÒÁÎÉÃÙ\n" -" --ps-level=õòï÷åîø ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÕÒÏ×ÅÎØ ÑÚÙËÁ PostScript, ËÏÔÏÒÙÊ \n" +" --ps-level=õòï÷åîø ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÕÒÏ×ÅÎØ ÑÚÙËÁ PostScript, " +"ËÏÔÏÒÙÊ \n" " ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØ enscript\n" -" --printer-options=ëìàþé ÐÅÒÅÄÁÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁÒÁÍÅÔÒÙ ËÏÍÁÎÄÅ ÐÅÞÁÔÉ\n" +" --printer-options=ëìàþé ÐÅÒÅÄÁÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁÒÁÍÅÔÒÙ ËÏÍÁÎÄÅ " +"ÐÅÞÁÔÉ\n" " --rotate-even-pages ÐÏ×ÏÒÁÞÉ×ÁÔØ ÞÅÔÎÙÅ ÓÔÒÁÎÉÃÙ ÎÁ 180 ÇÒÁÄÕÓÏ×\n" -#: src/main.c:2617 -#, fuzzy +#: src/main.c:2642 +#, fuzzy, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -704,7 +724,8 @@ " --ul-style=óôéìø ÚÁÄÁÅÔ óôéìø ÐÏÄËÌÁÄËÉ\n" " --word-wrap ÏÂÒÙ×ÁÔØ ÄÌÉÎÎÙÅ ÓÔÒÏËÉ ÎÁ ÇÒÁÎÉÃÁÈ ÓÌÏ×\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -808,22 +829,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÄÉÒÅËÔÉ×Ù ^@bggray: %s" -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ËÁÎÁÌ ÄÌÑ ËÏÍÁÎÄÙ \"%s\": %s\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ EPS-ÆÁÊÌ \"%s\": %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "EPS-ÆÁÊÌ \"%s\" ÎÅ ÎÁÞÉÎÁÅÔÓÑ ×ÏÌÛÅÂÎÙÍ ËÏÍÍÅÎÔÁÒÉÅÍ \"%%!\"\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -832,27 +848,27 @@ "EPS-ÆÁÊÌ \"%s\" ÓÏÄÅÒÖÉÔ ÎÅÐÒÁ×ÉÌØÎÕÀ ÓÔÒÏËÕ %%%%BoundingBox:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "EPS-ÆÁÊÌ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ EPS-ÆÁÊÌÏÍ\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" msgstr "ÏÂÒÁÂÁÔÙ×ÁÀÔÓÑ ×ÓÅ ×ÈÏÄÎÙÅ ÆÁÊÌÙ Ó ×ÙÈÏÄÎÙÍ ÑÚÙËÏÍ `%s'\n" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "ÏÂÒÁÂÁÔÙ×ÁÅÔÓÑ ÆÁÊÌ %s \"%s\"\n" -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, fuzzy, c-format msgid "couldn't create temporary divert file: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÉÍÑ ÄÌÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ: %s" -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÍÅÓÔÉÔØÓÑ ×Ï ×ÒÅÍÅÎÎÏÍ ÆÁÊÌÅ: %s" @@ -925,7 +941,9 @@ #: src/util.c:896 #, c-format msgid "couldn't open AFM file for font \"%s\", using default\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ AFM-ÆÁÊÌ ÄÌÑ ÛÒÉÆÔÁ \"%s\", ÉÓÐÏÌØÚÕÅÔÓÑ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ\n" +msgstr "" +"ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ AFM-ÆÁÊÌ ÄÌÑ ÛÒÉÆÔÁ \"%s\", ÉÓÐÏÌØÚÕÅÔÓÑ ÛÒÉÆÔ ÐÏ " +"ÕÍÏÌÞÁÎÉÀ\n" #: src/util.c:903 #, c-format @@ -942,70 +960,70 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÛÒÉÆÔÁ \"%s\": %s\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ ÆÏÒÍÁÔ ÄÌÑ ÄÉÒÅËÔÉ×Ù %%D{}" -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ %%-ÄÉÒÅËÔÉ×Á `%c' (%d)" -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: ÏÔÓÕÔÓÔ×ÕÅÔ ÚÁËÒÙ×ÁÀÝÁÑ ')' ÄÌÑ ÄÉÒÅËÔÉ×Ù $()" -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ ÉÍÑ ÐÅÒÅÍÅÎÎÏÊ ÄÌÑ ÄÉÒÅËÔÉ×Ù $()" -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ ÆÏÒÍÁÔ ÄÌÑ ÄÉÒÅËÔÉ×Ù $D{}" -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ $-ÄÉÒÅËÔÉ×Á `%c' (%d)" -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÞÉÓÌÏ Ó ÐÌÁ×ÁÀÝÅÊ ÔÏÞËÏÊ: \"%s\"" -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÈÏÄÎÏÊ ÆÉÌØÔÒ \"%s\" ÄÌÑ ÆÁÊÌÁ \"%s\": %s" -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÈÏÄÎÏÊ ÆÁÊÌ \"%s\": %s" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "ÆÁÊÌ=%s\n" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ \"%s\"" -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 msgid "couldn't create AFM library" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ AFM-ÂÉÂÌÉÏÔÅËÕ" -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1019,19 +1037,21 @@ "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... æáêì\n" "áÒÇÕÍÅÎÔÙ, ÏÂÑÚÁÔÅÌØÎÙÅ ÄÌÑ ÄÌÉÎÎÙÈ ËÌÀÞÅÊ, ÏÂÑÚÁÔÅÌØÎÙ É ÄÌÑ ËÏÒÏÔËÉÈ.\n" " -h, --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n" -" -p, --output-file=æáêì ×Ù×ÏÄÉÔØ × ÕËÁÚÁÎÎÙÊ æáêì (ÐÏ ÕÍÏÌÞÁÎÉÀ font.map).\n" -" åÓÌÉ æáêì ÚÁÄÁÎ ËÁË -, ÐÅÞÁÔÁÔØ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ.\n" +" -p, --output-file=æáêì ×Ù×ÏÄÉÔØ × ÕËÁÚÁÎÎÙÊ æáêì (ÐÏ ÕÍÏÌÞÁÎÉÀ font." +"map).\n" +" åÓÌÉ æáêì ÚÁÄÁÎ ËÁË -, ÐÅÞÁÔÁÔØ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ " +"×Ù×ÏÄ.\n" " -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "ÏÛÉÂËÁ: EOF × ËÏÍÍÅÎÔÁÒÉÉ" -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "ÏÛÉÂËÁ: EOF × ÓÔÒÏËÏ×ÏÊ ËÏÎÓÔÁÎÔÅ" -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "ÏÛÉÂËÁ: EOF × ÒÅÇÕÌÑÒÎÏÍ ×ÙÒÁÖÅÎÉÉ" @@ -1040,32 +1060,32 @@ msgid "states for GNU %s %s" msgstr "states ÄÌÑ GNU %s %s" -#: states/main.c:254 +#: states/main.c:255 #, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "%s: ÐÅÒÅÍÅÎÎÁÑ \"%s\" ÏÐÒÅÄÅÌÅÎÁ ÎÅÐÒÁ×ÉÌØÎÏ\n" -#: states/main.c:282 +#: states/main.c:283 #, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ \"%s\": %s\n" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: ÕÒÏ×ÅÎØ ÐÏÄÒÏÂÎÏÓÔÉ ÐÒÅÄÕÐÒÅÖÄÅÎÉÊ `%s' ÎÅÉÚ×ÅÓÔÅÎ\n" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "%s: ÏÐÅÒÁÔÉ×ÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n" -#: states/main.c:423 +#: states/main.c:424 #, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÈÏÄÎÏÊ ÆÁÊÌ `%s': %s\n" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -1074,7 +1094,8 @@ "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... [æáêì]...\n" "áÒÇÕÍÅÎÔÙ, ÏÂÑÚÁÔÅÌØÎÙÅ ÄÌÑ ÄÌÉÎÎÙÈ ËÌÀÞÅÊ, ÏÂÑÚÁÔÅÌØÎÙ É ÄÌÑ ËÏÒÏÔËÉÈ.\n" -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1087,8 +1108,10 @@ " -W, --warning=LEVEL set the warning level to LEVEL\n" msgstr "" " -D, --define=ðåòåíåîîáñ=úîáþåîéå\n" -" ÏÐÒÅÄÅÌÑÅÔ ðåòåíåîîõà É ÐÒÉÓ×ÁÉ×ÁÅÔ ÅÊ úîáþåîéå\n" -" -f, --file=æáêì ÞÉÔÁÔØ ÏÐÒÅÄÅÌÅÎÉÑ ÓÏÓÔÏÑÎÉÊ ÉÚ ÚÁÄÁÎÎÏÇÏ æáêìá\n" +" ÏÐÒÅÄÅÌÑÅÔ ðåòåíåîîõà É ÐÒÉÓ×ÁÉ×ÁÅÔ ÅÊ " +"úîáþåîéå\n" +" -f, --file=æáêì ÞÉÔÁÔØ ÏÐÒÅÄÅÌÅÎÉÑ ÓÏÓÔÏÑÎÉÊ ÉÚ ÚÁÄÁÎÎÏÇÏ " +"æáêìá\n" " -h, --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n" " -o, --output=æáêì ×Ù×ÏÄÉÔØ × ÕËÁÚÁÎÎÙÊ æáêì\n" " -p, --path=ðõôø ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÕÔØ ÐÏÉÓËÁ\n" @@ -1127,7 +1150,9 @@ #, c-format msgid "" "%s: FATAL ERROR: States version %s or higher is required for this script\n" -msgstr "%s: ëòéôéþåóëáñ ïûéâëá: ÄÌÑ ÜÔÏÊ ÐÒÏÇÒÁÍÍÙ ÎÅÏÂÈÏÄÉÍ states ×ÅÒÓÉÉ %s ÉÌÉ ×ÙÛÅ\n" +msgstr "" +"%s: ëòéôéþåóëáñ ïûéâëá: ÄÌÑ ÜÔÏÊ ÐÒÏÇÒÁÍÍÙ ÎÅÏÂÈÏÄÉÍ states ×ÅÒÓÉÉ %s ÉÌÉ " +"×ÙÛÅ\n" #: states/prims.c:610 states/prims.c:1276 #, c-format @@ -1257,7 +1282,8 @@ #: states/utils.c:1085 #, c-format msgid "%s:%d: error: illegal rvalue for string assignment\n" -msgstr "%s:%d: ÏÛÉÂËÁ: ÎÅÄÏÐÕÓÔÉÍÁÑ ÐÒÁ×ÁÑ ÞÁÓÔØ ÏÐÅÒÁÔÏÒÁ ÐÒÉÓ×ÁÉ×ÁÎÉÑ ÓÔÒÏË\n" +msgstr "" +"%s:%d: ÏÛÉÂËÁ: ÎÅÄÏÐÕÓÔÉÍÁÑ ÐÒÁ×ÁÑ ÞÁÓÔØ ÏÐÅÒÁÔÏÒÁ ÐÒÉÓ×ÁÉ×ÁÎÉÑ ÓÔÒÏË\n" #: states/utils.c:1104 #, c-format @@ -1279,6 +1305,9 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "%s: Á×ÔÏÚÁÇÒÕÚËÁ `%s' ÉÚ `%s'\n" +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "epsf: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ËÁÎÁÌ ÄÌÑ ËÏÍÁÎÄÙ \"%s\": %s\n" + #~ msgid "couldn't create toc file \"%s\": %s" #~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ÓÏÄÅÒÖÁÎÉÑ \"%s\": %s" --- enscript-1.6.4.orig/po/tr.po +++ enscript-1.6.4/po/tr.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: enscript 1.6.3\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 2002-11-19 15:00+0200\n" "Last-Translator: Deniz Akkus Kanca \n" "Language-Team: Turkish \n" @@ -151,85 +152,86 @@ msgid "Unmatched ) or \\)" msgstr "EÅŸleÅŸmemiÅŸ ) veya \\)" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "Daha önce düzenli ifade yok" -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N $3% sayfa $4L satır $E $C" -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "uid=%d için parola girdisi alınamadı: %s" -#: src/main.c:1088 +#: src/main.c:1099 #, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "\"%s/%s\" ayar dosyası açılamadı: %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "Ayrıca, aÅŸağıdaki dizinler de denendi:" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "\t%s" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "\t../lib" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "\t../../lib" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "Bu bir kurulum hatasına benziyor. Lütfen yeniden derlemeye çalışın:" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "\tmake distclean" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "\t./configure --prefix=ÖNEK" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "\tmake" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "\tmake check" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "\tmake install" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "veya `ENSCRIPT_LIBRARY' çevre deÄŸiÅŸkenini sizin" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "kitaplık dizininiz olarak tanımlayın." -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "bilinmeyen kodlama: %s" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "AFM kitaplığı açılamadı: %s" -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -239,12 +241,12 @@ "isim geniÅŸlik\tuzunluk\tllx\tlly\turx\tury\n" "----------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "\"%s\" ortamı hakkında hiç bir ÅŸey bilinmiyor" -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" @@ -252,42 +254,43 @@ "`%s' ortamı için yeni kenarlar atanıyor (%dx%d): llx=%d, lly=%d, urx=%d, ury=" "%d\n" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "geçersiz sayfa etiket biçemi \"%s\"" -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "geçersiz basılamaz biçem \"%s\"" -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "sarılmış satır imleci için geçersiz stil: \"%s\"" -#: src/main.c:1338 +#: src/main.c:1349 #, c-format msgid "illegal N-up argument: %d" msgstr "geçersiz N-up argümanı: %d" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "N-up argümanı 2'nin kuvveti olmalı: %d" -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "bozuk metinaltı pozisyonu: %s" -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "geçersiz metinaltı stili: %s" -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" @@ -295,105 +298,105 @@ "Renklendirme aÅŸağıdaki diller ve dosya biçemleri için desteklenir:\n" "\n" -#: src/main.c:1641 +#: src/main.c:1662 #, c-format msgid "couldn't create temporary toc file: %s" msgstr "geçici içindekiler dosyası oluÅŸturulamadı: %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "\"%s\" girdi dosyası durumlanamadı: %s" -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "içindekiler dosyası baÅŸa döndürülemedi: %s" -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "İçindekiler" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "çıktı üretilmedi\n" -#: src/main.c:1748 +#: src/main.c:1773 #, c-format msgid "output sent to %s\n" msgstr "çıktı %s'ye gönderildi\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "yazıcı" -#: src/main.c:1751 +#: src/main.c:1776 #, c-format msgid "output left in %s\n" msgstr "çıktı %s'de bırakıldı\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d sayfa * %d kopya ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr " %s'ye gönderildi\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " %s'de bırakıldı\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d satır %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "budandı" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "sarıldı" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "%d harf eksik\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "eksik karakter kodları (onluk):\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d basılamaz karakter\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "basılamaz karakter kodları (onluk):\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "`%s' yazıcısı açılamadı: %s" -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "\"%s\" çıktı dosyası oluÅŸturulamadı: %s" -#: src/main.c:1880 +#: src/main.c:1905 #, c-format msgid "couldn't close output file \"%s\": %s" msgstr "\"%s\" çıktı dosyası kapatılamadı: %s" -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -402,66 +405,66 @@ "seçenek dizgesi %s=\"%s\" içinde sözdizim hatası:\n" "açılan tırnak kapatılmamış: %c" -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" msgstr "uyarı: çevre deÄŸiÅŸkeni %s'den aÅŸağıdaki seçenekler iÅŸlenmedi:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " seçenek %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 msgid "number of columns must be larger than zero" msgstr "sütun sayısı sıfırdan büyük olmalı" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "dosya hizalanması sıfırdan büyük olmalı" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "bozuk yazıtipi özelliÄŸi: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "baÅŸlık tanım dosyası \"%s.hdr\" bulunamadı" -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "her sayfaya en az bir satır basmalı: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" msgstr "" "%s: geçersiz yenisatır karakter belirteci: '%s': 'n' veya 'r' beklendi\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "-W seçeneÄŸi için hatalı argüman `%s', --option: virgül bulunamadı" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "yardımcı uygulama belirteci tek bir karakter olmalı: %s" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "dilim sıfırdan büyük olmalı" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" -#: src/main.c:2510 +#: src/main.c:2535 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -502,11 +505,13 @@ " çıktıya bir sayfa aygıt tanımı gönderir\n" " -e, --escapes[=HARF] özel kaçış tanımlarını etkinleÅŸtirir\n" -#: src/main.c:2530 +#: src/main.c:2555 +#, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr " -E, --highlight[=DÄ°L] kaynak kodunu süsler\n" -#: src/main.c:2533 +#: src/main.c:2558 +#, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -547,7 +552,8 @@ "portrait,\n" " --columns=1\n" -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -581,8 +587,8 @@ " -r, --landscape enine basar\n" " -R, --portrait boyuna basar\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -623,7 +629,8 @@ "yapmaksızın\n" " gönderir\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -651,8 +658,8 @@ " --h-column-height=BOY yatay sütun boyunu BOY olarak ayarlar.\n" " --help bu yardımı gösterir ve çıkar.\n" -#: src/main.c:2596 -#, fuzzy +#: src/main.c:2621 +#, fuzzy, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -678,7 +685,8 @@ " --non-printable-format=BÇM basılamaz karakterlerin nasıl basılacağını " "belirler\n" -#: src/main.c:2607 +#: src/main.c:2632 +#, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -702,7 +710,8 @@ " --printer-options=SEÇENEK yazıcı komutuna fazladan seçenekler gönderir\n" " --rotate-even-pages çift sayılı sayfaları 180 derece döndürür\n" -#: src/main.c:2617 +#: src/main.c:2642 +#, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -730,7 +739,8 @@ " --ul-style=TARZ metinaltlarını TARZ tarzında yazdırır\n" " --word-wrap uzun satırları sözcük sınırlarında sardırır\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -833,22 +843,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "^@bggray kaçışı için geçersiz deÄŸer: %s" -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: \"%s\" komutuna veriyolu açılamadı: %s\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "EPS dosyası \"%s\" açılamadı: %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "EPS dosyası \"%s\" \"%%!\" sihriyle baÅŸlamıyor\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -857,27 +862,27 @@ "EPS dosyası \"%s\" bozuk %%%%BoundingBox satırı içeriyor:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "EPS dosyası \"%s\" geçerli bir EPS dosyası deÄŸil\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" msgstr "çıktı dili `%s' için bütün girdi dosyaları geçiriliyor\n" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "%s dosyası \"%s\" geçiriliyor\n" -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, c-format msgid "couldn't create temporary divert file: %s" msgstr "geçici ara dosya oluÅŸturulamadı: %s" -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "ara dosya baÅŸa sarılamadı: %s" @@ -967,70 +972,70 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "yazıtipi tanım dosyası \"%s\" açılamadı: %s\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: %%D{} kaçışı için çok uzun biçem" -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: bilinmeyen `%%' kaçışı `%c' (%d)" -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: $() kaçışı için kapatan ')' yok" -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: $() kaçışı için fazla uzun deÄŸiÅŸken adı" -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: $D{} kaçışı için fazla uzun biçem" -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: bilinmeyen `$' kaçışı `%c' (%d)" -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "bozuk üst boyut: \"%s\"" -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "\"%s\" dosyası için girdi filtresi \"%s\" açılamadı: %s" -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "\"%s\" girdi dosyası açılamadı: %s" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "dosya=%s\n" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "standart çıktı" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "%s: \"%s\" çıktı dosyası açılamadı" -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 msgid "couldn't create AFM library" msgstr "AFM kitaplığı oluÅŸturulamadı" -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1050,15 +1055,15 @@ " çıktıya gönderir.\n" " -V, --version sürüm bilgisini gösterir\n" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "hata: açıklama içinde EOF" -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "hata: dizge sabitinde EOF" -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "hata: düzenli ifade içinde EOF" @@ -1067,32 +1072,32 @@ msgid "states for GNU %s %s" msgstr "GNU %s %s için durumlar" -#: states/main.c:254 +#: states/main.c:255 #, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "%s: bozuk deÄŸiÅŸken tanımı \"%s\"\n" -#: states/main.c:282 +#: states/main.c:283 #, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "%s: çıktı dosyası \"%s\" oluÅŸturulamadı: %s\n" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: bilinmeyen uyarı seviyesi `%s'\n" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "%s: bellek tükendi\n" -#: states/main.c:423 +#: states/main.c:424 #, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "%s: girdi dosyası `%s' açılamadı: %s\n" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -1102,7 +1107,8 @@ "Uzun seçenekler için zorunlu olan argümanlar kısa seçenekler için de " "zorunludur.\n" -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1309,6 +1315,9 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "%1$s: `%3$s'den `%2$s'yi otomatik yükleme\n" +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "epsf: \"%s\" komutuna veriyolu açılamadı: %s\n" + #~ msgid "couldn't create toc file name: %s" #~ msgstr "içindekiler dosya adı oluÅŸturulamadı: %s" --- enscript-1.6.4.orig/po/en_GB.po +++ enscript-1.6.4/po/en_GB.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: enscript 1.6.3\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 2003-01-31 15:32+0000\n" "Last-Translator: Nigel Titley \n" "Language-Team: English (British) \n" @@ -151,85 +152,86 @@ msgid "Unmatched ) or \\)" msgstr "Unmatched ) or \\)" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "No previous regular expression" -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N $3% pages $4L lines $E $C" -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "couldn't get passwd entry for uid=%d: %s" -#: src/main.c:1088 +#: src/main.c:1099 #, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "couldn't read config file \"%s/%s\": %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "I did also try the following directories:" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "\t%s" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "\t../lib" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "\t../../lib" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "This is probably an installation error. Please, try to rebuild:" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "\tmake distclean" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "\t./configure --prefix=PREFIX" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "\tmake" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "\tmake check" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "\tmake install" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "library directory." -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "unknown encoding: %s" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "couldn't open AFM library: %s" -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -239,54 +241,55 @@ "name width\theight\tllx\tlly\turx\tury\n" "------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "do not know anything about media \"%s\"" -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" msgstr "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "illegal page lable format \"%s\"" -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "illegal non-printable format \"%s\"" -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "illegal style for wrapped line marker: \"%s\"" -#: src/main.c:1338 +#: src/main.c:1349 #, c-format msgid "illegal N-up argument: %d" msgstr "illegal N-up argument: %d" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "N-up argument must be power of 2: %d" -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "malformed underlay position: %s" -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "illegal underlay style: %s" -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" @@ -294,105 +297,105 @@ "Highlighting is supported for the following languages and file formats:\n" "\n" -#: src/main.c:1641 +#: src/main.c:1662 #, fuzzy, c-format msgid "couldn't create temporary toc file: %s" msgstr "couldn't create temporary divert file: %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "couldn't stat input file \"%s\": %s" -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "couldn't rewind toc file: %s" -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "Table of Contents" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "no output generated\n" -#: src/main.c:1748 +#: src/main.c:1773 #, c-format msgid "output sent to %s\n" msgstr "output sent to %s\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "printer" -#: src/main.c:1751 +#: src/main.c:1776 #, c-format msgid "output left in %s\n" msgstr "output left in %s\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d pages * %d copy ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr " sent to %s\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " left in %s\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d lines were %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "truncated" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "wrapped" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "%d characters were missing\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "missing character codes (decimal):\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d non-printable characters\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "non-printable character codes (decimal):\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "couldn't open printer `%s': %s" -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "couldn't create output file \"%s\": %s" -#: src/main.c:1880 +#: src/main.c:1905 #, c-format msgid "couldn't close output file \"%s\": %s" msgstr "couldn't close output file \"%s\": %s" -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -401,66 +404,66 @@ "syntax error in option string %s=\"%s\":\n" "missing end of quotation: %c" -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" msgstr "" "warning: didn't process following options from environment variable %s:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " option %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 msgid "number of columns must be larger than zero" msgstr "number of columns must be larger than zero" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "file alignment must be larger than zero" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "malformed font spec: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "couldn't find header definition file \"%s.hdr\"" -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "must print at least one line per each page: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" msgstr "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "malformed argument `%s' for option -W, --option: no comma found" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "helper application specification must be single character: %s" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "slice must be greater than zero" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Try `%s --help' for more information.\n" -#: src/main.c:2510 +#: src/main.c:2535 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -499,11 +502,13 @@ " pass a page device definition to output\n" " -e, --escapes[=CHAR] enable special escape interpretation\n" -#: src/main.c:2530 +#: src/main.c:2555 +#, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr " -E, --highlight[=LANG] highlight source code\n" -#: src/main.c:2533 +#: src/main.c:2558 +#, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -541,7 +546,8 @@ "portrait,\n" " --columns=1\n" -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -575,8 +581,8 @@ " -r, --landscape print in landscape mode\n" " -R, --portrait print in portrait mode\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -612,7 +618,8 @@ " -Z, --pass-through pass through PostScript and PCL files\n" " without any modifications\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -636,8 +643,8 @@ " --h-column-height=HEIGHT set the horizontal column height to HEIGHT\n" " --help print this help and exit\n" -#: src/main.c:2596 -#, fuzzy +#: src/main.c:2621 +#, fuzzy, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -659,7 +666,8 @@ " mark wrapped lines in the output with STYLE\n" " --non-printable-format=FMT specify how non-printable chars are printed\n" -#: src/main.c:2607 +#: src/main.c:2632 +#, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -681,7 +689,8 @@ " --printer-options=OPTIONS pass extra options to the printer command\n" " --rotate-even-pages rotate even-numbered pages 180 degrees\n" -#: src/main.c:2617 +#: src/main.c:2642 +#, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -707,7 +716,8 @@ " --ul-style=STYLE print underlays with style STYLE\n" " --word-wrap wrap long lines from word boundaries\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -809,22 +819,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "invalid value for ^@bggray escape: %s" -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: couldn't open pipe to command \"%s\": %s\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "couldn't open EPS file \"%s\": %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "EPS file \"%s\" does not start with \"%%!\" magic\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -833,27 +838,27 @@ "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "EPS file \"%s\" is not a valid EPS file\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" msgstr "passing through all input files for output language `%s'\n" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "passing through %s file \"%s\"\n" -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, c-format msgid "couldn't create temporary divert file: %s" msgstr "couldn't create temporary divert file: %s" -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "couldn't rewind divert file: %s" @@ -943,70 +948,70 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "couldn't open font description file \"%s\": %s\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: too long format for %%D{} escape" -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: unknown `%%' escape `%c' (%d)" -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: no closing ')' for $() escape" -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: too long variable name for $() escape" -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: too long format for $D{} escape" -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: unknown `$' escape `%c' (%d)" -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "malformed float dimension: \"%s\"" -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "couldn't open input filter \"%s\" for file \"%s\": %s" -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "couldn't open input file \"%s\": %s" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "file=%s\n" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "stdout" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "%s: couldn't open output file \"%s\"" -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 msgid "couldn't create AFM library" msgstr "couldn't create AFM library" -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1025,15 +1030,15 @@ " stdout.\n" " -V, --version print version number\n" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "error: EOF in comment" -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "error: EOF in string constant" -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "error: EOF in regular expression" @@ -1042,32 +1047,32 @@ msgid "states for GNU %s %s" msgstr "states for GNU %s %s" -#: states/main.c:254 +#: states/main.c:255 #, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "%s: malformed variable definition \"%s\"\n" -#: states/main.c:282 +#: states/main.c:283 #, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "%s: couldn't create output file \"%s\": %s\n" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: unknown warning level `%s'\n" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "%s: out of memory\n" -#: states/main.c:423 +#: states/main.c:424 #, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "%s: couldn't open input file `%s': %s\n" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -1076,7 +1081,8 @@ "Usage: %s [OPTION]... [FILE]...\n" "Mandatory arguments to long options are mandatory for short options too.\n" -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1281,6 +1287,9 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "%s: autoloading `%s' from `%s'\n" +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "epsf: couldn't open pipe to command \"%s\": %s\n" + #, fuzzy #~ msgid "couldn't create toc file name: %s" #~ msgstr "couldn't create temporary toc file: %s" --- enscript-1.6.4.orig/po/da.po +++ enscript-1.6.4/po/da.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: enscript 1.6.2\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 2002-11-09 10:35+0100\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -151,85 +152,86 @@ msgid "Unmatched ) or \\)" msgstr "Ubalanceret ) eller \\)" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "Intet foregående regulært udtryk" -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N $3% sider $4L linjer $E $C" -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "kunne ikke hente passwd-post for uid=%d: %s" -#: src/main.c:1088 +#: src/main.c:1099 #, fuzzy, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "kunne ikke åbne konfigurationsfilen \"%s/%s\": %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "" -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "ukendt kodning: %s" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "kunne ikke åbne AFM-bibliotek: %s" -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -239,53 +241,56 @@ "navn bredde\thøjde\tnvx\tnvy\tøhx\tøhy\n" "------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "kender ikke til noget om formatet \"%s\"" -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" -msgstr "sæt nye marginaler for formatet \"%s\" (%d×%d): nvx=%d, nvy=%d, øhx=%d, øhy%d\n" +msgstr "" +"sæt nye marginaler for formatet \"%s\" (%d×%d): nvx=%d, nvy=%d, øhx=%d, øhy%" +"d\n" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "ikke tilladt sideetiketsformat \"%s\"" -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "ikke tilladt ej-udskrivbart format \"%s\"" -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "ikke tilladt stíl på linjeombrydningstegn: \"%s\"" -#: src/main.c:1338 +#: src/main.c:1349 #, c-format msgid "illegal N-up argument: %d" msgstr "ikke tilladt N-op-argument: %d" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "N-op-argument skal være en potens af 2: %d" -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "fejludformet underlagsposition: %s" -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "ikke tilladt underlagsstíl: %s" -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" @@ -293,105 +298,105 @@ "Syntaksfarvning understøttes for følgende sprog og filformater:\n" "\n" -#: src/main.c:1641 +#: src/main.c:1662 #, fuzzy, c-format msgid "couldn't create temporary toc file: %s" msgstr "kunne ikke oprette indholdsfilnavn: %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "kunne ikke tage status på inddatafilen \"%s\": %s" -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "kunne ikke tilbagespole indholdsfilen: %s" -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "Indhold" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "ingen uddata genereret\n" -#: src/main.c:1748 +#: src/main.c:1773 #, c-format msgid "output sent to %s\n" msgstr "uddata sendt til %s\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "skriver" -#: src/main.c:1751 +#: src/main.c:1776 #, c-format msgid "output left in %s\n" msgstr "uddata beholdt i %s\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d sider * %d kopi ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr " sendt til %s\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " beholdt i %s\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d linjer blev %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "afkortede" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "linjeombrudt" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "%d tegn manglede\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "manglede tegnkoder (decimalt):\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d ej udskrivbare tegn\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "ej udskrivbare tegnkoder (decimalt):\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "kunne ikke åbne skriveren \"%s\": %s" -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "kunne ikke oprette uddatafilen \"%s\": %s" -#: src/main.c:1880 +#: src/main.c:1905 #, fuzzy, c-format msgid "couldn't close output file \"%s\": %s" msgstr "kunne ikke oprette uddatafilen \"%s\": %s" -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -400,66 +405,66 @@ "syntaksfejl i flagstrengen %s=\"%s\":\n" "mangler slut på citering: %c" -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" msgstr "advarsel: behandlede ikke følgende flag fra miljøvariablen %s:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " flaget %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 #, fuzzy msgid "number of columns must be larger than zero" msgstr "filgrupperingen skal være større end nul" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "filgrupperingen skal være større end nul" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "fejludformet skrifttypespecifikation: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "kunne ikke finde hoveddefinitionsfil \"%s.hdr\"" -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "skal udskrive mindst en linje per side: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" msgstr "%s: ikke tilladt nylinjetegn: \"%s\"': forventede \"n\" eller \"r\"\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "skive skal være større end nul" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv \"%s --help\" for mere information.\n" -#: src/main.c:2510 +#: src/main.c:2535 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -499,12 +504,13 @@ " angiv en sideenhedsdefinition til uddata\n" " -e, --escapes[=TEGN] tillad speciel kontrolsekvenstolkning\n" -#: src/main.c:2530 -#, fuzzy +#: src/main.c:2555 +#, fuzzy, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr " -E, --pretty-print[=SPROG] udskriv kildekode nydeligt\n" -#: src/main.c:2533 +#: src/main.c:2558 +#, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -532,17 +538,20 @@ " -h, --no-job-header fravælg jobforsiden\n" " -H, --highlight-bars=NUM angiv hvor høje markeringsstreger skal være\n" " -i, --indent=NUM sæt linjeindrykning til NUM tegn\n" -" -I, --filter=KOMMANDO læs inddatafiler gennem inddatafiltret KOMMANDO\n" +" -I, --filter=KOMMANDO læs inddatafiler gennem inddatafiltret " +"KOMMANDO\n" " -j, --borders udskriv kanter omkring kolonner\n" " -J, et alias for flaget --title\n" " -k, --page-prefeed tillad fødning af sider\n" " -K, --no-page-prefeed tillad ikke fødning af sider\n" -" -l, --lineprinter simulér en linjeskriver, dette er et alias for:\n" +" -l, --lineprinter simulér en linjeskriver, dette er et alias " +"for:\n" " --lines-per-page=66, --no-header, --" "portrait,\n" " --columns=1\n" -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -560,7 +569,8 @@ " -r, --landscape print in landscape mode\n" " -R, --portrait print in portrait mode\n" msgstr "" -" -L, --lines-per-page=NUM angiv antal linjer som skal skrives på hver side\n" +" -L, --lines-per-page=NUM angiv antal linjer som skal skrives på hver " +"side\n" " -m, --mail sende en e-post når det er færdigt\n" " -M, --media=NAVN brug uddataformatet NAVN\n" " -n, --copies=NUM udskriv NUM kopier af hver side\n" @@ -575,8 +585,8 @@ " -r, --landscape udskriv i landskabstilstand\n" " -R, --portrait udskriv i portrættilstand\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -612,7 +622,8 @@ " -Z, --pass-through send gennem PostScript- og PCL-filer uden\n" " nogen ændringer\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -626,8 +637,8 @@ " --help print this help and exit\n" msgstr "" -#: src/main.c:2596 -#, fuzzy +#: src/main.c:2621 +#, fuzzy, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -648,7 +659,8 @@ " --help udskriv denne hjælpetekst og afslut\n" " --help-pretty-print beskriv alle sprog og filformater med\n" " --pretty-print-understøttelse\n" -" --highlight-bar-gray=NUM udskriv markeringslinjer med gråværdi NUM (0 - 1)\n" +" --highlight-bar-gray=NUM udskriv markeringslinjer med gråværdi NUM (0 - " +"1)\n" " --list-media list navnene på alle kendte media\n" " --list-options list alle flag og deres værdier\n" " --margins=VENSTRE:HØJRE:TOP:BUND\n" @@ -658,8 +670,8 @@ " --non-printable-format=FMT angiv hvordan ej udskrivbare tegn skal " "udskrives\n" -#: src/main.c:2607 -#, fuzzy +#: src/main.c:2632 +#, fuzzy, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -681,8 +693,8 @@ " --printer-options=FLAG send med ekstra flag til udskriftskommandoer\n" " --rotate-even-pages rotér sider med lige numre 180°\n" -#: src/main.c:2617 -#, fuzzy +#: src/main.c:2642 +#, fuzzy, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -706,7 +718,8 @@ " --ul-style=STIL udskriv underlag med stilen STIL\n" " --word-wrap linjeombryd lange linjer ved ordgrænser\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -809,22 +822,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "ugyldig værdi for kontrolsekvensen ^@bggray: %s" -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: kunne ikke åbne datakanal til kommandoen \"%s\": %s\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "kunne ikke åbne EPS-filen \"%s\": %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "EPS-filen \"%s\" begynder ikke med \"%%!\"-magi\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -833,27 +841,27 @@ "EPS-filen \"%s\" indeholder fejludformet %%%%BoundingBox-linje:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "EPS-filen \"%s\" er ikke en gyldig EPS-fil\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" msgstr "videresender alle inddatafiler for uddatasproget \"%s\"\n" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "videresender %s-filen \"%s\"\n" -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, fuzzy, c-format msgid "couldn't create temporary divert file: %s" msgstr "kunne ikke oprette omdirigeringsfilnavn: %s" -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "kunne ikke tilbagespole omdirigeringsfilen: %s" @@ -926,7 +934,8 @@ #: src/util.c:896 #, c-format msgid "couldn't open AFM file for font \"%s\", using default\n" -msgstr "kunne ikke åbne AFM-fil for skrifttypen \"%s\", bruger standardalternativet\n" +msgstr "" +"kunne ikke åbne AFM-fil for skrifttypen \"%s\", bruger standardalternativet\n" #: src/util.c:903 #, c-format @@ -943,70 +952,70 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "kunne ikke åbne beskrivelsesfilen \"%s\" for skrifttypen: %s\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: for langt format for %%D{}-kontrolsekvens" -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: ukendt \"%%\"-kontrolsekvens \"%c\" (%d)" -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: ingen afsluttende \")\" for $()-kontrolsekvens" -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: for langt variabelnavn for $()-kontrolsekvens" -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: for langt format for $D{}-kontrolsekvens" -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: ukendt \"$\"-kontrolsekvens \"%c\" (%d)" -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "fejludformet flydendetalsdimension: \"%s\"" -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "kunne ikke åbne inddatafiltret \"%s\" for filen \"%s\": %s" -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "kunne ikke åbne inddatafilen \"%s\": %s" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "fil=%s\n" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "standard ud" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "%s: kunne ikke åbne uddatafilen \"%s\"" -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 msgid "couldn't create AFM library" msgstr "kunne ikke oprette AFM-bibliotek" -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1025,15 +1034,15 @@ " standard ud.\n" " -V, --version vis versionsnummer\n" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "fejl: filslut inde i kommentar" -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "fejl: filslut inde i strengkonstant" -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "fejl: filslut inde i regulært udtryk" @@ -1042,32 +1051,32 @@ msgid "states for GNU %s %s" msgstr "tilstand for GNU %s %s" -#: states/main.c:254 +#: states/main.c:255 #, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "%s: fejludformet variabeldefinition \"%s\"\n" -#: states/main.c:282 +#: states/main.c:283 #, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "%s: kunne ikke oprette uddatafilen \"%s\": %s\n" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: ukendt advarselsniveau \"%s\"\n" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "%s: hukommelsen opbrugt\n" -#: states/main.c:423 +#: states/main.c:424 #, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "%s: kunne ikke åbne inddatafilen \"%s\": %s\n" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -1076,7 +1085,8 @@ "Brug: %s [FLAG]... [FIL]...\n" "Obligatoriske argumenter til lange flag er obligatoriske også for de korte.\n" -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1128,7 +1138,8 @@ #, c-format msgid "" "%s: FATAL ERROR: States version %s or higher is required for this script\n" -msgstr "%s: FATAL FEJL: Tilstand af version %s eller over kræves for dette skript\n" +msgstr "" +"%s: FATAL FEJL: Tilstand af version %s eller over kræves for dette skript\n" #: states/prims.c:610 states/prims.c:1276 #, c-format @@ -1280,6 +1291,9 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "%s: læser in \"%s\" automatisk fra \"%s\"\n" +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "epsf: kunne ikke åbne datakanal til kommandoen \"%s\": %s\n" + #~ msgid "couldn't create toc file \"%s\": %s" #~ msgstr "kunne ikke oprette indholdsfil \"%s\": %s" --- enscript-1.6.4.orig/po/de.po +++ enscript-1.6.4/po/de.po @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU enscript 1.6.2\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 17:10+0200\n" "PO-Revision-Date: 1999-04-08 22:13+02:00\n" "Last-Translator: Martin von Löwis \n" "Language-Team: German \n" @@ -152,86 +153,87 @@ msgid "Unmatched ) or \\)" msgstr "»)« order »\\\\)« ohne öffnende Klammer" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "Kein vorangehender regulärer Ausdruck" -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N $3% Seiten $4L Zeilen $E $C" -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "Kein Passwort-Eintrag für UID=%d zu bekommen: %s." -#: src/main.c:1088 +#: src/main.c:1099 #, fuzzy, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "Kann Konfigurationsdatei »%s/%s« nicht öffnen: %s." -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "" -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "unbekannte Kodierung: %s" -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "Kann AFM-Bibliothek nicht öffnen: %s." # Müssen die x-, y-Sachen auch übersetzt werden? -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -241,54 +243,56 @@ "Name Weite\tHöhe\tllx\tlly\turx\tury\n" "------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "Nichts von dem Medium »%s« bekannt." -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" -msgstr "Neue Ränder für Medium »%s« setzen (%dx%d): lux=%d, luy=%d, rox=%d, roy=%d\n" +msgstr "" +"Neue Ränder für Medium »%s« setzen (%dx%d): lux=%d, luy=%d, rox=%d, roy=%d\n" -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "ungültiges Format für die Seitenbezeichnung »%s«." -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "Ungültiges, nicht auszugebendes Format (»non-printable«) \"%s\"." -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "Ungültiger Stil für Umbruchsmarkierung: »%s«." -#: src/main.c:1338 +#: src/main.c:1349 #, c-format msgid "illegal N-up argument: %d" msgstr "Ungültiges N-up Argument: %d." -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "Das Argument von N-up muß eine Zweierpotenz sein: %d" # Alternative Übersetzung für underlay: Hintergrund? -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "Fehlformatierte Position für Wasserzeichen: %s." -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "Unerlaubter Stil von Wasserzeichen: %s." -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" @@ -298,105 +302,105 @@ # Mir ist unklar, was diese und die folgenden Meldungen meinen... -ke- # Vermutlich toc = Table of contents? -mvl- -#: src/main.c:1641 +#: src/main.c:1662 #, fuzzy, c-format msgid "couldn't create temporary toc file: %s" msgstr "Datei für Inhaltsverzeichnis kann nicht angelegt werden: %s." -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "Kann Eingabedatei »%s« nicht feststellen (»stat«): %s." -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "Inhaltsverzeichnis kann nicht an Anfang zurückgesetzt werden: %s." -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "Inhaltsverzeichnis" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "Keine Ausgabe erzeugt.\n" -#: src/main.c:1748 +#: src/main.c:1773 #, c-format msgid "output sent to %s\n" msgstr "Ausgabe gesendet an %s.\n" -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "Drucker" -#: src/main.c:1751 +#: src/main.c:1776 #, c-format msgid "output left in %s\n" msgstr "Ausgabe abgelegt in %s.\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d Seiten * %d Kopie ]" -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr " geschickt zu: %s\n" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " abgelegt in: %s\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d Zeile(n) wurde(n) %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "abgeschnitten (»truncated«)" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "zusammengedrängt (»wrapped«)" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "%d Zeichen fehlen\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "fehlende Zeichencodes (dezimal):\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d nicht druckbare Zeichen\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "nicht druckbare Zeichencodes (dezimal):\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "Kann nicht auf Drucker »%s« zugreifen: %s." -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "Kann Ausgabedatei »%s« nicht anlegen: %s." -#: src/main.c:1880 +#: src/main.c:1905 #, fuzzy, c-format msgid "couldn't close output file \"%s\": %s" msgstr "Kann Ausgabedatei »%s« nicht anlegen: %s." -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -405,66 +409,68 @@ "Syntaxfehler in der Option %s=»%s«:\n" "fehlendes Ende des Zitats (»quotation«): %c" -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" -msgstr "ACHTUNG: folgende Optionen von der Umgebungsvariablen %s nicht ausgeführt:\n" +msgstr "" +"ACHTUNG: folgende Optionen von der Umgebungsvariablen %s nicht ausgeführt:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " Option %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 #, fuzzy msgid "number of columns must be larger than zero" msgstr "Ausrichtung der Datei (»aligment«) muss größer als Null sein" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "Ausrichtung der Datei (»aligment«) muss größer als Null sein" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "unpassende (»malformed«) Fontspezifikation: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" msgstr "Kann Definitionsdatei »%s.hdr« für die Kopfangaben nicht finden." -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "muss wenigstens eine Zeile pro Seite drucken: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" -msgstr "%s: Ungültiger Bezeichner für »Neue Zeile«: '%s': erwartet 'n' oder 'r'.\n" +msgstr "" +"%s: Ungültiger Bezeichner für »Neue Zeile«: '%s': erwartet 'n' oder 'r'.\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "Abschnitt muss größer als Null sein." -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "»%s --help« gibt Ihnen mehr Informationen.\n" -#: src/main.c:2510 +#: src/main.c:2535 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -507,12 +513,13 @@ " -e, --escapes[=ZEICHEN] Spezielle Interpretation der Escape-Zeichen\n" " zuschalten.\n" -#: src/main.c:2530 -#, fuzzy +#: src/main.c:2555 +#, fuzzy, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr " -E, --pretty-print[=LANG] Quelltext schön formatieren.\n" -#: src/main.c:2533 +#: src/main.c:2558 +#, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -537,8 +544,10 @@ " -g, --print-anyway Bedeutungslos (Kompatibilitätsoption)\n" " -G Wie --fancy-header\n" " --fancy-header[=NAME] Schicken Seitenkopf benutzen.\n" -" -h, --no-job-header Seite mit Kopf für Auftrag (»job«) unterdrücken.\n" -" -H, --highlight-bars=ZAHL Größe der Hervorhebungsbalken auf ZAHL festlegen.\n" +" -h, --no-job-header Seite mit Kopf für Auftrag (»job«) " +"unterdrücken.\n" +" -H, --highlight-bars=ZAHL Größe der Hervorhebungsbalken auf ZAHL " +"festlegen.\n" " -i, --indent=NUM Zeileneinrückung auf NUM Zeichen festlegen.\n" " -I, --filter=CMD Eingabezeilen durch Eingabefilter CMD lesen.\n" " -j, --borders Ränder um Spalten drucken.\n" @@ -550,7 +559,8 @@ "portrait,\n" " --columns=1.\n" -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -573,7 +583,8 @@ " -M, --media=NAME Ausgabemedium NAME nehmen.\n" " -n, --copies=ZAHL ZAHL der Kopien.\n" " -N, --newline=NZ \"Neue Zeile\"-Zeichen (»newline«) auswählen.\n" -" Mögliche Werte für NZ: n (`\\n') und r (`\\r').\n" +" Mögliche Werte für NZ: n (`\\n') und r (`" +"\\r').\n" " -o Alias für die Option --output.\n" " -O, --missing-characters\n" " Fehlenden Zeichenkode anzeigen.\n" @@ -585,8 +596,8 @@ " -r, --landscape Im Querformat (»landscape mode«) drucken.\n" " -R, --portrait Im Längsformat (»portrait mode«) drucken.\n" -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -610,7 +621,8 @@ " »statusdict definition« zur Ausgabe\n" " weiterreichen.\n" " -t, --title=TITEL Titel für erste Seite (»banner page«) angeben.\n" -" Gibt auch den Namen der Eingabedatei »stdin« an.\n" +" Gibt auch den Namen der Eingabedatei »stdin« " +"an.\n" " -T, --tabsize=NUM Tabulatorbreite auf NUM setzen.\n" " -u, --underlay[=TEXT] TEXT unter jeder Seite drucken (Wasserzeichen).\n" " -U, --nup=ZAHL Drucke ZAHL logische Seiten auf jede " @@ -619,11 +631,13 @@ " -V, --version Programmversion anzeigen.\n" " -W, --language=SPRACHE Setze Ausgabesprache auf SPRACHE.\n" " -X, --encoding=NAME Eingabe-Kodierung NAME benutzen.\n" -" -z, --no-formfeed Seitenvorschub (»form feed«) nicht interpretieren.\n" +" -z, --no-formfeed Seitenvorschub (»form feed«) nicht " +"interpretieren.\n" " -Z, --pass-through PostScript- und PCL-Dateien ohne\n" " Veränderungen weiterreichen.\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -637,8 +651,8 @@ " --help print this help and exit\n" msgstr "" -#: src/main.c:2596 -#, fuzzy +#: src/main.c:2621 +#, fuzzy, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -656,7 +670,8 @@ " --filter-stdin=NAME NAME, mit dem stdin in Eingabefiltern \n" " auftaucht, festlegen.\n" " --help Diese Hilfe anzeigen und beenden.\n" -" --help-pretty-pring Beschreibe alle von --pretty-print unterstützten\n" +" --help-pretty-pring Beschreibe alle von --pretty-print " +"unterstützten\n" " Sprachen.\n" " --highlight-bar-gray=ZAHL Graustufe für die Hervorhebungsbalken \n" " auf ZAHL setzen.\n" @@ -668,8 +683,8 @@ " durch STIL.\n" " --non-printable-format=FMT Nicht druckbares Format als FMT bestimmen.\n" -#: src/main.c:2607 -#, fuzzy +#: src/main.c:2632 +#, fuzzy, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -688,11 +703,12 @@ " --page-label-format=FMT Format für Seitenbezeichnung auf FMT setzen.\n" " --ps-level=LEVEL Von enscript benutztes Postscript-LEVEL \n" " einstellen.\n" -" --printer-options=OPTIONEN Extra OPTIONEN an das Druckerkommando übergeben.\n" +" --printer-options=OPTIONEN Extra OPTIONEN an das Druckerkommando " +"übergeben.\n" " --rotate-even-pages Geradzahlige Seiten um 180 Grad drehen.\n" -#: src/main.c:2617 -#, fuzzy +#: src/main.c:2642 +#, fuzzy, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -716,7 +732,8 @@ " --ul-style=STIL Wasserzeichen mit Stil STIL drucken.\n" " --word-wrap Lange Zeilen an Wortgrenzen umbrechen.\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -751,7 +768,8 @@ #: src/psgen.c:979 msgid "user font encoding can be only the system's default or `ps'" -msgstr "Nutzerdefinierte Fontkodierung kann nur der Systemstandard oder »ps« sein." +msgstr "" +"Nutzerdefinierte Fontkodierung kann nur der Systemstandard oder »ps« sein." #: src/psgen.c:1220 #, c-format @@ -778,7 +796,8 @@ #: src/psgen.c:1368 msgid "unexpected EOF while scanning ^@epsf escape" -msgstr "Unerwartetes EOF während Durchsicht (»scanning«) des Escape-Zeichens ^@epsf" +msgstr "" +"Unerwartetes EOF während Durchsicht (»scanning«) des Escape-Zeichens ^@epsf" #: src/psgen.c:1374 msgid "malformed ^@epsf escape: no '{' found" @@ -818,22 +837,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "Ungültiger Wert für das Escape-Zeichen ^@bggray: %s." -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epsf: Kann Pipe zum Befehl »%s« nicht öffnen: %s.\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "Kann EPS-Datei »%s« nicht öffnen: %s.\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "EPS-Datei »%s« beginnt nicht mit Kennung (»magic«) %%!\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -842,28 +856,29 @@ "EPS-Datei »%s« enthält fehlgebildete %%%%BoundingBox-Zeile:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "EPS-Datei »%s« ist keine gültige EPS-Datei\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" -msgstr "Alle Eingabedateien werden für die Ausgabesprache »%s« weitergeleitet.\n" +msgstr "" +"Alle Eingabedateien werden für die Ausgabesprache »%s« weitergeleitet.\n" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "Durch %s die Datei »%s« weiterreichen.\n" # Mir ist unklar, was diese und die folgenden Meldungen meinen... -ke- -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, fuzzy, c-format msgid "couldn't create temporary divert file: %s" msgstr "Name für Umleitungsdatei kann nicht erzeugt werden: %s." -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "Umleitungsdatei kann nicht zurückgespult werden: %s." @@ -936,7 +951,8 @@ #: src/util.c:896 #, c-format msgid "couldn't open AFM file for font \"%s\", using default\n" -msgstr "Kann AFM-Datei für Font »%s« nicht öffnen, nehme Vorgabe (»default«).\n" +msgstr "" +"Kann AFM-Datei für Font »%s« nicht öffnen, nehme Vorgabe (»default«).\n" #: src/util.c:903 #, c-format @@ -953,72 +969,72 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "Kann Datei für Font-Beschreibung »%s« nicht öffnen: %s.\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: Zu langes Format für Escape-Zeichen %%D{}." # ### was ist gemeint??? -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: Unbekanntes `%%' Escape-Zeichen '%c' (%d)." -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: Keine schließende ')' für das Escape-Zeichen $()." -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: Zu langer Variablen-Name für das Escape-Zeichen $()." -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: Zu langes Format für das Escape-Zeichen $D{}." -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: Unbekanntes '$'-Escape-Zeichen '%c' (%d)." # Gegenwärtig nur für Einrückung verwendet -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "Fehlformatierte Dimensionsangabe: \"%s\"." -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "Kann Eingabefilter »%s« für Datei »%s« nicht öffnen: %s." -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "Kann Eingabedatei »%s« nicht öffnen: %s." -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "Datei=%s\n" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "Standardausgabe" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "%s: Kann Ausgabedatei »%s« nicht öffnen." -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 msgid "couldn't create AFM library" msgstr "Kann AFM-Bibliothek nicht erzeugen." -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1037,15 +1053,15 @@ " Wenn NAME »-« ist, verwende Standardausgabe.\n" " -V, --version Gib die Versionsnummer aus.\n" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "Fehler: EOF in Kommentar." -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "Fehler: EOF in Zeichenkonstante." -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "Fehler: EOF in regulärem Ausdruck." @@ -1054,32 +1070,32 @@ msgid "states for GNU %s %s" msgstr "states für GNU %s %s" -#: states/main.c:254 +#: states/main.c:255 #, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "%s: Fehlformatierte Variablendefinition »%s«.\n" -#: states/main.c:282 +#: states/main.c:283 #, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "%s: Kann Ausgabedatei »%s« nicht anlegen: %s.\n" -#: states/main.c:313 +#: states/main.c:314 #, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: Unbekannte Warnstufe »%s«.\n" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "%s: Hauptspeicher erschöpft.\n" -#: states/main.c:423 +#: states/main.c:424 #, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "%s: Kann Eingabedatei »%s« nicht öffnen: %s.\n" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -1088,7 +1104,8 @@ "Aufruf: %s [OPTION]... [DATEI] ...\n" "Notwendige Argumente für lange Optionen sind auch für kurze notwendig.\n" -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1140,7 +1157,9 @@ #, c-format msgid "" "%s: FATAL ERROR: States version %s or higher is required for this script\n" -msgstr "%s: FATALER FEHLER: states Version %s oder höher wird für dieses Skript benötigt.\n" +msgstr "" +"%s: FATALER FEHLER: states Version %s oder höher wird für dieses Skript " +"benötigt.\n" #: states/prims.c:610 states/prims.c:1276 #, c-format @@ -1292,6 +1311,9 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "%s: »%s« wird automatisch von »%s« geladen.\n" +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "epsf: Kann Pipe zum Befehl »%s« nicht öffnen: %s.\n" + #~ msgid "couldn't create toc file \"%s\": %s" #~ msgstr "Datei für Inhaltsverzeichnis kann nicht angelegt werden »%s«: %s." --- enscript-1.6.4.orig/po/es.po +++ enscript-1.6.4/po/es.po @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU enscript 1.4.2\n" -"POT-Creation-Date: 2003-03-05 09:41+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-22 16:58+0200\n" "PO-Revision-Date: 1997-03-19 23:01+0100\n" "Last-Translator: L. Marcél Barrero M. \n" "Language-Team: Spanish \n" @@ -152,11 +153,11 @@ msgid "Unmatched ) or \\)" msgstr "" -#: compat/regex.c:5458 +#: compat/regex.c:5462 msgid "No previous regular expression" msgstr "" -#: src/main.c:966 +#: src/main.c:968 #, no-c-format msgid "$3v $-40N $3% pages $4L lines $E $C" msgstr "$3v $-40N $3% páginas $4L líneas $E $C" @@ -172,68 +173,68 @@ # Bueno, bien. Admitiendo que lo que no se encontró fue la línea entera, # propongo usar "entrada" y no "declaración" sv # -#: src/main.c:996 +#: src/main.c:1000 #, c-format msgid "couldn't get passwd entry for uid=%d: %s" msgstr "" "no se pudo obtener la entrada del usuario uid=%d en el archivo passwd: %s" -#: src/main.c:1088 +#: src/main.c:1099 #, fuzzy, c-format msgid "couldn't read config file \"%s/%s\": %s" msgstr "no se pudo abrir el archivo de configuración \"%s/%s\": %s" -#: src/main.c:1092 +#: src/main.c:1103 msgid "I did also try the following directories:" msgstr "" -#: src/main.c:1093 src/main.c:1094 src/main.c:1095 +#: src/main.c:1104 src/main.c:1105 src/main.c:1106 #, c-format msgid "\t%s" msgstr "" -#: src/main.c:1096 +#: src/main.c:1107 msgid "\t../lib" msgstr "" -#: src/main.c:1097 +#: src/main.c:1108 msgid "\t../../lib" msgstr "" -#: src/main.c:1099 +#: src/main.c:1110 msgid "This is probably an installation error. Please, try to rebuild:" msgstr "" -#: src/main.c:1100 +#: src/main.c:1111 msgid "\tmake distclean" msgstr "" -#: src/main.c:1101 +#: src/main.c:1112 msgid "\t./configure --prefix=PREFIX" msgstr "" -#: src/main.c:1102 +#: src/main.c:1113 msgid "\tmake" msgstr "" -#: src/main.c:1103 +#: src/main.c:1114 msgid "\tmake check" msgstr "" -#: src/main.c:1104 +#: src/main.c:1115 msgid "\tmake install" msgstr "" -#: src/main.c:1106 +#: src/main.c:1117 msgid "or set the environment variable `ENSCRIPT_LIBRARY' to point to your" msgstr "" -#: src/main.c:1108 +#: src/main.c:1119 msgid "library directory." msgstr "" # Para comprender mejor el sentido, habría que chequear el código fuente. -#: src/main.c:1180 +#: src/main.c:1191 #, c-format msgid "unknown encoding: %s" msgstr "codificación desconocida: %s" @@ -247,7 +248,7 @@ # ¿Consenso? :-) # En Spanish-GNU nos hemos decidido por biblioteca. sv # Lo cambio directamente. sv -#: src/main.c:1199 +#: src/main.c:1210 #, c-format msgid "couldn't open AFM library: %s" msgstr "no se pudo abrir la biblioteca AFM: %s" @@ -260,7 +261,8 @@ # # Sugiero comerse el "Lista de" y dejarlo simplemente # en "soportes conocidos". sv -#: src/main.c:1228 +#: src/main.c:1239 +#, c-format msgid "" "known media:\n" "name width\theight\tllx\tlly\turx\tury\n" @@ -270,12 +272,12 @@ "nombre ancho\tlargo\tllx\tlly\turx\tury\n" "------------------------------------------------------------\n" -#: src/main.c:1247 +#: src/main.c:1258 #, c-format msgid "do not know anything about media \"%s\"" msgstr "no se pudo reconocer el soporte \"%s\"" -#: src/main.c:1291 +#: src/main.c:1302 #, c-format msgid "" "set new marginals for media `%s' (%dx%d): llx=%d, lly=%d, urx=%d, ury=%d\n" @@ -284,45 +286,46 @@ # Yo tengo por norma comenzar por mayúscula cuando el original lo hace. # Este es el único mensaje (y los que siguen) que no son así. # De todas formas es lo que yo hago, no tienes por qué estar de acuerdo. sv -#: src/main.c:1302 +#: src/main.c:1313 #, c-format msgid "illegal page label format \"%s\"" msgstr "El formato del nombre de página \"%s\" es incorrecto." # *********************************************** -#: src/main.c:1314 +#: src/main.c:1325 #, c-format msgid "illegal non-printable format \"%s\"" msgstr "El formato no imprimible \"%s\" es incorrecto." -#: src/main.c:1328 +#: src/main.c:1339 #, c-format msgid "illegal style for wrapped line marker: \"%s\"" msgstr "" -#: src/main.c:1338 +#: src/main.c:1349 #, fuzzy, c-format msgid "illegal N-up argument: %d" msgstr "opción incorrecta: %s" -#: src/main.c:1343 +#: src/main.c:1354 #, c-format msgid "N-up argument must be power of 2: %d" msgstr "" # **************************************************************** -#: src/main.c:1420 +#: src/main.c:1431 #, c-format msgid "malformed underlay position: %s" msgstr "La posición de pie de página es incorrecta: %s" # **************************************************************** -#: src/main.c:1443 +#: src/main.c:1454 #, c-format msgid "illegal underlay style: %s" msgstr "El estilo del pie de página es incorrecto: %s" -#: src/main.c:1470 +#: src/main.c:1481 +#, c-format msgid "" "Highlighting is supported for the following languages and file formats:\n" "\n" @@ -338,12 +341,12 @@ # Bueno, en este caso no sería tan grave: Piensa que hablando de TeX, # uno puede decir "El archivo .tex, el archivo .dvi y el archivo .log" # y no pasa nada. sv -#: src/main.c:1641 +#: src/main.c:1662 #, fuzzy, c-format msgid "couldn't create temporary toc file: %s" msgstr "no se pudo crear el archivo para el índice: %s" -#: src/main.c:1688 +#: src/main.c:1709 #, c-format msgid "couldn't stat input file \"%s\": %s" msgstr "stat() no pudo evaluar archivo de entrada \"%s\": %s" @@ -358,21 +361,21 @@ # Y si decimos: # msgstr "no se pudo localizar el inicio del archivo para el índice: %s" # Algo mejor. sv -#: src/main.c:1708 +#: src/main.c:1729 #, c-format msgid "couldn't rewind toc file: %s" msgstr "no se pudo rebobinar el archivo para el índice: %s" -#: src/main.c:1714 +#: src/main.c:1735 msgid "Table of Contents" msgstr "Índice" -#: src/main.c:1743 +#: src/main.c:1768 msgid "no output generated\n" msgstr "" # como supongo que se trata de las páginas, lo pongo en género femenino. -#: src/main.c:1748 +#: src/main.c:1773 #, fuzzy, c-format msgid "output sent to %s\n" msgstr " enviadas a %s\n" @@ -380,7 +383,7 @@ # Si supiéramos el contexto sabríamos si el "la" procede o no. sv # Si si, según el código fuente, son las páginas enviadas a la impresora. # Ver siguiente comentario. -#: src/main.c:1749 src/main.c:1773 +#: src/main.c:1774 src/main.c:1798 msgid "printer" msgstr "la impresora" @@ -396,18 +399,18 @@ # Si se "imprime" en un archivo (opción -o ), se imprimirá el mensaje: # quedan en el archivo . # En este caso, creo que lo mejor sería poner "copiadas en" o "grabadas en" -#: src/main.c:1751 +#: src/main.c:1776 #, fuzzy, c-format msgid "output left in %s\n" msgstr " copiadas en %s\n" -#: src/main.c:1769 +#: src/main.c:1794 #, c-format msgid "[ %d pages * %d copy ]" msgstr "[ %d páginas * %d copias ]" # como supongo que se trata de las páginas, lo pongo en género femenino. -#: src/main.c:1772 +#: src/main.c:1797 #, c-format msgid " sent to %s\n" msgstr " enviadas a %s\n" @@ -424,53 +427,53 @@ # Si se "imprime" en un archivo (opción -o ), se imprimirá el mensaje: # quedan en el archivo . # En este caso, creo que lo mejor sería poner "copiadas en" o "grabadas en" -#: src/main.c:1775 +#: src/main.c:1800 #, c-format msgid " left in %s\n" msgstr " copiadas en %s\n" -#: src/main.c:1780 +#: src/main.c:1805 #, c-format msgid "%d lines were %s\n" msgstr "%d líneas fueron %s\n" -#: src/main.c:1782 +#: src/main.c:1807 msgid "truncated" msgstr "cortadas" -#: src/main.c:1782 +#: src/main.c:1807 msgid "wrapped" msgstr "separadas" -#: src/main.c:1788 +#: src/main.c:1813 #, c-format msgid "%d characters were missing\n" msgstr "faltaron %d caracteres\n" -#: src/main.c:1792 +#: src/main.c:1817 msgid "missing character codes (decimal):\n" msgstr "códigos (en decimal) de los caracteres que faltan:\n" -#: src/main.c:1800 +#: src/main.c:1825 #, c-format msgid "%d non-printable characters\n" msgstr "%d caracteres no imprimibles\n" -#: src/main.c:1805 +#: src/main.c:1830 msgid "non-printable character codes (decimal):\n" msgstr "códigos (en decimal) de los caracteres no imprimibles:\n" -#: src/main.c:1854 +#: src/main.c:1879 #, c-format msgid "couldn't open printer `%s': %s" msgstr "no se pudo acceder a la impresora `%s': %s" -#: src/main.c:1863 +#: src/main.c:1888 #, c-format msgid "couldn't create output file \"%s\": %s" msgstr "no se pudo crear el archivo de salida \"%s\": %s" -#: src/main.c:1880 +#: src/main.c:1905 #, fuzzy, c-format msgid "couldn't close output file \"%s\": %s" msgstr "no se pudo crear el archivo de salida \"%s\": %s" @@ -489,7 +492,7 @@ # Viene en el diccionario de la Real Academia. # ## Toda mi vida había dicho apóstrofe... Cada día se aprende, ¿verdad? :-) # ## Yo también, esto me lo dijo un `webmaster' de Zaragoza... -#: src/main.c:1938 +#: src/main.c:1963 #, c-format msgid "" "syntax error in option string %s=\"%s\":\n" @@ -505,61 +508,65 @@ # > para definir algunas acciones. (Aunque normalmente es lo contrario que sucede, # > que las opciones de la línea de comando son prioritarias a las variables de entorno)... # > ¿A ver en el código fuente? :-) -#: src/main.c:1970 +#: src/main.c:1995 #, c-format msgid "" "warning: didn't process following options from environment variable %s:\n" -msgstr "atención: no se procesaron las siguientes opciones de la variable de entorno %s:\n" +msgstr "" +"atención: no se procesaron las siguientes opciones de la variable de entorno " +"%s:\n" -#: src/main.c:1974 +#: src/main.c:1999 #, c-format msgid " option %d = \"%s\"\n" msgstr " opción %d = \"%s\"\n" -#: src/main.c:2020 +#: src/main.c:2045 #, fuzzy msgid "number of columns must be larger than zero" msgstr "la alineación del archivo debe ser mayor que cero" -#: src/main.c:2078 +#: src/main.c:2103 msgid "file alignment must be larger than zero" msgstr "la alineación del archivo debe ser mayor que cero" -#: src/main.c:2133 src/main.c:2139 src/main.c:2350 src/util.c:415 +#: src/main.c:2158 src/main.c:2164 src/main.c:2375 src/util.c:415 #, c-format msgid "malformed font spec: %s" msgstr "especificación errónea de la fuente: %s" -#: src/main.c:2155 +#: src/main.c:2180 #, c-format msgid "couldn't find header definition file \"%s.hdr\"" -msgstr "no se pudo encontrar el archivo de definición de la cabecera \"%s.hdr\"" +msgstr "" +"no se pudo encontrar el archivo de definición de la cabecera \"%s.hdr\"" -#: src/main.c:2199 +#: src/main.c:2224 #, c-format msgid "must print at least one line per each page: %s" msgstr "se debe imprimir por lo menos una línea por página: %s" -#: src/main.c:2219 +#: src/main.c:2244 #, c-format msgid "%s: illegal newline character specifier: '%s': expected 'n' or 'r'\n" -msgstr "%s: carácter de nueva línea no permitido: '%s': se esperaba 'n' o 'r'\n" +msgstr "" +"%s: carácter de nueva línea no permitido: '%s': se esperaba 'n' o 'r'\n" -#: src/main.c:2308 +#: src/main.c:2333 #, c-format msgid "malformed argument `%s' for option -W, --option: no comma found" msgstr "" -#: src/main.c:2313 +#: src/main.c:2338 #, c-format msgid "helper application specification must be single character: %s" msgstr "" -#: src/main.c:2409 +#: src/main.c:2434 msgid "slice must be greater than zero" msgstr "el intervalo debe ser mayor que cero" -#: src/main.c:2490 states/main.c:320 +#: src/main.c:2515 states/main.c:321 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pruebe `%s --help' para más información.\n" @@ -567,7 +574,7 @@ # Sugerencia: imprime el resultado (en vez de la salida). sv # Sugerencia: equivalente -> equivale, o bien "igual que" o "lo mismo que". sv # Sugerencia: secuencias especiales de escape -> secuencias de escape. sv -#: src/main.c:2510 +#: src/main.c:2535 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -608,15 +615,16 @@ " -e, --escapes[=CHAR] habilita la interpretación de las secuencias\n" " especiales de escape\n" -#: src/main.c:2530 +#: src/main.c:2555 +#, c-format msgid " -E, --highlight[=LANG] highlight source code\n" msgstr "" # lineprinter = impresora que imprime línea por línea. # impresora en línea, ¿no? Creo que no tiene nada que ver si es matricial o no. sv # pregunta: ¿"éste" lleva tilde? sv (creo que no). -#: src/main.c:2533 -#, fuzzy +#: src/main.c:2558 +#, fuzzy, c-format msgid "" " -f, --font=NAME use font NAME for body text\n" " -F, --header-font=NAME use font NAME for header texts\n" @@ -643,9 +651,11 @@ " -G idéntico a --fancy-header\n" " --fancy-header[=NOMBRE] selecciona la página de carátula\n" " -h, --no-job-header suprime la página de cabecera.\n" -" -H, --highlight-bars=NUM especifica cuán grandes son las barras de marca\n" +" -H, --highlight-bars=NUM especifica cuán grandes son las barras de " +"marca\n" " -i, --indent=NUM inicializa la sangría a NUM\n" -" -I, --filter=CMD lee los ficheros de entrada a través del filtro CMD\n" +" -I, --filter=CMD lee los ficheros de entrada a través del filtro " +"CMD\n" " -j, --borders imprime bordes alrededor de las columnas\n" " -k, --page-prefeed habilita la pre-alimentación de páginas\n" " -K, --no-page-prefeed inhabilita la pre-limentación de páginas\n" @@ -668,7 +678,8 @@ # Que lo vea otro, a ver qué dice. sv # También se podría poner "imprime en modo apaisado" e "imprime en modo normal" # Lo de portaretrato no me gusta. Apaisado sí em+ -#: src/main.c:2551 +#: src/main.c:2576 +#, c-format msgid "" " -L, --lines-per-page=NUM specify how many lines are printed on each " "page\n" @@ -716,8 +727,8 @@ # He puesto `form feed' en lugar de form feed, por no ser palabras españolas. # imprimir -> mostrar em+ # form feed -> salto de pagina em+ -#: src/main.c:2567 -#, fuzzy +#: src/main.c:2592 +#, fuzzy, c-format msgid "" " -s, --baselineskip=NUM set baselineskip to NUM\n" " -S, --statusdict=KEY[:VALUE]\n" @@ -738,7 +749,8 @@ msgstr "" " -s, --baselineskip=NUM inicializa `baselineskip' a NUM\n" " -S, --statusdict=CLAVE[:VALOR]\n" -" pasa una definición del `statusdict' a la salida\n" +" pasa una definición del `statusdict' a la " +"salida\n" " -t, --title=TÍTULO da el nombre TÍTULO a la ejecución. También\n" " da nombre al archivo de entrada\n" " -T, --tabsize=NUM inicializa el tamaño del tabulador a NUM\n" @@ -750,7 +762,8 @@ " -Z, --pass-through pasa a través de archivos PostScript y PCL\n" " sin niguna modificación\n" -#: src/main.c:2585 +#: src/main.c:2610 +#, c-format msgid "" "Long-only options:\n" " --color[=bool] create color outputs with states\n" @@ -764,7 +777,8 @@ " --help print this help and exit\n" msgstr "" -#: src/main.c:2596 +#: src/main.c:2621 +#, c-format msgid "" " --help-highlight describe all supported --highlight languages\n" " and file formats\n" @@ -777,7 +791,8 @@ " --non-printable-format=FMT specify how non-printable chars are printed\n" msgstr "" -#: src/main.c:2607 +#: src/main.c:2632 +#, c-format msgid "" " --nup-columnwise layout pages in the N-up printing columnwise\n" " --nup-xpad=NUM set the page x-padding of N-up printing to NUM\n" @@ -793,8 +808,8 @@ # Todos los underlay los he traducido como pie de página. # No es footnote, pero viendo su ubicación en la página, # es casi lo mismo... ¿alguien tiene otra sugerencia? -#: src/main.c:2617 -#, fuzzy +#: src/main.c:2642 +#, fuzzy, c-format msgid "" " --slice=NUM print vertical slice NUM\n" " --style=STYLE use highlight style STYLE\n" @@ -820,7 +835,8 @@ " para los pies de página\n" " --ul-style=STYLE imprime los pies de página con el estilo STYLE\n" -#: src/main.c:2631 +#: src/main.c:2656 +#, c-format msgid "" "\n" "Report bugs to mtr@iki.fi.\n" @@ -847,7 +863,8 @@ #: src/psgen.c:464 #, c-format msgid "couldn't find header definition file \"%s.hdr\": %s\n" -msgstr "no se pudo encontrar el archivo de definición de la cabecera \"%s.hdr\": %s\n" +msgstr "" +"no se pudo encontrar el archivo de definición de la cabecera \"%s.hdr\": %s\n" #: src/psgen.c:608 #, c-format @@ -875,7 +892,8 @@ #: src/psgen.c:1352 msgid "malformed ^@epsf escape: no ']' after options" -msgstr "secuencia de escape ^@epsf errónea: falta un ']' después de las opciones" +msgstr "" +"secuencia de escape ^@epsf errónea: falta un ']' después de las opciones" #: src/psgen.c:1364 #, c-format @@ -915,12 +933,14 @@ #: src/psgen.c:1465 #, c-format msgid "malformed font spec for ^@font escape: %s" -msgstr "especificación de fuente errónea para la secuencia de escape ^@font: %s" +msgstr "" +"especificación de fuente errónea para la secuencia de escape ^@font: %s" #: src/psgen.c:1501 #, fuzzy, c-format msgid "malformed color spec for ^@%s escape: %s" -msgstr "especificación de fuente errónea para la secuencia de escape ^@font: %s" +msgstr "" +"especificación de fuente errónea para la secuencia de escape ^@font: %s" #: src/psgen.c:1525 #, c-format @@ -932,28 +952,17 @@ msgid "invalid value for ^@bggray escape: %s" msgstr "valor incorrecto para la secuencia de escape ^@shade: %s" -# pipe es una palabra delicada. Yo le he traducido por "tubería" en recode -# Enrique ha puesto "tubería (pipe)" en glibc. -# Otros lo han traducido como "canalización" o "desviación". -# En cualquier caso, no sería un pipe "con el comando" sino "hacia el comando" sv -# Me suena medio feo lo de tubería, pero si son ya dos los que lo tradujeron así... -# Bueno, hay otras posibilidades, Federico Rivas usó una vez "canalización". sv -#: src/psgen.c:2397 -#, c-format -msgid "epsf: couldn't open pipe to command \"%s\": %s\n" -msgstr "epfs: no se pudo abrir un canal hacia el comando \"%s\": %s\n" - -#: src/psgen.c:2430 +#: src/psgen.c:2433 #, c-format msgid "couldn't open EPS file \"%s\": %s\n" msgstr "no se pudo abrir el archivo EPS \"%s\": %s\n" -#: src/psgen.c:2467 +#: src/psgen.c:2470 #, c-format msgid "EPS file \"%s\" does not start with \"%%!\" magic\n" msgstr "el archivo EPS \"%s\" no comienza con el código \"%%!\"\n" -#: src/psgen.c:2492 +#: src/psgen.c:2495 #, c-format msgid "" "EPS file \"%s\" contains malformed %%%%BoundingBox row:\n" @@ -962,30 +971,30 @@ "el archivo EPS \"%s\" tiene una línea %%%%BoundingBox errónea:\n" "\"%.*s\"\n" -#: src/psgen.c:2517 +#: src/psgen.c:2520 #, c-format msgid "EPS file \"%s\" is not a valid EPS file\n" msgstr "el archivo EPS \"%s\" no es un archivo EPS válido\n" -#: src/psgen.c:2659 +#: src/psgen.c:2662 #, c-format msgid "passing through all input files for output language `%s'\n" msgstr "" -#: src/psgen.c:2711 +#: src/psgen.c:2714 #, c-format msgid "passing through %s file \"%s\"\n" msgstr "pasando a través del archivo %s \"%s\"\n" # Los archivos "divert" son temporales, al no encontrar una traducción # directa, he de poner simplemente temporal. -#: src/psgen.c:2814 +#: src/psgen.c:2817 #, fuzzy, c-format msgid "couldn't create temporary divert file: %s" msgstr "no se pudo crear el archivo temporal: %s" # Ojo: rewind no es abrir. sv -#: src/psgen.c:2831 +#: src/psgen.c:2834 #, c-format msgid "couldn't rewind divert file: %s" msgstr "no se pudo rebobinar el archivo temporal: %s" @@ -1024,7 +1033,8 @@ #: src/util.c:627 #, c-format msgid "%s:%d: %%Format: too long name, maxlen=%d" -msgstr "%s:%d: %%Format: nombre demasiado largo. La longitud máxima permitida es %d" +msgstr "" +"%s:%d: %%Format: nombre demasiado largo. La longitud máxima permitida es %d" #: src/util.c:650 #, c-format @@ -1087,63 +1097,63 @@ msgid "couldn't open font description file \"%s\": %s\n" msgstr "no se pudo abrir el archivo de descripción \"%s\" de la fuente: %s\n" -#: src/util.c:1387 +#: src/util.c:1389 #, c-format msgid "%s: too long format for %%D{} escape" msgstr "%s: formato demasiado largo para la secuencia de escape %%D{}" -#: src/util.c:1472 +#: src/util.c:1474 #, c-format msgid "%s: unknown `%%' escape `%c' (%d)" msgstr "%s: secuencia de escape desconocida `%%' `%c' (%d)" -#: src/util.c:1510 +#: src/util.c:1512 #, c-format msgid "%s: no closing ')' for $() escape" msgstr "%s: falta el ')' para la secuencia de escape $()" -#: src/util.c:1513 +#: src/util.c:1515 #, c-format msgid "%s: too long variable name for $() escape" msgstr "%s: nombre de variable demasiado largo para la secuancia de escape $()" -#: src/util.c:1540 +#: src/util.c:1542 #, c-format msgid "%s: too long format for $D{} escape" msgstr "%s: formato demasiado largo para la secuencia de escape $D{}" # Propongo "secuencia de escape `$' desconocida ..." sv -#: src/util.c:1628 +#: src/util.c:1630 #, c-format msgid "%s: unknown `$' escape `%c' (%d)" msgstr "%s: secuencia de escape `$' `%c' (%d) desconocida" -#: src/util.c:1819 +#: src/util.c:1821 #, c-format msgid "malformed float dimension: \"%s\"" msgstr "dimensión de números reales errónea: \"%s\"" -#: src/util.c:1936 +#: src/util.c:1943 #, c-format msgid "couldn't open input filter \"%s\" for file \"%s\": %s" msgstr "" "no se pudo abrir el filtro de entrada \"%s\" para el archivo \"%s\": %s" -#: src/util.c:1953 +#: src/util.c:1960 #, c-format msgid "couldn't open input file \"%s\": %s" msgstr "no se pudo abrir el archivo de entrada \"%s\": %s" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 #, c-format msgid "file=%s\n" msgstr "" -#: src/mkafmmap.c:173 +#: src/mkafmmap.c:174 msgid "stdout" msgstr "" -#: src/mkafmmap.c:181 +#: src/mkafmmap.c:182 #, fuzzy, c-format msgid "%s: couldn't open output file \"%s\"" msgstr "no se pudo abrir el archivo de entrada \"%s\": %s" @@ -1157,12 +1167,12 @@ # ¿Consenso? :-) # En Spanish-GNU nos hemos decidido por biblioteca. sv # Lo cambio directamente. sv -#: src/mkafmmap.c:195 +#: src/mkafmmap.c:196 #, fuzzy msgid "couldn't create AFM library" msgstr "no se pudo abrir la biblioteca AFM: %s" -#: src/mkafmmap.c:244 +#: src/mkafmmap.c:245 #, c-format msgid "" "Usage: %s [OPTION]... FILE...\n" @@ -1174,15 +1184,15 @@ " -V, --version print version number\n" msgstr "" -#: states/lex.l:169 states/lex.l:175 +#: states/lex.l:65 states/lex.l:71 msgid "error: EOF in comment" msgstr "" -#: states/lex.l:206 +#: states/lex.l:95 msgid "error: EOF in string constant" msgstr "" -#: states/lex.l:313 +#: states/lex.l:202 msgid "error: EOF in regular expression" msgstr "" @@ -1191,40 +1201,41 @@ msgid "states for GNU %s %s" msgstr "" -#: states/main.c:254 +#: states/main.c:255 #, fuzzy, c-format msgid "%s: malformed variable definition \"%s\"\n" msgstr "dimensión de números reales errónea: \"%s\"" -#: states/main.c:282 +#: states/main.c:283 #, fuzzy, c-format msgid "%s: couldn't create output file \"%s\": %s\n" msgstr "no se pudo crear el archivo de salida \"%s\": %s" # Propongo "secuencia de escape `$' desconocida ..." sv -#: states/main.c:313 +#: states/main.c:314 #, fuzzy, c-format msgid "%s: unknown warning level `%s'\n" msgstr "%s: secuencia de escape `$' `%c' (%d) desconocida" -#: states/main.c:362 states/main.c:398 states/prims.c:1377 states/utils.c:229 +#: states/main.c:363 states/main.c:399 states/prims.c:1377 states/utils.c:229 #, c-format msgid "%s: out of memory\n" msgstr "" -#: states/main.c:423 +#: states/main.c:424 #, fuzzy, c-format msgid "%s: couldn't open input file `%s': %s\n" msgstr "no se pudo abrir el archivo de entrada \"%s\": %s" -#: states/main.c:447 +#: states/main.c:448 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: states/main.c:451 +#: states/main.c:452 +#, c-format msgid "" " -D, --define=VAR=VAL define variable VAR to have value VAR\n" " -f, --file=NAME read state definitions from file NAME\n" @@ -1425,6 +1436,15 @@ msgid "%s: autoloading `%s' from `%s'\n" msgstr "" +# pipe es una palabra delicada. Yo le he traducido por "tubería" en recode +# Enrique ha puesto "tubería (pipe)" en glibc. +# Otros lo han traducido como "canalización" o "desviación". +# En cualquier caso, no sería un pipe "con el comando" sino "hacia el comando" sv +# Me suena medio feo lo de tubería, pero si son ya dos los que lo tradujeron así... +# Bueno, hay otras posibilidades, Federico Rivas usó una vez "canalización". sv +#~ msgid "epsf: couldn't open pipe to command \"%s\": %s\n" +#~ msgstr "epfs: no se pudo abrir un canal hacia el comando \"%s\": %s\n" + #~ msgid "couldn't create toc file \"%s\": %s" #~ msgstr "no se pudo crear el archivo para el índice \"%s\": %s"