[Pinfo-devel] r303 - in pinfo/branches/cxx: . doc macros po src

Nathanael Nerode neroden-guest at costa.debian.org
Tue Aug 15 14:45:33 UTC 2006


Author: neroden-guest
Date: 2006-08-15 14:45:19 +0000 (Tue, 15 Aug 2006)
New Revision: 303

Added:
   pinfo/branches/cxx/ChangeLog.old
   pinfo/branches/cxx/autogen.sh
   pinfo/branches/cxx/po/pt_BR.po
   pinfo/branches/cxx/po/vi.po
Removed:
   pinfo/branches/cxx/macros/Makefile.in
Modified:
   pinfo/branches/cxx/AUTHORS
   pinfo/branches/cxx/COPYING
   pinfo/branches/cxx/Makefile.am
   pinfo/branches/cxx/NEWS
   pinfo/branches/cxx/README
   pinfo/branches/cxx/TODO
   pinfo/branches/cxx/config.h.in
   pinfo/branches/cxx/configure.ac
   pinfo/branches/cxx/doc/Makefile.am
   pinfo/branches/cxx/doc/pinfo.1.in
   pinfo/branches/cxx/doc/pinfo.texi
   pinfo/branches/cxx/macros/Makefile.am
   pinfo/branches/cxx/macros/curses.m4
   pinfo/branches/cxx/pinfo.spec.in
   pinfo/branches/cxx/po/cs.po
   pinfo/branches/cxx/po/de.po
   pinfo/branches/cxx/po/ja.po
   pinfo/branches/cxx/po/nl.po
   pinfo/branches/cxx/po/pinfo.pot
   pinfo/branches/cxx/po/pl.po
   pinfo/branches/cxx/po/ru.po
   pinfo/branches/cxx/po/sv.po
   pinfo/branches/cxx/src/colors.cxx
   pinfo/branches/cxx/src/colors.h
   pinfo/branches/cxx/src/common_includes.h
   pinfo/branches/cxx/src/datatypes.cxx
   pinfo/branches/cxx/src/datatypes.h
   pinfo/branches/cxx/src/filehandling_functions.cxx
   pinfo/branches/cxx/src/filehandling_functions.h
   pinfo/branches/cxx/src/initializelinks.cxx
   pinfo/branches/cxx/src/initializelinks.h
   pinfo/branches/cxx/src/keyboard.h
   pinfo/branches/cxx/src/mainfunction.cxx
   pinfo/branches/cxx/src/mainfunction.h
   pinfo/branches/cxx/src/manual.cxx
   pinfo/branches/cxx/src/manual.h
   pinfo/branches/cxx/src/parse_config.cxx
   pinfo/branches/cxx/src/parse_config.h
   pinfo/branches/cxx/src/pinfo.cxx
   pinfo/branches/cxx/src/pinforc.in
   pinfo/branches/cxx/src/printinfo.cxx
   pinfo/branches/cxx/src/printinfo.h
   pinfo/branches/cxx/src/regexp_search.cxx
   pinfo/branches/cxx/src/regexp_search.h
   pinfo/branches/cxx/src/sigblock.cxx
   pinfo/branches/cxx/src/sigblock.h
   pinfo/branches/cxx/src/signal_handler.cxx
   pinfo/branches/cxx/src/signal_handler.h
   pinfo/branches/cxx/src/tmpfiles.cxx
   pinfo/branches/cxx/src/tmpfiles.h
   pinfo/branches/cxx/src/utils.cxx
   pinfo/branches/cxx/src/utils.h
   pinfo/branches/cxx/src/video.cxx
   pinfo/branches/cxx/src/video.h
Log:
Merge CXX branch from trunk revision 302.  Includes translation updates (unfuzzied)
and FSF address updates, as well as most code changes.  Certain changes on trunk
were already fixed better on the branch and are not included.  A few extra random
fixes probably crept in.



Modified: pinfo/branches/cxx/AUTHORS
===================================================================
--- pinfo/branches/cxx/AUTHORS	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/AUTHORS	2006-08-15 14:45:19 UTC (rev 303)
@@ -1,8 +1,8 @@
-Pinfo is currently maintained by Bas Zoetekouw <bas at debian.org>
-and Nathanael Nerode <neroden at gcc.gnu.org>.
+Pinfo is currently maintained by Bas Zoetekouw <bas at debian.org> and Nathanael
+Nerode <neroden at gcc.gnu.org>.  Its original author is Przemek Borys
+<pborys at dione.ids.pl>.  Please send any comments/questions/bug reports to
+<pinfo-devel at lists.alioth.debian.org>
 
-Its original author is Przemek Borys <pborys at dione.ids.pl>.
-
 Below are the names of the people who helped by sending good ideas, bugs
 reports, or helped out in some other way:
 
@@ -32,7 +32,7 @@
 Jerzy Klejnowski (+)
 Adam Lazur (+)
 Daniel Bauke
-Andre' Karwath
+André Karwath
 Pawel Kolodziej
 Egil Kvaleberg
 Andrzej Solecki
@@ -55,6 +55,8 @@
 Michał Stępień
 Jerzy Klejnowski
 Stanislav Ievlev
+Felipe Augusto van de Wiel (Brazilian translation)
+Clytie Siddall (Vietnamese translation)
 
 (This list is possibly incomplete -- please remind me if you
 contributed in the past in some way, and are not credited here)

Modified: pinfo/branches/cxx/COPYING
===================================================================
--- pinfo/branches/cxx/COPYING	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/COPYING	2006-08-15 14:45:19 UTC (rev 303)
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -279,62 +279,3 @@
 
 		     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program 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 of the License, or
-    (at your option) any later version.
-
-    This program 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.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

