[Pinfo-devel] r205 - in pinfo/branches/cxx: po src

Nathanael Nerode neroden-guest at costa.debian.org
Thu Sep 8 11:21:18 UTC 2005


Author: neroden-guest
Date: 2005-09-08 11:21:17 +0000 (Thu, 08 Sep 2005)
New Revision: 205

Modified:
   pinfo/branches/cxx/po/Makevars
   pinfo/branches/cxx/po/POTFILES.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/mainfunction.cxx
   pinfo/branches/cxx/src/manual.cxx
Log:
Fix English in two messages (in two places).  Fix POTFILES.in to reflect changes on CXX branch.
Fix Makevars to reflect that I'm writing parts of this.  Update pot file.  Update po files.  Unfuzzy
translations fuzzied by fixes in English.

Also, add a comment to mainfunction.cxx.



Modified: pinfo/branches/cxx/po/Makevars
===================================================================
--- pinfo/branches/cxx/po/Makevars	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/po/Makevars	2005-09-08 11:21:17 UTC (rev 205)
@@ -18,7 +18,7 @@
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = Przemek Borys  <pborys at dione.ids.pl>
+COPYRIGHT_HOLDER = Przemek Borys  <pborys at dione.ids.pl> and Nathanael Nerode  <neroden at gcc.gnu.org>
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:

Modified: pinfo/branches/cxx/po/POTFILES.in
===================================================================
--- pinfo/branches/cxx/po/POTFILES.in	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/po/POTFILES.in	2005-09-08 11:21:17 UTC (rev 205)
@@ -1,16 +1,14 @@
-src/colors.c
-src/datatypes.c
-src/filehandling_functions.c
-src/initializelinks.c
-src/mainfunction.c
-src/manual.c
-src/menu_and_note_utils.c
-src/parse_config.c
-src/readlinewrapper.c
-# src/readrc.c
-src/regexp_search.c
-src/signal_handler.c
-src/snprintf.c
-src/utils.c
-src/video.c
-src/pinfo.c
+src/colors.cxx
+src/datatypes.cxx
+src/filehandling_functions.cxx
+src/initializelinks.cxx
+src/mainfunction.cxx
+src/manual.cxx
+src/parse_config.cxx
+src/pinfo.cxx
+src/printinfo.cxx
+src/regexp_search.cxx
+src/signal_handler.cxx
+src/tmpfiles.cxx
+src/utils.cxx
+src/video.cxx

Modified: pinfo/branches/cxx/po/cs.po
===================================================================
--- pinfo/branches/cxx/po/cs.po	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/po/cs.po	2005-09-08 11:21:17 UTC (rev 205)
@@ -5,7 +5,7 @@
 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-01 21:48+0200\n"
+"POT-Creation-Date: 2005-09-08 06:47-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"
@@ -13,197 +13,122 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/filehandling_functions.c:442 src/filehandling_functions.c:449
+#: 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"
 
-#: src/filehandling_functions.c:480 src/filehandling_functions.c:486
+#: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
 #, c-format
 msgid "Warning: could not find tag table"
 msgstr "Varování: tabulku znaèek nelze nalézt"
 
-#: src/filehandling_functions.c:513
+#: src/filehandling_functions.cxx:528
 #, c-format
 msgid "Searching for tag table done\n"
 msgstr "Hledání tabulky znaèek ukonèeno\n"
 
-#: src/filehandling_functions.c:1172
+#: src/filehandling_functions.cxx:1051
 #, c-format
 msgid "Error: could not open info file\n"
 msgstr "Chyba: Info dokument nelze otevøít.\n"
 
-#: src/mainfunction.c:143 src/manual.c:970
-msgid "Are you sure to print?"
+#: src/mainfunction.cxx:206 src/manual.cxx:744
+msgid "Are you sure you want to print?"
 msgstr "Opravdu chcete dokument vytisknout?"
 
-#: src/mainfunction.c:195 src/manual.c:1015
+#: src/mainfunction.cxx:255 src/manual.cxx:789
 msgid "Enter line: "
 msgstr "Zadejte øádek: "
 
-#: src/mainfunction.c:236 src/manual.c:1062
+#: src/mainfunction.cxx:293 src/manual.cxx:836
 msgid "Enter command: "
 msgstr "Zadejte pøíkaz: "
 
-#: src/mainfunction.c:255
+#: src/mainfunction.cxx:312
 msgid "Operation failed..."
 msgstr "Operace se nezdaøila..."
 
-#: src/mainfunction.c:291 src/mainfunction.c:551 src/manual.c:1115
+#: src/mainfunction.cxx:346 src/mainfunction.cxx:602 src/manual.cxx:890
 msgid "Enter regexp: "
 msgstr "Zadejte regulární výraz: "
 
-#: src/mainfunction.c:521 src/mainfunction.c:615 src/manual.c:1190
+#: src/mainfunction.cxx:571 src/mainfunction.cxx:667 src/manual.cxx:964
 #, fuzzy
 msgid "Search string not found..."
 msgstr "Varování: tabulka znaèek nenalezena...\n"
 
-#: src/mainfunction.c:576 src/manual.c:1148
+#: src/mainfunction.cxx:625 src/manual.cxx:920
 msgid "Invalid regular expression;"
 msgstr ""
 
-#: src/mainfunction.c:578 src/manual.c:1150
+#: src/mainfunction.cxx:627 src/manual.cxx:922
 msgid "Press any key to continue..."
 msgstr ""
 
-#: src/mainfunction.c:644
+#: src/mainfunction.cxx:694
 msgid "Enter node name: "
 msgstr "Zadejte jméno uzlu: "
 
-#: src/mainfunction.c:720
+#: src/mainfunction.cxx:764
 #, c-format
 msgid "Node %s not found"
 msgstr "Uzel %s nenalezen"
 
-#: src/mainfunction.c:1177 src/manual.c:1540
-msgid "Are you sure to quit?"
+#: src/mainfunction.cxx:1210 src/manual.cxx:1316
+msgid "Are you sure you want to quit?"
 msgstr "Opravdu chcete ukonèit program?"
 
-#: src/manual.c:312
-#, c-format
-msgid "Error: Cannot call man command.\n"
-msgstr "Chyba: program man nelze spustit.\n"
-
-#: src/manual.c:321
-#, c-format
-msgid "Error: No manual page found either.\n"
-msgstr "Chyba: Nebyla nalezena ani manuálová stránka.\n"
-
-#: src/manual.c:324
+#: src/manual.cxx:289
 #, fuzzy, c-format
-msgid "Apropos pages:\n"
-msgstr "Pøíslu¹né stránky:\n"
-
-#: src/manual.c:367
-msgid "Calling gunzip for"
-msgstr "Volám program gunzip pro"
-
-#: src/manual.c:373
-#, c-format
-msgid "Couldn't call gunzip.\n"
-msgstr "Program gunzip nelze zpustit.\n"
-
-#: src/manual.c:410
-msgid "IGNORING"
-msgstr "IGNORUJI"
-
-#: src/manual.c:453
-#, fuzzy, c-format
 msgid "Error: No manual page found\n"
 msgstr "Chyba: Nebyla nalezena ani manuálová stránka.\n"
 
-#: src/manual.c:458
+#: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
 msgstr ""
 
-#: src/manual.c:463
+#: src/manual.cxx:308
 #, c-format
-msgid "Nothing appropiate\n"
+msgid "Nothing appropriate\n"
 msgstr ""
 
-#: src/manual.c:984
+#: src/manual.cxx:758
 msgid "Enter manual name: "
 msgstr "Zadejte jméno manuálové stránky: "
 
-#: src/manual.c:1623 src/video.c:114
+#: src/manual.cxx:1400 src/video.cxx:106
 #, c-format
 msgid "Viewing line %d/%d, %d%%"
 msgstr "Zobrazen øádek %d/%d, %d%%"
 
-#: src/manual.c:1625 src/video.c:116
+#: src/manual.cxx:1402 src/video.cxx:109
 #, c-format
 msgid "Viewing line %d/%d, 100%%"
 msgstr "Zobrazen øádek %d/%d, 100%%"
 
-#: src/parse_config.c:113
+#: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
 msgstr ""
 
-#: src/parse_config.c:161
+#: src/parse_config.cxx:124
 #, c-format
 msgid "Parse error in config file on line %d\n"
 msgstr "Syntaktická chyba na øádku %d konfiguraèního souboru.\n"
 
-#: src/utils.c:117 src/utils.c:173
+#: src/pinfo.cxx:93
 #, c-format
-msgid "Virtual memory exhausted\n"
-msgstr "Nedostatek virtuální pamìti\n"
-
-#: src/utils.c:227
-#, c-format
-msgid ""
-"Illegal characters in filename!\n"
-"*** %s\n"
-msgstr ""
-"Soubor obsahuje nepovolené znaky!\n"
-"*** %s\n"
-
-#: src/utils.c:432
-msgid "yes"
-msgstr "ano"
-
-#: src/utils.c:433
-msgid "no"
-msgstr "ne"
-
-#: src/video.c:61
-msgid "File:"
-msgstr "Soubor:"
-
-#: src/video.c:62
-msgid "Node:"
-msgstr "Uzel:"
-
-#: src/video.c:63
-msgid "Next:"
-msgstr "Dal¹í:"
-
-#: src/video.c:64
-msgid "Prev:"
-msgstr "Pøedchozí:"
-
-#: src/video.c:65
-msgid "Up:"
-msgstr "Horní:"
-
-#: src/pinfo.c:113 src/pinfo.c:197
-#, c-format
-msgid "Looking for man page...\n"
-msgstr "Hledá se manuálová stránka...\n"
-
-#: src/pinfo.c:150
-#, c-format
 msgid "--node option used without argument\n"
 msgstr "chybí argument pro pøepínaè --node\n"
 
-#: src/pinfo.c:160
+#: src/pinfo.cxx:101
 #, fuzzy, c-format
 msgid "--rcfile option used without argument\n"
 msgstr "chybí argument pro pøepínaè --node\n"
 
-#: src/pinfo.c:171
+#: src/pinfo.cxx:112
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -252,54 +177,125 @@
 "-x, --clear-at-exit                   pøi ukonèení programu sma¾e obrazovku\n"
 "    --node=UZEL, --node UZEL          pøeskoèí rovnou na UZEL\n"
 
-#: src/pinfo.c:311
+#: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
+msgid "Looking for man page...\n"
+msgstr "Hledá se manuálová stránka...\n"
+
+#: src/pinfo.cxx:326
+#, c-format
 msgid "Error: could not open info file, trying manual\n"
 msgstr "Chyba: Nelze najít info stránku, zkou¹ím manuálovou stránku.\n"
 
-#: src/pinfo.c:344
+#: src/pinfo.cxx:356
 #, c-format
 msgid "Warning: tag table not found...\n"
 msgstr "Varování: tabulka znaèek nenalezena...\n"
 
-#: src/pinfo.c:348
+#: src/pinfo.cxx:360
 #, c-format
 msgid "Trying to create alternate tag table...\n"
 msgstr "Vytváøí se náhradní tabulka znaèek...\n"
 
-#: src/pinfo.c:353 src/pinfo.c:502
+#: src/pinfo.cxx:365
 #, c-format
-msgid "This doesn't look like info file...\n"
+msgid "This doesn't look like an info file...\n"
 msgstr "Toto nevypadá jako info dokument...\n"
 
-#: src/pinfo.c:366
+#: src/pinfo.cxx:378
 #, c-format
 msgid "Specified node does not exist...\n"
 msgstr "Zadaný uzel neexistuje...\n"
 
-#: src/pinfo.c:424
+#: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
 msgstr "Soubor nenalezen. Stisknìte libovolnou klávesu..."
 
-#: src/pinfo.c:444
+#: src/pinfo.cxx:453
 #, c-format
 msgid "Unexpected error.\n"
 msgstr "Neoèekávaná chyba.\n"
 
-#: src/pinfo.c:497
+#: src/pinfo.cxx:500
 msgid "Tag table not found. Trying to create alternate..."
 msgstr "Tabulka znaèek nenalezena. Vytváøí se náhradní..."
 
-#: src/pinfo.c:583
+#: src/pinfo.cxx:505
 #, c-format
+msgid "This doesn't look like info file...\n"
+msgstr "Toto nevypadá jako info dokument...\n"
+
+#: src/pinfo.cxx:564
+#, c-format
 msgid "Security warning: Unable to get GID of group called: %s\n"
 msgstr "Bezpeènostní varování: GID skupiny %s nelze zjistit\n"
 
-#: src/pinfo.c:603
+#: src/pinfo.cxx:584
 #, c-format
 msgid "Security warning: Unable to get UID of user called: %s\n"
 msgstr "Bezpeènostní varování: UID u¾ivatele %s nelze zjistit\n"
 
