* libdb/db_lookup.c (split_data): Use ngettext to translate strings

  containing plural forms (Savannah bug #34968).
* src/lexgrog.l (too_big): Likewise.
* src/mandb.c (main): Likewise.
* po/man-db.pot, po/*.po: Update.

1 files changed, 141 insertions, 125 deletions

diff --git a/po/man-db.pot b/po/man-db.pot
index 59af9fef..4f1175b3 100644
--- a/po/man-db.pot
+++ b/po/man-db.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.6.0.2\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2011-04-13 11:03+0100\n"
+"POT-Creation-Date: 2012-02-04 23:12+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,13 +16,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: lib/security.c:74
 #, c-format
 msgid "can't set effective uid"
 msgstr ""
 
-#: lib/security.c:101 src/mandb.c:771
+#: lib/security.c:101 src/mandb.c:789
 #, c-format
 msgid "the setuid man user \"%s\" does not exist"
 msgstr ""
@@ -52,17 +53,19 @@ msgstr ""
 msgid "cannot replace key %s"
 msgstr ""
 
-#: libdb/db_lookup.c:181 libdb/db_lookup.c:191
+#: libdb/db_lookup.c:181 libdb/db_lookup.c:192
 #, c-format
-msgid "only %d fields in content"
-msgstr ""
+msgid "only %d field in content"
+msgid_plural "only %d fields in content"
+msgstr[0] ""
+msgstr[1] ""
 
-#: libdb/db_lookup.c:380
+#: libdb/db_lookup.c:382
 #, c-format
 msgid "bad fetch on multi key %s"
 msgstr ""
 
-#: libdb/db_lookup.c:452 src/whatis.c:574
+#: libdb/db_lookup.c:454 src/whatis.c:574
 #, c-format
 msgid "Database %s corrupted; rebuild with mandb --create"
 msgstr ""
@@ -92,7 +95,7 @@ msgid "The man database defaults to %s%s."
 msgstr ""
 
 #: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:273 src/manconv_main.c:94 src/mandb.c:103
+#: src/lexgrog_test.c:68 src/man.c:273 src/manconv_main.c:94 src/mandb.c:104
 #: src/manpath.c:65 src/whatis.c:121 src/zsoelim_main.c:66
 msgid "emit debugging messages"
 msgstr ""
@@ -106,20 +109,20 @@ msgstr ""
 msgid "[SECTION...]"
 msgstr ""
 
-#: src/catman.c:99 src/man.c:293 src/whatis.c:131
+#: src/catman.c:99 src/man.c:294 src/whatis.c:131
 msgid "PATH"
 msgstr ""
 
-#: src/catman.c:99 src/man.c:293 src/whatis.c:131
+#: src/catman.c:99 src/man.c:294 src/whatis.c:131
 msgid "set search path for manual pages to PATH"
 msgstr ""
 
-#: src/catman.c:100 src/man.c:272 src/mandb.c:111 src/manpath.c:67
+#: src/catman.c:100 src/man.c:272 src/mandb.c:112 src/manpath.c:67
 #: src/whatis.c:133
 msgid "FILE"
 msgstr ""
 
-#: src/catman.c:100 src/man.c:272 src/mandb.c:111 src/manpath.c:67
+#: src/catman.c:100 src/man.c:272 src/mandb.c:112 src/manpath.c:67
 #: src/whatis.c:133
 msgid "use this user configuration file"
 msgstr ""
@@ -176,13 +179,13 @@ msgstr ""
 msgid "warning: %s: ignoring empty file"
 msgstr ""
 
-#: src/check_mandirs.c:310 src/straycats.c:267
+#: src/check_mandirs.c:310 src/straycats.c:275
 #, c-format
 msgid "warning: %s: whatis parse for %s(%s) failed"
 msgstr ""
 
-#: src/check_mandirs.c:336 src/check_mandirs.c:440 src/mandb.c:828
-#: src/straycats.c:88 src/straycats.c:295 src/ult_src.c:92
+#: src/check_mandirs.c:336 src/check_mandirs.c:440 src/mandb.c:846
+#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:92
 #, c-format
 msgid "can't search directory %s"
 msgstr ""
@@ -211,7 +214,7 @@ msgstr ""
 msgid "Purging old database entries in %s...\n"
 msgstr ""
 
-#: src/convert_name.c:46
+#: src/convert_name.c:47
 #, c-format
 msgid "Can't convert %s to cat name"
 msgstr ""
@@ -230,19 +233,19 @@ msgstr ""
 msgid "PATH SECTION NAME"
 msgstr ""
 
-#: src/globbing_test.c:59 src/man.c:296
+#: src/globbing_test.c:59 src/man.c:297
 msgid "EXTENSION"
 msgstr ""
 
-#: src/globbing_test.c:59 src/man.c:297
+#: src/globbing_test.c:59 src/man.c:298
 msgid "limit search to extension type EXTENSION"
 msgstr ""
 
-#: src/globbing_test.c:60 src/man.c:298
+#: src/globbing_test.c:60 src/man.c:299
 msgid "look for pages case-insensitively (default)"
 msgstr ""
 
-#: src/globbing_test.c:61 src/man.c:299
+#: src/globbing_test.c:61 src/man.c:300
 msgid "look for pages case-sensitively"
 msgstr ""
 
@@ -254,14 +257,16 @@ msgstr ""
 msgid "the page name contains wildcards"
 msgstr ""
 
-#: src/lexgrog.l:664
+#: src/lexgrog.l:668
 #, c-format
-msgid "warning: whatis for %s exceeds %d bytes, truncating."
-msgstr ""
+msgid "warning: whatis for %s exceeds %d byte, truncating."
+msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/lexgrog.l:812 src/man.c:2532 src/man.c:2613 src/man.c:2709
-#: src/manconv_main.c:165 src/straycats.c:215 src/ult_src.c:307
-#: src/ult_src.c:321 src/zsoelim.l:495
+#: src/lexgrog.l:819 src/man.c:2555 src/man.c:2636 src/man.c:2732
+#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:309
+#: src/ult_src.c:323 src/zsoelim.l:495
 #, c-format
 msgid "can't open %s"
 msgstr ""
@@ -290,15 +295,15 @@ msgstr ""
 msgid "show guessed series of preprocessing filters"
 msgstr ""
 
-#: src/lexgrog_test.c:73 src/man.c:288 src/man.c:313
+#: src/lexgrog_test.c:73 src/man.c:289 src/man.c:314
 msgid "ENCODING"
 msgstr ""
 
-#: src/lexgrog_test.c:73 src/man.c:313
+#: src/lexgrog_test.c:73 src/man.c:314
 msgid "use selected output encoding"
 msgstr ""
 
-#: src/lexgrog_test.c:117 src/man.c:541 src/man.c:551
+#: src/lexgrog_test.c:117 src/man.c:542 src/man.c:552
 #, c-format
 msgid "%s: incompatible options"
 msgstr ""
@@ -344,271 +349,271 @@ msgstr ""
 msgid "print physical location of man page(s)"
 msgstr ""
 
-#: src/man.c:284
+#: src/man.c:285
 msgid "print physical location of cat file(s)"
 msgstr ""
 
-#: src/man.c:286
+#: src/man.c:287
 msgid "interpret PAGE argument(s) as local filename(s)"
 msgstr ""
 
-#: src/man.c:287
+#: src/man.c:288
 msgid "used by catman to reformat out of date cat pages"
 msgstr ""
 
-#: src/man.c:288
+#: src/man.c:289
 msgid "output source page encoded in ENCODING"
 msgstr ""
 
-#: src/man.c:290
+#: src/man.c:291
 msgid "Finding manual pages:"
 msgstr ""
 
-#: src/man.c:291 src/whatis.c:132
+#: src/man.c:292 src/whatis.c:132
 msgid "LOCALE"
 msgstr ""
 
-#: src/man.c:291
+#: src/man.c:292
 msgid "define the locale for this particular man search"
 msgstr ""
 
-#: src/man.c:292 src/manpath.c:68 src/whatis.c:130
+#: src/man.c:293 src/manpath.c:68 src/whatis.c:130
 msgid "SYSTEM"
 msgstr ""
 
-#: src/man.c:292 src/manpath.c:68 src/whatis.c:130
+#: src/man.c:293 src/manpath.c:68 src/whatis.c:130
 msgid "use manual pages from other systems"
 msgstr ""
 
-#: src/man.c:294 src/whatis.c:128
+#: src/man.c:295 src/whatis.c:128
 msgid "LIST"
 msgstr ""
 
-#: src/man.c:294
+#: src/man.c:295
 msgid "use colon separated section list"
 msgstr ""
 
-#: src/man.c:300
+#: src/man.c:301
 msgid "show all pages matching regex"
 msgstr ""
 
-#: src/man.c:301
+#: src/man.c:302
 msgid "show all pages matching wildcard"
 msgstr ""
 
-#: src/man.c:302
+#: src/man.c:303
 msgid "make --regex and --wildcard match page names only, not descriptions"
 msgstr ""
 
-#: src/man.c:304
+#: src/man.c:305
 msgid "find all matching manual pages"
 msgstr ""
 
-#: src/man.c:305
+#: src/man.c:306
 msgid "force a cache consistency check"
 msgstr ""
 
-#: src/man.c:307
+#: src/man.c:308
 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
 msgstr ""
 
-#: src/man.c:309
+#: src/man.c:310
 msgid "Controlling formatted output:"
 msgstr ""
 
-#: src/man.c:310
+#: src/man.c:311
 msgid "PAGER"
 msgstr ""
 
-#: src/man.c:310
+#: src/man.c:311
 msgid "use program PAGER to display output"
 msgstr ""
 
-#: src/man.c:311 src/man.c:320
+#: src/man.c:312 src/man.c:321
 msgid "STRING"
 msgstr ""
 
-#: src/man.c:311
+#: src/man.c:312
 msgid "provide the `less' pager with a prompt"
 msgstr ""
 
-#: src/man.c:312
+#: src/man.c:313
 msgid "display ASCII translation of certain latin1 chars"
 msgstr ""
 
-#: src/man.c:315
+#: src/man.c:316
 msgid "turn off hyphenation"
 msgstr ""
 
-#: src/man.c:318
+#: src/man.c:319
 msgid "turn off justification"
 msgstr ""
 
-#: src/man.c:320
+#: src/man.c:321
 msgid ""
 "STRING indicates which preprocessors to run:\n"
 "e - [n]eqn, p - pic, t - tbl,\n"
 "g - grap, r - refer, v - vgrind"
 msgstr ""
 
-#: src/man.c:324
+#: src/man.c:325
 #, c-format
 msgid "use %s to format pages"
 msgstr ""
 
-#: src/man.c:325
+#: src/man.c:326
 msgid "DEVICE"
 msgstr ""
 
-#: src/man.c:326
+#: src/man.c:327
 #, c-format
 msgid "use %s with selected device"
 msgstr ""
 
-#: src/man.c:327
+#: src/man.c:328
 msgid "BROWSER"
 msgstr ""
 
-#: src/man.c:328
+#: src/man.c:329
 #, c-format
 msgid "use %s or BROWSER to display HTML output"
 msgstr ""
 
-#: src/man.c:329
+#: src/man.c:330
 msgid "RESOLUTION"
 msgstr ""
 
-#: src/man.c:331
+#: src/man.c:332
 msgid ""
 "use groff and display through gxditview (X11):\n"
 "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
 msgstr ""
 
-#: src/man.c:333
+#: src/man.c:334
 msgid "use groff and force it to produce ditroff"
 msgstr ""
 
-#: src/man.c:598 src/man.c:720
+#: src/man.c:599 src/man.c:723
 #, c-format
 msgid "No manual entry for %s\n"
 msgstr ""
 
-#: src/man.c:600
+#: src/man.c:601
 #, c-format
 msgid "(Alternatively, what manual page do you want from section %s?)\n"
 msgstr ""
 
-#: src/man.c:604
+#: src/man.c:605
 msgid "What manual page do you want?\n"
 msgstr ""
 
-#: src/man.c:717
+#: src/man.c:720
 #, c-format
 msgid "No manual entry for %s in section %s\n"
 msgstr ""
 
-#: src/man.c:725
+#: src/man.c:728
 #, c-format
 msgid "See '%s' for help when manual pages are not available.\n"
 msgstr ""
 
-#: src/man.c:916 src/man.c:2424
+#: src/man.c:919 src/man.c:2447
 #, c-format
 msgid "can't chdir to %s"
 msgstr ""
 
-#: src/man.c:1139
+#: src/man.c:1142
 msgid " Manual page "
 msgstr ""
 
-#: src/man.c:1190 src/man.c:3509
+#: src/man.c:1206 src/man.c:3532
 #, c-format
 msgid "mandb command failed with exit status %d"
 msgstr ""
 
-#: src/man.c:1736
+#: src/man.c:1756
 #, c-format
 msgid "ignoring unknown preprocessor `%c'"
 msgstr ""
 
-#: src/man.c:2011 src/mandb.c:305
+#: src/man.c:2031 src/mandb.c:306
 #, c-format
 msgid "can't chown %s"
 msgstr ""
 
-#: src/man.c:2023 src/mandb.c:219
+#: src/man.c:2043 src/mandb.c:220
 #, c-format
 msgid "can't chmod %s"
 msgstr ""
 
-#: src/man.c:2034 src/mandb.c:210
+#: src/man.c:2054 src/mandb.c:211
 #, c-format
 msgid "can't rename %s to %s"
 msgstr ""
 
-#: src/man.c:2053
+#: src/man.c:2073
 #, c-format
 msgid "can't set times on %s"
 msgstr ""
 
-#: src/man.c:2062
+#: src/man.c:2082
 #, c-format
 msgid "can't unlink %s"
 msgstr ""
 
-#: src/man.c:2113
+#: src/man.c:2133
 #, c-format
 msgid "can't create temporary cat for %s"
 msgstr ""
 
-#: src/man.c:2227
+#: src/man.c:2247
 #, c-format
 msgid "can't create temporary directory"
 msgstr ""
 
-#: src/man.c:2229 src/man.c:2270 src/man.c:2299
+#: src/man.c:2249 src/man.c:2292 src/man.c:2321
 #, c-format
 msgid "can't change to directory %s"
 msgstr ""
 
-#: src/man.c:2240
+#: src/man.c:2260
 #, c-format
 msgid "can't open temporary file %s"
 msgstr ""
 
-#: src/man.c:2276 src/man.c:2304
+#: src/man.c:2298 src/man.c:2326
 #, c-format
 msgid "can't remove directory %s"
 msgstr ""
 
-#: src/man.c:2655
+#: src/man.c:2678
 #, c-format
 msgid ""
 "\n"
 "cannot write to %s in catman mode"
 msgstr ""
 
-#: src/man.c:3361
+#: src/man.c:3384
 #, c-format
 msgid "%s: relying on whatis refs is deprecated\n"
 msgstr ""
 
-#: src/man.c:3709
+#: src/man.c:3732
 #, c-format
 msgid "internal error: candidate type %d out of range"
 msgstr ""
 
-#: src/man.c:3975
+#: src/man.c:3998
 #, c-format
 msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
 msgstr ""
 
-#: src/manconv.c:224 src/manconv.c:245 src/manconv.c:340
+#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
 #, c-format
 msgid "can't write to standard output"
 msgstr ""
 
-#: src/manconv.c:271
+#: src/manconv.c:279
 msgid "iconv: incomplete character at end of buffer"
 msgstr ""
 
@@ -646,90 +651,101 @@ msgstr ""
 msgid "must specify an output encoding"
 msgstr ""
 
-#: src/mandb.c:100
+#: src/mandb.c:101
 msgid "[MANPATH]"
 msgstr ""
 
-#: src/mandb.c:104
+#: src/mandb.c:105
 msgid "work quietly, except for 'bogus' warning"
 msgstr ""
 
-#: src/mandb.c:105
+#: src/mandb.c:106
 msgid "don't look for or add stray cats to the dbs"
 msgstr ""
 
-#: src/mandb.c:106
+#: src/mandb.c:107
 msgid "don't purge obsolete entries from the dbs"
 msgstr ""
 
-#: src/mandb.c:107
+#: src/mandb.c:108
 msgid "produce user databases only"
 msgstr ""
 
-#: src/mandb.c:108
+#: src/mandb.c:109
 msgid "create dbs from scratch, rather than updating"
 msgstr ""
 
-#: src/mandb.c:109
+#: src/mandb.c:110
 msgid "check manual pages for correctness"
 msgstr ""
 
-#: src/mandb.c:110
+#: src/mandb.c:111
 msgid "FILENAME"
 msgstr ""
 
-#: src/mandb.c:110
+#: src/mandb.c:111
 msgid "update just the entry for this filename"
 msgstr ""
 
-#: src/mandb.c:203
+#: src/mandb.c:204
 #, c-format
 msgid "can't remove %s"
 msgstr ""
 
-#: src/mandb.c:253
+#: src/mandb.c:254
 #, c-format
 msgid "can't write to %s"
 msgstr ""
 
-#: src/mandb.c:258
+#: src/mandb.c:259
 #, c-format
 msgid "can't read from %s"
 msgstr ""
 
-#: src/mandb.c:429
+#: src/mandb.c:428
 #, c-format
 msgid "Processing manual pages under %s...\n"
 msgstr ""
 
-#: src/mandb.c:610 src/mandb.c:637
+#: src/mandb.c:628 src/mandb.c:655
 #, c-format
 msgid "Removing obsolete cat directory %s...\n"
 msgstr ""
 
-#: src/mandb.c:793
+#: src/mandb.c:811
 #, c-format
 msgid "warning: no MANDB_MAP directives in %s, using your manpath"
 msgstr ""
 
-#: src/mandb.c:866
+#: src/mandb.c:883
 #, c-format
-msgid ""
-"%d man subdirectories contained newer manual pages.\n"
-"%d manual pages were added.\n"
-msgstr ""
+msgid "%d man subdirectory contained newer manual pages.\n"
+msgid_plural "%d man subdirectories contained newer manual pages.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/mandb.c:870
+#: src/mandb.c:888
 #, c-format
-msgid "%d stray cats were added.\n"
-msgstr ""
+msgid "%d manual page was added.\n"
+msgid_plural "%d manual pages were added.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/mandb.c:872
+#: src/mandb.c:892
 #, c-format
-msgid "%d old database entries were purged.\n"
-msgstr ""
+msgid "%d stray cat was added.\n"
+msgid_plural "%d stray cats were added.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/mandb.c:897
+#, c-format
+msgid "%d old database entry was purged.\n"
+msgid_plural "%d old database entries were purged.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/mandb.c:887
+#: src/mandb.c:915
 #, c-format
 msgid "No databases created."
 msgstr ""
@@ -784,27 +800,27 @@ msgstr ""
 msgid "warning: $MANPATH set, ignoring %s"
 msgstr ""
 
-#: src/manp.c:808
+#: src/manp.c:810
 #, c-format
 msgid "can't parse directory list `%s'"
 msgstr ""
 
-#: src/manp.c:864
+#: src/manp.c:870
 #, c-format
 msgid "can't open the manpath configuration file %s"
 msgstr ""
 
-#: src/manp.c:896
+#: src/manp.c:902
 #, c-format
 msgid "warning: mandatory directory %s doesn't exist"
 msgstr ""
 
-#: src/manp.c:1120
+#: src/manp.c:1126
 #, c-format
 msgid "can't determine current directory"
 msgstr ""
 
-#: src/manp.c:1308
+#: src/manp.c:1316
 #, c-format
 msgid "warning: %s does not begin with %s"
 msgstr ""
@@ -822,27 +838,27 @@ msgstr ""
 msgid "warning: no global manpaths set in config file %s"
 msgstr ""
 
-#: src/straycats.c:235 src/ult_src.c:136
+#: src/straycats.c:242 src/ult_src.c:136
 #, c-format
 msgid "warning: %s is a dangling symlink"
 msgstr ""
 
-#: src/straycats.c:238 src/ult_src.c:139 src/ult_src.c:250
+#: src/straycats.c:245 src/ult_src.c:139 src/ult_src.c:250
 #, c-format
 msgid "can't resolve %s"
 msgstr ""
 
-#: src/straycats.c:300
+#: src/straycats.c:308
 #, c-format
 msgid "Checking for stray cats under %s...\n"
 msgstr ""
 
-#: src/straycats.c:339
+#: src/straycats.c:347
 #, c-format
 msgid "warning: can't update index cache %s"
 msgstr ""
 
-#: src/ult_src.c:286
+#: src/ult_src.c:288
 #, c-format
 msgid "%s is self referencing"
 msgstr ""