Added: pinfo/branches/cxx/ChangeLog.old
===================================================================
--- pinfo/branches/cxx/ChangeLog.old	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/ChangeLog.old	2006-08-15 14:45:19 UTC (rev 303)
@@ -0,0 +1,1177 @@
+1999-11-02  Przemek Borys  <pborys at dione.ids.pl>
+
+	* AUTHORS, src/Makefile.am, src/manual.c:
+	bugfix, and new makefile.am, which makes backup copies of old pinforc file
+
+1999-10-31  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/parse_config.h, src/pinfo.c, src/pinforc.in, src/printinfo.c, src/regexp_search.c, src/regexp_search.h, src/utils.c, src/utils.h, src/video.c, configure.in, doc/pinfo.1.in, NEWS, src/filehandling_functions.c, src/mainfunction.c, src/mainfunction.h, src/manual.c, src/parse_config.c:
+	opis w NEWS do 0.5.9
+
+1999-10-10  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/mainfunction.c: fixed bug in totalsearch
+
+1999-10-02  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/manual.c: patch for solaris (setenv->putenv)
+
+1999-09-29  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/parse_config.c: tiny change
+
+1999-09-25  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* pinfo.spec.in:
+	- added ru translation from KSI-Linux spec file.
+
+1999-09-19  Przemek Borys  <pborys at dione.ids.pl>
+
+	* configure.in, src/filehandling_functions.c, src/pinfo.c, src/utils.c:
+	bugfixes, v0.5.8
+
+1999-09-15  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* po/cs.po, po/de.po, po/pl.po, po/ru.po, po/sv.po:
+	- updated. Przemek .. please before releasing each new version update .po
+	  files.
+
+1999-09-15  Przemek Borys  <pborys at dione.ids.pl>
+
+	* po/de.po: german translation--update
+
+1999-09-08  Artur Frysiak  <wiget at pld.org.pl>
+
+	* pinfo.spec.in: - added ru locale
+
+	* pinfo.spec.in: - now work on RedHat too (I hope)
+
+1999-09-07  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/pinfo.c, src/utils.c, src/utils.h, configure.in, NEWS, src/filehandling_functions.c, src/filehandling_functions.h, src/Makefile.am, src/manual.c, src/parse_config.c:
+	fixed --with-included-gettext (I hope)
+	man pages can now have width different than 80 cols
+	-r option works with compressed files
+	NEW VERSION :) (what was the command, which I should pass to CVS now? ;)
+
+1999-09-04  Artur Frysiak  <wiget at pld.org.pl>
+
+	* pinfo.spec.in: - fix building on RH 6.0
+
+1999-08-28  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/filehandling_functions.c, src/manual.c, NEWS:
+	portability changes
+
+1999-08-27  Jiri Pavlovsky  <pavlovsk at ff.cuni.cz>
+
+	* po/cs.po: *** empty log message ***
+
+1999-08-22  Przemek Borys  <pborys at dione.ids.pl>
+
+	* README: *** empty log message ***
+
+1999-08-18  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/manual.c, configure.in, NEWS:
+	manual supports now key_goto (please update .po translations)
+
+1999-08-16  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/video.c: fixed percent calculation
+
+1999-08-15  Przemek Borys  <pborys at dione.ids.pl>
+
+	* AUTHORS, NEWS: .
+
+1999-08-14  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/manual.c: correction to the split-link handler
+
+	* doc/pinfo.1.in, src/pinforc.in, NEWS:
+	Changes in docs.
+
+1999-08-14  Jiri Pavlovsky  <pavlovsk at ff.cuni.cz>
+
+	* src/manual.c, src/video.c, po/cs.po:
+	 pinfo will no longer say, you are viewing >100% of a document :)
+	 updated cs.po
+
+1999-08-13  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/colors.c, src/utils.c, src/utils.h, configure.in, doc/pinfo.1.in:
+	little changes to make autoconf work how expected
+
+	* src/manual.c, src/parse_config.c, src/pinforc.in, AUTHORS:
+	modified pinforc.in to not add filters by default
+	manual code now fully supports carried links.
+
+1999-08-12  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/datatypes.c, src/filehandling_functions.c, src/mainfunction.c:
+	modified default for ignoremacros (it can't be a constant)
+	modified search routines for indirect entries
+	modified routines for tag table creation
+
+	* src/mainfunction.c, src/manual.c, NEWS:
+	mainfunction -- updated searching routine to match new reality
+	manual.c -- a code for following links splitted across lines, ie. send-
+	            mail.8
+
+1999-08-10  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/manual.c: sigsegv fix
+
+1999-08-03  Paweł Wilk  <siewca at dione.ids.pl>
+
+	* src/manual.c: fixed zipped files greeping/viewing
+
+1999-07-30  Paweł Wilk  <siewca at dione.ids.pl>
+
+	* src/manual.c:
+	little improvement when ignore notice is shown
+
+1999-07-29  Artur Frysiak  <wiget at pld.org.pl>
+
+	* pinfo.spec.in: - switch to rpm 3.0.x
+
+	* configure.in: - check for more functions
+
+	* ChangeLog: updated
+
+1999-07-29  Paweł Wilk  <siewca at dione.ids.pl>
+
+	* src/manual.c: added configurable macro-remover
+
+	* po/pl.po: added IGNORE translation
+
+	* src/datatypes.c, src/datatypes.h:
+	added macro-remover default variables
+
+	* src/parse_config.c: customizations for macro-remover
+
+	* src/pinforc.in: macro-remover default settings
+
+	* po/de.po, po/sv.po, ChangeLog:
+	niespodzianka
+
+1999-07-24  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/pinfo.c: pinfo drops on floor root privileges
+
+1999-07-24  Paweł Wilk  <siewca at dione.ids.pl>
+
+	* src/common_includes.h, src/pinfo.c:
+	added checksu() func. used for leaving root privileges
+
+1999-07-16  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/colors.c, src/datatypes.c, src/datatypes.h, src/filehandling_functions.c, src/initializelinks.c, src/mainfunction.c, src/pinfo.c, src/signal_handler.c, src/utils.c:
+	the most time-consuming parts of pinfo should work faster.
+	Could sb test it on some weak machine? ;)
+
+1999-07-15  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/signal_handler.c:
+	modified signal handler to produce better crash messages ;)
+
+	* src/initializelinks.c:
+	extracted the greatest time hog in initializelinks:
+	exists_in_tag_table()
+	I need now to make it faster--probably by sorting tag_table, and
+	then using some more efficient algorithm.
+
+1999-07-14  Artur Frysiak  <wiget at pld.org.pl>
+
+	* ChangeLog: autoupdate
+
+1999-07-13  Artur Frysiak  <wiget at pld.org.pl>
+
+	* ChangeLog: autoupdate
+
+1999-07-13  Przemek Borys  <pborys at dione.ids.pl>
+
+	* doc/pinfo.1.in: updated example cfg file in pinfo.1
+
+	* src/colors.c:
+	accidentaly removed transparent support ;)
+
+	* src/manual.h: added configurable macro-remover
+
+	* src/manual.c, src/parse_config.c, src/pinfo.c, src/printinfo.c, src/utils.c, src/colors.c, src/filehandling_functions.c, src/initializelinks.c, src/mainfunction.c:
+	removed Wall warnings
+
+1999-07-10  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/colors.c:
+	Let's start testing transparent COLOR_DEFAULT...
+
+1999-07-09  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/parse_config.c, src/pinforc.in:
+	vi-style secondary keybindings
+
+	* src/manual.c, NEWS:
+	fixed tiny bug in manual code
+
+1999-07-08  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/filehandling_functions.c, src/utils.c:
+	bugfixes
+
+1999-07-07  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/filehandling_functions.c, src/pinfo.c:
+	fixed bugs:
+	pinfo with no filename argument, but with argc>1 runs dir page
+	dir pages aren't concatenated if in $INFOPATH there is a entry,
+	which corresponds to some default entry (to avoid duplicates)
+
+1999-07-01  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/initializelinks.c, src/mainfunction.c, src/manual.c, src/signal_handler.c, src/utils.c, src/utils.h, TODO:
+	bugfixes.
+	added new facility to turn off the cursor
+
+	* src/initializelinks.c, src/manual.c, src/printinfo.c, src/readlinewrapper.c, src/utils.c:
+	memory allocation fixes
+
+1999-06-29  Przemek Borys  <pborys at dione.ids.pl>
+
+	* po/pl.po, src/common_includes.h, src/datatypes.c, src/datatypes.h, src/initializelinks.c, src/mainfunction.c, src/Makefile.am, src/manual.c, src/menu_and_note_utils.c, src/parse_config.c, src/pinforc.in, src/printinfo.c, src/printinfo.h, src/video.c:
+	added printing facility
+	fixed indentation
+	renamed .row members to .col :) (as it should be)
+
+	* src/parse_config.h: customizations for macro-remover
+
+	* doc/pinfo.1.in, NEWS:
+	added printing facility
+	fixed indentation
+	renamed .row members to .col :) (as it should be)
+
+1999-06-28  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/colors.h, src/datatypes.h, src/filehandling_functions.h, src/initializelinks.c, src/initializelinks.h, src/keyboard.h, src/mainfunction.h, src/manual.c, src/manual.h, src/menu_and_note_utils.c, src/parse_config.c, src/parse_config.h, src/pinfo.c, src/readlinewrapper.c, src/signal_handler.h, src/utils.c, src/utils.h, src/video.c, TECHSTUFF:
+	Updated comments to the source...
+
+1999-06-27  Przemek Borys  <pborys at dione.ids.pl>
+
+	* AUTHORS, configure.in, po/pl.po, src/initializelinks.c:
+	even even faster compare_tag_table_string() ;))
+
+	* src/initializelinks.c:
+	even faster compare_tag_table_string()
+
+1999-06-25  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/filehandling_functions.c, src/filehandling_functions.h, src/mainfunction.c, src/manual.c, src/menu_and_note_utils.c, src/parse_config.c, src/parse_config.h, src/pinfo.c, src/pinforc.in, doc/pinfo.1, NEWS, TODO:
+	support for dir lookups (i.e. when there is a dir entry, which
+	has the same name with the command-line specified name, then that entry will
+	be used -- example `pinfo cat').
+
+	* doc/pinfo.1.in, src/mainfunction.c, src/manual.c, src/pinforc.in, TODO:
+	Added key_goline (like ^KL in joe)
+
+1999-06-22  Przemek Borys  <pborys at dione.ids.pl>
+
+	* AUTHORS, NEWS, src/filehandling_functions.c, src/initializelinks.c, src/manual.c, src/parse_config.c, src/readlinewrapper.c:
+	fixed some memory leaks
+	added speed improvements
+
+1999-06-20  Przemek Borys  <pborys at dione.ids.pl>
+
+	* TODO: added todo
+
+1999-06-17  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/manual.c, NEWS, TODO:
+	Fixed the sigsegv (underrun) bug in manual code.
+	Pity that 0.5.4 is already released :-/
+
+1999-06-16  Artur Frysiak  <wiget at pld.org.pl>
+
+	* ChangeLog: - updated
+
+1999-06-16  Jiri Pavlovsky  <pavlovsk at ff.cuni.cz>
+
+	* src/initializelinks.c:
+	fixed a tiny bug in multiline '*note' display
+
+1999-06-14  Jiri Pavlovsky  <pavlovsk at ff.cuni.cz>
+
+	* po/cs.po: cs.po update
+
+1999-06-13  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/mainfunction.c, src/manual.c, src/pinforc.in, src/video.c, AUTHORS, configure.in:
+	Fixed bug with highlighting
+	Fixed buf with not showing the last line of info pages.
+	Prepared for 0.5.4 release.
+
+1999-06-12  Przemek Borys  <pborys at dione.ids.pl>
+
+	* TODO: noted a bug to fix...
+
+	* TODO: added a forgotten todo
+
+1999-06-11  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/colors.c, src/colors.h, src/initializelinks.h, src/mainfunction.c, src/manual.c, src/parse_config.c, src/parse_config.h, src/utils.c, src/utils.h, NEWS:
+	simple search highlighting (finally ;)
+	Well... we're ready for the new release now ;)
+
+1999-06-10  Przemek Borys  <pborys at dione.ids.pl>
+
+	* po/ru.po: po dlia russkowo jazyka :)
+
+1999-06-08  Jiri Pavlovsky  <pavlovsk at ff.cuni.cz>
+
+	* po/cs.po, src/pinfo.c:
+	correction to my previous correction in help message :)
+
+	* src/pinfo.c, po/cs.po:
+	Continuing my mission to deliver the most up-to-date and accurate pinfo help
+	message :)
+	updated cs.po
+
+1999-06-08  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/manual.c, src/pinfo.c, AUTHORS, po/pl.po:
+	updated polish po
+	renamed -empty-lines to -squeeze-lines (like in less/cat)
+
+1999-06-07  Jiri Pavlovsky  <pavlovsk at ff.cuni.cz>
+
+	* src/datatypes.c, src/pinfo.c, po/cs.po:
+	Fixed typo in datatypes.c.
+	Updated argument parsing code and help message to reflect new options.
+	cs.po updated
+
+1999-06-05  Linus Ã…kerlund  <uxm165t at tninet.se>
+
+	* po/sv.po, src/parse_config.c:
+	parse_config.c: added check for NULL pointer to skip_whitespace(), and
+	checks for the return value of skip_whitespace(), to get better error
+	reporting.
+	sv.po: updated.
+
+1999-06-04  Przemek Borys  <pborys at dione.ids.pl>
+
+	* doc/pinfo.1.in, src/colors.c, src/common_includes.h, src/datatypes.c, src/datatypes.h, src/filehandling_functions.c, src/mainfunction.c, src/parse_config.c, src/parse_config.h, src/pinfo.c, src/pinforc.in, src/utils.c, src/utils.h, src/video.c, NEWS:
+	added concatenation of all available dir pages into one
+	added clear-screen at exit
+	added lightbackground
+	fixed displaying of text lines with different backgrounds (now
+	the bakgorund reaches till the end of screen, not till the end of line).
+
+	* src/initializelinks.c:
+	Updated splitted into several lines note handler.
+
+1999-05-31  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/initializelinks.h, src/utils.c, doc/pinfo.1.in:
+	whitespaced notes should work now :)
+	Updated man page.
+
+1999-05-30  Przemek Borys  <pborys at dione.ids.pl>
+
+	* po/pl.po, AUTHORS:
+	polish support for yes/no
+
+1999-05-26  Jiri Pavlovsky  <pavlovsk at ff.cuni.cz>
+
+	* src/pinforc.in, po/cs.po:
+	Put the 'QUIT-CONFIRM-DEFAULT' option to the pinforc.
+	cs.po updated
+
+1999-05-26  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/utils.h, src/datatypes.h, src/initializelinks.c, src/utils.c:
+	comments/cleanups/etc.
+
+1999-05-26  Artur Frysiak  <wiget at pld.org.pl>
+
+	* ChangeLog: updated
+
+1999-05-26  Jiri Pavlovsky  <pavlovsk at ff.cuni.cz>
+
+	* src/datatypes.h, src/keyboard.h, src/mainfunction.c, src/manual.c, src/parse_config.c, src/utils.c, src/utils.h, src/datatypes.c:
+	1999-05-26  Jiri Pavlovsky  <pavlovsk at ff.cuni.cz>
+	        * src/datatypes.c src/datatypes.h src/keyboard.h src/mainfunction.c src/manual.c src/parse_config.c src/pinforc.in src/utils.c src/utils.h:
+		Internationalize answer to the 'confirm-quit' dialog (and possibly any
+		future yes/no dialog:).
+		New config option 'QUIT-CONFIRM-DEFAULT' - determines default answer to
+		the 'confirm-quit' dialog.
+
+1999-05-20  Przemek Borys  <pborys at dione.ids.pl>
+
+	* doc/pinfo.1.in, src/datatypes.c, src/datatypes.h, src/initializelinks.c, src/mainfunction.c, src/manual.c, src/parse_config.c, src/pinforc.in, NEWS:
+	Fixed bug in *note:' detection.
+	Added option for enabling quit confirmation at exit (as in lynx).
+
+1999-05-18  Artur Frysiak  <wiget at pld.org.pl>
+
+	* ChangeLog: - updated
+
+1999-05-18  Przemek Borys  <pborys at dione.ids.pl>
+
+	* NEWS:
+	This time I'll update news file from the begining of new version work ;)
+
+1999-05-17  Przemek Borys  <pborys at dione.ids.pl>
+
+	* doc/pinfo.1.in, src/datatypes.c, src/datatypes.h, src/filehandling_functions.h, src/initializelinks.c, src/initializelinks.h, src/keyboard.h, src/mainfunction.c, src/manual.c, src/parse_config.c, src/pinfo.c, src/pinforc.in, src/regexp_search.c, src/utils.c, src/utils.h:
+	Added Filter-0xb7 option
+	Corrected pgdn/end scrolling (at end they move to the last visible link)
+	Corrected tab handling in highlights.
+
+1999-05-16  Przemek Borys  <pborys at dione.ids.pl>
+
+	* po/cs.po, AUTHORS, NEWS:
+	updated cs.po
+
+1999-05-15  Przemek Borys  <pborys at dione.ids.pl>
+
+	* doc/pinfo.1.in, NEWS, src/mainfunction.c, src/manual.c, src/pinfo.c, src/pinforc.in, src/regexp_search.c, src/utils.c, src/utils.h:
+	Added a wrapper for regexp search functions (a nonregexp wrapper).
+	Modified pinfo.c to conform gnu standards.
+	Modified pinforc.in to demonstrate the use of CTRL_KEY
+
+	* doc/pinfo.1, src/datatypes.c, src/datatypes.h, src/filehandling_functions.c, src/manual.c, src/parse_config.c, src/pinfo.c, src/pinforc.in, AUTHORS, configure.in, NEWS:
+	Added STDERR-REDIRECTION, MAN-OPTIONS, LONG-MANUAL-LINKS,
+	and fixed bug in building of suffixed filename for .bz2, and .Z
+	KEY_ALT, and KEY_CTRL work now fine. Added notes to pinfo.1, added changes
+	to pinforc.in.
+
+1999-05-15  Artur Frysiak  <wiget at pld.org.pl>
+
+	* doc/pinfo.1.in: - man page templete
+
+	* configure.in, doc/.cvsignore, doc/Makefile.am, doc/pinfo.1, Makefile.am, pinfo.spec.in, po/cs.po, po/de.po, po/pl.po, po/sv.po:
+	- generate automagicali pinfo.1
+
+1999-05-15  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/keyboard.h, src/mainfunction.c, src/manual.c, src/parse_config.c, src/utils.c, src/utils.h:
+	config file parser now accepts KEY_CTRL('x') and KEY_ALT('x') (done by
+	Linus)
+	Besides, I've fixed alt key handler -- it now works fine... at least at
+	linux console ;)
+
+1999-05-14  Przemek Borys  <pborys at dione.ids.pl>
+
+	* TODO: removed old todo ;)
+
+1999-05-13  Artur Frysiak  <wiget at pld.org.pl>
+
+	* ChangeLog: - updated
+
+	* src/Makefile.am: - CURSES_LIBS now in LIBS
+	- CURSES_INCLUDES now in CPPFLAGS
+
+	* src/parse_config.c:
+	- used HAVE_KEY_END instead USE_NCURSES
+
+	* src/.cvsignore, src/pinforc, src/pinforc.in:
+	- autogenerate pinforc (now only KEY_END_1 )
+
+	* acconfig.h, configure.in:
+	- added test have KEY_END in curses (if yes then define HAVE_KEY_END)
+
+1999-05-13  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/manual.c, src/regexp_search.c:
+	Added 2> redirection EVERYWHERE in manual.c (I hope ;)
+	modified global regexp search to not find regexps longer than two lines
+	(they are quite unusable for the reader, and shouldn't appear)
+
+	* doc/pinfo.1, po/pl.po, src/pinfo.c, AUTHORS:
+	Added --node command line option.
+	Modified `AUtHORS' structure
+
+1999-05-12  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/keyboard.h:
+	support for KEY_CTRL, KEY_ADD -- adapted from midnight commander's source
+
+1999-05-11  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/datatypes.c, src/datatypes.h, src/mainfunction.c, src/manual.c, src/parse_config.c, src/parse_config.h, src/pinfo.c, src/pinforc, doc/pinfo.1:
+	Added searchagain key
+	Noted, that KEY_END is probably available only in ncurses
+	(since it was used in sample config file, and I received a bug report about it,
+	when compiled on solaris)
+
+1999-05-09  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/manual.c, src/pinfo.c:
+	Added one _("blah") to pinfo.c
+	Updated mailto-link recognization in manual.c
+
+1999-05-06  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* pinfo.spec.in:
+	- added %{_target} macro to ./configure parameters.
+
+1999-05-06  Przemek Borys  <pborys at dione.ids.pl>
+
+	* po/de.po: updated german translation.
+
+1999-05-03  Artur Frysiak  <wiget at pld.org.pl>
+
+	* ChangeLog: updated
+
+	* pinfo.spec.in: - added sv and de locale
+
+1999-05-03  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/filehandling_functions.c, src/pinfo.c:
+	added indentation :)
+
+	* src/datatypes.c, src/datatypes.h, src/filehandling_functions.c, src/filehandling_functions.h, src/pinfo.c, configure.in, doc/pinfo.1, NEWS, po/de.po:
+	moved to version 0.5.2 (since the 0.5.1 contained serious bug)
+	added -t option for viewing corrupted info files.
+	added german translation
+
+1999-05-02  Przemek Borys  <pborys at dione.ids.pl>
+
+	* po/sv.po, configure.in, NEWS:
+	Added Swedish language module.
+	Moved version number to 0.5.1.
+
+1999-05-01  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/pinforc, src/readlinewrapper.c:
+	renamed mutt to pine in pinforc
+	reformatted readlinewrapper.c
+
+1999-04-30  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/colors.c, src/colors.h, src/common_includes.h, src/datatypes.c, src/datatypes.h, src/filehandling_functions.c, src/filehandling_functions.h, src/initializelinks.c, src/initializelinks.h, src/localestuff.h, src/mainfunction.c, src/mainfunction.h, src/manual.c, src/manual.h, src/menu_and_note_utils.c, src/menu_and_note_utils.h, src/parse_config.c, src/parse_config.h, src/pinfo.c, src/readlinewrapper.c, src/readlinewrapper.h, src/regexp_search.c, src/regexp_search.h, src/sigblock.c, src/sigblock.h, src/signal_handler.c, src/signal_handler.h, src/snprintf.c, src/test.c, src/utils.c, src/utils.h, src/video.c, src/video.h:
+	Reindented sources to gnu style rules.
+	Added more comments to source files. Huh. I'm tired :)
+
+	* doc/pinfo.1, NEWS:
+	pinfo1 -- noted support for international info pages.
+	NEWS -- preparing for 0.5.1 release
+
+1999-04-29  Przemek Borys  <pborys at dione.ids.pl>
+
+	* doc/pinfo.1, src/datatypes.c, src/filehandling_functions.c, src/mainfunction.c, src/manual.c, src/parse_config.c, src/parse_config.h, src/pinforc:
+	Added pgdn(up)_auto, fixed allocation bug in infopath handler.
+	Added support for turning off a key binding (0 value).
+
+1999-04-27  Przemek Borys  <pborys at dione.ids.pl>
+
+	* po/cs.po, src/datatypes.c, src/datatypes.h, src/manual.c, src/parse_config.c, src/pinforc, doc/pinfo.1:
+	added support for manlinks, and empty-man-lines config-options
+	my home cvs repository is down, I'M MAD :(( But I hope I've uploaded everything, what's necessary.
+
+1999-04-27  Artur Frysiak  <wiget at pld.org.pl>
+
+	* pinfo.spec.in: - added cs locale
+
+1999-04-27  Przemek Borys  <pborys at dione.ids.pl>
+
+	* po/cs.po, configure.in:
+	Added czech language support (Jiri Pavlovsky)
+
+1999-04-26  Artur Frysiak  <wiget at pld.org.pl>
+
+	* ChangeLog: - updated
+
+1999-04-24  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/initializelinks.c:
+	modified recognization of e-mail addresses (now there is required an
+	username before '@').
+
+1999-04-23  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/initializelinks.c:
+	Added support for splitted into two lines `highlights'.
+
+1999-04-23  Linus Ã…kerlund  <uxm165t at tninet.se>
+
+	* src/parse_config.c, doc/pinfo.1:
+	parse_config.c: Fixed blank lines in config file.
+	pinfo.1: Added some more explanation about config file.
+
+1999-04-23  Przemek Borys  <pborys at dione.ids.pl>
+
+	* doc/pinfo.1: Mentioned the last changes in man page :)
+
+	* src/pinfo.c, src/mainfunction.c:
+	Modified key_goto behaviour. Now it can either follow the `file.info'
+	syntax, or the `info-standard' syntax -- `(file) node'.
+
+1999-04-22  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/parse_config.h, src/menu_and_note_utils.c, src/menu_and_note_utils.h, src/parse_config.c, src/mainfunction.c, po/pl.po, AUTHORS:
+	Internationalized config file parser error message.
+	Added support for key_upnode (Marius Gedminas)
+	Modified handling of blank lines in config file.
+
+1999-04-21  Linus Ã…kerlund  <uxm165t at tninet.se>
+
+	* src/parse_config.c:
+	Fixed the bug/feature that gave you a parse error for empty lines in
+	the config file.
+
+1999-04-21  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/initializelinks.c, src/pinforc, src/readrc.c, src/readrc.h, src/video.c, po/pl.po:
+	minor change to initializelinks -- it now ignores apostrophes in words
+	ending with n't (like wouldn't, haven't,...)
+	removed old files.
+
+1999-04-21  Artur Frysiak  <wiget at pld.org.pl>
+
+	* ChangeLog: updated
+
+1999-04-21  Przemek Borys  <pborys at dione.ids.pl>
+
+	* doc/pinfo.1: Stilistical changes to pinfo.1
+
+1999-04-21  Linus Ã…kerlund  <uxm165t at tninet.se>
+
+	* src/pinforc, src/parse_config.c:
+	Added user visible error messages like "parse error on line XX".
+	Added MAILEDITOR option.
+
+1999-04-20  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/initializelinks.c:
+	updated little bug, which was caused by not counting tabs as 8 chars, but
+	as 1.
+
+1999-04-20  Linus Ã…kerlund  <uxm165t at tninet.se>
+
+	* doc/pinfo.1:
+	Fixed some formulations and spelling errors.
+
+	* src/parse_config.c, src/parse_config.h:
+	 Modified Files:
+		pinfo/src/parse_config.c pinfo/src/parse_config.h
+
+1999-04-19  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/datatypes.c, src/datatypes.h, src/initializelinks.c, src/initializelinks.h, src/mainfunction.c, src/manual.c, src/parse_config.c, doc/pinfo.1:
+	Added support for mail at addresses.embedded in the viewed documents.
+	Now you can send mail to such an addres by just pressing key_followlink on
+	it.
+
+1999-04-18  Przemek Borys  <pborys at dione.ids.pl>
+
+	* AUTHORS, configure.in, INSTALL.in, NEWS, TODO:
+	Some modifications before next release.
+	We move to 0.5.0 now, and I put this release on the web.
+
+	* src/Makefile.am:
+	A little modification in src/makefile.am semantic. Now it generates
+	useful makefile.in's on my machine. (feel free to correct it if it's wrong,
+	but I think it's OK ;)
+
+	* src/pinforc, src/utils.c, src/video.c, src/colors.c, src/colors.h, src/datatypes.c, src/datatypes.h, src/filehandling_functions.c, src/initializelinks.c, src/mainfunction.c, src/manual.c, src/parse_config.c, src/parse_config.h:
+	Secured tmp files. Now I use tempnam() to get a tmp name. It seems to
+	work ;)
+	Besides, I've added support for highlighting `quoted' text in info files.
+
+1999-04-17  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/manual.c, src/parse_config.c, src/parse_config.h, src/video.c, src/colors.c, src/colors.h, src/datatypes.c, src/datatypes.h, src/initializelinks.c, src/initializelinks.h, src/mainfunction.c:
+	Added experimental support for URL's embedded int info pages or man
+	pages. Pinfo will now call lynx, when you press key_followlink on a
+	detected url. (in future the www browser will be configurable ;)
+
+	* src/manual.c, src/initializelinks.c:
+	manual.c -- added back the stderr redirections by system()
+	initializelinks.c -- added support for menus and notes, ending either
+	by comma, period, tab, or newline. (as stated in info page for texinfo)
+
+1999-04-16  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/initializelinks.c:
+	added support for multiple note references in a single info line
+	to the file initializelinks.c
+
+1999-04-16  Artur Frysiak  <wiget at pld.org.pl>
+
+	* macros/Makefile.am: - added missing readline.m4 macro
+
+	* po/pl.po, src/Makefile.am, src/utils.c, acconfig.h, configure.in, pinfo.spec.in:
+	- added --with-localedir=dir configure option
+	- removed --with-readline from spec
+	- pl.po updated with msgmerge
+	- using PACKAGE and LOCALEDIR macros in bindtextdomain and textdomain
+
+1999-04-16  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/parse_config.c, src/parse_config.h, src/pinforc, src/mainfunction.c:
+	added key_dirpage do info module.
+	You can now move to `dir' page by pressing 'd' (or whatever you define)
+
+	* po/pl.po:
+	Original (full) polish language module, which in some way missed the
+	cvs repository.
+
+	* doc/pinfo.1:
+	updated manual page -- noted support for whitespaces between
+	config file entries.
+
+	* src/mainfunction.c, src/manual.c:
+	mainfunction.c, manual.c - removed a bug, which caused sigsegv when
+	nothing was given to regexp search.
+	manual.c - removed bash stderr redirection. (this program is about to
+	run not only under different shells, but also under different operating
+	systems! :)
+
+1999-04-16  Artur Frysiak  <wiget at pld.org.pl>
+
+	* src/manual.c: - redirect man and appropos 2>/dev/null
+
+1999-04-15  Artur Frysiak  <wiget at pld.org.pl>
+
+	* src/localestuff.h, pinfo.spec.in:
+	- added --without-included-gettext to ./configure in spec
+	- included config.h in localestuff.h (to correct determine locale support)
+
+	* po/pl.po, src/Makefile.am, configure.in, Makefile.am, pinfo.spec.in:
+	- make rpm depends additional to pinfo.spec
+	- correct some typos in configure.in
+	- added pinforc and polish locale to %files in spec
+	- added extra sources to EXTAR_DIST to include in dist tarball
+
+	* pinfo.spec.in:
+	- changed configure option to --with-readline
+
+	* macros/autogen.sh, macros/readline.m4, src/common_includes.h, src/Makefile.am, src/readlinewrapper.c, src/readlinewrapper.h, src/utils.c, configure.in, INSTALL.in, pinfo.spec.in:
+	- in INSTALL.in: change rpm -bb to make rpm
+	- if ./configure not found curses exit with error message
+	- added AM_CONDITIONAL to HAVE_SNPRINTF and HAVE_SIGBLOCK
+		(if conditional is true not include extra source)
+	- in src/autogen.sh: s/Gnome/pinfo/
+	- in macros/readline.m4: not use GNU readline at default
+	- in src/Makefile.am: split pinfo_SOURCE to pinfo_COMMON_SRC, pinfo_SNPRINTF_SRC,
+	  pinfo_READLINE_SRC and pinfo_SIGBLOCK_SRC. This allow compile only needed sources
+	- in src/common_includes.h: include some headers files if need
+	- in src/readlinewrapper.[ch]: remove commented #ifndef (for cleanup)
+	- in src/utils.c: resurect GNU readline support
+
+1999-04-15  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/datatypes.c, src/filehandling_functions.c, src/mainfunction.c, src/parse_config.c, src/pinforc, doc/pinfo.1:
+	added new features to config file
+	added a possibility to move across different info documents
+	with key_goto
+	added support for infopages not ending with '.info'
+
+1999-04-15  Artur Frysiak  <wiget at pld.org.pl>
+
+	* po/pl.po: One typo
+
+1999-04-14  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* ChangeLog:
+	- updated ChangeLog.
+
+	* po/pl.po:
+	- starting translation,
+	- added proper header.
+
+	* po/pl.po, configure.in:
+	- starting pl translation.
+
+1999-04-14  Przemek Borys  <pborys at dione.ids.pl>
+
+	* src/datatypes.c, src/datatypes.h, src/filehandling_functions.c, src/manual.c, src/pinfo.c, src/readlinewrapper.c, src/readlinewrapper.h, src/utils.c:
+	some updates. i.e. new command line option
+
+1999-04-14  Artur Frysiak  <wiget at pld.org.pl>
+
+	* acconfig.h, configure.in:
+	- Last (I hope) fix for check sigblock
+
+1999-04-13  Artur Frysiak  <wiget at pld.org.pl>
+
+	* configure.in: version up to 0.4.9
+
+	* src/filehandling_functions.c, src/filehandling_functions.h, src/initializelinks.c, src/mainfunction.c, src/manual.c, src/regexp_search.c, src/utils.c, NEWS:
+	- Changes from 0.4.9 (Przemek still ignore ours work)
+
+	* src/sigblock.c, src/common_includes.h:
+	- include sigblock.h in sigblock.c
+
+1999-04-13  Dobrica Pavlinusic  <dpavlin at foi.hr>
+
+	* src/sigblock.h:
+	changed back that #ifdef at begining. It created a lot of "allready defined"
+	warnings on systems which actually have it. It work like this also...
+
+	* src/sigblock.h:
+	fixed one wrong #ifdef (first one) and one semicolumn (;) at sigblock
+	proto. Now compiles on Solaris. But, it doesn't link yet.
+
+1999-04-13  Artur Frysiak  <wiget at pld.org.pl>
+
+	* macros/readline.m4, src/mainfunction.c, src/Makefile.am, src/manual.c, src/signal_handler.c, configure.in, macros/curses.m4, Makefile.am:
+	- make rpm depends to Makefile (build new tarball if Makefile changed)
+	- changed schemat of searching sigblock
+	- some cleanup in configure.in
+	- s/INCLUDEDIR/INCLUDES/
+	- in macros/curses.m4: changed CFLAGS to CPPFLAGS (-D is preprocessor flag)
+	- use #ifdef getmaxyx instead #ifdef USE_NCURSES (in some places)
+
+	* src/parse_config.c, src/parse_config.h:
+	- Added missing typedef
+	- changes for correct determine curses version (stil unfinished)
+
+1999-04-13  Dobrica Pavlinusic  <dpavlin at foi.hr>
+
+	* configure.in: 	* configure.in:
+		- check for sigblock in libbsd
+
+1999-04-13  Artur Frysiak  <wiget at pld.org.pl>
+
+	* Makefile.am: hook for make rpms
+
+1999-04-12  Artur Frysiak  <wiget at pld.org.pl>
+
+	* ChangeLog: - updated (with correct names and emails)
+
+	* po/POTFILES.in, src/colors.c:
+	- removed readrc.c from POTFILES
+	- s/#ifdef USE_NCURSES/#ifndef NO_COLOR_CURSES/ in colors.c
+
+	* ChangeLog: updated
+
+	* src/readlinewrapper.h:
+	- use HAS_READLINE (from readline.m4) instead HAVE_LIBREADLINE
+
+	* macros/readline.m4, src/Makefile.am, src/readlinewrapper.c, src/readlinewrapper.h, src/utils.c, acconfig.h, configure.in:
+	- added readline.m4 macro to search for GNU readline library
+
+	* po/.cvsignore: ignore more autogenerated files
+
+	* po/POTFILES.in:
+	- my stupid bug (spaces on end of lines)
+
+	* src/sigblock.h:
+	- added commented macro sigsegmask from glibc
+
+	Dobrica, please test both.
+
+	* src/common_includes.h, src/Makefile.am, src/sigblock.c, src/sigblock.h, configure.in:
+	- added check for sigblock to configure.in
+	- added snprintf.c, sigblock.[ch] to pinfo_SOURCES
+	- include sigblock.h in common_includes.h
+	- added replecament of sigblock (from glibc 2.1) and sigmask macro (from bash)
+
+	* src/utils.c:
+	in +164 changed #ifdef to #ifndef (sugested by Dobrica Pavlinusic <dpavlin at foi.hr>)
+
+	* src/snprintf.c:
+	- include config.h if defined HAVE_CONFIG_H
+
+1999-04-10  Artur Frysiak  <wiget at pld.org.pl>
+
+	* src/Makefile.am:
+	- remove readrc.[ch] from pinfo_SOURCES (this files not in pinfo 0.4.8 tarball)
+
+	* pinfo.spec.in: - updated %changelog
+
+	* po/Makefile.in.in: no more autogenerated files
+
+	* INSTALL.in: - changed install rpm from -i to -U
+	(save time to ansver question:
+	" I can't install pinfo. Rpm fail with messages:
+	pinfo conflicts with pinfo-OLDVERSION.
+	Whats wrong? " )
+
+	* INSTALL.in: fix typos
+
+	* Makefile.am: added INSTALL to EXTRA_DIST
+
+	* src/pinfo.c, acconfig.h, configure.in, .cvsignore, INSTALL, INSTALL.in:
+	- now VERSION is defined _only_ in configure.in
+	- update INSTALL
+	INSTALL now is autogenerated from INSTALL.in.
+	Change INSTALL.in insted INSTALL.
+
+	* configure.in: - changed version to 0.4.8
+
+	* ChangeLog: updated
+
+	* doc/pinfo.1, src/datatypes.c, src/filehandling_functions.c, src/initializelinks.c, src/localestuff.h, src/mainfunction.c, src/manual.c, src/menu_and_note_utils.c, src/parse_config.c, src/pinfo.c, src/pinforc, src/readlinewrapper.c, src/test.c, src/utils.c, src/utils.h, src/video.c, NEWS:
+	- sync with 0.4.8
+
+	Przemek please use cvs ;-)
+
+	* mainfunction.h: this file is in src dir
+
+	* po/.cvsignore: more autogenerated files
+
+	* .cvsignore: ignore more autogenerated files
+
+	* mkinstalldirs, missing:
+	removed autogenerated file
+
+	* po/.cvsignore: next autogenerated files
+
+	* po/POTFILES.in: remove all source files; please fix me
+
+	* po/ChangeLog: epmty but needed file
+
+	* configure.in: another try to i18n
+
+	* acconfig.h, configure.in, Makefile.am:
+	next try to i18n
+
+	* .cvsignore: next autogenerated files
+
+	* po/.cvsignore: ignore autogenerated files
+
+	* po/POTFILES.in: list of file with localized messages
+
+	* configure.in: firts part cleanup
+
+	* po/Makefile.in.in: stuf for i18n
+
+	* configure.in, src/pinfo.c:
+	- removed --with-getopt options from ./configure
+	check for getopt_long solved problem with getopt
+
+1999-04-09  Artur Frysiak  <wiget at pld.org.pl>
+
+	* pinfo.spec.in: - correct one typo
+
+	* macros/curses.m4:
+	- added $CURSES_INCLUDEDIR to eval version of ncurses
+
+	* acconfig.h, configure.in, Makefile.am, pinfo.spec.in:
+	- fix parsing CONFIGDIR (now CONFIGDIR is $sysconfdir/pinforc)
+
+	* src/utils.c, configure.in:
+	- next try to fix --with-readline
+
+	now path to libreadline.so maybe given ( --with-readline=/path/to/lib )
+	and path to readline.h maybe given ( --with-readline-inc=/path/to/include )
+
+	* src/utils.c, acconfig.h, configure.in:
+	- fix for --with-readline
+
+	* src/colors.c, src/mainfunction.c, src/Makefile.am, src/manual.c, src/parse_config.c, src/signal_handler.c, configure.in:
+	- changed all #ifndef ___OLD_CURSES___ to #ifdef USE_NCURSES
+
+	* src/snprintf.c:
+	Original from Patrick Powell. Hacked from mutt by Dobrica Pavlinusic <dpavlin at foi.hr>
+
+	* configure.in, src/Makefile.am:
+	- changes by Dobrica Pavlinusic <dpavlin at foi.hr>
+
+	"- added automatic check for getopt_long (no need to use options to
+	   configure)
+	 - added automatic check for GNU readline (if not found it defines
+	   appropriate symbol and continues -- before it just aborted)
+	 - added sprintf replacement
+
+	 Known problems:
+	 - GNU readline lib isn't found on Digital UNIX (it's installed!) -- I will
+	   have a look at that after this weekend"
+
+	* src/Makefile.am:
+	added pinforc (install in , default /etc)
+
+1999-04-07  Artur Frysiak  <wiget at pld.org.pl>
+
+	* configure.in:
+	- disable --with-old-curses and fixed one typo
+
+	* configure.in: version up to 0.4.6
+
+	* NEWS, doc/pinfo.1, INSTALL, README, TODO, AUTHORS:
+	sync with 0.4.6
+
+	* src/common_includes.h, src/.cvsignore, src/Makefile.am:
+	- using HAVE_CONFIG_H and USE_NCURSES common_includes.h
+
+	* src/initializelinks.c, src/initializelinks.h, src/localestuff.h, src/readlinewrapper.c, src/readlinewrapper.h:
+	new from pinfo 0.4.6
+
+	* src/colors.c, src/common_includes.h, src/datatypes.c, src/datatypes.h, src/filehandling_functions.c, src/filehandling_functions.h, src/mainfunction.c, src/mainfunction.h, src/Makefile.am, src/manual.c, src/menu_and_note_utils.c, src/menu_and_note_utils.h, src/parse_config.c, src/parse_config.h, src/pinfo.c, src/signal_handler.c, src/utils.c, src/utils.h, src/video.c, src/video.h:
+	sync with pinfo 0.4.6
+
+	* src/pinforc: initial version from pinfo 0.4.6
+
+1999-04-01  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* configure.in:
+	- removed AM_PROG_LIBTOOL.
+
+1999-03-31  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* ChangeLog:
+	- updated.
+
+	* pinfo.spec.in:
+	- one cleanup and fix in %doc.
+
+	Now pinfo is realy ready and can be quickly maked by:
+	$ cvs -d :pserver:anonymous at cvs.pld.org.pl:/cvsroot login
+	(Logging in to anonymous at cvs.pld.org.pl)
+	CVS password: <hit Enter>
+	$ cvs -d :pserver:anonymous at cvs.pld.org.pl:/cvsroot co pinfo
+	$ cd pinfo
+	$ ./autogen.sh ;make dist ; rpm -ta -v pinfo-*.tar.gz
+
+1999-03-31  Artur Frysiak  <wiget at pld.org.pl>
+
+	* TODO: - info about /home/users/wiget/tmp
+
+1999-03-31  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* NEWS:
+	- moved from CHANGELOG.
+
+	* CHANGELOG:
+	- CHANGELOG moved to NEWS.
+
+1999-03-31  Artur Frysiak  <wiget at pld.org.pl>
+
+	* Makefile.am: - real using EXTRA_DIST
+
+1999-03-31  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* doc/Makefile.am:
+	- added proper macros for man pages.
+
+1999-03-31  Artur Frysiak  <wiget at pld.org.pl>
+
+	* TODO: TODO file
+
+	* AUTHORS: changes from orginal tarball
+
+	* ChangeLog: entry from 0.4.0
+
+	* ChangeLog: - moved CHANGELOG to ChangeLog
+
+1999-03-31  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* configure.in:
+	Added AM_MAINTAINER_MODE (without this macros/macros.dep is not
+	generated).
+
+1999-03-31  Artur Frysiak  <wiget at pld.org.pl>
+
+	* configure.in: - correct display ./configure --help
+
+	* configure.in: - one typo
+
+	* acconfig.h, configure.in, pinfo.spec.in, src/common_includes.h, src/Makefile.am:
+	- added (hacked from orginal Makefile) ./configure options:
+		--enable-cursor 	[default=no ]
+		--enable-static		[default=yes]
+		--with-old-curses	[default=no ]
+		--with-regexp-search	[default=yes]
+		--with-getopt		[default=yes]
+		--with-readline		[default=yes]
+	- changed spec file to use ./configure and make install (not tested yet)
+	- added new source files to src/Makefile.am
+	- moved *.h to pinfo_SOURCES
+	- include config.h if need
+	- version changed to 0.4.0 (like orginal tar.gz)
+
+	Now pinfo succesfull compile :-)
+
+	* .cvsignore: - added more autogenerated files
+
+	* aclocal.m4, ltconfig, pinfo.spec:
+	- autogenerated files
+
+	* .cvsignore: - ignore more autogenerated files
+
+	* src/readrc.c:
+	- correct order of functions and some typos
+
+	* src/.cvsignore:
+	 added some file: pinfo executable and .deps catalog
+
+	* src/pinfo.c, src/utils.c, src/video.c, src/datatypes.c, src/datatypes.h, src/filehandling_functions.c, src/filehandling_functions.h, src/mainfunction.c, src/manual.c, src/parse_config.c, src/parse_config.h:
+	-integrated changes from 0.4.0
+
+	* .cvsignore: - ignore backup and autogenerated files
+
+	* configure.in, Makefile.am, pinfo.spec.in:
+	- spec is now autogenerated
+
+1999-03-29  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* src/Makefile.am:
+	* all header files moved to EXTRA_DIST,
+	* s/pinfo_SOURCE/pinfo_SOURCES/.
+
+	* doc/Makefile:
+	- removed. This file is generated.
+
+	* acconfig.h:
+	- autoheader template.
+
+	* configure.in:
+	- VERSION to 0.3.9,
+	- added ncurses detecting macros,
+	- added AM_CONFIG_HEADER for autoheader.
+
+	* autogen.sh:
+	- proper version this file with checking scr and doc subdirectories before
+	generating all neccesary files.
+
+	* doc/.cvsignore, macros/.cvsignore, src/.cvsignore:
+	- add Makefile to ignore list.
+
+	* macros/aclocal-include.m4, macros/compiler-flags.m4:
+	- autoconf macros:
+	  * aclocal-include.m4: template with including aclocal macros,
+	  * compiler-flags.m4: setting up compiler flags.
+
+	* macros/Makefile.am:
+	- added compiler-flags.m4 and aclocal-include.m4 to MACROS.
+
+	* macros/macros.dep:
+	- romeved. This file is generated.
+
+	* macros/autogen.sh:
+	- previouse verion based on GNOME template. Current is witout GNOME
+	  additions
+
+	* macros/.cvsignore:
+	- added to ignore list macros.dep.
+
+1999-03-28  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* autogen.sh:
+	- fixed message.
+
+	* macros/.cvsignore, macros/Makefile.in, src/.cvsignore, src/Makefile.in, doc/.cvsignore, doc/Makefile.in:
+	- added proper .cvsignore in subdirectories,
+	- removed */Makefile.in files.
+
+	* CHANGELOG, doc/pinfo.1, README, src/colors.c, src/colors.h, src/common_includes.h, src/datatypes.c, src/datatypes.h, src/filehandling_functions.c, src/filehandling_functions.h, src/keyboard.c, src/keyboard.h, src/mainfunction.c, src/manual.c, src/manual.h, src/menu_and_note_utils.c, src/pinfo.c, src/signal_handler.c, src/utils.c, src/utils.h:
+	- integrated latest changes from 0.3.9 version.
+
+1999-03-27  Tomasz KÅ‚oczko  <kloczek at wun.zie.pg.gda.pl>
+
+	* Makefile:
+	- removed.
+
+	* src/menu_and_note_utils.h, src/pinfo.c, src/readrc.c, src/readrc.h, src/regexp_search.c, src/regexp_search.h, src/signal_handler.c, src/signal_handler.h, src/utils.c, src/utils.h, src/video.c, src/video.h, doc/Makefile, doc/Makefile.am, doc/Makefile.in, doc/pinfo.1, macros/autogen.sh, macros/curses.m4, macros/macros.dep, macros/Makefile.am, macros/Makefile.in, src/colors.c, src/colors.h, src/common_includes.h, src/datatypes.c, src/datatypes.h, src/filehandling_functions.c, src/filehandling_functions.h, src/keyboard.c, src/keyboard.h, src/mainfunction.c, src/mainfunction.h, src/Makefile.am, src/Makefile.in, src/manual.c, src/manual.h, src/menu_and_note_utils.c, ACKNOWLEDGEMENTS, aclocal.m4, AUTHORS, autogen.sh, ChangeLog, colors.c, colors.h, common_includes.h, configure.in, COPYING, datatypes.c, datatypes.h, filehandling_functions.c, filehandling_functions.h, GPL, keyboard.c, keyboard.h, ltconfig, mainfunction.c, Makefile.am, manual.c, manual.h, menu_and_note_utils.c, menu_and_note_utils.h, missing, mkinstalldirs, NEWS, pinfo.1, pinfo.c, pinfo.spec, readrc.c, readrc.h, regexp_search.c, regexp_search.h, signal_handler.c, signal_handler.h, utils.c, utils.h, video.c, video.h:
+	- added autoconf/automake scheme,
+	- some files moved to doc and src subdirestories
+	- added macros subdirectory with autoconf macroc
+
+	TODO:
+	- add to configure.in detecting [n]curses using macros/curses/m4 macros.
+
+	* utils.h, video.c, video.h, ACKNOWLEDGEMENTS, CHANGELOG, colors.c, colors.h, common_includes.h, datatypes.c, datatypes.h, filehandling_functions.c, filehandling_functions.h, GPL, INSTALL, keyboard.c, keyboard.h, mainfunction.c, mainfunction.h, Makefile, manual.c, manual.h, menu_and_note_utils.c, menu_and_note_utils.h, pinfo.1, pinfo.c, README, readrc.c, readrc.h, regexp_search.c, regexp_search.h, signal_handler.c, signal_handler.h, TECHSTUFF, utils.c:
+	pinfo: curses based info browser - initial version 0.3.5.
+

Modified: pinfo/branches/cxx/Makefile.am
===================================================================
--- pinfo/branches/cxx/Makefile.am	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/Makefile.am	2006-08-15 14:45:19 UTC (rev 303)
@@ -1,12 +1,13 @@
+# no FSF/GNU fascism
+AUTOMAKE_OPTIONS=foreign
 
-ALL_LINGUAS =
 always_built_SUBDIRS = src
 
 sometimes_built_SUBDIRS = 
 
 SUBDIRS = doc macros po $(always_built_SUBDIRS)
 
-EXTRA_DIST = config.rpath  TECHSTUFF TODO pinfo.spec INSTALL
+EXTRA_DIST =  TECHSTUFF pinfo.spec INSTALL ChangeLog.old
 
 
 ## to automatically rebuild aclocal.m4 if any of the macros in `macros/' change