+#: src/utils.cxx:112 src/utils.cxx:168
+#, c-format
+msgid "Virtual memory exhausted\n"
+msgstr "Nedostatek virtuální pamìti\n"
+
+#: src/utils.cxx:226
+#, c-format
+msgid ""
+"Illegal characters in filename!\n"
+"*** %s\n"
+msgstr ""
+"Soubor obsahuje nepovolené znaky!\n"
+"*** %s\n"
+
+#: src/utils.cxx:397
+msgid "yes"
+msgstr "ano"
+
+#: src/utils.cxx:398
+msgid "no"
+msgstr "ne"
+
+#: src/video.cxx:53
+msgid "File:"
+msgstr "Soubor:"
+
+#: src/video.cxx:54
+msgid "Node:"
+msgstr "Uzel:"
+
+#: src/video.cxx:55
+msgid "Next:"
+msgstr "Dal¹í:"
+
+#: src/video.cxx:56
+msgid "Prev:"
+msgstr "Pøedchozí:"
+
+#: src/video.cxx:57
+msgid "Up:"
+msgstr "Horní:"
+
+#~ 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"
+
+#~ msgid "Calling gunzip for"
+#~ msgstr "Volám program gunzip pro"
+
+#~ msgid "Couldn't call gunzip.\n"
+#~ msgstr "Program gunzip nelze zpustit.\n"
+
+#~ msgid "IGNORING"
+#~ msgstr "IGNORUJI"
+
 #~ 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	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/po/de.po	2005-09-08 11:21:17 UTC (rev 205)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: pinfo-0.5.0\n"
 "Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2005-09-01 21:48+0200\n"
+"POT-Creation-Date: 2005-09-08 06:47-0400\n"
 "PO-Revision-Date: 1999-04-21 01:50+0200\n"
 "Last-Translator: Matthias Warkus <mawa at iname.com>\n"
 "Language-Team: German <de at li.org>\n"
@@ -14,198 +14,123 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/filehandling_functions.c:442 src/filehandling_functions.c:449
+#: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
 #, c-format
 msgid "Searching for indirect done"
 msgstr "Suche nach Node-Verzeichnis abgeschlossen."
 
-#: src/filehandling_functions.c:480 src/filehandling_functions.c:486
+#: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
 #, c-format
 msgid "Warning: could not find tag table"
 msgstr "Warnung: Konnte die Tag-Tabelle nicht finden."
 
-#: src/filehandling_functions.c:513
+#: src/filehandling_functions.cxx:528
 #, c-format
 msgid "Searching for tag table done\n"
 msgstr "Suche nach der Tag-Tabelle abgeschlossen.\n"
 
-#: src/filehandling_functions.c:1172
+#: src/filehandling_functions.cxx:1051
 #, c-format
 msgid "Error: could not open info file\n"
 msgstr "Fehler: Konnte die Info-Datei nicht öffnen.\n"
 
-#: src/mainfunction.c:143 src/manual.c:970
-msgid "Are you sure to print?"
+#: src/mainfunction.cxx:206 src/manual.cxx:744
+msgid "Are you sure you want to print?"
 msgstr "Wollen Sie wirklich drucken?"
 
-#: src/mainfunction.c:195 src/manual.c:1015
+#: src/mainfunction.cxx:255 src/manual.cxx:789
 msgid "Enter line: "
 msgstr "Zeile eingeben: "
 
-#: src/mainfunction.c:236 src/manual.c:1062
+#: src/mainfunction.cxx:293 src/manual.cxx:836
 msgid "Enter command: "
 msgstr "Bitte Befehl eingeben: "
 
-#: src/mainfunction.c:255
+#: src/mainfunction.cxx:312
 msgid "Operation failed..."
 msgstr "Funktion fehlgeschlagen..."
 
-#: src/mainfunction.c:291 src/mainfunction.c:551 src/manual.c:1115
+#: src/mainfunction.cxx:346 src/mainfunction.cxx:602 src/manual.cxx:890
 msgid "Enter regexp: "
 msgstr "Bitte Regexp eingeben: "
 
-#: src/mainfunction.c:521 src/mainfunction.c:615 src/manual.c:1190
+#: src/mainfunction.cxx:571 src/mainfunction.cxx:667 src/manual.cxx:964
 #, fuzzy
 msgid "Search string not found..."
 msgstr "Warnung: Konnte keine Tag-Tabelle finden...\n"
 
-#: src/mainfunction.c:576 src/manual.c:1148
+#: src/mainfunction.cxx:625 src/manual.cxx:920
 msgid "Invalid regular expression;"
 msgstr ""
 
-#: src/mainfunction.c:578 src/manual.c:1150
+#: src/mainfunction.cxx:627 src/manual.cxx:922
 msgid "Press any key to continue..."
 msgstr ""
 
-#: src/mainfunction.c:644
+#: src/mainfunction.cxx:694
 msgid "Enter node name: "
 msgstr "Bitte Node-Namen eingeben: "
 
-#: src/mainfunction.c:720
+#: src/mainfunction.cxx:764
 #, c-format
 msgid "Node %s not found"
 msgstr "Node %s wurde nicht gefunden."
 
-#: src/mainfunction.c:1177 src/manual.c:1540
-msgid "Are you sure to quit?"
+#: src/mainfunction.cxx:1210 src/manual.cxx:1316
+msgid "Are you sure you want to quit?"
 msgstr "Sind Sie sicher, daß Sie beenden wollen?"
 
-#: src/manual.c:312
-#, c-format
-msgid "Error: Cannot call man command.\n"
-msgstr ""
-
-#: src/manual.c:321
-#, c-format
-msgid "Error: No manual page found either.\n"
-msgstr "Fehler: Es wurde auch keine Manpage gefunden.\n"
-
-#: src/manual.c:324
+#: src/manual.cxx:289
 #, fuzzy, c-format
-msgid "Apropos pages:\n"
-msgstr "Passende Seiten:\n"
-
-#: src/manual.c:367
-msgid "Calling gunzip for"
-msgstr ""
-
-#: src/manual.c:373
-#, c-format
-msgid "Couldn't call gunzip.\n"
-msgstr ""
-
-#: src/manual.c:410
-msgid "IGNORING"
-msgstr ""
-
-#: src/manual.c:453
-#, fuzzy, c-format
 msgid "Error: No manual page found\n"
 msgstr "Fehler: Es wurde auch keine Manpage gefunden.\n"
 
-#: src/manual.c:458
+#: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
 msgstr ""
 
-#: src/manual.c:463
+#: src/manual.cxx:308
 #, c-format
-msgid "Nothing appropiate\n"
+msgid "Nothing appropriate\n"
 msgstr ""
 
-#: src/manual.c:984
+#: src/manual.cxx:758
 #, fuzzy
 msgid "Enter manual name: "
 msgstr "Bitte Node-Namen eingeben: "
 
-#: src/manual.c:1623 src/video.c:114
+#: src/manual.cxx:1400 src/video.cxx:106
 #, c-format
 msgid "Viewing line %d/%d, %d%%"
 msgstr "Zeile %d/%d, %d%%"
 
-#: src/manual.c:1625 src/video.c:116
+#: src/manual.cxx:1402 src/video.cxx:109
 #, c-format
 msgid "Viewing line %d/%d, 100%%"
 msgstr "Zeile %d/%d, 100%%"
 
-#: src/parse_config.c:113
+#: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
 msgstr ""
 
-#: src/parse_config.c:161
+#: src/parse_config.cxx:124
 #, c-format
 msgid "Parse error in config file on line %d\n"
 msgstr "Die Konfigurationsdatei hat einen Fehler in Zeile %d\n"
 
-#: src/utils.c:117 src/utils.c:173
+#: src/pinfo.cxx:93
 #, c-format
-msgid "Virtual memory exhausted\n"
-msgstr "Virtueller Speicher aufgebraucht.\n"
-
-#: src/utils.c:227
-#, c-format
-msgid ""
-"Illegal characters in filename!\n"
-"*** %s\n"
-msgstr ""
-"Ungültiges Zeichen im Dateinamen!\n"
-"*** %s\n"
-
-#: src/utils.c:432
-msgid "yes"
-msgstr "ja"
-
-#: src/utils.c:433
-msgid "no"
-msgstr "nein"
-
-#: src/video.c:61
-msgid "File:"
-msgstr "Datei:"
-
-#: src/video.c:62
-msgid "Node:"
-msgstr "Node:"
-
-#: src/video.c:63
-msgid "Next:"
-msgstr "nächstes Thema:"
-
-#: src/video.c:64
-msgid "Prev:"
-msgstr "vorheriges Thema:"
-
-#: src/video.c:65
-msgid "Up:"
-msgstr "Übergeordnet:"
-
-#: src/pinfo.c:113 src/pinfo.c:197
-#, c-format
-msgid "Looking for man page...\n"
-msgstr "Suche nach einer Manpage...\n"
-
-#: src/pinfo.c:150
-#, c-format
 msgid "--node option used without argument\n"
 msgstr "--node-Option ohne Argument benutzt\n"
 
-#: src/pinfo.c:160
+#: src/pinfo.cxx:101
 #, fuzzy, c-format
 msgid "--rcfile option used without argument\n"
 msgstr "--node-Option ohne Argument benutzt\n"
 
-#: src/pinfo.c:171
+#: src/pinfo.cxx:112
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -248,54 +173,113 @@
 "-x, --clear-at-exit                   Schirm beim Verlassen löschen\n"
 "    --node=knoten, --node knoten      direkt zum Knoten knoten springen\n"
 
-#: src/pinfo.c:311
+#: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
+msgid "Looking for man page...\n"
+msgstr "Suche nach einer Manpage...\n"
+
+#: 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"
 
-#: src/pinfo.c:344
+#: src/pinfo.cxx:356
 #, c-format
 msgid "Warning: tag table not found...\n"
 msgstr "Warnung: Konnte keine Tag-Tabelle finden...\n"
 
-#: src/pinfo.c:348
+#: src/pinfo.cxx:360
 #, c-format
 msgid "Trying to create alternate tag table...\n"
 msgstr "Versuche eine alternative Tag-Tabelle zu erstellen...\n"
 
-#: src/pinfo.c:353 src/pinfo.c:502
-#, c-format
-msgid "This doesn't look like info file...\n"
+#: src/pinfo.cxx:365
+#, fuzzy, c-format
+msgid "This doesn't look like an info file...\n"
 msgstr "Dies scheint keine Info-Datei zu sein...\n"
 
-#: src/pinfo.c:366
+#: src/pinfo.cxx:378
 #, c-format
 msgid "Specified node does not exist...\n"
 msgstr "Angegebener Knoten existiert nicht...\n"
 
-#: src/pinfo.c:424
+#: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
 msgstr "Datei wurde nicht gefunden. Bitte drücken Sie eine Taste..."
 
-#: src/pinfo.c:444
+#: src/pinfo.cxx:453
 #, c-format
 msgid "Unexpected error.\n"
 msgstr "Unerwarteter Fehler.\n"
 
-#: src/pinfo.c:497
+#: src/pinfo.cxx:500
 msgid "Tag table not found. Trying to create alternate..."
 msgstr "Versuche eine alternative Tag-Tabelle zu erstellen..."
 
-#: src/pinfo.c:583
+#: src/pinfo.cxx:505
 #, c-format
+msgid "This doesn't look like info file...\n"
+msgstr "Dies scheint keine Info-Datei zu sein...\n"
+
+#: src/pinfo.cxx:564
+#, c-format
 msgid "Security warning: Unable to get GID of group called: %s\n"
 msgstr ""
 
-#: src/pinfo.c:603
+#: src/pinfo.cxx:584
 #, c-format
 msgid "Security warning: Unable to get UID of user called: %s\n"
 msgstr ""
 
+#: src/utils.cxx:112 src/utils.cxx:168
+#, c-format
+msgid "Virtual memory exhausted\n"
+msgstr "Virtueller Speicher aufgebraucht.\n"
+
+#: src/utils.cxx:226
+#, c-format
+msgid ""
+"Illegal characters in filename!\n"
+"*** %s\n"
+msgstr ""
+"Ungültiges Zeichen im Dateinamen!\n"
+"*** %s\n"
+
+#: src/utils.cxx:397
+msgid "yes"
+msgstr "ja"
+
+#: src/utils.cxx:398
+msgid "no"
+msgstr "nein"
+
+#: src/video.cxx:53
+msgid "File:"
+msgstr "Datei:"
+
+#: src/video.cxx:54
+msgid "Node:"
+msgstr "Node:"
+
+#: src/video.cxx:55
+msgid "Next:"
+msgstr "nächstes Thema:"
+
+#: src/video.cxx:56
+msgid "Prev:"
+msgstr "vorheriges Thema:"
+
+#: src/video.cxx:57
+msgid "Up:"
+msgstr "Übergeordnet:"
+
+#~ msgid "Error: No manual page found either.\n"
+#~ msgstr "Fehler: Es wurde auch keine Manpage gefunden.\n"
+
+#, fuzzy
+#~ msgid "Apropos pages:\n"
+#~ msgstr "Passende Seiten:\n"
+
 #~ 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	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/po/ja.po	2005-09-08 11:21:17 UTC (rev 205)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: pinfo 0.6.3\n"
 "Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2005-09-01 21:48+0200\n"
