summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-09-16 00:48:18 +0100
committerColin Watson <cjwatson@debian.org>2014-09-16 00:48:18 +0100
commit6345cccb569587f1a6f62fd71504a4458f792cea (patch)
treeae01278f6f6d61d556281d47d9441e2a4cde1030
parentaa43315abaae7a801ffa8e108bdd01e921e8506d (diff)
Merge convert_name into man.c
* src/convert_name.c (gripe_converting_name): Move to ... * src/man.c (gripe_converting_name): ... here. * src/convert_name.c (convert_name): Move to ... * src/man.c (convert_name): ... here. Make static. * src/convert_name.h: Remove. * src/Makefile.am (man_SOURCES): Remove convert_name.c and convert_name.h. * po/POTFILES.in: Remove src/convert_name.c. * po/man-db.pot, po/*.po: Update.
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/ca.po290
-rw-r--r--po/cs.po292
-rw-r--r--po/da.po290
-rw-r--r--po/de.po292
-rw-r--r--po/eo.po290
-rw-r--r--po/es.po290
-rw-r--r--po/fi.po288
-rw-r--r--po/fr.po292
-rw-r--r--po/id.po292
-rw-r--r--po/it.po290
-rw-r--r--po/ja.po290
-rw-r--r--po/man-db.pot286
-rw-r--r--po/nl.po290
-rw-r--r--po/pl.po292
-rw-r--r--po/pt_BR.po288
-rw-r--r--po/ro.po292
-rw-r--r--po/ru.po290
-rw-r--r--po/sr.po292
-rw-r--r--po/sv.po290
-rw-r--r--po/vi.po290
-rw-r--r--po/zh_CN.po296
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile.in11
-rw-r--r--src/convert_name.c119
-rw-r--r--src/convert_name.h25
-rw-r--r--src/man.c73
27 files changed, 3127 insertions, 3206 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 63dbe18b..0bff2a4a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ src/accessdb.c
src/catman.c
src/check_mandirs.c
src/compression.c
-src/convert_name.c
src/descriptions_store.c
src/filenames.c
src/globbing_test.c
diff --git a/po/ca.po b/po/ca.po
index 70cb7240..6c3063ea 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.0-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2011-04-11 22:39+0200\n"
"Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "no es pot establir l'uid efectiu"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "l'usuari man setuid «%s» no existeix"
@@ -63,12 +63,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "només hi ha %d camps en el contingut"
msgstr[1] "només hi ha %d camps en el contingut"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "recepció errònia en clau múltiple %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "La base de dades %s està corrompuda; reconstruïu-la amb mandb --create"
@@ -98,7 +98,7 @@ msgid "The man database defaults to %s%s."
msgstr "La base de dades de man per defecte és %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "produeix informació de depuració"
@@ -112,20 +112,20 @@ msgstr "no es pot obrir %s per a lectura"
msgid "[SECTION...]"
msgstr "[SECCIÓ…]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "CAMÍ"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "estableix el camí de cerca de pàgines de manual a CAMÍ"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "FITXER"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "empra aquest fitxer de configuració de l'usuari"
@@ -167,74 +167,69 @@ msgstr "no es pot escriure en %s"
msgid "unable to update %s"
msgstr "no es pot actualitzar %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "avís: %s/man%s/%s.%s*: extensions en competència"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "no es pot actualitzar la memòria cau d'índex %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "avís: %s: enllaç simbòlic o petició ROFF «.so» incorrecte"
# «es descarta...» ivb
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "avís: %s: es descarta un fitxer buit"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "avís: %s: l'anàlisi de whatis per a %s(%s) ha fallat"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "no es pot cercar el directori %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "avís: no es pot crear el directori de cat %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "no es pot canviar al directori %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "no es pot crear la memòria cau d'índex %s"
# S'està... Per/per a/de? ivb
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "S'està actualitzant la memòria cau d'índex del camí «%s/%s». Espereu…"
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "fet.\n"
# S'estan... ivb
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "S'estan purgant entrades antigues de la base de dades en %s…\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "No es pot convertir %s a nom cat"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
@@ -242,7 +237,7 @@ msgstr "avís: no s'ha pogut desar l'entrada per a %s(%s)"
# Aquesta accepció d'«ignorar» és un anglicisme. Descartar? ivb
# Sí, de fet ho volia haver marcat amb "jm". jm
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "avís: %s: s'ha descartat un nom de fitxer estrany"
@@ -251,20 +246,20 @@ msgstr "avís: %s: s'ha descartat un nom de fitxer estrany"
msgid "PATH SECTION NAME"
msgstr "CAMÍ SECCIÓ NOM"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "EXTENSIÓ"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "limita la cerca al tipus d'extensió EXTENSIÓ"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr ""
"cerca les pàgines sense diferenciar majúscules i minúscules (per defecte)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "cerca les pàgines diferenciant majúscules i minúscules"
@@ -277,16 +272,16 @@ msgid "the page name contains wildcards"
msgstr "el nom de la pàgina conté comodins"
# Es trunca, es truncarà? ivb
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, fuzzy, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "avís: el whatis per a %s s'excedeix en %d bytes, es truncarà."
msgstr[1] "avís: el whatis per a %s s'excedeix en %d bytes, es truncarà."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "no es pot obrir %s"
@@ -315,164 +310,164 @@ msgstr "mostra informació whatis"
msgid "show guessed series of preprocessing filters"
msgstr "mostra sèries endevinades de filtres de preprocés"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "CODIFICACIÓ"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "empra la codificació d'eixida seleccionada"
# Frase completa: «les opcions són incompatibles» ivb
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: les opcions són incompatibles"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "l'ordre ha finalitzat amb l'estat %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[SECCIÓ] PÀGINA…"
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "reestableix totes les opcions als seus valors per defecte"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "AVISOS"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "habilita els avisos del groff"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Modes principals de funcionament:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "equivalent a «whatis»"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "equivalent a «apropos»"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "cerca text a totes les pàgines"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "mostra la ubicació física de les pàgines de manual"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "mostra la ubicació física dels fitxers cat"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "interpreta els arguments PÀGINA com a noms de fitxers locals"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr "emprat per catman per a reformatar pàgines de cat antiquades"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "mostra el font de la pàgina codificat amb CODIFICACIÓ"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Cerca de pàgines de manual:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "LOCALE"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "defineix el locale per a aquesta cerca de manuals concreta"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "SISTEMA"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "empra pàgines de manual d'altres sistemes"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "LLISTA"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "empra una llista de seccions separada per dos punts"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "mostra totes les pàgines que concorden amb una expressió regular"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "mostra totes les pàgines que concorden amb un comodí"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"fes que --regex i --wildcard concorden només amb noms de pàgines, no "
"descripcions"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "cerca totes les pàgines de manual coincidents"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "força una comprovació de consistència de la memòria cau"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr "no proves subpàgines, p. ex. «man foo bar» → «man foo-bar»"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Control de l'eixida formatada"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "PAGINADOR"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "empra el programa PAGINADOR per a mostrar l'eixida"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "CADENA"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "proveeix el paginador «less» amb un indicador"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "mostra traduccions ASCII d'alguns caràcters latin1"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "inhabilita la separació siŀlàbica"
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "inhabilita el sagnat"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -482,34 +477,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "empra %s per a formatar les pàgines"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "DISPOSITIU"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "empra %s amb el dispositiu seleccionat"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "NAVEGADOR"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "empra %s o NAVEGADOR per a mostrar l'eixida HTML"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "RESOLUCIÓ"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -517,69 +512,55 @@ msgstr ""
"empra groff i mostra a través de gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "utilitza groff i força la producció de ditroff"
# per/per a/de? ivb
# crec que és millor per a. jm
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "No hi ha una entrada de manual per a %s\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(Alternativament, quina pàgina de manual voleu de la secció %s?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Quina pàgina de manual voleu?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "No hi ha una entrada de manual per a %s a la secció %s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr ""
"Vegeu «%s» per a obtindre ajuda quan les pàgines de manual no són "
"disponibles.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "no es pot canviar de directori a %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Pàgina de manual "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "l'ordre de mandb ha fallat amb l'estat d'eixida %d"
-
# «es descarta el...» ivb
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "es descarta el preprocessador desconegut «%c»"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "no es pot fer «chown» a %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "no es pot fer «chmod» a %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "no es pot reanomenar %s a %s"
@@ -587,37 +568,48 @@ msgstr "no es pot reanomenar %s a %s"
# Segurament es referirà a l'{a,m,c}time; hores/dates? ivb
# I en eixe cas, què sugereixes? jm
# Allò que s'use majoritàriament pel cas, només era per assegurar-me. ivb
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "no es poden establir les hores en %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "no es pot desenllaçar %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "no es pot crear un fitxer cat temporal per a %s"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "no es pot crear un directori temporal"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "no es pot obrir el fitxer temporal %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "no es pot eliminar el directori %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- següent: %s [ visualitza (retorn) | omet (Ctrl-D) | surt (Ctrl-C ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "no es pot canviar de directori a %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -626,23 +618,31 @@ msgstr ""
"\n"
"no es pot escriure a %s en el mode catman"
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "No es pot convertir %s a nom cat"
+
# Lo de sempre, deprecated? jm
-#: src/man.c:3413
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: basar-se en referències whatis està desaconsellat\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "l'ordre de mandb ha fallat amb l'estat d'eixida %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr ""
"s'ha produït un error intern: el candidat de tipus %d està fora de rang"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- següent: %s [ visualitza (retorn) | omet (Ctrl-D) | surt (Ctrl-C ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Pàgina de manual "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -687,77 +687,77 @@ msgstr "s'ha d'especificar una codificació d'entrada"
msgid "must specify an output encoding"
msgstr "s'ha d'especificar una codificació d'eixida"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[CAMÍ DE MAN]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "treballa silenciosament, excepte per a avisos estranys"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "no cerques o afegisques cats orfes a les bd"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "no purgues entrades obsoletes de les bd"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "produeix només bases de dades d'usuari"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "crea db noves, en comptes d'actualitzar-les"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "comprova que les pàgines de manual són correctes"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "NOMFITXER"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "actualitza només l'entrada per a aquest nom de fitxer"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "no es pot eliminar %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "no es pot escriure en %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "no es pot llegir de %s"
# Si es refereix a un directori, «sota». ivb
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Processant pàgines de manual sota %s…\n"
# S'estan... ivb
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "S'està suprimint el directori de cats obsolet %s…\n"
# s'està utilitzant/s'utilitza/s'utilitzarà ivb
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
"avís: no hi ha directives MANDB_MAP en %s, s'utilitzarà el vostre camí de man"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, fuzzy, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -768,14 +768,14 @@ msgstr[1] ""
"%d subdirectoris de man contenien pàgines de manual més noves.\n"
"S'han afegit %d pàgines de manual.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, fuzzy, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] " Pàgina de manual "
msgstr[1] " Pàgina de manual "
-#: src/mandb.c:895
+#: src/mandb.c:910
#, fuzzy, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
@@ -783,14 +783,14 @@ msgstr[0] "S'han afegit %d cats orfes.\n"
msgstr[1] "S'han afegit %d cats orfes.\n"
# "la base de dades", o "bases de dades"? jm
-#: src/mandb.c:900
+#: src/mandb.c:915
#, fuzzy, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "S'han purgat %d entrades velles de la base de dades.\n"
msgstr[1] "S'han purgat %d entrades velles de la base de dades.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "No s'ha creat cap base de dades."
@@ -889,28 +889,28 @@ msgid "warning: no global manpaths set in config file %s"
msgstr ""
"avís: no hi ha camins de man globals establerts al fitxer de configuració %s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "avís: %s és un enllaç simbòlic trencat"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "no es pot resoldre %s"
# S'estan... ivb
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "S'estan cercant cats orfes sota %s…\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "no es pot actualitzar la memòria cau d'índex %s"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s es referència a ell mateix"
diff --git a/po/cs.po b/po/cs.po
index 10961b77..f0b5bbeb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.1-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2012-04-07 19:04+0100\n"
"Last-Translator: Marek Černocký <marek@manet.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -23,7 +23,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "nelze nastavit platné uid"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "uživatel manuálových stránek „%s“ použitý v setuid neexistuje"
@@ -61,12 +61,12 @@ msgstr[0] "pouze %d položka v obsahu"
msgstr[1] "pouze %d položky v obsahu"
msgstr[2] "pouze %d položek v obsahu"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "nelze získat vícenásobný klíč %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "Databáze %s je poškozena; znovu ji sestavte pomocí „mandb --create“"
@@ -96,7 +96,7 @@ msgid "The man database defaults to %s%s."
msgstr "Výchozí manuálová databáze je %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "vysílat ladicí zprávy"
@@ -110,20 +110,20 @@ msgstr "soubor %s nelze otevřít pro čtení"
msgid "[SECTION...]"
msgstr "[ODDÍL…]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "CESTA"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "nastavit cestu pro vyhledávání v manuálových stránkách na CESTA"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "SOUBOR"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "použít tento soubor s uživatelským nastavením"
@@ -162,77 +162,72 @@ msgstr "nelze zapisovat do %s"
msgid "unable to update %s"
msgstr "nelze aktualizovat %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "varování: %s/man%s/%s.%s*: neslučitelné přípony"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "nelze aktualizovat rejstřík %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "varování: %s: chybný symbolický odkaz nebo požadavek „.so“ od ROFF"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "varování: %s: ignoruje se prázdný soubor"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "varování: %s: selhalo zpracování programem whatis pro %s(%s)"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "nelze prohledat složku %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "varování: nelze vytvořit složku %s pro katalogy"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "nelze se přepnout do složky %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "nelze vytvořit rejstřík %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Aktualizuje se rejstřík pro cestu „%s/%s“. Čekejte…"
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "dokončeno.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Mažou se staré databázové záznamy v %s…\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "%s nelze převést na název katalogu"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "varování: selhalo uchování záznamu pro %s(%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "varování: %s: ignoruje se falešný název souboru"
@@ -241,19 +236,19 @@ msgstr "varování: %s: ignoruje se falešný název souboru"
msgid "PATH SECTION NAME"
msgstr "CESTA ODDÍL NÁZEV"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "PŘÍPONA"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "omezit hledání na přípony typu PŘÍPONA"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "při hledání stránek nerozlišovat velikost písmen (výchozí)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "při hledání stránek rozlišovat velikost písmen"
@@ -265,7 +260,7 @@ msgstr "považovat název stránky za regulární výraz"
msgid "the page name contains wildcards"
msgstr "název stránky obsahuje divoké znaky"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
@@ -273,9 +268,9 @@ msgstr[0] "varování: program whatis pro %s překročil %d bajt, bude zkrácen"
msgstr[1] "varování: program whatis pro %s překročil %d bajty, bude zkrácen"
msgstr[2] "varování: program whatis pro %s překročil %d bajtů, bude zkrácen"
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "nelze otevřít soubor %s"
@@ -304,165 +299,165 @@ msgstr "zobrazit informace programu whatis"
msgid "show guessed series of preprocessing filters"
msgstr "zobrazit předpokládanou sérii předzpracujících filtrů"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "KÓDOVÁNÍ"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "použít vybrané výstupní kódování"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: nekompatibilní přepínače"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "příkaz skončil s návratovým kódem %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[ODDÍL] STRÁNKA…"
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "nastavit všechny přepínače na jejich výchozí hodnoty"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "VAROVÁNÍ"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "povolit varování od programu groff"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Hlavní režimy operací:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "to stejné jako program whatis"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "to stejné jako program apropos"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "hledat text ve všech stránkách"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "vypsat fyzické umístění manuálové stránky (či stránek)"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "vypsat fyzické umístění katalogového souboru (či souborů)"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr ""
"vykládat si argument(y) STRÁNKA jako název místního souboru (či souborů)"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr "použít program catman k přeformátování neaktuálních stránek"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "vypsat zdrojovou stránku kódovanou v KÓDOVÁNÍ"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Hledání manuálových stránek:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "LOCALE"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr ""
"definovat národní prostředí LOCALE pro toto konkrétní hledání v manuálových "
"stránkách"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "SYSTÉM"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "použít manuálové stránky z jiných systémů"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "SEZNAM"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "použít dvojtečkami oddělovaný seznam oddílů"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "zobrazit všechny stránky odpovídající regulárnímu výrazu"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "zobrazit všechny stránky odpovídající divokým znakům"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"nechť se --regex a --wildcard porovnávají jen s názvem stránky, ne s popisem"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "najít všechny odpovídající manuálové stránky"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "vynutit kontrolu konzistence mezipaměti"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr "nezkoušet podstránky, např. „man hokus pokus“ => „man hokus-pokus“"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Řízení formátovaného výstupu:"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "ZOBRAZOVAČ"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "použít program ZOBRAZOVAČ k zobrazení výstupu"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "ŘETĚZEC"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "poskytne zobrazovací program „less“ s příkazovým řádkem"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "některé znaky latin1 zobrazovat přepisem do ASCII"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "vypnout dělní slov"
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "vypnout zarovnávání"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -472,34 +467,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "používat program %s k formátování stránek"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "ZAŘÍZENÍ"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "používat program %s s vybraným zařízením"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "PROHLÍŽEČ"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "použít %s nebo PROHLÍŽEČ k zobrazení výstupu v HTML"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "ROZLIŠENÍ"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -507,99 +502,97 @@ msgstr ""
"použít program groff a zobrazit přes gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "použít program groff a přimět ho vytvořit ditroff"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Manuálová stránka pro %s nebyla nalezena\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(Respektive, kterou manuálovou stránku z oddílu %s si přejete?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Kterou manuálovou stránku si přejete?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Manuálová stránka pro %s nebyla v oddíle %s nalezena\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr "Pokud nejsou manuálové stránky dostupné, použijte pro nápovědu „%s“.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "nelze se přepnout do složky %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Manuálová stránka "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "program mandb skončil s návratovým kódem %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "ignoruje se neznámé předzpracování „%c“"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "nelze změnit vlastnictví %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "nelze změnit oprávnění k %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "%s nelze přejmenovat na %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "nelze nastavit čas na %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "nelze smazat %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "nelze vytvořit dočasný katalog pro %s"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "nelze vytvořit dočasnou složku"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "nelze otevřít dočasný soubor %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "nelze odstranit složku %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- následující: %s [zobrazit (enter) | přeskočit (Ctrl-D) | ukončit "
+"(Ctrl-C)]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "nelze se přepnout do složky %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -608,22 +601,29 @@ msgstr ""
"\n"
"do %s nelze v režimu catman zapisovat"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "%s nelze převést na název katalogu"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: spoléhat se na to, co program whatis považuje za neschválené\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "program mandb skončil s návratovým kódem %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "interní chyba: kandidující typ %d je mimo rozsah"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- následující: %s [zobrazit (enter) | přeskočit (Ctrl-D) | ukončit "
-"(Ctrl-C)]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Manuálová stránka "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -668,74 +668,74 @@ msgstr "je nutné zadat vstupní kódování"
msgid "must specify an output encoding"
msgstr "je nutné zadat výstupní kódování"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[CESTA_K_MANUÁLOVÝM_STRÁNKÁM]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "pracovat tiše, s výjimkou „falešných“ varování"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "nehledat a nepřidávat do databáze bezprizorní katalogy"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "nemazat z databáze zastaralé záznamy"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "vytvořit pouze uživatelskou databázi"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "vytvořit databázi raději od píky, než ji aktualizovat"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "zkontrolovat, zda jsou manuálové stránky v pořádku"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "SOUBOR"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "aktualizovat jen záznam pro tento soubor"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "nelze odstranit soubor %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "nelze zapisovat do souboru %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "nelze číst ze souboru %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Zpracovávají se manuálové stránky ve složce %s…\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Odstraňuje se zastaralá složka katalogů %s…\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
"varování: v souboru %s není direktiva MANDB_MAP, použije se program manpath"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -743,7 +743,7 @@ msgstr[0] "%d manuálová podsložka obsahovala nové manuálové stránky.\n"
msgstr[1] "%d manuálové podsložky obsahovaly nové manuálové stránky.\n"
msgstr[2] "%d manuálových podsložek obsahovalo nové manuálové stránky.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
@@ -751,7 +751,7 @@ msgstr[0] "%d manuálová stránka byla přidána.\n"
msgstr[1] "%d manuálové stránky byly přidány.\n"
msgstr[2] "%d manuálových stránek bylo přidáno.\n"
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
@@ -759,7 +759,7 @@ msgstr[0] "Byl přidán %d bezprizorní katalog.\n"
msgstr[1] "Byly přidány %d bezprizorní katalogy.\n"
msgstr[2] "Bylo přidáno %d bezprizorních katalogů.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
@@ -767,7 +767,7 @@ msgstr[0] "Byl vymazán %d starý databázový záznam.\n"
msgstr[1] "Byly vymazány %d staré databázové záznamy.\n"
msgstr[2] "Bylo vymazáno %d starých databázových záznamů.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Nebyla vytvořena žádná databáze."
@@ -862,27 +862,27 @@ msgstr ""
"varování: v souboru %s s nastavením nejsou nastaveny žádné globální cesty k "
"manuálovým stránkám"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "varování: %s je symbolický odkaz ukazující na neexistující soubor"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "cestu %s nelze zpracovat"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Kontrolují se bezprizorní katalogy ve složce %s…\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "varování: rejstřík %s nelze aktualizovat"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "stránka %s se odkazuje sama na sebe"
diff --git a/po/da.po b/po/da.po
index a2abe358..b592e4cf 100644
--- a/po/da.po
+++ b/po/da.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.1-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2012-03-17 23:42+0100\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -35,7 +35,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "kan ikke sætte effektivt uid"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "en manualbruger »%s« som er setuid findes ikke"
@@ -72,12 +72,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "kun %d felt i indhold"
msgstr[1] "kun %d felter i indhold"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "fejlagtig hentning på multinøgle %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "Databasen %s er beskadiget; genopbyg med mandb --create"
@@ -107,7 +107,7 @@ msgid "The man database defaults to %s%s."
msgstr "Manualdatabasen er som standard %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "vis fejlsøgningsbeskeder"
@@ -121,20 +121,20 @@ msgstr "kan ikke åbne %s for læsning"
msgid "[SECTION...]"
msgstr "[AFSNIT...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "STI"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "angiv søgesti for manualsider med STI"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "FIL"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "brug denne brugers konfigurationsfil"
@@ -173,77 +173,72 @@ msgstr "kan ikke skrive indenfor %s"
msgid "unable to update %s"
msgstr "kan ikke opdatere %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "advarsel: %s/man%s/%s.%s*: filendelser i konflikt"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "kan ikke opdatere indekscachen %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "advarsel: %s: fejlagtig symbolsk lænke eller ROFF ».so-anmodning«"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "advarsel: %s: ignorerer tom fil"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "advarsel: %s: whatis-tolkning for %s(%s) mislykkedes"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "kan ikke søge i kataloget %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "advarsel: kan ikke oprette katalogmappe %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "kan ikke skifte til kataloget %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "kan ikke oprette indekscachen %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Opdaterer indekscache for søgestien »%s/%s«. Vent..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "færdig.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Tømmer gamle databaseindgange i %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Kan ikke konvertere %s til katalognavn"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "advarsel: det mislykkedes at lagre indgang for %s(%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "advarsel: %s: ignorerer fejlagtigt filnavn"
@@ -254,21 +249,21 @@ msgstr "advarsel: %s: ignorerer fejlagtigt filnavn"
msgid "PATH SECTION NAME"
msgstr "STI AFSNIT NAVN"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "FILENDELSE"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "begræns søgning til filendelser med typen FILENDELSE"
# evt. "med versalfølsomhed slået fra"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "se efter sider uden at være versalfølsom (standard)"
# "med versalfølsomhed slået til"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "se efter sider versalfølsomt"
@@ -280,16 +275,16 @@ msgstr "fortolk sidenavn som et regulært udtryk"
msgid "the page name contains wildcards"
msgstr "sidenavnet indeholder jokertegn"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "advarsel: whatis for %s overskrider %d byte, forkorter."
msgstr[1] "advarsel: whatis for %s overskrider %d byte, forkorter."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "kan ikke åbne %s"
@@ -318,168 +313,168 @@ msgstr "vis whatis-information"
msgid "show guessed series of preprocessing filters"
msgstr "vis gættet serie af forhåndsbehandlede filtre"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "KODNING"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "brug valgt uddatakodning"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: inkompatible tilvalg"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "kommandoen afsluttede med status %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[AFSNIT] SIDE..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "nulstil alle tilvalg til deres standardværdier"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "ADVARSLER"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "aktiver advarsler fra groff"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Hovedtilstande for handling:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "svarende til whatis"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "svarende til apropos"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "søg efter tekst på alle sider"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "vis fysisk placering af manualsider"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "vis fysisk placering af katalogfiler"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "fortolk SIDE-argumenter som lokale filnavne"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr ""
"bruges af katalogmanual til at omformatere katalogsider der skal opdateres"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "uddatakildeside kodet i KODNING"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Finder manualsider:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "SPROG"
# denne specifikke
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "definere sproget for netop denne manualsøgning"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "SYSTEM"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "brug manualsider fra andre systemer"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "LISTE"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "brug kolonadskilt afsnitsliste"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "vis alle sider der matcher regulært udtryk"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "vis alle sider der matcher jokertegn"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr "få --regex og --wildcard til at finde sidenavne og ikke beskrivelser"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "find alle matchende manualsider"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "fremtving konsistenskontrol af mellemlager"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr "forsøg ikke med undersider, f.eks. »man foo bar« => »man foo-bar«"
# "Kontrollerer formaterede uddata:"
# Det er en slags overskrift, så:
# "Tilvalg for formateret uddata"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Tilvalg for formateret uddata:"
# Der menes nok et program som less. Ordlisten foreslår bl.a. "tekstviser"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "TEKSTVISER"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "brug programmet TEKSTVISER til at vise uddata"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "STRENG"
# dette er hjælpeteksten til tilvalget -r til ma
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "brug tekstviseren »less« med den angivne prompt"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "vis ASCII-oversættelse af visse latin1-tegn"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "brug ikke orddeling"
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "brug ikke justering"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -489,34 +484,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "brug %s til formatsider"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "ENHED"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "brug %s med valgt enhed"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "BROWSER"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "brug %s eller BROWSER til at vise HTML-uddata"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "OPLØSNING"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -524,99 +519,96 @@ msgstr ""
"brug groff og vis igennem gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "brug groff og tving den til at producere ditroff"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Ingen manualindgang for %s\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(Eller hvilken manualside vil du have fra afsnit %s?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Hvilken manualside vil du have?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Ingen manualindgang for %s i afsnit %s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr "Se »%s« for hjælp når manualsider ikke er tilgængelige.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "kan ikke skifte katalog til %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Manualside "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "mandb-kommandoen mislykkedes med slutstatus %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "ignorerer ukendt forbehandler »%c«"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "kan ikke skifte ejer på %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "kan ikke ændre rettigheder på %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "kan ikke omdøbe %s til %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "kan ikke sætte tider på %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "kan ikke aflænke %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "kan ikke oprette midlertidigt katalog for %s"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "kan ikke oprette midlertidig mappe"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "kan ikke åbne midlertidig fil %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "kan ikke fjerne kataloget %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- næste: %s [ vis (retur) | overspring (Ctrl-D) | afslut (Ctrl-C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "kan ikke skifte katalog til %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -625,21 +617,29 @@ msgstr ""
"\n"
"kan ikke skrive til %s i tilstanden katalogmanual"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Kan ikke konvertere %s til katalognavn"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: at stole på whatis-referencer er forældet\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "mandb-kommandoen mislykkedes med slutstatus %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "intern fejl: kandidattype %d uden for gyldigt interval"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- næste: %s [ vis (retur) | overspring (Ctrl-D) | afslut (Ctrl-C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Manualside "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -684,101 +684,101 @@ msgstr "inddatakodning skal angives"
msgid "must specify an output encoding"
msgstr "uddatakodning skal angives"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[MANSTI]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "arbejd stille, undtagen for »bogus-advarsler«"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "kig ikke efter og tilføj ikke vildfarne katalogsider til databaserne"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "afinstaller ikke forældede punkter fra databaserne"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "producer kun brugerdatabaser"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "opret databaser fra bunden af i stedet for at opdatere"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "kontroller manualsider for korrekthed"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "FILNAVN"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "opdater kun punktet for dette filnavn"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "kan ikke fjerne %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "kan ikke skrive til %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "kan ikke læse fra %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Bearbejder manualsider under %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Fjerner forældet katalogside %s...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr "advarsel: intet MANDB_MAP-direktiv i %s, bruger din manualsøgesti"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
msgstr[0] "%d manualunderkatalog indeholdt nyere manualsider.\n"
msgstr[1] "%d manualunderkataloger indeholdt nyere manualsider.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] "%d manualside blev tilføjet.\n"
msgstr[1] "%d manualsider blev tilføjet.\n"
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "%d vildfaren katalogside blev tilføjet.\n"
msgstr[1] "%d vildfarne katalogsider blev tilføjet.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d gammel databaseindgang blev tømt.\n"
msgstr[1] "%d gamle databaseindgange blev tømt.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Ingen databaser er oprettet."
@@ -872,27 +872,27 @@ msgid "warning: no global manpaths set in config file %s"
msgstr ""
"advarsel: ingen globale manualsøgestier angivet i konfigurationsfilen %s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "advarsel: %s er en vildfaren symbolsk lænke"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "kan ikke slå %s op"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Undersøger vildfarne katalogsider under %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "advarsel: kan ikke opdatere indekscachen %s"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s refererer til sig selv"
diff --git a/po/de.po b/po/de.po
index e9209a5d..f40f6e7e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.1-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2012-04-25 21:22-0700\n"
"Last-Translator: Arun Persaud <arun@nubati.net>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -28,7 +28,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "effektive Benutzerkennung kann nicht gesetzt werden"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "Der von »man« verwandte Benutzer »%s« existiert nicht"
@@ -65,12 +65,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "nur %d Feld im Inhalt enthalten"
msgstr[1] "nur %d Felder im Inhalt enthalten"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "Suchschlüssel %s kann nicht eingelesen werden"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "Datenbank %s beschädigt; mit »mandb --create« neu erstellen"
@@ -100,7 +100,7 @@ msgid "The man database defaults to %s%s."
msgstr "Die Handbuchdatenbank benutzt standardmäßig %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "Hinweise zur Fehlersuche werden ausgegeben"
@@ -114,20 +114,20 @@ msgstr "%s kann nicht zum Lesen geöffnet werden"
msgid "[SECTION...]"
msgstr "[ABSCHNITT ...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "PFAD"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "Suchpfad für Handbuchseiten auf PFAD setzen"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "DATEI"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "diese Benutzerkonfigurationsdatei verwenden"
@@ -167,78 +167,73 @@ msgstr "innerhalb von %s kann nicht geschrieben werden"
msgid "unable to update %s"
msgstr "%s kann nicht aktualisiert werden"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "Warnung: %s/man%s/%s.%s*: konkurrierende Dateierweiterungen"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "Indexcache %s kann nicht aktualisiert werden"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr ""
"Warnung: %s: ungültige symbolische Verknüpfung oder »roff«-».so«-Anfrage"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "Warnung: %s: leere Datei wird ignoriert"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "Warnung: %s: whatis-Verarbeitung für %s(%s) fehlgeschlagen"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "Verzeichnis %s kann nicht durchsucht werden"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "Warnung: »cat«-Verzeichnis %s kann nicht angelegt werden"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "Es konnte nicht ins Verzeichnis %s gewechselt werden"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "Indexcache %s kann nicht erzeugt werden"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Indexcache des Pfades »%s/%s« wird aktualisiert. Bitte warten ..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "fertig.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Alte Datenbankeinträge in %s werden gelöscht ...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "%s kann nicht in »cat«-Namen umgewandelt werden"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "Warnung: Eintrag für (%s)%s konnte nicht abgelegt werden"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "Warnung: %s: fehlerhafter Dateiname wird ignoriert"
@@ -247,20 +242,20 @@ msgstr "Warnung: %s: fehlerhafter Dateiname wird ignoriert"
msgid "PATH SECTION NAME"
msgstr "PFAD ABSCHNITT NAME"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "ERWEITERUNG"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "Suche auf Erweiterungstyp ERWEITERUNG beschränken"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr ""
"Nach Seiten suchen ohne Groß- und Kleinschreibung zu beachten (Standard)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "Nach Seiten unter Beachtung von Groß- und Kleinschreibung suchen"
@@ -272,7 +267,7 @@ msgstr "jeden Seitennamen als RegEx interpretieren"
msgid "the page name contains wildcards"
msgstr "der Seitenname enthält Platzhalter"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
@@ -281,9 +276,9 @@ msgstr[0] ""
msgstr[1] ""
"Warnung: whatis-Eintrag für %s ist größer als %d Bytes, verkürze ihn."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "%s kann nicht geöffnet werden"
@@ -312,168 +307,168 @@ msgstr "whatis-Informationen anzeigen"
msgid "show guessed series of preprocessing filters"
msgstr "vermutete Serie der Vorverarbeitungsfilter anzeigen"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "KODIERUNG"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "ausgewählte Ausgabekodierung verwenden"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: inkompatible Optionen"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "Befehl mit Exit-Status %d beendet: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[ABSCHNITT] SEITE ..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "Alle Optionen auf ihre Standardwerte zurücksetzen"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "WARNUNGEN"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "groff-Warnungen aktivieren"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Hauptbetriebsmodi:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "Ersatz für »whatis«"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "Ersatz für »apropos«"
# (mes) NEU
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "Text in allen Seiten suchen"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "Speicherort der Handbuchseite(n) ausgeben"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "Speicherort der »cat«-Datei(en) ausgeben"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "SEITEN-Argument(e) als lokale(n) Dateinamen interpretieren"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr "von »catman« verwendet um veraltete »cat«-Seiten neu zu formatieren"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "Quellseiten mit KODIERUNG kodiert ausgeben"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Handbuchseiten finden: "
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "LOCALE"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "Locale für diese spezielle Handbuchsuche definieren"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "SYSTEM"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "Handbuchseiten von anderen Systemen verwenden"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "LISTE"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "kommaseparierte Abschnittsliste verwenden"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "alle mit dem regulären Ausdruck übereinstimmenden Seiten anzeigen"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "alle mit dem Platzhalter übereinstimmenden Seiten anzeigen"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"»--regex« und »--wildcard« werden nur gegen den Seitennamen geprüft, nicht "
"die Beschreibungen"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "alle übereinstimmenden Handbuchseiten finden"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "Konsistenzkontrolle des Caches erzwingen"
# (mes) neu
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr ""
"keine Unterseiten versuchen, zum Beispiel »man foo bar« => »man foo-bar«"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Formatierte Ausgabe kontrollieren:"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "ANZEIGEPROGRAMM"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "ANZEIGEPROGRAMM zur Darstellung der Ausgabe verwenden"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "ZEICHENKETTE"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "das »less«-Anzeigeprogramm mit einer Eingabeaufforderung ausstatten"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "ASCII-Übersetzungen einiger Latin1-Zeichen anzeigen"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "Silbentrennung abschalten"
# (mes) Was trifft es: Ausrichtung, Begründung, Blocksatz, Einstellung,
# Justierung, Rechtfertigung
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "Blocksatz abschalten"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -483,34 +478,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "%s zur Seitenformatierung verwenden"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "GERÄT"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "%s mit ausgewähltem Gerät verwenden"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "BROWSER"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "%s oder BROWSER zur Anzeige von HTML-Ausgabe verwenden"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "AUFLÖSUNG"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -518,101 +513,99 @@ msgstr ""
"»groff« verwenden und mit »gxditview« (X11) anzeigen:\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "»groff« verwenden und ditroff-Ausgabe erzwingen"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Kein Handbucheintrag für %s vorhanden\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr ""
"(Welche Handbuchseiten wollen Sie aus Abschnitt %s alternativ haben?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Welche Handbuchseiten möchten Sie haben?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Kein Handbucheintrag für %s im Abschnitt %s vorhanden\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr "Siehe auch »%s« für Hilfe, wenn Handbuchseiten nicht verfügbar sind.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "Es kann nicht ins Verzeichnis %s gewechselt werden"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Handbuchseite "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "»mandb«-Befehl schlug fehl mit Beendigungs-Status %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "Ignoriere unbekannten Präprozessor »%c«"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "Besitzer und/oder Gruppe von %s können nicht geändert werden"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "Zugriffsrechte von %s können nicht geändert werden"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "%s kann nicht in %s umbenannt werden"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "Es können keine Zeiten für %s gesetzt werden"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "%s kann nicht gelöscht werden"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "Es kann keine temporäre »cat«-Datei für %s erzeugt werden"
# (mes) NEU
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "Temporäres Verzeichnis kann nicht erzeugt werden."
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "Temporäre Datei %s kann nicht geöffnet werden"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "Verzeichnis %s kann nicht entfernt werden"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- nächste: %s [ Anzeigen (Return) | Überspringen (Strg+D) | Beenden "
+"(Strg+C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "Es kann nicht ins Verzeichnis %s gewechselt werden"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -621,22 +614,29 @@ msgstr ""
"\n"
"im »catman«-Modus kann nicht nach %s geschrieben werden"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "%s kann nicht in »cat«-Namen umgewandelt werden"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: es wird davon abgeraten, auf »whatis«-Referenzen zu vertrauen\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "»mandb«-Befehl schlug fehl mit Beendigungs-Status %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "interner Fehler: Kandidatentyp %d außerhalb des Bereichs"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- nächste: %s [ Anzeigen (Return) | Überspringen (Strg+D) | Beenden "
-"(Strg+C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Handbuchseite "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -681,103 +681,103 @@ msgstr "es muss eine Eingabekodierung angegeben werden"
msgid "must specify an output encoding"
msgstr "es muss eine Ausgabekodierung angegeben werden"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[HANDBUCHPFAD]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "still arbeiten, mit Ausnahme von »fehlerhaften« Warnungen"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr ""
"nicht nach herrenlosen »cat«-Datein suchen oder zu den Datenbanken hinzufügen"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "keine veralteten Einträge aus den Datenbanken löschen"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "nur Benutzerdatenbanken erzeugen"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "Datenbanken von Grund auf neu generieren, statt sie zu aktualisieren"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "Handbuchseiten auf Korrektheit überprüfen"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "DATEINAME"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "nur den Eintrag für diesen Dateinamen aktualisieren"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "%s kann nicht entfernt werden"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "es kann nicht nach %s geschrieben werden"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "%s kann nicht ausgelesen werden"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Handbuchseiten unter %s werden verarbeitet ...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "veraltetes »cat«-Verzeichnis %s wird entfernt ...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
"Warnung: keine MANDB_MAP-Anweisungen in %s, ihr Handbuchpfad wird verwendet"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
msgstr[0] "%d Handbuchverzeichnis enthielt neuere Handbuchseiten.\n"
msgstr[1] "%d Handbuchverzeichnisse enthielten neuere Handbuchseiten.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] "%d Handbuchseite wurde hinzugefügt.\n"
msgstr[1] "%d Handbuchseiten wurden hinzugefügt.\n"
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "%d herrenlose »cat«-Datei wurde hinzugefügt.\n"
msgstr[1] "%d herrenlose »cat«-Dateien wurden hinzugefügt.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d alter Datenbankeintrag wurde entfernt.\n"
msgstr[1] "%d alte Datenbankeinträge wurden entfernt.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Keine Datenbanken erstellt."
@@ -872,27 +872,27 @@ msgstr ""
"Warnung: Keine globalen Handbuchpfade (MANPATH) in Konfigurationsdatei %s "
"gesetzt"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "Warnung: %s ist eine freihängende symbolische Verknüpfung"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "%s kann nicht aufgelöst werden"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Handbuchseiten ohne »cat«-Dateien in %s werden gesucht ...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "Warnung: Indexcache %s kann nicht aktualisiert werden"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s bezieht sich auf sich selbst"
diff --git a/po/eo.po b/po/eo.po
index 1376142b..d5ecbe31 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.1-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2013-02-19 13:10-0300\n"
"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "ne eblas difini la faktan uid"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "la man-uzanto kun setuid \"%s\" ne ekzistas"
@@ -59,12 +59,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "nur %d kampo en enhavo"
msgstr[1] "nur %d kampoj en enhavo"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "malĝusta havigo per plur-ŝlosilo %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "La datumbazon %s fuŝas; rekonstruu per mandb --create"
@@ -94,7 +94,7 @@ msgid "The man database defaults to %s%s."
msgstr "La man-datumbazo apriore estas %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "sendi rafinigajn mesaĝojn"
@@ -108,20 +108,20 @@ msgstr "ne eblas malfermi %s por legi"
msgid "[SECTION...]"
msgstr "[SEKCIO...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "VOJO"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "difini serĉvojo por manlibraj paĝoj al VOJO"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "DOSIERO"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "uzi tiun ĉi uzant-agorda dosiero"
@@ -160,77 +160,72 @@ msgstr "ne eblas skribi ene de %s"
msgid "unable to update %s"
msgstr "Ne eblas ĝisdatigi %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "averto: %s/man%s/%s.%s*: konkurantaj sufiksoj"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "ne eblas ĝisdatigi la indeksan kaŝmemoron %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "averto: %s: malĝusta symlink aŭ peto de ROFF '.so'"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "averto: %s: ni preteratentas malplenan dosieron"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "averto: %s: analizo de whatis por %s(%s) fiaskis"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "ne eblas serĉi la dosierujon %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "averto: ne eblas krei la catdir %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "ne eblas ŝanĝi al la dosierujo %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "ne eblas krei la indeksan kaŝmemoron %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Ĝisdatigo de indeksa kaŝmemoro por la vojo '%s/%s'. Atendu..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "farite.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Viŝo de malnovaj datumbazaj enigoj en %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Ne eblas konverti %s al cat-nomo"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "averto: fiasko dum konservo de elemento por %s(%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "averto: %s: ni preteratentas aĉan dosiernomon"
@@ -239,19 +234,19 @@ msgstr "averto: %s: ni preteratentas aĉan dosiernomon"
msgid "PATH SECTION NAME"
msgstr "VOJO SEKCIO NOMO"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "SUFIKSO"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "limigi serĉon al la sufiksa tipo SUFIKSO"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "serĉi paĝojn sen-usklece (aprioras)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "serĉi paĝojn usklece"
@@ -263,16 +258,16 @@ msgstr "interpreti paĝ-nomon kiel regulesprimon"
msgid "the page name contains wildcards"
msgstr "la paĝ-nomo enhavas ĵokerojn"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "averto: whatis por %s troigas %d bajton, ni tranĉas."
msgstr[1] "averto: whatis por %s troigas %d bajtojn, ni tranĉas."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "ne eblas malfermi %s"
@@ -301,162 +296,162 @@ msgstr "montri informon de whatis"
msgid "show guessed series of preprocessing filters"
msgstr "montri supozitan serion da antaŭprocezaj filtriloj"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "ENKODIGO"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "uzi la elektitan eligan enkodigon"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: nekongruaj modifiloj"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "komando ĉesis kun stato %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[SEKCIO] PAĜO..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "redifini ĉiujn modifilojn al iliaj aprioraj valoroj"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "AVERTOJ"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "ebligi avertojn el groff"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Ĉefaj reĝimoj de operacio:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "samfunkcia al whatis"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "samfunkcia al apropos"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "serĉi tekston en ĉiuj paĝoj"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "montri fizikan lokon de man-paĝo(j)"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "montri fizikan lokon de cat-dosiero(j)n"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "interpreti argumento(j)n de PAĜO kiel loka(j)n dosiernomo(j)n"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr "uzata de catman por restrukturigi malaktualajn cat-paĝojn"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "eligi font-paĝon enkoditan laŭ ENKODIGO"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Trovo de manlibraj paĝoj:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "LOKAĴARO"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "difini la lokaĵaron por tiu ĉi specifa serĉo de man"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "SISTEMO"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "uzi manlibrajn paĝojn el aliaj sistemoj"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "LISTO"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "uzi dupunkto-apartitan sekcio-liston"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "montri ĉiujn paĝojn kongruajn al regulesprimo"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "montri ĉiujn paĝojn kongruajn al ĵokero"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"igi ke --regex kaj --wildcard kongruu nur al paĝ-nomoj, ne al priskriboj"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "trovi ĉiujn kongruajn manlibrajn paĝojn"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "devigi kontrolon pri kaŝmemora kohero"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr "ne provi subpaĝojn, ekz 'man foo bar' => 'man foo-bar'"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Regado de strukturita eligo:"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "PAĜILO"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "uzi la programon PAĜILO por montri eligon"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "ĈENO"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "provizi komandinviton al la paĝilo 'less'"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "montri mapigon ASCII por kelkaj signoj latin1"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "malaktivigi vorto-dividon"
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "malaktivigi ĝisrandigon"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -466,34 +461,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "uzi %s por strukturigi paĝojn"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "APARATO"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "uzi %s kun elektita aparato"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "FOLIUMILO"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "uzi %s aŭ FOLIUMILO por montri eligon HTML"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "DISTINGIVO"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -501,99 +496,96 @@ msgstr ""
"uzi groff kaj montri per gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "uzi groff kaj devigi ĝin produkti ditroff"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Neniu manlibra elemento por %s\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(Alternative, kiun manlibran paĝon vi volas el sekcio %s?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Kiun manlibran paĝon vi volas?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Neniu manlibra elemento por %s en sekcio %s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr "Konsultu '%s' por helpo kiam manlibraj paĝoj ne disponeblas.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "ne eblas apliki chdir al %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Manlibra paĝo "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "komando mandb fiaskis kun elir-stato %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "ni preteratentas nekonatan antaŭprocezilon '%c'"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "ne eblas apliki chown %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "ne eblas apliki chmod %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "ne eblas renomigi %s al %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "ne eblas difini horon en %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "ne eblas forigi %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "ne eblas krei provizoran cat por %s"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "ne eblas krei provizoran dosierujon"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "ne eblas malfermi la provizoran dosieron %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "ne eblas forigi la dosierujon %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- sekva: %s [ vidi (enigklavo) | salti (Ctrl-D) | eliri (Ctrl-C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "ne eblas apliki chdir al %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -602,21 +594,29 @@ msgstr ""
"\n"
"ne eblas skribi al %s sub reĝimo catman"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Ne eblas konverti %s al cat-nomo"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: fini je whatis refs estas malrekomendinde\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "komando mandb fiaskis kun elir-stato %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "interna eraro: kanditata tipo %d estas for de intervalo"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- sekva: %s [ vidi (enigklavo) | salti (Ctrl-D) | eliri (Ctrl-C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Manlibra paĝo "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -661,101 +661,101 @@ msgstr "devas indiki enigan enkodigon"
msgid "must specify an output encoding"
msgstr "devas indiki eligan enkodigon"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[MAN-VOJO]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "labori kviete, krom por averto pri 'aĉeco'"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "ne serĉi aŭ aldoni perditajn dosierojn cat al la dbs"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "ne forpurigi malaktualajn elementojn el la dbs"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "produkti nur datumbazojn de uzantoj"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "krei datumbazon elkomence, prefere ol ĝisdatigante"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "kontroli korektecon de manlibraj paĝoj"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "DOSIERNOMO"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "ĝisdatigi nur la elementon por tiu ĉi dosiernomo"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "ne eblas forigi %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "ne eblas skribi al %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "ne eblas legi el %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Procezado de manlibraj paĝoj sub %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Forigado de malaktuala cat-dosierujo %s...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr "averto: neniu instrukcio MANDB_MAP en %s, ni uzas vian man-vojon"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
msgstr[0] "%d man-subdosierujo enhavis pli novajn manlibrajn paĝojn.\n"
msgstr[1] "%d man-subdosierujoj enhavis pli novajn manlibrajn paĝojn.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] "%d manlibra paĝo estis aldonata.\n"
msgstr[1] "%d manlibraj paĝoj estis aldonataj.\n"
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "%d perdita cat estis aldonata.\n"
msgstr[1] "%d perditaj cat estis aldonataj.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d malnova datumbaza elemento estis forpurigata.\n"
msgstr[1] "%d malnovaj datumbazaj elementoj estis forpurigataj.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Neniu datumbazo estis kreata."
@@ -848,27 +848,27 @@ msgstr "montri la tutan mallokan man-vojon"
msgid "warning: no global manpaths set in config file %s"
msgstr "averto: neniu malloka man-vojo estas difinita en la agorda dosiero %s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "averto: %s estas sentrafa simbol-ligilo"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "ne eblas solvi %s"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Kontrolo pri perditaj cat sub %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "averto: ne eblas ĝisdatigi la indeksan kaŝmemoron %s"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s estas mem-referenca"
diff --git a/po/es.po b/po/es.po
index f1531e57..e1da444b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.3.20\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2002-07-03 21:52+0200\n"
"Last-Translator: David Martnez <ender@debian.org>\n"
"Language-Team: debian-l10n-spanish@lists.debian.org\n"
@@ -20,7 +20,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "no se puede asignar el uid efectivo."
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "el usuario setuid a man \"%s\" no existe."
@@ -57,12 +57,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "slo %d campos en el contenido."
msgstr[1] "slo %d campos en el contenido."
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "no se ha encontrado la clave mltiple %s."
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "Base de datos %s corrompida; reconstryala con mandb --create."
@@ -92,7 +92,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:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr ""
@@ -106,20 +106,20 @@ msgstr "no se puede abrir %s para leer."
msgid "[SECTION...]"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
#, fuzzy
msgid "use this user configuration file"
@@ -159,77 +159,72 @@ msgstr "no se puede escribir en %s."
msgid "unable to update %s"
msgstr "no se puede actualizar %s."
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "aviso: %s/man%s/%s.%s*: extensiones en conflicto."
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "no se puede actualizar el cach de ndices %s."
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "aviso: %s: enlace simblico o solicitud `.so' de ROFF incorrectos."
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "aviso: %s: ignorando fichero vaco."
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "aviso: %s: fall la exploracin de whatis para %s(%s)."
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "no se puede buscar en el directorio %s."
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "aviso: no se pudo crear directorio para cat %s."
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "no se puede entrar en el directorio %s."
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "no se puede crear el cach de ndices %s."
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Actualizando el cach de ndices para la ruta `%s/%s'. Aguarde..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "listo.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Purgando entradas antiguas en la base de datos en %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "No se puede convertir %s a un nombre de tipo cat."
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr ""
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "aviso: %s: ignorando nombre espurio de fichero."
@@ -238,19 +233,19 @@ msgstr "aviso: %s: ignorando nombre espurio de fichero."
msgid "PATH SECTION NAME"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr ""
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr ""
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr ""
@@ -262,16 +257,16 @@ msgstr ""
msgid "the page name contains wildcards"
msgstr ""
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, fuzzy, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "aviso: whatis para %s excede de %d bytes, se truncar el exceso."
msgstr[1] "aviso: whatis para %s excede de %d bytes, se truncar el exceso."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "no se puede abrir %s."
@@ -300,196 +295,196 @@ msgstr ""
msgid "show guessed series of preprocessing filters"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr ""
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, fuzzy, c-format
msgid "%s: incompatible options"
msgstr ": opciones incompatibles."
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "la orden termin y devolvi %d: %s."
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr ""
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr ""
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr ""
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr ""
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr ""
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr ""
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr ""
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr ""
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr ""
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr ""
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr ""
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr ""
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr ""
-#: src/man.c:297
+#: src/man.c:296
#, fuzzy
msgid "Finding manual pages:"
msgstr "Pgina de manual "
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr ""
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr ""
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr ""
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr ""
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr ""
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr ""
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr ""
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr ""
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr ""
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr ""
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr ""
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr ""
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr ""
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr ""
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr ""
-#: src/man.c:327
+#: src/man.c:326
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:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr ""
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr ""
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr ""
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr ""
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr ""
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr ""
-#: src/man.c:338
+#: src/man.c:337
#, fuzzy
msgid ""
"use groff and display through gxditview (X11):\n"
@@ -497,100 +492,97 @@ msgid ""
msgstr ""
" -X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12."
-#: src/man.c:340
+#: src/man.c:339
#, fuzzy
msgid "use groff and force it to produce ditroff"
msgstr "-Z, --ditroff usa groff y lo fuerza a generar ditroff."
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, fuzzy, c-format
msgid "No manual entry for %s\n"
msgstr "No existe entrada de manual para %s"
-#: src/man.c:605
+#: src/man.c:604
#, fuzzy, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "Qu pgina de manual de la seccin %s desea?\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Qu pgina de manual desea?\n"
-#: src/man.c:724
+#: src/man.c:723
#, fuzzy, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "No existe entrada de manual para %s"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr ""
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "no se puede cambiar al directorio %s."
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr "Pgina de manual "
-
-#: src/man.c:1222 src/man.c:3558
-#, fuzzy, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "la orden man fall con cdigo de salida %d."
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "se ignora el preprocesador desconocido `%c'."
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "no se puede realizar el chown %s."
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "no se puede realizar el chmod %s."
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "no se puede cambiar el nombre %s a %s."
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "no se puede cambiar la fecha de %s."
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "no se puede eliminar %s."
-#: src/man.c:2139
+#: src/man.c:1666
#, fuzzy, c-format
msgid "can't create temporary cat for %s"
msgstr "no se puede crear un nombre de fichero temporal."
-#: src/man.c:2253
+#: src/man.c:1780
#, fuzzy, c-format
msgid "can't create temporary directory"
msgstr "no se puede crear un nombre de fichero temporal."
-#: src/man.c:2265
+#: src/man.c:1792
#, fuzzy, c-format
msgid "can't open temporary file %s"
msgstr "no se puede abrir el fichero de configuracin de rutas de man %s."
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "no se puede borrar el directorio %s."
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- prxima: %s [ ver (return) | siguiente (Ctrl-D) | salir (Ctrl-C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "no se puede cambiar al directorio %s."
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -599,21 +591,29 @@ msgstr ""
"\n"
"no se puede escribir en %s en modo catman."
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "No se puede convertir %s a un nombre de tipo cat."
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: depender de las referencias de whatis est en desuso.\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, fuzzy, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "la orden man fall con cdigo de salida %d."
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr ""
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- prxima: %s [ ver (return) | siguiente (Ctrl-D) | salir (Ctrl-C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr "Pgina de manual "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, fuzzy, c-format
@@ -658,75 +658,75 @@ msgstr ""
msgid "must specify an output encoding"
msgstr ""
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr ""
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr ""
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr ""
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr ""
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr ""
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr ""
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr ""
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "no se puede borrar %s."
-#: src/mandb.c:257
+#: src/mandb.c:272
#, fuzzy, c-format
msgid "can't write to %s"
msgstr "no se puede escribir en %s."
-#: src/mandb.c:262
+#: src/mandb.c:277
#, fuzzy, c-format
msgid "can't read from %s"
msgstr "no se puede crear %s."
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Procesando las pginas de manual bajo %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, fuzzy, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Controlando si hay pginas cat sin fuentes bajo %s...\n"
# manpath es algo especfico, debe estar presente. nl
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
"aviso: no hay directivas MANDB_MAP en %s, se utilizar su ruta man (manpath)"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, fuzzy, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -737,28 +737,28 @@ msgstr[1] ""
"%d subdirectorios man tenan pginas de manual ms recientes.\n"
"Se aadieron %d pginas de manual.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, fuzzy, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] "Pgina de manual "
msgstr[1] "Pgina de manual "
-#: src/mandb.c:895
+#: src/mandb.c:910
#, fuzzy, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "Se aadieron %d cats sin fuentes.\n"
msgstr[1] "Se aadieron %d cats sin fuentes.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, fuzzy, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "Se han eliminado %d entradas antiguas en la base de datos.\n"
msgstr[1] "Se han eliminado %d entradas antiguas en la base de datos.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr ""
@@ -853,27 +853,27 @@ msgstr ""
"aviso: no se han asignado rutas man globales en el fichero de configuracin"
"%s."
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "aviso: %s es un enlace simblico cuyo destino no existe."
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "Es imposible resolver %s."
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Controlando si hay pginas cat sin fuentes bajo %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "aviso: no se pudo actualizar el cach de ndices %s."
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s se referencia a s mismo."
diff --git a/po/fi.po b/po/fi.po
index 72d5dbd8..5d3011b8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.4.2-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2004-01-25 15:07+0200\n"
"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "voimassaolevaa UID:ta ei voi asettaa"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr ""
@@ -58,12 +58,12 @@ msgid_plural "only %d fields in content"
msgstr[0] ""
msgstr[1] ""
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr ""
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr ""
@@ -94,7 +94,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:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr ""
@@ -108,20 +108,20 @@ msgstr ""
msgid "[SECTION...]"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
#, fuzzy
msgid "use this user configuration file"
@@ -159,77 +159,72 @@ msgstr ""
msgid "unable to update %s"
msgstr ""
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr ""
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr ""
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr ""
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "varoitus: %s: ei huomioida tyhjää tiedostoa"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr ""
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr ""
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr ""
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr ""
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr ""
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr ""
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "valmis.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr ""
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr ""
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr ""
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr ""
@@ -238,19 +233,19 @@ msgstr ""
msgid "PATH SECTION NAME"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr ""
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr ""
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr ""
@@ -262,16 +257,16 @@ msgstr ""
msgid "the page name contains wildcards"
msgstr ""
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
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:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr ""
@@ -300,315 +295,320 @@ msgstr ""
msgid "show guessed series of preprocessing filters"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr ""
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, fuzzy, c-format
msgid "%s: incompatible options"
msgstr ": epäyhteensopivat valitsimet"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr ""
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr ""
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr ""
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr ""
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr ""
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr ""
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr ""
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr ""
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr ""
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr ""
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr ""
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr ""
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr ""
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr ""
-#: src/man.c:297
+#: src/man.c:296
#, fuzzy
msgid "Finding manual pages:"
msgstr " Opastesivu "
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr ""
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr ""
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr ""
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr ""
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr ""
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr ""
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr ""
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr ""
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr ""
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr ""
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr ""
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr ""
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr ""
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr ""
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr ""
-#: src/man.c:327
+#: src/man.c:326
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:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr ""
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr ""
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr ""
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr ""
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr ""
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr ""
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
msgstr ""
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr ""
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Manuaalisivua %s ei ole\n"
-#: src/man.c:605
+#: src/man.c:604
#, fuzzy, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "Minkä opastesivun haluat osiosta %s?\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Minkä opastesivun haluat?\n"
-#: src/man.c:724
+#: src/man.c:723
#, fuzzy, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Manuaalisivua %s ei ole\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr ""
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr ""
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Opastesivu "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "mandb-komento epäonnistui paluuarvolla %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "ei huomioida tuntematonta esikäsittelintä \"%c\""
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr ""
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr ""
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr ""
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr ""
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr ""
-#: src/man.c:2139
+#: src/man.c:1666
#, fuzzy, c-format
msgid "can't create temporary cat for %s"
msgstr "varoitus: väliaikaistiedostoa %s ei voi luoda"
-#: src/man.c:2253
+#: src/man.c:1780
#, fuzzy, c-format
msgid "can't create temporary directory"
msgstr "varoitus: väliaikaistiedostoa %s ei voi luoda"
-#: src/man.c:2265
+#: src/man.c:1792
#, fuzzy, c-format
msgid "can't open temporary file %s"
msgstr "opastepolkujen asetustiedostoa %s ei voi avata"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr ""
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr ""
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
"cannot write to %s in catman mode"
msgstr ""
-#: src/man.c:3413
+#: src/man.c:2329
#, c-format
-msgid "%s: relying on whatis refs is deprecated\n"
+msgid "Can't convert %s to cat name"
msgstr ""
-#: src/man.c:3760
+#: src/man.c:3047
#, c-format
-msgid "internal error: candidate type %d out of range"
+msgid "%s: relying on whatis refs is deprecated\n"
msgstr ""
-#: src/man.c:4026
+#: src/man.c:3196 src/man.c:3968
#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgid "mandb command failed with exit status %d"
+msgstr "mandb-komento epäonnistui paluuarvolla %d"
+
+#: src/man.c:3398
+#, c-format
+msgid "internal error: candidate type %d out of range"
msgstr ""
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Opastesivu "
+
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, fuzzy, c-format
msgid "can't write to standard output"
@@ -652,101 +652,101 @@ msgstr ""
msgid "must specify an output encoding"
msgstr ""
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr ""
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr ""
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr ""
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr ""
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr ""
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr ""
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr ""
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "tiedostoa %s ei voi poistaa"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "tiedostoon %s ei voi kirjoittaa"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "tiedostosta %s ei voi lukea"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr ""
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr ""
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
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:891
+#: src/mandb.c:906
#, fuzzy, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] " Opastesivu "
msgstr[1] " Opastesivu "
-#: src/mandb.c:895
+#: src/mandb.c:910
#, fuzzy, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "%d jotain .. ööö.. kulkukissaa lisättiin.\n"
msgstr[1] "%d jotain .. ööö.. kulkukissaa lisättiin.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, fuzzy, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d vanhaa tietokantamerkintää poistettiin.\n"
msgstr[1] "%d vanhaa tietokantamerkintää poistettiin.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, fuzzy, c-format
msgid "No databases created."
msgstr "Tietokantoja ei päivitetty."
@@ -841,27 +841,27 @@ msgstr ""
"varoitus: asetustiedostossa %s ei ole asetettu järjestelmänlaajuisia "
"opastepolkuja"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "varoitus: %s on rikkinäinen symlinkki"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr ""
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr ""
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr ""
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s viittaa itseensä"
diff --git a/po/fr.po b/po/fr.po
index 1a410aea..00642b14 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.1-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2012-02-06 14:43-0400\n"
"Last-Translator: David Prévot <david@tilapin.org>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "impossible de positionner le propriétaire (UID) effectif"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "l'utilisateur man privilégié (setuid) « %s » n'existe pas"
@@ -61,12 +61,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "il n'y a qu'un champ dans le contenu"
msgstr[1] "il n'y a que %d champs dans le contenu"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "mauvais accès sur la clef multiple %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "La base %s est corrompue, reconstruisez-la avec mandb --create"
@@ -96,7 +96,7 @@ msgid "The man database defaults to %s%s."
msgstr "La base de données par défaut est %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "affichage des messages de débogage"
@@ -110,20 +110,20 @@ msgstr "impossible d'ouvrir %s en lecture"
msgid "[SECTION...]"
msgstr "[SECTION...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "CHEMIN"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "configure le chemin de recherche des pages de manuel à CHEMIN"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "FICHIER"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "utilise ce fichier de configuration utilisateur"
@@ -162,77 +162,72 @@ msgstr "impossible d'écrire dans %s"
msgid "unable to update %s"
msgstr "impossible de mettre %s à jour"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "attention : %s/man%s/%s.%s* : extensions en conflit"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "impossible de mettre à jour le cache d'index %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "attention : %s : lien symbolique ou directive ROFF « .so » incorrect"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "attention : %s : fichier vide ignoré"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "attention : %s : la recherche de whatis sur %s(%s) a échoué"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "impossible de chercher dans le répertoire %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "attention : impossible de créer le répertoire de pages préformatées %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "impossible d'aller dans le répertoire %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "impossible de créer le cache d'index %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Mise à jour du cache d'index pour le chemin « %s/%s ». Attendez…"
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "terminé.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Effacement des entrées inutiles de %s en cours…\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Impossible de convertir %s en nom de page préformatée"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "attention : impossible de stocker l'entrée pour %s(%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "attention : %s : nom de fichier erroné, ignoré"
@@ -241,19 +236,19 @@ msgstr "attention : %s : nom de fichier erroné, ignoré"
msgid "PATH SECTION NAME"
msgstr "CHEMIN SECTION NOM"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "EXTENSION"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "limite la recherche aux extensions EXTENSION"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "recherche les pages sans distinguer la casse (par défaut)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "recherche les pages en distinguant la casse"
@@ -265,16 +260,16 @@ msgstr "considère le nom de page comme une expression rationnelle"
msgid "the page name contains wildcards"
msgstr "le nom de page contient des caractères joker"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "attention : whatis pour %s dépasse d'un octet, excédent tronqué."
msgstr[1] "attention : whatis pour %s dépasse de %d octets, excédent tronqué."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "impossible d'ouvrir %s"
@@ -303,165 +298,165 @@ msgstr "affiche les renseignements comme whatis"
msgid "show guessed series of preprocessing filters"
msgstr "affiche la liste supposée des filtres de pré-traitement"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "ENCODAGE"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "utilise l'encodage d'affichage choisi"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s : options incompatibles"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "commande terminée avec %d comme code de retour : %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[SECTION] PAGE..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "réinitialise les valeurs par défaut des options"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "AVERTISSEMENTS"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "active les avertissements de groff"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Modes opératoires principaux :"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "équivalent à whatis"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "équivalent à apropos"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "recherche le texte dans toutes les pages"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "affiche l'emplacement des pages du manuel"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "affiche l'emplacement des fichiers « cat »"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "interprète l'argument PAGE comme un nom de fichier"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr "utilisé par catman pour reformater les pages trop vieilles"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "affiche le code source converti en ENCODAGE"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Recherche des pages de manuel :"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "LOCALE"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "définit la locale pour cette recherche de manuel"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "SYSTÈME"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "utilise les pages de manuel d'autres systèmes"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "LISTE"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "utilise la liste des sections séparées par des deux-points"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "montre toutes les pages correspondant à l'expression rationnelle"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "montre toutes les pages correspondant au caractère joker"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"correspond seulement aux noms de pages avec --regex et --wildcard, pas aux "
"descriptions"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "trouve toutes les pages correspondantes"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "force une vérification de cohérence du cache"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr ""
"ne prend pas en compte les sous-commandes, par exemple « man truc bidule » "
"=> « man truc-bidule »"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Contrôle du format d'affichage :"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "AFFICHEUR"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "utilise de programme AFFICHEUR pour l'affichage"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "CHAÎNE"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "donne une chaîne d'invite à « less »"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "affiche un équivalent ASCII de certains caractères latin1"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "désactive la césure"
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "désactive la justification"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -471,34 +466,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "utilise %s pour formater les pages"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "PÉRIPHÉRIQUE"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "utilise %s avec le périphérique sélectionné"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "NAVIGATEUR"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "utilise %s ou NAVIGATEUR pour l'affichage HTML"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "RÉSOLUTION"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -506,101 +501,99 @@ msgstr ""
"utilise groff et affiche avec gditview (X11) :\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "utilise groff en le forçant à produire ditroff"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Aucune entrée de manuel pour %s\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(Sinon, quelle page de manuel de la section %s voulez-vous ?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Quelle page de manuel voulez-vous ?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Aucune entrée de manuel pour %s en section %s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr ""
"voir « %s » pour obtenir de l'aide quand les pages de manuel ne sont pas "
"disponibles.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "impossible d'aller dans le répertoire %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Page de manuel "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "la commande mandb a échoué avec le code de retour %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "le préprocesseur « %c » est inconnu et ignoré"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "impossible de changer le propriétaire de %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "impossible de changer les droits de %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "impossible de renommer %s en %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "impossible de changer la date de %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "impossible de supprimer %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "impossible de créer une page « cat » temporaire pour %s"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "impossible de créer le répertoire temporaire"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "impossible d'ouvrir le fichier temporaire %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "impossible de supprimer le répertoire %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- prochain : %s [ voir (entrée) | passer (Ctrl-D) | quitter (Ctrl-"
+"C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "impossible d'aller dans le répertoire %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -609,23 +602,30 @@ msgstr ""
"\n"
"impossible d'écrire vers %s en mode catman"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Impossible de convertir %s en nom de page préformatée"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr ""
"%s : il est conseillé de ne plus se baser sur les références de whatis\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "la commande mandb a échoué avec le code de retour %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "erreur interne : le type candidat %d est hors de portée"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- prochain : %s [ voir (entrée) | passer (Ctrl-D) | quitter (Ctrl-"
-"C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Page de manuel "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -670,103 +670,103 @@ msgstr "l'encodage d'entrée doit être précisé"
msgid "must specify an output encoding"
msgstr "l'encodage de sortie doit être précisé"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[MANPATH]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "n'affiche rien à part les avertissement de dysfonctionnement"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "ne cherche ni n'ajoute de fichiers « cat » parasites dans la base"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "ne supprime pas les entrées obsolètes de la base"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "produit seulement les bases utilisateur"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "crée les bases du début plutôt qu'une mise à jour"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "vérifie la validité des pages de manuel"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "NOM_DE_FICHIER"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "met seulement à jour l'entrée correspondant à ce nom de fichier"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "impossible de supprimer %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "impossible d'écrire dans %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "impossible de lire à partir de %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Traitement des pages du manuel sous %s…\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Suppression du répertoire « cat » obsolète %s…\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
"attention : aucune directive MANDB_MAP dans %s, votre fichier manpath est "
"utilisé"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
msgstr[0] "Un sous-répertoire de manuel contient de nouvelles pages.\n"
msgstr[1] "%d sous-répertoires de manuel contiennent de nouvelles pages.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] "Une page de manuel a été ajoutée.\n"
msgstr[1] "%d pages de manuel ont été ajoutées.\n"
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "Une page sans source a été ajoutée.\n"
msgstr[1] "%d pages sans source ont été ajoutées.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "Une entrée inutile de la base a été supprimée.\n"
msgstr[1] "%d entrées inutiles de la base ont été supprimées.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Aucune base de données créée."
@@ -863,27 +863,27 @@ msgstr ""
"attention : aucun chemin de pages de manuel dans le fichier de configuration "
"%s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "attention : %s est un lien symbolique flottant"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "impossible de résoudre %s"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Recherche des fichiers préformatés sans sources sous %s…\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "attention : impossible de mettre à jour le cache d'index %s"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s s'auto-référence"
diff --git a/po/id.po b/po/id.po
index 1d5e45d6..d108260a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.6-pre2\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2014-08-10 19:00+0700\n"
"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "tidak dapat menset uid efektif"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "setuid pengguna man \"%s\" tidak ada"
@@ -59,12 +59,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "hanya bagian %d ada dalam isi"
msgstr[1] "hanya bagian %d ada dalam isi"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "pengambilan buruk di multi kunci %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "Basis data %s terkorupsi; membuat kembali dengan mandb --create"
@@ -94,7 +94,7 @@ msgid "The man database defaults to %s%s."
msgstr "Basis data man baku ke %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "keluarkan pesan penelusuran"
@@ -108,20 +108,20 @@ msgstr "tidak dapat membuka %s untuk pembacaan"
msgid "[SECTION...]"
msgstr "[BAGIAN...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "JALUR"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "tentukan jalur pencarian untuk halaman buku panduan ke JALUR"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "BERKAS"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "gunakan berkas konfigurasi pengguna ini"
@@ -160,77 +160,72 @@ msgstr "tidak dapat menulis didalam %s"
msgid "unable to update %s"
msgstr "tidak dapat memperbarui %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "peringatan: %s/man%s/%s.%s*: ekstensi berkompetisi"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "tidak dapat mengupdate persediaan indeks %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "peringatan: %s: symlink buruk atau ROFF `.so' diminta"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "peringatan: %s: mengabaikan berkas kosong"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "peringatan: %s: whatis parse untuk %s(%s) gagal"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "tidak dapat mencari direktori %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "peringatan: tidak dapat membuat catdir %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "tidak dapat mengubah direktori %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "tidak dapat membuat persediaan indeks %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Memperbarui persediaan indeks untuk jalur `%s/%s'. Mohon tunggu..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "selesai.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Menghapus masukan basis data lama dalam %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Tidak dapat mengubah %s ke nama cat"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "peringatan: gagal untuk menyimpan masukan untuk %s(%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "peringatan: %s: mengabaikan nama berkas palsu"
@@ -239,19 +234,19 @@ msgstr "peringatan: %s: mengabaikan nama berkas palsu"
msgid "PATH SECTION NAME"
msgstr "NAMA JALUR BAGIAN"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "EKSTENSI"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "batasi pencarian ke tipe ekstensi EKSTENSI"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "cari untuk halaman dengan tidak membedakan besar huruf (baku)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "cari untuk halaman dengan membedakan besar huruf"
@@ -263,16 +258,16 @@ msgstr "intepretasikan nama halaman sebagai sebuah regex"
msgid "the page name contains wildcards"
msgstr "nama halaman berisi huruf bebas"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "peringatan: whatis untuk %s melebihi %d bytes, dipotong."
msgstr[1] "peringatan: whatis untuk %s melebihi %d bytes, dipotong."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "tidak dapat membuka %s"
@@ -301,163 +296,163 @@ msgstr "tampilkan informasi whatis"
msgid "show guessed series of preprocessing filters"
msgstr "tampilkan urutan terkaan dari preproses penyaring"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "PENGKODEAN"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "gunakan pengkodean keluaran yang dipilih"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: pilihan tidak kompatibel"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "perintah keluar dengan status %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[BAGIAN] HALAMAN..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "reset semua pilihan ke nilai bakunya"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "PERINGATAN"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "aktifkan peringatan dari groff"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Mode operasi utama:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "sama dengan whatis"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "sama dengan apropos"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "cari teks dalam seluruh halaman"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "tampilkan lokasi aktual dari halaman man"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "tampilkan lokasi aktual dari halaman cat"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "interpretasikan HALAMAN argumen sebagai nama berkas lokal"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr ""
"digunakan oleh catman untuk mereformat keluaran dari halaman tanggal cat"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "keluaran sumber halaman dikodekan dalam PENGKODEAN"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Mencari halaman manual:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "LOKAL"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "definisikan lokal untuk pencarian man ini"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "SISTEM"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "gunakan halaman manual dari sistem lain"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "DAFTAR"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "gunakan daftar bagian dipisahkan oleh kolon"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "tampilkan seluruh halaman yang cocok dengan regex"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "tampilkan seluruh halaman yang cocok dengan huruf bebas"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"buat pencocokan nama halaman --regex dan --wildcard saja, bukan deskripsi"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "cari seluruh halaman buku panduan yang cocok"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "paksa sebuah pemeriksaan konsistensi persediaan"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr "jangan coba halaman dalam, contoh 'man foo bar' => 'man foo-bar'"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Mengontrol keluaran terformat:"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "PAGER"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "gunakan aplikasi PAGER untuk menampilkan keluaran"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "STRING"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "sediakan pager `less' dengan sebuah prompt"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "tampilkan terjemahan ASCII dari beberapa karakter latin1"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "non-aktifkan hyphenasi"
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "non-aktifkan hyphenasi"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -467,34 +462,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "gunakan %s untuk memformat halaman"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "PERANGKAT"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "gunakan %s dengan perangkat yang dipilih"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "BROWSER"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "gunakan %s atau BROWSER untuk menampilkan keluaran HTML"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "RESOLUSI"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -502,101 +497,99 @@ msgstr ""
"gunakan groff dan tampilkan melalui gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "gunakan groff dan paksa itu untuk menghasilkan ditroff"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Tidak ada masukan buku panduan untuk %s\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr ""
"(Secara alternatif, halaman buku panduan mana yang anda inginkan dari bagian "
"%s?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Halaman buku panduan mana yang anda inginkan?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Tidak ada masukan buku panduan untuk %s dalam bagian%s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr "Lihat '%s' untuk bantuan ketika halaman manual tidak tersedia.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "tidak dapat chdir ke %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Halaman buku panduan "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "perintah mandb gagal dengan status keluar %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "mengabaikan preprosesor tidak dikenal `%c'"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "tidak dapat chown %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "tidak dapat chmod %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "tidak dapat mengubah nama %s ke %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "tidak dapat menset waktu di %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "tidak dapat unlink %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "tidak dapat membuat cat sementara untuk %s"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "tidak dapat membuat direktori sementara"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "tidak dapat membuka berkas sementara %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "tidak dapat menghapus direktori %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- selanjutnya: %s [ lihat (return) | lewat (Ctrl-D) | berhenti (Ctrl-"
+"C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "tidak dapat chdir ke %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -605,22 +598,29 @@ msgstr ""
"\n"
"tidak dapat menulis ke %s dalam mode catman"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Tidak dapat mengubah %s ke nama cat"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: bergantung ke referensi whatis sudah ditinggalkan\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "perintah mandb gagal dengan status keluar %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "internal error: tipe kandidat %d diluar dari jangkauan"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- selanjutnya: %s [ lihat (return) | lewat (Ctrl-D) | berhenti (Ctrl-"
-"C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Halaman buku panduan "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -665,74 +665,74 @@ msgstr "harus menspesifikasikan sebuah pengkodean masukan"
msgid "must specify an output encoding"
msgstr "harus menspesifikasikan sebuah pengkodean keluaran"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[JALUR MAN]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "bekerja secara halus, kecuali untuk peringatan 'palsu'"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "jangan mencari atau menambahkan cats menyimpang ke basis data"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "jangan menghapus masukan yang sudah ditinggalkan dari basis data"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "hanya menghasilkan basis data pengguna"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "membuat basis data dari serpihan, daripada memperbaruinya"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "memeriksa halaman buku panduan untuk kebenarannya"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "NAMA BERKAS"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "perbarui hanya masukan untuk nama berkas ini"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "tidak dapat menghapus %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "tidak dapat menulis ke %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "tidak dapat membaca dari %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Memproses halaman buku panduan dibawah %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Memeriksa untuk cats menyimpang dibawah %s...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
"peringatan: tidak ada direktif MANDB_MAP dalam %s, menggunakan jalur man anda"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -743,28 +743,28 @@ msgstr[1] ""
"%d man subdirektori berisi halaman buku panduan lebih baru. halaman buku "
"panduan telah ditambahkan.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] "%d Halaman buku panduan \n"
msgstr[1] "%d Halaman buku panduan \n"
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "%d cats menyimpang telah ditambahkan.\n"
msgstr[1] "%d cats menyimpang telah ditambahkan.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d masukan basis data lama telah dihapus.\n"
msgstr[1] "%d masukan basis data lama telah dihapus.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Tidak ada basis data yang dibuat."
@@ -857,27 +857,27 @@ msgstr "tampilkan seluruh global manpath"
msgid "warning: no global manpaths set in config file %s"
msgstr "peringatan: tidak ada global manpath diset dalam berkas konfigurasi %s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "peringatan: %s adalah sebuah sambungan simbolik yang rusak"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "tidak dapat meresolf %s"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Memeriksa untuk cats menyimpang dibawah %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "peringatan: tidak dapat memperbarui persediaan indeks %s"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s adalah mereferensikan dirinya sendiri"
diff --git a/po/it.po b/po/it.po
index 16a441d4..54c575fc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.4.3\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2005-12-10 17:30+0100\n"
"Last-Translator: Giuseppe Sacco <eppesuig@debian.org>\n"
"Language-Team: Italian <tp@linux.it>\n"
@@ -21,7 +21,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "impossibile impostare lo uid effettivo"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "non esiste l'utente man con setuid \"%s\""
@@ -58,12 +58,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "trovati solo %d campi"
msgstr[1] "trovati solo %d campi"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "fetch errato sulla chiave multipla %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "Il database %s corrotto; lo si ricrei con mandb --create"
@@ -93,7 +93,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:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr ""
@@ -107,20 +107,20 @@ msgstr "impossibile aprire %s in lettura"
msgid "[SECTION...]"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
#, fuzzy
msgid "use this user configuration file"
@@ -160,78 +160,73 @@ msgstr "impossibile scrivere all'interno di %s"
msgid "unable to update %s"
msgstr "impossibile aggiornare %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "attenzione: %s/man%s/%s.%s*: estensioni in conflitto"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "impossibile aggiornare l'indice %s della cache"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "attenzione: %s: link simbolico o richiesta ROFF \".so\" errato(a)"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "attenzione: %s: viene ignorato un file vuoto"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "attenzione: %s: analisi whatis per %s(%s) fallita"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "impossibile ricercare nella directory %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "attenzione: impossibile creare la directory %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "impossibile posizionarsi nella directory %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "impossibile creare l'indice %s della cache"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr ""
"Aggiornamento dell'indice della cache per il percorso \"%s/%s\". Attendere..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "fatto.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Rimozione delle vecchie voci di basi dati in %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Impossibile convertire %s nel nome cat"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "attenzione: c' stato un errore memorizzando il dato %s(%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "attenzione: %s: vengono ignorati i nomi di file fasulli"
@@ -240,19 +235,19 @@ msgstr "attenzione: %s: vengono ignorati i nomi di file fasulli"
msgid "PATH SECTION NAME"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr ""
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr ""
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr ""
@@ -264,16 +259,16 @@ msgstr ""
msgid "the page name contains wildcards"
msgstr ""
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, fuzzy, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "attenzione: whatis per %s eccede di %d byte, troncato."
msgstr[1] "attenzione: whatis per %s eccede di %d byte, troncato."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "impossibile aprire %s"
@@ -302,295 +297,292 @@ msgstr ""
msgid "show guessed series of preprocessing filters"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr ""
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, fuzzy, c-format
msgid "%s: incompatible options"
msgstr ": opzioni incompatibili"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "comando terminato con stato d'uscita %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr ""
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr ""
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr ""
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr ""
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr ""
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr ""
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr ""
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr ""
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr ""
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr ""
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr ""
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr ""
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr ""
-#: src/man.c:297
+#: src/man.c:296
#, fuzzy
msgid "Finding manual pages:"
msgstr " Pagina di manuale "
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr ""
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr ""
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr ""
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr ""
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr ""
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr ""
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr ""
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr ""
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr ""
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr ""
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr ""
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr ""
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr ""
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr ""
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr ""
-#: src/man.c:327
+#: src/man.c:326
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:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr ""
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr ""
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr ""
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr ""
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr ""
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr ""
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
msgstr ""
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr ""
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Non c' il manuale per %s\n"
-#: src/man.c:605
+#: src/man.c:604
#, fuzzy, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "Quale pagina di manuale si desidera della sezione %s?\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Quale pagina di manuale si desidera?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Non c' il manuale per %s nella sezione %s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr ""
"Si veda \"%s\" per l'aiuto quando le pagine di manuali non sono presenti.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "impossibile fare chdir a %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Pagina di manuale "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "comando mandb fallito con stato d'uscita %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "preprocessore \"%c\" sconosciuto, lo ignoro"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "impossibile fare chown su %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "impossibile fare chmod su %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "impossibile rinominare %s in %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "impossibile impostare la data per %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "impossibile fare unlink di %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "impossibile creare un file 'cat' temporaneo per %s"
-#: src/man.c:2253
+#: src/man.c:1780
#, fuzzy, c-format
msgid "can't create temporary directory"
msgstr "impossibile creare un file 'cat' temporaneo per %s"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "impossibile aprire il file temporaneo %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "impossibile rimuovere la directory %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- successivo: %s [ mostra (return) | salta (Ctrl-D) | esci (Ctrl-C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "impossibile fare chdir a %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -599,21 +591,29 @@ msgstr ""
"\n"
"impossibile scrivere in %s in modo catman"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Impossibile convertire %s nel nome cat"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: confidare nei whatis refs obsoleto\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "comando mandb fallito con stato d'uscita %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "errore interno: il tipo %d candidato oltre il limite"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- successivo: %s [ mostra (return) | salta (Ctrl-D) | esci (Ctrl-C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Pagina di manuale "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, fuzzy, c-format
@@ -658,73 +658,73 @@ msgstr ""
msgid "must specify an output encoding"
msgstr ""
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr ""
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr ""
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr ""
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr ""
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr ""
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr ""
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr ""
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "impossibile rimuovere %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "impossibile scrivere in %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "impossibile leggere da %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Lavorazione delle pagine di manuale sotto a %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, fuzzy, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Ricerca degli stray cat sotto a %s...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr "attenzione: nessuna direttiva MANDB_MAP in %s, uso del tuo manpath"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, fuzzy, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -735,28 +735,28 @@ msgstr[1] ""
"%d sottodirectory man contenevano nuove pagine di manuale.\n"
"Sono state aggiunte %d pagine di manuale\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, fuzzy, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] " Pagina di manuale "
msgstr[1] " Pagina di manuale "
-#: src/mandb.c:895
+#: src/mandb.c:910
#, fuzzy, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "%d stray cat sono stati aggiunti.\n"
msgstr[1] "%d stray cat sono stati aggiunti.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, fuzzy, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d vecchie voci di database sono state rimosse.\n"
msgstr[1] "%d vecchie voci di database sono state rimosse.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, fuzzy, c-format
msgid "No databases created."
msgstr "Il database non stato aggiornato."
@@ -851,27 +851,27 @@ msgstr ""
"attenzione: nessun percorso man globale impostato nel file di configurazione "
"%s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "attenzione: %s un link simbolico spezzato"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "impossibile risolvere %s"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Ricerca degli stray cat sotto a %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "attenzione: impossibile aggiornare l'index %s della cache"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s auto referenziante"
diff --git a/po/ja.po b/po/ja.po
index c666d695..944cfaec 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db-2.6.5\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2013-06-27 19:41+0900\n"
"Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -23,7 +23,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "実効 UID を設定できません"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "setuid された man ユーザー \"%s\" は存在しません"
@@ -59,12 +59,12 @@ msgid "only %d field in content"
msgid_plural "only %d fields in content"
msgstr[0] "中身が %d フィールドしかありません"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "複合キー %s は不正な呼び出しです"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr ""
@@ -96,7 +96,7 @@ msgid "The man database defaults to %s%s."
msgstr "man データベースのデフォルトを %s%s にします。"
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "デバッグメッセージを表示する"
@@ -110,20 +110,20 @@ msgstr "%s を読み込み用に開けません"
msgid "[SECTION...]"
msgstr "[SECTION...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "PATH"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "man ページ用の検索パスを PATH に設定する"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "FILE"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "このユーザ設定ファイルを使用する"
@@ -162,78 +162,73 @@ msgstr "%s に書き込めません"
msgid "unable to update %s"
msgstr "%s を更新できません"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "警告: %s/man%s/%s.%s*: 拡張子が競合しています"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "index キャッシュ %s を更新できません"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr ""
"警告: %s: シンボリックリンクまたは ROFF の `.so' 要求に誤りがあります"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "警告: %s: 空ファイルを無視しています"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "警告: %s: whatis が %s(%s) の解釈に失敗しました"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "ディレクトリー %s を検索できません"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "警告: cat ディレクトリー %s を作成できません"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "ディレクトリ %s に移動できません"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "index キャッシュ %s を作成できません"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "パス `%s/%s' の index キャッシュを更新しています。お待ちください..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "完了しました。\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "%s 内の古いデータベース要素を取り除いています...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "%s を整形済みファイル名に変換できません"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "警告: %s(%s) 用の要素の保存に失敗しました"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "警告: %s: おかしなファイル名を無視しています"
@@ -242,19 +237,19 @@ msgstr "警告: %s: おかしなファイル名を無視しています"
msgid "PATH SECTION NAME"
msgstr "PATH SECTION NAME"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "EXTENSION"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "検索対象を拡張子が EXTENSION のものに限定する"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "大文字小文字を区別しないでページを検索する (デフォルト)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "大文字小文字を区別してページを検索する"
@@ -266,15 +261,15 @@ msgstr "ページ名を正規表現として解釈する"
msgid "the page name contains wildcards"
msgstr "ページ名をワイルドカードとして解釈する"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "警告: %s 用の whatis が %d バイトを超えています。切り詰めます。"
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "%s をオープンできません"
@@ -303,163 +298,163 @@ msgstr "whatis 情報を表示する"
msgid "show guessed series of preprocessing filters"
msgstr "推測した一連の事前処理フィルターを表示"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "ENCODING"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "選択した出力エンコーディングを使用する"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: 相互に利用できないオプションです"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "コマンドはステータス %d で終了しました: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[SECTION] PAGE..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "すべてのオプションをデフォルト値にリセットする"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "WARNINGS"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "groff からの警告を有効にする"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "操作の主なモード:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "whatis と同様"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "apropos と同様"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "すべてのページのテキストを検索する"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "マニュアルページの物理的な位置を表示する"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "整形済みファイルの物理的な位置を表示する"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "PAGE 引数をローカルファイル名として解釈する"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr "catman によって古い整形済みページを再整形するために使用される"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "ソースページのエンコーディングが ENCODING であるとみなして出力する"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "マニュアルページの探し方:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "LOCALE"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "この man の検索用のロケールを定義する"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "SYSTEM"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "ほかのシステムからのマニュアルページを使用する"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "LIST"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "セクションリストとしてコロン (:) で区切られた LIST を使用する"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "正規表現に一致したすべてのページを表示する"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "ワイルドカードに一致したすべてのページを表示する"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"--regex と --wildcard がページ名のみに一致するようにし、説明には一致しないよ"
"うにする"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "全ての一致したマニュアルページを探し出す"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "キャッシュ一貫性の確認を強制する"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr "サブページの試行、例えば 'man foo bar' => 'man foo-bar' を行わない"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "整形された出力の制御:"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "PAGER"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "出力を表示するプログラムとして PAGER を使用する"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "STRING"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "`less' ページャーのプロンプトを指定する"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "一部の latin1 文字を ASCII 文字に変換して表示する"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "ハイフンによる行末処理を無効にする"
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "均等割り付けを無効にする"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -469,34 +464,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "ページ整形に %s を使用する"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "DEVICE"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "選択した DEVICE 向けに %s を使用する"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "BROWSER"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "HTML 出力を表示するために %s または BROWSER を使用する"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "RESOLUTION"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -504,100 +499,97 @@ msgstr ""
"groff を使用し、 gxditview (X11) を通して表示する:\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "groff を使用し、強制的に ditroff を生成する"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "%s というマニュアルはありません\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(セクション %s からどのマニュアルページを代わりに表示しますか?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "マニュアルページを指定してください\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "%s というマニュアルはセクション %s にはありません\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr ""
"マニュアルページが利用できない場合のヘルプについては '%s'を見てください。\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "%s にディレクトリを変更できません"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " マニュアルページ "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "mandb コマンドが終了ステータス %d で失敗しました"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "不明な前処理系 `%c' を無視しています"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "%s の所有者を変更 (chown) できません"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "%s の許可属性を変更 (chmod) できません"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "%s の名前を %s に変更できません"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "%s の時刻を設定できません"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "%s を削除(unlink)できません"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "%s 用の一時的な整形済みファイルを作成できません"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "一時ディレクトリを作成できません"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "一時ファイル %s を開けません"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "ディレクトリ %s を削除できません"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- 次は: %s [ 閲覧 (return) | スキップ (Ctrl-D) | 終了 (Ctrl-C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "%s にディレクトリを変更できません"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -606,21 +598,29 @@ msgstr ""
"\n"
"catman モードで %s に書き込みできません"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "%s を整形済みファイル名に変換できません"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: whatis の参照に頼ることは勧められなくなっています\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "mandb コマンドが終了ステータス %d で失敗しました"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "内部エラー: 候補の種類 %d は範囲内にありません"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- 次は: %s [ 閲覧 (return) | スキップ (Ctrl-D) | 終了 (Ctrl-C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " マニュアルページ "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -665,76 +665,76 @@ msgstr "入力エンコーディングを指定しなければいけません"
msgid "must specify an output encoding"
msgstr "出力エンコーディングを指定しなければいけません"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[MANPATH]"
# Translator's NOTE: work..., don't look..., produce..., create are from:
# Translator's NOTE: http://lists.debian.or.jp/debian-doc/199812/msg00016.html
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "'ファイル名の不一致'による警告以外何も出力しない"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "roff のない cat ファイルを検索、DB へ追加しない"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "古くなったエントリーを DB から削除しない"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "ユーザ用データベースのみを生成"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "データベースを更新せず、一から作成し直す"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "マニュアルページの正確さをチェック"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "FILENAME"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "このファイル名の要素だけを更新"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "%s を削除できません"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "%s に書き込めません"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "%s から読み込めません"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "%s 配下のマニュアルページを処理しています...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "古い cat ディレクトリ %s を削除しています...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
"警告: %s に MANDB_MAP の指定はありません。あなたの manpath を使用します"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -742,25 +742,25 @@ msgstr[0] ""
"%d 個のマニュアルページ子ディレクトリに新しいマニュアルページが含まれていまし"
"た。\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] "%d 個のマニュアルページが追加されました。\n"
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "roff のない cat ファイルが %d 個追加されました。\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d 個の古いデータベース要素が除去されました。\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "データベースは作成されませんでした。"
@@ -853,27 +853,27 @@ msgstr "グローバルな manpath 全体を表示"
msgid "warning: no global manpaths set in config file %s"
msgstr "警告: 設定ファイル %s にグローバルな manpath の設定がありません"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "警告: %s はシンボリックリンクが切れています"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "%s を解決できません"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "%s 配下の roff がない cat ファイルをチェックしています...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "警告: index キャッシュ %s を更新できません"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s は自分自身を参照しています"
diff --git a/po/man-db.pot b/po/man-db.pot
index 39f9a515..3ff7e183 100644
--- a/po/man-db.pot
+++ b/po/man-db.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.7.1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\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"
@@ -23,7 +23,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr ""
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr ""
@@ -60,12 +60,12 @@ msgid_plural "only %d fields in content"
msgstr[0] ""
msgstr[1] ""
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr ""
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr ""
@@ -95,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:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr ""
@@ -109,20 +109,20 @@ msgstr ""
msgid "[SECTION...]"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr ""
@@ -159,77 +159,72 @@ msgstr ""
msgid "unable to update %s"
msgstr ""
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr ""
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr ""
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr ""
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr ""
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr ""
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr ""
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr ""
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr ""
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr ""
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr ""
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr ""
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr ""
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr ""
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr ""
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr ""
@@ -238,19 +233,19 @@ msgstr ""
msgid "PATH SECTION NAME"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr ""
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr ""
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr ""
@@ -262,16 +257,16 @@ msgstr ""
msgid "the page name contains wildcards"
msgstr ""
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
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:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr ""
@@ -300,312 +295,317 @@ msgstr ""
msgid "show guessed series of preprocessing filters"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr ""
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr ""
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr ""
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr ""
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr ""
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr ""
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr ""
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr ""
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr ""
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr ""
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr ""
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr ""
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr ""
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr ""
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr ""
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr ""
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr ""
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr ""
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr ""
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr ""
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr ""
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr ""
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr ""
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr ""
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr ""
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr ""
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr ""
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr ""
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr ""
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr ""
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr ""
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr ""
-#: src/man.c:327
+#: src/man.c:326
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:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr ""
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr ""
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr ""
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr ""
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr ""
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr ""
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
msgstr ""
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr ""
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr ""
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr ""
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr ""
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr ""
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr ""
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr ""
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr ""
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr ""
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr ""
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr ""
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr ""
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr ""
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr ""
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr ""
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr ""
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr ""
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr ""
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr ""
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr ""
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
"cannot write to %s in catman mode"
msgstr ""
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr ""
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr ""
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
#, c-format
-msgid "internal error: candidate type %d out of range"
+msgid "mandb command failed with exit status %d"
msgstr ""
-#: src/man.c:4026
+#: src/man.c:3398
#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgid "internal error: candidate type %d out of range"
+msgstr ""
+
+#: src/man.c:3898
+msgid " Manual page "
msgstr ""
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
@@ -651,101 +651,101 @@ msgstr ""
msgid "must specify an output encoding"
msgstr ""
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr ""
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr ""
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr ""
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr ""
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr ""
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr ""
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr ""
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr ""
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr ""
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr ""
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr ""
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr ""
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
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:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] ""
msgstr[1] ""
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] ""
msgstr[1] ""
-#: src/mandb.c:900
+#: src/mandb.c:915
#, 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:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr ""
@@ -838,27 +838,27 @@ msgstr ""
msgid "warning: no global manpaths set in config file %s"
msgstr ""
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr ""
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr ""
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr ""
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr ""
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 0e5a7c5b..89259f3b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db-2.5.7-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2009-11-16 08:36+0100\n"
"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "kan de effectieve UID niet instellen"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "de SETUID-gebruiker '%s' bestaat niet"
@@ -61,12 +61,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "slechts %d velden in de inhoud"
msgstr[1] "slechts %d velden in de inhoud"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "onjuiste treffer voor multisleutel %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "Database %s is beschadigd; maak deze opnieuw aan met 'mandb --create'"
@@ -96,7 +96,7 @@ msgid "The man database defaults to %s%s."
msgstr "De standaard man-database is %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "debug-uitvoer produceren"
@@ -110,20 +110,20 @@ msgstr "kan %s niet openen om te lezen"
msgid "[SECTION...]"
msgstr "[SECTIE...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "PAD"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "pad waarin naar man-pagina's gezocht moet worden"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "BESTAND"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "te gebruiken configuratiebestand"
@@ -162,79 +162,74 @@ msgstr "kan in %s niet schrijven"
msgid "unable to update %s"
msgstr "kan %s niet bijwerken"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "waarschuwing: botsende subsecties in %s/man%s/%s.%s*"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "kan index-cache %s niet bijwerken"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr ""
"waarschuwing: %s: onjuiste symbolische koppeling of onjuist roff-'.so'-"
"verzoek"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "waarschuwing: %s: leeg bestand wordt genegeerd"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "waarschuwing: %s: ontleden van %s(%s) voor 'whatis' is mislukt"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "kan map %s niet doorzoeken"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "waarschuwing: kan cat-map %s niet aanmaken"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "kan niet naar map %s gaan"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "kan index-cache %s niet aanmaken"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Bijwerken van index-cache voor pad '%s/%s'. Even geduld..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "voltooid.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Verwijderen van oude databaseitems uit %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Kan %s niet omzetten naar een cat-naam"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "waarschuwing: opslaan van item voor %s(%s) is mislukt"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "waarschuwing: %s: onjuiste bestandsnaam wordt genegeerd"
@@ -243,19 +238,19 @@ msgstr "waarschuwing: %s: onjuiste bestandsnaam wordt genegeerd"
msgid "PATH SECTION NAME"
msgstr "PAD SECTIE NAAM"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "SUBSECTIE"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "het zoeken beperken tot deze subsectie"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "hoofdletterongevoelig naar pagina's zoeken"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "hoofdlettergevoelig naar pagina's zoeken"
@@ -267,16 +262,16 @@ msgstr "paginanaam als reguliere expressies begrijpen"
msgid "the page name contains wildcards"
msgstr "de paginanaam bevat jokertekens"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, fuzzy, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "waarschuwing: de 'whatis' voor %s is meer dan %d bytes -- afgekapt"
msgstr[1] "waarschuwing: de 'whatis' voor %s is meer dan %d bytes -- afgekapt"
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "kan %s niet openen"
@@ -305,162 +300,162 @@ msgstr "'whatis'-informatie tonen"
msgid "show guessed series of preprocessing filters"
msgstr "de gegokte reeks voorbewerkingsfilters tonen"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "CODERING"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "uitvoer in deze codering produceren"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: opties gaan niet samen"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "opdracht eindigde met afsluitwaarde %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[SECTIE] PAGINA..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "alle opties op hun standaardwaarden terugzetten"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "WAARSCHUWINGEN"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "(deze) waarschuwingen van 'groff' doorgeven"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Werkingsmodus:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "als 'whatis' fungeren"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "als 'apropos' fungeren"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "zoek de tekst in alle pagina's"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "de locatie van man-pagina's tonen"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "de locatie van cat-pagina's tonen"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "paginanaam als lokale bestandsnaam begrijpen"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr "(gebruikt door 'catman' bij heropmaken)"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "brontekst uitvoeren omgezet naar deze codering"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Gevonden man-pagina's:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "TAALCODE"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "te gebruiken taalregio voor deze zoekopdracht"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "SYSTEEMNAAM"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "man-pagina's van deze andere Unix-systemen tonen"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "SECTIES"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "te doorzoeken secties (scheiden met dubbele punten)"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "alle pagina's tonen die voldoen aan de reguliere expressie"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "alle pagina's tonen die voldoen aan het jokerteken"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"laat --regex en --wildcard alleen paginanamen weergeven, geen beschrijvingen"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "alle passende pagina's vinden, niet alleen eerste"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "een cache-consistentiecontrole afdwingen"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr "probeer geen subpagina's, b.v. 'man foo bar' => 'man foo-bar'"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Uitvoerbesturing:"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "PROGRAMMA"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "dit programma gebruiken om de uitvoer te tonen"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "TEKENREEKS"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "deze tekens als prompt van 'less' gebruiken"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "een ASCII-versie van sommige Latin1-tekens tonen"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "woordafbreken uitschakelen"
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "uitvullen uitschakelen"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -470,34 +465,34 @@ msgstr ""
" e - [n]eqn p - pic t - tbl\n"
" g - grap r - refer v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "'%s' gebruiken om pagina's op te maken"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "APPARAAT"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "'%s' gebruiken met dit apparaat"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "PROGRAMMA"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "'%s' of PROGRAMMA gebruiken voor HTML-uitvoer"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "RESOLUTIE"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -505,99 +500,96 @@ msgstr ""
"'groff' gebruiken en uitvoer tonen via 'gxditview';\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "'groff' gebruiken en \"ditroff\" laten produceren"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Er is geen pagina over %s\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(Of anders: welke man-pagina wilt u zien uit sectie %s?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Welke man-pagina wilt u zien?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Er is geen pagina over %s in sectie %s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr "Zie '%s' voor hulp als man-pagina's niet beschikbaar zijn.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "kan niet naar map %s gaan"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Handleidingspagina "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "'mandb' is mislukt met afsluitwaarde %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "onbekende preprocessor '%c' wordt genegeerd"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "kan eigenaar van %s niet wijzigen"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "kan de toegangsrechten van %s niet wijzigen"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "kan %s niet hernoemen naar %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "kan tijdsstempels van %s niet zetten"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "kan %s niet verwijderen"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "kan geen tijdelijk cat-bestand aanmaken voor %s"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "kan geen tijdelijk map aanmaken"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "kan tijdelijk bestand %s niet openen"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "kan map %s niet verwijderen"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- volgende: %s [ Enter=zien | Ctrl-D=overslaan | Ctrl-C=afsluiten ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "kan niet naar map %s gaan"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -606,21 +598,29 @@ msgstr ""
"\n"
"kan niet naar %s schrijven in 'catman'-modus"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Kan %s niet omzetten naar een cat-naam"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: vertrouwen op 'whatis'-referenties wordt ontraden\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "'mandb' is mislukt met afsluitwaarde %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "**interne fout**: kandidaattype %d valt buiten bereik"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- volgende: %s [ Enter=zien | Ctrl-D=overslaan | Ctrl-C=afsluiten ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Handleidingspagina "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -665,74 +665,74 @@ msgstr "specificatie van een invoercodering ontbreekt"
msgid "must specify an output encoding"
msgstr "specificatie van een uitvoercodering ontbreekt"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[MANPAD]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "minder waarschuwingen produceren"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "losse cat-bestanden niet aan database toevoegen"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "verouderde items niet uit database verwijderen"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "alleen gebruikersdatabase produceren"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "database niet bijwerken maar opnieuw aanmaken"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "de man-pagina's op correctheid controleren"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "BESTAND"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "alleen het item voor dit bestand bijwerken"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "kan %s niet verwijderen"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "kan niet naar %s schrijven"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "kan niet uit %s lezen"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Verwerken van pagina's onder %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, fuzzy, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Zoeken naar losse cat-bestanden onder %s...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
"waarschuwing: geen 'MANDB_MAP'-opdrachten in %s; uw man-pad wordt gebruikt"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, fuzzy, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -743,28 +743,28 @@ msgstr[1] ""
"%d man-mappen bevatten nieuwere pagina's,\n"
"%d man-pagina's werden toegevoegd.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, fuzzy, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] " Handleidingspagina "
msgstr[1] " Handleidingspagina "
-#: src/mandb.c:895
+#: src/mandb.c:910
#, fuzzy, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "%d losse cat-bestanden werden toegevoegd.\n"
msgstr[1] "%d losse cat-bestanden werden toegevoegd.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, fuzzy, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d verouderde databaseitems werden verwijderd.\n"
msgstr[1] "%d verouderde databaseitems werden verwijderd.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Geen databases aangemaakt."
@@ -858,27 +858,27 @@ msgid "warning: no global manpaths set in config file %s"
msgstr ""
"waarschuwing: geen algemeen man-pad ingesteld in configuratiebestand %s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "waarschuwing: %s is een doelloze symbolische koppeling"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "kan %s niet herleiden"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Zoeken naar losse cat-bestanden onder %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "waarschuwing: kan index-cache %s niet bijwerken"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s refereert aan zichzelf"
diff --git a/po/pl.po b/po/pl.po
index 7d2114c8..45279c53 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.1-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2013-02-03 20:23+0100\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "nie można ustawić efektywnego identyfikatora użytkownika"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "użytkownik \"%s\" nie istnieje"
@@ -62,12 +62,12 @@ msgstr[0] "tylko %d pole w zmiennej content"
msgstr[1] "tylko %d pola w zmiennej content"
msgstr[2] "tylko %d pól w zmiennej content"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "błąd pobierania klucza wielowymiarowego %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr ""
@@ -99,7 +99,7 @@ msgid "The man database defaults to %s%s."
msgstr "Domyślną bazą danych jest %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "wyświetla komunikaty diagnostyczne"
@@ -113,21 +113,21 @@ msgstr "nie można otworzyć %s do odczytu"
msgid "[SECTION...]"
msgstr "[SEKCJA...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "ŚCIEŻKA"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "ustawia ścieżkę wyszukiwania stron podręcznika na ŚCIEŻKĘ"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "PLIK"
#
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "używa tego pliku konfiguracyjnego użytkownika"
@@ -166,78 +166,73 @@ msgstr "nie można zapisać w %s"
msgid "unable to update %s"
msgstr "nie można zaktualizować %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "ostrzeżenie: %s/man%s/%s.%s*: konkurujące rozszerzenia"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "nie można zaktualizować bufora indeksu %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr ""
"ostrzeżenie: %s złe dowiązanie symboliczne lub błędne żądanie \".so\" ROFF"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "ostrzeżenie: %s: ignorowanie pustego pliku"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "ostrzeżenie: %s: przetwarzanie whatis %s(%s) się nie powiodło"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "nie można przeszukać katalogu %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "ostrzeżenie: błąd tworzenia katalogu preformatowanych stron %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "nie można przejść do katalogu %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "nie można utworzyć bufora indeksu %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Aktualizowanie bufora indeksu dla ścieżki \"%s/%s\". Proszę czekać..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "zakończono.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Usuwanie starych wpisów w bazie danych %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Nie można skonwertować %s do nazwy preformatowanej strony podręcznika"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "ostrzeżenie: błąd podczas zachowywania wpisu dla %s(%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "ostrzeżenie: %s: ignorowanie niepoprawnej nazwy pliku"
@@ -246,19 +241,19 @@ msgstr "ostrzeżenie: %s: ignorowanie niepoprawnej nazwy pliku"
msgid "PATH SECTION NAME"
msgstr "ŚCIEŻKA SEKCJA NAZWA"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "ROZSZERZENIE"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "ogranicza wyszukiwanie do podanego typu ROZSZERZENIA"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "wyszukuje strony ignorując wielkość liter (domyślnie)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "wyszukuje strony biorąc pod uwagę wielkość liter"
@@ -270,7 +265,7 @@ msgstr "interpretuje każde nazwę strony jako wyr. regularne"
msgid "the page name contains wildcards"
msgstr "nazwa strony zawiera znaki dopasowywania"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
@@ -280,9 +275,9 @@ msgstr[1] ""
msgstr[2] ""
"ostrzeżenie: whatis dla argumentu %s przekracza %d bajtów, obcinanie."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "nie można otworzyć %s"
@@ -311,164 +306,164 @@ msgstr "pokazuje informacje whatis"
msgid "show guessed series of preprocessing filters"
msgstr "pokazuje serię odgadniętych filtrów preprocesora"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "KODOWANIE"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "używa wybranego wyjściowego kodowania znaków"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: niekompatybilne opcje"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "polecenie zwróciło kod błędu %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[SEKCJA] STRONA..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "przywraca wszystkim opcjom ich wartości domyślne"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "OSTRZEŻENIA"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "włącza ostrzeżenia groffa"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Główne tryby działania:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "odpowiednik whatis"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "odpowiednik apropos"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "szuka tekstu we wszystkich stronach"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "wyświetla lokalizacje stron(y) podręcznika"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "wyświetla lokalizacje preformatowanych plików cat"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "interpretuje argumenty STRONA jako nazwy lokalnych plików"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr ""
"używane przez catman do ponownego sformatowania przestarzałych stron cat"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "wypisuje stronę źródłową przekształconą do KODOWANIA"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Wyszukiwanie stron podręcznika ekranowego:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "UST_JĘZYKOWE"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "określa ustawienia językowe tego wyszukiwania stron"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "SYSTEM"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "używa stron podręcznika z innych systemów"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "LISTA"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "używa rozdzielonej dwukropkami listy sekcji"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "wyświetla wszystkie strony pasujące do wyr. regularnego"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "wyświetla wszystkie strony pasujące do maski dopasowania"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"powoduje, że --regex i --wildcard pasują tylko do nazw stron, a nie do opisów"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "wyszukuje wszystkie pasujące strony podręcznika"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "wymusza sprawdzanie spójności"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr "nie próbuje podstron, np. \"man foo bar\" => \"man foo-bar\""
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Kontrolowanie sformatowanego wyjścia:"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "PAGER"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "używa programu PAGER do wyświetlenia wyjścia"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "ŁAŃCUCH"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "ustawia linię zachęty programu \"less\""
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "wyświetla odpowiedniki ASCII pewnych znaków latin1"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "wyłącza podział wyrazów na końcu linii"
#
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "wyłącza wyrównywanie linii"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -478,34 +473,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "używa %s do formatowania stron"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "URZĄDZENIE"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "używa %s z podanym urządzeniem"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "PRZEGLĄDARKA"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "używa %s lub PRZEGLĄDARKI do wyświetlenia wyjścia w HTML-u"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "ROZDZIELCZOŚĆ"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -513,101 +508,99 @@ msgstr ""
"używa groffa i wyświetla przez gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "używa groffa i wymusza na nim wyprodukowanie ditroffa"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Brak podręcznika dla %s\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(Albo: jakiej strony z sekcji %s podręcznika potrzebujesz?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Jakiej strony podręcznika potrzebujesz?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Brak podręcznika dla %s w sekcji %s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr ""
"Proszę przeczytać \"%s\", aby uzyskać pomoc,\n"
" gdy strony podręcznika nie są dostępne.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "nie można zmienić katalogu na %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Strona podręcznika ekranowego "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "polecenie mandb zakończyło się błędem %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "ignorowanie nieznanego preprocesora \"%c\""
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "nie można zmienić właściciela %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "nie można zmienić praw dostępu %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "nie można zmienić nazwy %s na %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "nie można ustawić czasów na %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "nie można usunąć %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "nie można utworzyć tymczasowego pliku cat dla %s"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "nie można utworzyć katalogu tymczasowego"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "nie można otworzyć pliku tymczasowego %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "nie można usunąć katalogu %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- następna: %s [ przeglądaj (return) | pomiń (Ctrl-D) | zakończ (Ctrl-"
+"C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "nie można zmienić katalogu na %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -616,23 +609,30 @@ msgstr ""
"\n"
"nie można zapisać do %s w trybie catman"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Nie można skonwertować %s do nazwy preformatowanej strony podręcznika"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: poleganie na odnośnikach whatis jest niezalecane\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "polecenie mandb zakończyło się błędem %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr ""
"błąd wewnętrzny: typ kandydata %d poza zakresem dopuszczalnych wartości"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- następna: %s [ przeglądaj (return) | pomiń (Ctrl-D) | zakończ (Ctrl-"
-"C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Strona podręcznika ekranowego "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -677,73 +677,73 @@ msgstr "należy podać kodowanie wejścia"
msgid "must specify an output encoding"
msgstr "należy podać kodowanie wyjścia"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[MANPATH]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "tryb cichy, poza ostrzeżeniami o nieprawidłowościach"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "nie szuka i nie dodaje zabłąkanych plików cat do db"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "nie czyści przestarzałych wpisów z bazy danych"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "tworzy tylko bazy danych użytkownika"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "tworzy nowe bazy danych, zamiast aktualizować istniejące"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "sprawdza poprawność stron podręcznika"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "NAZWA_PLIKU"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "aktualizuje wpis dotyczący tej nazwy pliku"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "nie można usunąć %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "nie można pisać do %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "nie można czytać z %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Przetwarzanie stron podręcznika w %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Usuwanie przestarzałego katalogu stron preformatowanych %s...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr "ostrzeżenie: w %s brak dyrektyw MANDB_MAP, używanie ścieżki manpath"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -751,7 +751,7 @@ msgstr[0] "%d podkatalog man zawierał nowsze strony podręcznika.\n"
msgstr[1] "%d podkatalogi man zawierały nowsze strony podręcznika.\n"
msgstr[2] "%d podkatalogów man zawierało nowsze strony podręcznika.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
@@ -759,7 +759,7 @@ msgstr[0] "Dodano %d stronę podręcznika.\n"
msgstr[1] "Dodano %d strony podręcznika.\n"
msgstr[2] "Dodano %d stron podręcznika.\n"
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
@@ -767,7 +767,7 @@ msgstr[0] "Dodano %d zabłąkaną preformatowaną stronę podręcznika.\n"
msgstr[1] "Dodano %d zabłąkane preformatowane strony podręcznika.\n"
msgstr[2] "Dodano %d zabłąkanych preformatowanych stron podręcznika.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
@@ -775,7 +775,7 @@ msgstr[0] "Usunięto %d stary wpis z bazy danych.\n"
msgstr[1] "Usunięto %d stare wpisy z bazy danych.\n"
msgstr[2] "Usunięto %d starych wpisów z bazy danych.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Nie utworzono żadnej bazy danych."
@@ -869,27 +869,27 @@ msgid "warning: no global manpaths set in config file %s"
msgstr ""
"ostrzeżenie: w pliku konfiguracyjnym %s nie ustawiono systemowych ścieżek man"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "ostrzeżenie: %s jest wiszącym dowiązaniem symbolicznym"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "nie można rozwiązać %s"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Poszukiwanie nie powiązanych stron preformatowanych w %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "ostrzeżenie: nie można zaktualizować bufora indeksu %s"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s odwołuje się do samego siebie"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0a79bafc..74c4f21a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.4.1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2003-02-22 18:45-0300\n"
"Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -20,7 +20,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "impossvel setar o uid efetivo"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "o usurio man setuid \"%s\" no existe"
@@ -57,12 +57,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "apenas %d campos no contedo"
msgstr[1] "apenas %d campos no contedo"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "busca ruim na multi-chave %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "Banco de Dados %s corrompido; refazer com mandb --create"
@@ -92,7 +92,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:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr ""
@@ -106,20 +106,20 @@ msgstr "impossvel abrir %s para leitura"
msgid "[SECTION...]"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
#, fuzzy
msgid "use this user configuration file"
@@ -159,77 +159,72 @@ msgstr "impossvel escrever dentro de %s"
msgid "unable to update %s"
msgstr "incapaz de atualizar %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "aviso: %s/man%s/%s.%s*: extenses conflitantes"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "impossvel atualizar cache de ndice %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "aviso: %s: link simblico ruim ou requisio `.so' ROFF"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "aviso: %s: ignorando arquivo vazio"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "aviso: %s: exame whatis para %s(%s) falhou"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "impossvel buscar no diretrio %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "aviso: impossvel criar o catdir %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "impossvel mudar para o diretrio %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "impossvel criar cache de ndice %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Atualizando o cache de ndice para o caminho `%s/%s'. Aguarde..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "feito.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Descartando entradas antigas do banco de dados em %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Impossvel converter %s para um nome 'cat'"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "aviso: falhou ao armazenar entradas para %s(%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "aviso: %s: ignorando nome de arquivo invlido"
@@ -238,19 +233,19 @@ msgstr "aviso: %s: ignorando nome de arquivo invlido"
msgid "PATH SECTION NAME"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr ""
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr ""
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr ""
@@ -262,16 +257,16 @@ msgstr ""
msgid "the page name contains wildcards"
msgstr ""
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, fuzzy, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "aviso: whatis para %s excede %d bytes, truncando."
msgstr[1] "aviso: whatis para %s excede %d bytes, truncando."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "impossvel abrir %s"
@@ -300,196 +295,196 @@ msgstr ""
msgid "show guessed series of preprocessing filters"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr ""
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, fuzzy, c-format
msgid "%s: incompatible options"
msgstr ": opes incompatveis"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "o comando encerrou com estado %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr ""
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr ""
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr ""
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr ""
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr ""
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr ""
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr ""
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr ""
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr ""
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr ""
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr ""
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr ""
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr ""
-#: src/man.c:297
+#: src/man.c:296
#, fuzzy
msgid "Finding manual pages:"
msgstr " Pagina de manual "
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr ""
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr ""
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr ""
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr ""
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr ""
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr ""
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr ""
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr ""
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr ""
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr ""
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr ""
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr ""
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr ""
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr ""
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr ""
-#: src/man.c:327
+#: src/man.c:326
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:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr ""
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr ""
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr ""
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr ""
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr ""
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr ""
-#: src/man.c:338
+#: src/man.c:337
#, fuzzy
msgid ""
"use groff and display through gxditview (X11):\n"
@@ -497,101 +492,97 @@ msgid ""
msgstr ""
" -X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12."
-#: src/man.c:340
+#: src/man.c:339
#, fuzzy
msgid "use groff and force it to produce ditroff"
msgstr "-Z, --ditroff usa groff e fora a produzir ditroff."
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, fuzzy, c-format
msgid "No manual entry for %s\n"
msgstr "Nenhuma entrada de manual para %s"
-#: src/man.c:605
+#: src/man.c:604
#, fuzzy, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "Qual a pgina de manual desejada da seo %s?\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Qual a pgina de manual desejada?\n"
-#: src/man.c:724
+#: src/man.c:723
#, fuzzy, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Nenhuma entrada de manual para %s"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr ""
"Veja '%s' para ajuda quando as pginas de manual no estiverem disponveis.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "impossvel chdir para %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Pagina de manual "
-
-#: src/man.c:1222 src/man.c:3558
-#, fuzzy, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "o comando man falhou com estado de sada %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "igorando preprocessador desconhecido '%c'"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "impossvel fazer chown em %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "impossvel fazer chmod em %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "impossvel renomear %s para %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "impossvel setar os horrios de %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "impossvel remover %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, fuzzy, c-format
msgid "can't create temporary cat for %s"
msgstr "impossvel criar um nome de arquivo temporrio"
-#: src/man.c:2253
+#: src/man.c:1780
#, fuzzy, c-format
msgid "can't create temporary directory"
msgstr "impossvel criar um nome de arquivo temporrio"
-#: src/man.c:2265
+#: src/man.c:1792
#, fuzzy, c-format
msgid "can't open temporary file %s"
msgstr "impossvel abrir o arquivo de configurao do manpath %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "impossvel remover o diretrio %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "impossvel chdir para %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -600,20 +591,29 @@ msgstr ""
"\n"
"impossvel escrever em %s no modo catman"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Impossvel converter %s para um nome 'cat'"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: uso de whatis refs est obsoleto\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, fuzzy, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "o comando man falhou com estado de sada %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr ""
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Pagina de manual "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, fuzzy, c-format
@@ -658,73 +658,73 @@ msgstr ""
msgid "must specify an output encoding"
msgstr ""
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr ""
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr ""
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr ""
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr ""
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr ""
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr ""
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr ""
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "impossvel remover %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, fuzzy, c-format
msgid "can't write to %s"
msgstr "impossvel escrever dentro de %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, fuzzy, c-format
msgid "can't read from %s"
msgstr "impossvel criar %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Processando as pginas de manual sob %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, fuzzy, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Verificando por vira-latas sob %s...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr "aviso: nenhuma diretiva MANDB_MAP em %s, usando o seu manpath"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, fuzzy, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -735,28 +735,28 @@ msgstr[1] ""
"%d subdiretorios man continham pginas de manual novas.\n"
"%d pginas de manual foram adicionadas.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, fuzzy, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] " Pagina de manual "
msgstr[1] " Pagina de manual "
-#: src/mandb.c:895
+#: src/mandb.c:910
#, fuzzy, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "%d vira-latas foram adicionados.\n"
msgstr[1] "%d vira-latas foram adicionados.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, fuzzy, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d entradas antigas no banco de dados foram descartadas.\n"
msgstr[1] "%d entradas antigas no banco de dados foram descartadas.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr ""
@@ -849,27 +849,27 @@ msgstr ""
msgid "warning: no global manpaths set in config file %s"
msgstr "aviso: nenhum manpath global setado no arquivo de configurao %s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "warning: %s um symlink perdido"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "impossvel resolver %s"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Verificando por vira-latas sob %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "aviso: impossvel atualizar o cache de ndice %s"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s referencia a si mesmo"
diff --git a/po/ro.po b/po/ro.po
index cf0ea1ca..b1511821 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.4.2-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2003-10-27 08:40+0200\n"
"Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "nu se poate seta uid efectiv"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "utilizatorul man setuidat \"%s\" nu exist"
@@ -58,12 +58,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "numai %d cmpuri n coninut"
msgstr[1] "numai %d cmpuri n coninut"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "aducere(fetch) incorect n multi chei %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "Baza de date %s e corupt; reconstruii cu mandb --create"
@@ -93,7 +93,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:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr ""
@@ -107,20 +107,20 @@ msgstr "nu se poate deschide %s pentru citire"
msgid "[SECTION...]"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
#, fuzzy
msgid "use this user configuration file"
@@ -160,77 +160,72 @@ msgstr "nu se poate scrie n %s"
msgid "unable to update %s"
msgstr "nu se poate nnoi(update) %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "avertisment: %s/man%s/%s.%s*: extensii concurente"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "nu se poate nnoi(update) index cache %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "avertisment: %s: symlink eronat sau cerere ROFF `.so'"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "avertisment: %s: se ignor fiierul vid."
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "avertisment: %s: analiza(parse) whatis pentru %s(%s) euat"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "nu se poate cuta directorul %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "avertisment: nu se poate crea catdir %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "nu se poate schimba n directorul %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "nu se poate crea index cache-ului %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Se nnoiete(update) index cache-ul pentru calea `%s%s'. Ateptai..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "efectuat.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Se cur(purge) intrrile vechi ale bazei de date n %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Nu pot converti %s n nume cat"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "avertisment: am euat n depozitarea intrrii pentru %s (%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "avertisment: %s: se ignor numele de fiier fals(bogus)"
@@ -239,19 +234,19 @@ msgstr "avertisment: %s: se ignor numele de fiier fals(bogus)"
msgid "PATH SECTION NAME"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr ""
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr ""
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr ""
@@ -263,16 +258,16 @@ msgstr ""
msgid "the page name contains wildcards"
msgstr ""
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, fuzzy, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "avertisment: whatis pentru %s depete %d octei, se trunchiaz."
msgstr[1] "avertisment: whatis pentru %s depete %d octei, se trunchiaz."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "nu se poate deschide %s"
@@ -301,295 +296,293 @@ msgstr ""
msgid "show guessed series of preprocessing filters"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr ""
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, fuzzy, c-format
msgid "%s: incompatible options"
msgstr ": opiuni incompatibile"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "comanda a ieit cu starea %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr ""
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr ""
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr ""
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr ""
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr ""
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr ""
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr ""
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr ""
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr ""
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr ""
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr ""
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr ""
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr ""
-#: src/man.c:297
+#: src/man.c:296
#, fuzzy
msgid "Finding manual pages:"
msgstr " Pagin de manual "
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr ""
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr ""
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr ""
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr ""
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr ""
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr ""
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr ""
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr ""
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr ""
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr ""
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr ""
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr ""
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr ""
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr ""
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr ""
-#: src/man.c:327
+#: src/man.c:326
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:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr ""
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr ""
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr ""
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr ""
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr ""
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr ""
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
msgstr ""
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr ""
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, fuzzy, c-format
msgid "No manual entry for %s\n"
msgstr "Nu exist intrare n manual pentru %s"
-#: src/man.c:605
+#: src/man.c:604
#, fuzzy, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "Ce pagin de manual dorii din seciunea %s?\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Ce pagin de manual dorii?\n"
-#: src/man.c:724
+#: src/man.c:723
#, fuzzy, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Nu exist intrare n manual pentru %s"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr ""
"Citii `%s' pentru ajutor n caz c paginile de manual nu sunt disponibile.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "nu se poate schimba directorul(chdir) n %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Pagin de manual "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "comanda mandb a euat cu stare de ieire %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "se ignor preprocesorul necunoscut `%c'"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "nu se poate face chown pe %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "nu se poate face chmod pe %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "nu se poate redenumi %s n %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "nu se poate seta timpul pe %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "nu se poate scoate linkul(unlink) la %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, fuzzy, c-format
msgid "can't create temporary cat for %s"
msgstr "nu se poate crea un nume de fiier temporar"
-#: src/man.c:2253
+#: src/man.c:1780
#, fuzzy, c-format
msgid "can't create temporary directory"
msgstr "nu se poate crea un nume de fiier temporar"
-#: src/man.c:2265
+#: src/man.c:1792
#, fuzzy, c-format
msgid "can't open temporary file %s"
msgstr "nu se poate deschide fiierul de configurare al cii de man %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "nu se poate terge directorul %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- urmtor: %s [ vizualizare (return) | omitere (Ctrl-D) | ieire (Ctrl-"
+"C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "nu se poate schimba directorul(chdir) n %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -598,22 +591,29 @@ msgstr ""
"\n"
"nu se poate scrie n %s n modul catman"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Nu pot converti %s n nume cat"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: ncrederea n referinele whatis este nvechit\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "comanda mandb a euat cu stare de ieire %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "eroare intern: candidatul tip %d depete domeniul"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- urmtor: %s [ vizualizare (return) | omitere (Ctrl-D) | ieire (Ctrl-"
-"C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Pagin de manual "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, fuzzy, c-format
@@ -658,75 +658,75 @@ msgstr ""
msgid "must specify an output encoding"
msgstr ""
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr ""
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr ""
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr ""
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr ""
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr ""
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr ""
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr ""
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "nu se poate terge %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "nu se poate scrie n %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "nu se poate citi din %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Se proceseaz paginile de manual sub %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, fuzzy, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Se verific cat-urile rtcite sub %s...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
"avertisment: nu exist directive MANDB_MAP n %s, se folosete calea voastr "
"de man"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, fuzzy, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -737,28 +737,28 @@ msgstr[1] ""
"%d subdirectoare man conin pagini de manual noi.\n"
"%d pagini de manual au fost adugate.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, fuzzy, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] " Pagin de manual "
msgstr[1] " Pagin de manual "
-#: src/mandb.c:895
+#: src/mandb.c:910
#, fuzzy, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "%d cat-uri rtcite au fost adugate.\n"
msgstr[1] "%d cat-uri rtcite au fost adugate.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, fuzzy, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d intrri vechi n baza de date au fost eliminate.\n"
msgstr[1] "%d intrri vechi n baza de date au fost eliminate.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, fuzzy, c-format
msgid "No databases created."
msgstr "Nici o baz de date nnoit (updated)."
@@ -852,27 +852,27 @@ msgid "warning: no global manpaths set in config file %s"
msgstr ""
"avertisment: nu exist ci man globale setate n fiierul de configurare %s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "avertisment: %s este un symlink nesigur(dangling)"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "nu se poate rezolva %s"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Se verific cat-urile rtcite sub %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "avertisment: nu se poate nnoi(update) index cache-ul %s"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s este auto-referin(self-referencing)"
diff --git a/po/ru.po b/po/ru.po
index 57fd3fd1..a2b2abf1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.1-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2012-02-06 20:46+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "не удалось установить эффективный uid"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "setuid man пользователь \"%s\" не существует"
@@ -62,12 +62,12 @@ msgstr[0] "в содержимом только %d поле"
msgstr[1] "в содержимом только %d поля"
msgstr[2] "в содержимом только %d полей"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "неверная выборка по многомерному ключу %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "База данных %s повреждена; пересборка командой mandb --create"
@@ -97,7 +97,7 @@ msgid "The man database defaults to %s%s."
msgstr "По умолчанию база данных man расположена в %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "показывать сообщения отладки"
@@ -111,20 +111,20 @@ msgstr "не удалось открыть %s на чтение"
msgid "[SECTION...]"
msgstr "[СЕКЦИЯ...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "ПУТЬ"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "установить путь поиска справочных страниц в значение ПУТЬ"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "ФАЙЛ"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "использовать указанный пользовательских файл настроек"
@@ -163,78 +163,73 @@ msgstr "не удалось записать в %s"
msgid "unable to update %s"
msgstr "не удалось обновить %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "предупреждение: %s/man%s/%s.%s*: конкурирующие расширения"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "не удалось обновить индексный кэш %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr ""
"предупреждение: %s: неверная символическая ссылка или запрос ROFF `.so'"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "предупреждение: %s: игнорируется пустой файл"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "предупреждение: %s: whatis анализ %s(%s) не удался"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "не удалось найти каталог %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "предупреждение: не удалось создать cat каталог %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "не удалось сменить каталог на %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "не удалось создать индексный кэш %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Обновление индексного кэша для пути `%s/%s'. Ждите..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "завершено.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Удаление старых записей базы данных в %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Не удалось преобразовать %s в cat имя"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "предупреждение: не удалось сохранить запись для %s(%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "предупреждение: %s: игнорируется фальшивое имя файла"
@@ -243,19 +238,19 @@ msgstr "предупреждение: %s: игнорируется фальши
msgid "PATH SECTION NAME"
msgstr "ПУТЬ СЕКЦИЯ ИМЯ"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "РАСШИРЕНИЕ"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "искать только с заданным РАСШИРЕНИЕМ"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "не учитывать регистр при поиске (по умолчанию)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "учитывать регистр при поиске"
@@ -267,7 +262,7 @@ msgstr "считать имя страницы регулярным выраже
msgid "the page name contains wildcards"
msgstr "имя страницы содержит групповые символы"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
@@ -278,9 +273,9 @@ msgstr[1] ""
msgstr[2] ""
"предупреждение: результат whatis для %s превысил %d байт, обрезается."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "не удалось открыть %s"
@@ -309,162 +304,162 @@ msgstr "показать информацию whatis"
msgid "show guessed series of preprocessing filters"
msgstr "показать серию предположений фильтров предварительной обработки"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "КОДИРОВКА"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "использовать выбранную кодировку выходных данных"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: несовместимые параметры"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "команда завершилась с кодом %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[СЕКЦИЯ] СТРАНИЦА..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "сбросить все параметры в значения по умолчанию"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "ПРЕДУПРЕЖДЕНИЯ"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "включить предупреждения от groff"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Основные режимы работы:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "эквивалентно whatis"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "эквивалентно apropos"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "искать текст по всем справочным страницам"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "показывать физическое расположение man страницы"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "показывать физическое расположение cat файла(ов)"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "воспринимать аргумент(ы) СТРАНИЦА как имя файл(ов)"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr "используется catman для переформатирования устаревших cat страниц"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "вывести исходную страницу в КОДИРОВКЕ"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Поиск справочных страниц:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "ЛОКАЛЬ"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "задать локаль для поиска"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "СИСТЕМА"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "использовать справочные страницы от других систем"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "СПИСОК"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "использовать список секций, указанных через двоеточие"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "показать все страницы, удовлетворяющие регулярному выражению"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "показать все страницы, удовлетворяющие групповым символам"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"искать совпадение --regex и --wildcard только в именах страниц, без описаний"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "поиск всех подходящих справочных страниц"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "выполнить проверку целостности кэша"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr "не затрагивать подстраницы, например, 'man foo bar' => 'man foo-bar'"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Управление форматированием вывода:"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "ПЕЙДЖЕР"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "использовать программу ПЕЙДЖЕР для вывода на экран"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "СТРОКА"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "использовать пейджер `less' с подсказкой"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "показать трансляцию ASCII определённых символов latin1"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "выключить перенос слов"
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "выключить выравнивание"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -474,34 +469,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "использовать %s для форматирования страниц"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "УСТРОЙСТВО"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "использовать %s на выбранном устройстве"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "БРАУЗЕР"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "использовать %s или БРАУЗЕР для показа HTML"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "РАЗРЕШЕНИЕ"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -509,99 +504,96 @@ msgstr ""
"использовать groff и показывать с помощью gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "использовать groff и заставить его генерировать ditroff"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Нет справочной страницы для %s\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(Или же, какая именно из справочных страниц раздела %s вам нужна?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Какая справочная страница вам нужна?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Нет справочной страницы для %s в разделе %s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr "Смотрите '%s' в справке, если недоступны справочные страницы.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "не удалось выполнить функцию chdir в %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Справочная страница "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "команда mandb завершилась неудачно (код выхода %d)"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "игнорирование неизвестного препроцессора `%c'"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "не удалось выполнить функцию chown %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "не удалось выполнить функцию chmod %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "не удалось переименовать %s в %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "не удалось установить время доступа для %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "не удалось выполнить функцию unlink %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "не удалось создать временный cat файл %s"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "не удалось создать временный каталог"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "не удалось открыть временный файл %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "не удалось удалить каталог %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- след: %s [ просм (ввод) | пропуск (Ctrl-D) | выход (Ctrl-C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "не удалось выполнить функцию chdir в %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -610,21 +602,29 @@ msgstr ""
"\n"
"не удалось записать в %s в режиме catman"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Не удалось преобразовать %s в cat имя"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: полагаться на ссылки whatis настоятельно не рекомендуется\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "команда mandb завершилась неудачно (код выхода %d)"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "внутренняя ошибка: тип кандидата %d вне диапазона"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- след: %s [ просм (ввод) | пропуск (Ctrl-D) | выход (Ctrl-C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Справочная страница "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -669,73 +669,73 @@ msgstr "должна быть указана кодировка входных
msgid "must specify an output encoding"
msgstr "должна быть указана кодировка выходных данных"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[MANPATH]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "не выводить сообщения, за исключением 'фиктивных' предупреждений"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "не искать или добавлять побочные cat в dbs"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "не вычищать устаревшие записи из dbs"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "создать только пользовательские базы данных"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "создать dbs с нуля, а не обновлять"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "проверить справочные страницы на правильность"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "ИМЯ-ФАЙЛА"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "обновить запись только для этого файла"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "не удалось удалить %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "не удалось записать в %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "не удалось прочитать из %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Обработка справочных страниц в %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Удаляется устаревший каталог cat %s...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr "предупреждение: нет директивы MANDB_MAP в %s, используется ваш manpath"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -743,7 +743,7 @@ msgstr[0] "В %d man-подкаталоге содержатся более но
msgstr[1] "В %d man-подкаталогах содержатся более новые справочные страницы.\n"
msgstr[2] "В %d man-подкаталогах содержатся более новые справочные страницы.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
@@ -751,7 +751,7 @@ msgstr[0] "Добавлена %d справочная страница.\n"
msgstr[1] "Добавлено %d справочные страницы.\n"
msgstr[2] "Добавлено %d справочных страниц.\n"
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
@@ -759,7 +759,7 @@ msgstr[0] "Добавлена %d побочная cat-страница.\n"
msgstr[1] "Добавлено %d побочные cat-страницы.\n"
msgstr[2] "Добавлено %d побочных cat-страниц.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
@@ -767,7 +767,7 @@ msgstr[0] "Вычищена %d старая запись базы данных.\
msgstr[1] "Вычищено %d старые записи базы данных.\n"
msgstr[2] "Вычищено %d старых записей базы данных.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Базы данных не созданы."
@@ -862,27 +862,27 @@ msgstr "показать весь глобальный manpath"
msgid "warning: no global manpaths set in config file %s"
msgstr "предупреждение: не установлены глобальные manpath в файле настроек %s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "предупреждение: %s ссылается на несуществующий объект"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "не удалось определить %s"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Проверка побочных cat в %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "предупреждение: не удалось обновить индексный кэш %s"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s ссылается на себя"
diff --git a/po/sr.po b/po/sr.po
index b8571654..bdbe4e71 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.6-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2014-01-16 09:51+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "не могу да подесим стварни јиб"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "подесииб ман корисник „%s“ не постоји"
@@ -60,12 +60,12 @@ msgstr[0] "само %d поље у садржају"
msgstr[1] "само %d поља у садржају"
msgstr[2] "само %d поља у садржају"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "лоша набавка на вишеструком кључу „%s“"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "База података „%s“ је оштећена; изградите поново са „mandb --create“"
@@ -95,7 +95,7 @@ msgid "The man database defaults to %s%s."
msgstr "База података мана се пребацује на %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "исписује поруке за исправљање грешака"
@@ -109,20 +109,20 @@ msgstr "не могу да отворим „%s“ за читање"
msgid "[SECTION...]"
msgstr "[ОДЕЉАК...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "ПУТАЊА"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "поставља путању претраге за странице упутства на ПУТАЊУ"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "ДАТОТЕКА"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "користи ову корисничку датотеку подешавања"
@@ -161,77 +161,72 @@ msgstr "не могу да пишем у „%s“"
msgid "unable to update %s"
msgstr "не могу да ажурирам „%s“"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "упозорење: %s/man%s/%s.%s*: конкурентна проширења"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "не могу да ажурирам оставу индекса „%s“"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "упозорење: %s: лоша симболичка веза или РОФФ „.so“ захтев"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "упозорење: %s: занемарујем празну датотеку"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "упозорење: %s: није успела обрада шта-је за %s(%s)"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "не могу да претражим директоријум „%s“"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "упозорење: не могу да направим катдир „%s“"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "не могу да пређем у директоријум „%s“"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "не могу да направим оставу индекса „%s“"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Ажурирам оставу индекса за путању „%s/%s“. Сачекајте..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "готово.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Избацујем старе уносе базе података у „%s“...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Не могу да претворим „%s“ у кат назив"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "упозорење: нисам успео да ускладиштим унос за %s(%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "упозорење: %s: занемарујем нетачан назив датотеке"
@@ -240,19 +235,19 @@ msgstr "упозорење: %s: занемарујем нетачан назив
msgid "PATH SECTION NAME"
msgstr "ПУТАЊА ОДЕЉАК НАЗИВ"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "ПРОШИРЕЊЕ"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "ограничава претрагу на врсту проширења ПРОШИРЕЊЕ"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "тражи странице без обзира на величину слова (основно)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "тражи странице с обзиром на величину слова"
@@ -264,7 +259,7 @@ msgstr "тумачи назив странице као регуларни из
msgid "the page name contains wildcards"
msgstr "назив странице садржи џокере"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
@@ -272,9 +267,9 @@ msgstr[0] "упозорење: шта-је за „%s“ премашује %d
msgstr[1] "упозорење: шта-је за „%s“ премашује %d бајта, скраћујем."
msgstr[2] "упозорење: шта-је за „%s“ премашује %d бајтова, скраћујем."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "не могу да отворим „%s“"
@@ -303,162 +298,162 @@ msgstr "приказује шта-је податке"
msgid "show guessed series of preprocessing filters"
msgstr "приказује погођене серије пропусника предобраде"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "КОДИРАЊЕ"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "користи изабрано кодирање излаза"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: несагласне опције"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "наредба је изашла са стањем %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[ОДЕЉАК] СТРАНИЦА..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "враћа све опције на њихове основне вредности"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "УПОЗОРЕЊА"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "укључује упозорења из гроф-а"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Главни режими рада:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "исто што и шта-је"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "исто што и „apropos“"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "тражи текст на свим страницама"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "исписује физичко место ман странице(а)"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "исписује физичко место кат датотеке(а)"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "тумачи аргумент(е) СТРАНИЦЕ као месни(е) назив(е) датотеке"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr "користи га катман да поново обликује застареле кат странице"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "излазна страница извора је кодирана у КОДИРАЊУ"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Проналажење страница упутства:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "ЈЕЗИК"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "одређује језик за ову нарочиту претрагу мана"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "СИСТЕМ"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "користи странице упутства са других система"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "СПИСАК"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "користи двотачком раздвојени списак одељка"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "приказује све странице које одговарају регуларном изразу"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "приказује све странице које одговарају џокерима"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"„make --regex“ и „--wildcard“ поклапају само називе страница, а не описе"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "проналази све одговарајуће странице упутства"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "приморава проверу доследности оставе"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr "не покушава подстранице, нпр. „man foo bar“ => „man foo-bar“"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Управљање обликованим излазом:"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "СТРАНИЧАР"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "користи програм СТРАНИЧАР за приказивање излаза"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "НИСКА"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "обезбеђује страничара „less“ са упитом"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "приказује АСКРИ превод неких латин1 знакова"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "искључује преламање"
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "искључује поравнавање"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -468,34 +463,34 @@ msgstr ""
"e — [n]eqn, p — pic, t — tbl,\n"
"g — grap, r — refer, v — vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "користи „%s“ за обликовање страница"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "УРЕЂАЈ"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "користи „%s“ са изабраним уређајем"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "ПРЕГЛЕДНИК"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "користи „%s“ или ПРЕГЛЕДНИК за приказивање ХТМЛ излаза"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "РЕЗОЛУЦИЈА"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -503,99 +498,97 @@ msgstr ""
"користи грофа и приказује кроз гиксдитпреглед (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "користи гроф и приморава га да произведе дитроф"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Нема уноса упутства за „%s“\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(Илити, коју страницу упутства желите из одељка %s?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Коју страницу упутства желите?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Нема уноса упутства за „%s“ у одељку %s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr "Погледајте „%s“ за помоћ када странице упутства нису доступне.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "не могу да се пребацим у „%s“"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Страница упутства "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "наредба мандб није успела са излазним стањем „%d“"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "занемарујем неознати препроцесор „%c“"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "не могу да променим власника „%s“"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "не могу да променим режим „%s“"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "не могу да преименујем „%s“ у „%s“"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "не могу да подесим времена на „%s“"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "не могу да развежем „%s“"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "не могу да направим привремени кат за „%s“"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "не могу да направим привремени директоријум"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "не могу да отворим привремену датотеку „%s“"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "не могу да уклоним директоријум „%s“"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Ман-- следеће: %s [ преглед (повратница) | прескочи (Ктрл-Д) | изађи (Ктрл-"
+"Ц) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "не могу да се пребацим у „%s“"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -604,22 +597,29 @@ msgstr ""
"\n"
"не могу да пишем у „%s“ у катман режиму"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Не могу да претворим „%s“ у кат назив"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: ослањање на упуте шта-је је застарело\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "наредба мандб није успела са излазним стањем „%d“"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "унутрашња грешка: врста кандидата „%d“ је ван опсега"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Ман-- следеће: %s [ преглед (повратница) | прескочи (Ктрл-Д) | изађи (Ктрл-"
-"Ц) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Страница упутства "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -664,73 +664,73 @@ msgstr "морате навести кодирање улаза"
msgid "must specify an output encoding"
msgstr "морате навести кодирање излаза"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[МАНПУТАЊА]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "ради тихо, осим за „bogus“ упозорење"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "не тражи или не додаје залутале катсе у базе података"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "не избацује застареле уносе из база података"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "производи само корисничке базе података"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "прави базе података од почетка, уместо да их освежава"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "проверава странице упутства за исправношћу"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "ДАТОТЕКА"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "ажурира само унос за ову датотеку"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "не могу да уклоним „%s“"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "не могу да пишем у „%s“"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "не могу да читам из „%s“"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Обрађујем странице упутства под „%s“...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Уклањам застареле кат директоријуме „%s“...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr "упозорење: нема МАНБП_МАП смерница у „%s“, користим вашу ман-путању"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -738,7 +738,7 @@ msgstr[0] "%d ман подиректоријум је садржао новиј
msgstr[1] "%d ман подиректоријума су садржала новије странице упутства.\n"
msgstr[2] "%d ман подиректоријума је садржало новије странице упутства.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
@@ -746,7 +746,7 @@ msgstr[0] "%d страница упутства је додата.\n"
msgstr[1] "%d странице упутства су додате.\n"
msgstr[2] "%d страница упутства је додато.\n"
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
@@ -754,7 +754,7 @@ msgstr[0] "%d залутали кат је додат.\n"
msgstr[1] "%d залутала ката су додата.\n"
msgstr[2] "%d залуталих катова је додато.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
@@ -762,7 +762,7 @@ msgstr[0] "%d стари унос базе података је избачен.
msgstr[1] "%d стара уноса базе података су избачена.\n"
msgstr[2] "%d старих уноса базе података је избачено.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Нису направљене базе података."
@@ -855,27 +855,27 @@ msgstr "показује читаву општу манпутању"
msgid "warning: no global manpaths set in config file %s"
msgstr "упозорење: нису подешене опште манпутање у датотеци подешавања „%s“"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "упозорење: „%s“ је апсолутна симболичка веза"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "не могу да решим „%s“"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Тражим залутале катсе под „%s“...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "упозорење: не могу да ажурирам оставу индекса „%s“"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "„%s“ је само упутна"
diff --git a/po/sv.po b/po/sv.po
index 8c1755eb..a0666526 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.5.0-pre2\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2007-09-17 16:57+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -21,7 +21,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "kan inte ställa in effektivt uid"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "en manualanvändare \"%s\" som är setuid finns inte"
@@ -58,12 +58,12 @@ msgid_plural "only %d fields in content"
msgstr[0] "endast %d fält i innehåll"
msgstr[1] "endast %d fält i innehåll"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "felaktig hämtning på multinyckel %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "Databasen %s är skadad; bygg om med mandb --create"
@@ -93,7 +93,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:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr ""
@@ -107,20 +107,20 @@ msgstr "kan inte öppna %s för läsning"
msgid "[SECTION...]"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr ""
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr ""
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
#, fuzzy
msgid "use this user configuration file"
@@ -160,77 +160,72 @@ msgstr "kan inte skriva inom %s"
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "varning: %s/man%s/%s.%s*: filändelser i konflikt"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "kan inte uppdatera indexcachen %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "varning: %s: felaktig symbolisk länk eller ROFF \".so\"-begäran"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "varning: %s: ignorerar tom fil"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "varning: %s: whatis-tolkning för %s(%s) misslyckades"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "kan inte söka i katalogen %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "varning: kan inte skapa cat-katalog %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "kan inte byta till katalogen %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "kan inte skapa indexcachen %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "Uppdaterar indexcache för sökvägen \"%s/%s\". Vänta..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "klar.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Tömmer gamla databasposter i %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Kan inte konvertera %s till cat-namn"
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "varning: misslyckades med att lagra post för %s(%s)"
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "varning: %s: ignorerar felaktigt filnamn"
@@ -239,19 +234,19 @@ msgstr "varning: %s: ignorerar felaktigt filnamn"
msgid "PATH SECTION NAME"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr ""
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr ""
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr ""
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr ""
@@ -263,16 +258,16 @@ msgstr ""
msgid "the page name contains wildcards"
msgstr ""
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, fuzzy, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "varning: whatis för %s överskrider %d byte, förkortar."
msgstr[1] "varning: whatis för %s överskrider %d byte, förkortar."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "kan inte öppna %s"
@@ -301,197 +296,197 @@ msgstr ""
msgid "show guessed series of preprocessing filters"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr ""
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
#, fuzzy
msgid "use selected output encoding"
msgstr "måste ange en utmatningskodning"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, fuzzy, c-format
msgid "%s: incompatible options"
msgstr ": inkompatibla flaggor"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "kommandot avslutade med status %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr ""
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr ""
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr ""
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr ""
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr ""
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr ""
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr ""
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr ""
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr ""
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr ""
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr ""
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr ""
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr ""
-#: src/man.c:297
+#: src/man.c:296
#, fuzzy
msgid "Finding manual pages:"
msgstr " Manualsida "
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr ""
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr ""
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr ""
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr ""
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr ""
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr ""
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr ""
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr ""
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr ""
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr ""
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr ""
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr ""
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr ""
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr ""
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr ""
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr ""
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr ""
-#: src/man.c:327
+#: src/man.c:326
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:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr ""
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr ""
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr ""
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr ""
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr ""
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr ""
-#: src/man.c:338
+#: src/man.c:337
#, fuzzy
msgid ""
"use groff and display through gxditview (X11):\n"
@@ -499,103 +494,100 @@ msgid ""
msgstr ""
" -X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12."
-#: src/man.c:340
+#: src/man.c:339
#, fuzzy
msgid "use groff and force it to produce ditroff"
msgstr ""
"-Z, --ditroff använd groff och tvinga det att skapa ditroff."
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Ingen manualpost för %s\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(Alternativt, vilken manualsida vill du ha från avsnittet %s?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Vilken manualsida vill du ha?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Ingen manualpost för %s i avsnittet %s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr "Se \"%s\" för hjälp när manualsidor inte är tillgängliga.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "kan inte byta katalog till %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Manualsida "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "mandb-kommandot misslyckades med slutstatus %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "ignorerar okänd förbehandlare \"%c\""
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "kan inte byta ägare på %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "kan inte ändra rättigheter på %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "kan inte byta namn på %s till %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "kan inte ställa in tider på %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "kan inte avlänka %s"
# cat är vad? catalogue? kommandot "cat"?
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "kan inte skapa temporär cat för %s"
# cat är vad? catalogue? kommandot "cat"?
-#: src/man.c:2253
+#: src/man.c:1780
#, fuzzy, c-format
msgid "can't create temporary directory"
msgstr "kan inte skapa temporär cat för %s"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "kan inte öppna temporärfil %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "kan inte ta bort katalogen %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr ""
+"--Man-- nästa: %s [ visa (retur) | hoppa över (Ctrl-D) | avsluta (Ctrl-C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "kan inte byta katalog till %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -604,21 +596,29 @@ msgstr ""
"\n"
"kan inte skriva till %s i catman-läge"
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Kan inte konvertera %s till cat-namn"
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: förlitande på whatis-referenser är föråldrat\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "mandb-kommandot misslyckades med slutstatus %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "internt fel: kandidattypen %d utanför intervallet"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr ""
-"--Man-- nästa: %s [ visa (retur) | hoppa över (Ctrl-D) | avsluta (Ctrl-C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Manualsida "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -663,73 +663,73 @@ msgstr "måste ange en inmatningskodning"
msgid "must specify an output encoding"
msgstr "måste ange en utmatningskodning"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr ""
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr ""
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr ""
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr ""
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr ""
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr ""
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr ""
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr ""
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "kan inte ta bort %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "kan inte skriva till %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "kan inte läsa från %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Bearbetar manualsidor under %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, fuzzy, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Undersöker lösa cat-sidor under %s...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr "varning: inga MANDB_MAP-direktiv i %s, använder din manualsökväg"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, fuzzy, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -740,28 +740,28 @@ msgstr[1] ""
"%d manualunderkataloger innehöll nyare manualsidor.\n"
"%d manualsidor lades till.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, fuzzy, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] " Manualsida "
msgstr[1] " Manualsida "
-#: src/mandb.c:895
+#: src/mandb.c:910
#, fuzzy, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "%d lösa cat-sidor lades till.\n"
msgstr[1] "%d lösa cat-sidor lades till.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, fuzzy, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d gamla databasposter tömdes.\n"
msgstr[1] "%d gamla databasposter tömdes.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Inga databaser skapade."
@@ -854,27 +854,27 @@ msgstr ""
msgid "warning: no global manpaths set in config file %s"
msgstr "varning: inga globala manualsökvägar angivna i konfigurationsfilen %s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "varning: %s är en lös symbolisk länk"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "kan inte slå upp %s"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Undersöker lösa cat-sidor under %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "varning: kan inte uppdatera indexcachen %s"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s refererar till sig själv"
diff --git a/po/vi.po b/po/vi.po
index 26cabfca..e079a4d5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.6.6-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2014-01-12 16:01+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "không thể đặt UID chịu tác động"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "không có người dùng hướng dẫn \"setuid\" \"%s\""
@@ -63,12 +63,12 @@ msgid "only %d field in content"
msgid_plural "only %d fields in content"
msgstr[0] "chỉ có %d trường trong nội dung"
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr "tiến trình gọi (fetch) sai với đa khóa %s"
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr ""
@@ -99,7 +99,7 @@ msgid "The man database defaults to %s%s."
msgstr "Cơ sở dữ liệu chính có giá trị mặc định là %s%s."
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "phát ra các thông điệp để gỡ lỗi"
@@ -113,20 +113,20 @@ msgstr "không thể mở %s để đọc"
msgid "[SECTION...]"
msgstr "[PHẦN...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "ĐƯỜNG_DẪN"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "đặt ĐƯỜNG_DẪN đường dẫn để tìm kiếm các trang hướng dẫn"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "TẬP_TIN"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "dùng tập tin cấu hình này"
@@ -165,79 +165,74 @@ msgstr "không thể ghi ở trong %s"
msgid "unable to update %s"
msgstr "không thể cập nhật %s"
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "cảnh báo: \"%s/man%s/%s.%s*\": phần mở rộng cạnh tranh với nhau"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "không thể cập nhật bộ nhớ tạm mục lục %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "cảnh báo: %s: liên kết mềm sai, hoặc yêu cầu \".so\" ROFF sai"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "cảnh báo: %s: đang bỏ qua tập tin rỗng"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr ""
"cảnh báo: %s: việc phân tách kiểu \"whatis\" (là gì?) cho \"%s(%s)\" bị lỗi"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "không thể tìm kiếm trong danh mục %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "cảnh báo: không thể tạo catdir (thư mục \"cat\") %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "không thể chuyển sang thư mục %s"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "không thể tạo bộ nhớ tạm mục lục %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr ""
"Đang cập nhật bộ nhớ tạm mục lục cho đường dẫn \"%s/%s\". Vui lòng chờ..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "Đang tẩy các mục tin cơ sở dữ liệu cũ trong %s...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "Không thể chuyển đổi %s sang tên \"cat\""
-
#: src/descriptions_store.c:47
#, c-format
msgid "warning: failed to store entry for %s(%s)"
msgstr "cảnh báo: gặp lỗi khi lưu trữ mục tin cho \"%s(%s)\""
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "cảnh báo: %s: đang bỏ qua tên tập tin giả"
@@ -246,19 +241,19 @@ msgstr "cảnh báo: %s: đang bỏ qua tên tập tin giả"
msgid "PATH SECTION NAME"
msgstr "ĐƯỜNG DẪN PHẦN TÊN"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "PHẦN_MỞ_RỘNG"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "chỉ tìm kiếm phần mở rộng kiểu PHẦN MỞ RỘNG"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "không phân biệt chữ HOA/thường khi tìm (mặc định)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "phân biệt chữ HOA/thường khi tìm"
@@ -270,7 +265,7 @@ msgstr "phiên dịch tên trang như là một biểu thức chính quy"
msgid "the page name contains wildcards"
msgstr "tên trang chứa ký tự đại diện (? * v.v.)"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
@@ -278,9 +273,9 @@ msgstr[0] ""
"cảnh báo: thông tin \"whatis\" (là gì?) cho %s vượt quá %d byte nên đang cắt "
"bớt nó."
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "không thể mở %s"
@@ -309,163 +304,163 @@ msgstr "hiển thị thông tin whatis (là gì)"
msgid "show guessed series of preprocessing filters"
msgstr "hiển thị dãy bộ lọc tiền xử lý đã đoán"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "BẢNG_MÃ"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
msgid "use selected output encoding"
msgstr "dùng bảng mã xuất đã chọn"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s: các tùy chọn không tương thích với nhau"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "lệnh đã thoát với trạng thái %d: %s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[PHẦN] TRANG..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "đặt lại mọi tùy chọn về giá trị mặc định"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "CẢNH_BÁO"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "bật cảnh báo từ groff"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "Chế độ thao tác chính:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "tương đương với whatis"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "tương đương với apropos"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr "quét mọi trang tìm chuỗi"
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "in ra vị trí vật lý của (các) trang man"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "in ra vị trí vật lý của (các) trang cat"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "biên dịch mỗi đối số TRANG là tên tập tin cục bộ"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr "được catman dùng để định dạng lại các trang cat cũ"
-#: src/man.c:295
+#: src/man.c:294
msgid "output source page encoded in ENCODING"
msgstr "xuất trang mã nguồn đã mã hoá bằng BẢNG_MÃ"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "Đang tìm trang hướng dẫn:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "MIỀN_ĐỊA_PHƯƠNG"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "xác định miền địa phương cho việc tìm kiếm man đặc biệt"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "HỆ_THỐNG"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "use manual pages from other systems"
msgstr "dùng trang man từ hệ thống khác"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "DANH_SÁCH"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "dùng danh sách các phần định giới bằng dấu hai chấm"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr "hiển thị tất cả các trang khớp mẫu biểu thức chính quy"
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr "hiển thị tất cả các trang khớp mẫu với ký tự đại diện"
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
"làm cho tùy chọn \"--regex\" và \"--wildcard\" chỉ khớp với tên trang, không "
"phải với phần mô tả"
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "tìm tất cả các trang hướng dẫn tương ứng"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "ép buộc kiểm tra tính nhất quán của bộ nhớ tạm"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr "đừng thử trang con, v.d. “man foo bar” => “man foo-bar”"
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "Điều khiển định dạng cho kết xuất:"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "DÀN_TRANG"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "dùng chương trình DÀN TRANG để hiển thị kết xuất"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "CHUỖI"
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "cung cấp một dấu nhắc cho bộ dàn trang \"less\""
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "hiển thị bản dịch ASCII cua một số ký tự Latin-1 nào đó"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr "tắt chức năng gạch nối từ"
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr "tắt chức năng canh lề"
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -475,34 +470,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "dùng %s để định dạng trang"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "THIẾT_BỊ"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "dùng %s với thiết bị đã chọn"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "TRÌNH_DUYỆT"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "dùng %s hoặc TRÌNH DUYỆT để hiển thị kết xuất HTML"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "ĐỘ_PHÂN_GIẢI"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -510,100 +505,95 @@ msgstr ""
"dùng groff và hiển thị thông qua gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "dùng groff và ép buộc nó sản sinh ditroff"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "Không có trang hướng dẫn cho \"%s\"\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(Thay vì vậy, bạn muốn trang hướng dẫn nào từ phần %s?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "Bạn muốn trang hướng dẫn nào?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "Không có trang hướng dẫn cho %s trong phần %s\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr "Hãy xem \"%s\" để tìm trợ giúp khi trang hướng dẫn không sẵn sàng.\n"
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "không thể chdir (chuyển đổi thư mục) sang %s"
-
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Trang hướng dẫn "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr ""
-"lệnh \"mandb\" (cơ sở dữ liệu hướng dẫn) gặp lỗi với trạng thái thoát là %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "đang bỏ qua bộ tiền xử lý trước không hiểu \"%c\""
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "không thể \"chown\" (thay đổi quyền sở hữu) %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "không thể \"chmod\" (thay đổi chế độ đọc ghi) %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "không thể thay đổi tên %s thành %s"
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "không thể đặt thời gian trên %s"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "không thể bỏ liên kết %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "không thể tạo \"cat\" tạm cho %s"
-#: src/man.c:2253
+#: src/man.c:1780
#, c-format
msgid "can't create temporary directory"
msgstr "không thể tạo thư mục tạm thời"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "không thể mở tập tin tạm %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "không thể gỡ bỏ thư mục %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr "--Man-- kế: %s [ xem (enter) | nhảy qua (Ctrl-D) | thoát (Ctrl-C) ]\n"
+
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "không thể chdir (chuyển đổi thư mục) sang %s"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -612,20 +602,30 @@ msgstr ""
"\n"
"không thể ghi vào %s trong chế độ \"catman\""
-#: src/man.c:3413
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "Không thể chuyển đổi %s sang tên \"cat\""
+
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s: nhờ các \"ref\" (tham chiếu) của lệnh \"whatis\" bị phản đối\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr ""
+"lệnh \"mandb\" (cơ sở dữ liệu hướng dẫn) gặp lỗi với trạng thái thoát là %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "lỗi nội bộ: kiểu ứng cử %d nằm ngoài phạm vi"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr "--Man-- kế: %s [ xem (enter) | nhảy qua (Ctrl-D) | thoát (Ctrl-C) ]\n"
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Trang hướng dẫn "
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
#, c-format
@@ -670,99 +670,99 @@ msgstr "phải ghi rõ bảng mã đầu vào"
msgid "must specify an output encoding"
msgstr "phải ghi rõ bảng mã xuất ra"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[ĐƯỜNG_DẪN_MAN]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "chạy im, trừ xuất cảnh báo \"giả\""
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "đừng tìm hay thêm vào cơ sở dữ liệu các cat rải rác"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "đừng tẩy khỏi cơ sở dữ liệu các mục tin cũ"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "chỉ tạo các cơ sở dữ liệu người dùng"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "tạo lại cơ sở dữ liệu từ đầu thay cho cập nhật"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "kiểm tra các trang hướng dẫn xem có đúng không"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "TÊN_TẬP_TIN"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "chỉ cập nhật mục tin cho tên tập tin này"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "không thể gỡ bỏ %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "không thể ghi vào %s"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "không thể đọc từ %s"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "Đang xử lý các trang hướng dẫn dưới %s...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "Đang gỡ bỏ các thư mục “cat” không dùng nữa %s...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr ""
"cảnh báo: không có chỉ thị \"MANDB_MAP\" trong “%s” nên sẽ dùng đường dẫn "
"hướng dẫn của bạn."
-#: src/mandb.c:886
+#: src/mandb.c:901
#, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
msgstr[0] "%d thư mục con hướng dẫn chứa trang hướng dẫn mới hơn.\n"
-#: src/mandb.c:891
+#: src/mandb.c:906
#, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] "%d trang hướng dẫn được thêm vào.\n"
-#: src/mandb.c:895
+#: src/mandb.c:910
#, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
msgstr[0] "%d trang \"cat\" thất lạc đã được thêm vào.\n"
-#: src/mandb.c:900
+#: src/mandb.c:915
#, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "%d mục tin cơ sở dữ liệu cũ bị tẩy.\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "Chưa tạo cơ sở dữ liệu."
@@ -859,27 +859,27 @@ msgid "warning: no global manpaths set in config file %s"
msgstr ""
"cảnh báo: chưa lập đường dẫn hướng dẫn toàn cục trong tập tin cấu hình %s"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "cảnh báo: %s là liên kết mềm không chỉ vào đâu cả"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "không thể phân giải %s"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "Đang kiểm tra có trang \"cat\" rải rác dưới %s...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "cảnh báo: không thể cập nhật bộ nhớ tạm mục lục %s"
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s tham chiếu đến chính nó"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cf5ef717..c026eb9d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db 2.5.1-pre2\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 03:29+0100\n"
+"POT-Creation-Date: 2014-09-16 00:47+0100\n"
"PO-Revision-Date: 2008-01-16 17:49-0600\n"
"Last-Translator: Ming Hua <minghua-guest@users.alioth.debian.org>\n"
"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -33,7 +33,7 @@ msgstr ""
msgid "can't set effective uid"
msgstr "无法设置等效 uid"
-#: lib/security.c:101 src/mandb.c:792
+#: lib/security.c:101 src/mandb.c:807
#, c-format
msgid "the setuid man user \"%s\" does not exist"
msgstr "不存在用来将 man 程序 setuid 的用户 %s"
@@ -71,13 +71,13 @@ msgid_plural "only %d fields in content"
msgstr[0] ""
msgstr[1] ""
-#: libdb/db_lookup.c:383
+#: libdb/db_lookup.c:344
#, c-format
msgid "bad fetch on multi key %s"
msgstr ""
# need-proofread
-#: libdb/db_lookup.c:455 src/whatis.c:739
+#: libdb/db_lookup.c:415 src/whatis.c:739
#, c-format
msgid "Database %s corrupted; rebuild with mandb --create"
msgstr "数据库 %s 毁坏;请用 mandb --create 命令重建"
@@ -107,7 +107,7 @@ msgid "The man database defaults to %s%s."
msgstr "默认的 man 数据库是 %s%s。"
#: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:105
+#: src/lexgrog_test.c:68 src/man.c:278 src/manconv_main.c:94 src/mandb.c:108
#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
msgid "emit debugging messages"
msgstr "输出调试信息"
@@ -122,20 +122,20 @@ msgstr "无法打开 %s 读取数据"
msgid "[SECTION...]"
msgstr "[章节...]"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "PATH"
msgstr "路径"
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:299 src/whatis.c:133
msgid "set search path for manual pages to PATH"
msgstr "设置搜索手册页的路径为“路径”"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "FILE"
msgstr "文件"
-#: src/catman.c:100 src/man.c:278 src/mandb.c:113 src/manpath.c:67
+#: src/catman.c:100 src/man.c:277 src/mandb.c:116 src/manpath.c:67
#: src/whatis.c:135
msgid "use this user configuration file"
msgstr "使用该用户设置文件"
@@ -177,72 +177,67 @@ msgid "unable to update %s"
msgstr "无法更新 %s"
# need-proofread
-#: src/check_mandirs.c:107
+#: src/check_mandirs.c:94
#, c-format
msgid "warning: %s/man%s/%s.%s*: competing extensions"
msgstr "警告:%s/man%s/%s.%s*:互相竞争的扩展"
-#: src/check_mandirs.c:121 src/check_mandirs.c:561
+#: src/check_mandirs.c:108 src/check_mandirs.c:540
#, c-format
msgid "can't update index cache %s"
msgstr "无法更新索引缓存 %s"
-#: src/check_mandirs.c:249
+#: src/check_mandirs.c:236
#, c-format
msgid "warning: %s: bad symlink or ROFF `.so' request"
msgstr "警告:%s:坏的符号链接或坏的 ROFF“.so”请求"
-#: src/check_mandirs.c:307
+#: src/check_mandirs.c:294
#, c-format
msgid "warning: %s: ignoring empty file"
msgstr "警告:%s:忽略空文件"
-#: src/check_mandirs.c:311 src/straycats.c:275
+#: src/check_mandirs.c:298 src/straycats.c:262
#, c-format
msgid "warning: %s: whatis parse for %s(%s) failed"
msgstr "警告:%s:用 whatis 解读 %s(%s) 失败"
-#: src/check_mandirs.c:337 src/check_mandirs.c:441 src/mandb.c:849
-#: src/straycats.c:88 src/straycats.c:303 src/ult_src.c:95
+#: src/check_mandirs.c:324 src/check_mandirs.c:427 src/mandb.c:864
+#: src/straycats.c:74 src/straycats.c:290 src/ult_src.c:80
#, c-format
msgid "can't search directory %s"
msgstr "无法搜索目录 %s"
-#: src/check_mandirs.c:376 src/check_mandirs.c:403
+#: src/check_mandirs.c:363 src/check_mandirs.c:390
#, c-format
msgid "warning: cannot create catdir %s"
msgstr "警告:无法创建 catdir %s"
-#: src/check_mandirs.c:446 src/man.c:2255 src/man.c:2297 src/man.c:2326
+#: src/check_mandirs.c:432 src/man.c:1782 src/man.c:1824 src/man.c:1853
#, c-format
msgid "can't change to directory %s"
msgstr "无法切换到目录 %s 中"
-#: src/check_mandirs.c:489
+#: src/check_mandirs.c:481
#, c-format
msgid "can't create index cache %s"
msgstr "无法创建索引缓存 %s"
-#: src/check_mandirs.c:514
+#: src/check_mandirs.c:506
#, c-format
msgid "Updating index cache for path `%s/%s'. Wait..."
msgstr "正在为路径 %s/%s 更新索引缓存。请等待..."
-#: src/check_mandirs.c:620 src/check_mandirs.c:688
+#: src/check_mandirs.c:567 src/check_mandirs.c:621
msgid "done.\n"
msgstr "完成。\n"
# need-proofread
-#: src/check_mandirs.c:943
+#: src/check_mandirs.c:887
#, c-format
msgid "Purging old database entries in %s...\n"
msgstr "正在删除 %s 里的旧数据库条目...\n"
-#: src/convert_name.c:51
-#, c-format
-msgid "Can't convert %s to cat name"
-msgstr "无法把 %s 转换为 cat 名称"
-
# need-proofread
#: src/descriptions_store.c:47
#, c-format
@@ -250,7 +245,7 @@ msgid "warning: failed to store entry for %s(%s)"
msgstr "警告:为 %s(%s) 存储条目失败"
# need-proofread
-#: src/filenames.c:48 src/straycats.c:120 src/straycats.c:149
+#: src/filenames.c:48 src/straycats.c:106 src/straycats.c:135
#, c-format
msgid "warning: %s: ignoring bogus filename"
msgstr "警告:%s:忽略错误的文件名"
@@ -259,19 +254,19 @@ msgstr "警告:%s:忽略错误的文件名"
msgid "PATH SECTION NAME"
msgstr "路径 章节 名称"
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:302
msgid "EXTENSION"
msgstr "扩展"
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:303
msgid "limit search to extension type EXTENSION"
msgstr "将搜索限制在扩展类型为“扩展”的手册页之内"
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:304
msgid "look for pages case-insensitively (default)"
msgstr "查找手册页时不区分大小写字母 (默认)"
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:305
msgid "look for pages case-sensitively"
msgstr "查找手册页时区分大小写字母。"
@@ -285,16 +280,16 @@ msgstr "把每个关键词都当作正则表达式解读"
msgid "the page name contains wildcards"
msgstr "关键词里包含通配符"
-#: src/lexgrog.l:672
+#: src/lexgrog.l:665
#, fuzzy, c-format
msgid "warning: whatis for %s exceeds %d byte, truncating."
msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
msgstr[0] "警告:对 %s 的 whatis 操作结果超过 %d 字节,正在截断。"
msgstr[1] "警告:对 %s 的 whatis 操作结果超过 %d 字节,正在截断。"
-#: src/lexgrog.l:823 src/man.c:2562 src/man.c:2644 src/man.c:2741
-#: src/manconv_main.c:165 src/straycats.c:216 src/ult_src.c:362
-#: src/ult_src.c:376 src/zsoelim.l:498
+#: src/lexgrog.l:816 src/man.c:2124 src/man.c:2206 src/man.c:2303
+#: src/manconv_main.c:165 src/straycats.c:203 src/ult_src.c:347
+#: src/ult_src.c:361 src/zsoelim.l:498
#, c-format
msgid "can't open %s"
msgstr "无法打开 %s"
@@ -323,165 +318,165 @@ msgstr "显示 whatis 信息"
msgid "show guessed series of preprocessing filters"
msgstr "显示所猜测的预处理过滤器序列"
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:294 src/man.c:319
msgid "ENCODING"
msgstr "编码"
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:319
#, fuzzy
msgid "use selected output encoding"
msgstr "必须指定输出所用的编码"
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:546 src/man.c:555
#, c-format
msgid "%s: incompatible options"
msgstr "%s:互不相容的选项"
-#: src/man.c:164
+#: src/man.c:162
#, c-format
msgid "command exited with status %d: %s"
msgstr "命令以代码 %d 状态退出:%s"
-#: src/man.c:262
+#: src/man.c:261
msgid "[SECTION] PAGE..."
msgstr "[章节] 手册页..."
-#: src/man.c:280
+#: src/man.c:279
msgid "reset all options to their default values"
msgstr "将所有选项都重置为默认值"
-#: src/man.c:281
+#: src/man.c:280
msgid "WARNINGS"
msgstr "警告"
-#: src/man.c:282
+#: src/man.c:281
msgid "enable warnings from groff"
msgstr "开启 groff 的警告"
-#: src/man.c:284
+#: src/man.c:283
msgid "Main modes of operation:"
msgstr "主要运行模式:"
-#: src/man.c:285
+#: src/man.c:284
msgid "equivalent to whatis"
msgstr "等同于 whatis"
-#: src/man.c:286
+#: src/man.c:285
msgid "equivalent to apropos"
msgstr "等同于 apropos"
-#: src/man.c:287
+#: src/man.c:286
msgid "search for text in all pages"
msgstr ""
-#: src/man.c:288
+#: src/man.c:287
msgid "print physical location of man page(s)"
msgstr "输出手册页的物理位置"
-#: src/man.c:291
+#: src/man.c:290
msgid "print physical location of cat file(s)"
msgstr "输出 cat 文件的物理位置"
-#: src/man.c:293
+#: src/man.c:292
msgid "interpret PAGE argument(s) as local filename(s)"
msgstr "把“手册页”参数当成本地文件名来解读"
-#: src/man.c:294
+#: src/man.c:293
msgid "used by catman to reformat out of date cat pages"
msgstr "由 catman 使用,用来对过时的 cat 页重新排版"
-#: src/man.c:295
+#: src/man.c:294
#, fuzzy
msgid "output source page encoded in ENCODING"
msgstr "以指定编码输出手册页源码"
-#: src/man.c:297
+#: src/man.c:296
msgid "Finding manual pages:"
msgstr "寻找手册页:"
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:297 src/whatis.c:134
msgid "LOCALE"
msgstr "区域"
-#: src/man.c:298
+#: src/man.c:297
msgid "define the locale for this particular man search"
msgstr "定义本次手册页搜索所采用的区域设置"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
msgid "SYSTEM"
msgstr "系统"
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:298 src/manpath.c:68 src/whatis.c:132
#, fuzzy
msgid "use manual pages from other systems"
msgstr "搜索其它 unix 系统的手册页"
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:300 src/whatis.c:130
msgid "LIST"
msgstr "列表"
-#: src/man.c:301
+#: src/man.c:300
msgid "use colon separated section list"
msgstr "使用以半角冒号分隔的章节列表"
-#: src/man.c:307
+#: src/man.c:306
msgid "show all pages matching regex"
msgstr ""
-#: src/man.c:308
+#: src/man.c:307
msgid "show all pages matching wildcard"
msgstr ""
-#: src/man.c:309
+#: src/man.c:308
msgid "make --regex and --wildcard match page names only, not descriptions"
msgstr ""
-#: src/man.c:311
+#: src/man.c:310
msgid "find all matching manual pages"
msgstr "寻找所有匹配的手册页"
-#: src/man.c:312
+#: src/man.c:311
msgid "force a cache consistency check"
msgstr "强制进行缓存一致性的检查"
-#: src/man.c:314
+#: src/man.c:313
msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
msgstr ""
-#: src/man.c:316
+#: src/man.c:315
msgid "Controlling formatted output:"
msgstr "控制格式化的输出:"
-#: src/man.c:317
+#: src/man.c:316
msgid "PAGER"
msgstr "PAGER"
-#: src/man.c:317
+#: src/man.c:316
msgid "use program PAGER to display output"
msgstr "使用 PAGER 程序显示输出文本"
-#: src/man.c:318 src/man.c:327
+#: src/man.c:317 src/man.c:326
msgid "STRING"
msgstr "字符串"
# need-proofread
-#: src/man.c:318
+#: src/man.c:317
msgid "provide the `less' pager with a prompt"
msgstr "给 less pager 提供一个提示行"
-#: src/man.c:319
+#: src/man.c:318
msgid "display ASCII translation of certain latin1 chars"
msgstr "显示某些 latin1 字符的 ASCII 翻译形式"
-#: src/man.c:322
+#: src/man.c:321
msgid "turn off hyphenation"
msgstr ""
-#: src/man.c:325
+#: src/man.c:324
msgid "turn off justification"
msgstr ""
-#: src/man.c:327
+#: src/man.c:326
msgid ""
"STRING indicates which preprocessors to run:\n"
"e - [n]eqn, p - pic, t - tbl,\n"
@@ -491,34 +486,34 @@ msgstr ""
"e - [n]eqn, p - pic, t - tbl,\n"
"g - grap, r - refer, v - vgrind"
-#: src/man.c:331
+#: src/man.c:330
#, c-format
msgid "use %s to format pages"
msgstr "使用 %s 对手册页排版"
-#: src/man.c:332
+#: src/man.c:331
msgid "DEVICE"
msgstr "设备"
-#: src/man.c:333
+#: src/man.c:332
#, c-format
msgid "use %s with selected device"
msgstr "使用 %s 的指定设备"
-#: src/man.c:334
+#: src/man.c:333
msgid "BROWSER"
msgstr "浏览器"
-#: src/man.c:335
+#: src/man.c:334
#, c-format
msgid "use %s or BROWSER to display HTML output"
msgstr "使用 %s 或指定浏览器显示 HTML 输出"
-#: src/man.c:336
+#: src/man.c:335
msgid "RESOLUTION"
msgstr "分辨率"
-#: src/man.c:338
+#: src/man.c:337
msgid ""
"use groff and display through gxditview (X11):\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -526,104 +521,97 @@ msgstr ""
"使用 groff 并通过 gxditview (X11) 来显示:\n"
"-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
-#: src/man.c:340
+#: src/man.c:339
msgid "use groff and force it to produce ditroff"
msgstr "使用 groff 并强制它生成 ditroff"
-#: src/man.c:603 src/man.c:727
+#: src/man.c:602 src/man.c:726
#, c-format
msgid "No manual entry for %s\n"
msgstr "没有 %s 的手册页条目\n"
-#: src/man.c:605
+#: src/man.c:604
#, c-format
msgid "(Alternatively, what manual page do you want from section %s?)\n"
msgstr "(换句话问,您需要第 %s 节中的什么手册页?)\n"
-#: src/man.c:609
+#: src/man.c:608
msgid "What manual page do you want?\n"
msgstr "您需要什么手册页?\n"
-#: src/man.c:724
+#: src/man.c:723
#, c-format
msgid "No manual entry for %s in section %s\n"
msgstr "在第 %2$s 节中没有关于 %1$s 的手册页条目。\n"
-#: src/man.c:733
+#: src/man.c:732
#, c-format
msgid "See '%s' for help when manual pages are not available.\n"
msgstr "当没有手册页时,可以用 %s 命令来寻求帮助。\n"
-# need-proofread
-#: src/man.c:924 src/man.c:2453
-#, c-format
-msgid "can't chdir to %s"
-msgstr "无法进入到 %s 目录中"
-
-# I'm not sure this should be translated. It comes from a less prompt string
-# but seems to be only part of it. (Ming)
-# need-proofread
-#: src/man.c:1152
-msgid " Manual page "
-msgstr " Manual page "
-
-#: src/man.c:1222 src/man.c:3558
-#, c-format
-msgid "mandb command failed with exit status %d"
-msgstr "mandb 命令失败,退出状态代码为 %d"
-
-#: src/man.c:1766
+#: src/man.c:1295
#, c-format
msgid "ignoring unknown preprocessor `%c'"
msgstr "忽略未知的预处理器 `%c'"
-#: src/man.c:2037 src/mandb.c:310
+#: src/man.c:1566 src/mandb.c:327
#, c-format
msgid "can't chown %s"
msgstr "无法 chown %s"
-#: src/man.c:2049 src/mandb.c:221
+#: src/man.c:1578 src/mandb.c:224
#, c-format
msgid "can't chmod %s"
msgstr "无法 chmod %s"
-#: src/man.c:2060 src/mandb.c:212
+#: src/man.c:1589 src/mandb.c:215
#, c-format
msgid "can't rename %s to %s"
msgstr "无法将 %s 改名为 %s"
# need-proofread
-#: src/man.c:2079
+#: src/man.c:1606
#, c-format
msgid "can't set times on %s"
msgstr "无法设定 %s 文件的时间"
-#: src/man.c:2088
+#: src/man.c:1615
#, c-format
msgid "can't unlink %s"
msgstr "无法删除 (unlink) %s"
-#: src/man.c:2139
+#: src/man.c:1666
#, c-format
msgid "can't create temporary cat for %s"
msgstr "无法为 %s 创建临时 cat 文件"
-#: src/man.c:2253
+#: src/man.c:1780
#, fuzzy, c-format
msgid "can't create temporary directory"
msgstr "无法为 %s 创建临时 cat 文件"
-#: src/man.c:2265
+#: src/man.c:1792
#, c-format
msgid "can't open temporary file %s"
msgstr "无法打开临时文件 %s"
-#: src/man.c:2303 src/man.c:2331
+#: src/man.c:1830 src/man.c:1858
#, c-format
msgid "can't remove directory %s"
msgstr "无法移除目录 %s"
-#: src/man.c:2686
+#: src/man.c:1969
+#, c-format
+msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
+msgstr "--Man-- 下一页: %s [ 查看 (return) | 跳过 (Ctrl-D) | 退出 (Ctrl-C) ]\n"
+
+# need-proofread
+#: src/man.c:2014 src/man.c:3570
+#, c-format
+msgid "can't chdir to %s"
+msgstr "无法进入到 %s 目录中"
+
+#: src/man.c:2248
#, c-format
msgid ""
"\n"
@@ -632,21 +620,33 @@ msgstr ""
"\n"
"无法在 catman 模式下对 %s 写入"
+#: src/man.c:2329
+#, c-format
+msgid "Can't convert %s to cat name"
+msgstr "无法把 %s 转换为 cat 名称"
+
# need-proofread
-#: src/man.c:3413
+#: src/man.c:3047
#, c-format
msgid "%s: relying on whatis refs is deprecated\n"
msgstr "%s:依赖于 whatis 引用是已被废弃的做法\n"
-#: src/man.c:3760
+#: src/man.c:3196 src/man.c:3968
+#, c-format
+msgid "mandb command failed with exit status %d"
+msgstr "mandb 命令失败,退出状态代码为 %d"
+
+#: src/man.c:3398
#, c-format
msgid "internal error: candidate type %d out of range"
msgstr "内部错误:候选类型 %d 超出正常范围"
-#: src/man.c:4026
-#, c-format
-msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
-msgstr "--Man-- 下一页: %s [ 查看 (return) | 跳过 (Ctrl-D) | 退出 (Ctrl-C) ]\n"
+# I'm not sure this should be translated. It comes from a less prompt string
+# but seems to be only part of it. (Ming)
+# need-proofread
+#: src/man.c:3898
+msgid " Manual page "
+msgstr " Manual page "
# need-proofread
#: src/manconv.c:232 src/manconv.c:253 src/manconv.c:348
@@ -694,73 +694,73 @@ msgstr "必须指定输入所用的编码"
msgid "must specify an output encoding"
msgstr "必须指定输出所用的编码"
-#: src/mandb.c:102
+#: src/mandb.c:105
msgid "[MANPATH]"
msgstr "[手册路径]"
-#: src/mandb.c:106
+#: src/mandb.c:109
msgid "work quietly, except for 'bogus' warning"
msgstr "安静运行,除 bogus 警告外不输出信息"
-#: src/mandb.c:107
+#: src/mandb.c:110
msgid "don't look for or add stray cats to the dbs"
msgstr "不要在数据库中寻找或添加流浪猫"
-#: src/mandb.c:108
+#: src/mandb.c:111
msgid "don't purge obsolete entries from the dbs"
msgstr "不要删除数据库中过时的旧条目"
-#: src/mandb.c:109
+#: src/mandb.c:112
msgid "produce user databases only"
msgstr "仅生成用户数据库"
-#: src/mandb.c:110
+#: src/mandb.c:113
msgid "create dbs from scratch, rather than updating"
msgstr "不更新数据库,而是重新创建数据库"
-#: src/mandb.c:111
+#: src/mandb.c:114
msgid "check manual pages for correctness"
msgstr "检查手册页的正确性"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "FILENAME"
msgstr "文件名"
-#: src/mandb.c:112
+#: src/mandb.c:115
msgid "update just the entry for this filename"
msgstr "仅更新该文件名对应的条目"
-#: src/mandb.c:205
+#: src/mandb.c:208
#, c-format
msgid "can't remove %s"
msgstr "无法移除 %s"
-#: src/mandb.c:257
+#: src/mandb.c:272
#, c-format
msgid "can't write to %s"
msgstr "无法对 %s 写入"
-#: src/mandb.c:262
+#: src/mandb.c:277
#, c-format
msgid "can't read from %s"
msgstr "无法从 %s 读取"
-#: src/mandb.c:436
+#: src/mandb.c:453
#, c-format
msgid "Processing manual pages under %s...\n"
msgstr "正在处理 %s 下的手册页...\n"
-#: src/mandb.c:632 src/mandb.c:658
+#: src/mandb.c:647 src/mandb.c:673
#, fuzzy, c-format
msgid "Removing obsolete cat directory %s...\n"
msgstr "正在 %s 下查找流浪猫...\n"
-#: src/mandb.c:814
+#: src/mandb.c:829
#, c-format
msgid "warning: no MANDB_MAP directives in %s, using your manpath"
msgstr "警告:在 %s 中没有 MANDB_MAP 指令,使用您的手册路径设置"
-#: src/mandb.c:886
+#: src/mandb.c:901
#, fuzzy, c-format
msgid "%d man subdirectory contained newer manual pages.\n"
msgid_plural "%d man subdirectories contained newer manual pages.\n"
@@ -774,14 +774,14 @@ msgstr[1] ""
# I'm not sure this should be translated. It comes from a less prompt string
# but seems to be only part of it. (Ming)
# need-proofread
-#: src/mandb.c:891
+#: src/mandb.c:906
#, fuzzy, c-format
msgid "%d manual page was added.\n"
msgid_plural "%d manual pages were added.\n"
msgstr[0] " Manual page "
msgstr[1] " Manual page "
-#: src/mandb.c:895
+#: src/mandb.c:910
#, fuzzy, c-format
msgid "%d stray cat was added.\n"
msgid_plural "%d stray cats were added.\n"
@@ -789,14 +789,14 @@ msgstr[0] "添加了 %d 只流浪猫。\n"
msgstr[1] "添加了 %d 只流浪猫。\n"
# need-proofread
-#: src/mandb.c:900
+#: src/mandb.c:915
#, fuzzy, c-format
msgid "%d old database entry was purged.\n"
msgid_plural "%d old database entries were purged.\n"
msgstr[0] "删除了 %d 条旧数据库条目。\n"
msgstr[1] "删除了 %d 条旧数据库条目。\n"
-#: src/mandb.c:918
+#: src/mandb.c:933
#, c-format
msgid "No databases created."
msgstr "未创建任何数据库。"
@@ -889,28 +889,28 @@ msgstr "显示整个全局手册路径"
msgid "warning: no global manpaths set in config file %s"
msgstr "警告:在设置文件 %s 中没有设定全局手册路径"
-#: src/straycats.c:242 src/ult_src.c:139
+#: src/straycats.c:229 src/ult_src.c:124
#, c-format
msgid "warning: %s is a dangling symlink"
msgstr "警告:%s 是悬空的符号链接"
-#: src/straycats.c:245 src/ult_src.c:142 src/ult_src.c:302
+#: src/straycats.c:232 src/ult_src.c:127 src/ult_src.c:287
#, c-format
msgid "can't resolve %s"
msgstr "无法解析 %s"
-#: src/straycats.c:308
+#: src/straycats.c:295
#, c-format
msgid "Checking for stray cats under %s...\n"
msgstr "正在 %s 下查找流浪猫...\n"
-#: src/straycats.c:347
+#: src/straycats.c:334
#, c-format
msgid "warning: can't update index cache %s"
msgstr "警告:无法更新索引缓存 %s"
# need-proofread
-#: src/ult_src.c:340
+#: src/ult_src.c:325
#, c-format
msgid "%s is self referencing"
msgstr "%s 是指向自己的链接"
diff --git a/src/Makefile.am b/src/Makefile.am
index f28bb43a..8da3769a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,8 +101,6 @@ lexgrog_SOURCES = \
ult_src.h
man_SOURCES = \
compression.c \
- convert_name.c \
- convert_name.h \
filenames.c \
filenames.h \
globbing.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index 80d91251..6378e854 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -318,10 +318,10 @@ am_lexgrog_OBJECTS = compression.$(OBJEXT) descriptions.$(OBJEXT) \
lexgrog_OBJECTS = $(am_lexgrog_OBJECTS)
lexgrog_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_2)
-am_man_OBJECTS = compression.$(OBJEXT) convert_name.$(OBJEXT) \
- filenames.$(OBJEXT) globbing.$(OBJEXT) man.$(OBJEXT) \
- manconv.$(OBJEXT) manconv_client.$(OBJEXT) manp.$(OBJEXT) \
- ult_src.$(OBJEXT) zsoelim.$(OBJEXT)
+am_man_OBJECTS = compression.$(OBJEXT) filenames.$(OBJEXT) \
+ globbing.$(OBJEXT) man.$(OBJEXT) manconv.$(OBJEXT) \
+ manconv_client.$(OBJEXT) manp.$(OBJEXT) ult_src.$(OBJEXT) \
+ zsoelim.$(OBJEXT)
man_OBJECTS = $(am_man_OBJECTS)
man_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_2)
@@ -1485,8 +1485,6 @@ lexgrog_SOURCES = \
man_SOURCES = \
compression.c \
- convert_name.c \
- convert_name.h \
filenames.c \
filenames.h \
globbing.c \
@@ -1791,7 +1789,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catman.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mandirs.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compression.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert_name.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/descriptions.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/descriptions_store.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filenames.Po@am__quote@
diff --git a/src/convert_name.c b/src/convert_name.c
deleted file mode 100644
index 7514cf01..00000000
--- a/src/convert_name.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * convert_name.c
- *
- * Copyright (C) 1994, 1995 Graeme W. Wilford. (Wilf.)
- * Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2012
- * Colin Watson.
- *
- * This file is part of man-db.
- *
- * man-db is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * man-db is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with man-db; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * code to do appropriate pathname conversion
- *
- * Mon May 2 11:14:28 BST 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "xvasprintf.h"
-
-#include "gettext.h"
-#define _(String) gettext (String)
-
-#include "manconfig.h"
-
-#include "error.h"
-
-#include "manp.h"
-#include "convert_name.h"
-
-static inline void gripe_converting_name (const char *name) ATTRIBUTE_NORETURN;
-static inline void gripe_converting_name (const char *name)
-{
- error (FATAL, 0, _("Can't convert %s to cat name"), name);
- abort (); /* error should have exited; help compilers prove noreturn */
-}
-
-/* Convert the trailing part of 'name' to be a cat page path by altering its
- * extension appropriately. If fsstnd is set, also try converting the
- * containing directory name from "man1" to "cat1" etc., returning NULL if
- * that doesn't work.
- *
- * fsstnd should only be set if name is the original path of a man page
- * found in a man hierarchy, not something like a symlink target or a file
- * named with 'man -l'. Otherwise, a symlink to "/home/manuel/foo.1.gz"
- * would be converted to "/home/catuel/foo.1.gz", which would be bad.
- */
-char *convert_name (const char *name, int fsstnd)
-{
- char *to_name, *t1 = NULL;
- char *t2 = NULL;
-#ifdef COMP_SRC
- struct compression *comp;
-#endif /* COMP_SRC */
- char *namestem;
-
-#ifdef COMP_SRC
- comp = comp_info (name, 1);
- if (comp)
- namestem = comp->stem;
- else
-#endif /* COMP_SRC */
- namestem = xstrdup (name);
-
-#ifdef COMP_CAT
- /* TODO: BSD layout requires .0. */
- to_name = xasprintf ("%s.%s", namestem, COMPRESS_EXT);
-#else /* !COMP_CAT */
- to_name = xstrdup (namestem);
-#endif /* COMP_CAT */
- free (namestem);
-
- if (fsstnd) {
- t1 = strrchr (to_name, '/');
- if (!t1)
- gripe_converting_name (name);
- *t1 = '\0';
-
- t2 = strrchr (to_name, '/');
- if (!t2)
- gripe_converting_name (name);
- ++t2;
- *t1 = '/';
-
- if (STRNEQ (t2, "man", 3)) {
- /* If the second-last component starts with "man",
- * replace "man" with "cat".
- */
- *t2 = 'c';
- *(t2 + 2) = 't';
- } else {
- free (to_name);
- debug ("couldn't convert %s to FSSTND cat file\n",
- name);
- return NULL;
- }
- }
-
- debug ("converted %s to %s\n", name, to_name);
-
- return to_name;
-}
diff --git a/src/convert_name.h b/src/convert_name.h
deleted file mode 100644
index af074cf8..00000000
--- a/src/convert_name.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * convert_name.h: headers for pathname conversion
- *
- * Copyright (C) 1994, 1995 Graeme W. Wilford. (Wilf.)
- *
- * This file is part of man-db.
- *
- * man-db is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * man-db is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with man-db; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Mon May 2 11:14:28 BST 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
- */
-
-extern char *convert_name (const char *name, int fsstnd);
diff --git a/src/man.c b/src/man.c
index c99a445c..a071559f 100644
--- a/src/man.c
+++ b/src/man.c
@@ -102,7 +102,6 @@ static char *cwd;
#include "globbing.h"
#include "ult_src.h"
#include "manp.h"
-#include "convert_name.h"
#include "zsoelim.h"
#include "manconv_client.h"
@@ -2324,6 +2323,78 @@ static int display (const char *dir, const char *man_file,
return found;
}
+static inline void gripe_converting_name (const char *name) ATTRIBUTE_NORETURN;
+static inline void gripe_converting_name (const char *name)
+{
+ error (FATAL, 0, _("Can't convert %s to cat name"), name);
+ abort (); /* error should have exited; help compilers prove noreturn */
+}
+
+/* Convert the trailing part of 'name' to be a cat page path by altering its
+ * extension appropriately. If fsstnd is set, also try converting the
+ * containing directory name from "man1" to "cat1" etc., returning NULL if
+ * that doesn't work.
+ *
+ * fsstnd should only be set if name is the original path of a man page
+ * found in a man hierarchy, not something like a symlink target or a file
+ * named with 'man -l'. Otherwise, a symlink to "/home/manuel/foo.1.gz"
+ * would be converted to "/home/catuel/foo.1.gz", which would be bad.
+ */
+static char *convert_name (const char *name, int fsstnd)
+{
+ char *to_name, *t1 = NULL;
+ char *t2 = NULL;
+#ifdef COMP_SRC
+ struct compression *comp;
+#endif /* COMP_SRC */
+ char *namestem;
+
+#ifdef COMP_SRC
+ comp = comp_info (name, 1);
+ if (comp)
+ namestem = comp->stem;
+ else
+#endif /* COMP_SRC */
+ namestem = xstrdup (name);
+
+#ifdef COMP_CAT
+ /* TODO: BSD layout requires .0. */
+ to_name = xasprintf ("%s.%s", namestem, COMPRESS_EXT);
+#else /* !COMP_CAT */
+ to_name = xstrdup (namestem);
+#endif /* COMP_CAT */
+ free (namestem);
+
+ if (fsstnd) {
+ t1 = strrchr (to_name, '/');
+ if (!t1)
+ gripe_converting_name (name);
+ *t1 = '\0';
+
+ t2 = strrchr (to_name, '/');
+ if (!t2)
+ gripe_converting_name (name);
+ ++t2;
+ *t1 = '/';
+
+ if (STRNEQ (t2, "man", 3)) {
+ /* If the second-last component starts with "man",
+ * replace "man" with "cat".
+ */
+ *t2 = 'c';
+ *(t2 + 2) = 't';
+ } else {
+ free (to_name);
+ debug ("couldn't convert %s to FSSTND cat file\n",
+ name);
+ return NULL;
+ }
+ }
+
+ debug ("converted %s to %s\n", name, to_name);
+
+ return to_name;
+}
static char *find_cat_file (const char *path, const char *original,
const char *man_file)