Modified: pinfo/branches/cxx/NEWS
===================================================================
--- pinfo/branches/cxx/NEWS	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/NEWS	2006-08-15 14:45:19 UTC (rev 303)
@@ -1,279 +1,307 @@
+0.6.9
+  - New maintainer: Bas Zoetekouw <bas at debian.org>
+  - License is now GPL version 2 only
+  - Updated German, Dutch, English, Polish, Russian, Czech translations and
+    added Basque, Swedish, Viernamese and Brazilian translations.  Thanks to
+    Jens Seidel, Rene van Bevern, Piarres Beobide, Krzysztof Krzyzaniak, Yuri
+    Kozlov,  Eddy Petrişor, Katarína Machálková, Clytie Siddall and Felipe
+    Augusto van de Wiel.
+  - Nodes containing a "." are now correctly found
+  - Non-ASCII man pages are displayed correctly
+  - Improved the history behavior of the search input line
+  - Broken tag tables are now automatically fixed
+  - Don't segfault when a broken regexp is entered 
+  - Fixed a number of segfaults caused by using uninitialized pointers and 
+    off-by-1 errors
+  - Fixed heap corruption caused by non-ascii chars in info pages
+  - Fixed a lot of patch searching issues
+  - Fixed text display on narrow terminals 
+  - Fixed highlighting of searches
+  - The default pinforc now uses the terminal's default foreground and
+    background colors.  Thanks to Rob Funk for a patch.
+  - Use libreadline by default;  readline version 4 is now required.
+  - Better cooperation between ncurses and readline
+  - Fixed some memory leaks
+  - Got rid of tempnam() calls
+  - Fixed -Wall and -Wshadow compiler warnings
+  - Use utf8 in documentation files and fixed typoes
+    
 0.6.8
-	Patches from Witold Filipczyk for node detection algorithms in man
-	and info.
-	Added default item on search prompt.
-	Bugfix in info link freeing procedure, which failed on exim pages.
-	Bugfix for dir page lookup when several matches are found--there was
-	a double close() problem.
-0.6.7	
-	Added scrolling in left/right direction (!!!new config file keys).
-	Fixed handling of info entries like `emacs21/emacs'--modified
-        function matchfile().
-	Added autmatical detection of rawfilename for filenames beginning
-	with `../', `./', `/' in main().
-	Added support for '(gcc)Introduction' like specification of nodes.
-0.6.6	
-	bugfixes for userdefined rcfile and configuration inconsistences
-	added sorting of matches for the info file to display
-0.6.5	
-	Fixed bug in sorting of tag table links (major effect to the engine)
-	Changed the file search engine to scan the directory for a matching
-	pattern (instead of trying various propositions).
-	Fixed minor sigsegv bug in page loader (link initializer).
-	!Added switching between sections in manualviewer mode
-	Highlighting code does not highlight leading spaces in splitted
-	notes anymore.
-	Added information when the search is not successful
-	Added support for command line selected rc files
-0.6.4	
-	New apropos handler. It works now interactively. New option -p here.
-	Doesn't highlight anymore links to itself in man viewer.
-	Fixed bug with link following.
-        Fixed readline emulation: it now deletes old line content,
-        and handles end key
-        Fixed SIGWINCH handler/curses blocking getch emulation
-	Fixed searchpath routines. First of all, there is introduced a
-	'context' for currently viewed file. Pinfo will search files for
-	one set of infopages only in one directory--in the context directory.
-	The context can be changed only when changing the set of infopages.
+  Patches from Witold Filipczyk for node detection algorithms in man
+  and info.
+  Added default item on search prompt.
+  Bugfix in info link freeing procedure, which failed on exim pages.
+  Bugfix for dir page lookup when several matches are found--there was
+  a double close() problem.
+0.6.7    
+  Added scrolling in left/right direction (!!!new config file keys).
+  Fixed handling of info entries like `emacs21/emacs'--modified
+  function matchfile().
+  Added autmatical detection of rawfilename for filenames beginning
+  with `../', `./', `/' in main().
+  Added support for '(gcc)Introduction' like specification of nodes.
+0.6.6    
+  bugfixes for userdefined rcfile and configuration inconsistences
+  added sorting of matches for the info file to display
+0.6.5    
+  Fixed bug in sorting of tag table links (major effect to the engine)
+  Changed the file search engine to scan the directory for a matching
+  pattern (instead of trying various propositions).
+  Fixed minor sigsegv bug in page loader (link initializer).
+  !Added switching between sections in manualviewer mode
+  Highlighting code does not highlight leading spaces in splitted
+  notes anymore.
+  Added information when the search is not successful
+  Added support for command line selected rc files
+0.6.4    
+  New apropos handler. It works now interactively. New option -p here.
+  Doesn't highlight anymore links to itself in man viewer.
+  Fixed bug with link following.
+  Fixed readline emulation: it now deletes old line content,
+  and handles end key
+  Fixed SIGWINCH handler/curses blocking getch emulation
+  Fixed searchpath routines. First of all, there is introduced a
+  'context' for currently viewed file. Pinfo will search files for
+  one set of infopages only in one directory--in the context directory.
+  The context can be changed only when changing the set of infopages.
 0.6.3   
-	NLS and documentation bugfixes
-	Small bugfix in keyhandler
-0.6.2	
-	Fixed bug with searchpath for raw filename specification (temporary
-	hack).
-	Fixed stupid bug with info parser, which didn't accept an
-	`INFOTAG.+\n' separator for info nodes (eg. gnuplot's infopage).
-	Fixd detection of first info page.
-	Fixed buggy use of bkgdset()
+  NLS and documentation bugfixes
+  Small bugfix in keyhandler
+0.6.2    
+  Fixed bug with searchpath for raw filename specification (temporary
+  hack).
+  Fixed stupid bug with info parser, which didn't accept an
+  `INFOTAG.+\n' separator for info nodes (eg. gnuplot's infopage).
+  Fixd detection of first info page.
+  Fixed buggy use of bkgdset()
 0.6.1   
-	Modified behaviour of auto-pgdn. It now expands the submenus, as in
-	info.
-	Fixed problem with pinforc installed to non-exsisting etc directory
-	Fixed problem with black bar on first man page
-	Fixed buggy whitespace-skip comparing procedure 
-	Manual code can now handle hyphenated url links (it's still not
-	perfect with e-mail--it only works if the `@' is in the upper line)
-	Fixed buf in indirect-file search engine (a misplaced if())
-	Added texinfo documentation.
-	Manual code is now case insensitive as far as sections are considered
-0.6.0	
-	Replaced evil `myclrtoeol' with `bkgdset+clrtoeol'
-	Fixed putenv handler
-	Make install does not overwrite old pinforc anymore (this has it's
-	bad side--you must deal alone with version incompatibilities)
-	fixed sorting of dirpage matches
-	fixed some small bugs
+  Modified behaviour of auto-pgdn. It now expands the submenus, as in
+  info.
+  Fixed problem with pinforc installed to non-exsisting etc directory
+  Fixed problem with black bar on first man page
+  Fixed buggy whitespace-skip comparing procedure 
+  Manual code can now handle hyphenated url links (it's still not
+  perfect with e-mail--it only works if the `@' is in the upper line)
+  Fixed buf in indirect-file search engine (a misplaced if())
+  Added texinfo documentation.
+  Manual code is now case insensitive as far as sections are considered
+0.6.0    
+  Replaced evil `myclrtoeol' with `bkgdset+clrtoeol'
+  Fixed putenv handler
+  Make install does not overwrite old pinforc anymore (this has it's
+  bad side--you must deal alone with version incompatibilities)
+  fixed sorting of dirpage matches
+  fixed some small bugs
 0.5.9
-	Setenv()->putenv() (so pinfo can now compile without problems
-	at nonlinux unices)
-	Added SAFE-GROUP, and SAFE-USER config file options for defining
-	users, to which we want to drop root privileges when running pinfo
-	Added HIGHLIGHTREGEXP option, to allow highlighting of user defined
-	regexps when viewing manuals/infos
-	Search highlighting works now "professionaly" (as in less)
-	Fixed sigsegv bug in search engine.
+  Setenv()->putenv() (so pinfo can now compile without problems
+  at nonlinux unices)
+  Added SAFE-GROUP, and SAFE-USER config file options for defining
+  users, to which we want to drop root privileges when running pinfo
+  Added HIGHLIGHTREGEXP option, to allow highlighting of user defined
+  regexps when viewing manuals/infos
+  Search highlighting works now "professionaly" (as in less)
+  Fixed sigsegv bug in search engine.
 0.5.8
-	Fixed some ugly bugs to prepare for world domination ;->
-0.5.7	Updated man page
-	Fixed `splitted manlink' code
-	Added key_goto to manual code
-	Fixed minor bugs, and portability misadvantages
-	Modified the default info search order (./ is the last dir)
-	Manual code displays now manuals with optional width != than 80 chars.
-	Fixed configure --with-included-gettext (hopefuly)
-	-r works now with compressed files
-0.5.6	
-	Fixed memory bugs
-	Fixed displaying of concatenated dir pages
-	Speed up alghoritms
-	Transparent colors
-	Manual code can now handle hyperlinks splitted by `-' sign
-	Security filter for dangerous man macros (experimental)
-0.5.5	
-	Fixed nasty sigsegv bug in manual code.
-	Speed improvements to the code.
-	Many memory bugs fixed in the whole code.
-	Added key for going to specified line.
-	Added dir page name lookups. Now you will be able f.i. to go to 
-	`textutils:cat'	after typing `pinfo cat'.
-	Added support for printing. (with highlights, as in groff -Tascii).
+  Fixed some ugly bugs to prepare for world domination ;->
+0.5.7    Updated man page
+  Fixed `splitted manlink' code
+  Added key_goto to manual code
+  Fixed minor bugs, and portability misadvantages
+  Modified the default info search order (./ is the last dir)
+  Manual code displays now manuals with optional width != than 80 chars.
+  Fixed configure --with-included-gettext (hopefuly)
+  -r works now with compressed files
+0.5.6    
+  Fixed memory bugs
+  Fixed displaying of concatenated dir pages
+  Speed up alghoritms
+  Transparent colors
+  Manual code can now handle hyperlinks splitted by `-' sign
+  Security filter for dangerous man macros (experimental)
+0.5.5    
+  Fixed nasty sigsegv bug in manual code.
+  Speed improvements to the code.
+  Many memory bugs fixed in the whole code.
+  Added key for going to specified line.
+  Added dir page name lookups. Now you will be able f.i. to go to 
+  `textutils:cat'    after typing `pinfo cat'.
+  Added support for printing. (with highlights, as in groff -Tascii).
 0.5.4
-	Fixed highlighting code (the handling of \t's).
-	PgDn works now more `traditionaly' -- at end the last link is
-	selected.
-	Added FILTER-0xB7 config option.
-	Fixed bug in `*note:' detection.
-	Added option for enabling quit confirmation at exit (as in lynx).
-	Added option for clearing screen at exit
-	Added support for lightbackground
-	Fixed nonblack background in displaying contents of text.
-	Added support for multi-dired info dir entries.
-	Finally done some simple search highlighting.
+  Fixed highlighting code (the handling of \t's).
+  PgDn works now more `traditionaly' -- at end the last link is
+  selected.
+  Added FILTER-0xB7 config option.
+  Fixed bug in `*note:' detection.
+  Added option for enabling quit confirmation at exit (as in lynx).
+  Added option for clearing screen at exit
+  Added support for lightbackground
+  Fixed nonblack background in displaying contents of text.
+  Added support for multi-dired info dir entries.
+  Finally done some simple search highlighting.
 0.5.3
-	Fixed stderr redirections. Now you won't get garbage on screen when
-	following manual links.
-	Added MAN-OPTIONS config option, which allows you to pass options
-	to te `man' program.
-	Added KEY_CTRL and KEY_ALT macros, which enable you to use CTRL+x
-	and ALT+x combinations. (the ALT+x is probably only usable on linux
-	console, but who knows ;)
-	Fixed global regexp search code. It now searches every two following
-	lines, to avoid returning of expressions, which are several hounderts
-	lines long ;)
-	Added STDERR-REDIRECTION config file option, which allows you to
-	specify how do you wish to redirect stderr from plug-ins.
-	Added support for long section names in manual code. Now, if your
-	system supports it, you can make use of section names like
-	"3ncurses", and similar, without abbreviating them to just "3". (see
-	LONG-MANUAL-LINKS config option).
-	Added regexp search wrapper for systems which don't support it.
-0.5.2	
-	Fixed one very bad bug. That's the reason for fast new-version
-	release.
-	Added German language support.
-	Added -t option, for viewing corrupted info files.
-0.5.1	
-	Added support for mailto urls
-	Fixed highlighting routines for info pages, which ignored
-	tabulation formatting.
-	Added key_pgdn(up)_auto for automatic going to the next(previous)
-	node at the bottom(top) of viewed node. Also added support for
-	0 key value.
-	Fixed one bug in $INFOPATH handler.
-	Added support for hypertextualization of weird man sections 
-	(i.e. 3X11, 3Xt, etc. -- it's configurable)
-	Config file allows you now to specify your web browser, and
-	maileditor.
-	Added national language support for Swedish and Czech.
-0.5.0	
-	Added support for http:// and ftp:// URLs embedded into
-	man pages/info pages.
-	Secured the mechanism of tmp file creation
-	Added optional highlight for `quoted' text in info files
-	Moved to configure (autoconf, automake)!
-	Fixed sigsegv by regexp searchs.
-	Added support for infos not ending with `.info*' suffix
-	Added new feature to key_goto -- now when you pass there
-	a name, ending with `.info', then key_goto will move you not
-	to specified node, but to specified info document.
-	Locale support now is working (see at the example with polish
-	translation).
-	Added key_dir
-	Fixed support for xterm mouse.
-0.4.9	
-	Corrected global search code for inirect info files (that is those,
-	split up across several info files). It works fine now.
-0.4.8	
-	You can now browse man pages from different sections.
-0.4.7	
-	After a week of contignous fight I've... FIXED the nasty bug, which
-	caused so many sigsegvs! I'm really happy :)) And what about you? ;)
-	But locales at present send sigsegvs anyway ;)
-	I also added a program `testkey' for making it possible to obtain
-	keycode values for weird keys for config file.
-0.4.6	
-	Fixed many bugs connected with v0.4.5.
-	Started working on locale stuff. But for now it only causes
-	unexpected segmentation faults ;)
-0.4.5	
-	HUGE change. I reimplemented the info handling routines so, that
-	there is now possible to use links across different info files.
-	Thanks to this I could also implement a handler for 'dir' page.
-	Huh... I can't belive it works ;)
-0.4.4	
-	Made a wrapper for readline function. I just can't implement
-	readline handling properly under ncurses, so you'd rather use
-	this wrapper. It's not to advanced yet, but implements primary
-	things, thich readline deals with (history, and line editing).
-	I'm working on tab completion.
-0.4.3	
-	Added support for infos without tag table. Modified man page.
-0.4.2	
-	Modified use of readline lib. It doesn't require to use ltermcap
-	anymore, and does not need to close curses screen... This was
-	quite difficult task ;)
-	Added support for resizing screen 'on the fly' (i.e. in x window).
-	Added support for ncurses mouse (which works in xterm).
-0.4.1	
-	Recreated mechanism of opening info file. Now it is possible
-	to add new compression methods for info by just modyfing two
-	variables on the top of filehandling_functions.c. Also I've
-	added support for national info pages, which may be located
-	in the directory $INFOPATH/$LANG. (ie. for polish info pages
-	that could be /usr/info/pl_PL/infopage.info)
-	Added support for cutting off manual headers (--cut-man-headers)
-	Added some nodeposition informations in status bar.
-0.4.0	
-	Support for apropos. Searches finally work properly.
-0.3.9	
-	Gnu Readline support. Now you can browse history on regexp 
-	searchs	;). Added sigblock on sigpipe. Now you can safely open
-	pipes to programs which don't exist.
-0.3.8	
-	Added configuration file support. Fixed one bug. Expanded manual
-	page :)
-0.3.7	
-	Added option --manual, and --raw-filename. Added support for
-	8-bit characters (i.e. national characters for certain charsets).
-	Modified regexp search on manuals. Bold/italic tokens are recognized
-	now.
-0.3.6	
-	Added possibility to call shell commands from within pinfo.
-	Modified a bit makefile. Source does not use the 'dangerous' ;)
-	sprintf anymore. Fixed minor bugs.
-0.3.5	
-	Fixed some more sigsegv bugs.
-0.3.4	
-	Fixed some stupid bugs in manual code. Added new comments to source.
-	(since I almost got lost myself ;)
-0.3.3	
-	Speedup modifications. I.e. window is not refreshed now when
-	key buffer is not empty (to avoid scrolling, when the key is
-	already depressed, and to make it work better on slow terminals).
-0.3.2	
-	Added support for the refresh (^L) key.
-0.3.1	
-	Added possibility to redefine keys (at compile-time). Modified
-	man page hypertext recognization (now it recognizes everything of
-	the form 'something (x) or something (xy)'. Removed bug with
-	regex.h in manual.c.
-0.3.0	
-	Manuals can be read now as well as info files, when info cannot be
-	found. Manuals can be browsed similar to infos; hyperlinks are
-	the fields od form 'something (x)' (according to the common format at
-	SEE ALSO section). Since the change is quite big, I've moved the
-	version number to 0.3.0.
-0.2.4	
-	Added regexp searching -- '/' option and 's' option.
-0.2.3	
-	Tiny change -- added some checking for mvaddstr functions, so they
-	don't drop core if there's no menu/note token.
-0.2.2	
-	Added support for old curses (macro definition ___OLD_CURSES___,
-	enabled in Makefile. That was enough to compile this program
-	under HP-UX :)
-0.2.1	
-	Added support for "index menus", and all other of the format
-	"* blabla:[optional spaces]node.". Added cache for menu/note
-	highlight positions. Also code is a bit modified; to be precise
-	I started to clarify it a bit by adding macros, and other
-	things, to get as close to short'n'clear procedures, as possible.
-0.2.0	
-	The engine for hypertext recognization is reimplemented. Support for
-	notes and menus of format : node. is added. Also color support is
-	added. Also added some cache for menuchecking and notechecking
-	functs.
-0.1.5	
-	Fixed bug with not deleting files from /tmp; added $INFOPATH support
-0.1.4	
-	Added 'g' key
-0.1.3	
-	Added pgdn/pgup/home/end keys
-0.1.2	
-	Added support for notes of kind note::
-0.1.1	
-	First working engine; menus of kind menu:: are supported [12.III.1999]
-0.0.0	
-	I'm angry, because the only docs considering my problem (gtk) are in
-	info format, and I just can't work with standard info ;-)
+  Fixed stderr redirections. Now you won't get garbage on screen when
+  following manual links.
+  Added MAN-OPTIONS config option, which allows you to pass options
+  to te `man' program.
+  Added KEY_CTRL and KEY_ALT macros, which enable you to use CTRL+x
+  and ALT+x combinations. (the ALT+x is probably only usable on linux
+  console, but who knows ;)
+  Fixed global regexp search code. It now searches every two following
+  lines, to avoid returning of expressions, which are several hounderts
+  lines long ;)
+  Added STDERR-REDIRECTION config file option, which allows you to
+  specify how do you wish to redirect stderr from plug-ins.
+  Added support for long section names in manual code. Now, if your
+  system supports it, you can make use of section names like
+  "3ncurses", and similar, without abbreviating them to just "3". (see
+  LONG-MANUAL-LINKS config option).
+  Added regexp search wrapper for systems which don't support it.
+0.5.2    
+  Fixed one very bad bug. That's the reason for fast new-version
+  release.
+  Added German language support.
+  Added -t option, for viewing corrupted info files.
+0.5.1    
+  Added support for mailto urls
+  Fixed highlighting routines for info pages, which ignored
+  tabulation formatting.
+  Added key_pgdn(up)_auto for automatic going to the next(previous)
+  node at the bottom(top) of viewed node. Also added support for
+  0 key value.
+  Fixed one bug in $INFOPATH handler.
+  Added support for hypertextualization of weird man sections 
+  (i.e. 3X11, 3Xt, etc. -- it's configurable)
+  Config file allows you now to specify your web browser, and
+  maileditor.
+  Added national language support for Swedish and Czech.
+0.5.0    
+  Added support for http:// and ftp:// URLs embedded into
+  man pages/info pages.
+  Secured the mechanism of tmp file creation
+  Added optional highlight for `quoted' text in info files
+  Moved to configure (autoconf, automake)!
+  Fixed sigsegv by regexp searchs.
+  Added support for infos not ending with `.info*' suffix
+  Added new feature to key_goto -- now when you pass there
+  a name, ending with `.info', then key_goto will move you not
+  to specified node, but to specified info document.
+  Locale support now is working (see at the example with polish
+  translation).
+  Added key_dir
+  Fixed support for xterm mouse.
+0.4.9    
+  Corrected global search code for inirect info files (that is those,
+  split up across several info files). It works fine now.
+0.4.8    
+  You can now browse man pages from different sections.
+0.4.7    
+  After a week of contignous fight I've... FIXED the nasty bug, which
+  caused so many sigsegvs! I'm really happy :)) And what about you? ;)
+  But locales at present send sigsegvs anyway ;)
+  I also added a program `testkey' for making it possible to obtain
+  keycode values for weird keys for config file.
+0.4.6    
+  Fixed many bugs connected with v0.4.5.
+  Started working on locale stuff. But for now it only causes
+  unexpected segmentation faults ;)
+0.4.5    
+  HUGE change. I reimplemented the info handling routines so, that
+  there is now possible to use links across different info files.
+  Thanks to this I could also implement a handler for 'dir' page.
+  Huh... I can't belive it works ;)
+0.4.4    
+  Made a wrapper for readline function. I just can't implement
+  readline handling properly under ncurses, so you'd rather use
+  this wrapper. It's not to advanced yet, but implements primary
+  things, thich readline deals with (history, and line editing).
+  I'm working on tab completion.
+0.4.3    
+  Added support for infos without tag table. Modified man page.
+0.4.2    
+  Modified use of readline lib. It doesn't require to use ltermcap
+  anymore, and does not need to close curses screen... This was
+  quite difficult task ;)
+  Added support for resizing screen 'on the fly' (i.e. in x window).
+  Added support for ncurses mouse (which works in xterm).
+0.4.1    
+  Recreated mechanism of opening info file. Now it is possible
+  to add new compression methods for info by just modyfing two
+  variables on the top of filehandling_functions.c. Also I've
+  added support for national info pages, which may be located
+  in the directory $INFOPATH/$LANG. (ie. for polish info pages
+  that could be /usr/info/pl_PL/infopage.info)
+  Added support for cutting off manual headers (--cut-man-headers)
+  Added some nodeposition informations in status bar.
+0.4.0    
+  Support for apropos. Searches finally work properly.
+0.3.9    
+  Gnu Readline support. Now you can browse history on regexp 
+  searchs    ;). Added sigblock on sigpipe. Now you can safely open
+  pipes to programs which don't exist.
+0.3.8    
+  Added configuration file support. Fixed one bug. Expanded manual
+  page :)
+0.3.7    
+  Added option --manual, and --raw-filename. Added support for
+  8-bit characters (i.e. national characters for certain charsets).
+  Modified regexp search on manuals. Bold/italic tokens are recognized
+  now.
+0.3.6    
+  Added possibility to call shell commands from within pinfo.
+  Modified a bit makefile. Source does not use the 'dangerous' ;)
+  sprintf anymore. Fixed minor bugs.
+0.3.5    
+  Fixed some more sigsegv bugs.
+0.3.4    
+  Fixed some stupid bugs in manual code. Added new comments to source.
+  (since I almost got lost myself ;)
+0.3.3    
+  Speedup modifications. I.e. window is not refreshed now when
+  key buffer is not empty (to avoid scrolling, when the key is
+  already depressed, and to make it work better on slow terminals).
+0.3.2    
+  Added support for the refresh (^L) key.
+0.3.1    
+  Added possibility to redefine keys (at compile-time). Modified
+  man page hypertext recognization (now it recognizes everything of
+  the form 'something (x) or something (xy)'. Removed bug with
+  regex.h in manual.c.
+0.3.0    
+  Manuals can be read now as well as info files, when info cannot be
+  found. Manuals can be browsed similar to infos; hyperlinks are
+  the fields od form 'something (x)' (according to the common format at
+  SEE ALSO section). Since the change is quite big, I've moved the
+  version number to 0.3.0.
+0.2.4    
+  Added regexp searching -- '/' option and 's' option.
+0.2.3    
+  Tiny change -- added some checking for mvaddstr functions, so they
+  don't drop core if there's no menu/note token.
+0.2.2    
+  Added support for old curses (macro definition ___OLD_CURSES___,
+  enabled in Makefile. That was enough to compile this program
+  under HP-UX :)
+0.2.1    
+  Added support for "index menus", and all other of the format
+  "* blabla:[optional spaces]node.". Added cache for menu/note
+  highlight positions. Also code is a bit modified; to be precise
+  I started to clarify it a bit by adding macros, and other
+  things, to get as close to short'n'clear procedures, as possible.
+0.2.0    
+  The engine for hypertext recognization is reimplemented. Support for
+  notes and menus of format : node. is added. Also color support is
+  added. Also added some cache for menuchecking and notechecking
+  functs.
+0.1.5    
+  Fixed bug with not deleting files from /tmp; added $INFOPATH support
+0.1.4    
+  Added 'g' key
+0.1.3    
+  Added pgdn/pgup/home/end keys
+0.1.2    
+  Added support for notes of kind note::
+0.1.1    
+  First working engine; menus of kind menu:: are supported [12.III.1999]
+0.0.0    
+  I'm angry, because the only docs considering my problem (gtk) are in
+  info format, and I just can't work with standard info ;-)

Modified: pinfo/branches/cxx/README
===================================================================
--- pinfo/branches/cxx/README	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/README	2006-08-15 14:45:19 UTC (rev 303)
@@ -2,13 +2,13 @@
 the style of lynx.  We hope you like it. :)
 See the man page (pinfo.1) for details. 
 