+"POT-Creation-Date: 2005-09-08 06:47-0400\n"
 "PO-Revision-Date: 2001-11-21 17:42+0900\n"
 "Last-Translator: Masayuki Hatta <mhatta at gnu.org>\n"
 "Language-Team: Japanese <ja at li.org>\n"
@@ -14,197 +14,122 @@
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/filehandling_functions.c:442 src/filehandling_functions.c:449
+#: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
 #, c-format
 msgid "Searching for indirect done"
 msgstr "indirect¤Î¸¡º÷´°Î»"
 
-#: src/filehandling_functions.c:480 src/filehandling_functions.c:486
+#: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
 #, c-format
 msgid "Warning: could not find tag table"
 msgstr "·Ù¹ð: ¥¿¥°¥Æ¡¼¥Ö¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/filehandling_functions.c:513
+#: src/filehandling_functions.cxx:528
 #, c-format
 msgid "Searching for tag table done\n"
 msgstr "¥¿¥°¥Æ¡¼¥Ö¥ë¤Î¸¡º÷´°Î»\n"
 
-#: src/filehandling_functions.c:1172
+#: src/filehandling_functions.cxx:1051
 #, c-format
 msgid "Error: could not open info file\n"
 msgstr "¥¨¥é¡¼: info¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: src/mainfunction.c:143 src/manual.c:970
-msgid "Are you sure to print?"
+#: src/mainfunction.cxx:206 src/manual.cxx:744
+msgid "Are you sure you want to print?"
 msgstr "ËÜÅö¤Ë°õºþ¤·¤Æ¤è¤í¤·¤¤¤Ç¤¹¤«?"
 
-#: src/mainfunction.c:195 src/manual.c:1015
+#: src/mainfunction.cxx:255 src/manual.cxx:789
 msgid "Enter line: "
 msgstr "¹Ô¤òÆþÎÏ: "
 
-#: src/mainfunction.c:236 src/manual.c:1062
+#: src/mainfunction.cxx:293 src/manual.cxx:836
 msgid "Enter command: "
 msgstr "¥³¥Þ¥ó¥É¤òÆþÎÏ: "
 
-#: src/mainfunction.c:255
+#: src/mainfunction.cxx:312
 msgid "Operation failed..."
 msgstr "Áàºî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿..."
 
-#: src/mainfunction.c:291 src/mainfunction.c:551 src/manual.c:1115
+#: src/mainfunction.cxx:346 src/mainfunction.cxx:602 src/manual.cxx:890
 msgid "Enter regexp: "
 msgstr "Àµµ¬É½¸½¤òÆþÎÏ: "
 
-#: src/mainfunction.c:521 src/mainfunction.c:615 src/manual.c:1190
+#: src/mainfunction.cxx:571 src/mainfunction.cxx:667 src/manual.cxx:964
 #, fuzzy
 msgid "Search string not found..."
 msgstr "·Ù¹ð: ¥¿¥°¥Æ¡¼¥Ö¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿...\n"
 
-#: src/mainfunction.c:576 src/manual.c:1148
+#: src/mainfunction.cxx:625 src/manual.cxx:920
 msgid "Invalid regular expression;"
 msgstr ""
 
-#: src/mainfunction.c:578 src/manual.c:1150
+#: src/mainfunction.cxx:627 src/manual.cxx:922
 msgid "Press any key to continue..."
 msgstr ""
 
-#: src/mainfunction.c:644
+#: src/mainfunction.cxx:694
 msgid "Enter node name: "
 msgstr "¥Î¡¼¥É̾¤òÆþÎÏ: "
 
-#: src/mainfunction.c:720
+#: src/mainfunction.cxx:764
 #, c-format
 msgid "Node %s not found"
 msgstr "¥Î¡¼¥É %s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/mainfunction.c:1177 src/manual.c:1540
-msgid "Are you sure to quit?"
+#: src/mainfunction.cxx:1210 src/manual.cxx:1316
+msgid "Are you sure you want to quit?"
 msgstr "ËÜÅö¤Ë½ªÎ»¤·¤Æ¤è¤í¤·¤¤¤Ç¤¹¤«?"
 
-#: src/manual.c:312
-#, c-format
-msgid "Error: Cannot call man command.\n"
-msgstr "¥¨¥é¡¼: man¥³¥Þ¥ó¥É¤¬¸Æ¤Ó½Ð¤»¤Þ¤»¤ó¡£\n"
-
-#: src/manual.c:321
-#, c-format
-msgid "Error: No manual page found either.\n"
-msgstr "¥¨¥é¡¼: ¤É¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤â¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
-
-#: src/manual.c:324
+#: src/manual.cxx:289
 #, fuzzy, c-format
-msgid "Apropos pages:\n"
-msgstr "ŬÀڤʥڡ¼¥¸:\n"
-
-#: src/manual.c:367
-msgid "Calling gunzip for"
-msgstr "gunzip¤ò¸Æ¤Ó½Ð¤·Ãæ: "
-
-#: src/manual.c:373
-#, c-format
-msgid "Couldn't call gunzip.\n"
-msgstr "gunzip¤ò¸Æ¤Ó½Ð¤»¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
-
-#: src/manual.c:410
-msgid "IGNORING"
-msgstr "̵»ë"
-
-#: src/manual.c:453
-#, fuzzy, c-format
 msgid "Error: No manual page found\n"
 msgstr "¥¨¥é¡¼: ¤É¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤â¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: src/manual.c:458
+#: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
 msgstr ""
 
-#: src/manual.c:463
+#: src/manual.cxx:308
 #, c-format
-msgid "Nothing appropiate\n"
+msgid "Nothing appropriate\n"
 msgstr ""
 
-#: src/manual.c:984
+#: src/manual.cxx:758
 msgid "Enter manual name: "
 msgstr "¥Þ¥Ë¥å¥¢¥ë̾¤òÆþÎÏ: "
 
-#: src/manual.c:1623 src/video.c:114
+#: src/manual.cxx:1400 src/video.cxx:106
 #, c-format
 msgid "Viewing line %d/%d, %d%%"
 msgstr "¸½ºß %d/%d ¹ÔÌÜ¡¢%d%%"
 
-#: src/manual.c:1625 src/video.c:116
+#: src/manual.cxx:1402 src/video.cxx:109
 #, c-format
 msgid "Viewing line %d/%d, 100%%"
 msgstr "¸½ºß %d/%d ¹ÔÌÜ¡¢100%%"
 
-#: src/parse_config.c:113
+#: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
 msgstr ""
 
-#: src/parse_config.c:161
+#: src/parse_config.cxx:124
 #, c-format
 msgid "Parse error in config file on line %d\n"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¤Î %d ¹ÔÌܤDzòÀÏ¥¨¥é¡¼\n"
 
-#: src/utils.c:117 src/utils.c:173
+#: src/pinfo.cxx:93
 #, c-format
-msgid "Virtual memory exhausted\n"
-msgstr "²¾ÁÛ¥á¥â¥ê¤ò»È¤¤ÀڤäƤ·¤Þ¤¤¤Þ¤·¤¿\n"
-
-#: src/utils.c:227
-#, c-format
-msgid ""
-"Illegal characters in filename!\n"
-"*** %s\n"
-msgstr ""
-"¥Õ¥¡¥¤¥ë̾¤Ë°Ê²¼¤ÎÉÔÀµ¤Ê¥­¥ã¥é¥¯¥¿¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹!\n"
-"*** %s\n"
-
-#: src/utils.c:432
-msgid "yes"
-msgstr "yes"
-
-#: src/utils.c:433
-msgid "no"
-msgstr "no"
-
-#: src/video.c:61
-msgid "File:"
-msgstr "¥Õ¥¡¥¤¥ë: "
-
-#: src/video.c:62
-msgid "Node:"
-msgstr "¥Î¡¼¥É: "
-
-#: src/video.c:63
-msgid "Next:"
-msgstr "¼¡: "
-
-#: src/video.c:64
-msgid "Prev:"
-msgstr "Á°: "
-
-#: src/video.c:65
-msgid "Up:"
-msgstr "¾å: "
-
-#: src/pinfo.c:113 src/pinfo.c:197
-#, c-format
-msgid "Looking for man page...\n"
-msgstr "man¥Ú¡¼¥¸¤òõ¤·¤Æ¤¤¤Þ¤¹...\n"
-
-#: src/pinfo.c:150
-#, c-format
 msgid "--node option used without argument\n"
 msgstr "--node¥ª¥×¥·¥ç¥ó¤Ë°ú¿ô¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/pinfo.c:160
+#: src/pinfo.cxx:101
 #, fuzzy, c-format
 msgid "--rcfile option used without argument\n"
 msgstr "--node¥ª¥×¥·¥ç¥ó¤Ë°ú¿ô¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/pinfo.c:171
+#: src/pinfo.cxx:112
 #, fuzzy, c-format
 msgid ""
 "Usage:\n"
@@ -247,54 +172,125 @@
 "-x, --clear-at-exit                   ½ªÎ»»þ¤Ë²èÌ̤ò¥¯¥ê¥¢\n"
 "    --node=nodename, --node nodename  ¥Î¡¼¥Énodename¤ËľÀÜ¥¸¥ã¥ó¥×\n"
 
-#: src/pinfo.c:311
+#: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
+msgid "Looking for man page...\n"
+msgstr "man¥Ú¡¼¥¸¤òõ¤·¤Æ¤¤¤Þ¤¹...\n"
+
+#: src/pinfo.cxx:326
+#, c-format
 msgid "Error: could not open info file, trying manual\n"
 msgstr "¥¨¥é¡¼: info¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿¡£¥Þ¥Ë¥å¥¢¥ë¤Ç»î¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: src/pinfo.c:344
+#: src/pinfo.cxx:356
 #, c-format
 msgid "Warning: tag table not found...\n"
 msgstr "·Ù¹ð: ¥¿¥°¥Æ¡¼¥Ö¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿...\n"
 
-#: src/pinfo.c:348
+#: src/pinfo.cxx:360
 #, c-format
 msgid "Trying to create alternate tag table...\n"
 msgstr "Ê̤Υ¿¥°¥Æ¡¼¥Ö¥ë¤òºîÀ®¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹...\n"
 
-#: src/pinfo.c:353 src/pinfo.c:502
-#, c-format
-msgid "This doesn't look like info file...\n"
+#: src/pinfo.cxx:365
+#, fuzzy, c-format
+msgid "This doesn't look like an info file...\n"
 msgstr "¤³¤ì¤Ïinfo¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹...\n"
 
-#: src/pinfo.c:366
+#: src/pinfo.cxx:378
 #, c-format
 msgid "Specified node does not exist...\n"
 msgstr "»ØÄꤵ¤ì¤¿¥Î¡¼¥É¤Ï¸ºß¤·¤Þ¤»¤ó...\n"
 
-#: src/pinfo.c:424
+#: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£²¿¤«¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤..."
 
-#: src/pinfo.c:444
+#: src/pinfo.cxx:453
 #, c-format
 msgid "Unexpected error.\n"
 msgstr "ͽ´ü¤»¤Ì¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: src/pinfo.c:497
+#: src/pinfo.cxx:500
 msgid "Tag table not found. Trying to create alternate..."
 msgstr "¥¿¥°¥Æ¡¼¥Ö¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£Ê̤ΤòºîÀ®¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹..."
 
-#: src/pinfo.c:583
+#: src/pinfo.cxx:505
 #, c-format
+msgid "This doesn't look like info file...\n"
+msgstr "¤³¤ì¤Ïinfo¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹...\n"
+
+#: src/pinfo.cxx:564
+#, c-format
 msgid "Security warning: Unable to get GID of group called: %s\n"
 msgstr "¥»¥­¥å¥ê¥Æ¥£·Ù¹ð: °Ê²¼¤Î¥°¥ë¡¼¥×¤ÎGID¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: src/pinfo.c:603
+#: src/pinfo.cxx:584
 #, c-format
 msgid "Security warning: Unable to get UID of user called: %s\n"
 msgstr "¥»¥­¥å¥ê¥Æ¥£·Ù¹ð: °Ê²¼¤Î¥æ¡¼¥¶¤ÎUID¤ò¼èÆÀ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
