From 8f7a50d229d6d14ff7e74524a51a2b322ef26f15 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Mon, 3 Jan 2022 15:15:54 +0900 Subject: [PATCH] Imported Upstream version 2.7.2 --- Makefile.am | 6 +- Makefile.in | 72 ++++--- NEWS | 17 ++ aclocal.m4 | 59 +++--- build-aux/ar-lib | 2 +- build-aux/compile | 2 +- build-aux/depcomp | 2 +- build-aux/install-sh | 373 ++++++++++++++++----------------- build-aux/missing | 2 +- build-aux/test-driver | 15 +- build-aux/ylwrap | 2 +- configure | 125 +++++++++-- configure.ac | 28 ++- docs/Makefile.in | 24 ++- docs/man-db.lsm | 6 +- gnulib/lib/Makefile.in | 25 ++- init/Makefile.in | 22 +- init/systemd/Makefile.in | 24 ++- lib/Makefile.in | 25 ++- libdb/Makefile.in | 25 ++- libdb/db_delete.c | 20 +- libdb/db_gdbm.c | 6 +- libdb/db_lookup.c | 38 ++-- libdb/db_storage.h | 17 +- libdb/db_store.c | 52 ++--- libdb/db_ver.c | 10 +- libdb/mydbm.h | 5 +- man/Makefile.in | 30 ++- man/da/Makefile.in | 29 ++- man/de/Makefile.in | 29 ++- man/es/Makefile.in | 29 ++- man/fr/Makefile.in | 29 ++- man/id/Makefile.in | 29 ++- man/it/Makefile.in | 29 ++- man/ja/Makefile.in | 29 ++- man/man1/man.man1 | 4 +- man/nl/Makefile.in | 29 ++- man/pl/Makefile.in | 29 ++- man/po4a/Makefile.in | 22 +- man/po4a/po/da.po | 22 +- man/po4a/po/de.po | 24 +-- man/po4a/po/fr.po | 255 +++++++++------------- man/po4a/po/id.po | 26 +-- man/po4a/po/ja.po | 24 +-- man/po4a/po/man-db-manpages.pot | 14 +- man/po4a/po/nl.po | 16 +- man/po4a/po/pl.po | 24 +-- man/po4a/po/ru.po | 24 +-- man/po4a/po/zh_CN.po | 24 +-- man/ru/Makefile.in | 29 ++- man/zh_CN/Makefile.in | 29 ++- manual/Makefile.in | 24 ++- po/ca.po | 324 ++++++++++++++-------------- po/cs.po | 278 ++++++++++++------------ po/da.po | 278 ++++++++++++------------ po/de.po | 278 ++++++++++++------------ po/eo.po | 278 ++++++++++++------------ po/es.po | 278 ++++++++++++------------ po/fi.po | 453 +++++++++++++++++++--------------------- po/fr.po | 278 ++++++++++++------------ po/id.po | 278 ++++++++++++------------ po/it.po | 278 ++++++++++++------------ po/ja.po | 278 ++++++++++++------------ po/man-db.pot | 276 ++++++++++++------------ po/nl.po | 278 ++++++++++++------------ po/pl.po | 278 ++++++++++++------------ po/pt_BR.po | 278 ++++++++++++------------ po/ro.po | 278 ++++++++++++------------ po/ru.po | 278 ++++++++++++------------ po/sr.po | 278 ++++++++++++------------ po/sv.po | 278 ++++++++++++------------ po/vi.po | 278 ++++++++++++------------ po/zh_CN.po | 278 ++++++++++++------------ src/Makefile.in | 26 ++- src/accessdb.c | 6 +- src/catman.c | 34 ++- src/check_mandirs.c | 113 +++++----- src/check_mandirs.h | 4 +- src/descriptions.h | 3 +- src/descriptions_store.c | 4 +- src/man.c | 71 +++++-- src/mandb.c | 10 +- src/straycats.c | 17 +- src/tests/Makefile.in | 29 ++- src/whatis.c | 49 +++-- tools/Makefile.in | 24 ++- 86 files changed, 4335 insertions(+), 3968 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6152b94..61a64d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,11 @@ ## along with man-db; if not, write to the Free Software Foundation, ## Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -SUBDIRS = docs gnulib/lib gnulib/po init lib libdb src man manual po tools +if HAVE_GNULIB_PO +GNULIB_PO = gnulib/po +endif + +SUBDIRS = docs gnulib/lib $(GNULIB_PO) init lib libdb src man manual po tools dist_noinst_DATA = FAQ NEWS README include/README diff --git a/Makefile.in b/Makefile.in index bdbff25..30d86ea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,21 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(top_srcdir)/include/comp_src.h.in \ - $(top_srcdir)/include/manconfig.h.in $(dist_noinst_DATA) \ - ABOUT-NLS NEWS README build-aux/ar-lib build-aux/compile \ - build-aux/config.guess build-aux/config.rpath \ - build-aux/config.sub build-aux/depcomp build-aux/install-sh \ - build-aux/missing build-aux/ylwrap build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/ar-lib $(top_srcdir)/build-aux/compile \ - $(top_srcdir)/build-aux/config.guess \ - $(top_srcdir)/build-aux/config.rpath \ - $(top_srcdir)/build-aux/config.sub \ - $(top_srcdir)/build-aux/install-sh \ - $(top_srcdir)/build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -304,6 +299,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(dist_noinst_DATA) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -367,7 +364,22 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags CSCOPE = cscope -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = docs gnulib/lib gnulib/po init lib libdb src man manual \ + po tools +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/build-aux/ar-lib $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.rpath \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing \ + $(top_srcdir)/include/comp_src.h.in \ + $(top_srcdir)/include/manconfig.h.in ABOUT-NLS NEWS README \ + build-aux/ar-lib build-aux/compile build-aux/config.guess \ + build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ + build-aux/install-sh build-aux/ltmain.sh build-aux/missing \ + build-aux/ylwrap DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -1399,7 +1411,8 @@ unlzma = @unlzma@ unxz = @unxz@ vgrind = @vgrind@ xz = @xz@ -SUBDIRS = docs gnulib/lib gnulib/po init lib libdb src man manual po tools +@HAVE_GNULIB_PO_TRUE@GNULIB_PO = gnulib/po +SUBDIRS = docs gnulib/lib $(GNULIB_PO) init lib libdb src man manual po tools dist_noinst_DATA = FAQ NEWS README include/README # These macro files are imported by gnulib-tool, but at present not used. We @@ -1451,7 +1464,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1688,15 +1700,15 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -1732,17 +1744,17 @@ distcheck: dist esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1919,6 +1931,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + dist-hook: gen-ChangeLog .PHONY: gen-ChangeLog diff --git a/NEWS b/NEWS index e0f7213..9dc6b4c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,20 @@ +man-db 2.7.2 (16 August 2015) +============================= + +Major changes since man-db 2.7.1: + + Fixes: + ------ + + o 'man -k' and 'man -f' now pass any provided -l option through to + the underlying apropos/whatis programs. + + o apropos and whatis no longer truncate names if long output was + requested. + + o The database handle is no longer stored in a global variable, + fixing a class of possible double-close bugs. + man-db 2.7.1 (7 November 2014) ============================== diff --git a/aclocal.m4 b/aclocal.m4 index 789936a..09b82f7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -235,7 +235,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])# PKG_CHECK_VAR -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -247,10 +247,10 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,12 +266,12 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -333,7 +333,7 @@ AC_SUBST([AR])dnl # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -385,7 +385,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -416,7 +416,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -607,7 +607,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -683,7 +683,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -773,8 +773,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -848,6 +848,9 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -877,7 +880,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -888,7 +891,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -898,7 +901,7 @@ if test x"${install_sh}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -920,7 +923,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -955,7 +958,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1005,7 +1008,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1044,7 +1047,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1073,7 +1076,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1120,7 +1123,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1139,7 +1142,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1220,7 +1223,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1280,7 +1283,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1308,7 +1311,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1327,7 +1330,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/build-aux/ar-lib b/build-aux/ar-lib index fe2301e..463b9ec 100755 --- a/build-aux/ar-lib +++ b/build-aux/ar-lib @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2012-03-01.08; # UTC -# Copyright (C) 2010-2013 Free Software Foundation, Inc. +# Copyright (C) 2010-2014 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/compile b/build-aux/compile index 531136b..a85b723 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/depcomp b/build-aux/depcomp index 4ebd5b3..fc98710 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/install-sh b/build-aux/install-sh index 377bb86..59990a1 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ if test $# -eq 0; then fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ do # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,81 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +377,51 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +456,12 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +474,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff --git a/build-aux/missing b/build-aux/missing index db98974..f62bbae 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/test-driver b/build-aux/test-driver index d306056..8e575b0 100755 --- a/build-aux/test-driver +++ b/build-aux/test-driver @@ -3,7 +3,7 @@ scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -106,11 +106,14 @@ trap "st=143; $do_exit" 15 # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -119,6 +122,12 @@ case $estatus:$expect_failure in *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" diff --git a/build-aux/ylwrap b/build-aux/ylwrap index 8f072a8..7c2d927 100755 --- a/build-aux/ylwrap +++ b/build-aux/ylwrap @@ -3,7 +3,7 @@ scriptversion=2013-01-12.17; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # Written by Tom Tromey . # diff --git a/configure b/configure index 9c0781a..4603eb1 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for man-db 2.7.1. +# Generated by GNU Autoconf 2.69 for man-db 2.7.2. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='man-db' PACKAGE_TARNAME='man-db' -PACKAGE_VERSION='2.7.1' -PACKAGE_STRING='man-db 2.7.1' +PACKAGE_VERSION='2.7.2' +PACKAGE_STRING='man-db 2.7.2' PACKAGE_BUGREPORT='cjwatson@debian.org' PACKAGE_URL='' @@ -647,6 +647,8 @@ am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +HAVE_GNULIB_PO_FALSE +HAVE_GNULIB_PO_TRUE CROSS_COMPILING_FALSE CROSS_COMPILING_TRUE TRANS_ZSOELIM_UPPER @@ -2266,7 +2268,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures man-db 2.7.1 to adapt to many kinds of systems. +\`configure' configures man-db 2.7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2336,7 +2338,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of man-db 2.7.1:";; + short | recursive ) echo "Configuration of man-db 2.7.2:";; esac cat <<\_ACEOF @@ -2517,7 +2519,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -man-db configure 2.7.1 +man-db configure 2.7.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3226,7 +3228,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by man-db $as_me 2.7.1, which was +It was created by man-db $as_me 2.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3696,7 +3698,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3888,7 +3890,7 @@ else $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -4182,7 +4184,7 @@ fi # Define the identity of the package. PACKAGE='man-db' - VERSION='2.7.1' + VERSION='2.7.2' cat >>confdefs.h <<_ACEOF @@ -4216,8 +4218,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -13261,17 +13263,13 @@ CC="$lt_save_CC" -if test ! -f "$srcdir/gnulib/po/Makefile.in.in"; then - as_fn_error $? "you must run ./autogen.sh before ./configure when building from revision control" "$LINENO" 5 -fi - ac_config_headers="$ac_config_headers config.h" # Define below date and version information to be put into man pages etc. -date=2014-11-07 -roff_version=`echo 2.7.1 | sed 's/-/\\-/g'` +date=2015-08-16 +roff_version=`echo 2.7.2 | sed 's/-/\\-/g'` # We have to be a bit naughty here and supply options. # The autoconf literature states that only features that can be separately @@ -46257,12 +46255,77 @@ else fi test "$db" = "yes" && break + done +else + db=no +fi + + + if test "$db" = no + then + ac_fn_c_check_header_mongrel "$LINENO" "gdbm-ndbm.h" "ac_cv_header_gdbm_ndbm_h" "$ac_includes_default" +if test "x$ac_cv_header_gdbm_ndbm_h" = xyes; then : + + for lib in gdbm_compat c dbm + do + as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_dbm_fetch" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_fetch in -l$lib" >&5 +$as_echo_n "checking for dbm_fetch in -l$lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dbm_fetch (); +int +main () +{ +return dbm_fetch (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + test "$lib" = "c" || DBLIBS="-l$lib" + +$as_echo "#define NDBM 1" >>confdefs.h + + DBTYPE=ndbm + + db=yes +else + db=no +fi + + test "$db" = "yes" && break done else db=no fi + fi fi if test "$db" != "yes" @@ -46357,8 +46420,22 @@ else fi -ac_config_files="$ac_config_files Makefile gnulib/lib/Makefile gnulib/po/Makefile.in init/Makefile init/systemd/Makefile lib/Makefile src/Makefile src/man_db.conf src/tests/Makefile man/Makefile man/replace.sin man/po4a/Makefile man/da/Makefile man/de/Makefile man/es/Makefile man/fr/Makefile man/id/Makefile man/it/Makefile man/ja/Makefile man/nl/Makefile man/pl/Makefile man/ru/Makefile man/zh_CN/Makefile manual/Makefile libdb/Makefile docs/Makefile tools/Makefile include/comp_src.h include/manconfig.h po/Makefile.in" +# Are Gnulib translations available? + if test -f "$srcdir/gnulib/po/POTFILES.in"; then + HAVE_GNULIB_PO_TRUE= + HAVE_GNULIB_PO_FALSE='#' +else + HAVE_GNULIB_PO_TRUE='#' + HAVE_GNULIB_PO_FALSE= +fi + +ac_config_files="$ac_config_files Makefile gnulib/lib/Makefile init/Makefile init/systemd/Makefile lib/Makefile src/Makefile src/man_db.conf src/tests/Makefile man/Makefile man/replace.sin man/po4a/Makefile man/da/Makefile man/de/Makefile man/es/Makefile man/fr/Makefile man/id/Makefile man/it/Makefile man/ja/Makefile man/nl/Makefile man/pl/Makefile man/ru/Makefile man/zh_CN/Makefile manual/Makefile libdb/Makefile docs/Makefile tools/Makefile include/comp_src.h include/manconfig.h po/Makefile.in" + +if test -f "$srcdir/gnulib/po/Makefile.in.in"; then + ac_config_files="$ac_config_files gnulib/po/Makefile.in" + +fi cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -46593,6 +46670,10 @@ if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then as_fn_error $? "conditional \"CROSS_COMPILING\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_GNULIB_PO_TRUE}" && test -z "${HAVE_GNULIB_PO_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GNULIB_PO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -46990,7 +47071,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by man-db $as_me 2.7.1, which was +This file was extended by man-db $as_me 2.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -47056,7 +47137,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -man-db config.status 2.7.1 +man-db config.status 2.7.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -47475,7 +47556,6 @@ do "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "gnulib/lib/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/lib/Makefile" ;; - "gnulib/po/Makefile.in") CONFIG_FILES="$CONFIG_FILES gnulib/po/Makefile.in" ;; "init/Makefile") CONFIG_FILES="$CONFIG_FILES init/Makefile" ;; "init/systemd/Makefile") CONFIG_FILES="$CONFIG_FILES init/systemd/Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; @@ -47503,6 +47583,7 @@ do "include/comp_src.h") CONFIG_FILES="$CONFIG_FILES include/comp_src.h" ;; "include/manconfig.h") CONFIG_FILES="$CONFIG_FILES include/manconfig.h" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "gnulib/po/Makefile.in") CONFIG_FILES="$CONFIG_FILES gnulib/po/Makefile.in" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 519b42b..cc772a9 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. m4_pattern_forbid([^MAN_]) # Initialise and check we're in the correct directory. -AC_INIT([man-db], [2.7.1], [cjwatson@debian.org]) +AC_INIT([man-db], [2.7.2], [cjwatson@debian.org]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([1.11 -Wall -Wno-override -Werror foreign dist-xz no-dist-gzip parallel-tests]) AM_MAINTAINER_MODE @@ -13,15 +13,11 @@ AC_GNU_SOURCE m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) LT_INIT([disable-static]) -if test ! -f "$srcdir/gnulib/po/Makefile.in.in"; then - AC_MSG_ERROR([you must run ./autogen.sh before ./configure when building from revision control]) -fi - AC_CONFIG_HEADER([config.h]) AC_CANONICAL_HOST # Define below date and version information to be put into man pages etc. -date=2014-11-07 +date=2015-08-16 AC_SUBST([date])dnl roff_version=`echo AC_PACKAGE_VERSION | sed 's/-/\\-/g'` AC_SUBST([roff_version])dnl @@ -399,7 +395,20 @@ then AC_SUBST([DBTYPE], [ndbm])] db=yes, db=no) test "$db" = "yes" && break + done], db=no) + if test "$db" = no + then + AC_CHECK_HEADER([gdbm-ndbm.h], [ + for lib in gdbm_compat c dbm + do + AC_CHECK_LIB([$lib], [dbm_fetch], + test "$lib" = "c" || DBLIBS="-l$lib" + [AC_DEFINE([NDBM], [1], [Define if you have, and want to use, ndbm interface routines.]) + AC_SUBST([DBTYPE], [ndbm])] + db=yes, db=no) + test "$db" = "yes" && break done], db=no) + fi fi if test "$db" != "yes" @@ -438,9 +447,11 @@ MAN_TRANS_SUBST([zsoelim]) # If we're cross-compiling, tests won't work. AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes]) +# Are Gnulib translations available? +AM_CONDITIONAL([HAVE_GNULIB_PO], [test -f "$srcdir/gnulib/po/POTFILES.in"]) + AC_CONFIG_FILES([Makefile gnulib/lib/Makefile - gnulib/po/Makefile.in init/Makefile init/systemd/Makefile lib/Makefile @@ -468,4 +479,7 @@ AC_CONFIG_FILES([Makefile include/comp_src.h include/manconfig.h po/Makefile.in]) +if test -f "$srcdir/gnulib/po/Makefile.in.in"; then + AC_CONFIG_FILES([gnulib/po/Makefile.in]) +fi AC_OUTPUT diff --git a/docs/Makefile.in b/docs/Makefile.in index ea47760..77f6ca4 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,8 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = docs -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_noinst_DATA) COPYING COPYING.LIB TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -291,6 +299,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -316,6 +326,7 @@ am__can_run_installinfo = \ esac DATA = $(dist_noinst_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in COPYING COPYING.LIB TODO DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1335,7 +1346,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign docs/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1510,6 +1520,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/docs/man-db.lsm b/docs/man-db.lsm index 562c29a..07d875b 100644 --- a/docs/man-db.lsm +++ b/docs/man-db.lsm @@ -1,7 +1,7 @@ Begin4 Title: man-db -Version: 2.7.1 -Entered-date: 2014-11-07 +Version: 2.7.2 +Entered-date: 2015-08-16 Description: This package provides the man command. This utility is the primary way of examining the on-line help files (manual pages). Other utilities provided include the @@ -19,7 +19,7 @@ Author: jwe@che.utexas.edu (John W Eaton) cjwatson@debian.org (Colin Watson) Maintained-by: cjwatson@debian.org (Colin Watson) Primary-site: http://savannah.nongnu.org/download/man-db/ - 1.5M man-db-2.7.1.tar.xz + 1.5M man-db-2.7.2.tar.xz Alternate-site: ftp://ftp.debian.org/debian/pool/main/m/man-db/ Platforms: Requires GNU groff 1.16. Optionally uses GDBM or Berkeley DB (any version with 1.85 diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in index bd14083..488d168 100644 --- a/gnulib/lib/Makefile.in +++ b/gnulib/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -40,7 +40,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -103,8 +113,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = gnulib/lib -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am alloca.c \ - $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -316,6 +324,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -424,6 +434,8 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp alloca.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -1615,7 +1627,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gnulib/lib/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnits gnulib/lib/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -2141,6 +2152,8 @@ uninstall-am: uninstall-local mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \ tags-am uninstall uninstall-am uninstall-local +.PRECIOUS: Makefile + # We need the following in order to create when the system # doesn't have one that works with the given compiler. diff --git a/init/Makefile.in b/init/Makefile.in index b6eb4d7..f53ad26 100644 --- a/init/Makefile.in +++ b/init/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -77,7 +87,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = init -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -289,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -348,6 +358,7 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -1380,7 +1391,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign init/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign init/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1675,6 +1685,8 @@ uninstall-am: mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/init/systemd/Makefile.in b/init/systemd/Makefile.in index e00ab44..9f5e092 100644 --- a/init/systemd/Makefile.in +++ b/init/systemd/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,8 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = init/systemd -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_systemdtmpfiles_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -291,6 +299,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_systemdtmpfiles_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -344,6 +354,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(systemdtmpfilesdir)" DATA = $(dist_systemdtmpfiles_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1351,7 +1362,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign init/systemd/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign init/systemd/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1551,6 +1561,8 @@ uninstall-am: uninstall-dist_systemdtmpfilesDATA mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-dist_systemdtmpfilesDATA +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/Makefile.in b/lib/Makefile.in index 52ebafc..ff8ddc4 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = lib -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/depcomp $(dist_noinst_DATA) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -292,6 +300,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -404,6 +414,8 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1457,7 +1469,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1875,6 +1886,8 @@ uninstall-am: uninstall-pkglibLTLIBRARIES pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-pkglibLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libdb/Makefile.in b/libdb/Makefile.in index 8c267dd..51f089b 100644 --- a/libdb/Makefile.in +++ b/libdb/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = libdb -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/depcomp $(dist_noinst_DATA) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -292,6 +300,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -400,6 +410,8 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1431,7 +1443,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libdb/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign libdb/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1785,6 +1796,8 @@ uninstall-am: uninstall-pkglibLTLIBRARIES pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-pkglibLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libdb/db_delete.c b/libdb/db_delete.c index fae9418..9e22a3f 100644 --- a/libdb/db_delete.c +++ b/libdb/db_delete.c @@ -53,7 +53,7 @@ #define NO_ENTRY 1; -int dbdelete (const char *name, struct mandata *info) +int dbdelete (MYDBM_FILE dbf, const char *name, struct mandata *info) { datum key, cont; @@ -68,11 +68,11 @@ int dbdelete (const char *name, struct mandata *info) cont = MYDBM_FETCH (dbf, key); if (!MYDBM_DPTR (cont)) { /* 0 entries */ - free (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); return NO_ENTRY; } else if (*MYDBM_DPTR (cont) != '\t') { /* 1 entry */ MYDBM_DELETE (dbf, key); - MYDBM_FREE (MYDBM_DPTR (cont)); + MYDBM_FREE_DPTR (cont); } else { /* 2+ entries */ char **names, **ext; char *multi_content = NULL; @@ -92,8 +92,8 @@ int dbdelete (const char *name, struct mandata *info) if (i >= refs) { free (names); free (ext); - MYDBM_FREE (MYDBM_DPTR (cont)); - free (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (cont); + MYDBM_FREE_DPTR (key); return NO_ENTRY; } @@ -105,7 +105,7 @@ int dbdelete (const char *name, struct mandata *info) gripe_corrupt_data (); } MYDBM_DELETE (dbf, multi_key); - free (MYDBM_DPTR (multi_key)); + MYDBM_FREE_DPTR (multi_key); /* refs *may* be 1 if all manual pages with this name have been deleted. In this case, we'll have to remove @@ -114,9 +114,9 @@ int dbdelete (const char *name, struct mandata *info) if (refs == 1) { free (names); free (ext); - MYDBM_FREE (MYDBM_DPTR (cont)); + MYDBM_FREE_DPTR (cont); MYDBM_DELETE (dbf, key); - free (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); return 0; } @@ -127,7 +127,7 @@ int dbdelete (const char *name, struct mandata *info) "\t", names[j], "\t", ext[j], NULL); - MYDBM_FREE (MYDBM_DPTR (cont)); + MYDBM_FREE_DPTR (cont); /* if refs = 2 do something else. Doesn't really matter as the gdbm db file does not shrink any after a deletion @@ -142,6 +142,6 @@ int dbdelete (const char *name, struct mandata *info) free (ext); } - free (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); return 0; } diff --git a/libdb/db_gdbm.c b/libdb/db_gdbm.c index d195e47..f3aaa94 100644 --- a/libdb/db_gdbm.c +++ b/libdb/db_gdbm.c @@ -94,8 +94,8 @@ man_gdbm_wrapper man_gdbm_open_wrapper (const char *name, int flags) memset (&key, 0, sizeof key); MYDBM_SET (key, xstrdup (VER_KEY)); content = MYDBM_FETCH (wrap, key); - free (MYDBM_DPTR (key)); - free (MYDBM_DPTR (content)); + MYDBM_FREE_DPTR (key); + MYDBM_FREE_DPTR (content); } opening = 0; @@ -112,7 +112,7 @@ static void parent_sortkey_hashtable_free (void *defn) static void sortkey_hashtable_free (void *defn) { struct sortkey *key = (struct sortkey *) defn; - free (MYDBM_DPTR (key->key)); + MYDBM_FREE_DPTR (key->key); free (key); } diff --git a/libdb/db_lookup.c b/libdb/db_lookup.c index 41cdeca..cd0fa0c 100644 --- a/libdb/db_lookup.c +++ b/libdb/db_lookup.c @@ -266,8 +266,8 @@ int list_extensions (char *data, char ***names, char ***ext) 2) One data item exists. Item is returned as first in set of structures. 3) Many items exist. They are all returned, in a multiple structure set. */ -static struct mandata *dblookup (const char *page, const char *section, - int flags) +static struct mandata *dblookup (MYDBM_FILE dbf, const char *page, + const char *section, int flags) { struct mandata *info = NULL; datum key, cont; @@ -277,7 +277,7 @@ static struct mandata *dblookup (const char *page, const char *section, MYDBM_SET (key, name_to_key (page)); cont = MYDBM_FETCH (dbf, key); - free (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); if (MYDBM_DPTR (cont) == NULL) { /* No entries at all */ return info; /* indicate no entries */ @@ -345,7 +345,7 @@ static struct mandata *dblookup (const char *page, const char *section, MYDBM_DPTR (key)); gripe_corrupt_data (); } - free (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); /* allocate info struct, fill it in and point info to the next in the list */ @@ -360,26 +360,28 @@ static struct mandata *dblookup (const char *page, const char *section, free (names); free (ext); - MYDBM_FREE (MYDBM_DPTR (cont)); + MYDBM_FREE_DPTR (cont); return ret; } } -struct mandata *dblookup_all (const char *page, const char *section, - int match_case) +struct mandata *dblookup_all (MYDBM_FILE dbf, const char *page, + const char *section, int match_case) { - return dblookup (page, section, ALL | (match_case ? MATCH_CASE : 0)); + return dblookup (dbf, page, section, + ALL | (match_case ? MATCH_CASE : 0)); } -struct mandata *dblookup_exact (const char *page, const char *section, - int match_case) +struct mandata *dblookup_exact (MYDBM_FILE dbf, const char *page, + const char *section, int match_case) { - return dblookup (page, section, EXACT | (match_case ? MATCH_CASE : 0)); + return dblookup (dbf, page, section, + EXACT | (match_case ? MATCH_CASE : 0)); } -struct mandata *dblookup_pattern (const char *pattern, const char *section, - int match_case, int pattern_regex, - int try_descriptions) +struct mandata *dblookup_pattern (MYDBM_FILE dbf, const char *pattern, + const char *section, int match_case, + int pattern_regex, int try_descriptions) { struct mandata *ret = NULL, *tail = NULL; datum key, cont; @@ -473,12 +475,12 @@ nextpage_tab: nextpage: #ifndef BTREE nextkey = MYDBM_NEXTKEY (dbf, key); - MYDBM_FREE (MYDBM_DPTR (cont)); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (cont); + MYDBM_FREE_DPTR (key); key = nextkey; #else /* BTREE */ - MYDBM_FREE (MYDBM_DPTR (cont)); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (cont); + MYDBM_FREE_DPTR (key); end = btree_nextkeydata (dbf, &key, &cont); #endif /* !BTREE */ info.addr = NULL; diff --git a/libdb/db_storage.h b/libdb/db_storage.h index caf3169..6db37bb 100644 --- a/libdb/db_storage.h +++ b/libdb/db_storage.h @@ -72,15 +72,16 @@ struct mandata { }; /* used by the world */ -extern struct mandata *dblookup_all (const char *page, const char *section, - int match_case); -extern struct mandata *dblookup_exact (const char *page, const char *section, - int match_case); -extern struct mandata *dblookup_pattern (const char *page, const char *section, - int match_case, int pattern_regex, +extern struct mandata *dblookup_all (MYDBM_FILE dbf, const char *page, + const char *section, int match_case); +extern struct mandata *dblookup_exact (MYDBM_FILE dbf, const char *page, + const char *section, int match_case); +extern struct mandata *dblookup_pattern (MYDBM_FILE dbf, const char *page, + const char *section, int match_case, + int pattern_regex, int try_descriptions); -extern int dbstore (struct mandata *in, const char *base); -extern int dbdelete (const char *name, struct mandata *in); +extern int dbstore (MYDBM_FILE dbf, struct mandata *in, const char *base); +extern int dbdelete (MYDBM_FILE dbf, const char *name, struct mandata *in); extern void dbprintf (const struct mandata *info); extern void free_mandata_elements (struct mandata *pinfo); extern void free_mandata_struct (struct mandata *pinfo); diff --git a/libdb/db_store.c b/libdb/db_store.c index b87c3b6..6be6ca8 100644 --- a/libdb/db_store.c +++ b/libdb/db_store.c @@ -79,7 +79,8 @@ int compare_ids (char a, char b, int promote_links) * be replaced with some new contents. Check that names and section * extensions match before calling this. */ -static int replace_if_necessary (struct mandata *newdata, +static int replace_if_necessary (MYDBM_FILE dbf, + struct mandata *newdata, struct mandata *olddata, datum newkey, datum newcont) { @@ -189,7 +190,7 @@ static datum make_content (struct mandata *in) return errorcode or 0 on success. */ -int dbstore (struct mandata *in, const char *base) +int dbstore (MYDBM_FILE dbf, struct mandata *in, const char *base) { datum oldkey, oldcont; @@ -221,7 +222,7 @@ int dbstore (struct mandata *in, const char *base) oldcont = make_content (in); if (MYDBM_REPLACE (dbf, oldkey, oldcont)) gripe_replace_key (MYDBM_DPTR (oldkey)); - free (MYDBM_DPTR (oldcont)); + MYDBM_FREE_DPTR (oldcont); free (in->name); in->name = NULL; } else if (*MYDBM_DPTR (oldcont) == '\t') { /* situation (2) */ @@ -240,16 +241,16 @@ int dbstore (struct mandata *in, const char *base) struct mandata info; int ret; - MYDBM_FREE (MYDBM_DPTR (oldcont)); + MYDBM_FREE_DPTR (oldcont); cont = MYDBM_FETCH (dbf, newkey); split_content (MYDBM_DPTR (cont), &info); - ret = replace_if_necessary (in, &info, + ret = replace_if_necessary (dbf, in, &info, newkey, newcont); - /* MYDBM_FREE (MYDBM_DPTR (cont)); */ + /* MYDBM_FREE_DPTR (cont); */ free_mandata_elements (&info); - free (MYDBM_DPTR (newkey)); - free (MYDBM_DPTR (newcont)); - free (MYDBM_DPTR (oldkey)); + MYDBM_FREE_DPTR (newkey); + MYDBM_FREE_DPTR (newcont); + MYDBM_FREE_DPTR (oldkey); return ret; } @@ -259,19 +260,19 @@ int dbstore (struct mandata *in, const char *base) /* This next bit needs to be done first as we'll wipe out MYDBM_DPTR (oldcont) otherwise (for NDBM only!) */ - free (MYDBM_DPTR (newkey)); - free (MYDBM_DPTR (newcont)); + MYDBM_FREE_DPTR (newkey); + MYDBM_FREE_DPTR (newcont); MYDBM_SET (newcont, xasprintf ( "%s\t%s\t%s", MYDBM_DPTR (oldcont), base, in->ext)); - MYDBM_FREE (MYDBM_DPTR (oldcont)); + MYDBM_FREE_DPTR (oldcont); /* Try to replace the old simple data with the new stuff */ if (MYDBM_REPLACE (dbf, oldkey, newcont)) gripe_replace_key (MYDBM_DPTR (oldkey)); - free (MYDBM_DPTR (newcont)); + MYDBM_FREE_DPTR (newcont); } else { /* situation (3) */ datum newkey, newcont, lastkey, lastcont; struct mandata old; @@ -305,12 +306,13 @@ int dbstore (struct mandata *in, const char *base) if (!STREQ (base, MYDBM_DPTR (oldkey))) in->name = xstrdup (base); newcont = make_content (in); - ret = replace_if_necessary (in, &old, oldkey, newcont); - /* MYDBM_FREE (MYDBM_DPTR (oldcont)); */ + ret = replace_if_necessary (dbf, in, &old, + oldkey, newcont); + /* MYDBM_FREE_DPTR (oldcont); */ free_mandata_elements (&old); - free (MYDBM_DPTR (newcont)); - free (MYDBM_DPTR (lastkey)); - free (MYDBM_DPTR (oldkey)); + MYDBM_FREE_DPTR (newcont); + MYDBM_FREE_DPTR (lastkey); + MYDBM_FREE_DPTR (oldkey); free (old_name); free (in->name); in->name = NULL; @@ -336,8 +338,8 @@ int dbstore (struct mandata *in, const char *base) if (MYDBM_REPLACE (dbf, lastkey, lastcont)) gripe_replace_key (MYDBM_DPTR (lastkey)); - free (MYDBM_DPTR (lastkey)); - free (MYDBM_DPTR (lastcont)); + MYDBM_FREE_DPTR (lastkey); + MYDBM_FREE_DPTR (lastcont); newkey = make_multi_key (base, in->ext); newcont = make_content (in); @@ -345,8 +347,8 @@ int dbstore (struct mandata *in, const char *base) if (MYDBM_REPLACE (dbf, newkey, newcont)) gripe_replace_key (MYDBM_DPTR (newkey)); - free (MYDBM_DPTR (newkey)); - free (MYDBM_DPTR (newcont)); + MYDBM_FREE_DPTR (newkey); + MYDBM_FREE_DPTR (newcont); /* Now build a simple reference to the above two items */ @@ -356,12 +358,12 @@ int dbstore (struct mandata *in, const char *base) if (MYDBM_REPLACE (dbf, oldkey, newcont)) gripe_replace_key (MYDBM_DPTR (oldkey)); - /* MYDBM_FREE (MYDBM_DPTR (oldcont)); */ + /* MYDBM_FREE_DPTR (oldcont); */ free_mandata_elements (&old); - free (MYDBM_DPTR (newcont)); + MYDBM_FREE_DPTR (newcont); free (old_name); } - free (MYDBM_DPTR (oldkey)); + MYDBM_FREE_DPTR (oldkey); return 0; } diff --git a/libdb/db_ver.c b/libdb/db_ver.c index 2fadc8c..5ac306d 100644 --- a/libdb/db_ver.c +++ b/libdb/db_ver.c @@ -47,7 +47,7 @@ int dbver_rd (MYDBM_FILE dbfile) content = MYDBM_FETCH (dbfile, key); - free (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); if (MYDBM_DPTR (content) == NULL) { debug (_("warning: %s has no version identifier\n"), database); @@ -55,10 +55,10 @@ int dbver_rd (MYDBM_FILE dbfile) } else if (!STREQ (MYDBM_DPTR (content), VER_ID)) { debug (_("warning: %s is version %s, expecting %s\n"), database, MYDBM_DPTR (content), VER_ID); - MYDBM_FREE (MYDBM_DPTR (content)); + MYDBM_FREE_DPTR (content); return 1; } else { - MYDBM_FREE (MYDBM_DPTR (content)); + MYDBM_FREE_DPTR (content); return 0; } } @@ -78,6 +78,6 @@ void dbver_wr (MYDBM_FILE dbfile) _("fatal: unable to insert version identifier into %s"), database); - free (MYDBM_DPTR (key)); - free (MYDBM_DPTR (content)); + MYDBM_FREE_DPTR (key); + MYDBM_FREE_DPTR (content); } diff --git a/libdb/mydbm.h b/libdb/mydbm.h index 62311d5..d087eda 100644 --- a/libdb/mydbm.h +++ b/libdb/mydbm.h @@ -87,7 +87,6 @@ void man_gdbm_close (man_gdbm_wrapper wrap); # define MYDBM_GET_TIME(db) man_gdbm_get_time(db) # define MYDBM_SET_TIME(db, time) man_gdbm_set_time(db, time) # define MYDBM_REORG(db) gdbm_reorganize((db)->file) -# define MYDBM_FREE(x) free(x) # elif defined(NDBM) && !defined(GDBM) && !defined(BTREE) @@ -127,7 +126,6 @@ extern int ndbm_flclose(DBM *db); # define MYDBM_GET_TIME(db) ndbm_get_time(db) # define MYDBM_SET_TIME(db, time) ndbm_set_time(db, time) # define MYDBM_REORG(db) /* nothing - not implemented */ -# define MYDBM_FREE(x) free (x) # elif defined(BTREE) && !defined(NDBM) && !defined(GDBM) @@ -170,7 +168,6 @@ extern void btree_set_time(DB *db, const struct timespec time); # define MYDBM_GET_TIME(db) btree_get_time(db) # define MYDBM_SET_TIME(db, time) btree_set_time(db, time) # define MYDBM_REORG(db) /* nothing - not implemented */ -# define MYDBM_FREE(x) free(x) # else /* not GDBM or NDBM or BTREE */ # error Define either GDBM, NDBM or BTREE before including mydbm.h @@ -178,9 +175,9 @@ extern void btree_set_time(DB *db, const struct timespec time); #define MYDBM_RESET_DSIZE(d) (MYDBM_DSIZE(d) = strlen(MYDBM_DPTR(d)) + 1) #define MYDBM_SET(d, value) do { MYDBM_SET_DPTR(d, value); MYDBM_RESET_DSIZE(d); } while (0) +#define MYDBM_FREE_DPTR(d) do { free (MYDBM_DPTR (d)); MYDBM_SET_DPTR (d, NULL); } while (0) extern char *database; -extern MYDBM_FILE dbf; /* db_lookup.c */ extern datum copy_datum (datum dat); diff --git a/man/Makefile.in b/man/Makefile.in index 1d55db7..5948349 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,9 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(srcdir)/replace.sin.in \ - $(top_srcdir)/build-aux/test-driver THANKS subdir = man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -291,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = replace.sin @@ -559,6 +567,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Rules.man \ + $(srcdir)/replace.sin.in $(top_srcdir)/build-aux/test-driver \ + THANKS DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -1619,7 +1630,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Ru echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1628,7 +1638,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/Rules.man: +$(srcdir)/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1899,7 +1909,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2291,6 +2301,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am \ uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/man/da/Makefile.in b/man/da/Makefile.in index 7a84bd4..585cd8f 100644 --- a/man/da/Makefile.in +++ b/man/da/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,8 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/man/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = man/da ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -290,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -525,6 +534,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/man/Rules.man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1559,7 +1571,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/da/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/da/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1568,7 +1579,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/man/Rules.man: +$(top_srcdir)/man/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1744,7 +1755,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2108,6 +2119,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 recheck tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/man/de/Makefile.in b/man/de/Makefile.in index ee1f744..6ae0a62 100644 --- a/man/de/Makefile.in +++ b/man/de/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,8 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/man/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = man/de ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -290,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -525,6 +534,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/man/Rules.man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1559,7 +1571,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/de/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/de/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1568,7 +1579,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/man/Rules.man: +$(top_srcdir)/man/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1744,7 +1755,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2108,6 +2119,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 recheck tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/man/es/Makefile.in b/man/es/Makefile.in index 202f042..7681f14 100644 --- a/man/es/Makefile.in +++ b/man/es/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,8 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/man/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = man/es ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -290,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -525,6 +534,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/man/Rules.man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1554,7 +1566,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/es/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/es/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1563,7 +1574,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/man/Rules.man: +$(top_srcdir)/man/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1739,7 +1750,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2082,6 +2093,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 recheck tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in index 8c3a1d3..04befbb 100644 --- a/man/fr/Makefile.in +++ b/man/fr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,8 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/man/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = man/fr ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -290,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -525,6 +534,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/man/Rules.man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1559,7 +1571,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/fr/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/fr/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1568,7 +1579,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/man/Rules.man: +$(top_srcdir)/man/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1744,7 +1755,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2108,6 +2119,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 recheck tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/man/id/Makefile.in b/man/id/Makefile.in index af864d2..b08b240 100644 --- a/man/id/Makefile.in +++ b/man/id/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,8 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/man/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = man/id ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -290,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -525,6 +534,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/man/Rules.man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1559,7 +1571,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/id/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/id/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1568,7 +1579,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/man/Rules.man: +$(top_srcdir)/man/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1744,7 +1755,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2108,6 +2119,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 recheck tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/man/it/Makefile.in b/man/it/Makefile.in index 1d4668d..34b6242 100644 --- a/man/it/Makefile.in +++ b/man/it/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,8 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/man/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = man/it ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -290,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -525,6 +534,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/man/Rules.man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1555,7 +1567,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/it/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/it/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1564,7 +1575,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/man/Rules.man: +$(top_srcdir)/man/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1740,7 +1751,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2090,6 +2101,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 recheck tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in index 7e988ee..acc11fa 100644 --- a/man/ja/Makefile.in +++ b/man/ja/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,8 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/man/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = man/ja ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -290,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -525,6 +534,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/man/Rules.man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1559,7 +1571,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/ja/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/ja/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1568,7 +1579,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/man/Rules.man: +$(top_srcdir)/man/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1744,7 +1755,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2108,6 +2119,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 recheck tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/man/man1/man.man1 b/man/man1/man.man1 index 682ac2c..3d981c5 100644 --- a/man/man1/man.man1 +++ b/man/man1/man.man1 @@ -330,14 +330,14 @@ Search the short descriptions and manual page names for the keyword as regular expression. Print out any matches. Equivalent to -.BI %apropos%\ \-r \ printf . +.BI %apropos% \ printf . .TP .BI %man%\ \-f \ smail Lookup the manual pages referenced by .I smail and print out the short descriptions of any found. Equivalent to -.BI %whatis%\ \-r \ smail . +.BI %whatis% \ smail . .SH OVERVIEW Many options are available to .B %man% diff --git a/man/nl/Makefile.in b/man/nl/Makefile.in index 937e19b..9cb4c2d 100644 --- a/man/nl/Makefile.in +++ b/man/nl/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,8 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/man/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = man/nl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -290,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -525,6 +534,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/man/Rules.man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1559,7 +1571,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/nl/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/nl/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1568,7 +1579,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/man/Rules.man: +$(top_srcdir)/man/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1744,7 +1755,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2108,6 +2119,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 recheck tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/man/pl/Makefile.in b/man/pl/Makefile.in index 7827b68..0c8bd4d 100644 --- a/man/pl/Makefile.in +++ b/man/pl/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,8 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/man/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = man/pl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -290,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -525,6 +534,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/man/Rules.man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1559,7 +1571,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/pl/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/pl/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1568,7 +1579,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/man/Rules.man: +$(top_srcdir)/man/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1744,7 +1755,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2108,6 +2119,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 recheck tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/man/po4a/Makefile.in b/man/po4a/Makefile.in index b5add0f..567d476 100644 --- a/man/po4a/Makefile.in +++ b/man/po4a/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -77,7 +87,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = man/po4a -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -289,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -313,6 +323,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1343,7 +1354,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/po4a/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/po4a/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1521,6 +1531,8 @@ uninstall-am: mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + @PO4A_TRUE@all-local: @PO4A_TRUE@ rm -rf $(STAGING) diff --git a/man/po4a/po/da.po b/man/po4a/po/da.po index ef91431..e904249 100644 --- a/man/po4a/po/da.po +++ b/man/po4a/po/da.po @@ -1156,11 +1156,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>" msgid "" "Search the short descriptions and manual page names for the keyword " "I as regular expression. Print out any matches. Equivalent to B<" -"%apropos%\\ -r>I<\\ printf>B<.>" +"%apropos%>I<\\ printf>B<.>" msgstr "" "Søg i de korte beskrivelser og navnene på manualsiderne for nøgleordet " -"I som regulært udtryk. Udskriv resultaterne. Svarer til B<%apropos%" -"\\ -r>I<\\ printf>B<.>" +"I som regulært udtryk. Udskriv resultaterne. Svarer til B<%apropos" +"%>I<\\ printf>B<.>" #. type: TP #: ../../man/man1/man.man1:334 @@ -1172,10 +1172,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>" #: ../../man/man1/man.man1:341 msgid "" "Lookup the manual pages referenced by I and print out the short " -"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>" +"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" "Slå manualsiderne refereret af I op og vis den korte beskrivelse for " -"det fundne resultat. Svarer til B<%whatis%\\ -r>I<\\ smail>B<.>" +"det fundne resultat. Svarer til B<%whatis%>I<\\ smail>B<.>" #. type: SH #: ../../man/man1/man.man1:341 @@ -2975,8 +2975,8 @@ msgstr "" #. type: tbl table #: ../../man/man8/mandb.man8:59 #, no-wrap -msgid "Filename\n" -msgstr "Filnavn\n" +msgid "Filename" +msgstr "Filnavn" #. type: tbl table #: ../../man/man8/mandb.man8:61 @@ -2999,7 +2999,7 @@ msgstr "Ja" #. type: tbl table #: ../../man/man8/mandb.man8:61 #, no-wrap -msgid "I\n" +msgid "I" msgstr "" #. type: tbl table @@ -3018,7 +3018,7 @@ msgstr "" #. type: tbl table #: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67 #, no-wrap -msgid "I\n" +msgid "I" msgstr "" #. type: tbl table @@ -3042,8 +3042,8 @@ msgstr "UNIX ndbm" #. type: tbl table #: ../../man/man8/mandb.man8:70 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: Plain text #: ../../man/man8/mandb.man8:83 diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po index 45b6aff..03dc50b 100644 --- a/man/po4a/po/de.po +++ b/man/po4a/po/de.po @@ -1340,11 +1340,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>" msgid "" "Search the short descriptions and manual page names for the keyword " "I as regular expression. Print out any matches. Equivalent to B<" -"%apropos%\\ -r>I<\\ printf>B<.>" +"%apropos%>I<\\ printf>B<.>" msgstr "" "Sucht in den Kurzbeschreibungen und Namen der Handbuchseiten nach dem als " "regulären Ausdruck angesehenen Schlüsselwort I und gibt alle " -"Fundstellen aus. Diese Option entspricht B<%apropos%\\ -r> I<\\ printf>B<.>" +"Fundstellen aus. Diese Option entspricht B<%apropos%> I<\\ printf>B<.>" #. type: TP #: ../../man/man1/man.man1:334 @@ -1356,11 +1356,11 @@ msgstr "B<%man%\\ -f>I<\\ smail>" #: ../../man/man1/man.man1:341 msgid "" "Lookup the manual pages referenced by I and print out the short " -"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>" +"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" "Sucht die durch I angegebenen Handbuchseiten und gibt alle " "Kurzbeschreibungen der gefundenen Seiten aus. Diese Option entspricht B<" -"%apropos%\\ -r> I<\\ printf>B<.>" +"%apropos%> I<\\ printf>B<.>" #. type: SH #: ../../man/man1/man.man1:341 @@ -3702,8 +3702,8 @@ msgstr "asynch" #. type: tbl table #: ../../man/man8/mandb.man8:59 #, no-wrap -msgid "Filename\n" -msgstr "Dateiname\n" +msgid "Filename" +msgstr "Dateiname" #. type: tbl table #: ../../man/man8/mandb.man8:61 @@ -3726,8 +3726,8 @@ msgstr "Ja" #. type: tbl table #: ../../man/man8/mandb.man8:61 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" # Oder doch Hash-Tabelle? #. type: tbl table @@ -3746,8 +3746,8 @@ msgstr "Hash-Tabelle" #. type: tbl table #: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:67 @@ -3770,8 +3770,8 @@ msgstr "UNIX ndbm" #. type: tbl table #: ../../man/man8/mandb.man8:70 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: Plain text #: ../../man/man8/mandb.man8:83 diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po index 9ae1438..40e1d51 100644 --- a/man/po4a/po/fr.po +++ b/man/po4a/po/fr.po @@ -6,9 +6,9 @@ # David Prévot , 2010-2014. msgid "" msgstr "" -"Project-Id-Version: man-db-manpages 2.6.6-pre2\n" +"Project-Id-Version: man-db-manpages 2.7.0-pre1\n" "POT-Creation-Date: 2014-09-16 14:04+0100\n" -"PO-Revision-Date: 2014-01-19 08:11-0400\n" +"PO-Revision-Date: 2014-11-11 10:34-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" "Language: fr\n" @@ -461,12 +461,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:232 ../../man/man1/whatis.man1:236 -#, fuzzy -#| msgid "" -#| "If $B is set, its value is used as the terminal width (see the " -#| "B<--long> option). If it is not set, the terminal width will be " -#| "calculated using an B(2) if available, the value of $B, " -#| "or falling back to 80 characters if all else fails." msgid "" "If $B is set, its value is used as the terminal width (see the B<--" "long> option). If it is not set, the terminal width will be calculated " @@ -475,8 +469,9 @@ msgid "" msgstr "" "Si $B est définie, sa valeur est utilisée comme largeur de " "terminal (voir l'option B<--long>). Sinon, la largeur du terminal sera " -"calculée en utilisant un B(2) s'il est disponible, ou d'après la " -"valeur de $B, ou à 80 colonnes si aucune indication n'est trouvée." +"calculée soit d'après la valeur de $B, soit en utilisant un " +"B(2) s'il est disponible, soit à 80 colonnes si aucune indication " +"n'est trouvée." #. type: Plain text #: ../../man/man1/apropos.man1:241 @@ -860,19 +855,6 @@ msgstr "%man% - Interface de consultation des manuels de référence en ligne" #. The apropos command line #. type: Plain text #: ../../man/man1/man.man1:67 -#, fuzzy -#| msgid "" -#| "B<%man%> [\\|B<-C> I\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#| "warnings>\\|[\\|=I\\|]\\|] [\\|B<-R> I\\|] [\\|B<-L> " -#| "I\\|] [\\|B<-m> I\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#| "I\\|] [\\|B<-S> I\\|] [\\|B<-e> I\\|] [\\|B<-i>\\||" -#| "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#| "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#| "I\\|] [\\|B<-r> I\\|] [\\|B<-7>\\|] [\\|B<-E> I" -#| "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#| "I\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I\\|]\\|] [\\|B<-H>\\|" -#| "[\\|I\\|]\\|] [\\|B<-X>\\|[\\|I\\|]\\|] [\\|B<-Z>\\|] [\\|" -#| "[\\|I
\\|] I\\ .\\|.\\|.\\|]\\ .\\|.\\|." msgid "" "B<%man%> [\\|B<-C> I\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--warnings>" "\\|[\\|=I\\|]\\|] [\\|B<-R> I\\|] [\\|B<-L> I" @@ -896,51 +878,35 @@ msgstr "" "no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> I\\|] " "[\\|B<-t>\\|] [\\|B<-T>\\|[\\|I\\|]\\|] [\\|B<-H>\\|[\\|" "I\\|]\\|] [\\|B<-X>\\|[\\|I\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|" -"I
\\|] I\\ .\\|.\\|.\\|]\\ .\\|.\\|." +"I
\\|] I\\ .\\|.\\|.\\|]\\ .\\|.\\|.\\&" #. The --global-apropos command line #. type: Plain text #: ../../man/man1/man.man1:75 -#, fuzzy -#| msgid "B<%man%> B<-k> [\\|I I\\|] I \\&.\\|.\\|." msgid "B<%man%> B<-k> [\\|I I\\|] I \\&.\\|.\\|.\\&" msgstr "" "B<%man%> B<-k> [\\|I\\|] I \\&." -"\\|.\\|." +"\\|.\\|.\\&" #. The whatis command line #. type: Plain text #: ../../man/man1/man.man1:86 -#, fuzzy -#| msgid "" -#| "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I\\|] [\\|B<-i>" -#| "\\||\\|B<-I>\\|] [\\|I<--regex>\\|] [\\|I
\\|] I\\ .\\|.\\|." msgid "" "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I\\|] [\\|B<-i>\\||" "\\|B<-I>\\|] [\\|I<--regex>\\|] [\\|I
\\|] I\\ .\\|.\\|.\\&" msgstr "" "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I\\|] [\\|B<-i>\\||" -"\\|B<-I>\\|] [\\|I<--regex>\\|] [\\|I
\\|] I\\ .\\|.\\|." +"\\|B<-I>\\|] [\\|I<--regex>\\|] [\\|I
\\|] I\\ .\\|.\\|.\\&" #. The --local command line #. type: Plain text #: ../../man/man1/man.man1:94 -#, fuzzy -#| msgid "B<%man%> B<-f> [\\|I I\\|] I \\&.\\|.\\|." msgid "B<%man%> B<-f> [\\|I I\\|] I \\&.\\|.\\|.\\&" -msgstr "B<%man%> B<-f> [\\|I\\|] I \\&.\\|.\\|." +msgstr "B<%man%> B<-f> [\\|I\\|] I \\&.\\|.\\|.\\&" #. The --where/--where-cat command line #. type: Plain text #: ../../man/man1/man.man1:127 -#, fuzzy -#| msgid "" -#| "B<%man%> B<-l> [\\|B<-C> I\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#| "warnings>\\|[\\|=I\\|]\\|] [\\|B<-R> I\\|] [\\|B<-L> " -#| "I\\|] [\\|B<-P> I\\|] [\\|B<-r> I\\|] [\\|B<-7>" -#| "\\|] [\\|B<-E> I\\|] [\\|B<-p> I\\|] [\\|B<-t>\\|] [\\|" -#| "B<-T>\\|[\\|I\\|]\\|] [\\|B<-H>\\|[\\|I\\|]\\|] [\\|B<-X>" -#| "\\|[\\|I\\|]\\|] [\\|B<-Z>\\|] I \\&.\\|.\\|." msgid "" "B<%man%> B<-l> [\\|B<-C> I\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" "warnings>\\|[\\|=I\\|]\\|] [\\|B<-R> I\\|] [\\|B<-L> " @@ -954,35 +920,27 @@ msgstr "" "L> I\\|] [\\|B<-P> I\\|] [\\|B<-r> I\\|] [\\|B<-7>" "\\|] [\\|B<-E> I\\|] [\\|B<-p> I\\|] [\\|B<-t>\\|] [\\|B<-" "T>\\|[\\|I\\|]\\|] [\\|B<-H>\\|[\\|I\\|]\\|] [\\|" -"B<-X>\\|[\\|I\\|]\\|] [\\|B<-Z>\\|] I \\&.\\|.\\|." +"B<-X>\\|[\\|I\\|]\\|] [\\|B<-Z>\\|] I \\&.\\|.\\|.\\&" #. The --catman command line #. type: Plain text #: ../../man/man1/man.man1:137 -#, fuzzy -#| msgid "" -#| "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I\\|] [\\|B<-d>\\|] [\\|B<-D>" -#| "\\|] I \\&.\\|.\\|." msgid "" "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] " "I \\&.\\|.\\|.\\&" msgstr "" "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I\\|] [\\|B<-d>\\|] [\\|B<-D>" -"\\|] I \\&.\\|.\\|." +"\\|] I \\&.\\|.\\|.\\&" #. --help and --version #. type: Plain text #: ../../man/man1/man.man1:147 -#, fuzzy -#| msgid "" -#| "B<%man%> B<-c> [\\|B<-C> I\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I " -#| "\\&.\\|.\\|." msgid "" "B<%man%> B<-c> [\\|B<-C> I\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I \\&." "\\|.\\|.\\&" msgstr "" "B<%man%> B<-c> [\\|B<-C> I\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I " -"\\&.\\|.\\|." +"\\&.\\|.\\|.\\&" #. type: Plain text #: ../../man/man1/man.man1:150 @@ -991,17 +949,6 @@ msgstr "B<%man%> [\\|B<-?V>\\|]" #. type: Plain text #: ../../man/man1/man.man1:181 -#, fuzzy -#| msgid "" -#| "B<%man%> is the system's manual pager. Each I argument given to B<" -#| "%man%> is normally the name of a program, utility or function. The " -#| "I associated with each of these arguments is then found and " -#| "displayed. A I
, if provided, will direct B<%man%> to look only " -#| "in that I
of the manual. The default action is to search in all " -#| "of the available I following a pre-defined order (\"%sections%" -#| "\" by default, unless overridden by the B
directive in I<" -#| "%manpath_config_file%>), and to show only the first I found, even " -#| "if I exists in several I." msgid "" "B<%man%> is the system's manual pager. Each I argument given to B<%man" "%> is normally the name of a program, utility or function. The I)" +#, no-wrap msgid "Special files (usually found in I)" -msgstr "Fichiers spéciaux (situés généralement dans I)" +msgstr "Fichiers spéciaux (situés généralement dans I)" #. type: tbl table #: ../../man/man1/man.man1:201 @@ -1072,10 +1018,7 @@ msgstr "Jeux" #. type: tbl table #: ../../man/man1/man.man1:207 -#, fuzzy, no-wrap -#| msgid "" -#| "Miscellaneous (including macro packages and conventions),\n" -#| "e.g. B(7), B(7)" +#, no-wrap msgid "" "Miscellaneous (including macro packages and conventions),\n" "e.g.\\& B(7), B(7)" @@ -1270,10 +1213,9 @@ msgstr "" #. type: TP #: ../../man/man1/man.man1:310 -#, fuzzy, no-wrap -#| msgid "B<%man%\\ -l\\ -T>IB<\\ E\\ >I<./foo.1x.dvi>" +#, no-wrap msgid "B<%man% -l -T>IB< E >I<./foo.1x.dvi>" -msgstr "B<%man%\\ -l\\ -T>IB<\\ E\\ >I<./toto.1x.dvi>" +msgstr "B<%man% -l -T>IB< E >I<./toto.1x.dvi>" #. type: Plain text #: ../../man/man1/man.man1:326 @@ -1303,12 +1245,12 @@ msgstr "B<%man%\\ -k>I<\\ printf>" msgid "" "Search the short descriptions and manual page names for the keyword " "I as regular expression. Print out any matches. Equivalent to B<" -"%apropos%\\ -r>I<\\ printf>B<.>" +"%apropos%>I<\\ printf>B<.>" msgstr "" "Recherche la description courte et le nom des pages de manuel comportant le " "mot-clé I, utilisé comme une expression rationnelle, puis affiche " -"tout ce qui a été trouvé. Cette commande est équivalente à B<%apropos%\\ -" -"r>I<\\ printf>B<.>" +"tout ce qui a été trouvé. Cette commande est équivalente à B<%apropos%>I<\\ " +"printf>B<.>" #. type: TP #: ../../man/man1/man.man1:334 @@ -1320,10 +1262,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>" #: ../../man/man1/man.man1:341 msgid "" "Lookup the manual pages referenced by I and print out the short " -"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>" +"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" "Recherche les pages de manuel nommées I et en affiche les " -"descriptions courtes. Équivalent à B<%whatis%\\ -r>I<\\ smail>B<.>" +"descriptions courtes. Équivalent à B<%whatis%>I<\\ smail>B<.>" #. type: SH #: ../../man/man1/man.man1:341 @@ -1581,14 +1523,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:520 -#, fuzzy -#| msgid "" -#| "The filters are deciphered by a number of means. Firstly, the command " -#| "line option B<-p> or the environment variable $B is " -#| "interrogated. If B<-p> was not used and the environment variable was not " -#| "set, the initial line of the nroff file is parsed for a preprocessor " -#| "string. To contain a valid preprocessor string, the first line must " -#| "resemble" msgid "" "The filters are deciphered by a number of means. Firstly, the command line " "option B<-p> or the environment variable $B is interrogated. If " @@ -1679,10 +1613,9 @@ msgstr "" #. type: TP #: ../../man/man1/man.man1:577 -#, fuzzy, no-wrap -#| msgid "B<--warnings>[=I]" +#, no-wrap msgid "B<--warnings>[=I]" -msgstr "B<--warnings>[=I]" +msgstr "B<--warnings>[=I]" #. type: Plain text #: ../../man/man1/man.man1:589 @@ -1707,16 +1640,12 @@ msgstr "Modes opératoires principaux" #. type: Plain text #: ../../man/man1/man.man1:598 -#, fuzzy -#| msgid "" -#| "Equivalent to B<%whatis%>. Display a short description from the manual " -#| "page, if available. See B<%whatis%>(1) for details." msgid "" "Equivalent to B<%whatis%>. Display a short description from the manual " "page, if available. See B<%whatis%>(1) for details." msgstr "" "Équivalent à B<%whatis%>. Affiche, si elle est disponible, une courte " -"description de la page de manuel. Voir B<%whatis%>(1) pour obtenir des " +"description de la page de manuel. Consultez B<%whatis%>(1) pour obtenir des " "précisions." #. type: Plain text @@ -2370,10 +2299,9 @@ msgstr "" #. type: TP #: ../../man/man1/man.man1:1101 -#, fuzzy, no-wrap -#| msgid "B<-T>[I], B<--troff-device>[=I]" +#, no-wrap msgid "B<-T>[I], B<--troff-device>[=I]" -msgstr "B<-T>[I], B<--troff-device>[=I]" +msgstr "B<-T>[I], B<--troff-device>[=I]" #. type: Plain text #: ../../man/man1/man.man1:1113 @@ -2391,10 +2319,9 @@ msgstr "" #. type: TP #: ../../man/man1/man.man1:1113 -#, fuzzy, no-wrap -#| msgid "B<-H>[I], B<--html>[=I]" +#, no-wrap msgid "B<-H>[I], B<--html>[=I]" -msgstr "B<-H>[I], B<--html>[=I]" +msgstr "B<-H>[I], B<--html>[=I]" #. type: Plain text #: ../../man/man1/man.man1:1129 @@ -2415,10 +2342,9 @@ msgstr "" #. type: TP #: ../../man/man1/man.man1:1129 -#, fuzzy, no-wrap -#| msgid "B<-X>[I], B<--gxditview>[=I]" +#, no-wrap msgid "B<-X>[I], B<--gxditview>[=I]" -msgstr "B<-X>[I], B<--gxditview>[=I]" +msgstr "B<-X>[I], B<--gxditview>[=I]" #. type: Plain text #: ../../man/man1/man.man1:1143 @@ -2557,14 +2483,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1297 -#, fuzzy -#| msgid "" -#| "If $B is set, it will be parsed prior to B<%man%'s> command line " -#| "and is expected to be in a similar format. As all of the other B<%man%> " -#| "specific environment variables can be expressed as command line options, " -#| "and are thus candidates for being included in $B it is expected " -#| "that they will become obsolete. N.B. All spaces that should be " -#| "interpreted as part of an option's argument must be escaped." msgid "" "If $B is set, it will be parsed prior to B<%man%'s> command line and " "is expected to be in a similar format. As all of the other B<%man%> " @@ -2585,15 +2503,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1311 -#, fuzzy -#| msgid "" -#| "If $B is set, its value is used as the line length for which " -#| "manual pages should be formatted. If it is not set, manual pages will be " -#| "formatted with a line length appropriate to the current terminal (using " -#| "an B(2) if available, the value of $B, or falling back " -#| "to 80 characters if neither is available). Cat pages will only be saved " -#| "when the default formatting can be used, that is when the terminal line " -#| "length is between 66 and 80 characters." msgid "" "If $B is set, its value is used as the line length for which " "manual pages should be formatted. If it is not set, manual pages will be " @@ -2607,11 +2516,11 @@ msgstr "" "largeur de la ligne pour toutes les pages de manuel qui seront formatées. Si " "elle est vide, les pages de manuel seront formatées avec une largeur de " "ligne appropriée au terminal utilisé. Cette largeur sera déterminée soit " -"grâce à un B(2) s'il est disponible, soit d'après la valeur de " -"$B, soit à 80 colonnes si aucune indication n'est trouvée. Les " -"pages «\\ cat\\ » ne seront enregistrées que si la mise en forme par défaut " -"est utilisée, c'est-à-dire quand la largeur de ligne du terminal est " -"comprise entre 66 et 80 colonnes." +"d'après la valeur de $B, soit grâce à un B(2) s'il est " +"disponible, soit à 80 colonnes si aucune indication n'est trouvée. Les pages " +"«\\ cat\\ » ne seront enregistrées que si la mise en forme par défaut est " +"utilisée, c'est-à-dire quand la largeur de ligne du terminal est comprise " +"entre 66 et 80 colonnes." #. type: Plain text #: ../../man/man1/man.man1:1322 @@ -2690,13 +2599,11 @@ msgstr "HISTORIQUE" #. type: Plain text #: ../../man/man1/man.man1:1385 -#, fuzzy -#| msgid "" -#| "1990, 1991 - Originally written by John W. Eaton (jwe@che.utexas.edu)." msgid "" "1990, 1991 \\(en Originally written by John W.\\& Eaton (jwe@che.utexas.edu)." msgstr "" -"1990, 1991 - Première version écrite par John W. Eaton (jwe@che.utexas.edu)." +"1990, 1991 \\(en Première version écrite par John W.\\& Eaton (jwe@che." +"utexas.edu)." #. type: Plain text #: ../../man/man1/man.man1:1388 @@ -2709,42 +2616,28 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1392 -#, fuzzy -#| msgid "" -#| "30th April 1994 - 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) " -#| "has been developing and maintaining this package with the help of a few " -#| "dedicated people." msgid "" "30th April 1994 \\(en 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) " "has been developing and maintaining this package with the help of a few " "dedicated people." msgstr "" -"30 avril 1994 - 23 février 2000\\ : Wilf. (G.Wilford@ee.surrey.ac.uk) " -"adéveloppé et assuré la maintenance de ce programme avec l'aide de quelques " +"30 avril 1994 \\(en 23 février 2000\\ : Wilf. (G.Wilford@ee.surrey.ac.uk) a " +"développé et assuré la maintenance de ce programme avec l'aide de quelques " "personnes motivées." #. type: Plain text #: ../../man/man1/man.man1:1396 -#, fuzzy -#| msgid "" -#| "30th October 1996 - 30th March 2001: Fabrizio Polacco " -#| "Efpolacco@debian.orgE maintained and enhanced this package for " -#| "the Debian project, with the help of all the community." msgid "" "30th October 1996 \\(en 30th March 2001: Fabrizio Polacco " "Efpolacco@debian.orgE maintained and enhanced this package for the " "Debian project, with the help of all the community." msgstr "" -"30 octobre 1996 - 30 mars 2001\\ : Fabrizio Polacco Efpolacco@debian." +"30 octobre 1996 \\(en 30 mars 2001\\ : Fabrizio Polacco Efpolacco@debian." "orgE a assuré la maintenance et développé ce programme pour le projet " "Debian avec l'aide de toute la communauté." #. type: Plain text #: ../../man/man1/man.man1:1398 -#, fuzzy -#| msgid "" -#| "31st March 2001 - present day: Colin Watson Ecjwatson@debian.orgE " -#| "is now developing and maintaining man-db." msgid "" "31st March 2001 \\(en present day: Colin Watson Ecjwatson@debian." "orgE is now developing and maintaining man-db." @@ -3730,8 +3623,8 @@ msgstr "Async" #. type: tbl table #: ../../man/man8/mandb.man8:59 #, no-wrap -msgid "Filename\n" -msgstr "Nom de fichier\n" +msgid "Filename" +msgstr "Nom de fichier" #. type: tbl table #: ../../man/man8/mandb.man8:61 @@ -3754,8 +3647,8 @@ msgstr "Oui" #. type: tbl table #: ../../man/man8/mandb.man8:61 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:64 @@ -3773,8 +3666,8 @@ msgstr "Hachage" #. type: tbl table #: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:67 @@ -3797,8 +3690,8 @@ msgstr "UNIX ndbm" #. type: tbl table #: ../../man/man8/mandb.man8:70 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: Plain text #: ../../man/man8/mandb.man8:83 @@ -4027,6 +3920,56 @@ msgstr "" "maintenant incorporée à B(1)." #~ msgid "" +#~ "$mtime$ -E \"795987034\"\n" +#~ "$version$ -E \"2.3.1\"\n" +#~ "apropos -E \"1 1 795981542 A - - search the manual page names and " +#~ "descriptions\"\n" +#~ "catman -E \"8 8 795981544 A - - create or update the pre-formatted " +#~ "manual pages\"\n" +#~ "man -E \"1 1 795981542 A - - an interface to the on-line reference " +#~ "manuals\"\n" +#~ "mandb -E \"8 8 795981544 A - - create or update the manual page index " +#~ "caches\"\n" +#~ "manpath -E \" 1 5\"\n" +#~ "manpath~1 -E \"1 1 795981542 A - - determine search path for manual " +#~ "pages\"\n" +#~ "manpath~5 -E \"5 5 795981543 A - - format of the /etc/man_db.config " +#~ "file\"\n" +#~ "whatis -E \"1 1 795981543 A - - search the manual page names\"\n" +#~ "zsoelim -E \"1 1 795981543 A - - satisfy .so requests in roff input" +#~ "\"\n" +#~ msgstr "" +#~ "Exemple de sorties générées par accessdb\\ :\n" +#~ "\n" +#~ "NdT\\ : La commande accessdb utilise la base de données d'indexation. " +#~ "Or, \n" +#~ "celle-ci ne prend en compte que les pages de manuel en dialecte \n" +#~ "anglo-américain. Pour cette raison, les résultats ci-dessous n'ont pas \n" +#~ "été traduits. Toutefois, ceci ne présage en rien de l'absence, dans " +#~ "votre \n" +#~ "système, de ces pages traduites dans votre langue.\n" +#~ "\n" +#~ "$mtime$ -E \"1134451650\"\n" +#~ "$version$ -E \"2.4.1\"\n" +#~ "apropos -E \"- 1 1 1104942616 A - - gz search the manual page names " +#~ "and descriptions\"\n" +#~ "catman -E \"- 8 8 1104942616 A - - gz create or update the pre-" +#~ "formated manual pages\"\n" +#~ "man -E \"- 1 1 1104942616 A - t gz an interface to the on-line " +#~ "reference manuals\"\n" +#~ "mandb -E \"- 8 8 1104942616 A - t gz create or update the manual page " +#~ "index caches\"\n" +#~ "manpath -E \" manpath 1 manpath 5\"\n" +#~ "manpath~1 -E \"- 1 1 1104942616 A - - gz determine search path for " +#~ "manual pages\"\n" +#~ "manpath~5 -E \"- 5 5 1104942616 A - - gz format of the /etc/manpath." +#~ "config file\"\n" +#~ "whatis -E \"- 1 1 1104942616 A - - gz display manual page descriptions" +#~ "\"\n" +#~ "zsoelim -E \"- 1 1 1104942616 A - - gz satisfy .so requests in roff " +#~ "input\"\n" + +#~ msgid "" #~ "If you want to override B<%man%>'s prompt string processing completely, " #~ "use the $B environment variable described below." #~ msgstr "" diff --git a/man/po4a/po/id.po b/man/po4a/po/id.po index 19fb29c..f8fd4f5 100644 --- a/man/po4a/po/id.po +++ b/man/po4a/po/id.po @@ -1280,11 +1280,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>" msgid "" "Search the short descriptions and manual page names for the keyword " "I as regular expression. Print out any matches. Equivalent to B<" -"%apropos%\\ -r>I<\\ printf>B<.>" +"%apropos%>I<\\ printf>B<.>" msgstr "" "Cari deskripsi singkat dan nama halaman buku panduan untuk kata kunci " "I seperti ekspresi umum. Cetak semua kecocokan. Sama dengan B<" -"%apropos%\\ -r>I<\\ printf>B<.>" +"%apropos%>I<\\ printf>B<.>" #. type: TP #: ../../man/man1/man.man1:334 @@ -1296,11 +1296,11 @@ msgstr "B<%man%\\ -f>I<\\ smail>" #: ../../man/man1/man.man1:341 msgid "" "Lookup the manual pages referenced by I and print out the short " -"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>" +"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" "Cari halaman buku panduan direferensikan oleh I dan tampilkan " -"deskripsi singkat dari apapun yang ditemukan. Sama dengan B<%whatis%\\ -r>I<" -"\\ smail>B<.>" +"deskripsi singkat dari apapun yang ditemukan. Sama dengan B<%whatis%>I<\\ " +"smail>B<.>" #. type: SH #: ../../man/man1/man.man1:341 @@ -3632,8 +3632,8 @@ msgstr "Async" #. type: tbl table #: ../../man/man8/mandb.man8:59 #, no-wrap -msgid "Filename\n" -msgstr "Filename\n" +msgid "Filename" +msgstr "Filename" #. type: tbl table #: ../../man/man8/mandb.man8:61 @@ -3656,8 +3656,8 @@ msgstr "Yes" #. type: tbl table #: ../../man/man8/mandb.man8:61 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:64 @@ -3675,8 +3675,8 @@ msgstr "Hashed" #. type: tbl table #: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:67 @@ -3699,8 +3699,8 @@ msgstr "UNIX ndbm" #. type: tbl table #: ../../man/man8/mandb.man8:70 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: Plain text #: ../../man/man8/mandb.man8:83 diff --git a/man/po4a/po/ja.po b/man/po4a/po/ja.po index 8c058be..385c808 100644 --- a/man/po4a/po/ja.po +++ b/man/po4a/po/ja.po @@ -1208,10 +1208,10 @@ msgstr "B<%man%\\ -k>I<\\ printf>" msgid "" "Search the short descriptions and manual page names for the keyword " "I as regular expression. Print out any matches. Equivalent to B<" -"%apropos%\\ -r>I<\\ printf>B<.>" +"%apropos%>I<\\ printf>B<.>" msgstr "" "キーワード I をマニュアルページ名と要約文の中から正規表現として検索し" -"ます。一致するすべてのマニュアルページが表示されます。 B<%apropos%\\ -r>I<\\ " +"ます。一致するすべてのマニュアルページが表示されます。 B<%apropos%>I<\\ " "printf> と同様です。" #. type: TP @@ -1224,10 +1224,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>" #: ../../man/man1/man.man1:341 msgid "" "Lookup the manual pages referenced by I and print out the short " -"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>" +"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" "I によって参照されるマニュアルページを検索し、見つかったページの要約を" -"表示します。 B<%whatis%\\ -r>I<\\ smail> と同様です。" +"表示します。 B<%whatis%>I<\\ smail> と同様です。" #. type: SH #: ../../man/man1/man.man1:341 @@ -3380,8 +3380,8 @@ msgstr "非同期" #. type: tbl table #: ../../man/man8/mandb.man8:59 #, no-wrap -msgid "Filename\n" -msgstr "ファイル名\n" +msgid "Filename" +msgstr "ファイル名" #. type: tbl table #: ../../man/man8/mandb.man8:61 @@ -3404,8 +3404,8 @@ msgstr "○" #. type: tbl table #: ../../man/man8/mandb.man8:61 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:64 @@ -3423,8 +3423,8 @@ msgstr "ハッシュ" #. type: tbl table #: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:67 @@ -3447,8 +3447,8 @@ msgstr "UNIX ndbm" #. type: tbl table #: ../../man/man8/mandb.man8:70 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: Plain text #: ../../man/man8/mandb.man8:83 diff --git a/man/po4a/po/man-db-manpages.pot b/man/po4a/po/man-db-manpages.pot index 58a32b6..d8a4282 100644 --- a/man/po4a/po/man-db-manpages.pot +++ b/man/po4a/po/man-db-manpages.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2014-09-16 14:04+0100\n" +"POT-Creation-Date: 2015-08-02 12:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -931,7 +931,7 @@ msgstr "" msgid "" "Search the short descriptions and manual page names for the keyword " "I as regular expression. Print out any matches. Equivalent to " -"B<%apropos%\\ -r>I<\\ printf>B<.>" +"B<%apropos%>I<\\ printf>B<.>" msgstr "" #. type: TP @@ -944,7 +944,7 @@ msgstr "" #: ../../man/man1/man.man1:341 msgid "" "Lookup the manual pages referenced by I and print out the short " -"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>" +"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" #. type: SH @@ -2643,7 +2643,7 @@ msgstr "" #. type: tbl table #: ../../man/man8/mandb.man8:59 #, no-wrap -msgid "Filename\n" +msgid "Filename" msgstr "" #. type: tbl table @@ -2667,7 +2667,7 @@ msgstr "" #. type: tbl table #: ../../man/man8/mandb.man8:61 #, no-wrap -msgid "I\n" +msgid "I" msgstr "" #. type: tbl table @@ -2685,7 +2685,7 @@ msgstr "" #. type: tbl table #: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67 #, no-wrap -msgid "I\n" +msgid "I" msgstr "" #. type: tbl table @@ -2709,7 +2709,7 @@ msgstr "" #. type: tbl table #: ../../man/man8/mandb.man8:70 #, no-wrap -msgid "I\n" +msgid "I" msgstr "" #. type: Plain text diff --git a/man/po4a/po/nl.po b/man/po4a/po/nl.po index 48f775e..64118d3 100644 --- a/man/po4a/po/nl.po +++ b/man/po4a/po/nl.po @@ -1309,11 +1309,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>" msgid "" "Search the short descriptions and manual page names for the keyword " "I as regular expression. Print out any matches. Equivalent to B<" -"%apropos%\\ -r>I<\\ printf>B<.>" +"%apropos%>I<\\ printf>B<.>" msgstr "" "Zoek in de korte beschrijvingen en namen van man-pagina's naar het trefwoord " "I als reguliere expressie. Toon iedere treffer. Komt overeen met B<" -"%apropos%\\ -r>I<\\ printf>B<.>" +"%apropos%>I<\\ printf>B<.>" #. type: TP #: ../../man/man1/man.man1:334 @@ -1325,10 +1325,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>" #: ../../man/man1/man.man1:341 msgid "" "Lookup the manual pages referenced by I and print out the short " -"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>" +"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" "Alle korte beschijvingen tonen van de man-pagina's waarnaar verwezen wordt " -"door I. Is gelijk aan B<%whatis%\\ -r>I<\\ smail>B<.>" +"door I. Is gelijk aan B<%whatis%>I<\\ smail>B<.>" #. type: SH #: ../../man/man1/man.man1:341 @@ -3508,7 +3508,7 @@ msgstr "" #. type: tbl table #: ../../man/man8/mandb.man8:59 #, no-wrap -msgid "Filename\n" +msgid "Filename" msgstr "" #. type: tbl table @@ -3532,7 +3532,7 @@ msgstr "" #. type: tbl table #: ../../man/man8/mandb.man8:61 #, no-wrap -msgid "I\n" +msgid "I" msgstr "" #. type: tbl table @@ -3551,7 +3551,7 @@ msgstr "" #. type: tbl table #: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67 #, no-wrap -msgid "I\n" +msgid "I" msgstr "" #. type: tbl table @@ -3575,7 +3575,7 @@ msgstr "" #. type: tbl table #: ../../man/man8/mandb.man8:70 #, no-wrap -msgid "I\n" +msgid "I" msgstr "" #. type: Plain text diff --git a/man/po4a/po/pl.po b/man/po4a/po/pl.po index b48e891..f52154b 100644 --- a/man/po4a/po/pl.po +++ b/man/po4a/po/pl.po @@ -1244,11 +1244,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>" msgid "" "Search the short descriptions and manual page names for the keyword " "I as regular expression. Print out any matches. Equivalent to B<" -"%apropos%\\ -r>I<\\ printf>B<.>" +"%apropos%>I<\\ printf>B<.>" msgstr "" "Szuka słowa kluczowego I jako wyrażenia regularnego w krótkich " "opisach i nazwach stron podręcznika. Wyświetla wszystkie dopasowania. " -"Odpowiednik B<%apropos%\\ -r>I<\\ printf>B<.>" +"Odpowiednik B<%apropos%>I<\\ printf>B<.>" #. type: TP #: ../../man/man1/man.man1:334 @@ -1260,10 +1260,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>" #: ../../man/man1/man.man1:341 msgid "" "Lookup the manual pages referenced by I and print out the short " -"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>" +"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" "Wyszukuje strony podręcznika opisane przez I i wyświetla krótki opis " -"każdej ze znalezionych stron. Odpowiednik B<%whatis%\\ -r>I<\\ smail>B<.>" +"każdej ze znalezionych stron. Odpowiednik B<%whatis%>I<\\ smail>B<.>" #. type: SH #: ../../man/man1/man.man1:341 @@ -3574,8 +3574,8 @@ msgstr "Asynchroniczna" #. type: tbl table #: ../../man/man8/mandb.man8:59 #, no-wrap -msgid "Filename\n" -msgstr "Nazwa pliku\n" +msgid "Filename" +msgstr "Nazwa pliku" #. type: tbl table #: ../../man/man8/mandb.man8:61 @@ -3598,8 +3598,8 @@ msgstr "Tak" #. type: tbl table #: ../../man/man8/mandb.man8:61 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:64 @@ -3617,8 +3617,8 @@ msgstr "Funkcja mieszająca" #. type: tbl table #: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:67 @@ -3641,8 +3641,8 @@ msgstr "UNIX ndbm" #. type: tbl table #: ../../man/man8/mandb.man8:70 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: Plain text #: ../../man/man8/mandb.man8:83 diff --git a/man/po4a/po/ru.po b/man/po4a/po/ru.po index c08bce0..8131320 100644 --- a/man/po4a/po/ru.po +++ b/man/po4a/po/ru.po @@ -1238,11 +1238,11 @@ msgstr "B<%man%\\ -k>I<\\ printf>" msgid "" "Search the short descriptions and manual page names for the keyword " "I as regular expression. Print out any matches. Equivalent to B<" -"%apropos%\\ -r>I<\\ printf>B<.>" +"%apropos%>I<\\ printf>B<.>" msgstr "" "Искать в кратких описаниях и именах справочных страниц ключевое слово " "I, рассматриваемое как регулярное выражение. Показать любые " -"найденные совпадения. Эквивалентно вызову B<%apropos%\\ -r>I<\\ printf>B<.>" +"найденные совпадения. Эквивалентно вызову B<%apropos%>I<\\ printf>B<.>" #. type: TP #: ../../man/man1/man.man1:334 @@ -1254,10 +1254,10 @@ msgstr "B<%man%\\ -f>I<\\ smail>" #: ../../man/man1/man.man1:341 msgid "" "Lookup the manual pages referenced by I and print out the short " -"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>" +"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" "Искать справочные страницы, ссылающиеся на I и показать краткое " -"описание любой найденной. Эквивалентно вызову B<%whatis%\\ -r>I<\\ smail>B<.>" +"описание любой найденной. Эквивалентно вызову B<%whatis%>I<\\ smail>B<.>" #. type: SH #: ../../man/man1/man.man1:341 @@ -3538,8 +3538,8 @@ msgstr "Асинхронность" #. type: tbl table #: ../../man/man8/mandb.man8:59 #, no-wrap -msgid "Filename\n" -msgstr "Имя файла\n" +msgid "Filename" +msgstr "Имя файла" #. type: tbl table #: ../../man/man8/mandb.man8:61 @@ -3562,8 +3562,8 @@ msgstr "Да" #. type: tbl table #: ../../man/man8/mandb.man8:61 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:64 @@ -3581,8 +3581,8 @@ msgstr "Хэш" #. type: tbl table #: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:67 @@ -3605,8 +3605,8 @@ msgstr "UNIX ndbm" #. type: tbl table #: ../../man/man8/mandb.man8:70 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: Plain text #: ../../man/man8/mandb.man8:83 diff --git a/man/po4a/po/zh_CN.po b/man/po4a/po/zh_CN.po index d56cada..0d45a91 100644 --- a/man/po4a/po/zh_CN.po +++ b/man/po4a/po/zh_CN.po @@ -1214,10 +1214,10 @@ msgstr "B<%man%\\ -k>I<\\ printf>" msgid "" "Search the short descriptions and manual page names for the keyword " "I as regular expression. Print out any matches. Equivalent to B<" -"%apropos%\\ -r>I<\\ printf>B<.>" +"%apropos%>I<\\ printf>B<.>" msgstr "" "将关键词 I 作为正则表达式来搜索对应的手册页概述和手册页名称。打印任何" -"匹配结果。等效于 B<%apropos%\\ -r>I<\\ printf>B<.>" +"匹配结果。等效于 B<%apropos%>I<\\ printf>B<.>" #. type: TP #: ../../man/man1/man.man1:334 @@ -1229,9 +1229,9 @@ msgstr "B<%man%\\ -f>I<\\ smail>" #: ../../man/man1/man.man1:341 msgid "" "Lookup the manual pages referenced by I and print out the short " -"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>" +"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" -"查找 I 引用的手册页并输出找到的任何概述。等效于 B<%whatis%\\ -r>I<\\ " +"查找 I 引用的手册页并输出找到的任何概述。等效于 B<%whatis%>I<\\ " "smail>B<.>" #. type: SH @@ -3336,8 +3336,8 @@ msgstr "异步" #. type: tbl table #: ../../man/man8/mandb.man8:59 #, no-wrap -msgid "Filename\n" -msgstr "文件名\n" +msgid "Filename" +msgstr "文件名" #. type: tbl table #: ../../man/man8/mandb.man8:61 @@ -3360,8 +3360,8 @@ msgstr "是" #. type: tbl table #: ../../man/man8/mandb.man8:61 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:64 @@ -3379,8 +3379,8 @@ msgstr "已散列" #. type: tbl table #: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: tbl table #: ../../man/man8/mandb.man8:67 @@ -3403,8 +3403,8 @@ msgstr "UNIX ndbm" #. type: tbl table #: ../../man/man8/mandb.man8:70 #, no-wrap -msgid "I\n" -msgstr "I\n" +msgid "I" +msgstr "I" #. type: Plain text #: ../../man/man8/mandb.man8:83 diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in index b8c7a08..5a32661 100644 --- a/man/ru/Makefile.in +++ b/man/ru/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,8 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/man/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = man/ru ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -290,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -525,6 +534,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/man/Rules.man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1559,7 +1571,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/ru/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/ru/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1568,7 +1579,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/man/Rules.man: +$(top_srcdir)/man/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1744,7 +1755,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2108,6 +2119,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 recheck tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/man/zh_CN/Makefile.in b/man/zh_CN/Makefile.in index d6e2704..e9afb77 100644 --- a/man/zh_CN/Makefile.in +++ b/man/zh_CN/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,8 +86,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/man/Rules.man $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = man/zh_CN ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -290,6 +298,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -525,6 +534,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/man/Rules.man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1559,7 +1571,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/zh_CN/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/zh_CN/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1568,7 +1579,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/man/Rules.man: +$(top_srcdir)/man/Rules.man $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1744,7 +1755,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2108,6 +2119,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 recheck tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 +.PRECIOUS: Makefile + replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ diff --git a/manual/Makefile.in b/manual/Makefile.in index e37802b..ae288f1 100644 --- a/manual/Makefile.in +++ b/manual/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,8 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = manual -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_noinst_DATA) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -291,6 +299,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -316,6 +326,7 @@ am__can_run_installinfo = \ esac DATA = $(dist_noinst_DATA) $(noinst_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1357,7 +1368,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign manual/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1536,6 +1546,8 @@ uninstall-am: mostlyclean-libtool pdf pdf-am ps ps-am ps-local tags-am \ uninstall uninstall-am uninstall-hook +.PRECIOUS: Makefile + version: $(top_srcdir)/configure.ac echo '.ds V $(roff_version)' > $@ diff --git a/po/ca.po b/po/ca.po index 3ae224a..15c9af5 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,20 +1,21 @@ # Catalan message catalogs for man-db. -# Copyright © 2002, 2003, 2005, 2010, 2011 Colin Watson (msgids) +# Copyright © 2002, 2003, 2005, 2010, 2011, 2015 Colin Watson (msgids) # This file is distributed under the same licence as the man-db package. -# Jordi Mallach , 2002, 2003, 2005, 2010, 2011. +# Jordi Mallach , 2002, 2003, 2005, 2010, 2011, 2015. # msgid "" msgstr "" -"Project-Id-Version: man-db 2.6.0-pre1\n" +"Project-Id-Version: man-db 2.7.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" -"PO-Revision-Date: 2011-04-11 22:39+0200\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" +"PO-Revision-Date: 2015-08-04 08:34+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2 plural=n!=1;\n" #: lib/security.c:74 #, c-format @@ -57,10 +58,10 @@ msgstr "no es pot reemplaçar la clau %s" # I què tal «només hi ha...». ivb # yep. jm #: libdb/db_lookup.c:182 libdb/db_lookup.c:193 -#, fuzzy, c-format +#, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" -msgstr[0] "només hi ha %d camps en el contingut" +msgstr[0] "només hi ha %d camp en el contingut" msgstr[1] "només hi ha %d camps en el contingut" #: libdb/db_lookup.c:344 @@ -68,7 +69,7 @@ msgstr[1] "només hi ha %d camps en el contingut" msgid "bad fetch on multi key %s" msgstr "recepció errònia en clau múltiple %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "La base de dades %s està corrompuda; reconstruïu-la amb mandb --create" @@ -88,18 +89,18 @@ msgstr "avís: %s té versió %s, s'espera %s\n" msgid "fatal: unable to insert version identifier into %s" msgstr "fatal: no s'ha pogut inserir un identificador de versió en %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[BASE DE DADES DE MAN]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "produeix informació de depuració" @@ -112,42 +113,42 @@ msgstr "no es pot obrir %s per a lectura" msgid "[SECTION...]" msgstr "[SECCIÓ…]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "CAMÍ" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 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:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "FITXER" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "empra aquest fitxer de configuració de l'usuari" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "no es pot llegir la base de dades %s" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "l'ordre de man ha fallat amb l'estat d'eixida %d" +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "no es pot llegir la base de dades %s" + # Potser siga només «per», en tot cas crec que «de» és més adequat. ivb -#: src/catman.c:278 +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "contingut NUL de la clau: %s" # Alguna guia d'estil proposava «S'estan actualitzant...». ivb -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -157,12 +158,12 @@ msgstr "" "S'estan actualitzant els fitxers cat per a la secció %s de la jerarquia de " "man %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "no es pot escriure en %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "no es pot actualitzar %s" @@ -172,7 +173,7 @@ msgstr "no es pot actualitzar %s" 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:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "no es pot actualitzar la memòria cau d'índex %s" @@ -188,44 +189,44 @@ msgstr "avís: %s: enllaç simbòlic o petició ROFF «.so» incorrecte" msgid "warning: %s: ignoring empty file" msgstr "avís: %s: es descarta un fitxer buit" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, 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:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 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:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "avís: no es pot crear el directori de cat %s" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "no es pot canviar al directori %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, 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:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "fet.\n" # S'estan... ivb -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "S'estan purgant entrades antigues de la base de dades en %s…\n" @@ -246,20 +247,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:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "EXTENSIÓ" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "limita la cerca al tipus d'extensió EXTENSIÓ" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 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:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "cerca les pàgines diferenciant majúscules i minúscules" @@ -273,14 +274,14 @@ msgstr "el nom de la pàgina conté comodins" # Es trunca, es truncarà? ivb #: src/lexgrog.l:665 -#, fuzzy, c-format +#, 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à." +msgstr[0] "avís: el whatis per a %s s'excedeix en %d octet, es truncarà." +msgstr[1] "avís: el whatis per a %s s'excedeix en %d octets, es truncarà." -#: src/lexgrog.l:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -310,16 +311,16 @@ 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:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "CODIFICACIÓ" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 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:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: les opcions són incompatibles" @@ -329,145 +330,145 @@ msgstr "%s: les opcions són incompatibles" msgid "command exited with status %d: %s" msgstr "l'ordre ha finalitzat amb l'estat %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[SECCIÓ] PÀGINA…" -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "reestableix totes les opcions als seus valors per defecte" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "AVISOS" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "habilita els avisos del groff" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Modes principals de funcionament:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "equivalent a «whatis»" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "equivalent a «apropos»" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "cerca text a totes les pàgines" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "mostra la ubicació física de les pàgines de manual" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "mostra la ubicació física dels fitxers cat" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpreta els arguments PÀGINA com a noms de fitxers locals" -#: src/man.c:296 +#: src/man.c:295 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:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "mostra el font de la pàgina codificat amb CODIFICACIÓ" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Cerca de pàgines de manual:" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "LOCALE" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "defineix el locale per a aquesta cerca de manuals concreta" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "SISTEMA" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "empra pàgines de manual d'altres sistemes" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "LLISTA" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "empra una llista de seccions separada per dos punts" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "mostra totes les pàgines que concorden amb una expressió regular" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "mostra totes les pàgines que concorden amb un comodí" -#: src/man.c:311 +#: src/man.c:310 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:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "cerca totes les pàgines de manual coincidents" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "força una comprovació de consistència de la memòria cau" -#: src/man.c:316 +#: src/man.c:315 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:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "Control de l'eixida formatada" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "PAGINADOR" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "empra el programa PAGINADOR per a mostrar l'eixida" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "CADENA" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "proveeix el paginador «less» amb un indicador" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "mostra traduccions ASCII d'alguns caràcters latin1" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" -msgstr "inhabilita la separació siŀlàbica" +msgstr "inhabilita la separació sil·làbica" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "inhabilita el sagnat" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -477,34 +478,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "empra %s per a formatar les pàgines" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "DISPOSITIU" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "empra %s amb el dispositiu seleccionat" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "NAVEGADOR" -#: src/man.c:337 +#: src/man.c:336 #, 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:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "RESOLUCIÓ" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -512,32 +513,32 @@ msgstr "" "empra groff i mostra a través de gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 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:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "No hi ha una entrada de manual per a %s\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Quina pàgina de manual voleu?\n" -#: src/man.c:726 +#: src/man.c:767 #, 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:735 +#: src/man.c:776 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" @@ -545,22 +546,22 @@ msgstr "" "disponibles.\n" # «es descarta el...» ivb -#: src/man.c:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "es descarta el preprocessador desconegut «%c»" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "no es pot fer «chown» a %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "no es pot fer «chmod» a %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "no es pot reanomenar %s a %s" @@ -568,53 +569,53 @@ 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:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "no es poden establir les hores en %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "no es pot desenllaçar %s" -#: src/man.c:1672 +#: src/man.c:1715 #, 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:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "no es pot crear un directori temporal" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "no es pot obrir el fitxer temporal %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "no es pot crear un directori temporal" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "no es pot eliminar el directori %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "no es pot canviar de directori a %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -623,29 +624,29 @@ msgstr "" "\n" "no es pot escriure a %s en el mode catman" -#: src/man.c:2343 +#: src/man.c:2386 #, 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:3067 +#: src/man.c:3111 #, 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:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, 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:3420 +#: src/man.c:3466 #, 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:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Pàgina de manual " @@ -692,53 +693,53 @@ 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:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[CAMÍ DE MAN]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "treballa silenciosament, excepte per a avisos estranys" -#: src/mandb.c:110 +#: src/mandb.c:109 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:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "no purgues entrades obsoletes de les bd" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "produeix només bases de dades d'usuari" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "crea db noves, en comptes d'actualitzar-les" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "comprova que les pàgines de manual són correctes" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "NOMFITXER" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "actualitza només l'entrada per a aquest nom de fitxer" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "no es pot eliminar %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "no es pot escriure en %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "no es pot llegir de %s" @@ -763,36 +764,31 @@ msgstr "" "avís: no hi ha directives MANDB_MAP en %s, s'utilitzarà el vostre camí de man" #: src/mandb.c:902 -#, fuzzy, c-format +#, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" -msgstr[0] "" -"%d subdirectoris de man contenien pàgines de manual més noves.\n" -"S'han afegit %d pàgines de manual.\n" -msgstr[1] "" -"%d subdirectoris de man contenien pàgines de manual més noves.\n" -"S'han afegit %d pàgines de manual.\n" +msgstr[0] "%d subdirectori de man contenia pàgines de manual més noves.\n" +msgstr[1] "%d subdirectoris de man contenien pàgines de manual més noves.\n" #: src/mandb.c:907 -#, fuzzy, c-format +#, 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 " +msgstr[0] "S'ha afegit %d pàgina de manual.\n" +msgstr[1] "S'han afegit %d pàgines de manual.\n" #: src/mandb.c:911 -#, fuzzy, c-format +#, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" -msgstr[0] "S'han afegit %d cats orfes.\n" +msgstr[0] "S'ha afegit %d cat orfe.\n" msgstr[1] "S'han afegit %d cats orfes.\n" -# "la base de dades", o "bases de dades"? jm #: src/mandb.c:916 -#, fuzzy, c-format +#, 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[0] "S'ha purgat %d entrada vella de la base de dades.\n" msgstr[1] "S'han purgat %d entrades velles de la base de dades.\n" #: src/mandb.c:934 @@ -894,23 +890,23 @@ 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:246 src/ult_src.c:124 +#: src/straycats.c:247 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:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "S'estan cercant cats orfes sota %s…\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "no es pot actualitzar la memòria cau d'índex %s" @@ -920,54 +916,54 @@ msgstr "no es pot actualitzar la memòria cau d'índex %s" msgid "%s is self referencing" msgstr "%s es referència a ell mateix" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "PARAULACLAU…" -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "L'opció --regex està habilitada per defecte." -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "mostra missatges d'avís detallats" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "interpreta cada paraula clau com si fora una expressió regular" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "cerca coincidències exactes en cada paraula clau" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "les paraules clau contenen comodins" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "requereix que concorden totes les paraules clau" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "no ajustes l'eixida a l'amplada del terminal" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "cerca només en aquestes seccions (separades per punts i coma)" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "defineix el locale per a aquesta cerca" # «comor?» ivb # «el que tu has dit entendre no he pogut» yoda -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s què?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "avís: %s conté un bucle de punters" @@ -976,12 +972,12 @@ msgstr "avís: %s conté un bucle de punters" # Gènere? Nombre? És bo posar-ne un comentari. ivb # Pareix que es refereix al resultat d'un whois. «whois desconegut?» jm # Arreglat en 2.4.0pre. jm -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(assumpte desconegut)" # «res d'apropiat»? ivb -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: res d'apropiat.\n" diff --git a/po/cs.po b/po/cs.po index 8ec7322..e6b1277 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2012-04-07 19:04+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" @@ -66,7 +66,7 @@ msgstr[2] "pouze %d položek v obsahu" msgid "bad fetch on multi key %s" msgstr "nelze získat vícenásobný klíč %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Databáze %s je poÅ¡kozena; znovu ji sestavte pomocí „mandb --create“" @@ -86,18 +86,18 @@ msgstr "varování: soubor %s je verze %s, ale očekávána je verze %s\n" msgid "fatal: unable to insert version identifier into %s" msgstr "fatální chyba: nelze vložit identifikátor verze do souboru %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[MANUÁLOVÁ DATABÁZE]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "vysílat ladicí zprávy" @@ -110,40 +110,40 @@ msgstr "soubor %s nelze otevřít pro čtení" msgid "[SECTION...]" msgstr "[ODDÍL…]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "CESTA" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 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:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "SOUBOR" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "použít tento soubor s uživatelským nastavením" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "databázi %s nelze číst" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "příkaz man skončil s návratovým kódem %d" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "databázi %s nelze číst" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "položka pod klíčem %s je prázdná" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -152,12 +152,12 @@ msgstr "" "\n" "Aktualizují se katalogové soubory pro oddíl %s v manuálové hierarchii %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "nelze zapisovat do %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "nelze aktualizovat %s" @@ -167,7 +167,7 @@ msgstr "nelze aktualizovat %s" 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:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "nelze aktualizovat rejstřík %s" @@ -182,42 +182,42 @@ msgstr "varování: %s: chybný symbolický odkaz nebo požadavek „.so“ od R msgid "warning: %s: ignoring empty file" msgstr "varování: %s: ignoruje se prázdný soubor" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, 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:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "nelze prohledat složku %s" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "varování: nelze vytvořit složku %s pro katalogy" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "nelze se přepnout do složky %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "nelze vytvořit rejstřík %s" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "dokončeno.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Mažou se staré databázové záznamy v %s…\n" @@ -236,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:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "PŘÍPONA" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 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:307 +#: src/globbing_test.c:60 src/man.c:306 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:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "při hledání stránek rozliÅ¡ovat velikost písmen" @@ -268,8 +268,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -299,15 +299,15 @@ 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:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "KÓDOVÁNÍ" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "použít vybrané výstupní kódování" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: nekompatibilní přepínače" @@ -317,147 +317,147 @@ msgstr "%s: nekompatibilní přepínače" msgid "command exited with status %d: %s" msgstr "příkaz skončil s návratovým kódem %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[ODDÍL] STRÁNKA…" -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "nastavit vÅ¡echny přepínače na jejich výchozí hodnoty" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "VAROVÁNÍ" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "povolit varování od programu groff" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Hlavní režimy operací:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "to stejné jako program whatis" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "to stejné jako program apropos" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "hledat text ve vÅ¡ech stránkách" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "vypsat fyzické umístění manuálové stránky (či stránek)" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "vypsat fyzické umístění katalogového souboru (či souborů)" -#: src/man.c:295 +#: src/man.c:294 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:296 +#: src/man.c:295 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:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "vypsat zdrojovou stránku kódovanou v KÓDOVÁNÍ" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Hledání manuálových stránek:" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "LOCALE" -#: src/man.c:300 +#: src/man.c:299 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:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "SYSTÉM" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "použít manuálové stránky z jiných systémů" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "SEZNAM" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "použít dvojtečkami oddělovaný seznam oddílů" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "zobrazit vÅ¡echny stránky odpovídající regulárnímu výrazu" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "zobrazit vÅ¡echny stránky odpovídající divokým znakům" -#: src/man.c:311 +#: src/man.c:310 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:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "najít vÅ¡echny odpovídající manuálové stránky" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "vynutit kontrolu konzistence mezipaměti" -#: src/man.c:316 +#: src/man.c:315 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:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "Řízení formátovaného výstupu:" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "ZOBRAZOVAČ" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "použít program ZOBRAZOVAČ k zobrazení výstupu" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "ŘETĚZEC" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "poskytne zobrazovací program „less“ s příkazovým řádkem" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "některé znaky latin1 zobrazovat přepisem do ASCII" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "vypnout dělní slov" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "vypnout zarovnávání" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -467,34 +467,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "používat program %s k formátování stránek" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "ZAŘÍZENÍ" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "používat program %s s vybraným zařízením" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "PROHLÍŽEČ" -#: src/man.c:337 +#: src/man.c:336 #, 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:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "ROZLIÅ ENÍ" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -502,102 +502,102 @@ msgstr "" "použít program groff a zobrazit přes gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 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:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Manuálová stránka pro %s nebyla nalezena\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Kterou manuálovou stránku si přejete?\n" -#: src/man.c:726 +#: src/man.c:767 #, 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:735 +#: src/man.c:776 #, 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:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ignoruje se neznámé předzpracování „%c“" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "nelze změnit vlastnictví %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "nelze změnit oprávnění k %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "%s nelze přejmenovat na %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "nelze nastavit čas na %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "nelze smazat %s" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "nelze vytvořit dočasný katalog pro %s" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "nelze vytvořit dočasnou složku" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "nelze otevřít dočasný soubor %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "nelze vytvořit dočasnou složku" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "nelze odstranit složku %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "nelze se přepnout do složky %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -606,27 +606,27 @@ msgstr "" "\n" "do %s nelze v režimu catman zapisovat" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "%s nelze převést na název katalogu" -#: src/man.c:3067 +#: src/man.c:3111 #, 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:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, 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:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "interní chyba: kandidující typ %d je mimo rozsah" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Manuálová stránka " @@ -673,53 +673,53 @@ 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:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[CESTA_K_MANUÁLOVÝM_STRÁNKÁM]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "pracovat tiÅ¡e, s výjimkou „faleÅ¡ných“ varování" -#: src/mandb.c:110 +#: src/mandb.c:109 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:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "nemazat z databáze zastaralé záznamy" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "vytvořit pouze uživatelskou databázi" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "vytvořit databázi raději od píky, než ji aktualizovat" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "zkontrolovat, zda jsou manuálové stránky v pořádku" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "SOUBOR" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "aktualizovat jen záznam pro tento soubor" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "nelze odstranit soubor %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "nelze zapisovat do souboru %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "nelze číst ze souboru %s" @@ -867,22 +867,22 @@ 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:246 src/ult_src.c:124 +#: src/straycats.c:247 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:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Kontrolují se bezprizorní katalogy ve složce %s…\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "varování: rejstřík %s nelze aktualizovat" @@ -892,61 +892,61 @@ msgstr "varování: rejstřík %s nelze aktualizovat" msgid "%s is self referencing" msgstr "stránka %s se odkazuje sama na sebe" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "KLÍČOVÉ_SLOVO…" -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "Přepínač --regex je standardně zapnutý." -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "vypisovat podrobné varovné zprávy" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "každé klíčové slovo považovat za regulární výraz" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "každé klíčové slovo hledat na přesnou shodu" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "klíčové slovo (či slova) obsahují divoké znaky" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "požadovat shodu vÅ¡ech klíčových slov" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "neořezávat výstup na šířku terminálu" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "prohledávat jen tyto oddíly (oddělené dvojtečkou)" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "definovat národní prostředí pro toto hledání" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "Co má příkaz %s provést?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "varování: %s obsahuje zacyklený ukazatel" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(neznámý předmět)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nic neodpovídá.\n" diff --git a/po/da.po b/po/da.po index 49f8461..d29fc4a 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2012-03-17 23:42+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -77,7 +77,7 @@ msgstr[1] "kun %d felter i indhold" msgid "bad fetch on multi key %s" msgstr "fejlagtig hentning pÃ¥ multinøgle %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Databasen %s er beskadiget; genopbyg med mandb --create" @@ -97,18 +97,18 @@ msgstr "advarsel: %s er version %s, %s forventes\n" msgid "fatal: unable to insert version identifier into %s" msgstr "fatalt: kan ikke indsætte versionsidentifikator i %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[MANUALDATABASE]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "vis fejlsøgningsbeskeder" @@ -121,40 +121,40 @@ msgstr "kan ikke Ã¥bne %s for læsning" msgid "[SECTION...]" msgstr "[AFSNIT...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "STI" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" msgstr "angiv søgesti for manualsider med STI" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "FIL" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "brug denne brugers konfigurationsfil" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "kan ikke læse databasen %s" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "man-kommandoen mislykkedes med slutstatus %d" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "kan ikke læse databasen %s" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "NULL-indhold for nøgle: %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -163,12 +163,12 @@ msgstr "" "\n" "Opdaterer katalogfiler for afsnit %s i man-hierarkiet %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "kan ikke skrive indenfor %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "kan ikke opdatere %s" @@ -178,7 +178,7 @@ msgstr "kan ikke opdatere %s" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "advarsel: %s/man%s/%s.%s*: filendelser i konflikt" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "kan ikke opdatere indekscachen %s" @@ -193,42 +193,42 @@ msgstr "advarsel: %s: fejlagtig symbolsk lænke eller ROFF ».so-anmodning«" msgid "warning: %s: ignoring empty file" msgstr "advarsel: %s: ignorerer tom fil" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "advarsel: %s: whatis-tolkning for %s(%s) mislykkedes" -#: src/check_mandirs.c:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 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:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "advarsel: kan ikke oprette katalogmappe %s" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "kan ikke skifte til kataloget %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "kan ikke oprette indekscachen %s" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Opdaterer indekscache for søgestien »%s/%s«. Vent..." -#: src/check_mandirs.c:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "færdig.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Tømmer gamle databaseindgange i %s...\n" @@ -249,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:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "FILENDELSE" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 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:307 +#: src/globbing_test.c:60 src/man.c:306 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:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "se efter sider versalfølsomt" @@ -282,8 +282,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -313,15 +313,15 @@ 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:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "KODNING" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "brug valgt uddatakodning" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: inkompatible tilvalg" @@ -331,150 +331,150 @@ msgstr "%s: inkompatible tilvalg" msgid "command exited with status %d: %s" msgstr "kommandoen afsluttede med status %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[AFSNIT] SIDE..." -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "nulstil alle tilvalg til deres standardværdier" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "ADVARSLER" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "aktiver advarsler fra groff" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Hovedtilstande for handling:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "svarende til whatis" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "svarende til apropos" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "søg efter tekst pÃ¥ alle sider" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "vis fysisk placering af manualsider" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "vis fysisk placering af katalogfiler" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "fortolk SIDE-argumenter som lokale filnavne" -#: src/man.c:296 +#: src/man.c:295 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:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "uddatakildeside kodet i KODNING" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Finder manualsider:" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "SPROG" # denne specifikke -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "definere sproget for netop denne manualsøgning" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "SYSTEM" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "brug manualsider fra andre systemer" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "LISTE" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "brug kolonadskilt afsnitsliste" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "vis alle sider der matcher regulært udtryk" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "vis alle sider der matcher jokertegn" -#: src/man.c:311 +#: src/man.c:310 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:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "find alle matchende manualsider" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "fremtving konsistenskontrol af mellemlager" -#: src/man.c:316 +#: src/man.c:315 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:318 +#: src/man.c:317 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:319 +#: src/man.c:318 msgid "PAGER" msgstr "TEKSTVISER" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "brug programmet TEKSTVISER til at vise uddata" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "STRENG" # dette er hjælpeteksten til tilvalget -r til ma -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "brug tekstviseren »less« med den angivne prompt" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "vis ASCII-oversættelse af visse latin1-tegn" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "brug ikke orddeling" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "brug ikke justering" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -484,34 +484,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "brug %s til formatsider" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "ENHED" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "brug %s med valgt enhed" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "BROWSER" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "brug %s eller BROWSER til at vise HTML-uddata" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "OPLØSNING" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -519,101 +519,101 @@ msgstr "" "brug groff og vis igennem gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "brug groff og tving den til at producere ditroff" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Ingen manualindgang for %s\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Hvilken manualside vil du have?\n" -#: src/man.c:726 +#: src/man.c:767 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Ingen manualindgang for %s i afsnit %s\n" -#: src/man.c:735 +#: src/man.c:776 #, 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:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ignorerer ukendt forbehandler »%c«" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "kan ikke skifte ejer pÃ¥ %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "kan ikke ændre rettigheder pÃ¥ %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "kan ikke omdøbe %s til %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "kan ikke sætte tider pÃ¥ %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "kan ikke aflænke %s" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "kan ikke oprette midlertidigt katalog for %s" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "kan ikke oprette midlertidig mappe" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "kan ikke Ã¥bne midlertidig fil %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "kan ikke oprette midlertidig mappe" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "kan ikke fjerne kataloget %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "kan ikke skifte katalog til %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -622,27 +622,27 @@ msgstr "" "\n" "kan ikke skrive til %s i tilstanden katalogmanual" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "Kan ikke konvertere %s til katalognavn" -#: src/man.c:3067 +#: src/man.c:3111 #, 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:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb-kommandoen mislykkedes med slutstatus %d" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "intern fejl: kandidattype %d uden for gyldigt interval" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Manualside " @@ -689,53 +689,53 @@ msgstr "inddatakodning skal angives" msgid "must specify an output encoding" msgstr "uddatakodning skal angives" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[MANSTI]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "arbejd stille, undtagen for »bogus-advarsler«" -#: src/mandb.c:110 +#: src/mandb.c:109 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:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "afinstaller ikke forældede punkter fra databaserne" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "producer kun brugerdatabaser" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "opret databaser fra bunden af i stedet for at opdatere" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "kontroller manualsider for korrekthed" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "FILNAVN" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "opdater kun punktet for dette filnavn" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "kan ikke fjerne %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "kan ikke skrive til %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "kan ikke læse fra %s" @@ -877,22 +877,22 @@ msgid "warning: no global manpaths set in config file %s" msgstr "" "advarsel: ingen globale manualsøgestier angivet i konfigurationsfilen %s" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 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:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Undersøger vildfarne katalogsider under %s...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "advarsel: kan ikke opdatere indekscachen %s" @@ -902,61 +902,61 @@ msgstr "advarsel: kan ikke opdatere indekscachen %s" msgid "%s is self referencing" msgstr "%s refererer til sig selv" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "NØGLEORD..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "Tilvalget --regex er aktiveret som standard." -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "vis uddybende advarselsbeskeder" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "fortolk hvert nøgleord som et regulært udtryk" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "søg i hvert nøgleord for nøjagtigt match" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "nøgleordene indeholder jokertegn" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "alle nøgleord skal matche" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "tilpas ikke uddata til terminalbredde" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "søg kun i disse afsnit (kolonadskilt)" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "definer sproget for denne søgning" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s hvad?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "advarsel: %s indeholder en pegerløkke" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(ukendt emne)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: ingenting egnet.\n" diff --git a/po/de.po b/po/de.po index 1c56490..c9f5294 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2012-04-25 21:22-0700\n" "Last-Translator: Arun Persaud \n" "Language-Team: German \n" @@ -70,7 +70,7 @@ msgstr[1] "nur %d Felder im Inhalt enthalten" msgid "bad fetch on multi key %s" msgstr "Suchschlüssel %s kann nicht eingelesen werden" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Datenbank %s beschädigt; mit »mandb --create« neu erstellen" @@ -90,18 +90,18 @@ msgstr "Warnung: %s hat Versionsnummer %s, erwartet wurde %s\n" msgid "fatal: unable to insert version identifier into %s" msgstr "Fatal: Versionsnummer konnte nicht in %s eingefügt werden" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[HANDBUCHDATENBANK]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "Hinweise zur Fehlersuche werden ausgegeben" @@ -114,40 +114,40 @@ msgstr "%s kann nicht zum Lesen geöffnet werden" msgid "[SECTION...]" msgstr "[ABSCHNITT ...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "PFAD" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" msgstr "Suchpfad für Handbuchseiten auf PFAD setzen" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "DATEI" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "diese Benutzerkonfigurationsdatei verwenden" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "Datenbank %s kann nicht gelesen werden" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "Man-Befehl schlug mit Exit-Status %d fehl" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "Datenbank %s kann nicht gelesen werden" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "Inhalt für Suchschlüssel ist NULL: %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -157,12 +157,12 @@ msgstr "" "»cat«-Dateien des Abschnitts %s der Handbuchhierarchie %s werden " "aktualisiert.\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "innerhalb von %s kann nicht geschrieben werden" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "%s kann nicht aktualisiert werden" @@ -172,7 +172,7 @@ msgstr "%s kann nicht aktualisiert werden" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "Warnung: %s/man%s/%s.%s*: konkurrierende Dateierweiterungen" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "Indexcache %s kann nicht aktualisiert werden" @@ -188,42 +188,42 @@ msgstr "" msgid "warning: %s: ignoring empty file" msgstr "Warnung: %s: leere Datei wird ignoriert" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, 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:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "Verzeichnis %s kann nicht durchsucht werden" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "Warnung: »cat«-Verzeichnis %s kann nicht angelegt werden" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "Es konnte nicht ins Verzeichnis %s gewechselt werden" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "Indexcache %s kann nicht erzeugt werden" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "fertig.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Alte Datenbankeinträge in %s werden gelöscht ...\n" @@ -242,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:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "ERWEITERUNG" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "Suche auf Erweiterungstyp ERWEITERUNG beschränken" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 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:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "Nach Seiten unter Beachtung von Groß- und Kleinschreibung suchen" @@ -276,8 +276,8 @@ msgstr[0] "" msgstr[1] "" "Warnung: whatis-Eintrag für %s ist größer als %d Bytes, verkürze ihn." -#: src/lexgrog.l:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -307,15 +307,15 @@ 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:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "KODIERUNG" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "ausgewählte Ausgabekodierung verwenden" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: inkompatible Optionen" @@ -325,150 +325,150 @@ msgstr "%s: inkompatible Optionen" msgid "command exited with status %d: %s" msgstr "Befehl mit Exit-Status %d beendet: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[ABSCHNITT] SEITE ..." -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "Alle Optionen auf ihre Standardwerte zurücksetzen" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "WARNUNGEN" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "groff-Warnungen aktivieren" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Hauptbetriebsmodi:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "Ersatz für »whatis«" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "Ersatz für »apropos«" # (mes) NEU -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "Text in allen Seiten suchen" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "Speicherort der Handbuchseite(n) ausgeben" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "Speicherort der »cat«-Datei(en) ausgeben" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "SEITEN-Argument(e) als lokale(n) Dateinamen interpretieren" -#: src/man.c:296 +#: src/man.c:295 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:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "Quellseiten mit KODIERUNG kodiert ausgeben" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Handbuchseiten finden: " -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "LOCALE" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "Locale für diese spezielle Handbuchsuche definieren" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "SYSTEM" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "Handbuchseiten von anderen Systemen verwenden" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "LISTE" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "kommaseparierte Abschnittsliste verwenden" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "alle mit dem regulären Ausdruck übereinstimmenden Seiten anzeigen" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "alle mit dem Platzhalter übereinstimmenden Seiten anzeigen" -#: src/man.c:311 +#: src/man.c:310 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:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "alle übereinstimmenden Handbuchseiten finden" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "Konsistenzkontrolle des Caches erzwingen" # (mes) neu -#: src/man.c:316 +#: src/man.c:315 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:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "Formatierte Ausgabe kontrollieren:" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "ANZEIGEPROGRAMM" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "ANZEIGEPROGRAMM zur Darstellung der Ausgabe verwenden" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "ZEICHENKETTE" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "das »less«-Anzeigeprogramm mit einer Eingabeaufforderung ausstatten" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "ASCII-Übersetzungen einiger Latin1-Zeichen anzeigen" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "Silbentrennung abschalten" # (mes) Was trifft es: Ausrichtung, Begründung, Blocksatz, Einstellung, # Justierung, Rechtfertigung -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "Blocksatz abschalten" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -478,34 +478,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "%s zur Seitenformatierung verwenden" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "GERÄT" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "%s mit ausgewähltem Gerät verwenden" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "BROWSER" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "%s oder BROWSER zur Anzeige von HTML-Ausgabe verwenden" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "AUFLÖSUNG" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -513,105 +513,105 @@ msgstr "" "»groff« verwenden und mit »gxditview« (X11) anzeigen:\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "»groff« verwenden und ditroff-Ausgabe erzwingen" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Kein Handbucheintrag für %s vorhanden\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Welche Handbuchseiten möchten Sie haben?\n" -#: src/man.c:726 +#: src/man.c:767 #, 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:735 +#: src/man.c:776 #, 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:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "Ignoriere unbekannten Präprozessor »%c«" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "Besitzer und/oder Gruppe von %s können nicht geändert werden" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "Zugriffsrechte von %s können nicht geändert werden" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "%s kann nicht in %s umbenannt werden" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "Es können keine Zeiten für %s gesetzt werden" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "%s kann nicht gelöscht werden" -#: src/man.c:1672 +#: src/man.c:1715 #, 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:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "Temporäres Verzeichnis kann nicht erzeugt werden." -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "Temporäre Datei %s kann nicht geöffnet werden" # (mes) NEU -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "Temporäres Verzeichnis kann nicht erzeugt werden." -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "Verzeichnis %s kann nicht entfernt werden" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "Es kann nicht ins Verzeichnis %s gewechselt werden" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -620,27 +620,27 @@ msgstr "" "\n" "im »catman«-Modus kann nicht nach %s geschrieben werden" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "%s kann nicht in »cat«-Namen umgewandelt werden" -#: src/man.c:3067 +#: src/man.c:3111 #, 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:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "»mandb«-Befehl schlug fehl mit Beendigungs-Status %d" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "interner Fehler: Kandidatentyp %d außerhalb des Bereichs" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Handbuchseite " @@ -687,54 +687,54 @@ msgstr "es muss eine Eingabekodierung angegeben werden" msgid "must specify an output encoding" msgstr "es muss eine Ausgabekodierung angegeben werden" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[HANDBUCHPFAD]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "still arbeiten, mit Ausnahme von »fehlerhaften« Warnungen" -#: src/mandb.c:110 +#: src/mandb.c:109 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:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "keine veralteten Einträge aus den Datenbanken löschen" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "nur Benutzerdatenbanken erzeugen" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "Datenbanken von Grund auf neu generieren, statt sie zu aktualisieren" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "Handbuchseiten auf Korrektheit überprüfen" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "DATEINAME" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "nur den Eintrag für diesen Dateinamen aktualisieren" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "%s kann nicht entfernt werden" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "es kann nicht nach %s geschrieben werden" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "%s kann nicht ausgelesen werden" @@ -878,22 +878,22 @@ msgstr "" "Warnung: Keine globalen Handbuchpfade (MANPATH) in Konfigurationsdatei %s " "gesetzt" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 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:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Handbuchseiten ohne »cat«-Dateien in %s werden gesucht ...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "Warnung: Indexcache %s kann nicht aktualisiert werden" @@ -903,61 +903,61 @@ msgstr "Warnung: Indexcache %s kann nicht aktualisiert werden" msgid "%s is self referencing" msgstr "%s bezieht sich auf sich selbst" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "SCHLÜSSELWORT ..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "Die »--regex«-Option ist standardmäßig aktiviert." -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "ausführliche Warnmeldungen anzeigen" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "jedes Schlüsselwort als RegEx interpretieren" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "mit jedem Schlüsselwort nach exakten Treffern suchen" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "das bzw. die Schlüsselwort(e) enthalten Platzhalter" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "alle Schlüsselwörter müssen übereinstimmen" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "Ausgabe nicht an Terminalbreite anpassen" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "nur diese Abschnitte durchsuchen (durch Doppelpunkte getrennt)" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "Locale für diese Suche definieren" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s was bitte?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "Warnung: %s enthält zyklische Verweise" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(unbekanntes Thema)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nichts passendes.\n" diff --git a/po/eo.po b/po/eo.po index c51035d..1924296 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2013-02-19 13:10-0300\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -64,7 +64,7 @@ msgstr[1] "nur %d kampoj en enhavo" msgid "bad fetch on multi key %s" msgstr "malĝusta havigo per plur-ŝlosilo %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "La datumbazon %s fuŝas; rekonstruu per mandb --create" @@ -84,18 +84,18 @@ msgstr "averto: %s estas versio %s, ni atendas %s\n" msgid "fatal: unable to insert version identifier into %s" msgstr "neripareble: ne eblas enmeti versi-identiganton en %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[MAN-DATUMBAZO]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "sendi rafinigajn mesaĝojn" @@ -108,40 +108,40 @@ msgstr "ne eblas malfermi %s por legi" msgid "[SECTION...]" msgstr "[SEKCIO...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "VOJO" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 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:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "DOSIERO" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "uzi tiun ĉi uzant-agorda dosiero" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "ne eblas legi la datumbazon %s" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "komando man fiaskis kun elir-stato %d" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "ne eblas legi la datumbazon %s" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "Enhavo NULL por ŝlosilo: %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -150,12 +150,12 @@ msgstr "" "\n" "Ĝisdatigo de cat-dosieroj por sekcio %s de man-hierarkio %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "ne eblas skribi ene de %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "Ne eblas ĝisdatigi %s" @@ -165,7 +165,7 @@ msgstr "Ne eblas ĝisdatigi %s" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "averto: %s/man%s/%s.%s*: konkurantaj sufiksoj" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "ne eblas ĝisdatigi la indeksan kaŝmemoron %s" @@ -180,42 +180,42 @@ msgstr "averto: %s: malĝusta symlink aÅ­ peto de ROFF '.so'" msgid "warning: %s: ignoring empty file" msgstr "averto: %s: ni preteratentas malplenan dosieron" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, 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:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 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:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "averto: ne eblas krei la catdir %s" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "ne eblas ŝanĝi al la dosierujo %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "ne eblas krei la indeksan kaŝmemoron %s" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "farite.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Viŝo de malnovaj datumbazaj enigoj en %s...\n" @@ -234,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:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "SUFIKSO" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "limigi serĉon al la sufiksa tipo SUFIKSO" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "serĉi paĝojn sen-usklece (aprioras)" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "serĉi paĝojn usklece" @@ -265,8 +265,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -296,15 +296,15 @@ 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:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "ENKODIGO" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "uzi la elektitan eligan enkodigon" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: nekongruaj modifiloj" @@ -314,144 +314,144 @@ msgstr "%s: nekongruaj modifiloj" msgid "command exited with status %d: %s" msgstr "komando ĉesis kun stato %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[SEKCIO] PAĜO..." -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "redifini ĉiujn modifilojn al iliaj aprioraj valoroj" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "AVERTOJ" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "ebligi avertojn el groff" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Ĉefaj reĝimoj de operacio:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "samfunkcia al whatis" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "samfunkcia al apropos" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "serĉi tekston en ĉiuj paĝoj" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "montri fizikan lokon de man-paĝo(j)" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "montri fizikan lokon de cat-dosiero(j)n" -#: src/man.c:295 +#: src/man.c:294 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:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "uzata de catman por restrukturigi malaktualajn cat-paĝojn" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "eligi font-paĝon enkoditan laÅ­ ENKODIGO" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Trovo de manlibraj paĝoj:" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "LOKAÄ´ARO" -#: src/man.c:300 +#: src/man.c:299 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:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "SISTEMO" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "uzi manlibrajn paĝojn el aliaj sistemoj" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "LISTO" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "uzi dupunkto-apartitan sekcio-liston" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "montri ĉiujn paĝojn kongruajn al regulesprimo" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "montri ĉiujn paĝojn kongruajn al ĵokero" -#: src/man.c:311 +#: src/man.c:310 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:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "trovi ĉiujn kongruajn manlibrajn paĝojn" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "devigi kontrolon pri kaŝmemora kohero" -#: src/man.c:316 +#: src/man.c:315 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:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "Regado de strukturita eligo:" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "PAĜILO" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "uzi la programon PAĜILO por montri eligon" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "ĈENO" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "provizi komandinviton al la paĝilo 'less'" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "montri mapigon ASCII por kelkaj signoj latin1" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "malaktivigi vorto-dividon" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "malaktivigi ĝisrandigon" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -461,34 +461,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "uzi %s por strukturigi paĝojn" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "APARATO" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "uzi %s kun elektita aparato" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "FOLIUMILO" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "uzi %s aÅ­ FOLIUMILO por montri eligon HTML" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "DISTINGIVO" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -496,101 +496,101 @@ msgstr "" "uzi groff kaj montri per gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "uzi groff kaj devigi ĝin produkti ditroff" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Neniu manlibra elemento por %s\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Kiun manlibran paĝon vi volas?\n" -#: src/man.c:726 +#: src/man.c:767 #, 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:735 +#: src/man.c:776 #, 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:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ni preteratentas nekonatan antaÅ­procezilon '%c'" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "ne eblas apliki chown %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "ne eblas apliki chmod %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "ne eblas renomigi %s al %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "ne eblas difini horon en %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "ne eblas forigi %s" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "ne eblas krei provizoran cat por %s" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "ne eblas krei provizoran dosierujon" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "ne eblas malfermi la provizoran dosieron %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "ne eblas krei provizoran dosierujon" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "ne eblas forigi la dosierujon %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "ne eblas apliki chdir al %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -599,27 +599,27 @@ msgstr "" "\n" "ne eblas skribi al %s sub reĝimo catman" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "Ne eblas konverti %s al cat-nomo" -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: fini je whatis refs estas malrekomendinde\n" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "komando mandb fiaskis kun elir-stato %d" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "interna eraro: kanditata tipo %d estas for de intervalo" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Manlibra paĝo " @@ -666,53 +666,53 @@ msgstr "devas indiki enigan enkodigon" msgid "must specify an output encoding" msgstr "devas indiki eligan enkodigon" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[MAN-VOJO]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "labori kviete, krom por averto pri 'aĉeco'" -#: src/mandb.c:110 +#: src/mandb.c:109 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:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "ne forpurigi malaktualajn elementojn el la dbs" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "produkti nur datumbazojn de uzantoj" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "krei datumbazon elkomence, prefere ol ĝisdatigante" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "kontroli korektecon de manlibraj paĝoj" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "DOSIERNOMO" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "ĝisdatigi nur la elementon por tiu ĉi dosiernomo" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "ne eblas forigi %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "ne eblas skribi al %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "ne eblas legi el %s" @@ -853,22 +853,22 @@ 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:246 src/ult_src.c:124 +#: src/straycats.c:247 src/ult_src.c:124 #, c-format msgid "warning: %s is a dangling symlink" msgstr "averto: %s estas sentrafa simbol-ligilo" -#: src/straycats.c:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Kontrolo pri perditaj cat sub %s...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "averto: ne eblas ĝisdatigi la indeksan kaŝmemoron %s" @@ -878,61 +878,61 @@ msgstr "averto: ne eblas ĝisdatigi la indeksan kaŝmemoron %s" msgid "%s is self referencing" msgstr "%s estas mem-referenca" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "ŜLOSILVORTO..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "La modifilo --regex estas ebligita apriore." -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "montri detaligajn avertajn mesaĝojn" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "interpreti ĉiun ŝlosilvorton kiel regulesprimon" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "serĉi ĉiun ŝlosilvorton por entuta kongruo" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "la ŝlosilvorto(j) enhavas ĵokerojn" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "postuli ke ĉiuj ŝlosilvortoj kongruu" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "ne adapti eligon al la terminala larĝo" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "serĉi nur tiujn ĉi sekciojn (dupunkt-apartite)" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "difini la lokaĵaron por tiu ĉi serĉo" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s kio?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "averto: %s enhavas adresmontrilan ciklon" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(nekonata temo)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nenio taÅ­ga.\n" diff --git a/po/es.po b/po/es.po index 2819c0e..a553b43 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2002-07-03 21:52+0200\n" "Last-Translator: David Martínez \n" "Language-Team: debian-l10n-spanish@lists.debian.org\n" @@ -62,7 +62,7 @@ msgstr[1] "s msgid "bad fetch on multi key %s" msgstr "no se ha encontrado la clave múltiple %s." -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Base de datos %s corrompida; reconstrúyala con mandb --create." @@ -82,18 +82,18 @@ msgstr "aviso: %s tiene la versi msgid "fatal: unable to insert version identifier into %s" msgstr "error grave: no se puede insertar identificador de versión en %s." -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "" @@ -106,41 +106,41 @@ msgstr "no se puede abrir %s para leer." msgid "[SECTION...]" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 #, fuzzy msgid "use this user configuration file" msgstr "no se puede abrir el fichero de configuración de rutas de man %s." -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "no se puede leer la base de datos %s." - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "la orden man falló con código de salida %d." -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "no se puede leer la base de datos %s." + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "contenido NULL para la clave: %s." -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -149,12 +149,12 @@ msgstr "" "\n" "Actualizando los ficheros cat para la sección %s de la jerarquía de man %s.\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "no se puede escribir en %s." -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "no se puede actualizar %s." @@ -164,7 +164,7 @@ msgstr "no se puede actualizar %s." msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "aviso: %s/man%s/%s.%s*: extensiones en conflicto." -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "no se puede actualizar el caché de índices %s." @@ -179,42 +179,42 @@ msgstr "aviso: %s: enlace simb msgid "warning: %s: ignoring empty file" msgstr "aviso: %s: ignorando fichero vacío." -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "aviso: %s: falló la exploración de whatis para %s(%s)." -#: src/check_mandirs.c:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 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:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "aviso: no se pudo crear directorio para «cat» %s." -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "no se puede entrar en el directorio %s." -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "no se puede crear el caché de índices %s." -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "listo.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Purgando entradas antiguas en la base de datos en %s...\n" @@ -233,19 +233,19 @@ msgstr "aviso: %s: ignorando nombre espurio de fichero." msgid "PATH SECTION NAME" msgstr "" -#: src/globbing_test.c:59 src/man.c:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "" @@ -264,8 +264,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -295,15 +295,15 @@ msgstr "" msgid "show guessed series of preprocessing filters" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, fuzzy, c-format msgid "%s: incompatible options" msgstr ": opciones incompatibles." @@ -313,178 +313,178 @@ msgstr ": opciones incompatibles." msgid "command exited with status %d: %s" msgstr "la orden terminó y devolvió %d: %s." -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "" -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "" -#: src/man.c:299 +#: src/man.c:298 #, fuzzy msgid "Finding manual pages:" msgstr "Página de manual " -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "" -#: src/man.c:311 +#: src/man.c:310 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" -#: src/man.c:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "" -#: src/man.c:316 +#: src/man.c:315 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" -#: src/man.c:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "" -#: src/man.c:329 +#: src/man.c:328 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:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "" -#: src/man.c:340 +#: src/man.c:339 #, fuzzy msgid "" "use groff and display through gxditview (X11):\n" @@ -492,102 +492,102 @@ msgid "" msgstr "" " -X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12." -#: src/man.c:342 +#: src/man.c:341 #, fuzzy msgid "use groff and force it to produce ditroff" msgstr "-Z, --ditroff usa groff y lo fuerza a generar ditroff." -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, fuzzy, c-format msgid "No manual entry for %s\n" msgstr "No existe entrada de manual para %s" -#: src/man.c:607 +#: src/man.c:606 #, fuzzy, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "¿Qué página de manual de la sección %s desea?\n" -#: src/man.c:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "¿Qué página de manual desea?\n" -#: src/man.c:726 +#: src/man.c:767 #, fuzzy, c-format msgid "No manual entry for %s in section %s\n" msgstr "No existe entrada de manual para %s" -#: src/man.c:735 +#: src/man.c:776 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" -#: src/man.c:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "se ignora el preprocesador desconocido `%c'." -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "no se puede realizar el chown %s." -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "no se puede realizar el chmod %s." -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "no se puede cambiar el nombre %s a %s." -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "no se puede cambiar la fecha de %s." -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "no se puede eliminar %s." -#: src/man.c:1672 +#: src/man.c:1715 #, fuzzy, c-format msgid "can't create temporary cat for %s" msgstr "no se puede crear un nombre de fichero temporal." -#: src/man.c:1784 +#: src/man.c:1827 #, fuzzy, c-format msgid "can't create temporary directory" msgstr "no se puede crear un nombre de fichero temporal." -#: src/man.c:1796 +#: src/man.c:1839 #, fuzzy, c-format msgid "can't open temporary file %s" msgstr "no se puede abrir el fichero de configuración de rutas de man %s." -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "no se puede crear un nombre de fichero temporal." -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "no se puede borrar el directorio %s." -#: src/man.c:1980 +#: src/man.c:2023 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- próxima: %s [ ver (return) | siguiente (Ctrl-D) | salir (Ctrl-C) ]\n" -#: src/man.c:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "no se puede cambiar al directorio %s." -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -596,27 +596,27 @@ msgstr "" "\n" "no se puede escribir en %s en modo catman." -#: src/man.c:2343 +#: src/man.c:2386 #, 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:3067 +#: src/man.c:3111 #, 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:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, fuzzy, c-format msgid "mandb command failed with exit status %d" msgstr "la orden man falló con código de salida %d." -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr "Página de manual " @@ -663,53 +663,53 @@ msgstr "" msgid "must specify an output encoding" msgstr "" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "no se puede borrar %s." -#: src/mandb.c:272 +#: src/mandb.c:271 #, fuzzy, c-format msgid "can't write to %s" msgstr "no se puede escribir en %s." -#: src/mandb.c:277 +#: src/mandb.c:276 #, fuzzy, c-format msgid "can't read from %s" msgstr "no se puede crear %s." @@ -858,22 +858,22 @@ msgstr "" "aviso: no se han asignado rutas man globales en el fichero de configuración" "%s." -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 src/ult_src.c:124 #, c-format msgid "warning: %s is a dangling symlink" msgstr "aviso: %s es un enlace simbólico cuyo destino no existe." -#: src/straycats.c:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Controlando si hay páginas cat sin fuentes bajo %s...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "aviso: no se pudo actualizar el caché de índices %s." @@ -883,62 +883,62 @@ msgstr "aviso: no se pudo actualizar el cach msgid "%s is self referencing" msgstr "%s se referencia a sí mismo." -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "" -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "" -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s ¿qué?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "aviso: %s contiene un bucle de punteros." -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 #, fuzzy msgid "(unknown subject)" msgstr "(desconocido)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nada apropiado.\n" diff --git a/po/fi.po b/po/fi.po index 3a8f9ad..87b3a9c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,20 +1,22 @@ # Finnish translation of man-db. -# Copyright © 2004 Free Software Foundation, Inc. +# Copyright © 2015 Colin Watson (msgids) # This file is distributed under the same license as the man-db package. -# Lauri Nurmi , 2003, 2004. +# Lauri Nurmi , 2003, 2004, 2015. # msgid "" msgstr "" -"Project-Id-Version: man-db 2.4.2-pre1\n" +"Project-Id-Version: man-db 2.7.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" -"PO-Revision-Date: 2004-01-25 15:07+0200\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" +"PO-Revision-Date: 2015-07-28 21:52+0300\n" "Last-Translator: Lauri Nurmi \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.3\n" #: lib/security.c:74 #, c-format @@ -63,7 +65,7 @@ msgstr[1] "" msgid "bad fetch on multi key %s" msgstr "" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "" @@ -84,18 +86,18 @@ msgstr "" msgid "fatal: unable to insert version identifier into %s" msgstr "" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "" @@ -106,55 +108,55 @@ msgstr "" #: src/catman.c:95 msgid "[SECTION...]" -msgstr "" +msgstr "[OSIO...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" -msgstr "" +msgstr "POLKU" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" -msgstr "" +msgstr "aseta opastesivujen hakupoluksi POLKU" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" -msgstr "" +msgstr "TIEDOSTO" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 #, fuzzy msgid "use this user configuration file" msgstr "opastepolkujen asetustiedostoa %s ei voi avata" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "tietokantaa %s ei voi lukea" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "tietokantaa %s ei voi lukea" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" "Updating cat files for section %s of man hierarchy %s\n" msgstr "" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "" @@ -164,7 +166,7 @@ msgstr "" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "" @@ -179,42 +181,42 @@ msgstr "" msgid "warning: %s: ignoring empty file" msgstr "varoitus: %s: ei huomioida tyhjää tiedostoa" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "" -#: src/check_mandirs.c:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "" -#: src/check_mandirs.c:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "valmis.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "" @@ -233,19 +235,19 @@ msgstr "" msgid "PATH SECTION NAME" msgstr "" -#: src/globbing_test.c:59 src/man.c:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "" @@ -255,7 +257,7 @@ msgstr "" #: src/globbing_test.c:63 msgid "the page name contains wildcards" -msgstr "" +msgstr "sivun nimi sisältää jokerimerkkejä" #: src/lexgrog.l:665 #, c-format @@ -264,8 +266,8 @@ msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "" msgstr[1] "" -#: src/lexgrog.l:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -273,7 +275,7 @@ msgstr "" #: src/lexgrog_test.c:64 src/zsoelim_main.c:63 msgid "FILE..." -msgstr "" +msgstr "TIEDOSTO..." #: src/lexgrog_test.c:65 msgid "The defaults are --man and --whatis." @@ -281,29 +283,29 @@ msgstr "" #: src/lexgrog_test.c:69 msgid "parse as man page" -msgstr "" +msgstr "jäsennä man-sivuna" #: src/lexgrog_test.c:70 msgid "parse as cat page" -msgstr "" +msgstr "jäsennä cat-sivuna" #: src/lexgrog_test.c:71 msgid "show whatis information" -msgstr "" +msgstr "näytä whatis-tiedot" #: src/lexgrog_test.c:72 msgid "show guessed series of preprocessing filters" -msgstr "" +msgstr "näytä arvattu sarja esikäsittelysuotimia" -#: src/lexgrog_test.c:73 src/man.c:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" -msgstr "" +msgstr "MERKISTÖ" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" -msgstr "" +msgstr "käytä valittua tulosteen merkistöä" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, fuzzy, c-format msgid "%s: incompatible options" msgstr ": epäyhteensopivat valitsimet" @@ -313,304 +315,304 @@ msgstr ": epäyhteensopivat valitsimet" msgid "command exited with status %d: %s" msgstr "" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." -msgstr "" +msgstr "[OSIO] SIVU..." -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" -msgstr "" +msgstr "palauta kaikki valitsimet oletusarvoihinsa" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" -msgstr "" +msgstr "VAROITUKSET" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" -msgstr "" +msgstr "Päätoimintatilat:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" -msgstr "" +msgstr "whatis-vastine" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" -msgstr "" +msgstr "apropos-vastine" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" -msgstr "" +msgstr "etsi tekstiä kaikilta sivuilta" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" -msgstr "" +msgstr "näytä opastesivu(je)n fyysinen sijainti" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" -msgstr "" +msgstr "näytä cat-sivu(je)n fyysinen sijainti" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" -msgstr "" +msgstr "tulkitse SIVU-argumentti paikallisena tiedostonimenä" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "" -#: src/man.c:299 +#: src/man.c:298 #, fuzzy msgid "Finding manual pages:" msgstr " Opastesivu " -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" -msgstr "" +msgstr "JÄRJESTELMÄ" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "" -#: src/man.c:311 +#: src/man.c:310 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" -#: src/man.c:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "" -#: src/man.c:316 +#: src/man.c:315 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" -#: src/man.c:318 +#: src/man.c:317 msgid "Controlling formatted output:" -msgstr "" +msgstr "Muotoillun tulosteen hallinta:" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" -msgstr "" +msgstr "MERKKIJONO" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "" -#: src/man.c:329 +#: src/man.c:328 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:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" -msgstr "" +msgstr "LAITE" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" -msgstr "" +msgstr "SELAIN" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" -msgstr "" +msgstr "RESOLUUTIO" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" msgstr "" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "" -#: src/man.c:605 src/man.c:729 -#, c-format +#: src/man.c:604 src/man.c:770 +#, fuzzy, c-format msgid "No manual entry for %s\n" -msgstr "Manuaalisivua %s ei ole\n" +msgstr "Sovellukselle %s ei ole opastesivua" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Minkä opastesivun haluat?\n" -#: src/man.c:726 +#: src/man.c:767 #, fuzzy, c-format msgid "No manual entry for %s in section %s\n" -msgstr "Manuaalisivua %s ei ole\n" +msgstr "Sovellukselle %s ei ole opastesivua" -#: src/man.c:735 +#: src/man.c:776 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" -#: src/man.c:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ei huomioida tuntematonta esikäsittelintä \"%c\"" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "" -#: src/man.c:1672 +#: src/man.c:1715 #, fuzzy, c-format msgid "can't create temporary cat for %s" msgstr "varoitus: väliaikaistiedostoa %s ei voi luoda" -#: src/man.c:1784 +#: src/man.c:1827 #, fuzzy, c-format msgid "can't create temporary directory" -msgstr "varoitus: väliaikaistiedostoa %s ei voi luoda" +msgstr "nykyistä hakemistoa ei voi määrittää" -#: src/man.c:1796 +#: src/man.c:1839 #, fuzzy, c-format msgid "can't open temporary file %s" msgstr "opastepolkujen asetustiedostoa %s ei voi avata" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" -msgstr "varoitus: väliaikaistiedostoa %s ei voi luoda" +msgstr "nykyistä hakemistoa ei voi määrittää" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "" -#: src/man.c:1980 +#: src/man.c:2023 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" -#: src/man.c:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" "cannot write to %s in catman mode" msgstr "" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "" -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb-komento epäonnistui paluuarvolla %d" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Opastesivu " @@ -621,7 +623,7 @@ msgstr "tiedostoon %s ei voi kirjoittaa" #: src/manconv.c:279 msgid "iconv: incomplete character at end of buffer" -msgstr "" +msgstr "iconv: epätäydellinen merkki puskurin lopussa" #: src/manconv_main.c:88 msgid "-f CODE[:...] -t CODE [FILENAME]" @@ -633,7 +635,7 @@ msgstr "" #: src/manconv_main.c:92 msgid "possible encodings of original text" -msgstr "" +msgstr "alkuperäisen tekstin mahdolliset merkistöt" #: src/manconv_main.c:93 msgid "CODE" @@ -641,69 +643,69 @@ msgstr "" #: src/manconv_main.c:93 msgid "encoding for output" -msgstr "" +msgstr "tulosteen merkistö" #: src/manconv_main.c:95 src/manpath.c:66 msgid "produce fewer warnings" -msgstr "" +msgstr "tuota vähemmän varoituksia" #: src/manconv_main.c:130 src/manconv_main.c:139 #, c-format msgid "must specify an input encoding" -msgstr "" +msgstr "syötteen merkistö on annettava" #: src/manconv_main.c:134 #, c-format msgid "must specify an output encoding" -msgstr "" +msgstr "tulosteen merkistö on annettava" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" -msgstr "" +msgstr "TIEDOSTONIMI" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "tiedostoa %s ei voi poistaa" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "tiedostoon %s ei voi kirjoittaa" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "tiedostosta %s ei voi lukea" @@ -711,12 +713,12 @@ msgstr "tiedostosta %s ei voi lukea" #: src/mandb.c:454 #, c-format msgid "Processing manual pages under %s...\n" -msgstr "" +msgstr "Käsitellään opastesivuja hakemistossa %s...\n" #: src/mandb.c:648 src/mandb.c:674 #, c-format msgid "Removing obsolete cat directory %s...\n" -msgstr "" +msgstr "Poistetaan vanhentunut cat-hakemisto %s...\n" #: src/mandb.c:830 #, c-format @@ -727,8 +729,8 @@ msgstr "" #, 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] "" +msgstr[0] "%d man-alihakemisto sisälsi uudempia opastesivuja.\n" +msgstr[1] "%d man-alihakemistoa sisälsi uudempia opastesivuja.\n" #: src/mandb.c:907 #, fuzzy, c-format @@ -752,9 +754,9 @@ msgstr[0] "%d vanhaa tietokantamerkintää poistettiin.\n" msgstr[1] "%d vanhaa tietokantamerkintää poistettiin.\n" #: src/mandb.c:934 -#, fuzzy, c-format +#, c-format msgid "No databases created." -msgstr "Tietokantoja ei päivitetty." +msgstr "Tietokantoja ei luotu." #: src/manp.c:331 #, c-format @@ -792,7 +794,7 @@ msgid "warning: $MANPATH set, prepending %s" msgstr "" #: src/manp.c:725 -#, fuzzy, c-format +#, c-format msgid "warning: $MANPATH set, appending %s" msgstr "varoitus: $MANPATH asetettu, lisätään loppuun %s" @@ -846,22 +848,22 @@ msgstr "" "varoitus: asetustiedostossa %s ei ole asetettu järjestelmänlaajuisia " "opastepolkuja" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 src/ult_src.c:124 #, c-format msgid "warning: %s is a dangling symlink" msgstr "varoitus: %s on rikkinäinen symlinkki" -#: src/straycats.c:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 src/ult_src.c:127 src/ult_src.c:287 #, c-format msgid "can't resolve %s" msgstr "" -#: src/straycats.c:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "" @@ -871,61 +873,61 @@ msgstr "" msgid "%s is self referencing" msgstr "%s viittaa itseensä" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." -msgstr "" +msgstr "AVAINSANA..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "" -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" -msgstr "" +msgstr "avainsana(t) sisältävät jokerimerkkejä" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" -msgstr "" +msgstr "älä katkaise tulostetta päätteen leveyteen" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s mikä?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "varoitus: %s sisältää osoitinsilmukan" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(tuntematon aihe)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: ei mitään sopivaa.\n" @@ -962,48 +964,46 @@ msgstr "" #: src/zsoelim_main.c:67 msgid "compatibility switch (ignored)" -msgstr "" +msgstr "yhteensopivuusvalitsin (jätetään huomiotta)" # Kannattaako näihin jättää alkuperäinen funktion nimi vai yrittää selittää # mitä oikeasti tarkoitetaan? "haarauttaminen epäonnistui" #~ msgid "fork failed" #~ msgstr "fork epäonnistui" -#~ msgid "waitpid failed" -#~ msgstr "waitpid epäonnistui" - -#, fuzzy -#~ msgid "%s: %s" -#~ msgstr "%s: %s%s" - #~ msgid "dup2 failed" #~ msgstr "dup2 epäonnistui" #~ msgid "close failed" #~ msgstr "close epäonnistui" -#, fuzzy -#~ msgid "can't create index cache directory %s" -#~ msgstr "nykyistä hakemistoa ei voi määrittää" +#~ msgid "%s: %s%s" +#~ msgstr "%s: %s%s" -#~ msgid "-m -c: incompatible options" -#~ msgstr "-m -c: epäyhteensopivat valitsimet" +#~ msgid "waitpid failed" +#~ msgstr "waitpid epäonnistui" -#, fuzzy -#~ msgid "usage: %s [-hV] [man database]\n" +#~ msgid "usage: %s [-hV] [man_database]\n" #~ msgstr "käyttö: %s [-hV] [opastetietokanta]\n" #~ msgid "usage: %s [-dhV] [-C file] [-M manpath] [section] ...\n" #~ msgstr "käyttö: %s [-dhV] [-C tiedosto] [-M opastepolku] [osio]...\n" -#, fuzzy -#~ msgid "usage: %s [-deiIhV] path section name\n" -#~ msgstr "käyttö: %s [-dhV] [-C tiedosto] [-M opastepolku] [osio]...\n" - -#, fuzzy -#~ msgid "usage: %s [-mcwfhV] [-E encoding] file ...\n" +#~ msgid "usage: %s [-mcwfhV] file ...\n" #~ msgstr "käyttö: %s [-mcwfhV] tiedosto ...\n" +#~ msgid "-m -c: incompatible options" +#~ msgstr "-m -c: epäyhteensopivat valitsimet" + +#~ msgid "error trying to read from stdin" +#~ msgstr "virhe yritettäessä lukea vakiosyötteestä" + +#~ msgid "error writing to temporary file %s" +#~ msgstr "virhe kirjoitettaessa väliaikaistiedostoon %s" + +#~ msgid "Reformatting %s, please wait...\n" +#~ msgstr "Uudelleenmuotoillaan sivu %s, odota...\n" + #~ msgid "usage: %s [-dqspuct|-h|-V] [-C file] [-f filename] [manpath]\n" #~ msgstr "" #~ "käyttö: %s [-dqspuct|-h|-V] [-C tiedosto] [-f tiedostonimi] " @@ -1015,34 +1015,13 @@ msgstr "" #~ msgid "%s, version %s, %s\n" #~ msgstr "%s, versio %s, %s\n" -#, fuzzy -#~ msgid "" -#~ "usage: %s [-dalhV] [-r|-w|-e] [-s section] [-m systems] [-M manpath]\n" -#~ " [-L locale] [-C file] keyword ...\n" -#~ msgstr "" -#~ "käyttö: %s [-dhV] [-r|-w|-e] [-m järjestelmät] [-M opastepolku] [-C " -#~ "tiedosto] avainsana ...\n" - -#, fuzzy #~ msgid "" -#~ "usage: %s [-dlhV] [-r|-w] [-s section] [-m systems] [-M manpath]\n" -#~ " [-L locale] [-C file] keyword ...\n" +#~ "usage: %s [-dhV] [-r|-w|-e] [-m systems] [-M manpath] [-C file] " +#~ "keyword ...\n" #~ msgstr "" #~ "käyttö: %s [-dhV] [-r|-w|-e] [-m järjestelmät] [-M opastepolku] [-C " #~ "tiedosto] avainsana ...\n" -#~ msgid "error trying to read from stdin" -#~ msgstr "virhe yritettäessä lukea vakiosyötteestä" - -#~ msgid "error writing to temporary file %s" -#~ msgstr "virhe kirjoitettaessa väliaikaistiedostoon %s" - -#~ msgid "warning: can't create temp file %s" -#~ msgstr "varoitus: väliaikaistiedostoa %s ei voi luoda" - -#~ msgid "Reformatting %s, please wait...\n" -#~ msgstr "Uudelleenmuotoillaan sivu %s, odota...\n" - #~ msgid "" #~ "usage: %s [-dhV] [-r|-w] [-m systems] [-M manpath] [-C file] keyword ...\n" #~ msgstr "" diff --git a/po/fr.po b/po/fr.po index 5909a2d..35e573a 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2012-02-06 14:43-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" @@ -66,7 +66,7 @@ msgstr[1] "il n'y a que %d champs dans le contenu" msgid "bad fetch on multi key %s" msgstr "mauvais accès sur la clef multiple %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "La base %s est corrompue, reconstruisez-la avec mandb --create" @@ -86,18 +86,18 @@ msgstr "attention : %s a pour version %s au lieu de %s\n" msgid "fatal: unable to insert version identifier into %s" msgstr "erreur fatale : impossible d'insérer l'identifiant de version dans %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[BASE DE DONNÉES DE MAN]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "affichage des messages de débogage" @@ -110,40 +110,40 @@ msgstr "impossible d'ouvrir %s en lecture" msgid "[SECTION...]" msgstr "[SECTION...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "CHEMIN" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 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:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "FICHIER" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "utilise ce fichier de configuration utilisateur" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "impossible de lire la base de données %s" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "la commande man a échoué avec %d comme code de retour" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "impossible de lire la base de données %s" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "contenu vide (NULL) pour la clef : %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -152,12 +152,12 @@ msgstr "" "\n" "Mise à jour des fichiers préformatés pour la section %s de %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "impossible d'écrire dans %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "impossible de mettre %s à jour" @@ -167,7 +167,7 @@ msgstr "impossible de mettre %s à jour" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "attention : %s/man%s/%s.%s* : extensions en conflit" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "impossible de mettre à jour le cache d'index %s" @@ -182,42 +182,42 @@ msgstr "attention : %s : lien symbolique ou directive ROFF « .so » incorre msgid "warning: %s: ignoring empty file" msgstr "attention : %s : fichier vide ignoré" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, 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:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 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:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, 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:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "impossible d'aller dans le répertoire %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "impossible de créer le cache d'index %s" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "terminé.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Effacement des entrées inutiles de %s en cours…\n" @@ -236,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:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "EXTENSION" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "limite la recherche aux extensions EXTENSION" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 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:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "recherche les pages en distinguant la casse" @@ -267,8 +267,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -298,15 +298,15 @@ 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:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "ENCODAGE" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "utilise l'encodage d'affichage choisi" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s : options incompatibles" @@ -316,147 +316,147 @@ msgstr "%s : options incompatibles" msgid "command exited with status %d: %s" msgstr "commande terminée avec %d comme code de retour : %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[SECTION] PAGE..." -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "réinitialise les valeurs par défaut des options" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "AVERTISSEMENTS" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "active les avertissements de groff" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Modes opératoires principaux :" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "équivalent à whatis" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "équivalent à apropos" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "recherche le texte dans toutes les pages" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "affiche l'emplacement des pages du manuel" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "affiche l'emplacement des fichiers « cat »" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interprète l'argument PAGE comme un nom de fichier" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "utilisé par catman pour reformater les pages trop vieilles" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "affiche le code source converti en ENCODAGE" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Recherche des pages de manuel :" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "LOCALE" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "définit la locale pour cette recherche de manuel" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "SYSTÈME" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "utilise les pages de manuel d'autres systèmes" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "LISTE" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "utilise la liste des sections séparées par des deux-points" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "montre toutes les pages correspondant à l'expression rationnelle" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "montre toutes les pages correspondant au caractère joker" -#: src/man.c:311 +#: src/man.c:310 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:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "trouve toutes les pages correspondantes" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "force une vérification de cohérence du cache" -#: src/man.c:316 +#: src/man.c:315 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:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "Contrôle du format d'affichage :" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "AFFICHEUR" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "utilise de programme AFFICHEUR pour l'affichage" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "CHAÎNE" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "donne une chaîne d'invite à « less »" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "affiche un équivalent ASCII de certains caractères latin1" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "désactive la césure" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "désactive la justification" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -466,34 +466,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "utilise %s pour formater les pages" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "PÉRIPHÉRIQUE" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "utilise %s avec le périphérique sélectionné" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "NAVIGATEUR" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "utilise %s ou NAVIGATEUR pour l'affichage HTML" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "RÉSOLUTION" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -501,104 +501,104 @@ msgstr "" "utilise groff et affiche avec gditview (X11) :\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "utilise groff en le forçant à produire ditroff" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Aucune entrée de manuel pour %s\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Quelle page de manuel voulez-vous ?\n" -#: src/man.c:726 +#: src/man.c:767 #, 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:735 +#: src/man.c:776 #, 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:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "le préprocesseur « %c » est inconnu et ignoré" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "impossible de changer le propriétaire de %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "impossible de changer les droits de %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "impossible de renommer %s en %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "impossible de changer la date de %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "impossible de supprimer %s" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "impossible de créer une page « cat » temporaire pour %s" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "impossible de créer le répertoire temporaire" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "impossible d'ouvrir le fichier temporaire %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "impossible de créer le répertoire temporaire" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "impossible de supprimer le répertoire %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "impossible d'aller dans le répertoire %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -607,28 +607,28 @@ msgstr "" "\n" "impossible d'écrire vers %s en mode catman" -#: src/man.c:2343 +#: src/man.c:2386 #, 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:3067 +#: src/man.c:3111 #, 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:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, 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:3420 +#: src/man.c:3466 #, 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:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Page de manuel " @@ -675,53 +675,53 @@ 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:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[MANPATH]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "n'affiche rien à part les avertissement de dysfonctionnement" -#: src/mandb.c:110 +#: src/mandb.c:109 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:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "ne supprime pas les entrées obsolètes de la base" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "produit seulement les bases utilisateur" -#: src/mandb.c:113 +#: src/mandb.c:112 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:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "vérifie la validité des pages de manuel" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "NOM_DE_FICHIER" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "met seulement à jour l'entrée correspondant à ce nom de fichier" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "impossible de supprimer %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "impossible d'écrire dans %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "impossible de lire à partir de %s" @@ -868,22 +868,22 @@ msgstr "" "attention : aucun chemin de pages de manuel dans le fichier de configuration " "%s" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 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:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, 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:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "attention : impossible de mettre à jour le cache d'index %s" @@ -893,61 +893,61 @@ msgstr "attention : impossible de mettre à jour le cache d'index %s" msgid "%s is self referencing" msgstr "%s s'auto-référence" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "MOT-CLEF..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "L'option --regex est activée par défaut. " -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "affiche des messages d'avertissement étendus" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "interprète chaque mot-clef comme une expression régulière" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "recherche une correspondance exacte de chaque mot-clef" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "les mots-clefs contiennent des jokers" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "tous les mots-clefs doivent correspondre" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "ne réduit pas l'affichage à la largeur du terminal" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "recherche limitée à ces sections (séparées par des deux-points)" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "définit la locale pour cette recherche" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s comment ?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "attention : %s contient une référence circulaire" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(sujet inconnu)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s : rien d'adéquat\n" diff --git a/po/id.po b/po/id.po index 30b91f9..107b1d1 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2014-08-10 19:00+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -64,7 +64,7 @@ msgstr[1] "hanya bagian %d ada dalam isi" msgid "bad fetch on multi key %s" msgstr "pengambilan buruk di multi kunci %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Basis data %s terkorupsi; membuat kembali dengan mandb --create" @@ -84,18 +84,18 @@ msgstr "peringatan: %s memiliki versi %s, diduga %s\n" msgid "fatal: unable to insert version identifier into %s" msgstr "fatal: tidak dapat memasukan pengidentifikasi versi kedalam %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[BASIS DATA MAN]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "keluarkan pesan penelusuran" @@ -108,40 +108,40 @@ msgstr "tidak dapat membuka %s untuk pembacaan" msgid "[SECTION...]" msgstr "[BAGIAN...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "JALUR" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 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:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "BERKAS" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "gunakan berkas konfigurasi pengguna ini" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "tidak dapat membaca basis data %s" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "perintah man gagal dengan status keluar %d" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "tidak dapat membaca basis data %s" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "isi KOSONG untuk kunci: %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -150,12 +150,12 @@ msgstr "" "\n" "Memperbarui berkas cat untuk bagian %s dari struktur man %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "tidak dapat menulis didalam %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "tidak dapat memperbarui %s" @@ -165,7 +165,7 @@ msgstr "tidak dapat memperbarui %s" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "peringatan: %s/man%s/%s.%s*: ekstensi berkompetisi" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "tidak dapat mengupdate persediaan indeks %s" @@ -180,42 +180,42 @@ msgstr "peringatan: %s: symlink buruk atau ROFF `.so' diminta" msgid "warning: %s: ignoring empty file" msgstr "peringatan: %s: mengabaikan berkas kosong" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "peringatan: %s: whatis parse untuk %s(%s) gagal" -#: src/check_mandirs.c:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "tidak dapat mencari direktori %s" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "peringatan: tidak dapat membuat catdir %s" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "tidak dapat mengubah direktori %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "tidak dapat membuat persediaan indeks %s" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "selesai.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Menghapus masukan basis data lama dalam %s...\n" @@ -234,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:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "EKSTENSI" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "batasi pencarian ke tipe ekstensi EKSTENSI" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 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:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "cari untuk halaman dengan membedakan besar huruf" @@ -265,8 +265,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -296,15 +296,15 @@ 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:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "PENGKODEAN" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "gunakan pengkodean keluaran yang dipilih" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: pilihan tidak kompatibel" @@ -314,145 +314,145 @@ msgstr "%s: pilihan tidak kompatibel" msgid "command exited with status %d: %s" msgstr "perintah keluar dengan status %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[BAGIAN] HALAMAN..." -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "reset semua pilihan ke nilai bakunya" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "PERINGATAN" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "aktifkan peringatan dari groff" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Mode operasi utama:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "sama dengan whatis" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "sama dengan apropos" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "cari teks dalam seluruh halaman" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "tampilkan lokasi aktual dari halaman man" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "tampilkan lokasi aktual dari halaman cat" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpretasikan HALAMAN argumen sebagai nama berkas lokal" -#: src/man.c:296 +#: src/man.c:295 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:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "keluaran sumber halaman dikodekan dalam PENGKODEAN" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Mencari halaman manual:" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "LOKAL" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "definisikan lokal untuk pencarian man ini" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "SISTEM" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "gunakan halaman manual dari sistem lain" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "DAFTAR" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "gunakan daftar bagian dipisahkan oleh kolon" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "tampilkan seluruh halaman yang cocok dengan regex" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "tampilkan seluruh halaman yang cocok dengan huruf bebas" -#: src/man.c:311 +#: src/man.c:310 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:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "cari seluruh halaman buku panduan yang cocok" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "paksa sebuah pemeriksaan konsistensi persediaan" -#: src/man.c:316 +#: src/man.c:315 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:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "Mengontrol keluaran terformat:" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "PAGER" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "gunakan aplikasi PAGER untuk menampilkan keluaran" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "STRING" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "sediakan pager `less' dengan sebuah prompt" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "tampilkan terjemahan ASCII dari beberapa karakter latin1" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "non-aktifkan hyphenasi" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "non-aktifkan hyphenasi" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -462,34 +462,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "gunakan %s untuk memformat halaman" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "PERANGKAT" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "gunakan %s dengan perangkat yang dipilih" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "BROWSER" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "gunakan %s atau BROWSER untuk menampilkan keluaran HTML" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "RESOLUSI" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -497,104 +497,104 @@ msgstr "" "gunakan groff dan tampilkan melalui gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "gunakan groff dan paksa itu untuk menghasilkan ditroff" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Tidak ada masukan buku panduan untuk %s\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Halaman buku panduan mana yang anda inginkan?\n" -#: src/man.c:726 +#: src/man.c:767 #, 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:735 +#: src/man.c:776 #, 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:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "mengabaikan preprosesor tidak dikenal `%c'" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "tidak dapat chown %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "tidak dapat chmod %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "tidak dapat mengubah nama %s ke %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "tidak dapat menset waktu di %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "tidak dapat unlink %s" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "tidak dapat membuat cat sementara untuk %s" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "tidak dapat membuat direktori sementara" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "tidak dapat membuka berkas sementara %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "tidak dapat membuat direktori sementara" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "tidak dapat menghapus direktori %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "tidak dapat chdir ke %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -603,27 +603,27 @@ msgstr "" "\n" "tidak dapat menulis ke %s dalam mode catman" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "Tidak dapat mengubah %s ke nama cat" -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: bergantung ke referensi whatis sudah ditinggalkan\n" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "perintah mandb gagal dengan status keluar %d" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "internal error: tipe kandidat %d diluar dari jangkauan" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Halaman buku panduan " @@ -670,53 +670,53 @@ msgstr "harus menspesifikasikan sebuah pengkodean masukan" msgid "must specify an output encoding" msgstr "harus menspesifikasikan sebuah pengkodean keluaran" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[JALUR MAN]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "bekerja secara halus, kecuali untuk peringatan 'palsu'" -#: src/mandb.c:110 +#: src/mandb.c:109 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:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "jangan menghapus masukan yang sudah ditinggalkan dari basis data" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "hanya menghasilkan basis data pengguna" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "membuat basis data dari serpihan, daripada memperbaruinya" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "memeriksa halaman buku panduan untuk kebenarannya" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "NAMA BERKAS" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "perbarui hanya masukan untuk nama berkas ini" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "tidak dapat menghapus %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "tidak dapat menulis ke %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "tidak dapat membaca dari %s" @@ -862,22 +862,22 @@ 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:246 src/ult_src.c:124 +#: src/straycats.c:247 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:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Memeriksa untuk cats menyimpang dibawah %s...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "peringatan: tidak dapat memperbarui persediaan indeks %s" @@ -887,61 +887,61 @@ msgstr "peringatan: tidak dapat memperbarui persediaan indeks %s" msgid "%s is self referencing" msgstr "%s adalah mereferensikan dirinya sendiri" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "KATA KUNCI..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "Pilihan --regex aktif secara baku." -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "tampikan pesan peringatan bertele-tele" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "intepretasikan setiap kata kunci sebagai sebuah regex" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "cari setiap kata kunci untuk pencocokan yang tepat" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "kata kunci berisi huruf bebas" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "membutuhkan semua kata kunci untuk mencocokan" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "jangan trim keluaran ke lebar terminal" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "hanya cari di bagian ini" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "definisikan lokal untuk pencarian ini" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s apa?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "peringatan: %s berisi sebuah penunjuk loop" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(subjek tidak diketahui)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: tidak ada yang sesuai.\n" diff --git a/po/it.po b/po/it.po index 2309de6..ec1359b 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2005-12-10 17:30+0100\n" "Last-Translator: Giuseppe Sacco \n" "Language-Team: Italian \n" @@ -63,7 +63,7 @@ msgstr[1] "trovati solo %d campi" msgid "bad fetch on multi key %s" msgstr "fetch errato sulla chiave multipla %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Il database %s è corrotto; lo si ricrei con mandb --create" @@ -83,18 +83,18 @@ msgstr "attenzione: %s ha versione %s, invece dell'attesa %s\n" msgid "fatal: unable to insert version identifier into %s" msgstr "errore grave: impossibile inserire l'identificatore di versione in %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "" @@ -107,41 +107,41 @@ msgstr "impossibile aprire %s in lettura" msgid "[SECTION...]" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 #, fuzzy msgid "use this user configuration file" msgstr "impossibile aprire il file di configurazione dei percorsi man %s" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "impossibile leggere il database %s" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "comando man fallito con stato d'uscita %d" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "impossibile leggere il database %s" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "contenuto NULL per la chiave: %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -150,12 +150,12 @@ msgstr "" "\n" "Aggiornamento dei file cat della sezione %s della gerarchia di manuali %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "impossibile scrivere all'interno di %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "impossibile aggiornare %s" @@ -165,7 +165,7 @@ msgstr "impossibile aggiornare %s" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "attenzione: %s/man%s/%s.%s*: estensioni in conflitto" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "impossibile aggiornare l'indice %s della cache" @@ -180,43 +180,43 @@ msgstr "attenzione: %s: link simbolico o richiesta ROFF \".so\" errato(a)" msgid "warning: %s: ignoring empty file" msgstr "attenzione: %s: viene ignorato un file vuoto" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "attenzione: %s: analisi whatis per %s(%s) fallita" -#: src/check_mandirs.c:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "impossibile ricercare nella directory %s" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "attenzione: impossibile creare la directory %s" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "impossibile posizionarsi nella directory %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "impossibile creare l'indice %s della cache" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "fatto.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Rimozione delle vecchie voci di basi dati in %s...\n" @@ -235,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:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "" @@ -266,8 +266,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -297,15 +297,15 @@ msgstr "" msgid "show guessed series of preprocessing filters" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, fuzzy, c-format msgid "%s: incompatible options" msgstr ": opzioni incompatibili" @@ -315,279 +315,279 @@ msgstr ": opzioni incompatibili" msgid "command exited with status %d: %s" msgstr "comando terminato con stato d'uscita %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "" -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "" -#: src/man.c:299 +#: src/man.c:298 #, fuzzy msgid "Finding manual pages:" msgstr " Pagina di manuale " -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "" -#: src/man.c:311 +#: src/man.c:310 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" -#: src/man.c:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "" -#: src/man.c:316 +#: src/man.c:315 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" -#: src/man.c:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "" -#: src/man.c:329 +#: src/man.c:328 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:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" msgstr "" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Non c'è il manuale per %s\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Quale pagina di manuale si desidera?\n" -#: src/man.c:726 +#: src/man.c:767 #, 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:735 +#: src/man.c:776 #, 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:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "preprocessore \"%c\" sconosciuto, lo ignoro" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "impossibile fare chown su %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "impossibile fare chmod su %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "impossibile rinominare %s in %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "impossibile impostare la data per %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "impossibile fare unlink di %s" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "impossibile creare un file 'cat' temporaneo per %s" -#: src/man.c:1784 +#: src/man.c:1827 #, fuzzy, c-format msgid "can't create temporary directory" msgstr "impossibile creare un file 'cat' temporaneo per %s" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "impossibile aprire il file temporaneo %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "impossibile creare un file 'cat' temporaneo per %s" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "impossibile rimuovere la directory %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "impossibile fare chdir a %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -596,27 +596,27 @@ msgstr "" "\n" "impossibile scrivere in %s in modo catman" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "Impossibile convertire %s nel nome cat" -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: confidare nei whatis refs è obsoleto\n" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "comando mandb fallito con stato d'uscita %d" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "errore interno: il tipo %d candidato è oltre il limite" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Pagina di manuale " @@ -663,53 +663,53 @@ msgstr "" msgid "must specify an output encoding" msgstr "" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "impossibile rimuovere %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "impossibile scrivere in %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "impossibile leggere da %s" @@ -856,22 +856,22 @@ msgstr "" "attenzione: nessun percorso man globale impostato nel file di configurazione " "%s" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 src/ult_src.c:124 #, c-format msgid "warning: %s is a dangling symlink" msgstr "attenzione: %s è un link simbolico spezzato" -#: src/straycats.c:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 src/ult_src.c:127 src/ult_src.c:287 #, c-format msgid "can't resolve %s" msgstr "impossibile risolvere %s" -#: src/straycats.c:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Ricerca degli stray cat sotto a %s...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "attenzione: impossibile aggiornare l'index %s della cache" @@ -881,61 +881,61 @@ msgstr "attenzione: impossibile aggiornare l'index %s della cache" msgid "%s is self referencing" msgstr "%s è auto referenziante" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "" -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "" -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s cosa?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "attenzione: %s contiene un riferimeno a se stesso" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(oggetto sconosciuto)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: niente di appropriato.\n" diff --git a/po/ja.po b/po/ja.po index 8a43633..0d104ff 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2013-06-27 19:41+0900\n" "Last-Translator: Yasuaki Taniguchi \n" "Language-Team: Japanese \n" @@ -64,7 +64,7 @@ msgstr[0] "中身が %d フィールドしかありません" msgid "bad fetch on multi key %s" msgstr "複合キー %s は不正な呼び出しです" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "" @@ -86,18 +86,18 @@ msgstr "警告: %1$s のバージョンは %3$s が予期されますが、実 msgid "fatal: unable to insert version identifier into %s" msgstr "致命的: %s にバージョン識別子を挿入できません" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[MAN DATABASE]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "デバッグメッセージを表示する" @@ -110,40 +110,40 @@ msgstr "%s を読み込み用に開けません" msgid "[SECTION...]" msgstr "[SECTION...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "PATH" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" msgstr "man ページ用の検索パスを PATH に設定する" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "FILE" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "このユーザ設定ファイルを使用する" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "データベース %s を読み込めません" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "man コマンドが終了ステータス %d で失敗しました" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "データベース %s を読み込めません" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "キー %s の内容は NULL です" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -152,12 +152,12 @@ msgstr "" "\n" "man 階層 %2$s のセクション %1$s の cat ファイルを更新しています\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "%s に書き込めません" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "%s を更新できません" @@ -167,7 +167,7 @@ msgstr "%s を更新できません" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "警告: %s/man%s/%s.%s*: 拡張子が競合しています" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "index キャッシュ %s を更新できません" @@ -183,42 +183,42 @@ msgstr "" msgid "warning: %s: ignoring empty file" msgstr "警告: %s: 空ファイルを無視しています" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "警告: %s: whatis が %s(%s) の解釈に失敗しました" -#: src/check_mandirs.c:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "ディレクトリー %s を検索できません" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "警告: cat ディレクトリー %s を作成できません" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "ディレクトリ %s に移動できません" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "index キャッシュ %s を作成できません" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "パス `%s/%s' の index キャッシュを更新しています。お待ちください..." -#: src/check_mandirs.c:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "完了しました。\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "%s 内の古いデータベース要素を取り除いています...\n" @@ -237,19 +237,19 @@ msgstr "警告: %s: おかしなファイル名を無視しています" msgid "PATH SECTION NAME" msgstr "PATH SECTION NAME" -#: src/globbing_test.c:59 src/man.c:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "EXTENSION" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "検索対象を拡張子が EXTENSION のものに限定する" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "大文字小文字を区別しないでページを検索する (デフォルト)" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "大文字小文字を区別してページを検索する" @@ -267,8 +267,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -298,15 +298,15 @@ msgstr "whatis 情報を表示する" msgid "show guessed series of preprocessing filters" msgstr "推測した一連の事前処理フィルターを表示" -#: src/lexgrog_test.c:73 src/man.c:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "ENCODING" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "選択した出力エンコーディングを使用する" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: 相互に利用できないオプションです" @@ -316,145 +316,145 @@ msgstr "%s: 相互に利用できないオプションです" msgid "command exited with status %d: %s" msgstr "コマンドはステータス %d で終了しました: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[SECTION] PAGE..." -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "すべてのオプションをデフォルト値にリセットする" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "WARNINGS" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "groff からの警告を有効にする" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "操作の主なモード:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "whatis と同様" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "apropos と同様" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "すべてのページのテキストを検索する" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "マニュアルページの物理的な位置を表示する" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "整形済みファイルの物理的な位置を表示する" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "PAGE 引数をローカルファイル名として解釈する" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "catman によって古い整形済みページを再整形するために使用される" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "ソースページのエンコーディングが ENCODING であるとみなして出力する" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "マニュアルページの探し方:" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "LOCALE" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "この man の検索用のロケールを定義する" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "SYSTEM" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "ほかのシステムからのマニュアルページを使用する" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "LIST" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "セクションリストとしてコロン (:) で区切られた LIST を使用する" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "正規表現に一致したすべてのページを表示する" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "ワイルドカードに一致したすべてのページを表示する" -#: src/man.c:311 +#: src/man.c:310 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "--regex と --wildcard がページ名のみに一致するようにし、説明には一致しないよ" "うにする" -#: src/man.c:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "全ての一致したマニュアルページを探し出す" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "キャッシュ一貫性の確認を強制する" -#: src/man.c:316 +#: src/man.c:315 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "サブページの試行、例えば 'man foo bar' => 'man foo-bar' を行わない" -#: src/man.c:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "整形された出力の制御:" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "PAGER" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "出力を表示するプログラムとして PAGER を使用する" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "STRING" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "`less' ページャーのプロンプトを指定する" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "一部の latin1 文字を ASCII 文字に変換して表示する" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "ハイフンによる行末処理を無効にする" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "均等割り付けを無効にする" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -464,34 +464,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "ページ整形に %s を使用する" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "DEVICE" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "選択した DEVICE 向けに %s を使用する" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "BROWSER" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "HTML 出力を表示するために %s または BROWSER を使用する" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "RESOLUTION" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -499,102 +499,102 @@ msgstr "" "groff を使用し、 gxditview (X11) を通して表示する:\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "groff を使用し、強制的に ditroff を生成する" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "%s というマニュアルはありません\n" -#: src/man.c:607 +#: src/man.c:606 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(セクション %s からどのマニュアルページを代わりに表示しますか?)\n" -#: src/man.c:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "マニュアルページを指定してください\n" -#: src/man.c:726 +#: src/man.c:767 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "%s というマニュアルはセクション %s にはありません\n" -#: src/man.c:735 +#: src/man.c:776 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" "マニュアルページが利用できない場合のヘルプについては '%s'を見てください。\n" -#: src/man.c:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "不明な前処理系 `%c' を無視しています" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "%s の所有者を変更 (chown) できません" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "%s の許可属性を変更 (chmod) できません" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "%s の名前を %s に変更できません" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "%s の時刻を設定できません" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "%s を削除(unlink)できません" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "%s 用の一時的な整形済みファイルを作成できません" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "一時ディレクトリを作成できません" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "一時ファイル %s を開けません" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "一時ディレクトリを作成できません" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "ディレクトリ %s を削除できません" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "%s にディレクトリを変更できません" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -603,27 +603,27 @@ msgstr "" "\n" "catman モードで %s に書き込みできません" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "%s を整形済みファイル名に変換できません" -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: whatis の参照に頼ることは勧められなくなっています\n" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb コマンドが終了ステータス %d で失敗しました" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "内部エラー: 候補の種類 %d は範囲内にありません" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " マニュアルページ " @@ -670,55 +670,55 @@ msgstr "入力エンコーディングを指定しなければいけません" msgid "must specify an output encoding" msgstr "出力エンコーディングを指定しなければいけません" -#: src/mandb.c:105 +#: src/mandb.c:104 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:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "'ファイル名の不一致'による警告以外何も出力しない" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "roff のない cat ファイルを検索、DB へ追加しない" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "古くなったエントリーを DB から削除しない" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "ユーザ用データベースのみを生成" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "データベースを更新せず、一から作成し直す" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "マニュアルページの正確さをチェック" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "FILENAME" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "このファイル名の要素だけを更新" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "%s を削除できません" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "%s に書き込めません" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "%s から読み込めません" @@ -858,22 +858,22 @@ msgstr "グローバルな manpath 全体を表示" msgid "warning: no global manpaths set in config file %s" msgstr "警告: 設定ファイル %s にグローバルな manpath の設定がありません" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 src/ult_src.c:124 #, c-format msgid "warning: %s is a dangling symlink" msgstr "警告: %s はシンボリックリンクが切れています" -#: src/straycats.c:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 src/ult_src.c:127 src/ult_src.c:287 #, c-format msgid "can't resolve %s" msgstr "%s を解決できません" -#: src/straycats.c:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "%s 配下の roff がない cat ファイルをチェックしています...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "警告: index キャッシュ %s を更新できません" @@ -883,61 +883,61 @@ msgstr "警告: index キャッシュ %s を更新できません" msgid "%s is self referencing" msgstr "%s は自分自身を参照しています" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "KEYWORD..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "--regex オプションはデフォルトで有効です。" -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "冗長な警告メッセージを表示する" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "各キーワードを正規表現として解釈する" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "各検索語に完全に一致するものを検索" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "キーワードでワイルドカードを使用する" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "全検索語に一致するものを検索" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "出力を端末幅に切り詰めない" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "これらのセクションのみ検索する (コロン区切り)" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "検索するロケールを定義する" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s キーワードは何ですか？\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "警告: %s にはループしているポインタが含まれています" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(不明な題名です)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: 適切なものはありませんでした。\n" diff --git a/po/man-db.pot b/po/man-db.pot index 2183b2a..ba7364d 100644 --- a/po/man-db.pot +++ b/po/man-db.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: man-db 2.7.1\n" +"Project-Id-Version: man-db 2.7.2\n" "Report-Msgid-Bugs-To: Colin Watson \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -65,7 +65,7 @@ msgstr[1] "" msgid "bad fetch on multi key %s" msgstr "" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "" @@ -85,18 +85,18 @@ msgstr "" msgid "fatal: unable to insert version identifier into %s" msgstr "" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "" @@ -109,52 +109,52 @@ msgstr "" msgid "[SECTION...]" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "" -#: src/catman.c:172 +#: src/catman.c:194 #, c-format -msgid "cannot read database %s" +msgid "man command failed with exit status %d" msgstr "" -#: src/catman.c:205 +#: src/catman.c:233 #, c-format -msgid "man command failed with exit status %d" +msgid "cannot read database %s" msgstr "" -#: src/catman.c:278 +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" "Updating cat files for section %s of man hierarchy %s\n" msgstr "" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "" @@ -164,7 +164,7 @@ msgstr "" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "" @@ -179,42 +179,42 @@ msgstr "" msgid "warning: %s: ignoring empty file" msgstr "" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "" -#: src/check_mandirs.c:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "" -#: src/check_mandirs.c:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "" @@ -233,19 +233,19 @@ msgstr "" msgid "PATH SECTION NAME" msgstr "" -#: src/globbing_test.c:59 src/man.c:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "" @@ -264,8 +264,8 @@ msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "" msgstr[1] "" -#: src/lexgrog.l:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -295,15 +295,15 @@ msgstr "" msgid "show guessed series of preprocessing filters" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "" @@ -313,303 +313,303 @@ msgstr "" msgid "command exited with status %d: %s" msgstr "" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "" -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "" -#: src/man.c:311 +#: src/man.c:310 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" -#: src/man.c:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "" -#: src/man.c:316 +#: src/man.c:315 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" -#: src/man.c:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "" -#: src/man.c:329 +#: src/man.c:328 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:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" msgstr "" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "" -#: src/man.c:607 +#: src/man.c:606 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "" -#: src/man.c:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "" -#: src/man.c:726 +#: src/man.c:767 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "" -#: src/man.c:735 +#: src/man.c:776 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" -#: src/man.c:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, c-format msgid "can't restore previous working directory" msgstr "" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "" -#: src/man.c:1980 +#: src/man.c:2023 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" -#: src/man.c:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" "cannot write to %s in catman mode" msgstr "" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "" -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr "" @@ -656,53 +656,53 @@ msgstr "" msgid "must specify an output encoding" msgstr "" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "" @@ -843,22 +843,22 @@ msgstr "" msgid "warning: no global manpaths set in config file %s" msgstr "" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 src/ult_src.c:124 #, c-format msgid "warning: %s is a dangling symlink" msgstr "" -#: src/straycats.c:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 src/ult_src.c:127 src/ult_src.c:287 #, c-format msgid "can't resolve %s" msgstr "" -#: src/straycats.c:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "" @@ -868,61 +868,61 @@ msgstr "" msgid "%s is self referencing" msgstr "" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "" -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "" -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "" diff --git a/po/nl.po b/po/nl.po index 788fe08..076cbc3 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2009-11-16 08:36+0100\n" "Last-Translator: Erwin Poeze \n" "Language-Team: Dutch \n" @@ -66,7 +66,7 @@ msgstr[1] "slechts %d velden in de inhoud" msgid "bad fetch on multi key %s" msgstr "onjuiste treffer voor multisleutel %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Database %s is beschadigd; maak deze opnieuw aan met 'mandb --create'" @@ -86,18 +86,18 @@ msgstr "waarschuwing: %s heeft versie %s, terwijl %s verwacht wordt\n" msgid "fatal: unable to insert version identifier into %s" msgstr "fatale fout: kan geen versie-indicatie invoegen in %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[MAN-GEGEVENSBANK]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "debug-uitvoer produceren" @@ -110,40 +110,40 @@ msgstr "kan %s niet openen om te lezen" msgid "[SECTION...]" msgstr "[SECTIE...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "PAD" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 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:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "BESTAND" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "te gebruiken configuratiebestand" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "kan database %s niet lezen" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "'man' is mislukt met afsluitwaarde %d" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "kan database %s niet lezen" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "NULL-inhoud voor sleutel %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -152,12 +152,12 @@ msgstr "" "\n" "Bijwerken van cat-bestanden voor sectie %s van man-hiërachie %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "kan in %s niet schrijven" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "kan %s niet bijwerken" @@ -167,7 +167,7 @@ msgstr "kan %s niet bijwerken" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "waarschuwing: botsende subsecties in %s/man%s/%s.%s*" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "kan index-cache %s niet bijwerken" @@ -184,42 +184,42 @@ msgstr "" msgid "warning: %s: ignoring empty file" msgstr "waarschuwing: %s: leeg bestand wordt genegeerd" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, 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:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "kan map %s niet doorzoeken" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "waarschuwing: kan cat-map %s niet aanmaken" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "kan niet naar map %s gaan" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "kan index-cache %s niet aanmaken" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "voltooid.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Verwijderen van oude databaseitems uit %s...\n" @@ -238,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:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "SUBSECTIE" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "het zoeken beperken tot deze subsectie" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "hoofdletterongevoelig naar pagina's zoeken" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "hoofdlettergevoelig naar pagina's zoeken" @@ -269,8 +269,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -300,15 +300,15 @@ 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:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "CODERING" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "uitvoer in deze codering produceren" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: opties gaan niet samen" @@ -318,144 +318,144 @@ msgstr "%s: opties gaan niet samen" msgid "command exited with status %d: %s" msgstr "opdracht eindigde met afsluitwaarde %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[SECTIE] PAGINA..." -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "alle opties op hun standaardwaarden terugzetten" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "WAARSCHUWINGEN" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "(deze) waarschuwingen van 'groff' doorgeven" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Werkingsmodus:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "als 'whatis' fungeren" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "als 'apropos' fungeren" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "zoek de tekst in alle pagina's" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "de locatie van man-pagina's tonen" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "de locatie van cat-pagina's tonen" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "paginanaam als lokale bestandsnaam begrijpen" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "(gebruikt door 'catman' bij heropmaken)" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "brontekst uitvoeren omgezet naar deze codering" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Gevonden man-pagina's:" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "TAALCODE" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "te gebruiken taalregio voor deze zoekopdracht" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "SYSTEEMNAAM" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "man-pagina's van deze andere Unix-systemen tonen" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "SECTIES" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "te doorzoeken secties (scheiden met dubbele punten)" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "alle pagina's tonen die voldoen aan de reguliere expressie" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "alle pagina's tonen die voldoen aan het jokerteken" -#: src/man.c:311 +#: src/man.c:310 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "laat --regex en --wildcard alleen paginanamen weergeven, geen beschrijvingen" -#: src/man.c:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "alle passende pagina's vinden, niet alleen eerste" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "een cache-consistentiecontrole afdwingen" -#: src/man.c:316 +#: src/man.c:315 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:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "Uitvoerbesturing:" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "PROGRAMMA" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "dit programma gebruiken om de uitvoer te tonen" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "TEKENREEKS" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "deze tekens als prompt van 'less' gebruiken" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "een ASCII-versie van sommige Latin1-tekens tonen" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "woordafbreken uitschakelen" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "uitvullen uitschakelen" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -465,34 +465,34 @@ msgstr "" " e - [n]eqn p - pic t - tbl\n" " g - grap r - refer v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "'%s' gebruiken om pagina's op te maken" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "APPARAAT" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "'%s' gebruiken met dit apparaat" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "PROGRAMMA" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "'%s' of PROGRAMMA gebruiken voor HTML-uitvoer" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "RESOLUTIE" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -500,101 +500,101 @@ msgstr "" "'groff' gebruiken en uitvoer tonen via 'gxditview';\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "'groff' gebruiken en \"ditroff\" laten produceren" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Er is geen pagina over %s\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Welke man-pagina wilt u zien?\n" -#: src/man.c:726 +#: src/man.c:767 #, 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:735 +#: src/man.c:776 #, 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:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "onbekende preprocessor '%c' wordt genegeerd" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "kan eigenaar van %s niet wijzigen" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "kan de toegangsrechten van %s niet wijzigen" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "kan %s niet hernoemen naar %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "kan tijdsstempels van %s niet zetten" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "kan %s niet verwijderen" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "kan geen tijdelijk cat-bestand aanmaken voor %s" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "kan geen tijdelijk map aanmaken" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "kan tijdelijk bestand %s niet openen" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "kan geen tijdelijk map aanmaken" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "kan map %s niet verwijderen" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "kan niet naar map %s gaan" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -603,27 +603,27 @@ msgstr "" "\n" "kan niet naar %s schrijven in 'catman'-modus" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "Kan %s niet omzetten naar een cat-naam" -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: vertrouwen op 'whatis'-referenties wordt ontraden\n" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "'mandb' is mislukt met afsluitwaarde %d" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "**interne fout**: kandidaattype %d valt buiten bereik" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Handleidingspagina " @@ -670,53 +670,53 @@ msgstr "specificatie van een invoercodering ontbreekt" msgid "must specify an output encoding" msgstr "specificatie van een uitvoercodering ontbreekt" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[MANPAD]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "minder waarschuwingen produceren" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "losse cat-bestanden niet aan database toevoegen" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "verouderde items niet uit database verwijderen" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "alleen gebruikersdatabase produceren" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "database niet bijwerken maar opnieuw aanmaken" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "de man-pagina's op correctheid controleren" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "BESTAND" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "alleen het item voor dit bestand bijwerken" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "kan %s niet verwijderen" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "kan niet naar %s schrijven" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "kan niet uit %s lezen" @@ -863,22 +863,22 @@ msgid "warning: no global manpaths set in config file %s" msgstr "" "waarschuwing: geen algemeen man-pad ingesteld in configuratiebestand %s" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 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:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Zoeken naar losse cat-bestanden onder %s...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "waarschuwing: kan index-cache %s niet bijwerken" @@ -888,62 +888,62 @@ msgstr "waarschuwing: kan index-cache %s niet bijwerken" msgid "%s is self referencing" msgstr "%s refereert aan zichzelf" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "SLEUTELWOORD..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "De optie '--regex' is standaard." -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "breedsprakige waarschuwingen produceren" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "sleutelwoorden als reguliere expressies begrijpen" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "sleutelwoorden moeten exact overeenkomen" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "de sleutelwoorden bevatten jokertekens" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "alle sleutelwoorden moeten gevonden worden" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "de uitvoer niet aan de terminalbreedte aanpassen" -#: src/whatis.c:130 +#: src/whatis.c:129 #, fuzzy msgid "search only these sections (colon-separated)" msgstr "alleen in deze sectie zoeken" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "te gebruiken taalregio voor deze zoekopdracht" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s wat?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "waarschuwing: %s bevat een pointer-lus" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(onderwerp onbekend)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: niets gevonden.\n" diff --git a/po/pl.po b/po/pl.po index 349edb8..271046f 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2013-02-03 20:23+0100\n" "Last-Translator: Robert Luberda \n" "Language-Team: Polish \n" @@ -67,7 +67,7 @@ msgstr[2] "tylko %d pól w zmiennej content" msgid "bad fetch on multi key %s" msgstr "błąd pobierania klucza wielowymiarowego %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "" @@ -89,18 +89,18 @@ msgstr "ostrzeżenie: %s jest w wersji %s, podczas gdy oczekiwano %s\n" msgid "fatal: unable to insert version identifier into %s" msgstr "błąd krytyczny: nie można dodać identyfikatora wersji do %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[BAZA DANYCH MAN]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "wyświetla komunikaty diagnostyczne" @@ -113,41 +113,41 @@ msgstr "nie można otworzyć %s do odczytu" msgid "[SECTION...]" msgstr "[SEKCJA...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "ŚCIEÅ»KA" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 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:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "PLIK" # -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "używa tego pliku konfiguracyjnego użytkownika" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "nie można odczytać bazy danych %s" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "polecenie man zakończyło się błędem %d" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "nie można odczytać bazy danych %s" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "Pusta (NULL) zawartość klucza %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -156,12 +156,12 @@ msgstr "" "\n" "Aktualizowanie preformatowanych stron w sekcji %s hierarchii stron %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "nie można zapisać w %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "nie można zaktualizować %s" @@ -171,7 +171,7 @@ msgstr "nie można zaktualizować %s" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "ostrzeżenie: %s/man%s/%s.%s*: konkurujące rozszerzenia" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "nie można zaktualizować bufora indeksu %s" @@ -187,42 +187,42 @@ msgstr "" msgid "warning: %s: ignoring empty file" msgstr "ostrzeżenie: %s: ignorowanie pustego pliku" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, 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:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "nie można przeszukać katalogu %s" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "ostrzeżenie: błąd tworzenia katalogu preformatowanych stron %s" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "nie można przejść do katalogu %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "nie można utworzyć bufora indeksu %s" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "zakończono.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Usuwanie starych wpisów w bazie danych %s...\n" @@ -241,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:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "ROZSZERZENIE" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "ogranicza wyszukiwanie do podanego typu ROZSZERZENIA" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "wyszukuje strony ignorując wielkość liter (domyślnie)" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "wyszukuje strony biorąc pod uwagę wielkość liter" @@ -275,8 +275,8 @@ msgstr[1] "" msgstr[2] "" "ostrzeżenie: whatis dla argumentu %s przekracza %d bajtów, obcinanie." -#: src/lexgrog.l:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -306,15 +306,15 @@ 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:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "KODOWANIE" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "używa wybranego wyjściowego kodowania znaków" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: niekompatybilne opcje" @@ -324,146 +324,146 @@ msgstr "%s: niekompatybilne opcje" msgid "command exited with status %d: %s" msgstr "polecenie zwróciło kod błędu %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[SEKCJA] STRONA..." -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "przywraca wszystkim opcjom ich wartości domyślne" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "OSTRZEÅ»ENIA" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "włącza ostrzeżenia groffa" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Główne tryby działania:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "odpowiednik whatis" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "odpowiednik apropos" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "szuka tekstu we wszystkich stronach" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "wyświetla lokalizacje stron(y) podręcznika" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "wyświetla lokalizacje preformatowanych plików cat" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpretuje argumenty STRONA jako nazwy lokalnych plików" -#: src/man.c:296 +#: src/man.c:295 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:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "wypisuje stronę źródłową przekształconą do KODOWANIA" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Wyszukiwanie stron podręcznika ekranowego:" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "UST_JĘZYKOWE" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "określa ustawienia językowe tego wyszukiwania stron" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "SYSTEM" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "używa stron podręcznika z innych systemów" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "LISTA" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "używa rozdzielonej dwukropkami listy sekcji" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "wyświetla wszystkie strony pasujące do wyr. regularnego" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "wyświetla wszystkie strony pasujące do maski dopasowania" -#: src/man.c:311 +#: src/man.c:310 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:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "wyszukuje wszystkie pasujące strony podręcznika" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "wymusza sprawdzanie spójności" -#: src/man.c:316 +#: src/man.c:315 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:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "Kontrolowanie sformatowanego wyjścia:" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "PAGER" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "używa programu PAGER do wyświetlenia wyjścia" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "ŁAŃCUCH" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "ustawia linię zachęty programu \"less\"" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "wyświetla odpowiedniki ASCII pewnych znaków latin1" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "wyłącza podział wyrazów na końcu linii" # -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "wyłącza wyrównywanie linii" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -473,34 +473,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "używa %s do formatowania stron" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "URZĄDZENIE" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "używa %s z podanym urządzeniem" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "PRZEGLĄDARKA" -#: src/man.c:337 +#: src/man.c:336 #, 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:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "ROZDZIELCZOŚĆ" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -508,104 +508,104 @@ msgstr "" "używa groffa i wyświetla przez gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "używa groffa i wymusza na nim wyprodukowanie ditroffa" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Brak podręcznika dla %s\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Jakiej strony podręcznika potrzebujesz?\n" -#: src/man.c:726 +#: src/man.c:767 #, 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:735 +#: src/man.c:776 #, 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:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ignorowanie nieznanego preprocesora \"%c\"" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "nie można zmienić właściciela %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "nie można zmienić praw dostępu %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "nie można zmienić nazwy %s na %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "nie można ustawić czasów na %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "nie można usunąć %s" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "nie można utworzyć tymczasowego pliku cat dla %s" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "nie można utworzyć katalogu tymczasowego" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "nie można otworzyć pliku tymczasowego %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "nie można utworzyć katalogu tymczasowego" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "nie można usunąć katalogu %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "nie można zmienić katalogu na %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -614,28 +614,28 @@ msgstr "" "\n" "nie można zapisać do %s w trybie catman" -#: src/man.c:2343 +#: src/man.c:2386 #, 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:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: poleganie na odnośnikach whatis jest niezalecane\n" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "polecenie mandb zakończyło się błędem %d" -#: src/man.c:3420 +#: src/man.c:3466 #, 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:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Strona podręcznika ekranowego " @@ -682,53 +682,53 @@ msgstr "należy podać kodowanie wejścia" msgid "must specify an output encoding" msgstr "należy podać kodowanie wyjścia" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[MANPATH]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "tryb cichy, poza ostrzeżeniami o nieprawidłowościach" -#: src/mandb.c:110 +#: src/mandb.c:109 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:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "nie czyści przestarzałych wpisów z bazy danych" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "tworzy tylko bazy danych użytkownika" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "tworzy nowe bazy danych, zamiast aktualizować istniejące" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "sprawdza poprawność stron podręcznika" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "NAZWA_PLIKU" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "aktualizuje wpis dotyczący tej nazwy pliku" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "nie można usunąć %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "nie można pisać do %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "nie można czytać z %s" @@ -874,22 +874,22 @@ 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:246 src/ult_src.c:124 +#: src/straycats.c:247 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:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Poszukiwanie nie powiązanych stron preformatowanych w %s...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "ostrzeżenie: nie można zaktualizować bufora indeksu %s" @@ -899,61 +899,61 @@ msgstr "ostrzeżenie: nie można zaktualizować bufora indeksu %s" msgid "%s is self referencing" msgstr "%s odwołuje się do samego siebie" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "SŁOWO_KLUCZ..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "Opcja --regex jest domyślnie włączona." -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "wyświetla szczegółowe ostrzeżenia" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "interpretuje każde słowo kluczowe jako wyr. regularne" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "szuka każdego słowa kluczowego dla pełnego dopasowania" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "słowa kluczowe zawierają znaki dopasowywania" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "żąda dopasowania wszystkich słów kluczowych" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "nie przycina wyjścia do szerokości terminalu" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "przeszukuje tylko te sekcje (rozdzielone średnikami)" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "ustawienia językowe tego wyszukiwania" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "co %s?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "ostrzeżenie: %s zawiera pętlę wskaźników" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(temat nieznany)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nic odpowiedniego.\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index cfd6862..04bf5c7 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2003-02-22 18:45-0300\n" "Last-Translator: Alexandre Folle de Menezes \n" "Language-Team: Brazilian Portuguese \n" @@ -62,7 +62,7 @@ msgstr[1] "apenas %d campos no conte msgid "bad fetch on multi key %s" msgstr "busca ruim na multi-chave %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Banco de Dados %s corrompido; refazer com mandb --create" @@ -82,18 +82,18 @@ msgstr "aviso: %s msgid "fatal: unable to insert version identifier into %s" msgstr "fatal: incapaz de inserir o identificador de versão em %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "" @@ -106,41 +106,41 @@ msgstr "imposs msgid "[SECTION...]" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 #, fuzzy msgid "use this user configuration file" msgstr "impossível abrir o arquivo de configuração do manpath %s" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "impossível ler o banco de dados %s" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "o comando man falhou com estado de saída %d" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "impossível ler o banco de dados %s" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "Conteúdo NULL para chave: %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -149,12 +149,12 @@ msgstr "" "\n" "Atualizando arquivos cat para seção %s da hierarquia man %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "impossível escrever dentro de %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "incapaz de atualizar %s" @@ -164,7 +164,7 @@ msgstr "incapaz de atualizar %s" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "aviso: %s/man%s/%s.%s*: extensões conflitantes" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "impossível atualizar cache de índice %s" @@ -179,42 +179,42 @@ msgstr "aviso: %s: link simb msgid "warning: %s: ignoring empty file" msgstr "aviso: %s: ignorando arquivo vazio" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "aviso: %s: exame whatis para %s(%s) falhou" -#: src/check_mandirs.c:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "impossível buscar no diretório %s" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "aviso: impossível criar o catdir %s" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "impossível mudar para o diretório %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "impossível criar cache de índice %s" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "feito.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Descartando entradas antigas do banco de dados em %s...\n" @@ -233,19 +233,19 @@ msgstr "aviso: %s: ignorando nome de arquivo inv msgid "PATH SECTION NAME" msgstr "" -#: src/globbing_test.c:59 src/man.c:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "" @@ -264,8 +264,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -295,15 +295,15 @@ msgstr "" msgid "show guessed series of preprocessing filters" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, fuzzy, c-format msgid "%s: incompatible options" msgstr ": opções incompatíveis" @@ -313,178 +313,178 @@ msgstr ": op msgid "command exited with status %d: %s" msgstr "o comando encerrou com estado %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "" -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "" -#: src/man.c:299 +#: src/man.c:298 #, fuzzy msgid "Finding manual pages:" msgstr " Pagina de manual " -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "" -#: src/man.c:311 +#: src/man.c:310 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" -#: src/man.c:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "" -#: src/man.c:316 +#: src/man.c:315 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" -#: src/man.c:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "" -#: src/man.c:329 +#: src/man.c:328 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:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "" -#: src/man.c:340 +#: src/man.c:339 #, fuzzy msgid "" "use groff and display through gxditview (X11):\n" @@ -492,102 +492,102 @@ msgid "" msgstr "" " -X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12." -#: src/man.c:342 +#: src/man.c:341 #, fuzzy msgid "use groff and force it to produce ditroff" msgstr "-Z, --ditroff usa groff e força a produzir ditroff." -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, fuzzy, c-format msgid "No manual entry for %s\n" msgstr "Nenhuma entrada de manual para %s" -#: src/man.c:607 +#: src/man.c:606 #, fuzzy, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "Qual a página de manual desejada da seção %s?\n" -#: src/man.c:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Qual a página de manual desejada?\n" -#: src/man.c:726 +#: src/man.c:767 #, fuzzy, c-format msgid "No manual entry for %s in section %s\n" msgstr "Nenhuma entrada de manual para %s" -#: src/man.c:735 +#: src/man.c:776 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" "Veja '%s' para ajuda quando as páginas de manual não estiverem disponíveis.\n" -#: src/man.c:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "igorando preprocessador desconhecido '%c'" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "impossível fazer chown em %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "impossível fazer chmod em %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "impossível renomear %s para %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "impossível setar os horários de %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "impossível remover %s" -#: src/man.c:1672 +#: src/man.c:1715 #, fuzzy, c-format msgid "can't create temporary cat for %s" msgstr "impossível criar um nome de arquivo temporário" -#: src/man.c:1784 +#: src/man.c:1827 #, fuzzy, c-format msgid "can't create temporary directory" msgstr "impossível criar um nome de arquivo temporário" -#: src/man.c:1796 +#: src/man.c:1839 #, fuzzy, c-format msgid "can't open temporary file %s" msgstr "impossível abrir o arquivo de configuração do manpath %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "impossível criar um nome de arquivo temporário" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "impossível remover o diretório %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "impossível chdir para %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -596,27 +596,27 @@ msgstr "" "\n" "impossível escrever em %s no modo catman" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "Impossível converter %s para um nome 'cat'" -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: uso de whatis refs está obsoleto\n" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, fuzzy, c-format msgid "mandb command failed with exit status %d" msgstr "o comando man falhou com estado de saída %d" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Pagina de manual " @@ -663,53 +663,53 @@ msgstr "" msgid "must specify an output encoding" msgstr "" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "impossível remover %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, fuzzy, c-format msgid "can't write to %s" msgstr "impossível escrever dentro de %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, fuzzy, c-format msgid "can't read from %s" msgstr "impossível criar %s" @@ -854,22 +854,22 @@ msgstr "" msgid "warning: no global manpaths set in config file %s" msgstr "aviso: nenhum manpath global setado no arquivo de configuração %s" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 src/ult_src.c:124 #, c-format msgid "warning: %s is a dangling symlink" msgstr "warning: %s é um symlink perdido" -#: src/straycats.c:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 src/ult_src.c:127 src/ult_src.c:287 #, c-format msgid "can't resolve %s" msgstr "impossível resolver %s" -#: src/straycats.c:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Verificando por vira-latas sob %s...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "aviso: impossível atualizar o cache de índice %s" @@ -879,61 +879,61 @@ msgstr "aviso: imposs msgid "%s is self referencing" msgstr "%s referencia a si mesmo" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "" -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "" -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s o que?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "aviso: %s contém um laço de ponteiros" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(assunto desconhecido)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nada apropriado.\n" diff --git a/po/ro.po b/po/ro.po index e02d312..d462498 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2003-10-27 08:40+0200\n" "Last-Translator: Eugen Hoanca \n" "Language-Team: Romanian \n" @@ -63,7 +63,7 @@ msgstr[1] "numai %d c msgid "bad fetch on multi key %s" msgstr "aducere(fetch) incorectã în multi chei %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Baza de date %s e coruptã; reconstruiþi cu mandb --create" @@ -83,18 +83,18 @@ msgstr "avertisment: %s este versiunea %s, se a msgid "fatal: unable to insert version identifier into %s" msgstr "fatal: nu se poate insera identificatorul de versiune în %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "" @@ -107,41 +107,41 @@ msgstr "nu se poate deschide %s pentru citire" msgid "[SECTION...]" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 #, fuzzy msgid "use this user configuration file" msgstr "nu se poate deschide fiºierul de configurare al cãii de man %s" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "nu se poate citi baza de date %s." - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "comanda man a eºuat cu stare de ieºire %d" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "nu se poate citi baza de date %s." + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "conþinut NULL pentru cheia: %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -150,12 +150,12 @@ msgstr "" "\n" "Se înnoiesc(update) fiºierele cat pentru secþiunea %s a ierarhiei man %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "nu se poate scrie în %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "nu se poate înnoi(update) %s" @@ -165,7 +165,7 @@ msgstr "nu se poate msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "avertisment: %s/man%s/%s.%s*: extensii concurente" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "nu se poate înnoi(update) index cache %s" @@ -180,42 +180,42 @@ msgstr "avertisment: %s: symlink eronat sau cerere ROFF `.so'" msgid "warning: %s: ignoring empty file" msgstr "avertisment: %s: se ignorã fiºierul vid." -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "avertisment: %s: analiza(parse) whatis pentru %s(%s) eºuatã" -#: src/check_mandirs.c:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "nu se poate cãuta directorul %s" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "avertisment: nu se poate crea catdir %s" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "nu se poate schimba în directorul %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "nu se poate crea index cache-ului %s" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Se înnoieºte(update) index cache-ul pentru calea `%s%s'. Aºteptaþi..." -#: src/check_mandirs.c:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "efectuat.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Se curãþã(purge) intrãrile vechi ale bazei de date în %s...\n" @@ -234,19 +234,19 @@ msgstr "avertisment: %s: se ignor msgid "PATH SECTION NAME" msgstr "" -#: src/globbing_test.c:59 src/man.c:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "" @@ -265,8 +265,8 @@ msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "avertisment: whatis pentru %s depãºeºte %d octeþi, se trunchiazã." msgstr[1] "avertisment: whatis pentru %s depãºeºte %d octeþi, se trunchiazã." -#: src/lexgrog.l:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -296,15 +296,15 @@ msgstr "" msgid "show guessed series of preprocessing filters" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, fuzzy, c-format msgid "%s: incompatible options" msgstr ": opþiuni incompatibile" @@ -314,280 +314,280 @@ msgstr ": op msgid "command exited with status %d: %s" msgstr "comanda a ieºit cu starea %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "" -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "" -#: src/man.c:299 +#: src/man.c:298 #, fuzzy msgid "Finding manual pages:" msgstr " Paginã de manual " -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "" -#: src/man.c:311 +#: src/man.c:310 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" -#: src/man.c:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "" -#: src/man.c:316 +#: src/man.c:315 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" -#: src/man.c:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "" -#: src/man.c:329 +#: src/man.c:328 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:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" msgstr "" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, fuzzy, c-format msgid "No manual entry for %s\n" msgstr "Nu existã intrare în manual pentru %s" -#: src/man.c:607 +#: src/man.c:606 #, fuzzy, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "Ce paginã de manual doriþi din secþiunea %s?\n" -#: src/man.c:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Ce paginã de manual doriþi?\n" -#: src/man.c:726 +#: src/man.c:767 #, fuzzy, c-format msgid "No manual entry for %s in section %s\n" msgstr "Nu existã intrare în manual pentru %s" -#: src/man.c:735 +#: src/man.c:776 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" "Citiþi `%s' pentru ajutor în caz cã paginile de manual nu sunt disponibile.\n" -#: src/man.c:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "se ignorã preprocesorul necunoscut `%c'" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "nu se poate face chown pe %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "nu se poate face chmod pe %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "nu se poate redenumi %s în %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "nu se poate seta timpul pe %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "nu se poate scoate linkul(unlink) la %s" -#: src/man.c:1672 +#: src/man.c:1715 #, fuzzy, c-format msgid "can't create temporary cat for %s" msgstr "nu se poate crea un nume de fiºier temporar" -#: src/man.c:1784 +#: src/man.c:1827 #, fuzzy, c-format msgid "can't create temporary directory" msgstr "nu se poate crea un nume de fiºier temporar" -#: src/man.c:1796 +#: src/man.c:1839 #, fuzzy, c-format msgid "can't open temporary file %s" msgstr "nu se poate deschide fiºierul de configurare al cãii de man %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "nu se poate crea un nume de fiºier temporar" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "nu se poate ºterge directorul %s" -#: src/man.c:1980 +#: src/man.c:2023 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- urmãtor: %s [ vizualizare (return) | omitere (Ctrl-D) | ieºire (Ctrl-" "C) ]\n" -#: src/man.c:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "nu se poate schimba directorul(chdir) în %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -596,27 +596,27 @@ msgstr "" "\n" "nu se poate scrie în %s în modul catman" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "Nu pot converti %s în nume cat" -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: încrederea în referinþele whatis este învechitã\n" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "comanda mandb a eºuat cu stare de ieºire %d" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "eroare internã: candidatul tip %d depãºeºte domeniul" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Paginã de manual " @@ -663,53 +663,53 @@ msgstr "" msgid "must specify an output encoding" msgstr "" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "nu se poate ºterge %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "nu se poate scrie în %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "nu se poate citi din %s" @@ -857,22 +857,22 @@ msgid "warning: no global manpaths set in config file %s" msgstr "" "avertisment: nu existã cãi man globale setate în fiºierul de configurare %s" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 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:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Se verificã cat-urile rãtãcite sub %s...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "avertisment: nu se poate înnoi(update) index cache-ul %s" @@ -882,61 +882,61 @@ msgstr "avertisment: nu se poate msgid "%s is self referencing" msgstr "%s este auto-referinþã(self-referencing)" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "" -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "" -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s ce?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "avertisment: %s conþine o buclã pointer" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(subiect necunoscut)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nimic potrivit.\n" diff --git a/po/ru.po b/po/ru.po index 9a5f2fa..63d4668 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2012-02-06 20:46+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -67,7 +67,7 @@ msgstr[2] "в содержимом только %d полей" msgid "bad fetch on multi key %s" msgstr "неверная выборка по многомерному ключу %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "База данных %s повреждена; пересборка командой mandb --create" @@ -87,18 +87,18 @@ msgstr "предупреждение: %s имеет версию %s, а ожид msgid "fatal: unable to insert version identifier into %s" msgstr "неустранимая ошибка: не удалось вставить идентификатор версии в %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[БАЗА ДАННЫХ MAN]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "показывать сообщения отладки" @@ -111,40 +111,40 @@ msgstr "не удалось открыть %s на чтение" msgid "[SECTION...]" msgstr "[СЕКЦИЯ...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "ПУТЬ" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" msgstr "установить путь поиска справочных страниц в значение ПУТЬ" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "ФАЙЛ" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "использовать указанный пользовательских файл настроек" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "не удалось прочитать базу данных %s" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "команда man завершилась неудачно (код выхода %d)" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "не удалось прочитать базу данных %s" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "содержимое ключа равно NULL: %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -153,12 +153,12 @@ msgstr "" "\n" "Обновление cat файлов в разделе %s man иерархии %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "не удалось записать в %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "не удалось обновить %s" @@ -168,7 +168,7 @@ msgstr "не удалось обновить %s" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "предупреждение: %s/man%s/%s.%s*: конкурирующие расширения" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "не удалось обновить индексный кэш %s" @@ -184,42 +184,42 @@ msgstr "" msgid "warning: %s: ignoring empty file" msgstr "предупреждение: %s: игнорируется пустой файл" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "предупреждение: %s: whatis анализ %s(%s) не удался" -#: src/check_mandirs.c:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "не удалось найти каталог %s" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "предупреждение: не удалось создать cat каталог %s" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "не удалось сменить каталог на %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "не удалось создать индексный кэш %s" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Обновление индексного кэша для пути `%s/%s'. Ждите..." -#: src/check_mandirs.c:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "завершено.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Удаление старых записей базы данных в %s...\n" @@ -238,19 +238,19 @@ msgstr "предупреждение: %s: игнорируется фальши msgid "PATH SECTION NAME" msgstr "ПУТЬ СЕКЦИЯ ИМЯ" -#: src/globbing_test.c:59 src/man.c:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "РАСШИРЕНИЕ" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "искать только с заданным РАСШИРЕНИЕМ" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "не учитывать регистр при поиске (по умолчанию)" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "учитывать регистр при поиске" @@ -273,8 +273,8 @@ msgstr[1] "" msgstr[2] "" "предупреждение: результат whatis для %s превысил %d байт, обрезается." -#: src/lexgrog.l:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -304,15 +304,15 @@ msgstr "показать информацию whatis" msgid "show guessed series of preprocessing filters" msgstr "показать серию предположений фильтров предварительной обработки" -#: src/lexgrog_test.c:73 src/man.c:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "КОДИРОВКА" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "использовать выбранную кодировку выходных данных" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: несовместимые параметры" @@ -322,144 +322,144 @@ msgstr "%s: несовместимые параметры" msgid "command exited with status %d: %s" msgstr "команда завершилась с кодом %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[СЕКЦИЯ] СТРАНИЦА..." -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "сбросить все параметры в значения по умолчанию" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "ПРЕДУПРЕЖДЕНИЯ" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "включить предупреждения от groff" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Основные режимы работы:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "эквивалентно whatis" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "эквивалентно apropos" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "искать текст по всем справочным страницам" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "показывать физическое расположение man страницы" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "показывать физическое расположение cat файла(ов)" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "воспринимать аргумент(ы) СТРАНИЦА как имя файл(ов)" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "используется catman для переформатирования устаревших cat страниц" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "вывести исходную страницу в КОДИРОВКЕ" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Поиск справочных страниц:" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "ЛОКАЛЬ" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "задать локаль для поиска" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "СИСТЕМА" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "использовать справочные страницы от других систем" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "СПИСОК" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "использовать список секций, указанных через двоеточие" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "показать все страницы, удовлетворяющие регулярному выражению" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "показать все страницы, удовлетворяющие групповым символам" -#: src/man.c:311 +#: src/man.c:310 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "искать совпадение --regex и --wildcard только в именах страниц, без описаний" -#: src/man.c:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "поиск всех подходящих справочных страниц" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "выполнить проверку целостности кэша" -#: src/man.c:316 +#: src/man.c:315 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "не затрагивать подстраницы, например, 'man foo bar' => 'man foo-bar'" -#: src/man.c:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "Управление форматированием вывода:" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "ПЕЙДЖЕР" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "использовать программу ПЕЙДЖЕР для вывода на экран" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "СТРОКА" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "использовать пейджер `less' с подсказкой" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "показать трансляцию ASCII определённых символов latin1" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "выключить перенос слов" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "выключить выравнивание" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -469,34 +469,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "использовать %s для форматирования страниц" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "УСТРОЙСТВО" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "использовать %s на выбранном устройстве" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "БРАУЗЕР" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "использовать %s или БРАУЗЕР для показа HTML" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "РАЗРЕШЕНИЕ" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -504,101 +504,101 @@ msgstr "" "использовать groff и показывать с помощью gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "использовать groff и заставить его генерировать ditroff" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Нет справочной страницы для %s\n" -#: src/man.c:607 +#: src/man.c:606 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Или же, какая именно из справочных страниц раздела %s вам нужна?)\n" -#: src/man.c:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Какая справочная страница вам нужна?\n" -#: src/man.c:726 +#: src/man.c:767 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Нет справочной страницы для %s в разделе %s\n" -#: src/man.c:735 +#: src/man.c:776 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Смотрите '%s' в справке, если недоступны справочные страницы.\n" -#: src/man.c:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "игнорирование неизвестного препроцессора `%c'" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "не удалось выполнить функцию chown %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "не удалось выполнить функцию chmod %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "не удалось переименовать %s в %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "не удалось установить время доступа для %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "не удалось выполнить функцию unlink %s" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "не удалось создать временный cat файл %s" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "не удалось создать временный каталог" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "не удалось открыть временный файл %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "не удалось создать временный каталог" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "не удалось удалить каталог %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "не удалось выполнить функцию chdir в %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -607,27 +607,27 @@ msgstr "" "\n" "не удалось записать в %s в режиме catman" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "Не удалось преобразовать %s в cat имя" -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: полагаться на ссылки whatis настоятельно не рекомендуется\n" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "команда mandb завершилась неудачно (код выхода %d)" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "внутренняя ошибка: тип кандидата %d вне диапазона" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Справочная страница " @@ -674,53 +674,53 @@ msgstr "должна быть указана кодировка входных msgid "must specify an output encoding" msgstr "должна быть указана кодировка выходных данных" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[MANPATH]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "не выводить сообщения, за исключением 'фиктивных' предупреждений" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "не искать или добавлять побочные cat в dbs" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "не вычищать устаревшие записи из dbs" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "создать только пользовательские базы данных" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "создать dbs с нуля, а не обновлять" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "проверить справочные страницы на правильность" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "ИМЯ-ФАЙЛА" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "обновить запись только для этого файла" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "не удалось удалить %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "не удалось записать в %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "не удалось прочитать из %s" @@ -867,22 +867,22 @@ msgstr "показать весь глобальный manpath" msgid "warning: no global manpaths set in config file %s" msgstr "предупреждение: не установлены глобальные manpath в файле настроек %s" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 src/ult_src.c:124 #, c-format msgid "warning: %s is a dangling symlink" msgstr "предупреждение: %s ссылается на несуществующий объект" -#: src/straycats.c:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 src/ult_src.c:127 src/ult_src.c:287 #, c-format msgid "can't resolve %s" msgstr "не удалось определить %s" -#: src/straycats.c:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Проверка побочных cat в %s...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "предупреждение: не удалось обновить индексный кэш %s" @@ -892,61 +892,61 @@ msgstr "предупреждение: не удалось обновить ин msgid "%s is self referencing" msgstr "%s ссылается на себя" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "КЛЮЧ..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "Параметр --regex включён по умолчанию." -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "выводить подробные предупреждающие сообщения" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "считать каждый ключ регулярным выражением" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "искать точное совпадения каждого ключа" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "ключ(и) содержит групповые символы" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "требуется совпадение всех ключей" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "не обрезать вывод по ширине терминала" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "искать только в этих секциях (разделяются двоеточиями)" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "задать локаль для этого поиска" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s что?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "warning: %s содержит циклический указатель" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(неизвестный объект)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: ничего подходящего не найдено.\n" diff --git a/po/sr.po b/po/sr.po index 9192ab9..d75e9af 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2014-01-16 09:51+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" @@ -65,7 +65,7 @@ msgstr[2] "само %d поља у садржају" msgid "bad fetch on multi key %s" msgstr "лоша набавка на вишеструком кључу „%s“" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "База података „%s“ је оштећена; изградите поново са „mandb --create“" @@ -85,18 +85,18 @@ msgstr "упозорење: „%s“ је у издању %s, очекивах % msgid "fatal: unable to insert version identifier into %s" msgstr "кобно: не могу да уметнем одредника издања у „%s“" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[БАЗА ПОДАТАКА МАН-а]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "исписује поруке за исправљање грешака" @@ -109,40 +109,40 @@ msgstr "не могу да отворим „%s“ за читање" msgid "[SECTION...]" msgstr "[ОДЕЉАК...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "ПУТАЊА" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" msgstr "поставља путању претраге за странице упутства на ПУТАЊУ" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "ДАТОТЕКА" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "користи ову корисничку датотеку подешавања" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "не могу да прочитам базу података „%s“" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "наредба мана није успела са излазним стањем „%d“" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "не могу да прочитам базу података „%s“" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "НИШТАВАН садржај за кључ: %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -151,12 +151,12 @@ msgstr "" "\n" "Ажурирам кат датотеке за одељак %s манове хијерархије %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "не могу да пишем у „%s“" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "не могу да ажурирам „%s“" @@ -166,7 +166,7 @@ msgstr "не могу да ажурирам „%s“" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "упозорење: %s/man%s/%s.%s*: конкурентна проширења" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "не могу да ажурирам оставу индекса „%s“" @@ -181,42 +181,42 @@ msgstr "упозорење: %s: лоша симболичка веза или Р msgid "warning: %s: ignoring empty file" msgstr "упозорење: %s: занемарујем празну датотеку" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "упозорење: %s: није успела обрада шта-је за %s(%s)" -#: src/check_mandirs.c:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 src/ult_src.c:80 #, c-format msgid "can't search directory %s" msgstr "не могу да претражим директоријум „%s“" -#: src/check_mandirs.c:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "упозорење: не могу да направим катдир „%s“" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "не могу да пређем у директоријум „%s“" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "не могу да направим оставу индекса „%s“" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Ажурирам оставу индекса за путању „%s/%s“. Сачекајте..." -#: src/check_mandirs.c:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "готово.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Избацујем старе уносе базе података у „%s“...\n" @@ -235,19 +235,19 @@ msgstr "упозорење: %s: занемарујем нетачан назив msgid "PATH SECTION NAME" msgstr "ПУТАЊА ОДЕЉАК НАЗИВ" -#: src/globbing_test.c:59 src/man.c:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "ПРОШИРЕЊЕ" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "ограничава претрагу на врсту проширења ПРОШИРЕЊЕ" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "тражи странице без обзира на величину слова (основно)" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "тражи странице с обзиром на величину слова" @@ -267,8 +267,8 @@ msgstr[0] "упозорење: шта-је за „%s“ премашује %d msgstr[1] "упозорење: шта-је за „%s“ премашује %d бајта, скраћујем." msgstr[2] "упозорење: шта-је за „%s“ премашује %d бајтова, скраћујем." -#: src/lexgrog.l:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -298,15 +298,15 @@ msgstr "приказује шта-је податке" msgid "show guessed series of preprocessing filters" msgstr "приказује погођене серије пропусника предобраде" -#: src/lexgrog_test.c:73 src/man.c:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "КОДИРАЊЕ" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "користи изабрано кодирање излаза" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: несагласне опције" @@ -316,144 +316,144 @@ msgstr "%s: несагласне опције" msgid "command exited with status %d: %s" msgstr "наредба је изашла са стањем %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[ОДЕЉАК] СТРАНИЦА..." -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "враћа све опције на њихове основне вредности" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "УПОЗОРЕЊА" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "укључује упозорења из гроф-а" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Главни режими рада:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "исто што и шта-је" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "исто што и „apropos“" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "тражи текст на свим страницама" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "исписује физичко место ман странице(а)" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "исписује физичко место кат датотеке(а)" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "тумачи аргумент(е) СТРАНИЦЕ као месни(е) назив(е) датотеке" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "користи га катман да поново обликује застареле кат странице" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "излазна страница извора је кодирана у КОДИРАЊУ" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Проналажење страница упутства:" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "ЈЕЗИК" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "одређује језик за ову нарочиту претрагу мана" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "СИСТЕМ" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "користи странице упутства са других система" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "СПИСАК" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "користи двотачком раздвојени списак одељка" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "приказује све странице које одговарају регуларном изразу" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "приказује све странице које одговарају џокерима" -#: src/man.c:311 +#: src/man.c:310 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "„make --regex“ и „--wildcard“ поклапају само називе страница, а не описе" -#: src/man.c:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "проналази све одговарајуће странице упутства" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "приморава проверу доследности оставе" -#: src/man.c:316 +#: src/man.c:315 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "не покушава подстранице, нпр. „man foo bar“ => „man foo-bar“" -#: src/man.c:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "Управљање обликованим излазом:" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "СТРАНИЧАР" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "користи програм СТРАНИЧАР за приказивање излаза" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "НИСКА" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "обезбеђује страничара „less“ са упитом" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "приказује АСКРИ превод неких латин1 знакова" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "искључује преламање" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "искључује поравнавање" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -463,34 +463,34 @@ msgstr "" "e — [n]eqn, p — pic, t — tbl,\n" "g — grap, r — refer, v — vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "користи „%s“ за обликовање страница" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "УРЕЂАЈ" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "користи „%s“ са изабраним уређајем" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "ПРЕГЛЕДНИК" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "користи „%s“ или ПРЕГЛЕДНИК за приказивање ХТМЛ излаза" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "РЕЗОЛУЦИЈА" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -498,102 +498,102 @@ msgstr "" "користи грофа и приказује кроз гиксдитпреглед (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "користи гроф и приморава га да произведе дитроф" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Нема уноса упутства за „%s“\n" -#: src/man.c:607 +#: src/man.c:606 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Илити, коју страницу упутства желите из одељка %s?)\n" -#: src/man.c:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Коју страницу упутства желите?\n" -#: src/man.c:726 +#: src/man.c:767 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Нема уноса упутства за „%s“ у одељку %s\n" -#: src/man.c:735 +#: src/man.c:776 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Погледајте „%s“ за помоћ када странице упутства нису доступне.\n" -#: src/man.c:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "занемарујем неознати препроцесор „%c“" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "не могу да променим власника „%s“" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "не могу да променим режим „%s“" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "не могу да преименујем „%s“ у „%s“" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "не могу да подесим времена на „%s“" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "не могу да развежем „%s“" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "не могу да направим привремени кат за „%s“" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "не могу да направим привремени директоријум" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "не могу да отворим привремену датотеку „%s“" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "не могу да направим привремени директоријум" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "не могу да уклоним директоријум „%s“" -#: src/man.c:1980 +#: src/man.c:2023 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Ман-- следеће: %s [ преглед (повратница) | прескочи (Ктрл-Д) | изађи (Ктрл-" "Ц) ]\n" -#: src/man.c:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "не могу да се пребацим у „%s“" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -602,27 +602,27 @@ msgstr "" "\n" "не могу да пишем у „%s“ у катман режиму" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "Не могу да претворим „%s“ у кат назив" -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: ослањање на упуте шта-је је застарело\n" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "наредба мандб није успела са излазним стањем „%d“" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "унутрашња грешка: врста кандидата „%d“ је ван опсега" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Страница упутства " @@ -669,53 +669,53 @@ msgstr "морате навести кодирање улаза" msgid "must specify an output encoding" msgstr "морате навести кодирање излаза" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[МАНПУТАЊА]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "ради тихо, осим за „bogus“ упозорење" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "не тражи или не додаје залутале катсе у базе података" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "не избацује застареле уносе из база података" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "производи само корисничке базе података" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "прави базе података од почетка, уместо да их освежава" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "проверава странице упутства за исправношћу" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "ДАТОТЕКА" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "ажурира само унос за ову датотеку" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "не могу да уклоним „%s“" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "не могу да пишем у „%s“" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "не могу да читам из „%s“" @@ -860,22 +860,22 @@ msgstr "показује читаву општу манпутању" msgid "warning: no global manpaths set in config file %s" msgstr "упозорење: нису подешене опште манпутање у датотеци подешавања „%s“" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 src/ult_src.c:124 #, c-format msgid "warning: %s is a dangling symlink" msgstr "упозорење: „%s“ је апсолутна симболичка веза" -#: src/straycats.c:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 src/ult_src.c:127 src/ult_src.c:287 #, c-format msgid "can't resolve %s" msgstr "не могу да решим „%s“" -#: src/straycats.c:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Тражим залутале катсе под „%s“...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "упозорење: не могу да ажурирам оставу индекса „%s“" @@ -885,61 +885,61 @@ msgstr "упозорење: не могу да ажурирам оставу и msgid "%s is self referencing" msgstr "„%s“ је само упутна" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "КЉУЧНА РЕЧ..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "Опција „--regex“ је унапред изабрана." -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "исписује опширне поруке упозорења" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "тумачи сваку кључну реч као регуларни израз" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "тражи сваку кључну реч за тачним поклапањем" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "кључна реч садржи џокера" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "захтева све кључне речи за подударање" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "не крати излаз на ширину терминала" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "претаржује само ове одељке (раздвојене двотачком)" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "одређује језик за ову претрагу" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s шта?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "упозорење: „%s“ садржи петљу показивача" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(непознат субјекат)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: ништа одговарајуће.\n" diff --git a/po/sv.po b/po/sv.po index e0c6faa..c9f297f 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2007-09-17 16:57+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -63,7 +63,7 @@ msgstr[1] "endast %d fält i innehÃ¥ll" msgid "bad fetch on multi key %s" msgstr "felaktig hämtning pÃ¥ multinyckel %s" -#: libdb/db_lookup.c:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Databasen %s är skadad; bygg om med mandb --create" @@ -83,18 +83,18 @@ msgstr "varning: %s är version %s, %s förväntas\n" msgid "fatal: unable to insert version identifier into %s" msgstr "ödesdiger: kan inte infoga versionsidentifierare i %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "" @@ -107,41 +107,41 @@ msgstr "kan inte öppna %s för läsning" msgid "[SECTION...]" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "set search path for manual pages to PATH" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 #, fuzzy msgid "use this user configuration file" msgstr "kan inte öppna konfigurationsfilen för manualsökväg %s" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "kan inte läsa databasen %s" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "manualkommandot misslyckades med slutstatus %d" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "kan inte läsa databasen %s" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "NULL-innehÃ¥ll för nyckel: %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -150,12 +150,12 @@ msgstr "" "\n" "Uppdaterar cat-filer för avsnitt %s i man-hierarkin %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "kan inte skriva inom %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" @@ -165,7 +165,7 @@ msgstr "kan inte uppdatera %s" msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "varning: %s/man%s/%s.%s*: filändelser i konflikt" -#: src/check_mandirs.c:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, c-format msgid "can't update index cache %s" msgstr "kan inte uppdatera indexcachen %s" @@ -180,42 +180,42 @@ msgstr "varning: %s: felaktig symbolisk länk eller ROFF \".so\"-begäran" msgid "warning: %s: ignoring empty file" msgstr "varning: %s: ignorerar tom fil" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, 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:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 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:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, c-format msgid "warning: cannot create catdir %s" msgstr "varning: kan inte skapa cat-katalog %s" -#: src/check_mandirs.c:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "kan inte byta till katalogen %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, c-format msgid "can't create index cache %s" msgstr "kan inte skapa indexcachen %s" -#: src/check_mandirs.c:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "klar.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Tömmer gamla databasposter i %s...\n" @@ -234,19 +234,19 @@ msgstr "varning: %s: ignorerar felaktigt filnamn" msgid "PATH SECTION NAME" msgstr "" -#: src/globbing_test.c:59 src/man.c:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 msgid "limit search to extension type EXTENSION" msgstr "" -#: src/globbing_test.c:60 src/man.c:307 +#: src/globbing_test.c:60 src/man.c:306 msgid "look for pages case-insensitively (default)" msgstr "" -#: src/globbing_test.c:61 src/man.c:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "" @@ -265,8 +265,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -296,16 +296,16 @@ msgstr "" msgid "show guessed series of preprocessing filters" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 #, fuzzy msgid "use selected output encoding" msgstr "mÃ¥ste ange en utmatningskodning" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, fuzzy, c-format msgid "%s: incompatible options" msgstr ": inkompatibla flaggor" @@ -315,178 +315,178 @@ msgstr ": inkompatibla flaggor" msgid "command exited with status %d: %s" msgstr "kommandot avslutade med status %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "" -#: src/man.c:282 +#: src/man.c:281 msgid "reset all options to their default values" msgstr "" -#: src/man.c:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "" -#: src/man.c:290 +#: src/man.c:289 msgid "print physical location of man page(s)" msgstr "" -#: src/man.c:293 +#: src/man.c:292 msgid "print physical location of cat file(s)" msgstr "" -#: src/man.c:295 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "" -#: src/man.c:296 +#: src/man.c:295 msgid "used by catman to reformat out of date cat pages" msgstr "" -#: src/man.c:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "" -#: src/man.c:299 +#: src/man.c:298 #, fuzzy msgid "Finding manual pages:" msgstr " Manualsida " -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "" -#: src/man.c:300 +#: src/man.c:299 msgid "define the locale for this particular man search" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "" -#: src/man.c:303 +#: src/man.c:302 msgid "use colon separated section list" msgstr "" -#: src/man.c:309 +#: src/man.c:308 msgid "show all pages matching regex" msgstr "" -#: src/man.c:310 +#: src/man.c:309 msgid "show all pages matching wildcard" msgstr "" -#: src/man.c:311 +#: src/man.c:310 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" -#: src/man.c:313 +#: src/man.c:312 msgid "find all matching manual pages" msgstr "" -#: src/man.c:314 +#: src/man.c:313 msgid "force a cache consistency check" msgstr "" -#: src/man.c:316 +#: src/man.c:315 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" -#: src/man.c:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "" -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "" -#: src/man.c:329 +#: src/man.c:328 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:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "" -#: src/man.c:340 +#: src/man.c:339 #, fuzzy msgid "" "use groff and display through gxditview (X11):\n" @@ -494,106 +494,106 @@ msgid "" msgstr "" " -X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12." -#: src/man.c:342 +#: src/man.c:341 #, 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:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Ingen manualpost för %s\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Vilken manualsida vill du ha?\n" -#: src/man.c:726 +#: src/man.c:767 #, 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:735 +#: src/man.c:776 #, 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:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ignorerar okänd förbehandlare \"%c\"" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "kan inte byta ägare pÃ¥ %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "kan inte ändra rättigheter pÃ¥ %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "kan inte byta namn pÃ¥ %s till %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "kan inte ställa in tider pÃ¥ %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "kan inte avlänka %s" # cat är vad? catalogue? kommandot "cat"? -#: src/man.c:1672 +#: src/man.c:1715 #, 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:1784 +#: src/man.c:1827 #, fuzzy, c-format msgid "can't create temporary directory" msgstr "kan inte skapa temporär cat för %s" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "kan inte öppna temporärfil %s" # cat är vad? catalogue? kommandot "cat"? -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "kan inte skapa temporär cat för %s" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "kan inte ta bort katalogen %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "kan inte byta katalog till %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -602,27 +602,27 @@ msgstr "" "\n" "kan inte skriva till %s i catman-läge" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "Kan inte konvertera %s till cat-namn" -#: src/man.c:3067 +#: src/man.c:3111 #, 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:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb-kommandot misslyckades med slutstatus %d" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "internt fel: kandidattypen %d utanför intervallet" -#: src/man.c:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Manualsida " @@ -669,53 +669,53 @@ msgstr "mÃ¥ste ange en inmatningskodning" msgid "must specify an output encoding" msgstr "mÃ¥ste ange en utmatningskodning" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "kan inte ta bort %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "kan inte skriva till %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "kan inte läsa frÃ¥n %s" @@ -860,22 +860,22 @@ 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:246 src/ult_src.c:124 +#: src/straycats.c:247 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:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "Undersöker lösa cat-sidor under %s...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "varning: kan inte uppdatera indexcachen %s" @@ -885,61 +885,61 @@ msgstr "varning: kan inte uppdatera indexcachen %s" msgid "%s is self referencing" msgstr "%s refererar till sig själv" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "" -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "" -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s vad?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "varning: %s innehÃ¥ller en pekarslinga" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(okänt ämne)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: ingenting lämpligt.\n" diff --git a/po/vi.po b/po/vi.po index 22f6ba6..19b5d6f 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2014-01-12 16:01+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -68,7 +68,7 @@ msgstr[0] "chỉ có %d trường trong nội dung" 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:415 src/whatis.c:739 +#: libdb/db_lookup.c:417 src/whatis.c:741 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "" @@ -89,18 +89,18 @@ msgstr "cảnh báo: %s là phiên bản %s, cần %s\n" msgid "fatal: unable to insert version identifier into %s" msgstr "lỗi nghiêm trọng: không thể chèn định danh phiên bản vào %s" -#: src/accessdb.c:60 +#: src/accessdb.c:59 msgid "[MAN DATABASE]" msgstr "[CÆ  SỞ Dá»® LIỆU MAN]" -#: src/accessdb.c:61 +#: src/accessdb.c:60 #, c-format 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:281 src/manconv_main.c:94 src/mandb.c:108 -#: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66 +#: src/accessdb.c:63 src/catman.c:98 src/globbing_test.c:58 +#: src/lexgrog_test.c:68 src/man.c:280 src/manconv_main.c:94 src/mandb.c:107 +#: src/manpath.c:65 src/whatis.c:122 src/zsoelim_main.c:66 msgid "emit debugging messages" msgstr "phát ra các thông điệp để gỡ lỗi" @@ -113,40 +113,40 @@ msgstr "không thể mở %s để đọc" msgid "[SECTION...]" msgstr "[PHẦN...]" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 msgid "PATH" msgstr "ĐƯỜNG_DẪN" -#: src/catman.c:99 src/man.c:302 src/whatis.c:133 +#: src/catman.c:99 src/man.c:301 src/whatis.c:132 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:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "FILE" msgstr "TẬP_TIN" -#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67 -#: src/whatis.c:135 +#: src/catman.c:100 src/man.c:279 src/mandb.c:115 src/manpath.c:67 +#: src/whatis.c:134 msgid "use this user configuration file" msgstr "dùng tập tin cấu hình này" -#: src/catman.c:172 -#, c-format -msgid "cannot read database %s" -msgstr "không thể đọc cÆ¡ sở dữ liệu %s" - -#: src/catman.c:205 +#: src/catman.c:194 #, c-format msgid "man command failed with exit status %d" msgstr "lệnh \"man\" đã thất bại với trạng thái thoát là %d" -#: src/catman.c:278 +#: src/catman.c:233 +#, c-format +msgid "cannot read database %s" +msgstr "không thể đọc cÆ¡ sở dữ liệu %s" + +#: src/catman.c:276 #, c-format msgid "NULL content for key: %s" msgstr "nội dung VÔ GIÁ TRỊ cho khóa: %s" -#: src/catman.c:293 +#: src/catman.c:291 #, c-format msgid "" "\n" @@ -155,12 +155,12 @@ msgstr "" "\n" "Đang cập nhật các tập tin \"cat\" cho phần %s của cây phân cấp \"man\" %s\n" -#: src/catman.c:347 +#: src/catman.c:345 #, c-format msgid "cannot write within %s" msgstr "không thể ghi ở trong %s" -#: src/catman.c:424 +#: src/catman.c:422 #, c-format msgid "unable to update %s" msgstr "không thể cập nhật %s" @@ -170,7 +170,7 @@ msgstr "không thể cập nhật %s" 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:109 src/check_mandirs.c:566 +#: src/check_mandirs.c:109 src/check_mandirs.c:563 #, 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" @@ -185,44 +185,44 @@ msgstr "cảnh báo: %s: liên kết mềm sai, hoặc yêu cầu \".so\" ROFF s msgid "warning: %s: ignoring empty file" msgstr "cảnh báo: %s: đang bỏ qua tập tin rỗng" -#: src/check_mandirs.c:299 src/straycats.c:279 +#: src/check_mandirs.c:299 src/straycats.c:280 #, 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:327 src/check_mandirs.c:447 src/mandb.c:865 -#: src/straycats.c:77 src/straycats.c:309 src/ult_src.c:80 +#: src/check_mandirs.c:328 src/check_mandirs.c:448 src/mandb.c:865 +#: src/straycats.c:77 src/straycats.c:310 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:383 src/check_mandirs.c:410 +#: src/check_mandirs.c:384 src/check_mandirs.c:411 #, 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:452 src/man.c:1786 +#: src/check_mandirs.c:453 src/man.c:1829 #, c-format msgid "can't change to directory %s" msgstr "không thể chuyển sang thÆ° mục %s" -#: src/check_mandirs.c:506 +#: src/check_mandirs.c:503 #, 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:531 +#: src/check_mandirs.c:528 #, 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:594 src/check_mandirs.c:648 +#: src/check_mandirs.c:590 src/check_mandirs.c:650 msgid "done.\n" msgstr "hoàn tất.\n" -#: src/check_mandirs.c:914 +#: src/check_mandirs.c:910 #, 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" @@ -241,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:305 +#: src/globbing_test.c:59 src/man.c:304 msgid "EXTENSION" msgstr "PHẦN_MỞ_RỘNG" -#: src/globbing_test.c:59 src/man.c:306 +#: src/globbing_test.c:59 src/man.c:305 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:307 +#: src/globbing_test.c:60 src/man.c:306 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:308 +#: src/globbing_test.c:61 src/man.c:307 msgid "look for pages case-sensitively" msgstr "phân biệt chữ HOA/thường khi tìm" @@ -273,8 +273,8 @@ 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:816 src/man.c:2138 src/man.c:2220 src/man.c:2317 -#: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347 +#: src/lexgrog.l:816 src/man.c:2181 src/man.c:2263 src/man.c:2360 +#: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:347 #: src/ult_src.c:361 src/zsoelim.l:498 #, c-format msgid "can't open %s" @@ -304,15 +304,15 @@ 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:297 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:296 src/man.c:321 msgid "ENCODING" msgstr "BẢNG_MÃ" -#: src/lexgrog_test.c:73 src/man.c:322 +#: src/lexgrog_test.c:73 src/man.c:321 msgid "use selected output encoding" msgstr "dùng bảng mã xuất đã chọn" -#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:117 src/man.c:548 src/man.c:557 #, c-format msgid "%s: incompatible options" msgstr "%s: các tùy chọn không tÆ°Æ¡ng thích với nhau" @@ -322,145 +322,145 @@ msgstr "%s: các tùy chọn không tÆ°Æ¡ng thích với nhau" msgid "command exited with status %d: %s" msgstr "lệnh đã thoát với trạng thái %d: %s" -#: src/man.c:264 +#: src/man.c:263 msgid "[SECTION] PAGE..." msgstr "[PHẦN] TRANG..." -#: src/man.c:282 +#: src/man.c:281 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:283 +#: src/man.c:282 msgid "WARNINGS" msgstr "CẢNH_BÁO" -#: src/man.c:284 +#: src/man.c:283 msgid "enable warnings from groff" msgstr "bật cảnh báo từ groff" -#: src/man.c:286 +#: src/man.c:285 msgid "Main modes of operation:" msgstr "Chế độ thao tác chính:" -#: src/man.c:287 +#: src/man.c:286 msgid "equivalent to whatis" msgstr "tÆ°Æ¡ng đương với whatis" -#: src/man.c:288 +#: src/man.c:287 msgid "equivalent to apropos" msgstr "tÆ°Æ¡ng đương với apropos" -#: src/man.c:289 +#: src/man.c:288 msgid "search for text in all pages" msgstr "quét mọi trang tìm chuỗi" -#: src/man.c:290 +#: src/man.c:289 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:293 +#: src/man.c:292 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:295 +#: src/man.c:294 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:296 +#: src/man.c:295 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:297 +#: src/man.c:296 msgid "output source page encoded in ENCODING" msgstr "xuất trang mã nguồn đã mã hoá bằng BẢNG_MÃ" -#: src/man.c:299 +#: src/man.c:298 msgid "Finding manual pages:" msgstr "Đang tìm trang hướng dẫn:" -#: src/man.c:300 src/whatis.c:134 +#: src/man.c:299 src/whatis.c:133 msgid "LOCALE" msgstr "MIỀN_ĐỊA_PHƯƠNG" -#: src/man.c:300 +#: src/man.c:299 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:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "SYSTEM" msgstr "HỆ_THỐNG" -#: src/man.c:301 src/manpath.c:68 src/whatis.c:132 +#: src/man.c:300 src/manpath.c:68 src/whatis.c:131 msgid "use manual pages from other systems" msgstr "dùng trang man từ hệ thống khác" -#: src/man.c:303 src/whatis.c:130 +#: src/man.c:302 src/whatis.c:129 msgid "LIST" msgstr "DANH_SÁCH" -#: src/man.c:303 +#: src/man.c:302 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:309 +#: src/man.c:308 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:310 +#: src/man.c:309 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:311 +#: src/man.c:310 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:313 +#: src/man.c:312 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:314 +#: src/man.c:313 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:316 +#: src/man.c:315 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:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "Điều khiển định dạng cho kết xuất:" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "DÀN_TRANG" -#: src/man.c:319 +#: src/man.c:318 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:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "CHUỖI" -#: src/man.c:320 +#: src/man.c:319 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:321 +#: src/man.c:320 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:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "tắt chức năng gạch nối từ" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "tắt chức năng canh lề" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -470,34 +470,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "dùng %s để định dạng trang" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "THIẾT_BỊ" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "dùng %s với thiết bị đã chọn" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "TRÌNH_DUYỆT" -#: src/man.c:337 +#: src/man.c:336 #, 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:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "ĐỘ_PHÂN_GIẢI" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -505,100 +505,100 @@ 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:342 +#: src/man.c:341 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:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "Không có trang hướng dẫn cho \"%s\"\n" -#: src/man.c:607 +#: src/man.c:606 #, 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:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "Bạn muốn trang hướng dẫn nào?\n" -#: src/man.c:726 +#: src/man.c:767 #, 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:735 +#: src/man.c:776 #, 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:1298 +#: src/man.c:1341 #, 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:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "không thể \"chown\" (thay đổi quyền sở hữu) %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "không thể \"chmod\" (thay đổi chế độ đọc ghi) %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "không thể thay đổi tên %s thành %s" -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "không thể đặt thời gian trên %s" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "không thể bỏ liên kết %s" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "không thể tạo \"cat\" tạm cho %s" -#: src/man.c:1784 +#: src/man.c:1827 #, c-format msgid "can't create temporary directory" msgstr "không thể tạo thÆ° mục tạm thời" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "không thể mở tập tin tạm %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "không thể tạo thÆ° mục tạm thời" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "không thể gỡ bỏ thÆ° mục %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "không thể chdir (chuyển đổi thÆ° mục) sang %s" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -607,28 +607,28 @@ msgstr "" "\n" "không thể ghi vào %s trong chế độ \"catman\"" -#: src/man.c:2343 +#: src/man.c:2386 #, 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:3067 +#: src/man.c:3111 #, 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:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, 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:3420 +#: src/man.c:3466 #, 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:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Trang hướng dẫn " @@ -675,53 +675,53 @@ 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:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[ĐƯỜNG_DẪN_MAN]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "chạy im, trừ xuất cảnh báo \"giả\"" -#: src/mandb.c:110 +#: src/mandb.c:109 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:111 +#: src/mandb.c:110 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:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "chỉ tạo các cÆ¡ sở dữ liệu người dùng" -#: src/mandb.c:113 +#: src/mandb.c:112 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:114 +#: src/mandb.c:113 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:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "TÊN_TẬP_TIN" -#: src/mandb.c:115 +#: src/mandb.c:114 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:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "không thể gỡ bỏ %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "không thể ghi vào %s" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "không thể đọc từ %s" @@ -864,22 +864,22 @@ 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:246 src/ult_src.c:124 +#: src/straycats.c:247 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:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 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:314 +#: src/straycats.c:315 #, 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:353 +#: src/straycats.c:355 #, 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" @@ -889,61 +889,61 @@ msgstr "cảnh báo: không thể cập nhật bộ nhớ tạm mục lục %s" msgid "%s is self referencing" msgstr "%s tham chiếu đến chính nó" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "TỪ KHOÁ..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "Tùy chọn \"--regex\" (biểu thức chính quy) được bật theo mặc định." -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "in ra cảnh báo dạng chi tiết" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "biên dịch mỗi từ khoá nhÆ° là một biểu thức chính quy" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "tìm kiếm khớp hoàn toàn từng từ khoá một" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "(các) từ khoá chứa ký tá»± đại diện (? * v.v.)" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "yêu cầu mọi từ khoá khớp" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "đừng xén kết xuất cho bằng bề rộng của thiết bị cuối" -#: src/whatis.c:130 +#: src/whatis.c:129 msgid "search only these sections (colon-separated)" msgstr "chỉ tìm kiếm trong những phần này (ngăn cách bởi dấu hai chấm)" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "xác định miền địa phÆ°Æ¡ng cho việc tìm kiếm này" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s gì vậy?\n" -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "cảnh báo: %s chứa một vòng lặp con trỏ (pointer loop)" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(không hiểu chủ đề)" -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: không có gì thích hợp cả.\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 893167b..e2b8434 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 \n" -"POT-Creation-Date: 2014-11-07 16:16+0000\n" +"POT-Creation-Date: 2015-08-16 11:05+0100\n" "PO-Revision-Date: 2008-01-16 17:49-0600\n" "Last-Translator: Ming Hua \n" "Language-Team: Chinese (simplified) 'man foo-bar'" msgstr "" -#: src/man.c:318 +#: src/man.c:317 msgid "Controlling formatted output:" msgstr "控制格式化的输出：" -#: src/man.c:319 +#: src/man.c:318 msgid "PAGER" msgstr "PAGER" -#: src/man.c:319 +#: src/man.c:318 msgid "use program PAGER to display output" msgstr "使用 PAGER 程序显示输出文本" -#: src/man.c:320 src/man.c:329 +#: src/man.c:319 src/man.c:328 msgid "STRING" msgstr "字符串" # need-proofread -#: src/man.c:320 +#: src/man.c:319 msgid "provide the `less' pager with a prompt" msgstr "给 less pager 提供一个提示行" -#: src/man.c:321 +#: src/man.c:320 msgid "display ASCII translation of certain latin1 chars" msgstr "显示某些 latin1 字符的 ASCII 翻译形式" -#: src/man.c:324 +#: src/man.c:323 msgid "turn off hyphenation" msgstr "" -#: src/man.c:327 +#: src/man.c:326 msgid "turn off justification" msgstr "" -#: src/man.c:329 +#: src/man.c:328 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -486,34 +486,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:333 +#: src/man.c:332 #, c-format msgid "use %s to format pages" msgstr "使用 %s 对手册页排版" -#: src/man.c:334 +#: src/man.c:333 msgid "DEVICE" msgstr "设备" -#: src/man.c:335 +#: src/man.c:334 #, c-format msgid "use %s with selected device" msgstr "使用 %s 的指定设备" -#: src/man.c:336 +#: src/man.c:335 msgid "BROWSER" msgstr "浏览器" -#: src/man.c:337 +#: src/man.c:336 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "使用 %s 或指定浏览器显示 HTML 输出" -#: src/man.c:338 +#: src/man.c:337 msgid "RESOLUTION" msgstr "分辨率" -#: src/man.c:340 +#: src/man.c:339 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -521,102 +521,102 @@ msgstr "" "使用 groff 并通过 gxditview (X11) 来显示：\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:342 +#: src/man.c:341 msgid "use groff and force it to produce ditroff" msgstr "使用 groff 并强制它生成 ditroff" -#: src/man.c:605 src/man.c:729 +#: src/man.c:604 src/man.c:770 #, c-format msgid "No manual entry for %s\n" msgstr "没有 %s 的手册页条目\n" -#: src/man.c:607 +#: src/man.c:606 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(换句话问，您需要第 %s 节中的什么手册页？)\n" -#: src/man.c:611 +#: src/man.c:610 msgid "What manual page do you want?\n" msgstr "您需要什么手册页？\n" -#: src/man.c:726 +#: src/man.c:767 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "在第 %2$s 节中没有关于 %1$s 的手册页条目。\n" -#: src/man.c:735 +#: src/man.c:776 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "当没有手册页时，可以用 %s 命令来寻求帮助。\n" -#: src/man.c:1298 +#: src/man.c:1341 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "忽略未知的预处理器 `%c'" -#: src/man.c:1572 src/mandb.c:327 +#: src/man.c:1615 src/mandb.c:326 #, c-format msgid "can't chown %s" msgstr "无法 chown %s" -#: src/man.c:1584 src/mandb.c:224 +#: src/man.c:1627 src/mandb.c:223 #, c-format msgid "can't chmod %s" msgstr "无法 chmod %s" -#: src/man.c:1595 src/mandb.c:215 +#: src/man.c:1638 src/mandb.c:214 #, c-format msgid "can't rename %s to %s" msgstr "无法将 %s 改名为 %s" # need-proofread -#: src/man.c:1612 +#: src/man.c:1655 #, c-format msgid "can't set times on %s" msgstr "无法设定 %s 文件的时间" -#: src/man.c:1621 +#: src/man.c:1664 #, c-format msgid "can't unlink %s" msgstr "无法删除 (unlink) %s" -#: src/man.c:1672 +#: src/man.c:1715 #, c-format msgid "can't create temporary cat for %s" msgstr "无法为 %s 创建临时 cat 文件" -#: src/man.c:1784 +#: src/man.c:1827 #, fuzzy, c-format msgid "can't create temporary directory" msgstr "无法为 %s 创建临时 cat 文件" -#: src/man.c:1796 +#: src/man.c:1839 #, c-format msgid "can't open temporary file %s" msgstr "无法打开临时文件 %s" -#: src/man.c:1826 src/man.c:1863 src/man.c:3598 +#: src/man.c:1869 src/man.c:1906 src/man.c:3644 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "无法为 %s 创建临时 cat 文件" -#: src/man.c:1833 src/man.c:1868 +#: src/man.c:1876 src/man.c:1911 #, c-format msgid "can't remove directory %s" msgstr "无法移除目录 %s" -#: src/man.c:1980 +#: src/man.c:2023 #, 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:2028 +#: src/man.c:2071 #, c-format msgid "can't chdir to %s" msgstr "无法进入到 %s 目录中" -#: src/man.c:2262 +#: src/man.c:2305 #, c-format msgid "" "\n" @@ -625,23 +625,23 @@ msgstr "" "\n" "无法在 catman 模式下对 %s 写入" -#: src/man.c:2343 +#: src/man.c:2386 #, c-format msgid "Can't convert %s to cat name" msgstr "无法把 %s 转换为 cat 名称" # need-proofread -#: src/man.c:3067 +#: src/man.c:3111 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s：依赖于 whatis 引用是已被废弃的做法\n" -#: src/man.c:3217 src/man.c:3995 +#: src/man.c:3261 src/man.c:4030 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb 命令失败，退出状态代码为 %d" -#: src/man.c:3420 +#: src/man.c:3466 #, c-format msgid "internal error: candidate type %d out of range" msgstr "内部错误：候选类型 %d 超出正常范围" @@ -649,7 +649,7 @@ msgstr "内部错误：候选类型 %d 超出正常范围" # 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:3925 +#: src/man.c:3960 msgid " Manual page " msgstr " Manual page " @@ -699,53 +699,53 @@ msgstr "必须指定输入所用的编码" msgid "must specify an output encoding" msgstr "必须指定输出所用的编码" -#: src/mandb.c:105 +#: src/mandb.c:104 msgid "[MANPATH]" msgstr "[手册路径]" -#: src/mandb.c:109 +#: src/mandb.c:108 msgid "work quietly, except for 'bogus' warning" msgstr "安静运行，除 bogus 警告外不输出信息" -#: src/mandb.c:110 +#: src/mandb.c:109 msgid "don't look for or add stray cats to the dbs" msgstr "不要在数据库中寻找或添加流浪猫" -#: src/mandb.c:111 +#: src/mandb.c:110 msgid "don't purge obsolete entries from the dbs" msgstr "不要删除数据库中过时的旧条目" -#: src/mandb.c:112 +#: src/mandb.c:111 msgid "produce user databases only" msgstr "仅生成用户数据库" -#: src/mandb.c:113 +#: src/mandb.c:112 msgid "create dbs from scratch, rather than updating" msgstr "不更新数据库，而是重新创建数据库" -#: src/mandb.c:114 +#: src/mandb.c:113 msgid "check manual pages for correctness" msgstr "检查手册页的正确性" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "FILENAME" msgstr "文件名" -#: src/mandb.c:115 +#: src/mandb.c:114 msgid "update just the entry for this filename" msgstr "仅更新该文件名对应的条目" -#: src/mandb.c:208 +#: src/mandb.c:207 #, c-format msgid "can't remove %s" msgstr "无法移除 %s" -#: src/mandb.c:272 +#: src/mandb.c:271 #, c-format msgid "can't write to %s" msgstr "无法对 %s 写入" -#: src/mandb.c:277 +#: src/mandb.c:276 #, c-format msgid "can't read from %s" msgstr "无法从 %s 读取" @@ -894,22 +894,22 @@ msgstr "显示整个全局手册路径" msgid "warning: no global manpaths set in config file %s" msgstr "警告：在设置文件 %s 中没有设定全局手册路径" -#: src/straycats.c:246 src/ult_src.c:124 +#: src/straycats.c:247 src/ult_src.c:124 #, c-format msgid "warning: %s is a dangling symlink" msgstr "警告：%s 是悬空的符号链接" -#: src/straycats.c:249 src/ult_src.c:127 src/ult_src.c:287 +#: src/straycats.c:250 src/ult_src.c:127 src/ult_src.c:287 #, c-format msgid "can't resolve %s" msgstr "无法解析 %s" -#: src/straycats.c:314 +#: src/straycats.c:315 #, c-format msgid "Checking for stray cats under %s...\n" msgstr "正在 %s 下查找流浪猫...\n" -#: src/straycats.c:353 +#: src/straycats.c:355 #, c-format msgid "warning: can't update index cache %s" msgstr "警告：无法更新索引缓存 %s" @@ -920,64 +920,64 @@ msgstr "警告：无法更新索引缓存 %s" msgid "%s is self referencing" msgstr "%s 是指向自己的链接" -#: src/whatis.c:119 +#: src/whatis.c:118 msgid "KEYWORD..." msgstr "关键词..." -#: src/whatis.c:120 +#: src/whatis.c:119 msgid "The --regex option is enabled by default." msgstr "默认开启 --regex 选项。" -#: src/whatis.c:124 +#: src/whatis.c:123 msgid "print verbose warning messages" msgstr "输出详细的警告信息" -#: src/whatis.c:125 +#: src/whatis.c:124 msgid "interpret each keyword as a regex" msgstr "把每个关键词都当作正则表达式解读" -#: src/whatis.c:126 +#: src/whatis.c:125 msgid "search each keyword for exact match" msgstr "对每个关键词都进行严格匹配的搜索" -#: src/whatis.c:127 +#: src/whatis.c:126 msgid "the keyword(s) contain wildcards" msgstr "关键词里包含通配符" -#: src/whatis.c:128 +#: src/whatis.c:127 msgid "require all keywords to match" msgstr "要求所有的关键词都同时匹配" -#: src/whatis.c:129 +#: src/whatis.c:128 msgid "do not trim output to terminal width" msgstr "不要把输出按终端宽度截断" -#: src/whatis.c:130 +#: src/whatis.c:129 #, fuzzy msgid "search only these sections (colon-separated)" msgstr "仅在该节手册页中搜索" -#: src/whatis.c:134 +#: src/whatis.c:133 msgid "define the locale for this search" msgstr "定义本次搜索所使用的区域设置" -#: src/whatis.c:231 +#: src/whatis.c:230 #, c-format msgid "%s what?\n" msgstr "%s 什么？\n" # need-proofread -#: src/whatis.c:391 src/whatis.c:409 +#: src/whatis.c:390 src/whatis.c:408 #, c-format msgid "warning: %s contains a pointer loop" msgstr "警告：%s 包含一个指针回环" -#: src/whatis.c:403 src/whatis.c:411 +#: src/whatis.c:402 src/whatis.c:410 msgid "(unknown subject)" msgstr "(未知的主题)" # partially-translated -#: src/whatis.c:865 +#: src/whatis.c:868 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s：没有 appropriate。\n" diff --git a/src/Makefile.in b/src/Makefile.in index 012fa94..5d1e416 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -84,9 +94,6 @@ sbin_PROGRAMS = accessdb$(EXEEXT) pkglibexec_PROGRAMS = globbing$(EXEEXT) manconv$(EXEEXT) \ zsoelim$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/man_db.conf.in lexgrog.c zsoelim.c \ - $(top_srcdir)/build-aux/depcomp $(top_srcdir)/build-aux/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -298,6 +305,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = man_db.conf @@ -455,6 +463,9 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/man_db.conf.in \ + $(top_srcdir)/build-aux/depcomp $(top_srcdir)/build-aux/ylwrap \ + lexgrog.c zsoelim.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -1627,7 +1638,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -2188,6 +2198,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-pkglibexecPROGRAMS \ uninstall-hook uninstall-pkglibexecPROGRAMS \ uninstall-sbinPROGRAMS +.PRECIOUS: Makefile + apropos$(EXEEXT): whatis$(EXEEXT) rm -f $@ diff --git a/src/accessdb.c b/src/accessdb.c index da08e5e..75a5c01 100644 --- a/src/accessdb.c +++ b/src/accessdb.c @@ -51,7 +51,6 @@ const char *cat_root; /* for db_storage.c */ char *database; -MYDBM_FILE dbf; const char *argp_program_version = "accessdb " PACKAGE_VERSION; const char *argp_program_bug_address = PACKAGE_BUGREPORT; @@ -105,6 +104,7 @@ static struct argp argp = { options, parse_opt, args_doc, doc, 0, int main (int argc, char *argv[]) { + MYDBM_FILE dbf; datum key; int ret = OK; @@ -148,10 +148,10 @@ int main (int argc, char *argv[]) *t = ' '; printf ("%s -> \"%s\"\n", nicekey, MYDBM_DPTR (content)); free (nicekey); - MYDBM_FREE (MYDBM_DPTR (content)); + MYDBM_FREE_DPTR (content); next: nextkey = MYDBM_NEXTKEY (dbf, key); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); key = nextkey; } diff --git a/src/catman.c b/src/catman.c index 44217bd..8bd17f7 100644 --- a/src/catman.c +++ b/src/catman.c @@ -82,7 +82,7 @@ /* globals */ char *program_name; int quiet = 1; -MYDBM_FILE dbf; +MYDBM_FILE dbf_close_post_fork; char *manp; extern char *user_config_file; char *database; @@ -164,22 +164,11 @@ static char *locale; static char *manpathlist[MAXDIRS]; -/* open db for reading, return 0 for success, errcode for failure */ -static int rdopen_db (void) -{ - dbf = MYDBM_RDOPEN (database); - if (dbf == NULL) { - error (0, errno, _("cannot read database %s"), database); - return 1; - } - return 0; -} - static void post_fork (void) { pop_all_cleanups (); - if (dbf) - MYDBM_CLOSE (dbf); + if (dbf_close_post_fork) + MYDBM_CLOSE (dbf_close_post_fork); } /* Execute man with the appropriate catman args. Always frees cmd. @@ -233,13 +222,22 @@ static inline size_t add_arg (pipecmd *cmd, datum key) ultimate source files. */ static int parse_for_sec (const char *manpath, const char *section) { + MYDBM_FILE dbf; pipecmd *basecmd, *cmd; datum key; size_t arg_size, initial_bit; int message = 1, first_arg; - if (rdopen_db () || dbver_rd (dbf)) + dbf = MYDBM_RDOPEN (database); + if (!dbf) { + error (0, errno, _("cannot read database %s"), database); return 1; + } + if (dbver_rd (dbf)) { + MYDBM_CLOSE (dbf); + return 1; + } + dbf_close_post_fork = dbf; basecmd = pipecmd_new (MAN); pipecmd_clearenv (basecmd); @@ -321,16 +319,16 @@ static int parse_for_sec (const char *manpath, const char *section) /* we don't need the content ever again */ assert (MYDBM_DPTR (content)); /* just to be sure */ - MYDBM_FREE (MYDBM_DPTR (content)); + MYDBM_FREE_DPTR (content); } nextkey = MYDBM_NEXTKEY (dbf, key); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); key = nextkey; } + dbf_close_post_fork = NULL; MYDBM_CLOSE (dbf); - dbf = NULL; if (pipecmd_get_nargs (cmd) > first_arg) catman (cmd); else diff --git a/src/check_mandirs.c b/src/check_mandirs.c index ea59778..46911c6 100644 --- a/src/check_mandirs.c +++ b/src/check_mandirs.c @@ -117,7 +117,7 @@ static void gripe_rwopen_failed (void) * otherwise cache it in case we trace another manpage back to it. Next, * store it in the db along with any references found in the whatis. */ -void test_manfile (const char *file, const char *path) +void test_manfile (MYDBM_FILE dbf, const char *file, const char *path) { char *manpage_base; const char *ult; @@ -157,7 +157,7 @@ void test_manfile (const char *file, const char *path) * save both an ult_src() and a find_name(), amongst other wastes of * time. */ - exists = dblookup_exact (manpage_base, info.ext, 1); + exists = dblookup_exact (dbf, manpage_base, info.ext, 1); /* Ensure we really have the actual page. Gzip keeps the mtime the * same when it compresses, so we have to compare compression @@ -181,7 +181,7 @@ void test_manfile (const char *file, const char *path) exists, "man"); if (!abs_filename) { if (!opt_test) - dbdelete (manpage_base, exists); + dbdelete (dbf, manpage_base, exists); } else { gripe_multi_extensions (path, exists->sec, manpage_base, @@ -284,7 +284,7 @@ void test_manfile (const char *file, const char *path) parse_descriptions (manpage_base, lg.whatis); if (descs) { if (!opt_test) - store_descriptions (descs, &info, + store_descriptions (dbf, descs, &info, path, manpage_base, &whatis->trace); free_descriptions (descs); @@ -305,7 +305,8 @@ void test_manfile (const char *file, const char *path) free (lg.whatis); } -static inline void add_dir_entries (const char *path, char *infile) +static inline void add_dir_entries (MYDBM_FILE dbf, + const char *path, char *infile) { char *manpage; int len; @@ -351,7 +352,7 @@ static inline void add_dir_entries (const char *path, char *infile) for (i = 0; i < names_len; ++i) { manpage = appendstr (manpage, names[i], NULL); - test_manfile (manpage, path); + test_manfile (dbf, manpage, path); *(manpage + len) = '\0'; free (names[i]); } @@ -457,6 +458,7 @@ static int testmandirs (const char *path, const char *catpath, while( (mandir = readdir (dir)) ) { struct stat stbuf; struct timespec mtime; + MYDBM_FILE dbf; if (strncmp (mandir->d_name, "man", 3) != 0) continue; @@ -481,11 +483,6 @@ static int testmandirs (const char *path, const char *catpath, debug ("\tsubdirectory %s has been 'modified'\n", mandir->d_name); - if (dbf) { - MYDBM_CLOSE (dbf); - dbf = NULL; - } - if (create && !created) { /* We seem to have something to do, so create the * database now. @@ -533,9 +530,8 @@ static int testmandirs (const char *path, const char *catpath, if (!tty) fprintf (stderr, "\n"); } - add_dir_entries (path, mandir->d_name); + add_dir_entries (dbf, path, mandir->d_name); MYDBM_CLOSE (dbf); - dbf = NULL; amount++; } closedir (dir); @@ -546,6 +542,7 @@ static int testmandirs (const char *path, const char *catpath, /* update the modification timestamp of `database' */ static void update_db_time (void) { + MYDBM_FILE dbf; struct timespec now; /* Open the db in RW to update its mtime */ @@ -573,7 +570,6 @@ static void update_db_time (void) MYDBM_SET_TIME (dbf, now); MYDBM_CLOSE (dbf); - dbf = NULL; } /* routine to prepare/create the db prior to calling testmandirs() */ @@ -598,7 +594,7 @@ int create_db (const char *manpath, const char *catpath) } /* Make sure an existing database is essentially sane. */ -static int sanity_check_db (void) +static int sanity_check_db (MYDBM_FILE dbf) { datum key; @@ -613,12 +609,12 @@ static int sanity_check_db (void) if (!MYDBM_DPTR (content)) { debug ("warning: %s has a key with no content (%s); " "rebuilding\n", database, MYDBM_DPTR (key)); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); return 0; } - MYDBM_FREE (MYDBM_DPTR (content)); + MYDBM_FREE_DPTR (content); nextkey = MYDBM_NEXTKEY (dbf, key); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); key = nextkey; } @@ -629,40 +625,39 @@ static int sanity_check_db (void) filesystem */ int update_db (const char *manpath, const char *catpath) { + MYDBM_FILE dbf; + struct timespec mtime; + int new; + dbf = MYDBM_RDOPEN (database); - if (dbf && !sanity_check_db ()) { + if (dbf && !sanity_check_db (dbf)) { MYDBM_CLOSE (dbf); dbf = NULL; } - if (dbf) { - struct timespec mtime = MYDBM_GET_TIME (dbf); - int new; + if (!dbf) { + debug ("failed to open %s O_RDONLY\n", database); + return EOF; + } + mtime = MYDBM_GET_TIME (dbf); + MYDBM_CLOSE (dbf); - debug ("update_db(): %ld.%09ld\n", - (long) mtime.tv_sec, mtime.tv_nsec); - new = testmandirs (manpath, catpath, mtime, 0); + debug ("update_db(): %ld.%09ld\n", (long) mtime.tv_sec, mtime.tv_nsec); + new = testmandirs (manpath, catpath, mtime, 0); - if (new) { - update_db_time (); - if (!quiet) - fputs (_("done.\n"), stderr); - } - - return new; + if (new) { + update_db_time (); + if (!quiet) + fputs (_("done.\n"), stderr); } - - debug ("failed to open %s O_RDONLY\n", database); - - return EOF; + + return new; } /* Purge any entries pointing to name. This currently assumes that pointers * are always shallow, which may not be a good assumption yet; it should be * close, though. - * - * Assumes that the appropriate database is already open on dbf. */ -void purge_pointers (const char *name) +void purge_pointers (MYDBM_FILE dbf, const char *name) { datum key = MYDBM_FIRSTKEY (dbf); @@ -696,7 +691,7 @@ void purge_pointers (const char *name) if (STREQ (entry.pointer, name)) { if (!opt_test) - dbdelete (nicekey, &entry); + dbdelete (dbf, nicekey, &entry); else debug ("%s(%s): pointer vanished, " "would delete\n", nicekey, entry.ext); @@ -704,10 +699,10 @@ void purge_pointers (const char *name) pointers_contentnext: free (nicekey); - MYDBM_FREE (MYDBM_DPTR (content)); + MYDBM_FREE_DPTR (content); pointers_next: nextkey = MYDBM_NEXTKEY (dbf, key); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); key = nextkey; } } @@ -757,8 +752,8 @@ static int count_glob_matches (const char *name, const char *ext, /* Decide whether to purge a reference to a "normal" (ULT_MAN or SO_MAN) * page. */ -static int purge_normal (const char *name, struct mandata *info, - char **found) +static int purge_normal (MYDBM_FILE dbf, const char *name, + struct mandata *info, char **found) { struct timespec t; @@ -771,7 +766,7 @@ static int purge_normal (const char *name, struct mandata *info, return 0; if (!opt_test) - dbdelete (name, info); + dbdelete (dbf, name, info); else debug ("%s(%s): missing page, would delete\n", name, info->ext); @@ -780,8 +775,8 @@ static int purge_normal (const char *name, struct mandata *info, } /* Decide whether to purge a reference to a WHATIS_MAN or WHATIS_CAT page. */ -static int purge_whatis (const char *path, int cat, const char *name, - struct mandata *info, char **found, +static int purge_whatis (MYDBM_FILE dbf, const char *path, int cat, + const char *name, struct mandata *info, char **found, struct timespec db_mtime) { /* TODO: On some systems, the cat page extension differs from the @@ -808,7 +803,7 @@ static int purge_whatis (const char *path, int cat, const char *name, * says; that's fixed now, so delete and force a rescan. */ if (!opt_test) - dbdelete (name, info); + dbdelete (dbf, name, info); else debug ("%s(%s): whatis with empty pointer, " "would delete\n", name, info->ext); @@ -837,7 +832,7 @@ static int purge_whatis (const char *path, int cat, const char *name, return 0; if (!opt_test) - dbdelete (name, info); + dbdelete (dbf, name, info); else debug ("%s(%s): whatis target was deleted, " "would delete\n", name, info->ext); @@ -895,6 +890,7 @@ int purge_missing (const char *manpath, const char *catpath, #endif struct stat st; int db_exists; + MYDBM_FILE dbf; datum key; int count = 0; struct timespec db_mtime; @@ -918,7 +914,7 @@ int purge_missing (const char *manpath, const char *catpath, gripe_rwopen_failed (); return 0; } - if (!sanity_check_db ()) { + if (!sanity_check_db (dbf)) { MYDBM_CLOSE (dbf); dbf = NULL; return 0; @@ -937,7 +933,7 @@ int purge_missing (const char *manpath, const char *catpath, /* Ignore db identifier keys. */ if (*MYDBM_DPTR (key) == '$') { nextkey = MYDBM_NEXTKEY (dbf, key); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); key = nextkey; continue; } @@ -945,7 +941,7 @@ int purge_missing (const char *manpath, const char *catpath, content = MYDBM_FETCH (dbf, key); if (!MYDBM_DPTR (content)) { nextkey = MYDBM_NEXTKEY (dbf, key); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); key = nextkey; continue; } @@ -961,9 +957,9 @@ int purge_missing (const char *manpath, const char *catpath, if (check_multi_key (nicekey, MYDBM_DPTR (content))) MYDBM_DELETE (dbf, key); free (nicekey); - MYDBM_FREE (MYDBM_DPTR (content)); + MYDBM_FREE_DPTR (content); nextkey = MYDBM_NEXTKEY (dbf, key); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); key = nextkey; continue; } @@ -989,19 +985,19 @@ int purge_missing (const char *manpath, const char *catpath, */ if (entry.id == ULT_MAN || entry.id == SO_MAN || entry.id == STRAY_CAT) - count += purge_normal (nicekey, &entry, found); + count += purge_normal (dbf, nicekey, &entry, found); else if (entry.id == WHATIS_MAN) - count += purge_whatis (manpath, 0, nicekey, + count += purge_whatis (dbf, manpath, 0, nicekey, &entry, found, db_mtime); else /* entry.id == WHATIS_CAT */ - count += purge_whatis (catpath, 1, nicekey, + count += purge_whatis (dbf, catpath, 1, nicekey, &entry, found, db_mtime); free (nicekey); free_mandata_elements (&entry); nextkey = MYDBM_NEXTKEY (dbf, key); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (key); key = nextkey; } @@ -1013,6 +1009,5 @@ int purge_missing (const char *manpath, const char *catpath, */ MYDBM_SET_TIME (dbf, db_mtime); MYDBM_CLOSE (dbf); - dbf = NULL; return count; } diff --git a/src/check_mandirs.h b/src/check_mandirs.h index b5aab9c..39f68d2 100644 --- a/src/check_mandirs.h +++ b/src/check_mandirs.h @@ -23,9 +23,9 @@ #include "db_storage.h" /* check_mandirs.c */ -extern void test_manfile (const char *file, const char *path); +extern void test_manfile (MYDBM_FILE dbf, const char *file, const char *path); extern int create_db (const char *manpath, const char *catpath); extern int update_db (const char *manpath, const char *catpath); -extern void purge_pointers (const char *name); +extern void purge_pointers (MYDBM_FILE dbf, const char *name); extern int purge_missing (const char *manpath, const char *catpath, int will_run_mandb); diff --git a/src/descriptions.h b/src/descriptions.h index 1f101b0..a0161be 100644 --- a/src/descriptions.h +++ b/src/descriptions.h @@ -32,7 +32,8 @@ struct ult_trace; extern struct page_description *parse_descriptions (const char *base, const char *whatis); -extern void store_descriptions (const struct page_description *head, +extern void store_descriptions (MYDBM_FILE dbf, + const struct page_description *head, struct mandata *info, const char *path, const char *base, struct ult_trace *trace); diff --git a/src/descriptions_store.c b/src/descriptions_store.c index f2c566c..c473aee 100644 --- a/src/descriptions_store.c +++ b/src/descriptions_store.c @@ -60,7 +60,7 @@ static int is_prefix (const char *path, const char *dir) /* Take a list of descriptions returned by parse_descriptions() and store * it into the database. */ -void store_descriptions (const struct page_description *head, +void store_descriptions (MYDBM_FILE dbf, const struct page_description *head, struct mandata *info, const char *path, const char *base, struct ult_trace *trace) @@ -140,7 +140,7 @@ void store_descriptions (const struct page_description *head, } debug ("name = '%s', id = %c\n", desc->name, info->id); - if (dbstore (info, desc->name) > 0) { + if (dbstore (dbf, info, desc->name) > 0) { gripe_bad_store (base, info->ext); break; } diff --git a/src/man.c b/src/man.c index e451546..f0a6e8b 100644 --- a/src/man.c +++ b/src/man.c @@ -190,7 +190,6 @@ static char *manpathlist[MAXDIRS]; int quiet = 1; char *program_name; char *database = NULL; -MYDBM_FILE dbf; extern const char *extension; /* for globbing.c */ extern char *user_config_file; /* defined in manp.c */ extern int disable_cache; @@ -613,6 +612,48 @@ static void gripe_no_name (const char *sect) exit (FAIL); } +/* In case we're set-id, double-check that our standard file descriptors are + * open in a standard way. See: + * + * http://austingroupbugs.net/view.php?id=173 + */ +static void check_standard_fds (void) +{ + int flags, mode; + + /* We can't even write an error message in this case, so check it + * first. + */ + flags = fcntl (2, F_GETFL); + if (flags < 0) + exit (FATAL); + mode = flags & O_ACCMODE; + if (mode != O_WRONLY && mode != O_RDWR) + exit (FATAL); + + flags = fcntl (0, F_GETFL); + if (flags < 0) { + fprintf (stderr, "stdin not open!\n"); + exit (FATAL); + } + mode = flags & O_ACCMODE; + if (mode != O_RDONLY && mode != O_RDWR) { + fprintf (stderr, "stdin not open for reading!\n"); + exit (FATAL); + } + + flags = fcntl (1, F_GETFL); + if (flags < 0) { + fprintf (stderr, "stdout not open!\n"); + exit (FATAL); + } + mode = flags & O_ACCMODE; + if (mode != O_WRONLY && mode != O_RDWR) { + fprintf (stderr, "stdout not open for reading!\n"); + exit (FATAL); + } +} + static struct termios tms; static int tms_set = 0; @@ -747,6 +788,8 @@ static void do_extern (int argc, char *argv[]) /* Please keep these in the same order as they are in whatis.c. */ if (debug_level) pipecmd_arg (cmd, "-d"); + if (local_man_file) /* actually apropos/whatis --long */ + pipecmd_arg (cmd, "-l"); if (colon_sep_section_list) pipecmd_args (cmd, "-s", colon_sep_section_list, NULL); if (alt_system_name) @@ -3030,12 +3073,13 @@ out: static void dbdelete_wrapper (const char *page, struct mandata *info) { if (!catman) { + MYDBM_FILE dbf; + dbf = MYDBM_RWOPEN (database); if (dbf) { - if (dbdelete (page, info) == 1) + if (dbdelete (dbf, page, info) == 1) debug ("%s(%s) not in db!\n", page, info->ext); MYDBM_CLOSE (dbf); - dbf = NULL; } } } @@ -3263,6 +3307,8 @@ static int try_db (const char *manpath, const char *sec, const char *name, data = hashtable_lookup (db_hash, manpath, strlen (manpath)); if (!data) { + MYDBM_FILE dbf; + dbf = MYDBM_RDOPEN (database); if (dbf && dbver_rd (dbf)) { MYDBM_CLOSE (dbf); @@ -3275,10 +3321,10 @@ static int try_db (const char *manpath, const char *sec, const char *name, otherwise NULL retrieves all available */ if (regex_opt || wildcard) data = dblookup_pattern - (name, section, match_case, + (dbf, name, section, match_case, regex_opt, !names_only); else - data = dblookup_all (name, section, + data = dblookup_all (dbf, name, section, match_case); hashtable_install (db_hash, manpath, strlen (manpath), data); @@ -3806,6 +3852,8 @@ int main (int argc, char *argv[]) program_name = base_name (argv[0]); + check_standard_fds (); + init_debug (); pipeline_install_post_fork (pop_all_cleanups); @@ -3825,19 +3873,6 @@ int main (int argc, char *argv[]) global_argv = argv; #endif - { /* opens base streams in case someone like "info" closed them */ - struct stat buf; - if (STDIN_FILENO < 0 || - ((fstat (STDIN_FILENO, &buf) < 0) && (errno == EBADF))) - freopen ("/dev/null", "r", stdin); - if (STDOUT_FILENO < 0 || - ((fstat (STDOUT_FILENO, &buf) < 0) && (errno == EBADF))) - freopen ("/dev/null", "w", stdout); - if (STDERR_FILENO < 0 || - ((fstat (STDERR_FILENO, &buf) < 0) && (errno == EBADF))) - freopen ("/dev/null", "w", stderr); - } - /* This will enable us to do some profiling and know where gmon.out * will end up. Must restore_cwd (&cwd) before we return. */ diff --git a/src/mandb.c b/src/mandb.c index 21b8782..0b0f8e6 100644 --- a/src/mandb.c +++ b/src/mandb.c @@ -74,7 +74,6 @@ char *program_name; int quiet = 1; extern int opt_test; /* don't update db */ -MYDBM_FILE dbf; char *manp; char *database = NULL; extern char *extension; /* for globbing.c */ @@ -348,6 +347,8 @@ static inline void do_chown (uid_t uid) /* Update a single file in an existing database. */ static int update_one_file (const char *manpath, const char *filename) { + MYDBM_FILE dbf; + dbf = MYDBM_RWOPEN (database); if (dbf) { struct mandata info; @@ -356,16 +357,15 @@ static int update_one_file (const char *manpath, const char *filename) memset (&info, 0, sizeof (struct mandata)); manpage = filename_info (filename, &info, ""); if (info.name) { - dbdelete (info.name, &info); - purge_pointers (info.name); + dbdelete (dbf, info.name, &info); + purge_pointers (dbf, info.name); free (info.name); } free (manpage); - test_manfile (filename, manpath); + test_manfile (dbf, filename, manpath); } MYDBM_CLOSE (dbf); - dbf = NULL; return 1; } diff --git a/src/straycats.c b/src/straycats.c index 69615f6..d3f89b7 100644 --- a/src/straycats.c +++ b/src/straycats.c @@ -63,7 +63,7 @@ static char *catdir, *mandir; -static int check_for_stray (void) +static int check_for_stray (MYDBM_FILE dbf) { DIR *cdir; struct dirent *catlist; @@ -193,7 +193,8 @@ static int check_for_stray (void) /* see if we already have it, before going any further */ mandir_base = base_name (mandir); - exists = dblookup_exact (mandir_base, info.ext, 1); + exists = dblookup_exact (dbf, mandir_base, info.ext, + 1); #ifndef FAVOUR_STRAYCATS if (exists && exists->id != WHATIS_CAT) #else /* FAVOUR_STRAYCATS */ @@ -270,7 +271,7 @@ static int check_for_stray (void) (mandir_base, lg.whatis); if (descs) { store_descriptions - (descs, &info, + (dbf, descs, &info, NULL, mandir_base, NULL); free_descriptions (descs); @@ -297,7 +298,7 @@ next_name: return strays; } -static int open_catdir (void) +static int open_catdir (MYDBM_FILE dbf) { DIR *cdir; struct dirent *catlist; @@ -331,7 +332,7 @@ static int open_catdir (void) *(t1 = mandir + manlen) = 'm'; *(t1 + 2) = 'n'; - strays += check_for_stray (); + strays += check_for_stray (dbf); *(catdir + catlen) = *(mandir + manlen) = '\0'; } @@ -341,6 +342,7 @@ static int open_catdir (void) int straycats (const char *manpath) { + MYDBM_FILE dbf; char *catpath; int strays; @@ -360,7 +362,7 @@ int straycats (const char *manpath) /* look in the usual catpath location */ mandir = xstrdup (manpath); catdir = xstrdup (manpath); - strays = open_catdir (); + strays = open_catdir (dbf); /* look in the alternate catpath location if we have one and it's different from the usual catpath */ @@ -372,7 +374,7 @@ int straycats (const char *manpath) *mandir = *catdir = '\0'; mandir = appendstr (mandir, manpath, NULL); catdir = appendstr (catdir, catpath, NULL); - strays += open_catdir (); + strays += open_catdir (dbf); } free (mandir); @@ -382,6 +384,5 @@ int straycats (const char *manpath) free (catpath); MYDBM_CLOSE (dbf); - dbf = NULL; return strays; } diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index d1e116e..742f6b8 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = fspause$(EXEEXT) subdir = src/tests -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_check_SCRIPTS) $(top_srcdir)/build-aux/depcomp \ - $(top_srcdir)/build-aux/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -292,6 +299,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_check_SCRIPTS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -569,6 +578,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log) TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1606,7 +1618,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/tests/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1755,7 +1766,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2199,6 +2210,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/whatis.c b/src/whatis.c index 2dae427..39aa093 100644 --- a/src/whatis.c +++ b/src/whatis.c @@ -86,7 +86,6 @@ static int num_keywords; char *program_name; int am_apropos; char *database; -MYDBM_FILE dbf; int quiet = 1; #ifdef HAVE_ICONV @@ -354,7 +353,7 @@ static void use_grep (const char * const *pages, int num_pages, char *manpath, free (whatis_file); } -static struct mandata *resolve_pointers (struct mandata *info, +static struct mandata *resolve_pointers (MYDBM_FILE dbf, struct mandata *info, const char *page) { int rounds; @@ -369,7 +368,7 @@ static struct mandata *resolve_pointers (struct mandata *info, * arbitrary: it's just there to avoid an infinite loop. */ newpage = info->pointer; - info = dblookup_exact (newpage, info->ext, 1); + info = dblookup_exact (dbf, newpage, info->ext, 1); for (rounds = 0; rounds < 10; rounds++) { struct mandata *newinfo; @@ -382,7 +381,7 @@ static struct mandata *resolve_pointers (struct mandata *info, STREQ (info->pointer, newpage))) return info; - newinfo = dblookup_exact (info->pointer, info->ext, 1); + newinfo = dblookup_exact (dbf, info->pointer, info->ext, 1); free_mandata_struct (info); info = newinfo; } @@ -412,7 +411,7 @@ static char *get_whatis (struct mandata *info, const char *page) } /* print out any matches found */ -static void display (struct mandata *info, const char *page) +static void display (MYDBM_FILE dbf, struct mandata *info, const char *page) { struct mandata *newinfo; char *string, *whatis, *string_conv; @@ -420,7 +419,7 @@ static void display (struct mandata *info, const char *page) char *key; int line_len, rest; - newinfo = resolve_pointers (info, page); + newinfo = resolve_pointers (dbf, info, page); whatis = get_whatis (newinfo, page); if (newinfo == NULL) newinfo = info; @@ -439,7 +438,7 @@ static void display (struct mandata *info, const char *page) line_len = get_line_length (); - if (strlen (page_name) > (size_t) (line_len / 2)) + if (!long_output && strlen (page_name) > (size_t) (line_len / 2)) string = xasprintf ("%.*s...", line_len / 2 - 3, page_name); else string = xstrdup (page_name); @@ -477,16 +476,17 @@ out: } /* lookup the page and display the results */ -static inline int do_whatis_section (const char *page, const char *section) +static inline int do_whatis_section (MYDBM_FILE dbf, + const char *page, const char *section) { struct mandata *info; int count = 0; - info = dblookup_all (page, section, 0); + info = dblookup_all (dbf, page, section, 0); while (info) { struct mandata *pinfo; - display (info, page); + display (dbf, info, page); count++; pinfo = info->next; /* go on to next structure */ free_mandata_elements (info); @@ -526,7 +526,8 @@ static int suitable_manpath (const char *manpath, const char *page_dir) return ret; } -static void do_whatis (const char * const *pages, int num_pages, +static void do_whatis (MYDBM_FILE dbf, + const char * const *pages, int num_pages, const char *manpath, int *found) { int i; @@ -564,11 +565,11 @@ static void do_whatis (const char * const *pages, int num_pages, char * const *section; for (section = sections; *section; ++section) { - if (do_whatis_section (page, *section)) + if (do_whatis_section (dbf, page, *section)) found[i] = 1; } } else { - if (do_whatis_section (page, NULL)) + if (do_whatis_section (dbf, page, NULL)) found[i] = 1; } @@ -693,7 +694,8 @@ static void parse_whatis (const char * const *pages, char * const *lowpages, #undef BTREE /* scan for the page, print any matches */ -static void do_apropos (const char * const *pages, int num_pages, int *found) +static void do_apropos (MYDBM_FILE dbf, + const char * const *pages, int num_pages, int *found) { datum key, cont; char **lowpages; @@ -789,19 +791,19 @@ static void do_apropos (const char * const *pages, int num_pages, int *found) parse_name (pages, num_pages, MYDBM_DPTR (key), found, found_here); if (combine (num_pages, found_here)) - display (&info, MYDBM_DPTR (key)); + display (dbf, &info, MYDBM_DPTR (key)); if (tab) *tab = '\t'; nextpage: #ifndef BTREE nextkey = MYDBM_NEXTKEY (dbf, key); - MYDBM_FREE (MYDBM_DPTR (cont)); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (cont); + MYDBM_FREE_DPTR (key); key = nextkey; #else /* BTREE */ - MYDBM_FREE (MYDBM_DPTR (cont)); - MYDBM_FREE (MYDBM_DPTR (key)); + MYDBM_FREE_DPTR (cont); + MYDBM_FREE_DPTR (key); end = btree_nextkeydata (dbf, &key, &cont); #endif /* !BTREE */ info.addr = NULL; /* == MYDBM_DPTR (cont), freed above */ @@ -821,6 +823,8 @@ static int search (const char * const *pages, int num_pages) int any_found, i; for (mp = manpathlist; *mp; mp++) { + MYDBM_FILE dbf; + catpath = get_catpath (*mp, SYSTEM_CAT | USER_CAT); if (catpath) { @@ -842,17 +846,16 @@ static int search (const char * const *pages, int num_pages) } if (am_apropos) - do_apropos (pages, num_pages, found); + do_apropos (dbf, pages, num_pages, found); else { if (regex_opt || wildcard) - do_apropos (pages, num_pages, found); + do_apropos (dbf, pages, num_pages, found); else - do_whatis (pages, num_pages, *mp, found); + do_whatis (dbf, pages, num_pages, *mp, found); } free (database); database = NULL; MYDBM_CLOSE (dbf); - dbf = NULL; } chkr_garbage_detector (); diff --git a/tools/Makefile.in b/tools/Makefile.in index a62cc50..51b4bbc 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tools -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_noinst_SCRIPTS) $(dist_noinst_DATA) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/m4/man-arg-automatic-update.m4 \ @@ -292,6 +300,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_SCRIPTS) \ + $(dist_noinst_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -318,6 +328,7 @@ am__can_run_installinfo = \ esac DATA = $(dist_noinst_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1331,7 +1342,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tools/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1506,6 +1516,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- 2.7.4