-	Copyright (C) 1999  Przemek Borys <pborys at dione.ids.pl>
-	Copyright (C) 2005  Bas Zoetekouw <bas at debian.org>
-	Copyright 2005  Nathanael Nerode <neroden at gcc.gnu.org>
+    Copyright (C) 1999       Przemek Borys <pborys at dione.ids.pl>
+    Copyright (C) 2005-2006  Bas Zoetekouw <bas at debian.org> 
+                             Nathanael Nerode <neroden at gcc.gnu.org>
 
-	This program is free software; you can redistribute it and/or modify it
-	under the terms of version 2 of the GNU General Public License as
-	published by the Free Software Foundation.
+    This program is free software; you can redistribute it and/or modify it
+    under the terms of version 2 of the GNU General Public License as
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,5 +17,5 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 

Modified: pinfo/branches/cxx/TODO
===================================================================
--- pinfo/branches/cxx/TODO	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/TODO	2006-08-15 14:45:19 UTC (rev 303)
@@ -7,6 +7,10 @@
 includes, and the related process of converting from C headers to
 C++ C-wrapper headers.
 
+Switch to using ncursesw rather than ncurses (for UTF-8 support).
+Switch to using glib++'s ustring class rather than std::string (again
+for UTF-8 support).
+
 Sigh.  The easy string conversions are done; the hard ones remain.
 
 (medium term)

Copied: pinfo/branches/cxx/autogen.sh (from rev 302, pinfo/trunk/autogen.sh)

Modified: pinfo/branches/cxx/config.h.in
===================================================================
--- pinfo/branches/cxx/config.h.in	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/config.h.in	2006-08-15 14:45:19 UTC (rev 303)
@@ -5,6 +5,21 @@
    */
 #undef CRAY_STACKSEG_END
 
+/* Defined if curses has support for colors */
+#undef CURSES_COLORS
+
+/* Name of the ncurses.h file that should be included */
+#undef CURSES_H_NAME
+
+/* Defined if curses has KEY_END definition */
+#undef CURSES_KEY_END
+
+/* Defined if curses has support for mouse events */
+#undef CURSES_MOUSE
+
+/* Does curses have support for non-iso8859 charsets? */
+#undef CURSES_WCHAR
+
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
@@ -300,7 +315,7 @@
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
+   automatically deduced at runtime.
 	STACK_DIRECTION > 0 => grows toward higher addresses
 	STACK_DIRECTION < 0 => grows toward lower addresses
 	STACK_DIRECTION = 0 => direction of growth unknown */
@@ -313,6 +328,9 @@
 #undef USE_BSD_CURSES
 
 /* Use Ncurses? */
+#undef USE_CURSES
+
+/* Use Ncurses? */
 #undef USE_NCURSES
 
 /* Use SunOS SysV curses? */
@@ -336,7 +354,7 @@
 #undef inline
 #endif
 
-/* Define to `long' if <sys/types.h> does not define. */
+/* Define to `long int' if <sys/types.h> does not define. */
 #undef off_t
 
 /* Define as the type of the result of subtracting two pointers, if the system
@@ -346,7 +364,7 @@
 /* Define to empty if the C compiler doesn't support this keyword. */
 #undef signed
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define to unsigned long or unsigned long long if <stdint.h> and

Modified: pinfo/branches/cxx/configure.ac
===================================================================
--- pinfo/branches/cxx/configure.ac	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/configure.ac	2006-08-15 14:45:19 UTC (rev 303)
@@ -1,8 +1,8 @@
 #***************************************************************************
 #*  Pinfo is a ncurses based lynx style info documentation browser
 #*
-#*  Copyright (C) 1999  Przemek Borys <pborys at dione.ids.pl>
-#*  Copyright (C) 2005  Bas Zoetekouw <bas at debian.org>
+#*  Copyright (C) 1999-2005  Przemek Borys <pborys at dione.ids.pl>
+#*  Copyright (C) 2005,2006  Bas Zoetekouw <bas at debian.org>
 #*  Copyright 2005  Nathanael Nerode <neroden at gcc.gnu.org>
 #*
 #*  This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,7 @@
 #*
 #*  You should have received a copy of the GNU General Public License
 #*  along with this program; if not, write to the Free Software
-#*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+#*  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
 #*  USA
 #***************************************************************************/
 #
@@ -26,7 +26,7 @@
 #
 
 # init
-AC_INIT([pinfo],[0.6.8+svn],[pinfo-devel at lists.alioth.debian.org])
+AC_INIT([pinfo],[0.6.9],[pinfo-devel at lists.alioth.debian.org])
 # require a recent autoconf
 AC_PREREQ([2.57])
 # for identification of derived ./configure scripts
@@ -102,8 +102,17 @@
 ####################################################
 # readline
 AC_CHECK_READLINE
-if test "$has_readline" = false; then
+if test "x$has_readline" = "xfalse"; then
   AC_MSG_ERROR([Readline not found.  You need readline to compile pinfo])
+else
+  # if we have readline, it needs to be version 4 or later
+	if test $readline_version -lt 4
+	then 
+		AC_MSG_WARN([Version 4 of readline is required to compile pinfo.  
+			Yours is only version $readline_version.
+			Readline support will be disabled.])
+		has_readline=false
+	fi
 fi
 
 # curses
@@ -148,7 +157,7 @@
 ## i18n, t10n stuff
 ####################################################
 # the languages for which we have .po files
-ALL_LINGUAS="pl cs sv de ru ja nl"
+ALL_LINGUAS="cs de eu ja nl pl pt_BR ro ru sv vi"
 
 # Checks for all prerequisites of the intl subdirectory
 AM_INTL_SUBDIR

Modified: pinfo/branches/cxx/doc/Makefile.am
===================================================================
--- pinfo/branches/cxx/doc/Makefile.am	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/doc/Makefile.am	2006-08-15 14:45:19 UTC (rev 303)
@@ -5,3 +5,7 @@
 man_MANS = pinfo.1
 info_TEXINFOS = pinfo.texi
 EXTRA_DIST = $(man_MANS) $(info_TEXINFOS)
+
+clean-generic: my-clean
+my-clean:
+	rm -f pinfo.1 pinfo.info

Modified: pinfo/branches/cxx/doc/pinfo.1.in
===================================================================
--- pinfo/branches/cxx/doc/pinfo.1.in	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/doc/pinfo.1.in	2006-08-15 14:45:19 UTC (rev 303)
@@ -11,12 +11,13 @@
 read by passing it an
 .I infopage
 argument. This argument contains the name of an info page (i.e. 'bash').
-The program will then (by default) search for it in 
-.IR "./", 
+The program will then (by default) search for it in the current directory,
+.IR "/usr/share/info",
 .IR "/usr/info",
-.IR "/usr/share/info",
+.IR "/usr/local/share/info",
+.IR "/usr/local/info".
 and
-.IR "/usr/local/info".
+.IR "/opt/info".
 The search path can be adjusted by INFOPATH environment variable or in the configuration
 file. Pinfo will also automatically add the suffix '-info', '-info.Z', '-info.gz', or '-info.bz2'.
 At present other suffixes are not recognized, but you can easily add them to

Modified: pinfo/branches/cxx/doc/pinfo.texi
===================================================================
--- pinfo/branches/cxx/doc/pinfo.texi	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/doc/pinfo.texi	2006-08-15 14:45:19 UTC (rev 303)
@@ -43,7 +43,7 @@
 
 @end titlepage
 
- at dircategory Texinfo
+ at dircategory Texinfo documentation system
 @direntry
 * Pinfo: (pinfo).           curses based lynx-style info browser.
 @end direntry
@@ -103,8 +103,9 @@
 page you want to read by passing it an @var{info_page} argument. This argumen
 t
 contains the name of an info page (i.e. @samp{bash}). The program
-will then (by default) search for it in @file{./}, @file{/usr/info},
- at file{/usr/share/info} and @file{/usr/local/info}. Other searchpath may be
+will then (by default) search for it in the current diectory, @file{/usr/share/info},
+ at file{/usr/info}, @file{/usr/local/share/info}, @file{/usr/local/info},
+and @file{/opt/info}. Other searchpath may be
 specified in configfile or via INFOPATH environmental variable.
 Pinfo will also automaticaly add the suffix
 @samp{-info}, @samp{-info.Z}, @samp{-info.gz}, or @samp{-info.bz2}. At

Modified: pinfo/branches/cxx/macros/Makefile.am
===================================================================
--- pinfo/branches/cxx/macros/Makefile.am	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/macros/Makefile.am	2006-08-15 14:45:19 UTC (rev 303)
@@ -1,10 +1,12 @@
 ## Please update this variable if any new macros are created
-MACROS=	compiler-flags.m4		\
+MACROS=	\
+	compiler-flags.m4		\
 	aclocal-include.m4		\
 	curses.m4			\
-	readline.m4
+	readline.m4	\
+	wchar.m4
 
-EXTRA_DIST=$(MACROS) autogen.sh
+EXTRA_DIST=$(MACROS)
 MAINTAINERCLEANFILES=macros.dep
 
 @MAINT at macros.dep: Makefile.am

Deleted: pinfo/branches/cxx/macros/Makefile.in

Modified: pinfo/branches/cxx/macros/curses.m4
===================================================================
--- pinfo/branches/cxx/macros/curses.m4	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/macros/curses.m4	2006-08-15 14:45:19 UTC (rev 303)
@@ -1,7 +1,50 @@
 dnl Curses detection: Munged from Midnight Commander's configure.in
 dnl
-dnl What it does:
-dnl =============
+dnl  This program is distributed in the hope that it will be useful, but
+dnl  WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl  General Public License for more details.
+dnl 
+dnl  You should have received a copy of the GNU General Public License
+dnl  along with this program; if not, write to the Free Software
+dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+dnl  
+dnl 
+dnl  How to use this?
+dnl  (-) put a call to AC_CHECK_CURSES in configure.ac (after the call to
+dnl      AC_PROG_CC, obviously)
+dnl  (-) AC_CHECK_CURSES will look for a curses library (or look at the
+dnl  	location the user specified on the ./configure command line) , and
+dnl  	checks if it is usable.  If it is found, and is usable, the shell
+dnl  	variable $USE_CURSES is set for use in configure.ac, and the
+dnl  	autoheader USE_CURSES will be defined.  
+dnl  (-) the includes and libraries cc options are put into the
+dnl      $CURSES_INCLUDES and $CURSES_LIBS shell variables and the automake 
+dnl      variables @CURSES_INCLUDES@ and @CURSES_LIBS at .  Additional flags 
+dnl      that are needed are put in $CURSES_FLAGS and @CURSES_FLAGS@
+
+
+
+dnl First define the headers for config.h.in:
+AH_TEMPLATE([USE_CURSES],[
+	Use Ncurses?
+])
+AH_TEMPLATE([CURSES_WCHAR],[
+	Does curses have support for non-iso8859 charsets?
+])
+AH_TEMPLATE(CURSES_H_NAME, [
+	Name of the ncurses.h file that should be included
+])
+AH_TEMPLATE([CURSES_COLORS],[
+	Defined if curses has support for colors
+])
+AH_TEMPLATE(CURSES_KEY_END,[
+	Defined if curses has KEY_END definition
+])
+AH_TEMPLATE(CURSES_MOUSE,[
+	Defined if curses has support for mouse events
+])
+
 dnl
 dnl - Determine which version of curses is installed on your system
 dnl   and set the -I/-L/-l compiler entries and add a few preprocessor

Modified: pinfo/branches/cxx/pinfo.spec.in
===================================================================
--- pinfo/branches/cxx/pinfo.spec.in	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/pinfo.spec.in	2006-08-15 14:45:19 UTC (rev 303)
@@ -8,8 +8,8 @@
 Group(pl):	Narzêdzia/System
 Group(ru):	õÔÉÌÉÔÙ/óÉÓÔÅÍÁ
 Copyright:	GPL
-Vendor:		Przemek Borys <pborys at dione.ids.pl>
-Source:		http://zeus.polsl.gliwice.pl/~pborys/%{name}-%{version}.tar.gz
+Vendor:		Bas Zoetekouw <bas at debian.org>
+Source:		http://alioth.debian.org/project/showfiles.php?group_id=30592
 BuildRoot:   	/tmp/%{name}-%{version}-root
 
 %define		_prefix		/usr
@@ -92,4 +92,4 @@
 
 * Fri Mar 19 1999 Micha³ Kuratczyk <kura at pld.org.pl>
   [0.2.3-1]
-- initial RPM release
\ No newline at end of file
+- initial RPM release

Modified: pinfo/branches/cxx/po/cs.po
===================================================================
--- pinfo/branches/cxx/po/cs.po	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/po/cs.po	2006-08-15 14:45:19 UTC (rev 303)
@@ -1,14 +1,14 @@
 # Czech translation of pinfo
 # Jiøí Pavlovský <pavlovsk at ff.cuni.cz>, 1999.
-#
+# revised and updated by Katarína Machálková <bubli at bubli.org>, 2005
 msgid ""
 msgstr ""
 "Project-Id-Version: pinfo-0.5.6\n"
 "Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2005-09-08 08:22-0400\n"
-"PO-Revision-Date: 1999-08-28 00:05+0200\n"
-"Last-Translator: Jiøí Pavlovský <pavlovsk at ff.cuni.cz>\n"
-"Language-Team: Czech <cs at li.org>\n"
+"PO-Revision-Date: 2005-10-11 16:59+0200\n"
+"Last-Translator: Katarina Machalkova <bubli at bubli.org>\n"
+"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -16,7 +16,7 @@
 #: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
 #, c-format
 msgid "Searching for indirect done"
-msgstr "Hledání nepøímého odkazu ukonèeno"
+msgstr "Hledání nepøímého odkazu dokonèeno"
 
 #: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
 #, c-format
@@ -26,12 +26,12 @@
 #: src/filehandling_functions.cxx:528
 #, c-format
 msgid "Searching for tag table done\n"
-msgstr "Hledání tabulky znaèek ukonèeno\n"
+msgstr "Hledání tabulky znaèek dokonèeno\n"
 
 #: src/filehandling_functions.cxx:1051
 #, c-format