+#: src/utils.cxx:112 src/utils.cxx:168
+#, c-format
+msgid "Virtual memory exhausted\n"
+msgstr "²¾ÁÛ¥á¥â¥ê¤ò»È¤¤ÀڤäƤ·¤Þ¤¤¤Þ¤·¤¿\n"
+
+#: src/utils.cxx:226
+#, c-format
+msgid ""
+"Illegal characters in filename!\n"
+"*** %s\n"
+msgstr ""
+"¥Õ¥¡¥¤¥ë̾¤Ë°Ê²¼¤ÎÉÔÀµ¤Ê¥­¥ã¥é¥¯¥¿¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹!\n"
+"*** %s\n"
+
+#: src/utils.cxx:397
+msgid "yes"
+msgstr "yes"
+
+#: src/utils.cxx:398
+msgid "no"
+msgstr "no"
+
+#: src/video.cxx:53
+msgid "File:"
+msgstr "¥Õ¥¡¥¤¥ë: "
+
+#: src/video.cxx:54
+msgid "Node:"
+msgstr "¥Î¡¼¥É: "
+
+#: src/video.cxx:55
+msgid "Next:"
+msgstr "¼¡: "
+
+#: src/video.cxx:56
+msgid "Prev:"
+msgstr "Á°: "
+
+#: src/video.cxx:57
+msgid "Up:"
+msgstr "¾å: "
+
+#~ msgid "Error: Cannot call man command.\n"
+#~ msgstr "¥¨¥é¡¼: man¥³¥Þ¥ó¥É¤¬¸Æ¤Ó½Ð¤»¤Þ¤»¤ó¡£\n"
+
+#~ msgid "Error: No manual page found either.\n"
+#~ msgstr "¥¨¥é¡¼: ¤É¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤â¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
+
+#, fuzzy
+#~ msgid "Apropos pages:\n"
+#~ msgstr "ŬÀڤʥڡ¼¥¸:\n"
+
+#~ msgid "Calling gunzip for"
+#~ msgstr "gunzip¤ò¸Æ¤Ó½Ð¤·Ãæ: "
+
+#~ msgid "Couldn't call gunzip.\n"
+#~ msgstr "gunzip¤ò¸Æ¤Ó½Ð¤»¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
+
+#~ msgid "IGNORING"
+#~ msgstr "̵»ë"
+
 #~ msgid "Warning: could not find tag table\n"
 #~ msgstr "·Ù¹ð: ¥¿¥°¥Æ¡¼¥Ö¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿\n"
 

Modified: pinfo/branches/cxx/po/nl.po
===================================================================
--- pinfo/branches/cxx/po/nl.po	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/po/nl.po	2005-09-08 11:21:17 UTC (rev 205)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pinfo 0.6.8-svn\n"
 "Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2005-09-01 21:48+0200\n"
+"POT-Creation-Date: 2005-09-08 06:47-0400\n"
 "PO-Revision-Date: 2005-09-01 21:21+0200\n"
 "Last-Translator: Bas Zoetekouw <bas at debian.org>\n"
 "Language-Team: Dutch <nl at li.org>\n"
@@ -15,196 +15,121 @@
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/filehandling_functions.c:442 src/filehandling_functions.c:449
+#: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
 #, c-format
 msgid "Searching for indirect done"
 msgstr "Indirectie zoekopdracht afgerond"
 
-#: src/filehandling_functions.c:480 src/filehandling_functions.c:486
+#: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
 #, c-format
 msgid "Warning: could not find tag table"
 msgstr "Waarschuwing: tag-tabel niet gevonden"
 
-#: src/filehandling_functions.c:513
+#: src/filehandling_functions.cxx:528
 #, c-format
 msgid "Searching for tag table done\n"
 msgstr "Zoeken naar tag-tabel afgerond\n"
 
-#: src/filehandling_functions.c:1172
+#: src/filehandling_functions.cxx:1051
 #, c-format
 msgid "Error: could not open info file\n"
 msgstr "Fout: kon de info file niet openen\n"
 
-#: src/mainfunction.c:143 src/manual.c:970
-msgid "Are you sure to print?"
+#: src/mainfunction.cxx:206 src/manual.cxx:744
+msgid "Are you sure you want to print?"
 msgstr "Weet u zeker dat u wilt printen?"
 
-#: src/mainfunction.c:195 src/manual.c:1015
+#: src/mainfunction.cxx:255 src/manual.cxx:789
 msgid "Enter line: "
 msgstr "Voer regel in: "
 
-#: src/mainfunction.c:236 src/manual.c:1062
+#: src/mainfunction.cxx:293 src/manual.cxx:836
 msgid "Enter command: "
 msgstr "Voer commando in:"
 
-#: src/mainfunction.c:255
+#: src/mainfunction.cxx:312
 msgid "Operation failed..."
 msgstr "Opdracht mislukt..."
 
-#: src/mainfunction.c:291 src/mainfunction.c:551 src/manual.c:1115
+#: src/mainfunction.cxx:346 src/mainfunction.cxx:602 src/manual.cxx:890
 msgid "Enter regexp: "
 msgstr "Voer reguliere expressie in: "
 
-#: src/mainfunction.c:521 src/mainfunction.c:615 src/manual.c:1190
+#: src/mainfunction.cxx:571 src/mainfunction.cxx:667 src/manual.cxx:964
 msgid "Search string not found..."
 msgstr "Zoekstring niet gevonden..."
 
-#: src/mainfunction.c:576 src/manual.c:1148
+#: src/mainfunction.cxx:625 src/manual.cxx:920
 msgid "Invalid regular expression;"
 msgstr "Ongeldige reguliere expressie;"
 
-#: src/mainfunction.c:578 src/manual.c:1150
+#: src/mainfunction.cxx:627 src/manual.cxx:922
 msgid "Press any key to continue..."
 msgstr "Druk een toets om door te gaan..."
 
-#: src/mainfunction.c:644
+#: src/mainfunction.cxx:694
 msgid "Enter node name: "
 msgstr "Voer node-naam in: "
 
-#: src/mainfunction.c:720
+#: src/mainfunction.cxx:764
 #, c-format
 msgid "Node %s not found"
 msgstr "Node %s niet gevonden"
 
-#: src/mainfunction.c:1177 src/manual.c:1540
-msgid "Are you sure to quit?"
+#: src/mainfunction.cxx:1210 src/manual.cxx:1316
+msgid "Are you sure you want to quit?"
 msgstr "Weet u zeker dat u het programma wilt verlaten?"
 
-#: src/manual.c:312
+#: src/manual.cxx:289
 #, c-format
-msgid "Error: Cannot call man command.\n"
-msgstr "Fout: kan het man commando niet aanroepen.\n"
-
-#: src/manual.c:321
-#, c-format
-msgid "Error: No manual page found either.\n"
-msgstr "Fout: ook geen manual pagina gevonden.\n"
-
-#: src/manual.c:324
-#, c-format
-msgid "Apropos pages:\n"
-msgstr "Verwante pagina's:\n"
-
-#: src/manual.c:367
-msgid "Calling gunzip for"
-msgstr "Aanroepen van gunzip voor"
-
-#: src/manual.c:373
-#, c-format
-msgid "Couldn't call gunzip.\n"
-msgstr "Kon gunzip niet aanroepen.\n"
-
-#: src/manual.c:410
-msgid "IGNORING"
-msgstr "WORDT GENEGEERD"
-
-#: src/manual.c:453
-#, c-format
 msgid "Error: No manual page found\n"
 msgstr "Fout: geen manual pagina gevonden\n"
 
-#: src/manual.c:458
+#: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
 msgstr "Aanroepen van apropos \n"
 
-#: src/manual.c:463
-#, c-format
-msgid "Nothing appropiate\n"
+#: src/manual.cxx:308
+#, fuzzy, c-format
+msgid "Nothing appropriate\n"
 msgstr "Niets geschikts\n"
 
-#: src/manual.c:984
+#: src/manual.cxx:758
 msgid "Enter manual name: "
 msgstr "Geef manual naam in: "
 
-#: src/manual.c:1623 src/video.c:114
+#: src/manual.cxx:1400 src/video.cxx:106
 #, c-format
 msgid "Viewing line %d/%d, %d%%"
 msgstr "Bekijken van regel %d/%d, %d%%"
 
-#: src/manual.c:1625 src/video.c:116
+#: src/manual.cxx:1402 src/video.cxx:109
 #, c-format
 msgid "Viewing line %d/%d, 100%%"
 msgstr "Bekijken van regel %d/%d, 100%%"
 
-#: src/parse_config.c:113
+#: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
 msgstr "Kan configuratiebestand niet openen!\n"
 
-#: src/parse_config.c:161
+#: src/parse_config.cxx:124
 #, c-format
 msgid "Parse error in config file on line %d\n"
 msgstr "Ontledingsfout in het configuratiebestand op regel %d\n"
 
-#: src/utils.c:117 src/utils.c:173
+#: src/pinfo.cxx:93
 #, c-format
-msgid "Virtual memory exhausted\n"
-msgstr "Vertuele geheugen is uitgeput\n"
-
-#: src/utils.c:227
-#, c-format
-msgid ""
-"Illegal characters in filename!\n"
-"*** %s\n"
-msgstr ""
-"Illegale karakters in bestandnaam!\n"
-"*** %s\n"
-
-#: src/utils.c:432
-msgid "yes"
-msgstr "ja"
-
-#: src/utils.c:433
-msgid "no"
-msgstr "nee"
-
-#: src/video.c:61
-msgid "File:"
-msgstr "Bestand:"
-
-#: src/video.c:62
-msgid "Node:"
-msgstr "Node:"
-
-#: src/video.c:63
-msgid "Next:"
-msgstr "Volgende:"
-
-#: src/video.c:64
-msgid "Prev:"
-msgstr "Vorige:"
-
-#: src/video.c:65
-msgid "Up:"
-msgstr "Omhoog:"
-
-#: src/pinfo.c:113 src/pinfo.c:197
-#, c-format
-msgid "Looking for man page...\n"
-msgstr "Opzoeken van man pagina...\n"
-
-#: src/pinfo.c:150
-#, c-format
 msgid "--node option used without argument\n"
 msgstr "--node optie gebruikt zonder argument\n"
 
-#: src/pinfo.c:160
+#: src/pinfo.cxx:101
 #, c-format
 msgid "--rcfile option used without argument\n"
 msgstr "--rcfile optie gebruikt zonder argument\n"
 
-#: src/pinfo.c:171
+#: src/pinfo.cxx:112
 #, c-format
 msgid ""
 "Usage:\n"
@@ -255,50 +180,120 @@
 "    --rcfile=file, --rcfile file      gebruik aan alternatief "
 "configuratiebestand\n"
 
-#: src/pinfo.c:311
+#: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
+msgid "Looking for man page...\n"
+msgstr "Opzoeken van man pagina...\n"
+
+#: src/pinfo.cxx:326
+#, c-format
 msgid "Error: could not open info file, trying manual\n"
 msgstr "Fout: kon info-bestand niet openen, probeer nu de man-pagina\n"
 
-#: src/pinfo.c:344
+#: src/pinfo.cxx:356
 #, c-format
 msgid "Warning: tag table not found...\n"
 msgstr "Waarschuwing: tag-tabel niet gevonden...\n"
 
-#: src/pinfo.c:348
+#: src/pinfo.cxx:360
 #, c-format
 msgid "Trying to create alternate tag table...\n"
 msgstr "Probeer een alternatieve tag-tabel aan te maken...\n"
 
-#: src/pinfo.c:353 src/pinfo.c:502
-#, c-format
-msgid "This doesn't look like info file...\n"
+#: src/pinfo.cxx:365
+#, fuzzy, c-format
+msgid "This doesn't look like an info file...\n"
 msgstr "Dit ziet er niet uit als een info bestande...\n"
 
-#: src/pinfo.c:366
+#: src/pinfo.cxx:378
 #, c-format
 msgid "Specified node does not exist...\n"
 msgstr "Aangegeven node bestata niet...\n"
 
-#: src/pinfo.c:424
+#: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
 msgstr "Bestand niet gevonden.  Druk op een toest..."
 
-#: src/pinfo.c:444
+#: src/pinfo.cxx:453
 #, c-format
 msgid "Unexpected error.\n"
 msgstr "Onverwachte fout.\n"
 
-#: src/pinfo.c:497
+#: src/pinfo.cxx:500
 msgid "Tag table not found. Trying to create alternate..."
 msgstr "Tag-tabel niet gevonden.  Probeer een alternatieve te maken..."
 
-#: src/pinfo.c:583
+#: src/pinfo.cxx:505
 #, c-format
+msgid "This doesn't look like info file...\n"
+msgstr "Dit ziet er niet uit als een info bestande...\n"
+
+#: src/pinfo.cxx:564
+#, c-format
 msgid "Security warning: Unable to get GID of group called: %s\n"
 msgstr "Beveiligingswaarschuwing: kan GID van de groep `%s' niet vinden\n"
 
-#: src/pinfo.c:603
+#: src/pinfo.cxx:584
 #, c-format
 msgid "Security warning: Unable to get UID of user called: %s\n"
 msgstr "Beveiligingswaarschuwing: kan UID van de gebruiker `%s' niet vinden\n"
+
+#: src/utils.cxx:112 src/utils.cxx:168
+#, c-format
+msgid "Virtual memory exhausted\n"
+msgstr "Vertuele geheugen is uitgeput\n"
+
+#: src/utils.cxx:226
+#, c-format
+msgid ""
+"Illegal characters in filename!\n"
+"*** %s\n"
+msgstr ""
+"Illegale karakters in bestandnaam!\n"
+"*** %s\n"
+
+#: src/utils.cxx:397
+msgid "yes"
+msgstr "ja"
+
+#: src/utils.cxx:398
+msgid "no"
+msgstr "nee"
+
+#: src/video.cxx:53
+msgid "File:"
+msgstr "Bestand:"
+
+#: src/video.cxx:54
+msgid "Node:"
+msgstr "Node:"
+
+#: src/video.cxx:55
+msgid "Next:"
+msgstr "Volgende:"
+
+#: src/video.cxx:56
+msgid "Prev:"
+msgstr "Vorige:"
+
+#: src/video.cxx:57
+msgid "Up:"
+msgstr "Omhoog:"
+
+#~ msgid "Error: Cannot call man command.\n"
+#~ msgstr "Fout: kan het man commando niet aanroepen.\n"
+
+#~ msgid "Error: No manual page found either.\n"
+#~ msgstr "Fout: ook geen manual pagina gevonden.\n"
+
+#~ msgid "Apropos pages:\n"
+#~ msgstr "Verwante pagina's:\n"
+
+#~ msgid "Calling gunzip for"
+#~ msgstr "Aanroepen van gunzip voor"
+
+#~ msgid "Couldn't call gunzip.\n"
+#~ msgstr "Kon gunzip niet aanroepen.\n"
+
+#~ msgid "IGNORING"
+#~ msgstr "WORDT GENEGEERD"

Modified: pinfo/branches/cxx/po/pinfo.pot
===================================================================
--- pinfo/branches/cxx/po/pinfo.pot	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/po/pinfo.pot	2005-09-08 11:21:17 UTC (rev 205)
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Przemek Borys  <pborys at dione.ids.pl>
+# Copyright (C) YEAR Przemek Borys  <pborys at dione.ids.pl> and Nathanael Nerode  <neroden at gcc.gnu.org>
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2005-09-01 21:48+0200\n"
+"POT-Creation-Date: 2005-09-08 06:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,194 +16,121 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/filehandling_functions.c:442 src/filehandling_functions.c:449
+#: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
 #, c-format
 msgid "Searching for indirect done"
 msgstr ""
 
-#: src/filehandling_functions.c:480 src/filehandling_functions.c:486
+#: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
 #, c-format
 msgid "Warning: could not find tag table"
 msgstr ""
 
-#: src/filehandling_functions.c:513
+#: src/filehandling_functions.cxx:528
 #, c-format
 msgid "Searching for tag table done\n"
 msgstr ""
 
-#: src/filehandling_functions.c:1172
+#: src/filehandling_functions.cxx:1051
 #, c-format
 msgid "Error: could not open info file\n"
 msgstr ""
 
-#: src/mainfunction.c:143 src/manual.c:970
-msgid "Are you sure to print?"
+#: src/mainfunction.cxx:206 src/manual.cxx:744
+msgid "Are you sure you want to print?"
 msgstr ""
 
-#: src/mainfunction.c:195 src/manual.c:1015
+#: src/mainfunction.cxx:255 src/manual.cxx:789
 msgid "Enter line: "
 msgstr ""
 
-#: src/mainfunction.c:236 src/manual.c:1062
+#: src/mainfunction.cxx:293 src/manual.cxx:836
 msgid "Enter command: "
 msgstr ""
 
-#: src/mainfunction.c:255
+#: src/mainfunction.cxx:312
 msgid "Operation failed..."
 msgstr ""
 
-#: src/mainfunction.c:291 src/mainfunction.c:551 src/manual.c:1115
+#: src/mainfunction.cxx:346 src/mainfunction.cxx:602 src/manual.cxx:890
 msgid "Enter regexp: "
 msgstr ""
 
-#: src/mainfunction.c:521 src/mainfunction.c:615 src/manual.c:1190
+#: src/mainfunction.cxx:571 src/mainfunction.cxx:667 src/manual.cxx:964
 msgid "Search string not found..."
 msgstr ""
 
-#: src/mainfunction.c:576 src/manual.c:1148
+#: src/mainfunction.cxx:625 src/manual.cxx:920
 msgid "Invalid regular expression;"
 msgstr ""
 
-#: src/mainfunction.c:578 src/manual.c:1150
+#: src/mainfunction.cxx:627 src/manual.cxx:922
 msgid "Press any key to continue..."
 msgstr ""
 
-#: src/mainfunction.c:644
+#: src/mainfunction.cxx:694
 msgid "Enter node name: "
 msgstr ""
 
-#: src/mainfunction.c:720
+#: src/mainfunction.cxx:764
 #, c-format
 msgid "Node %s not found"
 msgstr ""
 
-#: src/mainfunction.c:1177 src/manual.c:1540
-msgid "Are you sure to quit?"
+#: src/mainfunction.cxx:1210 src/manual.cxx:1316
+msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/manual.c:312
+#: src/manual.cxx:289
 #, c-format
-msgid "Error: Cannot call man command.\n"
-msgstr ""
-
-#: src/manual.c:321
-#, c-format
-msgid "Error: No manual page found either.\n"
-msgstr ""
-
-#: src/manual.c:324
-#, c-format
-msgid "Apropos pages:\n"
-msgstr ""
-
-#: src/manual.c:367
-msgid "Calling gunzip for"
-msgstr ""
-
-#: src/manual.c:373
-#, c-format
-msgid "Couldn't call gunzip.\n"
-msgstr ""
-
-#: src/manual.c:410
-msgid "IGNORING"
-msgstr ""
-
-#: src/manual.c:453
-#, c-format
 msgid "Error: No manual page found\n"
 msgstr ""
 
-#: src/manual.c:458
+#: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
 msgstr ""
 
-#: src/manual.c:463
+#: src/manual.cxx:308
 #, c-format
-msgid "Nothing appropiate\n"
+msgid "Nothing appropriate\n"
 msgstr ""
 
-#: src/manual.c:984
+#: src/manual.cxx:758
 msgid "Enter manual name: "
 msgstr ""
 
-#: src/manual.c:1623 src/video.c:114
+#: src/manual.cxx:1400 src/video.cxx:106
 #, c-format
 msgid "Viewing line %d/%d, %d%%"
 msgstr ""
 
-#: src/manual.c:1625 src/video.c:116
+#: src/manual.cxx:1402 src/video.cxx:109
 #, c-format
 msgid "Viewing line %d/%d, 100%%"
 msgstr ""
 
-#: src/parse_config.c:113
+#: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
 msgstr ""
 
-#: src/parse_config.c:161
+#: src/parse_config.cxx:124
 #, c-format
 msgid "Parse error in config file on line %d\n"
 msgstr ""
 
-#: src/utils.c:117 src/utils.c:173
+#: src/pinfo.cxx:93
 #, c-format
-msgid "Virtual memory exhausted\n"
-msgstr ""
-
-#: src/utils.c:227
-#, c-format
-msgid ""
-"Illegal characters in filename!\n"
-"*** %s\n"
-msgstr ""
-
-#: src/utils.c:432
-msgid "yes"
-msgstr ""
-
-#: src/utils.c:433
-msgid "no"
-msgstr ""
-
-#: src/video.c:61
-msgid "File:"
-msgstr ""
-
-#: src/video.c:62
-msgid "Node:"
-msgstr ""
-
-#: src/video.c:63
-msgid "Next:"
-msgstr ""
-
-#: src/video.c:64
-msgid "Prev:"
-msgstr ""
-
-#: src/video.c:65
-msgid "Up:"
-msgstr ""
-
-#: src/pinfo.c:113 src/pinfo.c:197
-#, c-format
-msgid "Looking for man page...\n"
-msgstr ""
-
-#: src/pinfo.c:150
-#, c-format
 msgid "--node option used without argument\n"
 msgstr ""
 
-#: src/pinfo.c:160
+#: src/pinfo.cxx:101
 #, c-format
 msgid "--rcfile option used without argument\n"
 msgstr ""
 
-#: src/pinfo.c:171
+#: src/pinfo.cxx:112
 #, c-format
 msgid ""
 "Usage:\n"
@@ -228,50 +155,100 @@
 "    --rcfile=file, --rcfile file      use alternate rcfile\n"
 msgstr ""
 
-#: src/pinfo.c:311
+#: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
+msgid "Looking for man page...\n"
+msgstr ""
+
+#: src/pinfo.cxx:326
+#, c-format
 msgid "Error: could not open info file, trying manual\n"
 msgstr ""
 
-#: src/pinfo.c:344
+#: src/pinfo.cxx:356
 #, c-format
 msgid "Warning: tag table not found...\n"
 msgstr ""
 
-#: src/pinfo.c:348
+#: src/pinfo.cxx:360
 #, c-format
 msgid "Trying to create alternate tag table...\n"
 msgstr ""
 
-#: src/pinfo.c:353 src/pinfo.c:502
+#: src/pinfo.cxx:365
 #, c-format
-msgid "This doesn't look like info file...\n"
+msgid "This doesn't look like an info file...\n"
 msgstr ""
 
-#: src/pinfo.c:366
+#: src/pinfo.cxx:378
 #, c-format
 msgid "Specified node does not exist...\n"
 msgstr ""
 
-#: src/pinfo.c:424
+#: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
 msgstr ""
 
-#: src/pinfo.c:444
+#: src/pinfo.cxx:453
 #, c-format
 msgid "Unexpected error.\n"
 msgstr ""
 
-#: src/pinfo.c:497
+#: src/pinfo.cxx:500
 msgid "Tag table not found. Trying to create alternate..."
 msgstr ""
 
-#: src/pinfo.c:583
+#: src/pinfo.cxx:505
 #, c-format
+msgid "This doesn't look like info file...\n"
+msgstr ""
+
+#: src/pinfo.cxx:564
+#, c-format
 msgid "Security warning: Unable to get GID of group called: %s\n"
 msgstr ""
 
-#: src/pinfo.c:603
+#: src/pinfo.cxx:584
 #, c-format
 msgid "Security warning: Unable to get UID of user called: %s\n"
 msgstr ""
+
+#: src/utils.cxx:112 src/utils.cxx:168
+#, c-format
+msgid "Virtual memory exhausted\n"
+msgstr ""
+
+#: src/utils.cxx:226
+#, c-format
+msgid ""
+"Illegal characters in filename!\n"
+"*** %s\n"
+msgstr ""
+
+#: src/utils.cxx:397
+msgid "yes"
+msgstr ""
+
+#: src/utils.cxx:398
+msgid "no"
+msgstr ""
+
+#: src/video.cxx:53
+msgid "File:"
+msgstr ""
+
+#: src/video.cxx:54
+msgid "Node:"
+msgstr ""
+
+#: src/video.cxx:55
+msgid "Next:"
+msgstr ""
+
+#: src/video.cxx:56
+msgid "Prev:"
+msgstr ""
+
+#: src/video.cxx:57
+msgid "Up:"
+msgstr ""

Modified: pinfo/branches/cxx/po/pl.po
===================================================================
--- pinfo/branches/cxx/po/pl.po	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/po/pl.po	2005-09-08 11:21:17 UTC (rev 205)
@@ -6,7 +6,7 @@
 msgstr ""
 "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-01 21:48+0200\n"
+"POT-Creation-Date: 2005-09-08 06:47-0400\n"
 "PO-Revision-Date: 2003-08-21 11:22+0200\n"
 "Last-Translator: Przemek Borys <pborys at dione.ids.pl>\n"
 "Language-Team:\n"
@@ -14,146 +14,113 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/filehandling_functions.c:442 src/filehandling_functions.c:449
+#: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
 #, c-format
 msgid "Searching for indirect done"
 msgstr "Zakoñczono poszukiwanie mapowañ niebezpo¶rednich"
 
-#: src/filehandling_functions.c:480 src/filehandling_functions.c:486
+#: 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)..."
 
-#: src/filehandling_functions.c:513
+#: src/filehandling_functions.cxx:528
 #, c-format
 msgid "Searching for tag table done\n"
 msgstr "Zakoñczono poszukiwanie tablicy mapowañ\n"
 
-#: src/filehandling_functions.c:1172
+#: 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"
 
-#: src/mainfunction.c:143 src/manual.c:970
-msgid "Are you sure to print?"
+#: src/mainfunction.cxx:206 src/manual.cxx:744
+msgid "Are you sure you want to print?"
 msgstr "Czy na pewno chcesz drukowaæ?"
 
 #
 # Go line messages
 #
-#: src/mainfunction.c:195 src/manual.c:1015
+#: src/mainfunction.cxx:255 src/manual.cxx:789
 msgid "Enter line: "
 msgstr "Podaj liniê: "
 
 #
 # Shellfeed messages
 #
-#: src/mainfunction.c:236 src/manual.c:1062
+#: src/mainfunction.cxx:293 src/manual.cxx:836
 msgid "Enter command: "
 msgstr "Podaj komendê: "
 
-#: src/mainfunction.c:255
+#: src/mainfunction.cxx:312
 msgid "Operation failed..."
 msgstr "Operacja siê nie powiod³a..."
 
 #
 # Regexp search messages
 #
-#: src/mainfunction.c:291 src/mainfunction.c:551 src/manual.c:1115
+#: src/mainfunction.cxx:346 src/mainfunction.cxx:602 src/manual.cxx:890
 msgid "Enter regexp: "
 msgstr "Podaj regexp: "
 