-msgid "Error: could not open info file\n"
-msgstr "Chyba: Info dokument nelze otevøít.\n"
+msgid "Error: could not open info file"
+msgstr "Chyba: Info dokument nelze otevøít."
 
 #: src/mainfunction.cxx:205 src/manual.cxx:744
 msgid "Are you sure you want to print?"
@@ -50,21 +50,20 @@
 msgstr "Operace se nezdaøila..."
 
 #: src/mainfunction.cxx:348 src/mainfunction.cxx:607 src/manual.cxx:890
-msgid "Enter regexp: "
+msgid "Enter regular expression: "
 msgstr "Zadejte regulární výraz: "
 
 #: src/mainfunction.cxx:576 src/mainfunction.cxx:664 src/manual.cxx:959
-#, fuzzy
 msgid "Search string not found..."
-msgstr "Varování: tabulka znaèek nenalezena...\n"
+msgstr "Hledaný øetìzec nebyl nalezen..."
 
 #: src/mainfunction.cxx:630 src/manual.cxx:920
 msgid "Invalid regular expression;"
-msgstr ""
+msgstr "Neplatný regulární výraz;"
 
 #: src/mainfunction.cxx:632 src/manual.cxx:922
 msgid "Press any key to continue..."
-msgstr ""
+msgstr "Pro pokraèování stisknìte libovolnou klávesu..."
 
 #: src/mainfunction.cxx:691
 msgid "Enter node name: "
@@ -80,23 +79,23 @@
 msgstr "Opravdu chcete ukonèit program?"
 
 #: src/manual.cxx:289
-#, fuzzy, c-format
+#, c-format
 msgid "Error: No manual page found\n"
-msgstr "Chyba: Nebyla nalezena ani manuálová stránka.\n"
+msgstr "Chyba: Nebyla nalezena manuálová stránka.\n"
 
 #: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
-msgstr ""
+msgstr "Volám program apropos \n"
 
 #: src/manual.cxx:308
 #, c-format
 msgid "Nothing appropriate\n"
-msgstr ""
+msgstr "®ádné související stránky\n"
 
 #: src/manual.cxx:758
 msgid "Enter manual name: "
-msgstr "Zadejte jméno manuálové stránky: "
+msgstr "Zadejte název manuálové stránky: "
 
 #: src/manual.cxx:1395 src/video.cxx:105
 #, c-format
@@ -111,7 +110,7 @@
 #: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
-msgstr ""
+msgstr "Nelze otevøít konfiguraèní soubor!\n"
 
 #: src/parse_config.cxx:124
 #, c-format
@@ -124,12 +123,12 @@
 msgstr "chybí argument pro pøepínaè --node\n"
 
 #: src/pinfo.cxx:101
-#, fuzzy, c-format
+#, c-format
 msgid "--rcfile option used without argument\n"
-msgstr "chybí argument pro pøepínaè --node\n"
+msgstr "chybí argument pro pøepínaè --rcfile\n"
 
 #: src/pinfo.cxx:112
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage:\n"
 "%s [options] [info|manual]\n"
@@ -159,9 +158,11 @@
 "-v, --version                         vypí¹e informace o verzi\n"
 "-m, --manual                          zobrazí manuálovou stránku\n"
 "-r, --raw-filename                    zobrazí soubor daného jména\n"
+"-f, --file                            synonymum pro -r\n"
 "-a, --apropos                         pokud nenalezne odpovídající "
 "dokument,\n"
 "                                      pou¾ije apropos(1)\n"
+"-p, --plain-apropos                   pou¾ije pouze apropos(1)\n"
 "-c, --cut-man-headers                 vystøihne z manuálových stránek "
 "opakované\n"
 "                                      hlavièky\n"
@@ -176,11 +177,13 @@
 "-t, --force-manual-tag-table          vynutí detekci tabulky znaèek\n"
 "-x, --clear-at-exit                   pøi ukonèení programu sma¾e obrazovku\n"
 "    --node=UZEL, --node UZEL          pøeskoèí rovnou na UZEL\n"
+"    --rcfile=soubor, --rcfile soubor  pou¾ije alternativní konfiguraèní "
+"soubor\n"
 
 #: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
 msgid "Looking for man page...\n"
-msgstr "Hledá se manuálová stránka...\n"
+msgstr "Hledám manuálovou stránku...\n"
 
 #: src/pinfo.cxx:326
 #, c-format
@@ -241,7 +244,7 @@
 "Illegal characters in filename!\n"
 "*** %s\n"
 msgstr ""
-"Soubor obsahuje nepovolené znaky!\n"
+"Název souboru obsahuje nepovolené znaky!\n"
 "*** %s\n"
 
 #: src/utils.cxx:256
@@ -270,30 +273,38 @@
 
 #: src/video.cxx:57
 msgid "Up:"
-msgstr "Horní:"
+msgstr "Nahoru:"
 
-#~ msgid "Virtual memory exhausted\n"
-#~ msgstr "Nedostatek virtuální pamìti\n"
-
 #~ msgid "Error: Cannot call man command.\n"
 #~ msgstr "Chyba: program man nelze spustit.\n"
 
 #~ msgid "Error: No manual page found either.\n"
 #~ msgstr "Chyba: Nebyla nalezena ani manuálová stránka.\n"
 
-#, fuzzy
 #~ msgid "Apropos pages:\n"
-#~ msgstr "Pøíslu¹né stránky:\n"
+#~ msgstr "Související stránky:\n"
 
 #~ msgid "Calling gunzip for"
 #~ msgstr "Volám program gunzip pro"
 
 #~ msgid "Couldn't call gunzip.\n"
-#~ msgstr "Program gunzip nelze zpustit.\n"
+#~ msgstr "Program gunzip nelze spustit.\n"
 
 #~ msgid "IGNORING"
 #~ msgstr "IGNORUJI"
 
+#~ msgid "Virtual memory exhausted\n"
+#~ msgstr "Nedostatek virtuální pamìti\n"
+
+#~ msgid "Tag table is corrupt, trying to fix..."
+#~ msgstr "Tabulka znaèek je po¹kozena, pokou¹ím se ji opravit..."
+
+#~ msgid "press a key to continue"
+#~ msgstr "stisknìte libovolnou klávesu"
+
+#~ msgid "Are you sure to print?"
+#~ msgstr "Opravdu chcete dokument vytisknout?"
+
 #~ msgid "Warning: could not find tag table\n"
 #~ msgstr "Varování: tabulku znaèek nelze nalézt\n"
 

Modified: pinfo/branches/cxx/po/de.po
===================================================================
--- pinfo/branches/cxx/po/de.po	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/po/de.po	2006-08-15 14:45:19 UTC (rev 303)
@@ -8,7 +8,7 @@
 "Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2005-09-08 08:22-0400\n"
 "PO-Revision-Date: 1999-04-21 01:50+0200\n"
-"Last-Translator: Matthias Warkus <mawa at iname.com>\n"
+"Last-Translator: René van Bevern <rvb at pro-linux.de>\n"
 "Language-Team: German <de at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -17,7 +17,7 @@
 #: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
 #, c-format
 msgid "Searching for indirect done"
-msgstr "Suche nach Node-Verzeichnis abgeschlossen."
+msgstr "Suche nach Knotenverzeichnis abgeschlossen."
 
 #: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
 #, c-format
@@ -31,8 +31,8 @@
 
 #: src/filehandling_functions.cxx:1051
 #, c-format
-msgid "Error: could not open info file\n"
-msgstr "Fehler: Konnte die Info-Datei nicht öffnen.\n"
+msgid "Error: could not open info file"
+msgstr "Fehler: Konnte die Info-Datei nicht öffnen."
 
 #: src/mainfunction.cxx:205 src/manual.cxx:744
 msgid "Are you sure you want to print?"
@@ -40,7 +40,7 @@
 
 #: src/mainfunction.cxx:254 src/manual.cxx:789
 msgid "Enter line: "
-msgstr "Zeile eingeben: "
+msgstr "Bitte Zeilennummer eingeben: "
 
 #: src/mainfunction.cxx:292 src/manual.cxx:836
 msgid "Enter command: "
@@ -51,8 +51,8 @@
 msgstr "Funktion fehlgeschlagen..."
 
 #: src/mainfunction.cxx:348 src/mainfunction.cxx:607 src/manual.cxx:890
-msgid "Enter regexp: "
-msgstr "Bitte Regexp eingeben: "
+msgid "Enter regular expression: "
+msgstr "Bitte regulären Ausdruck eingeben: "
 
 #: src/mainfunction.cxx:576 src/mainfunction.cxx:664 src/manual.cxx:959
 #, fuzzy
@@ -61,44 +61,43 @@
 
 #: src/mainfunction.cxx:630 src/manual.cxx:920
 msgid "Invalid regular expression;"
-msgstr ""
+msgstr "Ungültiger regulärer Ausdruck;"
 
 #: src/mainfunction.cxx:632 src/manual.cxx:922
 msgid "Press any key to continue..."
-msgstr ""
+msgstr "Beliebige Taste drücken, um fortzufahren..."
 
 #: src/mainfunction.cxx:691
 msgid "Enter node name: "
-msgstr "Bitte Node-Namen eingeben: "
+msgstr "Bitte Knotennamen eingeben: "
 
 #: src/mainfunction.cxx:759
 #, c-format
 msgid "Node %s not found"
-msgstr "Node %s wurde nicht gefunden."
+msgstr "Knoten %s wurde nicht gefunden."
 
 #: src/mainfunction.cxx:1221 src/manual.cxx:1311
 msgid "Are you sure you want to quit?"
-msgstr "Sind Sie sicher, daß Sie beenden wollen?"
+msgstr "Sind Sie sicher, dass Sie pinfo beenden wollen?"
 
 #: src/manual.cxx:289
-#, fuzzy, c-format
+#, c-format
 msgid "Error: No manual page found\n"
-msgstr "Fehler: Es wurde auch keine Manpage gefunden.\n"
+msgstr "Fehler: Es wurde keine Manpage gefunden.\n"
 
 #: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
-msgstr ""
+msgstr "Rufe apropos auf \n"
 
 #: src/manual.cxx:308
 #, c-format
 msgid "Nothing appropriate\n"
-msgstr ""
+msgstr "Nichts entsprechendes gefunden.\n"
 
 #: src/manual.cxx:758
-#, fuzzy
 msgid "Enter manual name: "
-msgstr "Bitte Node-Namen eingeben: "
+msgstr "Bitte Manpage-Namen eingeben: "
 
 #: src/manual.cxx:1395 src/video.cxx:105
 #, c-format
@@ -113,7 +112,7 @@
 #: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
-msgstr ""
+msgstr "Kann Konfigurationsdatei nicht öffnen.\n"
 
 #: src/parse_config.cxx:124
 #, c-format
@@ -126,9 +125,9 @@
 msgstr "--node-Option ohne Argument benutzt\n"
 
 #: src/pinfo.cxx:101
-#, fuzzy, c-format
+#, c-format
 msgid "--rcfile option used without argument\n"
-msgstr "--node-Option ohne Argument benutzt\n"
+msgstr "--rcfile-Option ohne Argument benutzt\n"
 
 #: src/pinfo.cxx:112
 #, fuzzy, c-format
@@ -161,8 +160,10 @@
 "-v, --version                         Version\n"
 "-m, --manual                          Man-Page verwenden\n"
 "-r, --raw-filename                    rohen Dateinamen verwenden\n"
+"-f, --file                            synonym für -r\n"
 "-a, --apropos                         Apropos aufrufen, wenn nichts "
 "gefunden\n"
+"-p, --plain-apropos                   nur apropos aufrufen\n"
 "-c, --cut-man-headers                 wiederholte Man-Kopfzeilen entfernen\n"
 "-l, --long-manual-links               lange Linknamen in Man-Pages benutzen\n"
 "-s, --squeeze-manlines                leere Zeilen aus Man-Pages entfernen\n"
@@ -171,7 +172,9 @@
 "-t, --force-manual-tag-table          Manuelles Auffinden der Tagtabelle\n"
 "                                      erzwingen\n"
 "-x, --clear-at-exit                   Schirm beim Verlassen löschen\n"
-"    --node=knoten, --node knoten      direkt zum Knoten knoten springen\n"
+"    --node=knoten, --node knoten      direkt zum Knoten 'knoten' springen\n"
+"    --rcfile=datei, --rcfile datei    alternative Konfigurationsdatei "
+"benutzen\n"
 
 #: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
@@ -181,7 +184,7 @@
 #: src/pinfo.cxx:326
 #, c-format
 msgid "Error: could not open info file, trying manual\n"
-msgstr "Fehler: Info Datei nicht gefunden, suche nach einer Manpage... \n"
+msgstr "Fehler: Info-Datei nicht gefunden, suche nach einer Manpage... \n"
 
 #: src/pinfo.cxx:356
 #, c-format
@@ -194,7 +197,7 @@
 msgstr "Versuche eine alternative Tag-Tabelle zu erstellen...\n"
 
 #: src/pinfo.cxx:365
-#, fuzzy, c-format
+#, c-format
 msgid "This doesn't look like an info file...\n"
 msgstr "Dies scheint keine Info-Datei zu sein...\n"
 
@@ -224,12 +227,12 @@
 #: src/pinfo.cxx:564
 #, c-format
 msgid "Security warning: Unable to get GID of group called: %s\n"
-msgstr ""
+msgstr "Sicherheitswarnung: Konnte GID der Gruppe %s nicht ermitteln.\n"
 
 #: src/pinfo.cxx:584
 #, c-format
 msgid "Security warning: Unable to get UID of user called: %s\n"
-msgstr ""
+msgstr "Sicherheitswarnung: Konnte UID des Benutzers %s nicht ermitteln.\n"
 
 #: src/utils.cxx:85
 #, c-format
@@ -237,7 +240,7 @@
 "Illegal characters in filename!\n"
 "*** %s\n"
 msgstr ""
-"Ungültiges Zeichen im Dateinamen!\n"
+"Ungültiges Zeichen im Dateinamen.\n"
 "*** %s\n"
 
 #: src/utils.cxx:256
@@ -254,7 +257,7 @@
 
 #: src/video.cxx:54
 msgid "Node:"
-msgstr "Node:"
+msgstr "Knoten:"
 
 #: src/video.cxx:55
 msgid "Next:"
@@ -268,8 +271,8 @@
 msgid "Up:"
 msgstr "Übergeordnet:"
 
-#~ msgid "Virtual memory exhausted\n"
-#~ msgstr "Virtueller Speicher aufgebraucht.\n"
+#~ msgid "Error: Cannot call man command.\n"
+#~ msgstr "Fehler: Kann 'man' nicht ausführen.\n"
 
 #~ msgid "Error: No manual page found either.\n"
 #~ msgstr "Fehler: Es wurde auch keine Manpage gefunden.\n"
@@ -278,6 +281,24 @@
 #~ msgid "Apropos pages:\n"
 #~ msgstr "Passende Seiten:\n"
 
+#~ msgid "Calling gunzip for"
+#~ msgstr "Rufe gunzip auf für"
+
+#~ msgid "Couldn't call gunzip.\n"
+#~ msgstr "Konnte gunzip nicht ausführen.\n"
+
+#~ msgid "IGNORING"
+#~ msgstr "IGNORIERE"
+
+#~ msgid "Virtual memory exhausted\n"
+#~ msgstr "Virtueller Speicher aufgebraucht.\n"
+
+#~ msgid "press a key to continue"
+#~ msgstr "Beliebige Taste drücken, um fortzufahren"
+
+#~ msgid "Are you sure to print?"
+#~ msgstr "Wollen Sie wirklich drucken?"
+
 #~ msgid "Warning: could not find tag table\n"
 #~ msgstr "Warnung: Konnte die Tag-Tabelle nicht finden.\n"
 

Modified: pinfo/branches/cxx/po/ja.po
===================================================================
--- pinfo/branches/cxx/po/ja.po	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/po/ja.po	2006-08-15 14:45:19 UTC (rev 303)
@@ -31,8 +31,8 @@
 
 #: src/filehandling_functions.cxx:1051
 #, c-format
-msgid "Error: could not open info file\n"
-msgstr "¥¨¥é¡¼: info¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿\n"
+msgid "Error: could not open info file"
+msgstr "¥¨¥é¡¼: info¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿"
 
 #: src/mainfunction.cxx:205 src/manual.cxx:744
 msgid "Are you sure you want to print?"
@@ -51,7 +51,8 @@
 msgstr "Áàºî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿..."
 
 #: src/mainfunction.cxx:348 src/mainfunction.cxx:607 src/manual.cxx:890
-msgid "Enter regexp: "
+#, fuzzy
+msgid "Enter regular expression: "
 msgstr "Àµµ¬É½¸½¤òÆþÎÏ: "
 
 #: src/mainfunction.cxx:576 src/mainfunction.cxx:664 src/manual.cxx:959
@@ -193,7 +194,7 @@
 msgstr "Ê̤Υ¿¥°¥Æ¡¼¥Ö¥ë¤òºîÀ®¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹...\n"
 
 #: src/pinfo.cxx:365
-#, fuzzy, c-format
+#, c-format
 msgid "This doesn't look like an info file...\n"
 msgstr "¤³¤ì¤Ïinfo¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹...\n"
 
@@ -267,9 +268,6 @@
 msgid "Up:"
 msgstr "¾å: "
 
-#~ msgid "Virtual memory exhausted\n"
-#~ msgstr "²¾ÁÛ¥á¥â¥ê¤ò»È¤¤ÀڤäƤ·¤Þ¤¤¤Þ¤·¤¿\n"
-
 #~ msgid "Error: Cannot call man command.\n"
 #~ msgstr "¥¨¥é¡¼: man¥³¥Þ¥ó¥É¤¬¸Æ¤Ó½Ð¤»¤Þ¤»¤ó¡£\n"
 
@@ -289,6 +287,12 @@
 #~ msgid "IGNORING"
 #~ msgstr "̵»ë"
 
+#~ msgid "Virtual memory exhausted\n"
+#~ msgstr "²¾ÁÛ¥á¥â¥ê¤ò»È¤¤ÀڤäƤ·¤Þ¤¤¤Þ¤·¤¿\n"
+
+#~ msgid "Are you sure to print?"
+#~ msgstr "ËÜÅö¤Ë°õºþ¤·¤Æ¤è¤í¤·¤¤¤Ç¤¹¤«?"
+
 #~ msgid "Warning: could not find tag table\n"
 #~ msgstr "·Ù¹ð: ¥¿¥°¥Æ¡¼¥Ö¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿\n"
 

Modified: pinfo/branches/cxx/po/nl.po
===================================================================
--- pinfo/branches/cxx/po/nl.po	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/po/nl.po	2006-08-15 14:45:19 UTC (rev 303)
@@ -32,8 +32,8 @@
 
 #: src/filehandling_functions.cxx:1051
 #, c-format
-msgid "Error: could not open info file\n"
-msgstr "Fout: kon de info file niet openen\n"
+msgid "Error: could not open info file"
+msgstr "Fout: kon de info file niet openen"
 
 #: src/mainfunction.cxx:205 src/manual.cxx:744
 msgid "Are you sure you want to print?"
@@ -52,7 +52,7 @@
 msgstr "Opdracht mislukt..."
 
 #: src/mainfunction.cxx:348 src/mainfunction.cxx:607 src/manual.cxx:890
-msgid "Enter regexp: "
+msgid "Enter regular expression: "
 msgstr "Voer reguliere expressie in: "
 
 #: src/mainfunction.cxx:576 src/mainfunction.cxx:664 src/manual.cxx:959
@@ -91,7 +91,7 @@
 msgstr "Aanroepen van apropos \n"
 
 #: src/manual.cxx:308
-#, fuzzy, c-format
+#, c-format
 msgid "Nothing appropriate\n"
 msgstr "Niets geschikts\n"
 
@@ -201,7 +201,7 @@
 msgstr "Probeer een alternatieve tag-tabel aan te maken...\n"
 
 #: src/pinfo.cxx:365
-#, fuzzy, c-format
+#, c-format
 msgid "This doesn't look like an info file...\n"
 msgstr "Dit ziet er niet uit als een info bestande...\n"
 
@@ -212,7 +212,7 @@
 
 #: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
-msgstr "Bestand niet gevonden.  Druk op een toest..."
+msgstr "Bestand niet gevonden.  Druk op een toets..."
 
 #: src/pinfo.cxx:453
 #, c-format
@@ -275,9 +275,6 @@
 msgid "Up:"
 msgstr "Omhoog:"
 
-#~ msgid "Virtual memory exhausted\n"
-#~ msgstr "Vertuele geheugen is uitgeput\n"
-
 #~ msgid "Error: Cannot call man command.\n"
 #~ msgstr "Fout: kan het man commando niet aanroepen.\n"
 
@@ -295,3 +292,12 @@
 
 #~ msgid "IGNORING"
 #~ msgstr "WORDT GENEGEERD"
+
+#~ msgid "Virtual memory exhausted\n"
+#~ msgstr "Vertuele geheugen is uitgeput\n"
+
+#~ msgid "Tag table is corrupt, trying to fix..."
+#~ msgstr "Tag-tabel is kapot, bezig met reparatie..."
+
+#~ msgid "press a key to continue"
+#~ msgstr "Druk op een toets om door te gaan"

Modified: pinfo/branches/cxx/po/pinfo.pot
===================================================================
--- pinfo/branches/cxx/po/pinfo.pot	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/po/pinfo.pot	2006-08-15 14:45:19 UTC (rev 303)
@@ -33,7 +33,7 @@
 
 #: src/filehandling_functions.cxx:1051
 #, c-format
-msgid "Error: could not open info file\n"
+msgid "Error: could not open info file"
 msgstr ""
 
 #: src/mainfunction.cxx:205 src/manual.cxx:744
@@ -53,7 +53,7 @@
 msgstr ""
 
 #: src/mainfunction.cxx:348 src/mainfunction.cxx:607 src/manual.cxx:890
-msgid "Enter regexp: "
+msgid "Enter regular expression: "
 msgstr ""
 
 #: src/mainfunction.cxx:576 src/mainfunction.cxx:664 src/manual.cxx:959

Modified: pinfo/branches/cxx/po/pl.po
===================================================================
--- pinfo/branches/cxx/po/pl.po	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/po/pl.po	2006-08-15 14:45:19 UTC (rev 303)
@@ -7,8 +7,8 @@
 "Project-Id-Version: pinfo-0.6.8\n"
 "Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2005-09-08 08:22-0400\n"
-"PO-Revision-Date: 2003-08-21 11:22+0200\n"
-"Last-Translator: Przemek Borys <pborys at dione.ids.pl>\n"
+"PO-Revision-Date: 2005-09-29 21:59+0200\n"
+"Last-Translator: Krzysztof Krzy¿aniak (eloy) <eloy at debian.org>\n"
 "Language-Team:\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
@@ -22,21 +22,21 @@
 #: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
 #, c-format
 msgid "Warning: could not find tag table"
-msgstr "Ostrze¿enie: Nie znalaz³em tablicy mapowañ (tag table)..."
+msgstr "Ostrze¿enie: nie mo¿na znale¼æ tablicy tagów"
 
 #: src/filehandling_functions.cxx:528
 #, c-format
 msgid "Searching for tag table done\n"
-msgstr "Zakoñczono poszukiwanie tablicy mapowañ\n"
+msgstr "Zakoñczono poszukiwanie tablicy tagów\n"
 
 #: src/filehandling_functions.cxx:1051
 #, c-format
-msgid "Error: could not open info file\n"
-msgstr "B³ad: nie mog³em otworzyæ pliku info\n"
+msgid "Error: could not open info file"
+msgstr "B³ad: nie nie mo¿na otworzyæ pliku info"
 
 #: src/mainfunction.cxx:205 src/manual.cxx:744
 msgid "Are you sure you want to print?"
-msgstr "Czy na pewno chcesz drukowaæ?"
+msgstr "Czy na pewno drukowaæ?"
 
 #
 # Go line messages
@@ -60,8 +60,9 @@
 # Regexp search messages
 #
 #: src/mainfunction.cxx:348 src/mainfunction.cxx:607 src/manual.cxx:890