-#: src/mainfunction.c:521 src/mainfunction.c:615 src/manual.c:1190
+#: src/mainfunction.cxx:571 src/mainfunction.cxx:667 src/manual.cxx:964
 msgid "Search string not found..."
 msgstr "Szukany ³añcuch nie zosta³ znaleziony..."
 
-#: src/mainfunction.c:576 src/manual.c:1148
+#: src/mainfunction.cxx:625 src/manual.cxx:920
 msgid "Invalid regular expression;"
 msgstr ""
 
-#: src/mainfunction.c:578 src/manual.c:1150
+#: src/mainfunction.cxx:627 src/manual.cxx:922
 msgid "Press any key to continue..."
 msgstr ""
 
 #
 # Goto messages
 #
-#: src/mainfunction.c:644
+#: src/mainfunction.cxx:694
 msgid "Enter node name: "
 msgstr "Podaj nazwê wêz³a: "
 
 # , c-format
-#: src/mainfunction.c:720
+#: src/mainfunction.cxx:764
 #, c-format
 msgid "Node %s not found"
 msgstr "Wêze³ %s nie istnieje"
 
 # Dialogs
-#: src/mainfunction.c:1177 src/manual.c:1540
-msgid "Are you sure to quit?"
+#: src/mainfunction.cxx:1210 src/manual.cxx:1316
+msgid "Are you sure you want to quit?"
 msgstr "Czy na pewno chcesz zakoñczyæ pracê?"
 
-#: src/manual.c:312
-#, c-format
-msgid "Error: Cannot call man command.\n"
-msgstr "B³±d: Nie mogê wywo³aæ komendy man.\n"
-
 #
 # Manual messages
 #
 # loading:
-#: src/manual.c:321
-#, c-format
-msgid "Error: No manual page found either.\n"
-msgstr "B³ad: Nie ma równie¿ pasuj±cej strony podrêcznika man.\n"
-
-# apropos:
-#: src/manual.c:324
+#: src/manual.cxx:289
 #, fuzzy, c-format
-msgid "Apropos pages:\n"
-msgstr "Odpowiadaj±ce zapytaniu strony:\n"
-
-#: src/manual.c:367
-msgid "Calling gunzip for"
-msgstr "Wo³am gunzip dla"
-
-#: src/manual.c:373
-#, c-format
-msgid "Couldn't call gunzip.\n"
-msgstr "Nie mog³em wywo³aæ gunzip.\n"
-
-#: src/manual.c:410
-msgid "IGNORING"
-msgstr "IGNORUJÊ"
-
-#
-# Manual messages
-#
-# loading:
-#: src/manual.c:453
-#, fuzzy, c-format
 msgid "Error: No manual page found\n"
 msgstr "B³ad: Nie ma równie¿ pasuj±cej strony podrêcznika man.\n"
 
-#: src/manual.c:458
+#: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
 msgstr ""
 
-#: src/manual.c:463
+#: src/manual.cxx:308
 #, c-format
-msgid "Nothing appropiate\n"
+msgid "Nothing appropriate\n"
 msgstr ""
 
 #
 # Goto messages
 #
-#: src/manual.c:984
+#: src/manual.cxx:758
 #, fuzzy
 msgid "Enter manual name: "
 msgstr "Podaj nazwê wêz³a: "
 
-#: src/manual.c:1623 src/video.c:114
+#: src/manual.cxx:1400 src/video.cxx:106
 #, c-format
 msgid "Viewing line %d/%d, %d%%"
 msgstr "Przegl±danie linii %d/%d, %d%%"
@@ -161,12 +128,12 @@
 #
 # Viewer messages
 #
-#: src/manual.c:1625 src/video.c:116
+#: src/manual.cxx:1402 src/video.cxx:109
 #, c-format
 msgid "Viewing line %d/%d, 100%%"
 msgstr "Przegl±danie linii %d/%d, 100%%"
 
-#: src/parse_config.c:113
+#: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
 msgstr ""
@@ -174,74 +141,20 @@
 #
 # Messages from the config file parsing procedures:
 #
-#: src/parse_config.c:161
+#: src/parse_config.cxx:124
 #, c-format
 msgid "Parse error in config file on line %d\n"
 msgstr "B³±d sk³adni w linii %d pliku konfiguracyjnego\n"
 
 #
-# Out of memory message
-#
-#: src/utils.c:117 src/utils.c:173
-#, c-format
-msgid "Virtual memory exhausted\n"
-msgstr "Brak pamiêci\n"
-
-#
-# Message for procedure, which checks the command line filename
-#
-# , c-format
-#: src/utils.c:227
-#, c-format
-msgid ""
-"Illegal characters in filename!\n"
-"*** %s\n"
-msgstr ""
-"W nazwie pliku znajduj± siê niedozwolone znaki!\n"
-"*** %s\n"
-
-#: src/utils.c:432
-msgid "yes"
-msgstr "tak"
-
-#: src/utils.c:433
-msgid "no"
-msgstr "nie"
-
-#: src/video.c:61
-msgid "File:"
-msgstr "Plik:"
-
-#: src/video.c:62
-msgid "Node:"
-msgstr "Wêze³:"
-
-#: src/video.c:63
-msgid "Next:"
-msgstr "Nastêpny:"
-
-#: src/video.c:64
-msgid "Prev:"
-msgstr "Poprzedni:"
-
-#: src/video.c:65
-msgid "Up:"
-msgstr "Góra:"
-
-#: src/pinfo.c:113 src/pinfo.c:197
-#, c-format
-msgid "Looking for man page...\n"
-msgstr "Szukam strony podrêcznika man...\n"
-
-#
 # error messages when loading
 #
-#: src/pinfo.c:150
+#: src/pinfo.cxx:93
 #, c-format
 msgid "--node option used without argument\n"
 msgstr "opcja --node bez argumentu\n"
 
-#: src/pinfo.c:160
+#: src/pinfo.cxx:101
 #, c-format
 msgid "--rcfile option used without argument\n"
 msgstr "opcja --rcfile bez argumentu\n"
@@ -250,7 +163,7 @@
 # help message
 #
 # , c-format
-#: src/pinfo.c:171
+#: src/pinfo.cxx:112
 #, c-format
 msgid ""
 "Usage:\n"
@@ -299,54 +212,137 @@
 "    --node=Wêze³, --node Wêze³        Przejd¼ do wêz³a Wêze³ strony info\n"
 "    --rcfile=plik, --rcfile plik      U¿yj alternatywnego pliku rc\n"
 
-#: src/pinfo.c:311
+#: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
+msgid "Looking for man page...\n"
+msgstr "Szukam strony podrêcznika man...\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"
 
-#: src/pinfo.c:344
+#: src/pinfo.cxx:356
 #, c-format
 msgid "Warning: tag table not found...\n"
 msgstr "Ostrze¿enie: nie znalaz³em tablicy mapowañ (tag table)...\n"
 
-#: src/pinfo.c:348
+#: src/pinfo.cxx:360
 #, c-format
 msgid "Trying to create alternate tag table...\n"
 msgstr "Próbujê utworzyæ alternatywn± tablicê mapowañ...\n"
 
-#: src/pinfo.c:353 src/pinfo.c:502
-#, c-format
-msgid "This doesn't look like info file...\n"
+#: src/pinfo.cxx:365
+#, fuzzy, c-format
+msgid "This doesn't look like an info file...\n"
 msgstr "Nie wygl±da mi to na plik info...\n"
 
-#: src/pinfo.c:366
+#: src/pinfo.cxx:378
 #, c-format
 msgid "Specified node does not exist...\n"
 msgstr "Podany wêze³ nie istnieje...\n"
 
-#: src/pinfo.c:424
+#: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
 msgstr "Nie znalaz³em pliku. Naci¶nij dowolny klawisz..."
 
-#: src/pinfo.c:444
+#: src/pinfo.cxx:453
 #, c-format
 msgid "Unexpected error.\n"
 msgstr "Nieoczekiwany b³±d.\n"
 
-#: src/pinfo.c:497
+#: src/pinfo.cxx:500
 msgid "Tag table not found. Trying to create alternate..."
 msgstr "Nie znalaz³em tablicy mapowañ. Próbujê j± odgadn±æ..."
 
-#: src/pinfo.c:583
+#: 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"
+
+#: 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"
 
-#: src/pinfo.c:603
+#: 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"
 
+#
+# Out of memory message
+#
+#: src/utils.cxx:112 src/utils.cxx:168
+#, c-format
+msgid "Virtual memory exhausted\n"
+msgstr "Brak pamiêci\n"
+
+#
+# Message for procedure, which checks the command line filename
+#
+# , c-format
+#: src/utils.cxx:226
+#, c-format
+msgid ""
+"Illegal characters in filename!\n"
+"*** %s\n"
+msgstr ""
+"W nazwie pliku znajduj± siê niedozwolone znaki!\n"
+"*** %s\n"
+
+#: src/utils.cxx:397
+msgid "yes"
+msgstr "tak"
+
+#: src/utils.cxx:398
+msgid "no"
+msgstr "nie"
+
+#: src/video.cxx:53
+msgid "File:"
+msgstr "Plik:"
+
+#: src/video.cxx:54
+msgid "Node:"
+msgstr "Wêze³:"
+
+#: src/video.cxx:55
+msgid "Next:"
+msgstr "Nastêpny:"
+
+#: src/video.cxx:56
+msgid "Prev:"
+msgstr "Poprzedni:"
+
+#: src/video.cxx:57
+msgid "Up:"
+msgstr "Góra:"
+
+#~ msgid "Error: Cannot call man command.\n"
+#~ msgstr "B³±d: Nie mogê wywo³aæ komendy man.\n"
+
+#
+# Manual messages
+#
+# loading:
+#~ msgid "Error: No manual page found either.\n"
+#~ 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"
+
+#~ msgid "Calling gunzip for"
+#~ msgstr "Wo³am gunzip dla"
+
+#~ msgid "Couldn't call gunzip.\n"
+#~ msgstr "Nie mog³em wywo³aæ gunzip.\n"
+
+#~ msgid "IGNORING"
+#~ msgstr "IGNORUJÊ"
+
 #~ msgid "Warning: could not find tag table\n"
 #~ msgstr "Ostrze¿enie: Nie znalaz³em tablicy mapowañ (tag table)...\n"
 

Modified: pinfo/branches/cxx/po/ru.po
===================================================================
--- pinfo/branches/cxx/po/ru.po	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/po/ru.po	2005-09-08 11:21:17 UTC (rev 205)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: 0.5.3\n"
 "Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2005-09-01 21:48+0200\n"
+"POT-Creation-Date: 2005-09-08 06:47-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"
@@ -14,196 +14,121 @@
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/filehandling_functions.c:442 src/filehandling_functions.c:449
+#: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
 #, c-format
 msgid "Searching for indirect done"
 msgstr ""
 
-#: src/filehandling_functions.c:480 src/filehandling_functions.c:486
+#: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
 #, c-format
 msgid "Warning: could not find tag table"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÔÁÂÌÉÞÎÙÊ ÔÜÇ"
 
-#: src/filehandling_functions.c:513
+#: src/filehandling_functions.cxx:528
 #, c-format
 msgid "Searching for tag table done\n"
 msgstr "ðÏÉÓË ÔÁÂÌÉÞÎÏÇÏ ÔÜÇÁ ÚÁ×ÅÒÛÅÎ\n"
 
-#: src/filehandling_functions.c:1172
+#: src/filehandling_functions.cxx:1051
 #, c-format
 msgid "Error: could not open info file\n"
 msgstr "ïÛÉÂËÁ: ÎÅ ÍÏÇÕ ÎÁÊÔÉ info ÆÁÊÌ\n"
 
-#: src/mainfunction.c:143 src/manual.c:970
-msgid "Are you sure to print?"
+#: src/mainfunction.cxx:206 src/manual.cxx:744
+msgid "Are you sure you want to print?"
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÖÅÌÁÅÔÅ ÎÁÐÅÞÁÔÁÔØ"
 
-#: src/mainfunction.c:195 src/manual.c:1015
+#: src/mainfunction.cxx:255 src/manual.cxx:789
 msgid "Enter line: "
 msgstr "÷×ÅÄÉÔÅ ÓÔÒÏËÕ: "
 
-#: src/mainfunction.c:236 src/manual.c:1062
+#: src/mainfunction.cxx:293 src/manual.cxx:836
 msgid "Enter command: "
 msgstr "÷×ÅÄÉÔÅ ËÏÍÁÎÄÕ: "
 
-#: src/mainfunction.c:255
+#: src/mainfunction.cxx:312
 msgid "Operation failed..."
 msgstr "äÅÊÓÔ×ÉÅ ÎÅ ÕÄÁÌÏÓØ..."
 
-#: src/mainfunction.c:291 src/mainfunction.c:551 src/manual.c:1115
+#: src/mainfunction.cxx:346 src/mainfunction.cxx:602 src/manual.cxx:890
 msgid "Enter regexp: "
 msgstr "÷×ÅÄÉÔÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ: "
 
-#: src/mainfunction.c:521 src/mainfunction.c:615 src/manual.c:1190
+#: src/mainfunction.cxx:571 src/mainfunction.cxx:667 src/manual.cxx:964
 msgid "Search string not found..."
 msgstr "óÔÒÏËÁ ÎÅ ÎÁÊÄÅÎÁ..."
 
-#: src/mainfunction.c:576 src/manual.c:1148
+#: src/mainfunction.cxx:625 src/manual.cxx:920
 msgid "Invalid regular expression;"
 msgstr ""
 
-#: src/mainfunction.c:578 src/manual.c:1150
+#: src/mainfunction.cxx:627 src/manual.cxx:922
 msgid "Press any key to continue..."
 msgstr ""
 
-#: src/mainfunction.c:644
+#: src/mainfunction.cxx:694
 msgid "Enter node name: "
 msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÎÏÄÙ: "
 
-#: src/mainfunction.c:720
+#: src/mainfunction.cxx:764
 #, c-format
 msgid "Node %s not found"
 msgstr "õÚÅÌ %s ÎÅ ÎÁÊÄÅÎ"
 
-#: src/mainfunction.c:1177 src/manual.c:1540
-msgid "Are you sure to quit?"
+#: src/mainfunction.cxx:1210 src/manual.cxx:1316
+msgid "Are you sure you want to quit?"
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÖÅÌÁÅÔÅ ×ÙÊÔÉ?"
 
-#: src/manual.c:312
+#: src/manual.cxx:289
 #, c-format
-msgid "Error: Cannot call man command.\n"
-msgstr "ïÛÉÂËÁ: îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ man\n"
-
-#: src/manual.c:321
-#, c-format
-msgid "Error: No manual page found either.\n"
-msgstr "ïÛÉÂËÁ: Man ÓÔÒÁÎÉÃÁ ÎÅ ÎÁÊÄÅÎÁ ÔÁËÖÅ.\n"
-
-#: src/manual.c:324
-#, fuzzy, c-format
-msgid "Apropos pages:\n"
-msgstr "ðÏÄÈÏÄÑÝÉÅ ÓÔÒÁÎÉÃÙ:\n"
-
-#: src/manual.c:367
-msgid "Calling gunzip for"
-msgstr "úÁÐÕÓË gunzip ÄÌÑ"
-
-#: src/manual.c:373
-#, c-format
-msgid "Couldn't call gunzip.\n"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ gunzip \n"
-
-#: src/manual.c:410
-msgid "IGNORING"
-msgstr ""
-
-#: src/manual.c:453
-#, c-format
 msgid "Error: No manual page found\n"
 msgstr "ïÛÉÂËÁ: ÓÔÒÁÎÉÃÁ ÒÕËÏ×ÏÄÓÔ×Á ÎÅ ÎÁÊÄÅÎÁ.\n"
 
-#: src/manual.c:458
+#: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
 msgstr ""
 
-#: src/manual.c:463
+#: src/manual.cxx:308
 #, fuzzy, c-format
-msgid "Nothing appropiate\n"
+msgid "Nothing appropriate\n"
 msgstr "îÉÞÅÇÏ ÐÏÄÈÏÄÑÝÅÇÏ\n"
 
-#: src/manual.c:984
+#: src/manual.cxx:758
 msgid "Enter manual name: "
 msgstr "÷×ÅÄÉÔÅ ÎÁÚ×ÁÎÉÅ ÒÕËÏ×ÏÄÓÔ×Á: "
 
-#: src/manual.c:1623 src/video.c:114
+#: src/manual.cxx:1400 src/video.cxx:106
 #, c-format
 msgid "Viewing line %d/%d, %d%%"
 msgstr "ðÒÏÓÍÁÔÒÉ×ÁÀ ÓÔÒÏÞËÕ %d/%d, %d%%"
 
-#: src/manual.c:1625 src/video.c:116
+#: src/manual.cxx:1402 src/video.cxx:109
 #, c-format
 msgid "Viewing line %d/%d, 100%%"
 msgstr "ðÒÏÓÍÁÔÒÉ×ÁÀ ÓÔÒÏÞËÕ %d/%d, 100%%"
 
-#: src/parse_config.c:113
+#: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
 msgstr ""
 
-#: src/parse_config.c:161
+#: src/parse_config.cxx:124
 #, c-format
 msgid "Parse error in config file on line %d\n"
 msgstr "óÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ × ÓÔÒÏËÅ %d\n"
 
-#: src/utils.c:117 src/utils.c:173
+#: src/pinfo.cxx:93
 #, c-format
-msgid "Virtual memory exhausted\n"
-msgstr "úÁËÏÎÞÉÌÁÓØ ×ÉÒÔÕÁÌØÎÁÑ ÐÁÍÑÔØ\n"
-
-#: src/utils.c:227
-#, c-format
-msgid ""
-"Illegal characters in filename!\n"
-"*** %s\n"
-msgstr ""
-"ÎÅ×ÅÒÎÙÅ ÓÉÍ×ÏÌÙ × ÉÍÅÎÉ ÆÁÊÌÁ!\n"
-"*** %s\n"
-
-#: src/utils.c:432
-msgid "yes"
-msgstr ""
-
-#: src/utils.c:433
-msgid "no"
-msgstr ""
-
-#: src/video.c:61
-msgid "File:"
-msgstr "æÁÊÌ:"
-
-#: src/video.c:62
-msgid "Node:"
-msgstr "õÚÅÌ:"
-
-#: src/video.c:63
-msgid "Next:"
-msgstr "óÌÅÄ.:"
-
-#: src/video.c:64
-msgid "Prev:"
-msgstr "ðÒÅÄ.:"
-
-#: src/video.c:65
-msgid "Up:"
-msgstr "÷×ÅÒÈ:"
-
-#: src/pinfo.c:113 src/pinfo.c:197
-#, c-format
-msgid "Looking for man page...\n"
-msgstr "éÝÕ man ÓÔÒÁÎÉÃÕ...\n"
-
-#: src/pinfo.c:150
-#, c-format
 msgid "--node option used without argument\n"
 msgstr "ÐÁÒÁÍÅÔÒ --node ÉÓÐÏÌØÚÕÅÔÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: src/pinfo.c:160
+#: src/pinfo.cxx:101
 #, fuzzy, c-format
 msgid "--rcfile option used without argument\n"
 msgstr "ÏÐÃÉÑ --node ÉÓÐÏÌØÚÕÅÔÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: src/pinfo.c:171
+#: src/pinfo.cxx:112
 #, c-format
 msgid ""
 "Usage:\n"
@@ -228,53 +153,121 @@
 "    --rcfile=file, --rcfile file      use alternate rcfile\n"
 msgstr ""
 
-#: src/pinfo.c:311
+#: src/pinfo.cxx:138 src/pinfo.cxx:242
 #, c-format
+msgid "Looking for man page...\n"
+msgstr "éÝÕ man ÓÔÒÁÎÉÃÕ...\n"
+
+#: src/pinfo.cxx:326
+#, c-format
 msgid "Error: could not open info file, trying manual\n"
 msgstr "ïÛÉÂËÁ: ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ info ÆÁÊÌ, ÐÙÔÁÀÓØ ÏÔËÒÙÔØ man\n"
 
-#: src/pinfo.c:344
+#: src/pinfo.cxx:356
 #, c-format
 msgid "Warning: tag table not found...\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÔÁÂÌÉÞÎÙÊ ÔÜÇ ÎÅ ÎÁÊÄÅÎ...\n"
 
-#: src/pinfo.c:348
+#: src/pinfo.cxx:360
 #, c-format
 msgid "Trying to create alternate tag table...\n"
 msgstr "ðÙÔÁÀÓØ ÓÏÚÄÁÔØ ÄÒÕÇÏÊ ÔÁÂÌÉÞÎÙÊ ÔÜÇ...\n"
 
-#: src/pinfo.c:353 src/pinfo.c:502
-#, c-format
-msgid "This doesn't look like info file...\n"
+#: src/pinfo.cxx:365
+#, fuzzy, c-format
+msgid "This doesn't look like an info file...\n"
 msgstr "îÅÐÏÈÏÖ ÎÁ info ÆÁÊÌ...\n"
 
-#: src/pinfo.c:366
+#: src/pinfo.cxx:378
 #, c-format
 msgid "Specified node does not exist...\n"
 msgstr "õËÁÚÁÎÎÙÊ ÕÚÅÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ...\n"
 
-#: src/pinfo.c:424
+#: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
 msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ. îÁÖÍÉÔÅ ÌÀÂÕÀ ËÌÁ×ÉÛÕ..."
 
-#: src/pinfo.c:444
+#: src/pinfo.cxx:453
 #, c-format
 msgid "Unexpected error.\n"
 msgstr "îÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ.\n"
 
-#: src/pinfo.c:497
+#: src/pinfo.cxx:500
 msgid "Tag table not found. Trying to create alternate..."
 msgstr "ôÁÂÌÉÞÎÙÊ ÔÜÇ ÎÅ ÎÁÊÄÅÎ. ðÙÔÁÀÓØ ÓÏÚÄÁÔØ ÄÒÕÇÏÊ..."
 
-#: src/pinfo.c:583
+#: src/pinfo.cxx:505
 #, c-format
+msgid "This doesn't look like info file...\n"
+msgstr "îÅÐÏÈÏÖ ÎÁ info ÆÁÊÌ...\n"
+
+#: src/pinfo.cxx:564
+#, c-format
 msgid "Security warning: Unable to get GID of group called: %s\n"
 msgstr ""
 
-#: src/pinfo.c:603
+#: src/pinfo.cxx:584
 #, c-format
 msgid "Security warning: Unable to get UID of user called: %s\n"
 msgstr ""
 
+#: src/utils.cxx:112 src/utils.cxx:168
+#, c-format
+msgid "Virtual memory exhausted\n"
+msgstr "úÁËÏÎÞÉÌÁÓØ ×ÉÒÔÕÁÌØÎÁÑ ÐÁÍÑÔØ\n"
+
+#: src/utils.cxx:226
+#, c-format
+msgid ""
+"Illegal characters in filename!\n"
+"*** %s\n"
+msgstr ""
+"ÎÅ×ÅÒÎÙÅ ÓÉÍ×ÏÌÙ × ÉÍÅÎÉ ÆÁÊÌÁ!\n"
+"*** %s\n"
+
+#: src/utils.cxx:397
+msgid "yes"
+msgstr ""
+
+#: src/utils.cxx:398
+msgid "no"
+msgstr ""
+
+#: src/video.cxx:53
+msgid "File:"
+msgstr "æÁÊÌ:"
+
+#: src/video.cxx:54
+msgid "Node:"
+msgstr "õÚÅÌ:"
+
+#: src/video.cxx:55
+msgid "Next:"
+msgstr "óÌÅÄ.:"
+
+#: src/video.cxx:56
+msgid "Prev:"
+msgstr "ðÒÅÄ.:"
+
+#: src/video.cxx:57
+msgid "Up:"
+msgstr "÷×ÅÒÈ:"
+
+#~ msgid "Error: Cannot call man command.\n"
+#~ msgstr "ïÛÉÂËÁ: îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ man\n"
+
+#~ msgid "Error: No manual page found either.\n"
+#~ msgstr "ïÛÉÂËÁ: Man ÓÔÒÁÎÉÃÁ ÎÅ ÎÁÊÄÅÎÁ ÔÁËÖÅ.\n"
+
+#, fuzzy
+#~ msgid "Apropos pages:\n"
+#~ msgstr "ðÏÄÈÏÄÑÝÉÅ ÓÔÒÁÎÉÃÙ:\n"
+
+#~ msgid "Calling gunzip for"
+#~ msgstr "úÁÐÕÓË gunzip ÄÌÑ"
+
+#~ msgid "Couldn't call gunzip.\n"
+#~ msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ gunzip \n"
+
 #~ msgid "Warning: could not find tag table\n"
 #~ msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÔÁÂÌÉÞÎÙÊ ÔÜÇ\n"

Modified: pinfo/branches/cxx/po/sv.po
===================================================================
--- pinfo/branches/cxx/po/sv.po	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/po/sv.po	2005-09-08 11:21:17 UTC (rev 205)
@@ -6,7 +6,7 @@
 msgstr ""
 "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-01 21:48+0200\n"
+"POT-Creation-Date: 2005-09-08 06:47-0400\n"
 "PO-Revision-Date: 2003-08-21 11:22+0200\n"
 "Last-Translator:\n"
 "Language-Team: \n"
@@ -14,34 +14,34 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/filehandling_functions.c:442 src/filehandling_functions.c:449
+#: src/filehandling_functions.cxx:466 src/filehandling_functions.cxx:471
 #, c-format
 msgid "Searching for indirect done"
 msgstr "Sökning efter indirekt klar"
 