-msgid "Enter regexp: "
-msgstr "Podaj regexp: "
+#, fuzzy
+msgid "Enter regular expression: "
+msgstr "Wprowad¼ wyra¿enie regularne: "
 
 #: src/mainfunction.cxx:576 src/mainfunction.cxx:664 src/manual.cxx:959
 msgid "Search string not found..."
@@ -69,11 +70,11 @@
 
 #: src/mainfunction.cxx:630 src/manual.cxx:920
 msgid "Invalid regular expression;"
-msgstr ""
+msgstr "B³êdne wyra¿enie regularne;"
 
 #: src/mainfunction.cxx:632 src/manual.cxx:922
 msgid "Press any key to continue..."
-msgstr ""
+msgstr "Naci¶nij dowolny klawisz..."
 
 #
 # Goto messages
@@ -100,25 +101,24 @@
 #: src/manual.cxx:289
 #, fuzzy, c-format
 msgid "Error: No manual page found\n"
-msgstr "B³ad: Nie ma równie¿ pasuj±cej strony podrêcznika man.\n"
+msgstr "B³ad: Nie znaleziono strony podrêcznika.\n"
 
 #: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
-msgstr ""
+msgstr "Uruchamianie polecenia apropos \n"
 
 #: src/manual.cxx:308
 #, c-format
 msgid "Nothing appropriate\n"
-msgstr ""
+msgstr "Brak odpowiadaj±cych stron\n"
 
 #
 # Goto messages
 #
 #: src/manual.cxx:758
-#, fuzzy
 msgid "Enter manual name: "
-msgstr "Podaj nazwê wêz³a: "
+msgstr "Podaj tytu³ podrêcznika: "
 
 #: src/manual.cxx:1395 src/video.cxx:105
 #, c-format
@@ -136,7 +136,7 @@
 #: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
-msgstr ""
+msgstr "Nie mo¿na otworzyæ pliku konfiguracyjnego!\n"
 
 #
 # Messages from the config file parsing procedures:
@@ -152,12 +152,12 @@
 #: src/pinfo.cxx:93
 #, c-format
 msgid "--node option used without argument\n"
-msgstr "opcja --node bez argumentu\n"
+msgstr "opcja --node u¿yta bez argumentu\n"
 
 #: src/pinfo.cxx:101
 #, c-format
 msgid "--rcfile option used without argument\n"
-msgstr "opcja --rcfile bez argumentu\n"
+msgstr "opcja --rcfile u¿yta bez argumentu\n"
 
 #
 # help message
@@ -215,27 +215,27 @@
 #: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
 msgid "Looking for man page...\n"
-msgstr "Szukam strony podrêcznika man...\n"
+msgstr "Szukam strony podrêcznika...\n"
 
 #: src/pinfo.cxx:326
 #, c-format
 msgid "Error: could not open info file, trying manual\n"
-msgstr "B³±d: nie ma takiego pliku info, próbujê podrêcznika man\n"
+msgstr "B³±d: nie ma takiego pliku info, szukanie strony podrêcznika\n"
 
 #: src/pinfo.cxx:356
 #, c-format
 msgid "Warning: tag table not found...\n"
-msgstr "Ostrze¿enie: nie znalaz³em tablicy mapowañ (tag table)...\n"
+msgstr "Ostrze¿enie: nie znalaziono tablicy tagów...\n"
 
 #: src/pinfo.cxx:360
 #, c-format
 msgid "Trying to create alternate tag table...\n"
-msgstr "Próbujê utworzyæ alternatywn± tablicê mapowañ...\n"
+msgstr "Próba utworzenia alternatywnej tablicy tagów...\n"
 
 #: src/pinfo.cxx:365
-#, fuzzy, c-format
+#, c-format
 msgid "This doesn't look like an info file...\n"
-msgstr "Nie wygl±da mi to na plik info...\n"
+msgstr "Nie jest plikiem typu info...\n"
 
 #: src/pinfo.cxx:378
 #, c-format
@@ -244,7 +244,7 @@
 
 #: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
-msgstr "Nie znalaz³em pliku. Naci¶nij dowolny klawisz..."
+msgstr "Nie znaleziono pliku. Naci¶nij dowolny klawisz..."
 
 #: src/pinfo.cxx:453
 #, c-format
@@ -253,22 +253,23 @@
 
 #: src/pinfo.cxx:500
 msgid "Tag table not found. Trying to create alternate..."
-msgstr "Nie znalaz³em tablicy mapowañ. Próbujê j± odgadn±æ..."
+msgstr ""
+"Nie znaleziono tablicy tagów. Próba utworzenia alternatywnej tablicy..."
 
 #: src/pinfo.cxx:505
 #, c-format
 msgid "This doesn't look like info file...\n"
-msgstr "Nie wygl±da mi to na plik info...\n"
+msgstr "Nie jest plikiem typu info...\n"
 
 #: src/pinfo.cxx:564
 #, c-format
 msgid "Security warning: Unable to get GID of group called: %s\n"
-msgstr "Ostrze¿enie bezpieczeñstwa: Nie mogê pobraæ GID grupy: %s\n"
+msgstr "Niebezpieczeñstwo: Nie mo¿na pobraæ GID grupy: %s\n"
 
 #: src/pinfo.cxx:584
 #, c-format
 msgid "Security warning: Unable to get UID of user called: %s\n"
-msgstr "Ostrze¿enie bezpieczeñstwa: Nie mogê pobraæ UID u¿ytkownika: %s\n"
+msgstr "Niebezpieczeñstwo: Nie mo¿na pobraæ UID u¿ytkownika: %s\n"
 
 #
 # Message for procedure, which checks the command line filename
@@ -311,14 +312,8 @@
 msgid "Up:"
 msgstr "Góra:"
 
-#
-# Out of memory message
-#
-#~ msgid "Virtual memory exhausted\n"
-#~ msgstr "Brak pamiêci\n"
-
 #~ msgid "Error: Cannot call man command.\n"
-#~ msgstr "B³±d: Nie mogê wywo³aæ komendy man.\n"
+#~ msgstr "B³±d: Nie mo¿na uruchomiæ polecenia man.\n"
 
 #
 # Manual messages
@@ -328,24 +323,26 @@
 #~ msgstr "B³ad: Nie ma równie¿ pasuj±cej strony podrêcznika man.\n"
 
 # apropos:
-#, fuzzy
 #~ msgid "Apropos pages:\n"
-#~ msgstr "Odpowiadaj±ce zapytaniu strony:\n"
+#~ msgstr "Podobne strony:\n"
 
 #~ msgid "Calling gunzip for"
-#~ msgstr "Wo³am gunzip dla"
+#~ msgstr "Uruchamianie gunzip dla"
 
 #~ msgid "Couldn't call gunzip.\n"
-#~ msgstr "Nie mog³em wywo³aæ gunzip.\n"
+#~ msgstr "Nie mo¿na uruchomiæ programu gunzip.\n"
 
 #~ msgid "IGNORING"
-#~ msgstr "IGNORUJÊ"
+#~ msgstr "IGNOROWANIE"
 
-#~ msgid "Warning: could not find tag table\n"
-#~ msgstr "Ostrze¿enie: Nie znalaz³em tablicy mapowañ (tag table)...\n"
-
 #
-# Load messages for info pages (version for printf)
+# Out of memory message
 #
-#~ msgid "Searching for indirect done\n"
-#~ msgstr "Zakoñczono poszukiwanie tablicy mapowañ niebezpo¶rednich\n"
+#~ msgid "Virtual memory exhausted\n"
+#~ msgstr "Brak pamiêci\n"
+
+#~ msgid "Tag table is corrupt, trying to fix..."
+#~ msgstr "Tablica tagów jest uszkodzona, próba naprawy..."
+
+#~ msgid "press a key to continue"
+#~ msgstr "naci¶nij dowolny klawisz"

Copied: pinfo/branches/cxx/po/pt_BR.po (from rev 302, pinfo/trunk/po/pt_BR.po)
===================================================================
--- pinfo/trunk/po/pt_BR.po	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/po/pt_BR.po	2006-08-15 14:45:19 UTC (rev 303)
@@ -0,0 +1,306 @@
+# translation of pinfo
+# Copyright (C) 2006 Przemek Borys <pborys at dione.ids.pl>, 
+# Bas Zoetekouw <bas at debian.org>, Nathanael Nerode <neroden at gcc.gnu.org>
+# This file is distributed under the same license as the pinfo package.
+# Felipe Augusto van de Wiel (faw) <felipe at cathedrallabs.org>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pinfo\n"
+"Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2005-09-08 08:22-0400\n"
+"PO-Revision-Date: 2006-01-06 02:05-0200\n"
+"Last-Translator: Felipe Augusto van de Wiel (faw) <felipe at cathedrallabs."
+"org>\n"
+"Language-Team: l10n portuguese <debian-l10n-portuguese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\n"
+
+#: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
+#, c-format
+msgid "Searching for indirect done"
+msgstr "Procura por indireta concluída"
+
+#: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
+#, c-format
+msgid "Warning: could not find tag table"
+msgstr "Aviso: não foi possível encontrar a tabela de etiquetas"
+
+#: src/filehandling_functions.cxx:528
+#, c-format
+msgid "Searching for tag table done\n"
+msgstr "Procura pela tabela de etiquetas concluída\n"
+
+#: src/filehandling_functions.cxx:1051
+#, c-format
+msgid "Error: could not open info file"
+msgstr "Erro: não foi possível abrir o arquivo info"
+
+#: src/mainfunction.cxx:205 src/manual.cxx:744
+msgid "Are you sure you want to print?"
+msgstr "Você tem certeza que deseja imprimir?"
+
+#: src/mainfunction.cxx:254 src/manual.cxx:789
+msgid "Enter line: "
+msgstr "Informe linha: "
+
+#: src/mainfunction.cxx:292 src/manual.cxx:836
+msgid "Enter command: "
+msgstr "Informe comando: "
+
+#: src/mainfunction.cxx:311
+msgid "Operation failed..."
+msgstr "Operação falhou..."
+
+#: src/mainfunction.cxx:348 src/mainfunction.cxx:607 src/manual.cxx:890
+msgid "Enter regular expression: "
+msgstr "Informe expressão regular: "
+
+#: src/mainfunction.cxx:576 src/mainfunction.cxx:664 src/manual.cxx:959
+msgid "Search string not found..."
+msgstr "Texto pesquisado não encontrado..."
+
+#: src/mainfunction.cxx:630 src/manual.cxx:920
+msgid "Invalid regular expression;"
+msgstr "Expressão regular inválida;"
+
+#: src/mainfunction.cxx:632 src/manual.cxx:922
+msgid "Press any key to continue..."
+msgstr "Pressione qualquer tecla para continuar..."
+
+#: src/mainfunction.cxx:691
+msgid "Enter node name: "
+msgstr "Informe nome do nó (node): "
+
+#: src/mainfunction.cxx:759
+#, c-format
+msgid "Node %s not found"
+msgstr "Nó (node) %s não encontrado"
+
+#: src/mainfunction.cxx:1221 src/manual.cxx:1311
+msgid "Are you sure you want to quit?"
+msgstr "Você tem certeza que deseja sair?"
+
+#: src/manual.cxx:289
+#, c-format
+msgid "Error: No manual page found\n"
+msgstr "Erro: Nenhuma página de manual encontrada\n"
+
+#: src/manual.cxx:300
+#, c-format
+msgid "Calling apropos \n"
+msgstr "Chamando apropos \n"
+
+#: src/manual.cxx:308
+#, c-format
+msgid "Nothing appropriate\n"
+msgstr "Nada apropriado\n"
+
+#: src/manual.cxx:758
+msgid "Enter manual name: "
+msgstr "Informe nome do manual: "
+
+#: src/manual.cxx:1395 src/video.cxx:105
+#, c-format
+msgid "Viewing line %d/%d, %d%%"
+msgstr "Visualizando linha %d/%d, %d%%"
+
+#: src/manual.cxx:1397 src/video.cxx:108
+#, c-format
+msgid "Viewing line %d/%d, 100%%"
+msgstr "Visualizando linha %d/%d, 100%%"
+
+#: src/parse_config.cxx:86
+#, c-format
+msgid "Can't open config file!\n"
+msgstr "Não foi possível abrir o arquivo de configuração!\n"
+
+#: src/parse_config.cxx:124
+#, c-format
+msgid "Parse error in config file on line %d\n"
+msgstr "Erro de interpretação do arquivo de configuração na linha %d\n"
+
+#: src/pinfo.cxx:93
+#, c-format
+msgid "--node option used without argument\n"
+msgstr "opção --node usada sem argumento\n"
+
+#: src/pinfo.cxx:101
+#, c-format
+msgid "--rcfile option used without argument\n"
+msgstr "opção --rcfile usada sem argumento\n"
+
+#: src/pinfo.cxx:112
+#, c-format
+msgid ""
+"Usage:\n"
+"%s [options] [info|manual]\n"
+"Options:\n"
+"-h, --help                            help\n"
+"-v, --version                         version\n"
+"-m, --manual                          use man page\n"
+"-r, --raw-filename                    use raw filename\n"
+"-f, --file                            synonym for -r\n"
+"-a, --apropos                         call apropos if nothing found\n"
+"-p, --plain-apropos                   call only apropos\n"
+"-c, --cut-man-headers                 cut out repeated man headers\n"
+"-l, --long-manual-links               use long link names in manuals\n"
+"-s, --squeeze-manlines                cut empty lines from manual pages\n"
+"-d, --dont-handle-without-tag-table   don't display texinfo pages without "
+"tag\n"
+"                                      tables\n"
+"-t, --force-manual-tag-table          force manual detection of tag table\n"
+"-x, --clear-at-exit                   clear screen at exit\n"
+"    --node=nodename, --node nodename  jump directly to the node nodename\n"
+"    --rcfile=file, --rcfile file      use alternate rcfile\n"
+msgstr ""
+"Uso:\n"
+"%s [opções] [info|manual]\n"
+"Opções:\n"
+"-h, --help                              ajuda\n"
+"-v, --version                           versão\n"
+"-m, --manual                            use páginas de manual (man page)\n"
+"-r, --raw-filename                      use nomes de arquivos crus (raw)\n"
+"-f, --file                              sinônimo para -r\n"
+"-a, --apropos                           chama apropos se nada for "
+"encontrado\n"
+"-p, --plain-apropos                     chama apenas apropos\n"
+"-c, --cut-man-headers                   remove cabeçalhos man repetidos\n"
+"-l, --long-manual-links                 use nomes de link longos nos "
+"manuais\n"
+"-s, --squeeze-manlines                  remove linhas vazias das páginas de\n"
+"                                        manual\n"
+"-d, --dont-handle-without-tag-table     não exibe páginas texinfo sem as\n"
+"                                        tabelas de etiquetas\n"
+"-t, --force-manual-tag-table            forçar a detecção manual da tabela\n"
+"                                        de etiquetas\n"
+"-x, --clear-at-exit                     limpa a tela quando sair\n"
+"    --node=nomedonó, --node nomedonó    pula direto para o nó \"nomedonó\"\n"
+"    --rcfile=arquivo, --rcfile arquivo  usa um arquivo rcfile alternativo\n"
+
+#: src/pinfo.cxx:138 src/pinfo.cxx:242
+#, c-format
+msgid "Looking for man page...\n"
+msgstr "Procurando pela página de manual...\n"
+
+#: src/pinfo.cxx:326
+#, c-format
+msgid "Error: could not open info file, trying manual\n"
+msgstr "Erro: não foi possível abrir o arquivo info, tentando manual\n"
+
+#: src/pinfo.cxx:356
+#, c-format
+msgid "Warning: tag table not found...\n"
+msgstr "Aviso: tabela etiquetas não encontrada...\n"
+
+#: src/pinfo.cxx:360
+#, c-format
+msgid "Trying to create alternate tag table...\n"
+msgstr "Tentando criar tabela de etiquetas alternativa...\n"
+
+#: src/pinfo.cxx:365
+#, c-format
+msgid "This doesn't look like an info file...\n"
+msgstr "Isso não parece ser um arquivo info...\n"
+
+#: src/pinfo.cxx:378
+#, c-format
+msgid "Specified node does not exist...\n"
+msgstr "O nó especificado não existe...\n"
+
+#: src/pinfo.cxx:435
+msgid "File not found. Press any key..."
+msgstr "Arquivo não encontrado. Pressione uma tecla..."
+
+#: src/pinfo.cxx:453
+#, c-format
+msgid "Unexpected error.\n"
+msgstr "Erro inesperado.\n"
+
+#: src/pinfo.cxx:500
+msgid "Tag table not found. Trying to create alternate..."
+msgstr ""
+"Tabela de etiquetas não encontrada. Tentando criar tabela alternativa..."
+
+#: src/pinfo.cxx:505
+#, c-format
+msgid "This doesn't look like info file...\n"
+msgstr "Isso não parece ser um arquivo info...\n"
+
+#: src/pinfo.cxx:564
+#, c-format
+msgid "Security warning: Unable to get GID of group called: %s\n"
+msgstr ""
+"Aviso de segurança: Não foi possível obter o GID do grupo chamado: %s\n"
+
+#: src/pinfo.cxx:584
+#, c-format
+msgid "Security warning: Unable to get UID of user called: %s\n"
+msgstr ""
+"Aviso de segurança: Não foi possível obter o UID do usuário chamado: %s\n"
+
+#: src/utils.cxx:85
+#, c-format
+msgid ""
+"Illegal characters in filename!\n"
+"*** %s\n"
+msgstr ""
+"Caracteres ilegais no nome do arquivo!\n"
+"*** %s\n"
+
+#: src/utils.cxx:256
+msgid "yes"
+msgstr "sim"
+
+#: src/utils.cxx:257
+msgid "no"
+msgstr "não"
+
+#: src/video.cxx:53
+msgid "File:"
+msgstr "Arquivo:"
+
+#: src/video.cxx:54
+msgid "Node:"
+msgstr "Nó:"
+
+#: src/video.cxx:55
+msgid "Next:"
+msgstr "Próximo:"
+
+#: src/video.cxx:56
+msgid "Prev:"
+msgstr "Anterior:"
+
+#: src/video.cxx:57
+msgid "Up:"
+msgstr "Acima:"
+
+#~ msgid "Error: Cannot call man command.\n"
+#~ msgstr "Erro: Não foi possível chamar o comando man.\n"
+
+#~ msgid "Error: No manual page found either.\n"
+#~ msgstr "Erro: Nenhuma página de manual foi encontrada.\n"
+
+#~ msgid "Apropos pages:\n"
+#~ msgstr "Páginas apropos:\n"
+
+#~ msgid "Calling gunzip for"
+#~ msgstr "Chamando gunzip para"
+
+#~ msgid "Couldn't call gunzip.\n"
+#~ msgstr "Não foi possível chamar gunzip.\n"
+
+#~ msgid "IGNORING"
+#~ msgstr "IGNORANDO"
+
+#~ msgid "Virtual memory exhausted\n"
+#~ msgstr "Memória virtual exaurida\n"
+
+#~ msgid "Tag table is corrupt, trying to fix..."
+#~ msgstr "Tabela de etiquetas está corrompida, tentando consertar..."
+
+#~ msgid "press a key to continue"
+#~ msgstr "pressione uma tecla para continuar"

Modified: pinfo/branches/cxx/po/ru.po
===================================================================
--- pinfo/branches/cxx/po/ru.po	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/po/ru.po	2006-08-15 14:45:19 UTC (rev 303)
@@ -1,132 +1,134 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# translation of ru.po to Russian
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Volosenkov Dmitry <_bil_ at mail.ru>, 2003.
+# Yuri Kozlov <kozlov.y at gmail.com>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.5.3\n"
+"Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2005-09-08 08:22-0400\n"
-"PO-Revision-Date: 2003-08-21 11:22+0200\n"
-"Last-Translator: Volosenkov Dmitry <_bil_ at mail.ru>\n"
-"Language-Team: russian <ru at li.org>\n"
+"PO-Revision-Date: 2005-10-01 10:47+0400\n"
+"Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
 
 #: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
 #, c-format
 msgid "Searching for indirect done"
-msgstr ""
+msgstr "Поиск ссылки завершён"
 
 #: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
 #, c-format
 msgid "Warning: could not find tag table"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÔÁÂÌÉÞÎÙÊ ÔÜÇ"
+msgstr "Предупреждение: не могу найти табличный тег"
 
 #: src/filehandling_functions.cxx:528
 #, c-format
 msgid "Searching for tag table done\n"
-msgstr "ðÏÉÓË ÔÁÂÌÉÞÎÏÇÏ ÔÜÇÁ ÚÁ×ÅÒÛÅÎ\n"
+msgstr "Поиск табличного тега завершён\n"
 
 #: src/filehandling_functions.cxx:1051
 #, c-format
-msgid "Error: could not open info file\n"
-msgstr "ïÛÉÂËÁ: ÎÅ ÍÏÇÕ ÎÁÊÔÉ info ÆÁÊÌ\n"
+msgid "Error: could not open info file"
+msgstr "Ошибка: не удалось открыть info файл"
 
 #: src/mainfunction.cxx:205 src/manual.cxx:744
 msgid "Are you sure you want to print?"
-msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÖÅÌÁÅÔÅ ÎÁÐÅÞÁÔÁÔØ"
+msgstr "Вы действительно желаете напечатать?"
 
 #: src/mainfunction.cxx:254 src/manual.cxx:789
 msgid "Enter line: "
-msgstr "÷×ÅÄÉÔÅ ÓÔÒÏËÕ: "
+msgstr "Введите строку: "
 
 #: src/mainfunction.cxx:292 src/manual.cxx:836
 msgid "Enter command: "
-msgstr "÷×ÅÄÉÔÅ ËÏÍÁÎÄÕ: "
+msgstr "Введите команду: "
 
 #: src/mainfunction.cxx:311
 msgid "Operation failed..."
-msgstr "äÅÊÓÔ×ÉÅ ÎÅ ÕÄÁÌÏÓØ..."
+msgstr "Действие не удалось..."
 
 #: src/mainfunction.cxx:348 src/mainfunction.cxx:607 src/manual.cxx:890
-msgid "Enter regexp: "
-msgstr "÷×ÅÄÉÔÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ: "
+msgid "Enter regular expression: "
+msgstr "Введите регулярное выражение: "
 
 #: src/mainfunction.cxx:576 src/mainfunction.cxx:664 src/manual.cxx:959
 msgid "Search string not found..."
-msgstr "óÔÒÏËÁ ÎÅ ÎÁÊÄÅÎÁ..."
+msgstr "Строка не найдена..."
 
 #: src/mainfunction.cxx:630 src/manual.cxx:920
 msgid "Invalid regular expression;"
-msgstr ""
+msgstr "Недопустимое регулярное выражение;"
 
 #: src/mainfunction.cxx:632 src/manual.cxx:922
 msgid "Press any key to continue..."
-msgstr ""
+msgstr "Нажмите любую клавишу..."
 
 #: src/mainfunction.cxx:691
 msgid "Enter node name: "
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÎÏÄÙ: "
+msgstr "Введите имя узла: "
 
 #: src/mainfunction.cxx:759
 #, c-format
 msgid "Node %s not found"
-msgstr "õÚÅÌ %s ÎÅ ÎÁÊÄÅÎ"
+msgstr "Узел %s не найден"
 
 #: src/mainfunction.cxx:1221 src/manual.cxx:1311
 msgid "Are you sure you want to quit?"
-msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÖÅÌÁÅÔÅ ×ÙÊÔÉ?"
+msgstr "Завершить работу?"
 
 #: src/manual.cxx:289
 #, c-format
 msgid "Error: No manual page found\n"
-msgstr "ïÛÉÂËÁ: ÓÔÒÁÎÉÃÁ ÒÕËÏ×ÏÄÓÔ×Á ÎÅ ÎÁÊÄÅÎÁ.\n"
+msgstr "Ошибка: страница руководства не найдена\n"
 
 #: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
-msgstr ""
+msgstr "Запуск команды apropos \n"
 
 #: src/manual.cxx:308
-#, fuzzy, c-format
+#, c-format
 msgid "Nothing appropriate\n"