-#: src/filehandling_functions.c:480 src/filehandling_functions.c:486
+#: src/filehandling_functions.cxx:502 src/filehandling_functions.cxx:507
 #, c-format
 msgid "Warning: could not find tag table"
 msgstr "Varning: kunde inte finna tag table"
 
-#: src/filehandling_functions.c:513
+#: src/filehandling_functions.cxx:528
 #, c-format
 msgid "Searching for tag table done\n"
 msgstr "Sökning efter tag table klar\n"
 
-#: src/filehandling_functions.c:1172
+#: src/filehandling_functions.cxx:1051
 #, c-format
 msgid "Error: could not open info file\n"
 msgstr "Fel: kunde inte öppna info-fil\n"
 
-#: src/mainfunction.c:143 src/manual.c:970
-msgid "Are you sure to print?"
+#: src/mainfunction.cxx:206 src/manual.cxx:744
+msgid "Are you sure you want to print?"
 msgstr ""
 
 #
 # Regexp search messages
 #
-#: src/mainfunction.c:195 src/manual.c:1015
+#: src/mainfunction.cxx:255 src/manual.cxx:789
 #, fuzzy
 msgid "Enter line: "
 msgstr "Skriv regexp: "
@@ -49,112 +49,79 @@
 #
 # Shellfeed messages
 #
-#: src/mainfunction.c:236 src/manual.c:1062
+#: src/mainfunction.cxx:293 src/manual.cxx:836
 msgid "Enter command: "
 msgstr "Skriv kommando: "
 
-#: src/mainfunction.c:255
+#: src/mainfunction.cxx:312
 msgid "Operation failed..."
 msgstr "Operationen misslyckades..."
 
 #
 # Regexp search messages
 #
-#: src/mainfunction.c:291 src/mainfunction.c:551 src/manual.c:1115
+#: src/mainfunction.cxx:346 src/mainfunction.cxx:602 src/manual.cxx:890
 msgid "Enter regexp: "
 msgstr "Skriv regexp: "
 
-#: src/mainfunction.c:521 src/mainfunction.c:615 src/manual.c:1190
+#: src/mainfunction.cxx:571 src/mainfunction.cxx:667 src/manual.cxx:964
 #, fuzzy
 msgid "Search string not found..."
 msgstr "Varning: tag-table inte funnen...\n"
 
-#: src/mainfunction.c:576 src/manual.c:1148
+#: src/mainfunction.cxx:625 src/manual.cxx:920
 msgid "Invalid regular expression;"
 msgstr ""
 
-#: src/mainfunction.c:578 src/manual.c:1150
+#: src/mainfunction.cxx:627 src/manual.cxx:922
 msgid "Press any key to continue..."
 msgstr ""
 
 #
 # Goto messages
 #
-#: src/mainfunction.c:644
+#: src/mainfunction.cxx:694
 msgid "Enter node name: "
 msgstr "Skriv nod-namn: "
 
 # , c-format
-#: src/mainfunction.c:720
+#: src/mainfunction.cxx:764
 #, c-format
 msgid "Node %s not found"
 msgstr "Kunde inte hitta nod %s"
 
-#: src/mainfunction.c:1177 src/manual.c:1540
-msgid "Are you sure to quit?"
+#: src/mainfunction.cxx:1210 src/manual.cxx:1316
+msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/manual.c:312
-#, c-format
-msgid "Error: Cannot call man command.\n"
-msgstr ""
-
 #
 # Manual messages
 #
 # loading:
-#: src/manual.c:321
-#, c-format
-msgid "Error: No manual page found either.\n"
-msgstr "Fel: Hittade ingen manual-sida heller.\n"
-
-# apropos:
-#: src/manual.c:324
+#: src/manual.cxx:289
 #, fuzzy, c-format
-msgid "Apropos pages:\n"
-msgstr "Lämpliga sidor:\n"
-
-#: src/manual.c:367
-msgid "Calling gunzip for"
-msgstr ""
-
-#: src/manual.c:373
-#, c-format
-msgid "Couldn't call gunzip.\n"
-msgstr ""
-
-#: src/manual.c:410
-msgid "IGNORING"
-msgstr ""
-
-#
-# Manual messages
-#
-# loading:
-#: src/manual.c:453
-#, fuzzy, c-format
 msgid "Error: No manual page found\n"
 msgstr "Fel: Hittade ingen manual-sida heller.\n"
 
-#: src/manual.c:458
+#: src/manual.cxx:300
 #, c-format
 msgid "Calling apropos \n"
 msgstr ""
 
-#: src/manual.c:463
+#: src/manual.cxx:308
 #, c-format
-msgid "Nothing appropiate\n"
+msgid "Nothing appropriate\n"
 msgstr ""
 
 #
 # Goto messages
 #
-#: src/manual.c:984
+#: src/manual.cxx:758
 #, fuzzy
 msgid "Enter manual name: "
 msgstr "Skriv nod-namn: "
 
-#: src/manual.c:1623 src/video.c:114
+#: src/manual.cxx:1400 src/video.cxx:106
 #, c-format
 msgid "Viewing line %d/%d, %d%%"
 msgstr "Aktuell rad %d/%d, %d%%"
@@ -162,12 +129,12 @@
 #
 # Viewer messages
 #
-#: src/manual.c:1625 src/video.c:116
+#: src/manual.cxx:1402 src/video.cxx:109
 #, c-format
 msgid "Viewing line %d/%d, 100%%"
 msgstr "Aktuell rad %d/%d, 100%%"
 
-#: src/parse_config.c:113
+#: src/parse_config.cxx:86
 #, c-format
 msgid "Can't open config file!\n"
 msgstr ""
@@ -175,79 +142,22 @@
 #
 # Messages from the config file parsing procedures:
 #
-#: src/parse_config.c:161
+#: src/parse_config.cxx:124
 #, c-format
 msgid "Parse error in config file on line %d\n"
 msgstr "Syntax-fel i konfigureringsfil på rad %d\n"
 
-#
-# Out of memory message
-#
-#: src/utils.c:117 src/utils.c:173
+#: src/pinfo.cxx:93
 #, c-format
-msgid "Virtual memory exhausted\n"
-msgstr "Slut på virtuellt minne\n"
-
-#
-# Message for procedure, which checks the command line filename
-#
-# , c-format
-#: src/utils.c:227
-#, c-format
-msgid ""
-"Illegal characters in filename!\n"
-"*** %s\n"
-msgstr ""
-"Otillåtna tecken i filnamnet!\n"
-"*** %s\n"
-
-#: src/utils.c:432
-msgid "yes"
-msgstr "ja"
-
-#: src/utils.c:433
-msgid "no"
-msgstr "nej"
-
-#: src/video.c:61
-msgid "File:"
-msgstr "Fil:"
-
-#: src/video.c:62
-msgid "Node:"
-msgstr "Nod:"
-
-#: src/video.c:63
-msgid "Next:"
-msgstr "Nästa:"
-
-#: src/video.c:64
-msgid "Prev:"
-msgstr "Föregående:"
-
-#: src/video.c:65
-msgid "Up:"
-msgstr "Upp:"
-
-#
-# error messages when loading
-#
-#: src/pinfo.c:113 src/pinfo.c:197
-#, c-format
-msgid "Looking for man page...\n"
-msgstr "Letar efter man-sida...\n"
-
-#: src/pinfo.c:150
-#, c-format
 msgid "--node option used without argument\n"
 msgstr "Alternativ --node använt utan argument\n"
 
-#: src/pinfo.c:160
+#: src/pinfo.cxx:101
 #, fuzzy, c-format
 msgid "--rcfile option used without argument\n"
 msgstr "Alternativ --node använt utan argument\n"
 
-#: src/pinfo.c:171
+#: src/pinfo.cxx:112
 #, c-format
 msgid ""
 "Usage:\n"
@@ -272,54 +182,128 @@
 "    --rcfile=file, --rcfile file      use alternate rcfile\n"
 msgstr ""
 
-#: src/pinfo.c:311
+#
+# 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"
+
+#: src/pinfo.cxx:326
+#, 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"
 
-#: src/pinfo.c:344
+#: src/pinfo.cxx:356
 #, c-format
 msgid "Warning: tag table not found...\n"
 msgstr "Varning: tag-table inte funnen...\n"
 
-#: src/pinfo.c:348
+#: src/pinfo.cxx:360
 #, c-format
 msgid "Trying to create alternate tag table...\n"
 msgstr "Försöker skapa alternativ tag-table...\n"
 
-#: src/pinfo.c:353 src/pinfo.c:502
-#, c-format
-msgid "This doesn't look like info file...\n"
+#: src/pinfo.cxx:365
+#, fuzzy, c-format
+msgid "This doesn't look like an info file...\n"
 msgstr "Det här ser inte ut som en info-fil...\n"
 
-#: src/pinfo.c:366
+#: src/pinfo.cxx:378
 #, c-format
 msgid "Specified node does not exist...\n"
 msgstr "Angiven nod existerar inte...\n"
 
-#: src/pinfo.c:424
+#: src/pinfo.cxx:435
 msgid "File not found. Press any key..."
 msgstr "Filen finns inte.  Tryck en tangent..."
 
-#: src/pinfo.c:444
+#: src/pinfo.cxx:453
 #, c-format
 msgid "Unexpected error.\n"
 msgstr "Oväntat fel.\n"
 
-#: src/pinfo.c:497
+#: src/pinfo.cxx:500
 msgid "Tag table not found. Trying to create alternate..."
 msgstr "Tag-table inte funnen.  Försöker skapa alternativ..."
 
-#: src/pinfo.c:583
+#: 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"
+
+#: src/pinfo.cxx:564
+#, c-format
 msgid "Security warning: Unable to get GID of group called: %s\n"
 msgstr ""
 
-#: src/pinfo.c:603
+#: src/pinfo.cxx:584
 #, c-format
 msgid "Security warning: Unable to get UID of user called: %s\n"
 msgstr ""
 
+#
+# Out of memory message
+#
+#: src/utils.cxx:112 src/utils.cxx:168
+#, c-format
+msgid "Virtual memory exhausted\n"
+msgstr "Slut på virtuellt minne\n"
+
+#
+# Message for procedure, which checks the command line filename
+#
+# , c-format
+#: src/utils.cxx:226
+#, c-format
+msgid ""
+"Illegal characters in filename!\n"
+"*** %s\n"
+msgstr ""
+"Otillåtna tecken i filnamnet!\n"
+"*** %s\n"
+
+#: src/utils.cxx:397
+msgid "yes"
+msgstr "ja"
+
+#: src/utils.cxx:398
+msgid "no"
+msgstr "nej"
+
+#: src/video.cxx:53
+msgid "File:"
+msgstr "Fil:"
+
+#: src/video.cxx:54
+msgid "Node:"
+msgstr "Nod:"
+
+#: src/video.cxx:55
+msgid "Next:"
+msgstr "Nästa:"
+
+#: src/video.cxx:56
+msgid "Prev:"
+msgstr "Föregående:"
+
+#: src/video.cxx:57
+msgid "Up:"
+msgstr "Upp:"
+
+#
+# Manual messages
+#
+# loading:
+#~ msgid "Error: No manual page found either.\n"
+#~ msgstr "Fel: Hittade ingen manual-sida heller.\n"
+
+# apropos:
+#, fuzzy
+#~ 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"
 

Modified: pinfo/branches/cxx/src/mainfunction.cxx
===================================================================
--- pinfo/branches/cxx/src/mainfunction.cxx	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/src/mainfunction.cxx	2005-09-08 11:21:17 UTC (rev 205)
@@ -583,6 +583,7 @@
 					rval.node = tag_table[return_value].nodename;
 					rval.file = "";
 					rval.keep_going = true;
+					/* NOTE: This is the only case where aftersearch is not reset */
 					return rval;
 				}
 			}			/* end: if key_totalsearch */
@@ -1206,7 +1207,7 @@
 				break;
 			else
 			{
-				if (yesno(_("Are you sure to quit?"), QuitConfirmDefault))
+				if (yesno(_("Are you sure you want to quit?"), QuitConfirmDefault))
 					break;
 			}
 		}

Modified: pinfo/branches/cxx/src/manual.cxx
===================================================================
--- pinfo/branches/cxx/src/manual.cxx	2005-09-08 09:13:25 UTC (rev 204)
+++ pinfo/branches/cxx/src/manual.cxx	2005-09-08 11:21:17 UTC (rev 205)
@@ -741,7 +741,7 @@
 			if ((key == keys.print_1) ||
 					(key == keys.print_2))
 			{
-				if (yesno(_("Are you sure to print?"), 0))
+				if (yesno(_("Are you sure you want to print?"), 0))
 					printmanual(manual);
 			}
 			/*====================================================*/
@@ -1313,7 +1313,7 @@
 				break;
 			else
 			{
-				if (yesno(_("Are you sure to quit?"), QuitConfirmDefault))
+				if (yesno(_("Are you sure you want to quit?"), QuitConfirmDefault))
 					break;
 			}
 		}




More information about the Pinfo-devel mailing list