-msgstr "îÉÞÅÇÏ ÐÏÄÈÏÄÑÝÅÇÏ\n"
+msgstr "Ничего подходящего\n"
 
 #: src/manual.cxx:758
 msgid "Enter manual name: "
-msgstr "÷×ÅÄÉÔÅ ÎÁÚ×ÁÎÉÅ ÒÕËÏ×ÏÄÓÔ×Á: "
+msgstr "Введите название руководства: "
 
 #: src/manual.cxx:1395 src/video.cxx:105
 #, c-format
 msgid "Viewing line %d/%d, %d%%"
-msgstr "ðÒÏÓÍÁÔÒÉ×ÁÀ ÓÔÒÏÞËÕ %d/%d, %d%%"
+msgstr "Просмотр строки %d/%d, %d%%"
 
 #: src/manual.cxx:1397 src/video.cxx:108
 #, c-format
 msgid "Viewing line %d/%d, 100%%"
-msgstr "ðÒÏÓÍÁÔÒÉ×ÁÀ ÓÔÒÏÞËÕ %d/%d, 100%%"
+msgstr "Просмотр строки %d/%d, 100%%"
 
 #: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
-msgstr ""
+msgstr "Не удалось открыть файл конфигурации!\n"
 
 #: src/parse_config.cxx:124
 #, c-format
 msgid "Parse error in config file on line %d\n"
-msgstr "óÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ × ÓÔÒÏËÅ %d\n"
+msgstr "Синтаксическая ошибка конфигурационного файла в строке %d\n"
 
 #: src/pinfo.cxx:93
 #, c-format
 msgid "--node option used without argument\n"
-msgstr "ÐÁÒÁÍÅÔÒ --node ÉÓÐÏÌØÚÕÅÔÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+msgstr "параметр --node указан без аргумента\n"
 
 #: src/pinfo.cxx:101
-#, fuzzy, c-format
+#, c-format
 msgid "--rcfile option used without argument\n"
-msgstr "ÏÐÃÉÑ --node ÉÓÐÏÌØÚÕÅÔÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+msgstr "параметр --rcfile указан без аргумента\n"
 
 #: src/pinfo.cxx:112
 #, c-format
@@ -152,64 +154,91 @@
 "    --node=nodename, --node nodename  jump directly to the node nodename\n"
 "    --rcfile=file, --rcfile file      use alternate rcfile\n"
 msgstr ""
+"Использование:\n"
+"%s [параметры] [файл info или страницы руководства]\n"
+"Параметры:\n"
+"-h, --help                            помощь\n"
+"-v, --version                         версия\n"
+"-m, --manual                          показать страницу руководства\n"
+"-r, --raw-filename                    использовать сырой файл\n"
+"-f, --file                            тоже что и -r\n"
+"-a, --apropos                         запустить apropos, если\n"
+"                                      ничего не найдено\n"
+"-p, --plain-apropos                   запустить только apropos\n"
+"-c, --cut-man-headers                 вырезать повторяющиеся заголовки "
+"страниц\n"
+"                                      руководства\n"
+"-l, --long-manual-links               использовать длинные ссылки\n"
+"                                      в руководствах\n"
+"-s, --squeeze-manlines                вырезать пустые строки из страниц\n"
+"                                      руководства\n"
+"-d, --dont-handle-without-tag-table   не показывать texinfo страницы без "
+"тегов\n"
+"                                      таблиц\n"
+"-t, --force-manual-tag-table          принудительное ручное определение "
+"тегов\n"
+"                                      таблицы\n"
+"-x, --clear-at-exit                   очищать экран при выходе\n"
+"    --node=узел, --node узел          сразу перейти к указанному узлу\n"
+"    --rcfile=файл, --rcfile файл      использовать другой rcfile\n"
 
 #: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
 msgid "Looking for man page...\n"
-msgstr "éÝÕ man ÓÔÒÁÎÉÃÕ...\n"
+msgstr "Поиск страницы руководства...\n"
 
 #: src/pinfo.cxx:326
 #, c-format
 msgid "Error: could not open info file, trying manual\n"
-msgstr "ïÛÉÂËÁ: ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ info ÆÁÊÌ, ÐÙÔÁÀÓØ ÏÔËÒÙÔØ man\n"
+msgstr "Ошибка: не удалось открыть info файл, попытка открыть man\n"
 
 #: src/pinfo.cxx:356
 #, c-format
 msgid "Warning: tag table not found...\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÔÁÂÌÉÞÎÙÊ ÔÜÇ ÎÅ ÎÁÊÄÅÎ...\n"
+msgstr "Предупреждение: табличный тег не найден...\n"
 
 #: src/pinfo.cxx:360
 #, c-format
 msgid "Trying to create alternate tag table...\n"
-msgstr "ðÙÔÁÀÓØ ÓÏÚÄÁÔØ ÄÒÕÇÏÊ ÔÁÂÌÉÞÎÙÊ ÔÜÇ...\n"
+msgstr "Попытка создать другой табличный тег...\n"
 
 #: src/pinfo.cxx:365
-#, fuzzy, c-format
+#, c-format
 msgid "This doesn't look like an info file...\n"
-msgstr "îÅÐÏÈÏÖ ÎÁ info ÆÁÊÌ...\n"
+msgstr "Вероятно это не info файл...\n"
 
 #: src/pinfo.cxx:378
 #, c-format
 msgid "Specified node does not exist...\n"
-msgstr "õËÁÚÁÎÎÙÊ ÕÚÅÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ...\n"
+msgstr "Указанный узел не существует...\n"
 
 #: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
-msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ. îÁÖÍÉÔÅ ÌÀÂÕÀ ËÌÁ×ÉÛÕ..."
+msgstr "Файл не найден. Нажмите любую клавишу..."
 
 #: src/pinfo.cxx:453
 #, c-format
 msgid "Unexpected error.\n"
-msgstr "îÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ.\n"
+msgstr "Неожиданная ошибка.\n"
 
 #: src/pinfo.cxx:500
 msgid "Tag table not found. Trying to create alternate..."
-msgstr "ôÁÂÌÉÞÎÙÊ ÔÜÇ ÎÅ ÎÁÊÄÅÎ. ðÙÔÁÀÓØ ÓÏÚÄÁÔØ ÄÒÕÇÏÊ..."
+msgstr "Табличный тег не найден. Попытка создать другой..."
 
 #: src/pinfo.cxx:505
 #, c-format
 msgid "This doesn't look like info file...\n"
-msgstr "îÅÐÏÈÏÖ ÎÁ info ÆÁÊÌ...\n"
+msgstr "Вероятно это не info файл...\n"
 
 #: src/pinfo.cxx:564
 #, c-format
 msgid "Security warning: Unable to get GID of group called: %s\n"
-msgstr ""
+msgstr "Предупреждение безопасности: Не удалось получить GID группы %s\n"
 
 #: src/pinfo.cxx:584
 #, c-format
 msgid "Security warning: Unable to get UID of user called: %s\n"
-msgstr ""
+msgstr "Предупреждение безопасности: Не удалось получить UID пользователя %s\n"
 
 #: src/utils.cxx:85
 #, c-format
@@ -217,55 +246,60 @@
 "Illegal characters in filename!\n"
 "*** %s\n"
 msgstr ""
-"ÎÅ×ÅÒÎÙÅ ÓÉÍ×ÏÌÙ × ÉÍÅÎÉ ÆÁÊÌÁ!\n"
+"Недопустимые символы в имени файла!\n"
 "*** %s\n"
 
 #: src/utils.cxx:256
 msgid "yes"
-msgstr ""
+msgstr "да"
 
 #: src/utils.cxx:257
 msgid "no"
-msgstr ""
+msgstr "нет"
 
 #: src/video.cxx:53
 msgid "File:"
-msgstr "æÁÊÌ:"
+msgstr "Файл:"
 
 #: src/video.cxx:54
 msgid "Node:"
-msgstr "õÚÅÌ:"
+msgstr "Узел:"
 
 #: src/video.cxx:55
 msgid "Next:"
-msgstr "óÌÅÄ.:"
+msgstr "След.:"
 
 #: src/video.cxx:56
 msgid "Prev:"
-msgstr "ðÒÅÄ.:"
+msgstr "Пред.:"
 
 #: src/video.cxx:57
 msgid "Up:"
-msgstr "÷×ÅÒÈ:"
+msgstr "Вверх:"
 
-#~ msgid "Virtual memory exhausted\n"
-#~ msgstr "úÁËÏÎÞÉÌÁÓØ ×ÉÒÔÕÁÌØÎÁÑ ÐÁÍÑÔØ\n"
-
 #~ msgid "Error: Cannot call man command.\n"
-#~ msgstr "ïÛÉÂËÁ: îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ man\n"
+#~ msgstr "Ошибка: Невозможно запустить команду man.\n"
 
 #~ msgid "Error: No manual page found either.\n"
-#~ msgstr "ïÛÉÂËÁ: Man ÓÔÒÁÎÉÃÁ ÎÅ ÎÁÊÄÅÎÁ ÔÁËÖÅ.\n"
+#~ msgstr "Ошибка: Страница руководства тоже не найдена.\n"
 
-#, fuzzy
 #~ msgid "Apropos pages:\n"
-#~ msgstr "ðÏÄÈÏÄÑÝÉÅ ÓÔÒÁÎÉÃÙ:\n"
+#~ msgstr "Подходящие страницы:\n"
 
 #~ msgid "Calling gunzip for"
-#~ msgstr "úÁÐÕÓË gunzip ÄÌÑ"
+#~ msgstr "Запуск gunzip для"
 
 #~ msgid "Couldn't call gunzip.\n"
-#~ msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ gunzip \n"
+#~ msgstr "Не удалось запустить gunzip.\n"
 
-#~ msgid "Warning: could not find tag table\n"
-#~ msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÔÁÂÌÉÞÎÙÊ ÔÜÇ\n"
+#~ msgid "IGNORING"
+#~ msgstr "ИГНОРИРОВАНИЕ"
+
+#~ msgid "Virtual memory exhausted\n"
+#~ msgstr "Закончилась виртуальная память\n"
+
+#~ msgid "Tag table is corrupt, trying to fix..."
+#~ msgstr "Табличный тег повреждён, попытка восстановления..."
+
+#~ msgid "press a key to continue"
+#~ msgstr "нажмите любую клавишу"

Modified: pinfo/branches/cxx/po/sv.po
===================================================================
--- pinfo/branches/cxx/po/sv.po	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/po/sv.po	2006-08-15 14:45:19 UTC (rev 303)
@@ -1,18 +1,20 @@
-# pinfo Swedish language module
-#
-# strings for the header-filter of info messages
-# , fuzzy
+# Svenska translation of pinfo.
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Daniel Nylander <po at danielnylander.se>, 2005.
+# 
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: pinfo-0.6.8\n"
+"Project-Id-Version: pinfo 0.6.8-6\n"
 "Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2005-09-08 08:22-0400\n"
-"PO-Revision-Date: 2003-08-21 11:22+0200\n"
-"Last-Translator:\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2005-10-06 12:00+0200\n"
+"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
+"Language-Team: Swedish <sv at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
 
 #: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
 #, c-format
@@ -31,20 +33,20 @@
 
 #: src/filehandling_functions.cxx:1051
 #, c-format
-msgid "Error: could not open info file\n"
-msgstr "Fel: kunde inte öppna info-fil\n"
+msgid "Error: could not open info file"
+msgstr "Fel: kunde inte öppna info-fil"
 
 #: src/mainfunction.cxx:205 src/manual.cxx:744
+#, fuzzy
 msgid "Are you sure you want to print?"
-msgstr ""
+msgstr "Är du säker att du vill skriva ut?"
 
 #
 # Regexp search messages
 #
 #: src/mainfunction.cxx:254 src/manual.cxx:789
-#, fuzzy
 msgid "Enter line: "
-msgstr "Skriv regexp: "
+msgstr "Ange linje "
 
 #
 # Shellfeed messages
@@ -61,13 +63,13 @@
 # Regexp search messages
 #
 #: src/mainfunction.cxx:348 src/mainfunction.cxx:607 src/manual.cxx:890
-msgid "Enter regexp: "
+#, fuzzy
+msgid "Enter regular expression: "
 msgstr "Skriv regexp: "
 
 #: src/mainfunction.cxx:576 src/mainfunction.cxx:664 src/manual.cxx:959
-#, fuzzy
 msgid "Search string not found..."
-msgstr "Varning: tag-table inte funnen...\n"
+msgstr "Söksträng inte hittad..."
 
 #: src/mainfunction.cxx:630 src/manual.cxx:920
 msgid "Invalid regular expression;"
@@ -91,35 +93,35 @@
 msgstr "Kunde inte hitta nod %s"
 
 #: src/mainfunction.cxx:1221 src/manual.cxx:1311
+#, fuzzy
 msgid "Are you sure you want to quit?"
-msgstr ""
+msgstr "Är du säker att du vill avsluta?"
 
 #
 # Manual messages
 #
 # loading:
 #: src/manual.cxx:289
-#, fuzzy, c-format
+#, c-format
 msgid "Error: No manual page found\n"
-msgstr "Fel: Hittade ingen manual-sida heller.\n"
+msgstr "Fel: Ingen manualsida hittad.\n"
 
 #: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
-msgstr ""
+msgstr "Kallar upp apropos \n"
 
 #: src/manual.cxx:308
-#, c-format
+#, fuzzy, c-format
 msgid "Nothing appropriate\n"
-msgstr ""
+msgstr "Inget lämpligt\n"
 
 #
 # Goto messages
 #
 #: src/manual.cxx:758
-#, fuzzy
 msgid "Enter manual name: "
-msgstr "Skriv nod-namn: "
+msgstr "Ange manualnamn:"
 
 #: src/manual.cxx:1395 src/video.cxx:105
 #, c-format
@@ -137,7 +139,7 @@
 #: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
-msgstr ""
+msgstr "Kunde inte öppna konfigurationsfilen!\n"
 
 #
 # Messages from the config file parsing procedures:
@@ -150,12 +152,12 @@
 #: src/pinfo.cxx:93
 #, c-format
 msgid "--node option used without argument\n"
-msgstr "Alternativ --node använt utan argument\n"
+msgstr ""
 
 #: src/pinfo.cxx:101
-#, fuzzy, c-format
+#, c-format
 msgid "--rcfile option used without argument\n"
-msgstr "Alternativ --node använt utan argument\n"
+msgstr ""
 
 #: src/pinfo.cxx:112
 #, c-format
@@ -182,56 +184,53 @@
 "    --rcfile=file, --rcfile file      use alternate rcfile\n"
 msgstr ""
 
-#
-# error messages when loading
-#
 #: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
 msgid "Looking for man page...\n"
-msgstr "Letar efter man-sida...\n"
+msgstr ""
 
 #: src/pinfo.cxx:326
-#, c-format
+#, fuzzy, c-format
 msgid "Error: could not open info file, trying manual\n"
-msgstr "Fel: kunde inte öppna info-fil, försöker med manual\n"
+msgstr "Fel: kunde inte öppna info-fil\n"
 
 #: src/pinfo.cxx:356
-#, c-format
+#, fuzzy, c-format
 msgid "Warning: tag table not found...\n"
-msgstr "Varning: tag-table inte funnen...\n"
+msgstr "Sökning efter tag table klar\n"
 
 #: src/pinfo.cxx:360
 #, c-format
 msgid "Trying to create alternate tag table...\n"
-msgstr "Försöker skapa alternativ tag-table...\n"
+msgstr ""
 
 #: src/pinfo.cxx:365
-#, fuzzy, c-format
+#, c-format
 msgid "This doesn't look like an info file...\n"
-msgstr "Det här ser inte ut som en info-fil...\n"
+msgstr ""
 
 #: src/pinfo.cxx:378
 #, c-format
 msgid "Specified node does not exist...\n"
-msgstr "Angiven nod existerar inte...\n"
+msgstr ""
 
 #: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
-msgstr "Filen finns inte.  Tryck en tangent..."
+msgstr ""
 
 #: src/pinfo.cxx:453
 #, c-format
 msgid "Unexpected error.\n"
-msgstr "Oväntat fel.\n"
+msgstr ""
 
 #: src/pinfo.cxx:500
 msgid "Tag table not found. Trying to create alternate..."
-msgstr "Tag-table inte funnen.  Försöker skapa alternativ..."
+msgstr ""
 
 #: src/pinfo.cxx:505
 #, c-format
 msgid "This doesn't look like info file...\n"
-msgstr "Det här ser inte ut som en info-fil...\n"
+msgstr ""
 
 #: src/pinfo.cxx:564
 #, c-format
@@ -243,52 +242,43 @@
 msgid "Security warning: Unable to get UID of user called: %s\n"
 msgstr ""
 
-#
-# Message for procedure, which checks the command line filename
-#
-# , c-format
 #: src/utils.cxx:85
 #, c-format
 msgid ""
 "Illegal characters in filename!\n"
 "*** %s\n"
 msgstr ""
-"Otillåtna tecken i filnamnet!\n"
-"*** %s\n"
 
 #: src/utils.cxx:256
 msgid "yes"
-msgstr "ja"
+msgstr ""
 
 #: src/utils.cxx:257
 msgid "no"
-msgstr "nej"
+msgstr ""
 
 #: src/video.cxx:53
 msgid "File:"
-msgstr "Fil:"
+msgstr ""
 
 #: src/video.cxx:54
 msgid "Node:"
-msgstr "Nod:"
+msgstr ""
 
 #: src/video.cxx:55
 msgid "Next:"
-msgstr "Nästa:"
+msgstr ""
 
 #: src/video.cxx:56
 msgid "Prev:"
-msgstr "Föregående:"
+msgstr ""
 
 #: src/video.cxx:57
 msgid "Up:"
-msgstr "Upp:"
+msgstr ""
 
-#
-# Out of memory message
-#
-#~ msgid "Virtual memory exhausted\n"
-#~ msgstr "Slut på virtuellt minne\n"
+#~ msgid "Error: Cannot call man command.\n"
+#~ msgstr "Fel: Kunde inte kalla upp kommandot 'man'.\n"
 
 #
 # Manual messages
@@ -302,34 +292,30 @@
 #~ msgid "Apropos pages:\n"
 #~ msgstr "Lämpliga sidor:\n"
 
-#~ msgid "Warning: could not find tag table\n"
-#~ msgstr "Varning: kunde inte finna tag table\n"
+#~ msgid "Calling gunzip for"
+#~ msgstr "Kallar upp gunzip för"
 
+#~ msgid "Couldn't call gunzip.\n"
+#~ msgstr "Kunde inte kalla upp gunzip.\n"
+
+#~ msgid "IGNORING"
+#~ msgstr "IGNORERAR"
+
 #
+# Out of memory message
+#
+#~ msgid "Virtual memory exhausted\n"
+#~ msgstr "Slut på virtuellt minne\n"
+
+# pinfo Swedish language module
+#
+# strings for the header-filter of info messages
+# , fuzzy
+#
 # Load messages for info pages (version for printf)
 #
 #~ msgid "Searching for indirect done\n"
 #~ msgstr "Sökning efter indirekt klar\n"
 
-#
-# help message
-#
-# , c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "%s [options] [info|manual]\n"
-#~ "Options:\n"
-#~ "--help, -h: help\n"
-#~ "--version, -v: version\n"
-#~ "--manual, -m: use man page\n"
-#~ "--raw-filename, -r: use raw filename\n"
-#~ "--apropos, -a: call apropos if nothing found\n"
-#~ msgstr ""
-#~ "Användning:\n"
-#~ "%s [alternativ] [info|manual]\n"
-#~ "Alternativ:\n"
-#~ "--help, -h: hjälp\n"
-#~ "--version, -v: versionsnummer\n"
-#~ "--manual, -m: använd man-sida\n"
-#~ "--raw-filename, -r: använd rått filnamn\n"
-#~ "--apropos, -a: anropa apropos om inget lämpligt dokument finns\n"
+#~ msgid "Warning: could not find tag table\n"
+#~ msgstr "Varning: kunde inte finna tag table\n"

Copied: pinfo/branches/cxx/po/vi.po (from rev 302, pinfo/trunk/po/vi.po)
===================================================================
--- pinfo/trunk/po/vi.po	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/po/vi.po	2006-08-15 14:45:19 UTC (rev 303)
@@ -0,0 +1,301 @@
+# Vietnamese translation for PInfo.
+# Copyright © 2005 Przemek Borys <pborys at dione.ids.pl>, Bas Zoetekouw <bas at debian.org>, Nathanael Nerode <neroden at gcc.gnu.org>
+# This file is distributed under the same license as the PInfo package.
+# Clytie Siddall <clytie at riverland.net.au>, 2005.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: pinfo\n"
+"Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2005-09-08 08:22-0400\n"
+"PO-Revision-Date: 2005-12-21 15:11+1030\n"
+"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.5.1b\n"
+
+#: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
+#, c-format
+msgid "Searching for indirect done"
+msgstr "Đang tìm kiếm xong gián tiếp"
+
+#: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
+#, c-format
+msgid "Warning: could not find tag table"
+msgstr "Cảnh báo: không tìm thấy bảng thẻ"
+
+#: src/filehandling_functions.cxx:528
+#, c-format
+msgid "Searching for tag table done\n"
+msgstr "Đang tìm kiếm xong bảng thẻ\n"
+
+#: src/filehandling_functions.cxx:1051
+#, c-format
+msgid "Error: could not open info file"
+msgstr "Lỗi: không thể mở tập tin thông tin"
+
+#: src/mainfunction.cxx:205 src/manual.cxx:744
+msgid "Are you sure you want to print?"
+msgstr "Bạn có chắc muốn in không?"
+
+#: src/mainfunction.cxx:254 src/manual.cxx:789
+msgid "Enter line: "
+msgstr "Gõ dòng: "
+
+#: src/mainfunction.cxx:292 src/manual.cxx:836
+msgid "Enter command: "
+msgstr "Gõ lệnh: "
+
+#: src/mainfunction.cxx:311
+msgid "Operation failed..."
+msgstr "Thao tác thất bại..."
+
+#: src/mainfunction.cxx:348 src/mainfunction.cxx:607 src/manual.cxx:890
+msgid "Enter regular expression: "
+msgstr "Gõ biểu thức chính quy: "
+
+#: src/mainfunction.cxx:576 src/mainfunction.cxx:664 src/manual.cxx:959
+msgid "Search string not found..."
+msgstr "Không tìm thấy chuỗi tìm kiếm..."
+
+#: src/mainfunction.cxx:630 src/manual.cxx:920
+msgid "Invalid regular expression;"
+msgstr "Biểu thức chính quy không hợp lệ;"
+
+#: src/mainfunction.cxx:632 src/manual.cxx:922
+msgid "Press any key to continue..."
+msgstr "Bấm phím nào để tiếp tục..."
+
+#: src/mainfunction.cxx:691
+msgid "Enter node name: "
+msgstr "Gõ tên nút: "
+
+#: src/mainfunction.cxx:759
+#, c-format
+msgid "Node %s not found"
+msgstr "Không tìm thấy nút %s"
+
+#: src/mainfunction.cxx:1221 src/manual.cxx:1311
+msgid "Are you sure you want to quit?"
+msgstr "Bạn có chắc muốn thoát không?"
+
+#: src/manual.cxx:289
+#, c-format
+msgid "Error: No manual page found\n"
+msgstr "Lỗi: không tìm thấy trang hướng dẫn\n"
+
+#: src/manual.cxx:300
+#, c-format
+msgid "Calling apropos \n"
+msgstr "Đang gọi apropos \n"
+
+#: src/manual.cxx:308
+#, c-format
+msgid "Nothing appropriate\n"
+msgstr "Không có gì thích hợp\n"
+
+#: src/manual.cxx:758
+msgid "Enter manual name: "
+msgstr "Gõ tên sổ hướng dẫn: "
+
+#: src/manual.cxx:1395 src/video.cxx:105
+#, c-format
+msgid "Viewing line %d/%d, %d%%"
+msgstr "Đang xem dòng %d/%d, %d%%"
+
+#: src/manual.cxx:1397 src/video.cxx:108
+#, c-format
+msgid "Viewing line %d/%d, 100%%"
+msgstr "Đang xem dòng %d/%d, 100%%"
+
+#: src/parse_config.cxx:86
+#, c-format
+msgid "Can't open config file!\n"
+msgstr "• Không thể mở tập tin cấu hình. •\n"
+
+#: src/parse_config.cxx:124
+#, c-format
+msgid "Parse error in config file on line %d\n"
+msgstr "Gặp lỗi phân tách trong tập tin cấu hình trên dòng %d\n"
+
+#: src/pinfo.cxx:93
+#, c-format
+msgid "--node option used without argument\n"
+msgstr "Tùy chọn « --node » (nút) được dùng không có đối số\n"
+
+#: src/pinfo.cxx:101
+#, c-format
+msgid "--rcfile option used without argument\n"
+msgstr "Tùy chọn « --rcfile » (tập tin rc) được dùng không có đối số\n"
+
+#: src/pinfo.cxx:112
+#, c-format
+msgid ""
+"Usage:\n"
+"%s [options] [info|manual]\n"
+"Options:\n"
+"-h, --help                            help\n"
+"-v, --version                         version\n"
+"-m, --manual                          use man page\n"
+"-r, --raw-filename                    use raw filename\n"
+"-f, --file                            synonym for -r\n"
+"-a, --apropos                         call apropos if nothing found\n"
+"-p, --plain-apropos                   call only apropos\n"
+"-c, --cut-man-headers                 cut out repeated man headers\n"
+"-l, --long-manual-links               use long link names in manuals\n"
+"-s, --squeeze-manlines                cut empty lines from manual pages\n"
+"-d, --dont-handle-without-tag-table   don't display texinfo pages without "
+"tag\n"
+"                                      tables\n"
+"-t, --force-manual-tag-table          force manual detection of tag table\n"
+"-x, --clear-at-exit                   clear screen at exit\n"
+"    --node=nodename, --node nodename  jump directly to the node nodename\n"
+"    --rcfile=file, --rcfile file      use alternate rcfile\n"
+msgstr ""
+"Cách sử dụng:\n"
+"%s [tùy_chọn ...] [thông_tin|sổ_hướng_dẫn]\n"
+"Options:\n"
+"-h, --help                            _trợ giúp_\n"
+"-v, --version                         _phiên bản_\n"
+"-m, --manual                          sử dụng _trang hướng dẫn_\n"
+"-r, --raw-filename                    sử dụng _tên tập tin thô_\n"
+"-f, --file                            bằng tùy chọn « -r »  (_tập tin_)\n"
+"-a, --apropos                         gọi apropos nếu không tìm gì\n"
+"-p, --plain-apropos                   gọi chỉ apropos thôi (_chuẩn_)\n"
+"-c, --cut-man-headers                 _cắt ra các dòng đầu hướng dẫn_ trùng\n"
+"-l, --long-manual-links               sử dụng tên _liên kết dài_ trong _sổ "
+"hướng dẫn_\n"
+"-s, --squeeze-manlines                cắt các _dòng_ trắng ra trang _hướng "
+"dẫn_ (_vắt_)\n"
+"-d, --dont-handle-without-tag-table   _đừng_ hiển thị trang kiểu texinfo\n"
+"\t\t\t\t\t\t\t\t_không có bảng thẻ_ (_quản "
+"lý_)                                    -t, --force-manual-tag-"
+"table          _buộc_ tự phát hiện _bảng thẻ_\n"
+"-x, --clear-at-exit                   _xóa_ màn hình _khi thoát_\n"
+"    --node=nodename, --node nodename      nhảy thẳng đến _nút tên_ này\n"
+"    --rcfile=tập_tin, --rcfile tập_tin      sử dụng tập tin rc thay thế\n"
+
+#: src/pinfo.cxx:138 src/pinfo.cxx:242
+#, c-format
+msgid "Looking for man page...\n"
+msgstr "Đang tìm trang hướng dẫn...\n"
+
+#: src/pinfo.cxx:326
+#, c-format
+msgid "Error: could not open info file, trying manual\n"
+msgstr "Lỗi: không thể mở tập tin thông tin nên thử sổ hướng dẫn\n"
+
+#: src/pinfo.cxx:356
+#, c-format
+msgid "Warning: tag table not found...\n"
+msgstr "Cảnh báo: không tìm thấy bảng thẻ...\n"
+
+#: src/pinfo.cxx:360
+#, c-format
+msgid "Trying to create alternate tag table...\n"
+msgstr "Đang cố tạo bảng thẻ thay thế...\n"
+
+#: src/pinfo.cxx:365
+#, c-format
+msgid "This doesn't look like an info file...\n"
+msgstr "Điều này không hình như tập tin thông tin...\n"
+
+#: src/pinfo.cxx:378
+#, c-format
+msgid "Specified node does not exist...\n"
+msgstr "Không có nút đã gõ...\n"
+
+#: src/pinfo.cxx:435
+msgid "File not found. Press any key..."
+msgstr "Không tìm thấy tập tin. Bấm phím nào..."
+
+#: src/pinfo.cxx:453
+#, c-format
+msgid "Unexpected error.\n"
+msgstr "Gặp lỗi bất ngờ.\n"
+
+#: src/pinfo.cxx:500
+msgid "Tag table not found. Trying to create alternate..."
+msgstr "Không tìm thấy bảng thẻ. Đang cố tạo điều thay thế..."
+
+#: src/pinfo.cxx:505
+#, c-format
+msgid "This doesn't look like info file...\n"
+msgstr "Điều này không hình như tập tin thông tin...\n"
+
+#: src/pinfo.cxx:564
+#, c-format
+msgid "Security warning: Unable to get GID of group called: %s\n"
+msgstr "Cảnh báo bảo mật: không thể lấy GID của nhóm tên: %s\n"
+
+#: src/pinfo.cxx:584
+#, c-format
+msgid "Security warning: Unable to get UID of user called: %s\n"
+msgstr "Cảnh báo bảo mật: không thể lấy UID của người dùng tên: %s\n"
+
+#: src/utils.cxx:85
+#, c-format
+msgid ""
+"Illegal characters in filename!\n"
+"*** %s\n"
+msgstr ""
+"• Gặp ký tự sai trong tên tập tin. •\n"
+"*** %s\n"
+
+#: src/utils.cxx:256
+msgid "yes"
+msgstr "có"
+
+#: src/utils.cxx:257
+msgid "no"
+msgstr "không"
+
+#: src/video.cxx:53
+msgid "File:"
+msgstr "Tập tin:"
+
+#: src/video.cxx:54
+msgid "Node:"
+msgstr "Nút:"
+
+#: src/video.cxx:55
+msgid "Next:"
+msgstr "Kế:"
+
+#: src/video.cxx:56
+msgid "Prev:"
+msgstr "TrÆ°á»›c:"
+
+#: src/video.cxx:57
+msgid "Up:"
+msgstr "Lên:"
+
+#~ msgid "Error: Cannot call man command.\n"
+#~ msgstr "Lỗi: không thể gọi lệnh man (hướng dẫn).\n"
+
+#~ msgid "Error: No manual page found either.\n"
+#~ msgstr "Lỗi: cũng không tìm thấy trang hướng dẫn.\n"
+
+#~ msgid "Apropos pages:\n"
+#~ msgstr "Trang Apropos:\n"
+
+#~ msgid "Calling gunzip for"
+#~ msgstr "Đang gọi gunzip cho"
+
+#~ msgid "Couldn't call gunzip.\n"
+#~ msgstr "Không thể gọi gunzip.\n"
+
+#~ msgid "IGNORING"
+#~ msgstr "ĐANG BỎ QUA"
+
+#~ msgid "Virtual memory exhausted\n"
+#~ msgstr "Hết bộ nhớ ảo\n"
+
+#~ msgid "Tag table is corrupt, trying to fix..."
+#~ msgstr "Bảng thẻ bị hỏng nên cố sửa..."
+
+#~ msgid "press a key to continue"
+#~ msgstr "bấm phím nào để tiếp tục"

Modified: pinfo/branches/cxx/src/colors.cxx
===================================================================
--- pinfo/branches/cxx/src/colors.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/colors.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/colors.h
===================================================================
--- pinfo/branches/cxx/src/colors.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/colors.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/common_includes.h
===================================================================
--- pinfo/branches/cxx/src/common_includes.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/common_includes.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/datatypes.cxx
===================================================================
--- pinfo/branches/cxx/src/datatypes.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/datatypes.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 #include "common_includes.h"
@@ -42,7 +42,7 @@
 vector<string> manlinks = string_explode(
 		string_toupper(string("1:8:2:3:4:5:6:7:9:n:l:p:o:3X11:3Xt:3X:3x")),
 	':');
-string configuredinfopath = "/usr/share/info:/usr/local/share/info:/opt/info";
+string configuredinfopath = ".:/usr/share/info:/usr/info:/usr/local/share/info:/usr/local/info:/opt/info";
 string ignoredmacros = "";
 string rcfile = "";
 

Modified: pinfo/branches/cxx/src/datatypes.h
===================================================================
--- pinfo/branches/cxx/src/datatypes.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/datatypes.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/filehandling_functions.cxx
===================================================================
--- pinfo/branches/cxx/src/filehandling_functions.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/filehandling_functions.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 
@@ -1024,7 +1024,8 @@
 				if (id == NULL)
 				{
 					closeprogram();
-					printf(_("Error: could not open info file\n"));
+					printf(_("Error: could not open info file"));
+					printf("\n");
 					exit(1);
 				}
 				if (off > 0)

Modified: pinfo/branches/cxx/src/filehandling_functions.h
===================================================================
--- pinfo/branches/cxx/src/filehandling_functions.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/filehandling_functions.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/initializelinks.cxx
===================================================================
--- pinfo/branches/cxx/src/initializelinks.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/initializelinks.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 #include "common_includes.h"
@@ -61,30 +61,6 @@
 }
 
 /*
- * calculates the length of string between start and end, counting `\t' as
- * filling up to 8 chars. (i.e. at line 22 tab will increment the counter by 2
- * [8-(22-int(22/8)*8)] spaces)
- *
- * Bugs: this doesn't actually work.  FIXME.
- */
-int
-calculate_len(const char *start, const char *end)
-{
-	int len = 0;
-	while (start < end)
-	{
-		len++;
-		if (*start == '\t')
-		{
-			len--;
-			len +=(8 -((len) -(((len) >> 3) << 3)));
-		}
-		start++;
-	}
-	return len;
-}
-
-/*
  * Returns index of the first non-URL character (or length, if there
  * is no non-URL character)
  * FIXME: This is really not a sufficient test for a URL.

Modified: pinfo/branches/cxx/src/initializelinks.h
===================================================================
--- pinfo/branches/cxx/src/initializelinks.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/initializelinks.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 
@@ -37,9 +37,4 @@
 std::string::size_type findemailstart (const std::string & str,
 																			 std::string::size_type pos = 0);
 
-/*
- * calculate length of visible part of string ('\t' included) between start and
- * end. Returns length.
- */
-int calculate_len (const char *start, const char *end);
 #endif

Modified: pinfo/branches/cxx/src/keyboard.h
===================================================================
--- pinfo/branches/cxx/src/keyboard.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/keyboard.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/mainfunction.cxx
===================================================================
--- pinfo/branches/cxx/src/mainfunction.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/mainfunction.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 #include "common_includes.h"
@@ -199,7 +199,7 @@
 		searchagain.search = 0;
 	} else {
 		/* if searchagain key wasn't hit */
-		token_string = getstring(_("Enter regexp: "));
+		token_string = getstring(_("Enter regular expression: "));
 		/* save it to searchagain buffer */
 		searchagain.lastsearch = token_string;	
 		/*
@@ -235,7 +235,7 @@
 	return_value = -1;
 	/* the info is of indirect type; we'll search through several files */
 	if (!indirect.empty()) {
-		FILE *fd;
+		FILE *fd = NULL;
 		long tokenpos;
 		long starttokenpos;
 		long filelen;
@@ -593,7 +593,7 @@
 			if ((key == keys.shellfeed_1) ||
 					(key == keys.shellfeed_2))
 			{
-				FILE * pipe;
+				FILE * pipe = NULL;
 				/* get command name */
 				attrset(bottomline);
 				move(maxy - 1, 0);
@@ -650,6 +650,8 @@
 				if (!skipsearch) {
 					if (found_line == -1) {
 						attrset(bottomline);
+            mymvhline(maxy - 1, 0, ' ', maxx);
+            move(maxy - 1, 0);
 						mvaddstr(maxy - 1, 0, _("Search string not found..."));
 						statusline_locked = true;
 					}
@@ -683,7 +685,7 @@
 					token_string = searchagain.lastsearch;
 					searchagain.search = 0;
 				} else {
-					token_string = getstring(_("Enter regexp: "));
+					token_string = getstring(_("Enter regular expression: "));
 					searchagain.lastsearch = token_string;
 					searchagain.type = key;
 				}
@@ -726,6 +728,8 @@
 				if (!success)
 				{
 					attrset(bottomline);
+          mymvhline(maxy - 1, 0, ' ', maxx);
+          move(maxy - 1, 0);
 					mvaddstr(maxy - 1, 0, _("Search string not found..."));
 					statusline_locked = true;
 				}

Modified: pinfo/branches/cxx/src/mainfunction.h
===================================================================
--- pinfo/branches/cxx/src/mainfunction.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/mainfunction.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/manual.cxx
===================================================================
--- pinfo/branches/cxx/src/manual.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/manual.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 #include "common_includes.h"
@@ -1057,7 +1057,7 @@
 				 */
 				if (!searchagain.search)
 				{
-					token_string = getstring(_("Enter regexp: "));
+					token_string = getstring(_("Enter regular expression: "));
 					searchagain.lastsearch = token_string;
 					searchagain.type = key;
 				}

Modified: pinfo/branches/cxx/src/manual.h
===================================================================
--- pinfo/branches/cxx/src/manual.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/manual.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/parse_config.cxx
===================================================================
--- pinfo/branches/cxx/src/parse_config.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/parse_config.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 
@@ -541,7 +541,7 @@
 		else
 			return 1;
 	}
-	else if (!strncmp(temp, "FTPVIEWER", 10))
+	else if (!strncmp(temp, "FTPVIEWER", 9))
 	{
 		temp = strtok(NULL, "\n");
 		if (temp)

Modified: pinfo/branches/cxx/src/parse_config.h
===================================================================
--- pinfo/branches/cxx/src/parse_config.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/parse_config.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/pinfo.cxx
===================================================================
--- pinfo/branches/cxx/src/pinfo.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/pinfo.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/pinforc.in
===================================================================
--- pinfo/branches/cxx/src/pinforc.in	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/pinforc.in	2006-08-15 14:45:19 UTC (rev 303)
@@ -1,21 +1,21 @@
 # Here are some colour setting.
 # Whitespace between the entries is optional.
 # Format:
-# Color_ID         = Foreground   ,  Background  ,  forelight,  backblink(light)
+# Color_ID         = Foreground   ,  Background   ,forelight,  backblink(light)
 #
-COL_NORMAL         = COLOR_WHITE  ,  COLOR_BLACK ,  NO_BOLD  ,  NO_BLINK
-COL_MENUSELECTED   = COLOR_RED    ,  COLOR_BLACK ,  BOLD     ,  NO_BLINK
-COL_MENU           = COLOR_BLUE   ,  COLOR_BLACK ,  BOLD     ,  NO_BLINK
-COL_NOTESELECTED   = COLOR_RED    ,  COLOR_BLACK ,  BOLD     ,  NO_BLINK
-COL_NOTE           = COLOR_GREEN  ,  COLOR_BLACK ,  BOLD     ,  NO_BLINK
-COL_TOPLINE        = COLOR_YELLOW ,  COLOR_BLUE  ,  BOLD     ,  NO_BLINK
-COL_BOTTOMLINE     = COLOR_YELLOW ,  COLOR_BLUE  ,  BOLD     ,  NO_BLINK
-COL_MANUALBOLD     = COLOR_WHITE  ,  COLOR_BLACK ,  BOLD     ,  NO_BLINK
-COL_MANUALITALIC   = COLOR_WHITE  ,  COLOR_BLACK ,  BOLD     ,  NO_BLINK
-COL_URL            = COLOR_MAGENTA,  COLOR_BLACK ,  BOLD     ,  NO_BLINK
-COL_URLSELECTED    = COLOR_RED    ,  COLOR_BLACK ,  BOLD     ,  NO_BLINK
-COL_INFOHIGHLIGHT  = COLOR_WHITE  ,  COLOR_BLACK ,  BOLD     ,  NO_BLINK
-COL_SEARCHHIGHLIGHT= COLOR_YELLOW ,  COLOR_BLACK ,  BOLD     ,  NO_BLINK
+COL_NORMAL         = COLOR_DEFAULT,  COLOR_DEFAULT,  NO_BOLD,  NO_BLINK
+COL_MENUSELECTED   = COLOR_RED    ,  COLOR_DEFAULT,  BOLD   ,  NO_BLINK
+COL_MENU           = COLOR_BLUE   ,  COLOR_DEFAULT,  BOLD   ,  NO_BLINK
+COL_NOTESELECTED   = COLOR_RED    ,  COLOR_DEFAULT,  BOLD   ,  NO_BLINK
+COL_NOTE           = COLOR_GREEN  ,  COLOR_DEFAULT,  BOLD   ,  NO_BLINK
+COL_TOPLINE        = COLOR_YELLOW ,  COLOR_BLUE   ,  BOLD   ,  NO_BLINK
+COL_BOTTOMLINE     = COLOR_YELLOW ,  COLOR_BLUE   ,  BOLD   ,  NO_BLINK
+COL_MANUALBOLD     = COLOR_DEFAULT,  COLOR_DEFAULT,  BOLD   ,  NO_BLINK
+COL_MANUALITALIC   = COLOR_DEFAULT,  COLOR_DEFAULT,  BOLD   ,  NO_BLINK
+COL_URL            = COLOR_MAGENTA,  COLOR_DEFAULT,  BOLD   ,  NO_BLINK
+COL_URLSELECTED    = COLOR_RED    ,  COLOR_DEFAULT,  BOLD   ,  NO_BLINK
+COL_INFOHIGHLIGHT  = COLOR_DEFAULT,  COLOR_DEFAULT,  BOLD   ,  NO_BLINK
+COL_SEARCHHIGHLIGHT= COLOR_DEFAULT,  COLOR_DEFAULT,  BOLD   ,  NO_BLINK
 #
 # Here are some keybindings as well...
 #

Modified: pinfo/branches/cxx/src/printinfo.cxx
===================================================================
--- pinfo/branches/cxx/src/printinfo.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/printinfo.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/printinfo.h
===================================================================
--- pinfo/branches/cxx/src/printinfo.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/printinfo.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/regexp_search.cxx
===================================================================
--- pinfo/branches/cxx/src/regexp_search.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/regexp_search.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 
@@ -55,13 +55,22 @@
 	pinfo_re_pattern = strdup(name);
 	return 0;
 #else
+  /* first see if we can compile the regexp */
+  regex_t preg;
+  if (regcomp(&preg, name, REG_ICASE) != 0)
+  {
+    /* compilation failed, so return */
+    return -1;
+  }
+
 	if (prior_regex) {
 		regfree(&current_regex);
 	}
-	int result;
-	result = regcomp(&current_regex, name, REG_ICASE);
+
+  /* then copy the compiled expression into the newly allocated space */
+  memcpy(&current_regex, &preg, sizeof(preg));
 	prior_regex = true;
-	return result;
+	return 0;
 #endif
 }
 

Modified: pinfo/branches/cxx/src/regexp_search.h
===================================================================
--- pinfo/branches/cxx/src/regexp_search.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/regexp_search.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/sigblock.cxx
===================================================================
--- pinfo/branches/cxx/src/sigblock.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/sigblock.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -13,8 +13,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* orginal from glibc 2.1 */
 

Modified: pinfo/branches/cxx/src/sigblock.h
===================================================================
--- pinfo/branches/cxx/src/sigblock.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/sigblock.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/signal_handler.cxx
===================================================================
--- pinfo/branches/cxx/src/signal_handler.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/signal_handler.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 #include "common_includes.h"

Modified: pinfo/branches/cxx/src/signal_handler.h
===================================================================
--- pinfo/branches/cxx/src/signal_handler.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/signal_handler.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/tmpfiles.cxx
===================================================================
--- pinfo/branches/cxx/src/tmpfiles.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/tmpfiles.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/tmpfiles.h
===================================================================
--- pinfo/branches/cxx/src/tmpfiles.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/tmpfiles.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 

Modified: pinfo/branches/cxx/src/utils.cxx
===================================================================
--- pinfo/branches/cxx/src/utils.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/utils.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 1999  Przemek Borys <pborys at dione.ids.pl>
  *  Copyright (C) 2005  Bas Zoetekouw <bas at debian.org>
- *  Copyright 2005  Nathanael Nerode <neroden at gcc.gnu.org>
+ *  Copyright 2005, 2006  Nathanael Nerode <neroden at gcc.gnu.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of version 2 of the GNU General Public License as
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 
@@ -128,6 +128,31 @@
 }
 
 /*
+ * calculates the length of string between start and end, counting `\t' as
+ * filling up to 8 chars. (i.e. at line 22 tab will increment the counter by 2
+ * [8-(22-int(22/8)*8)] spaces)
+ *
+ * Bugs: this doesn't actually work.  FIXME.
+ */
+int
+calculate_len(const char *start, const char *end)
+{
+  int len = 0;
+  while (start < end)
+  {
+    len++;
+    if (*start == '\t')
+    {
+      len--;
+      len += (8 - (len & 0x07));
+    }
+    start++;
+  }
+  return len;
+}
+
+
+/*
  * Create a vector of strings.  If the strings are concatenated together
  * with separator in between them, the original string will be recovered.
  */

Modified: pinfo/branches/cxx/src/utils.h
===================================================================
--- pinfo/branches/cxx/src/utils.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/utils.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 
@@ -46,4 +46,20 @@
 /* Return a string converted to uppercase */
 std::string string_toupper (std::string s);
 
+/*
+ * calculates the length of string between start and end, counting `\t' as
+ * filling up to 8 chars. (i.e. at line 22 tab will increment the counter by 2
+ * [8-(22-int(22/8)*8)] spaces)
+ */
+int
+calculate_len(const char *start, const char *end);
+
+/*
+ *  * create a temporary file in a safe way, and return its name in a newly
+ *   * allocated string
+ *    */
+char *
+make_tempfile();
+
+
 #endif

Modified: pinfo/branches/cxx/src/video.cxx
===================================================================
--- pinfo/branches/cxx/src/video.cxx	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/video.cxx	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 
@@ -30,7 +30,7 @@
 #include "colors.h"
 #include "curse_utils.h"
 #include "datatypes.h"
-#include "initializelinks.h" // for bletchulous calculate_len
+#include "utils.h" // for bletchulous calculate_len
 #include "regexp_search.h"
 
 /*
@@ -177,13 +177,17 @@
 	}
 
 #ifndef ___DONT_USE_REGEXP_SEARCH___
+  /* loop over all the lines currently in the window */
 	for (int i = pos; 
 				(i < message.size()) && (i < pos + lines_visible); i++) {
+    /* loop over all regexps we might want to show */
 		for (int j = 0; j < h_regexp.size(); j++) {
 			regmatch_t pmatch[1];
 			const char * message_i = message[i].c_str();
 			const char * rest_of_str = message_i;
+      /* check if this regexp is present on this line */
 			while (!regexec(&h_regexp[j], rest_of_str, 1, pmatch, 0)) {
+        /* yes, found something, so highlight it */
 				int num_chars = pmatch[0].rm_eo - pmatch[0].rm_so;
 				int x = calculate_len(message_i, rest_of_str + pmatch[0].rm_so);
 				int txtoffset = (rest_of_str - message_i) + pmatch[0].rm_so;

Modified: pinfo/branches/cxx/src/video.h
===================================================================
--- pinfo/branches/cxx/src/video.h	2006-06-24 15:16:14 UTC (rev 302)
+++ pinfo/branches/cxx/src/video.h	2006-08-15 14:45:19 UTC (rev 303)
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  *  USA
  ***************************************************************************/
 




More information about the Pinfo-devel mailing list