diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2022-01-03 15:16:06 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2022-01-03 15:16:06 +0900 |
| commit | dea3b44eda2de950e16ed387cc21ca00660c172f (patch) | |
| tree | fc81b57130a71ad979b9bd1ed1bcee92f446eb85 | |
| parent | 038e1f38eea308b5df7bdace890eb43fe051b19e (diff) | |
| download | man-db-dea3b44eda2de950e16ed387cc21ca00660c172f.tar.gz man-db-dea3b44eda2de950e16ed387cc21ca00660c172f.tar.bz2 man-db-dea3b44eda2de950e16ed387cc21ca00660c172f.zip | |
Imported Upstream version 2.7.4upstream/2.7.4
| -rw-r--r-- | NEWS | 20 | ||||
| -rwxr-xr-x | build-aux/config.guess | 47 | ||||
| -rwxr-xr-x | build-aux/config.sub | 36 | ||||
| -rwxr-xr-x | configure | 24 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | docs/man-db.lsm | 6 | ||||
| -rw-r--r-- | man/Makefile.in | 11 | ||||
| -rw-r--r-- | man/Rules.man | 11 | ||||
| -rw-r--r-- | man/THANKS | 1 | ||||
| -rw-r--r-- | man/da/Makefile.in | 11 | ||||
| -rw-r--r-- | man/de/Makefile.in | 11 | ||||
| -rw-r--r-- | man/es/Makefile.in | 11 | ||||
| -rw-r--r-- | man/fr/Makefile.in | 11 | ||||
| -rw-r--r-- | man/id/Makefile.in | 11 | ||||
| -rw-r--r-- | man/it/Makefile.in | 11 | ||||
| -rw-r--r-- | man/it/man1/manpath.man1 | 6 | ||||
| -rw-r--r-- | man/ja/Makefile.in | 11 | ||||
| -rw-r--r-- | man/nl/Makefile.in | 11 | ||||
| -rw-r--r-- | man/pl/Makefile.in | 11 | ||||
| -rw-r--r-- | man/po4a/po/zh_CN.po | 460 | ||||
| -rw-r--r-- | man/ru/Makefile.in | 11 | ||||
| -rw-r--r-- | man/zh_CN/Makefile.in | 11 | ||||
| -rw-r--r-- | po/ca.po | 24 | ||||
| -rw-r--r-- | po/cs.po | 24 | ||||
| -rw-r--r-- | po/da.po | 24 | ||||
| -rw-r--r-- | po/de.po | 24 | ||||
| -rw-r--r-- | po/eo.po | 24 | ||||
| -rw-r--r-- | po/es.po | 24 | ||||
| -rw-r--r-- | po/fi.po | 24 | ||||
| -rw-r--r-- | po/fr.po | 24 | ||||
| -rw-r--r-- | po/id.po | 24 | ||||
| -rw-r--r-- | po/it.po | 24 | ||||
| -rw-r--r-- | po/ja.po | 24 | ||||
| -rw-r--r-- | po/man-db.pot | 28 | ||||
| -rw-r--r-- | po/nl.po | 24 | ||||
| -rw-r--r-- | po/pl.po | 24 | ||||
| -rw-r--r-- | po/pt_BR.po | 24 | ||||
| -rw-r--r-- | po/ro.po | 24 | ||||
| -rw-r--r-- | po/ru.po | 24 | ||||
| -rw-r--r-- | po/sr.po | 24 | ||||
| -rw-r--r-- | po/sv.po | 24 | ||||
| -rw-r--r-- | po/vi.po | 24 | ||||
| -rw-r--r-- | po/zh_CN.po | 24 | ||||
| -rw-r--r-- | src/man.c | 31 | ||||
| -rw-r--r-- | src/manp.c | 2 |
45 files changed, 616 insertions, 672 deletions
@@ -1,3 +1,23 @@ +man-db 2.7.4 (8 October 2015) +============================= + +Major changes since man-db 2.7.3: + + Fixes: + ------ + + o Fix crash when eliminating manpath duplicates if canonicalising a + manpath entry fails. + + o Fix a build system bug that sometimes caused substitutions in + manual pages to be left unexpanded. + + o man exits with status 3 rather than 0 if its formatting command + exits non-zero, even if its display command exits zero. + + o man honours MANWIDTH in conjunction with the -Z option, to make it + easier to diagnose warnings in manual pages. + man-db 2.7.3 (9 September 2015) =============================== diff --git a/build-aux/config.guess b/build-aux/config.guess index 1f5c50c..1659250 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2015-08-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ timestamp='2014-03-23' # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to <config-patches@gnu.org>. me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -168,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -197,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -207,13 +221,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -235,6 +249,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -579,8 +596,9 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -932,6 +950,9 @@ EOF crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -1020,7 +1041,7 @@ EOF echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} diff --git a/build-aux/config.sub b/build-aux/config.sub index bba4efb..1acc966 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-09-11' +timestamp='2015-08-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ timestamp='2014-09-11' # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to <config-patches@gnu.org>. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -255,12 +255,13 @@ case $basic_machine in | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ @@ -305,7 +306,7 @@ case $basic_machine in | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -313,6 +314,7 @@ case $basic_machine in | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -327,6 +329,9 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -372,12 +377,13 @@ case $basic_machine in | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ @@ -424,12 +430,13 @@ case $basic_machine in | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -437,6 +444,7 @@ case $basic_machine in | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -513,6 +521,9 @@ case $basic_machine in basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -774,6 +785,9 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -1365,7 +1379,7 @@ case $os in | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -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.3. +# Generated by GNU Autoconf 2.69 for man-db 2.7.4. # # Report bugs to <cjwatson@debian.org>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='man-db' PACKAGE_TARNAME='man-db' -PACKAGE_VERSION='2.7.3' -PACKAGE_STRING='man-db 2.7.3' +PACKAGE_VERSION='2.7.4' +PACKAGE_STRING='man-db 2.7.4' PACKAGE_BUGREPORT='cjwatson@debian.org' PACKAGE_URL='' @@ -2278,7 +2278,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.3 to adapt to many kinds of systems. +\`configure' configures man-db 2.7.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2349,7 +2349,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of man-db 2.7.3:";; + short | recursive ) echo "Configuration of man-db 2.7.4:";; esac cat <<\_ACEOF @@ -2530,7 +2530,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -man-db configure 2.7.3 +man-db configure 2.7.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3239,7 +3239,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.3, which was +It was created by man-db $as_me 2.7.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4195,7 +4195,7 @@ fi # Define the identity of the package. PACKAGE='man-db' - VERSION='2.7.3' + VERSION='2.7.4' cat >>confdefs.h <<_ACEOF @@ -13279,8 +13279,8 @@ ac_config_headers="$ac_config_headers config.h" # Define below date and version information to be put into man pages etc. -date=2015-09-09 -roff_version=`echo 2.7.3 | sed 's/-/\\-/g'` +date=2015-10-08 +roff_version=`echo 2.7.4 | 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 @@ -47081,7 +47081,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.3, which was +This file was extended by man-db $as_me 2.7.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -47147,7 +47147,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.3 +man-db config.status 2.7.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5d880e9..4170867 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.3], [cjwatson@debian.org]) +AC_INIT([man-db], [2.7.4], [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 @@ -17,7 +17,7 @@ AC_CONFIG_HEADER([config.h]) AC_CANONICAL_HOST # Define below date and version information to be put into man pages etc. -date=2015-09-09 +date=2015-10-08 AC_SUBST([date])dnl roff_version=`echo AC_PACKAGE_VERSION | sed 's/-/\\-/g'` AC_SUBST([roff_version])dnl diff --git a/docs/man-db.lsm b/docs/man-db.lsm index 32a6dd1..2414ff0 100644 --- a/docs/man-db.lsm +++ b/docs/man-db.lsm @@ -1,7 +1,7 @@ Begin4 Title: man-db -Version: 2.7.3 -Entered-date: 2015-09-09 +Version: 2.7.4 +Entered-date: 2015-10-08 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.3.tar.xz + 1.5M man-db-2.7.4.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/man/Makefile.in b/man/Makefile.in index 5948349..e8571c7 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -2307,18 +2307,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ diff --git a/man/Rules.man b/man/Rules.man index 4ce8ac0..55ff35d 100644 --- a/man/Rules.man +++ b/man/Rules.man @@ -34,18 +34,17 @@ endif replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ @@ -21,6 +21,7 @@ Erwin Poeze <erwin.poeze@gmail.com> man/nl, nl.po Robert Luberda <robert@debian.org> man/pl, pl.po Yuri Kozlov <kozlov.y@gmail.com> man/ru, ru.po Wylmer Wang <wantinghard@gmail.com> man/zh_CN +zwpwjwtz <zwpwjwtz@126.com> man/zh_CN Jordi Mallach <jordi@gnu.org> ca.po Vladimir Michl <Vladimir.Michl@seznam.cz> cs.po Ondřej Surý <ondrej@sury.org> cs.po diff --git a/man/da/Makefile.in b/man/da/Makefile.in index 585cd8f..07fede8 100644 --- a/man/da/Makefile.in +++ b/man/da/Makefile.in @@ -2125,18 +2125,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ diff --git a/man/de/Makefile.in b/man/de/Makefile.in index 6ae0a62..db75fa3 100644 --- a/man/de/Makefile.in +++ b/man/de/Makefile.in @@ -2125,18 +2125,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ diff --git a/man/es/Makefile.in b/man/es/Makefile.in index 7681f14..3702d0e 100644 --- a/man/es/Makefile.in +++ b/man/es/Makefile.in @@ -2099,18 +2099,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in index 04befbb..f743ecc 100644 --- a/man/fr/Makefile.in +++ b/man/fr/Makefile.in @@ -2125,18 +2125,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ diff --git a/man/id/Makefile.in b/man/id/Makefile.in index b08b240..fc7f8ab 100644 --- a/man/id/Makefile.in +++ b/man/id/Makefile.in @@ -2125,18 +2125,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ diff --git a/man/it/Makefile.in b/man/it/Makefile.in index 34b6242..a6d2c3d 100644 --- a/man/it/Makefile.in +++ b/man/it/Makefile.in @@ -2107,18 +2107,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ diff --git a/man/it/man1/manpath.man1 b/man/it/man1/manpath.man1 index 67166e6..19fd6e2 100644 --- a/man/it/man1/manpath.man1 +++ b/man/it/man1/manpath.man1 @@ -25,7 +25,7 @@ .IR sistema \|[\|,.\|.\|.\|]\|] .SH DESCRIZIONE Se -.RB $ %MANPATH% +.RB $ MANPATH è impostata, .B %manpath% ne mostrerà semplicemente il contenuto e genererà un avviso. @@ -96,9 +96,9 @@ Mostra un messaggio d'aiuto ed esce. Mostra informazioni sulla versione e sull'autore. .SH VARIABILI D'AMBIENTE .TP -.B %MANPATH% +.B MANPATH Se -.RB $ %MANPATH% +.RB $ MANPATH è impostata, .B %manpath% ne mostra il valore invece che determinarlo al momento. Se diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in index acc11fa..794bb6b 100644 --- a/man/ja/Makefile.in +++ b/man/ja/Makefile.in @@ -2125,18 +2125,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ diff --git a/man/nl/Makefile.in b/man/nl/Makefile.in index 9cb4c2d..b01c287 100644 --- a/man/nl/Makefile.in +++ b/man/nl/Makefile.in @@ -2125,18 +2125,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ diff --git a/man/pl/Makefile.in b/man/pl/Makefile.in index 0c8bd4d..727fb3e 100644 --- a/man/pl/Makefile.in +++ b/man/pl/Makefile.in @@ -2125,18 +2125,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ diff --git a/man/po4a/po/zh_CN.po b/man/po4a/po/zh_CN.po index 0d45a91..8483ed3 100644 --- a/man/po4a/po/zh_CN.po +++ b/man/po4a/po/zh_CN.po @@ -5,15 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: man-db-manpages-2.6.4-pre1\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: 2013-06-16 17:17+0800\n" -"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" +"PO-Revision-Date: 2015-09-03 23:05+0800\n" +"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" -"Language: \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.4\n" +"X-Poedit-Bookmarks: -1,102,-1,-1,-1,-1,-1,-1,-1,-1\n" #. type: TH #: ../../man/man1/apropos.man1:12 @@ -64,7 +66,7 @@ msgstr "手册分页显示工具" #: ../../man/man8/mandb.man8:14 #, no-wrap msgid "NAME" -msgstr "NAME" +msgstr "名称" #. type: Plain text #: ../../man/man1/apropos.man1:15 @@ -83,18 +85,12 @@ msgstr "概述" #. type: Plain text #: ../../man/man1/apropos.man1:32 -#, fuzzy -#| msgid "" -#| "B<%apropos%> [\\|B<-dalhvV>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|" -#| "B<-s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#| "I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&." -#| "\\|.\\|." msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" "\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." msgstr "" -"B<%apropos%> [\\|B<-dalhvV>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" +"B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<列表>\\|] [\\|B<-m> I<系统>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" "\\|] [\\|B<-L> I<区域>\\|] [\\|B<-C> I<文件>\\|] I<关键词> \\&.\\|.\\|." @@ -214,8 +210,8 @@ msgid "" "truncated to the terminal width to avoid ugly results from poorly-written " "B<NAME> sections." msgstr "" -"不按终端宽度截断输出。通常会将输出截短为终端宽度，以免显示写得不好的 B<NAME> " -"节时显示混乱。" +"不按终端宽度截断输出。通常会将输出截短为终端宽度，以免显示写得不好的 时显示混" +"乱。" #. type: TP #: ../../man/man1/apropos.man1:103 ../../man/man1/whatis.man1:107 @@ -351,10 +347,8 @@ msgstr "打印帮助消息并退出。" #: ../../man/man1/man.man1:1166 ../../man/man1/manpath.man1:95 #: ../../man/man1/whatis.man1:193 ../../man/man8/accessdb.man8:39 #: ../../man/man8/catman.man8:74 ../../man/man8/mandb.man8:144 -#, fuzzy -#| msgid "Print a help message and exit." msgid "Print a short usage message and exit." -msgstr "打印帮助消息并退出。" +msgstr "打印简短的帮助消息并退出。" #. type: Plain text #: ../../man/man1/apropos.man1:192 ../../man/man1/lexgrog.man1:95 @@ -411,8 +405,7 @@ msgstr "环境" msgid "" "If $B<SYSTEM> is set, it will have the same effect as if it had been " "specified as the argument to the B<-m> option." -msgstr "" -"如果设置了 $B<SYSTEM> 环境变量，则和将它指定为 B<-m> 选项的参数效果相同。" +msgstr "如果设置了 $B<SYSTEM> 环境变量，其效果将与 B<-m> 选项的参数相同。" #. type: Plain text #: ../../man/man1/apropos.man1:220 ../../man/man1/whatis.man1:224 @@ -426,21 +419,15 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:232 ../../man/man1/whatis.man1:236 -#, fuzzy -#| msgid "" -#| "If $B<MANWIDTH> 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<ioctl>(2) if available, the value of $B<COLUMNS>, " -#| "or falling back to 80 characters if all else fails." msgid "" "If $B<MANWIDTH> 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 the value of $B<COLUMNS>, an B<ioctl>(2) if available, or falling " "back to 80 characters if all else fails." msgstr "" -"如果设置了 $B<MANWIDTH> 环境变量，它的值将用作终端宽度(参阅 B<--long> 选项)。" -"如果未设置它，终端宽度将通过调用 B<ioctl>(2)(若有)、$B<COLUMNS> 环境变量计" -"算。若都失败，将退回到 80 个字符。 " +"如果设置了 $B<MANWIDTH> ，它的值将用作终端宽度(参阅 B<--long> 选项)。如果未设" +"置它，终端宽度将通过 $B<COLUMNS> 环境变量或调用 B<ioctl>(2)(如果有的话)计算。" +"若都失败，将退回到 80 个字符。" #. type: Plain text #: ../../man/man1/apropos.man1:241 @@ -511,15 +498,11 @@ msgstr "lexgrog - 解析 man 手册页的头部信息" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 -#, fuzzy -#| msgid "" -#| "B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-fhwV>\\|] [\\|B<-E> " -#| "I<encoding>\\|] I<file> \\&.\\|.\\|." msgid "" "B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" "\\|] I<file> \\&.\\|.\\|." msgstr "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-fhwV>\\|] [\\|B<-E> I<编码>\\|] " +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<编码>\\|] " "I<文件> \\&.\\|.\\|." #. type: Plain text @@ -595,7 +578,7 @@ msgstr "B<-E> I<编码>, B<--encoding> I<编码>" #. type: Plain text #: ../../man/man1/lexgrog.man1:86 msgid "Override the guessed character set for the page to I<encoding>." -msgstr "覆盖推测的页面字符集编码，将编码设置为 I<编码>。" +msgstr "将页面编码设置为 I<编码>，而非自动推测的编码。" #. type: Plain text #: ../../man/man1/lexgrog.man1:102 @@ -678,7 +661,7 @@ msgid "" "nevertheless a good idea to retain the backslash." msgstr "" "一些手册分页程序要求 \\(oq\\e-\\(cq 与上面显示的完全相同；不过 B<%mandb%> 更" -"宽松。尽管如此，保留反斜杠来与其他系统兼容更好。" +"宽松。尽管如此，保留反斜杠可以更好地兼容其他系统。" #. type: Plain text #: ../../man/man1/lexgrog.man1:158 @@ -792,19 +775,6 @@ msgstr "%man% - 在线参考手册的接口" #. The apropos command line #. type: Plain text #: ../../man/man1/man.man1:67 -#, fuzzy -#| msgid "" -#| "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#| "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#| "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#| "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#| "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#| "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#| "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#| "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#| "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#| "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#| "[\\|I<section>\\|] I<page>\\ .\\|.\\|.\\|]\\ .\\|.\\|." msgid "" "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--warnings>" "\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> I<locale>" @@ -819,7 +789,7 @@ msgid "" "\\|]\\ .\\|.\\|.\\&" msgstr "" "B<%man%> [\\|B<-C> I<文件>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--warnings>" -"\\|[\\|=I<警告>\\|]\\|] [\\|B<-R> I<警告>\\|] [\\|B<-L> I<区域>\\|] [\\|B<-" +"\\|[\\|=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>\\|] [\\|" @@ -827,49 +797,34 @@ msgstr "" "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<dpi>\\|]\\|] " -"[\\|B<-Z>\\|] [\\|[\\|I<章节>\\|] I<页>\\ .\\|.\\|.\\|]\\ .\\|.\\|." +"[\\|B<-Z>\\|] [\\|[\\|I<章节>\\|] I<页>\\ .\\|.\\|.\\|]\\ .\\|.\\|.\\&" #. The --global-apropos command line #. type: Plain text #: ../../man/man1/man.man1:75 -#, fuzzy -#| msgid "B<%man%> B<-k> [\\|I<apropos> I<options>\\|] I<regexp> \\&.\\|.\\|." msgid "B<%man%> B<-k> [\\|I<apropos> I<options>\\|] I<regexp> \\&.\\|.\\|.\\&" -msgstr "B<%man%> B<-k> [\\|I<apropos> I<选项>\\|] I<正则表达式> \\&.\\|.\\|." +msgstr "" +"B<%man%> B<-k> [\\|I<apropos> 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<list>\\|] [\\|B<-i>" -#| "\\||\\|B<-I>\\|] [\\|I<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." msgid "" "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>\\||" "\\|B<-I>\\|] [\\|I<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|.\\&" msgstr "" "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|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<whatis> I<options>\\|] I<page> \\&.\\|.\\|." msgid "B<%man%> B<-f> [\\|I<whatis> I<options>\\|] I<page> \\&.\\|.\\|.\\&" -msgstr "B<%man%> B<-f> [\\|I<whatis> I<选项>\\|] I<页> \\&.\\|.\\|." +msgstr "B<%man%> B<-f> [\\|I<whatis> 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<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#| "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#| "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#| "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#| "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#| "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|." msgid "" "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " @@ -883,56 +838,35 @@ msgstr "" "[\\|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<dpi>\\|]\\|] " -"[\\|B<-Z>\\|] 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<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#| "\\|] I<page> \\&.\\|.\\|." msgid "" "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] " "I<page> \\&.\\|.\\|.\\&" 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<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I<page> " -#| "\\&.\\|.\\|." msgid "" "B<%man%> B<-c> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I<page> \\&." "\\|.\\|.\\&" msgstr "" "B<%man%> B<-c> [\\|B<-C> I<文件>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I<页> \\&." -"\\|.\\|." +"\\|.\\|.\\&" #. type: Plain text #: ../../man/man1/man.man1:150 -#, fuzzy -#| msgid "B<%man%> [\\|B<-hV>\\|]" msgid "B<%man%> [\\|B<-?V>\\|]" -msgstr "B<%man%> [\\|B<-hV>\\|]" +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<page> argument given to B<" -#| "%man%> is normally the name of a program, utility or function. The " -#| "I<manual page> associated with each of these arguments is then found and " -#| "displayed. A I<section>, if provided, will direct B<%man%> to look only " -#| "in that I<section> of the manual. The default action is to search in all " -#| "of the available I<sections> following a pre-defined order (\"%sections%" -#| "\" by default, unless overridden by the B<SECTION> directive in I<" -#| "%manpath_config_file%>), and to show only the first I<page> found, even " -#| "if I<page> exists in several I<sections>." msgid "" "B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" "%> is normally the name of a program, utility or function. The I<manual " @@ -945,8 +879,8 @@ msgid "" "I<page> exists in several I<sections>." msgstr "" "B<%man%> 是系统的手册分页程序。指定给 B<%man%> 的 I<页> 选项通常是程序、工具" -"或函数名。程序将显示找到的相关 I<手册页>。如果指定了 I<章节>，B<%man%> 将只在" -"手册的指定 I<章节> 搜索。默认将按预定的顺序查找所有可用的 I<章节> (默认" +"或函数名。程序将显示每一个找到的相关 I<手册页>。如果指定了 I<章节>，B<%man%> " +"将只在手册的指定 I<章节> 搜索。默认将按预定的顺序查找所有可用的 I<章节> (默认" "是“%sections%”，除非被 I<%manpath_config_file%> 中的 B<SECTION> 指令覆盖)，并" "只显示找到的第一个 I<页>，即使多个 I<章节> 中都有这个 I<页面>。" @@ -977,10 +911,9 @@ msgstr "库调用(程序库中的函数)" #. type: tbl table #: ../../man/man1/man.man1:198 -#, fuzzy, no-wrap -#| msgid "Special files (usually found in I</dev>)" +#, no-wrap msgid "Special files (usually found in I</dev\\/>)" -msgstr "特殊文件(通常位于 I</dev>)" +msgstr "特殊文件(通常位于 I</dev\\/>)" #. type: tbl table #: ../../man/man1/man.man1:201 @@ -996,14 +929,11 @@ msgstr "游戏" #. type: tbl table #: ../../man/man1/man.man1:207 -#, fuzzy, no-wrap -#| msgid "" -#| "Miscellaneous (including macro packages and conventions),\n" -#| "e.g. B<man>(7), B<groff>(7)" +#, no-wrap msgid "" "Miscellaneous (including macro packages and conventions),\n" "e.g.\\& B<man>(7), B<groff>(7)" -msgstr "杂项(包括宏包和规范，如 B<man>(7), B<groff>(7))" +msgstr "杂项(包括宏包和规范，如 B<man>(7)，B<groff>(7))" #. type: tbl table #: ../../man/man1/man.man1:211 @@ -1053,7 +983,7 @@ msgstr "B<加粗文本>" #: ../../man/man1/man.man1:250 #, no-wrap msgid "type exactly as shown." -msgstr "原样显示的样式。" +msgstr "按原样显示。" #. type: tbl table #: ../../man/man1/man.man1:253 @@ -1065,7 +995,7 @@ msgstr "I<倾斜文本>" #: ../../man/man1/man.man1:253 #, no-wrap msgid "replace with appropriate argument." -msgstr "替换为相应的参数。" +msgstr "用相应的参数进行替换。" #. type: tbl table #: ../../man/man1/man.man1:256 @@ -1077,7 +1007,7 @@ msgstr "[\\|B<-abc>\\|]" #: ../../man/man1/man.man1:256 #, no-wrap msgid "any or all arguments within [ ] are optional." -msgstr "[ ] 内的任意/全部参数都是可选的。" +msgstr "“[ ]” 内的任意/全部参数都是可选的。" #. type: tbl table #: ../../man/man1/man.man1:259 @@ -1089,7 +1019,7 @@ msgstr "B<-a\\|>|\\|B<-b>" #: ../../man/man1/man.man1:259 #, no-wrap msgid "options delimited by | cannot be used together." -msgstr "以 | 分隔的选项可以一起使用。" +msgstr "以“|”分隔的选项可以一起使用。" #. type: tbl table #: ../../man/man1/man.man1:262 @@ -1113,7 +1043,7 @@ msgstr "[\\|I<表达式>\\|] .\\|.\\|." #: ../../man/man1/man.man1:265 #, no-wrap msgid "entire I<expression>\\ within [ ] is repeatable." -msgstr "[ ] 内的整个 I<表达式> 可以重复。" +msgstr "“[ ]”内的整个 I<表达式> 可以重复。" #. type: Plain text #: ../../man/man1/man.man1:273 @@ -1184,10 +1114,9 @@ msgstr "" #. type: TP #: ../../man/man1/man.man1:310 -#, fuzzy, no-wrap -#| msgid "B<%man%\\ -l\\ -T>I<dvi\\ ./foo.1x.gz>B<\\ E<gt>\\ >I<./foo.1x.dvi>" +#, no-wrap msgid "B<%man% -l -T>I<dvi ./foo.1x.gz>B< E<gt> >I<./foo.1x.dvi>" -msgstr "B<%man%\\ -l\\ -T>I<dvi\\ ./foo.1x.gz>B<\\ E<gt>\\ >I<./foo.1x.dvi>" +msgstr "B<%man% -l -T>I<dvi ./foo.1x.gz>B< E<gt> >I<./foo.1x.dvi>" #. type: Plain text #: ../../man/man1/man.man1:326 @@ -1200,7 +1129,7 @@ msgid "" msgstr "" "此命令会将 nroff 源手册页 I<./foo.1x.gz> 解压并格式化为 B<设备无关(dvi)> 文" "件。重定向是必须的，因为 B<-T> 标志会导致输出不经分页程序直接传送到 " -"B<stdout>。 输出结果应该使用 B<xdvi> 这样的程序查看，或使用 B<dvips> 这样的程" +"B<stdout>。 应该使用 B<xdvi> 这样的程序查看输出结果，或使用 B<dvips> 这样的程" "序进一步处理为 PostScript。" #. type: TP @@ -1214,10 +1143,10 @@ msgstr "B<%man%\\ -k>I<\\ printf>" msgid "" "Search the short descriptions and manual page names for the keyword " "I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"%apropos%\\ -r>I<\\ printf>B<.>" msgstr "" -"将关键词 I<printf> 作为正则表达式来搜索对应的手册页概述和手册页名称。打印任何" -"匹配结果。等效于 B<%apropos%>I<\\ printf>B<.>" +"将关键词 I<printf> 作为正则表达式来搜索对应的手册页概述和手册页名称，并打印所" +"有匹配结果。等效于 B<%apropos%\\ -r>I<\\ printf>B<.>" #. type: TP #: ../../man/man1/man.man1:334 @@ -1229,9 +1158,9 @@ msgstr "B<%man%\\ -f>I<\\ smail>" #: ../../man/man1/man.man1:341 msgid "" "Lookup the manual pages referenced by I<smail> and print out the short " -"descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" +"descriptions of any found. Equivalent to B<%whatis%\\ -r>I<\\ smail>B<.>" msgstr "" -"查找 I<smail> 引用的手册页并输出找到的任何概述。等效于 B<%whatis%>I<\\ " +"查找 I<smail> 引用的手册页并输出找到的所有概述。等效于 B<%whatis%\\ -r>I<\\ " "smail>B<.>" #. type: SH @@ -1252,7 +1181,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:369 -#, fuzzy msgid "" "If set, various environment variables are interrogated to determine the " "operation of B<%man%>. It is possible to set the `catch all' variable " @@ -1264,7 +1192,13 @@ msgid "" "$B<MANOPT>, B<-D> can be specified as the initial command line option. This " "will allow %man% to `forget' about the options specified in $B<MANOPT> " "although they must still have been valid." -msgstr "如果设置，将检查各种环境变量来确定 B<%man%> 如何操作。" +msgstr "" +"如果被设置，程序将检查各种环境变量来确定 B<%man%> 如何操作。可以对命令行中的" +"任何字符串设置“catch all”变量 $B<MANOPT>，除非是选项参数中需要转义的空格。B<" +"%man%> 将会先解析 $B<MANOPT>，再解析它自己的命令行。这些需要参数的选项将会被" +"命令行中其他的相同选项所覆盖。若要重置 $B<MANOPT> 中的所有选项，可以在命令行" +"开头指定 B<-D> 选项。这会让 %man% “忘掉”$B<MANOPT> 中指定的选项，即便它们可能" +"仍然是有效的。" #. type: Plain text #: ../../man/man1/man.man1:390 @@ -1367,9 +1301,9 @@ msgid "" "are not available in your native language and you would like to supply them, " "please contact the maintainer who will be coordinating such activity." msgstr "" -"国际化的消息分类功能也包含在此包中，可以用同样的方式启用(同样，如果可用的" -"话)。如果您发现此包提供的手册页和消息分类对您的本地语言不可用并且想提供支持，" -"请联系协调这类活动的(手册本地化)维护者。" +"国际化的消息分类功能也包含在此包中，可以用同样的方式启用(如果可用的话)。如果" +"您发现此包提供的手册页和消息分类对您的本地语言不可用并且想提供支持，请联系协" +"调这类活动的(手册本地化)维护者。" #. type: Plain text #: ../../man/man1/man.man1:471 @@ -1434,14 +1368,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<MANROFFSEQ> 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<MANROFFSEQ> is interrogated. If " @@ -1512,15 +1438,14 @@ msgid "" "have been set in $B<MANOPT>. Any options that follow B<-D> will have their " "usual effect." msgstr "" -"此选项通常作为第一个选项，它将 B<%man%> 的行为恢复为默认。它的作用是重置任何" -"在 $B<MANOPT> 中设置的选项。B<-D> 之后的任何选项正常有效。" +"此选项通常作为第一个选项，它将 B<%man%> 的行为恢复为默认值。它的作用是重置任" +"何在 $B<MANOPT> 中设置的选项。B<-D> 之后的任何选项保留其原有效果。" #. type: TP #: ../../man/man1/man.man1:577 -#, fuzzy, no-wrap -#| msgid "B<--warnings>[=I<warnings>]" +#, no-wrap msgid "B<--warnings>[=I<warnings\\/>]" -msgstr "B<--warnings>[=I<警告>]" +msgstr "B<--warnings>[=I<警告\\/>]" #. type: Plain text #: ../../man/man1/man.man1:589 @@ -1539,18 +1464,15 @@ msgstr "" #: ../../man/man1/man.man1:589 #, no-wrap msgid "Main modes of operation" -msgstr "操作的主要方式" +msgstr "主要操作方式" #. 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 "等同于 B<%whatis%>。显示来自手册页的概述(若有)。详见 B<%whatis%>(1)。" +msgstr "" +"等同于 B<%whatis%>。显示来自手册页的加简短说明(若有)。详见 B<%whatis%>(1)。" #. type: Plain text #: ../../man/man1/man.man1:607 @@ -1558,7 +1480,7 @@ msgid "" "Equivalent to B<%apropos%>. Search the short manual page descriptions for " "keywords and display any matches. See B<%apropos%>(1) for details." msgstr "" -"等同于 B<%apropos%>。搜索关键词对应的手册概述并显示任何匹配结果。详见 B<" +"等同于 B<%apropos%>。搜索关键词对应的手册概述并显示所有匹配结果。详见 B<" "%apropos%>。" #. type: Plain text @@ -1599,7 +1521,7 @@ msgstr "" msgid "" "Don't actually display the manual pages, but do print the location(s) of the " "source nroff files that would be formatted." -msgstr "不实际显示手册页，但打印将格式化的 nroff 文件的位置。" +msgstr "不显示手册页，但打印将被格式化的 nroff 文件的位置。" #. type: Plain text #: ../../man/man1/man.man1:642 @@ -1608,8 +1530,8 @@ msgid "" "cat files that would be displayed. If -w and -W are both specified, print " "both separated by a space." msgstr "" -"不实际显示手册页，但打印将显示的 cat 文件的位置。如果同时指定了 -w 和 -W，同" -"时打印二者，以空格隔开。" +"不实际显示手册页，但打印将显示的 cat 文件的位置。如果同时指定了 -w 和 -W，则" +"同时打印二者，以空格隔开。" #. type: Plain text #: ../../man/man1/man.man1:647 @@ -1703,7 +1625,7 @@ msgid "" "(The B<-s> spelling is for compatibility with System V.)" msgstr "" "要搜索的“指定顺序”的手册章节列表，以英文冒号或逗号分隔。此选项会覆盖 " -"$B<MANSECT> 环境变量。(使用 B<-s> 表示是为了与 系统 V 兼容。)" +"$B<MANSECT> 环境变量。(使用 B<-s> 表示是为了与 System V 兼容。)" #. type: TP #: ../../man/man1/man.man1:739 @@ -1740,7 +1662,7 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:777 msgid "Ignore case when searching for manual pages. This is the default." -msgstr "搜索手册页时忽略大小写。默认值。" +msgstr "搜索手册页时忽略大小写。此为默认值。" #. type: Plain text #: ../../man/man1/man.man1:780 @@ -1757,7 +1679,7 @@ msgid "" msgstr "" "显示名字或描述的任何部分与所提供的正则表达式 I<页> 参数匹配的所有页面，像使" "用 B<apropos>(1) 一样。由于搜索正则表达式时通常没办法选出“最佳”手册页，此选项" -"隐含打开 B<-a> 选项。" +"隐含了 B<-a> 选项。" #. type: Plain text #: ../../man/man1/man.man1:805 @@ -1772,7 +1694,7 @@ msgstr "" "显示名字或描述的任何部分与所提供的 shell 格式通配符 I<页> 参数匹配的所有页" "面，像使用 B<apropos>(1) B<--wildcard> 一样。I<页> 参数必须匹配整个名字或描" "述，或匹配描述中单词的边界。由于搜索通配符时通常没办法选出“最佳”手册页，此选" -"项隐含打开 B<-a> 选项。" +"项隐含了 B<-a> 选项。" #. type: Plain text #: ../../man/man1/man.man1:814 @@ -1780,8 +1702,8 @@ msgid "" "If the B<--regex> or B<--wildcard> option is used, match only page names, " "not page descriptions, as with B<whatis>(1). Otherwise, no effect." msgstr "" -"如果使用了 B<--regex> 或 B<--wildcard> 选项，则只匹配手册页名而不匹配描述，像" -"使用 B<whatis>(1) 一样。否则不起作用。" +"如果使用了 B<--regex> 或 B<--wildcard> 选项，则只匹配手册页名而不匹配描述，就" +"像使用 B<whatis>(1) 一样。否则不起作用。" #. type: Plain text #: ../../man/man1/man.man1:822 @@ -1935,10 +1857,10 @@ msgid "" "end in an escaped $ which may be followed by further options for less. By " "default B<%man%> sets the B<-ix8> options." msgstr "" -"为了好读，这里分成了三行。字符串的含义请参阅 B<less>(1) 手册页。提示字符串将" -"首先由 shell 解释。提示中的所有的双引号、反斜杠都必须在前面加一个反斜杠转义。" -"提示字符串可以转义的 $ 结束，后面还可以跟其他的 less 选项。B<%man%> 默认设置 " -"B<-ix8> 选项。" +"为了方便阅读，这里分成了三行。字符串的含义请参阅 B<less>(1) 手册页。提示字符" +"串将首先由 shell 解释。提示中的所有的双引号、反斜杠都必须在前面加一个反斜杠转" +"义。提示字符串可以转义的 $ 结束，后面还可以跟其他的 less 选项。B<%man%> 默认" +"设置 B<-ix8> 选项。" #. type: Plain text #: ../../man/man1/man.man1:948 @@ -1959,10 +1881,10 @@ msgid "" "shows the translations performed: some parts of it may only be displayed " "properly when using B<GNU> B<nroff>'s I<latin1>(7) device." msgstr "" -"当在 7 位终端或终端模拟器中查看纯 I<ascii>(7) 手册页时，若使用 B<GNU> " +"当在7位编码的终端或终端模拟器中查看纯 I<ascii>(7) 手册页时，若使用 B<GNU> " "B<nroff> I<latin1>(7) 设备描述，一些字符可能显示不正确。此选项允许纯 " "I<ascii> 手册页使用 I<latin11> 设备以 I<ascii> 显示。它不会转换任何 " -"I<latin1> 文本。死皮赖脸显示了进行的转换：其中一部分可能只有在使用 B<GNU> " +"I<latin1> 文本。以下表格显示了进行的转换：其中一部分可能只有在使用 B<GNU> " "B<nroff> 的 I<latin1>(7) 设备时才正确显示。" #. type: tbl table @@ -2065,8 +1987,8 @@ msgid "" "\"\\e%\" at the start of a word to prevent it from being hyphenated." msgstr "" "如果您编写手册页时只是不希望 B<nroff> 在某个位置不恰当地断字，不要使用此选" -"项，而是查询 B<nroff> 文档(寻找方法)；例如，您可以在单词中插入“\\e%”来指示该" -"位置可以断字，或在单词开头插入“\\e%”来阻止对它断字。" +"项，而应查阅 B<nroff> 文档中的相关方法；例如，您可以在单词中插入“\\e%”来指示" +"该位置可以断字，或在单词开头插入“\\e%”来阻止对它断字。" #. type: Plain text #: ../../man/man1/man.man1:1065 @@ -2087,9 +2009,9 @@ msgid "" "\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" -"如果您编写手册页时只是不希望 B<nroff> 对齐某些段落，不要使用此选项，而是查询 " -"B<nroff> 文档(寻找方法)；例如，您可以使用“.na”、“.nf”、“.fi”和“.ad”请求来临时" -"禁止对齐和填充。" +"如果您编写手册页时只是不希望 B<nroff> 对齐某些段落，不要使用此选项，而应查阅 " +"B<nroff> 文档中的相关方法；例如，您可以使用“.na”、“.nf”、“.fi”和“.ad”请求来临" +"时禁止对齐和填充。" #. type: TP #: ../../man/man1/man.man1:1072 @@ -2123,10 +2045,9 @@ msgstr "" #. type: TP #: ../../man/man1/man.man1:1101 -#, fuzzy, no-wrap -#| msgid "B<-T>[I<device>], B<--troff-device>[=I<device>]" +#, no-wrap msgid "B<-T>[I<device\\/>], B<--troff-device>[=I<device\\/>]" -msgstr "B<-T>[I<设备>], B<--troff-device>[=I<设备>]" +msgstr "B<-T>[I<设备\\/>], B<--troff-device>[=I<设备\\/>]" #. type: Plain text #: ../../man/man1/man.man1:1113 @@ -2137,15 +2058,14 @@ msgid "" "B<utf8>, B<X75> and B<X100>." msgstr "" "此选项用于更改 B<groff> (也可能是 B<troff>) 的输出以适合某个非默认设备。此选" -"项隐含打开 B<-t>。(Groff-1.17 提供的)例子包括 B<dvi>、B<latin1>、B<ps>、" +"项隐含了 B<-t>。(Groff-1.17 提供的)例子包括 B<dvi>、B<latin1>、B<ps>、" "B<utf8>、B<X75> 和 B<X100>。" #. type: TP #: ../../man/man1/man.man1:1113 -#, fuzzy, no-wrap -#| msgid "B<-H>[I<browser>], B<--html>[=I<browser>]" +#, no-wrap msgid "B<-H>[I<browser\\/>], B<--html>[=I<browser\\/>]" -msgstr "B<-H>[I<浏览器>], B<--html>[=I<浏览器>]" +msgstr "B<-H>[I<浏览器\\/>], B<--html>[=I<浏览器\\/>]" #. type: Plain text #: ../../man/man1/man.man1:1129 @@ -2159,15 +2079,14 @@ msgid "" msgstr "" "此选项使 B<groff> 生成 HTML 输出并在浏览器中显示输出结果。浏览器选择取决于可" "选的 I<browser> 参数(若提供)、$B<BROWSER> 环境变量，或编译时指定的默认值(或环" -"境变量未设置，默认值通常为 B<lynx>)。此选项隐含打开 B<-t>，并只和 B<GNU> " +"境变量未设置，默认值通常为 B<lynx>)。此选项隐含了 B<-t>，并只和 B<GNU> " "B<troff> 一起使用。" #. type: TP #: ../../man/man1/man.man1:1129 -#, fuzzy, no-wrap -#| msgid "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]" +#, no-wrap msgid "B<-X>[I<dpi\\/>], B<--gxditview>[=I<dpi\\/>]" -msgstr "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]" +msgstr "B<-X>[I<dpi\\/>], B<--gxditview>[=I<dpi\\/>]" #. type: Plain text #: ../../man/man1/man.man1:1143 @@ -2180,7 +2099,7 @@ msgid "" msgstr "" "此选项使用 B<gxditview> 程序在一个图形窗口中显示 B<groff> 的输出结果。I<dpi> " "(点/英寸)可以是 75、75-12、100 或 100-12，默认为 75；-12 形式使用 12 点的基础" -"字号。此选项隐含打开带相应 X75、X75-12、X100 或 X100-12 参数的 B<-T> 选项。" +"字号。此选项隐含了带相应 X75、X75-12、X100 或 X100-12 参数的 B<-T> 选项。" #. type: Plain text #: ../../man/man1/man.man1:1159 @@ -2192,7 +2111,7 @@ msgid "" msgstr "" "B<groff> 会运行 B<troff> 然后使用合适的后处理器产生适合所选设备的输出。如果 " "I<%troff> 为 B<groff>，此选项会传递给 B<groff> 并禁止使用后处理器。此选项隐含" -"打开 B<-t> 选项。" +"了 B<-t> 选项。" #. type: SS #: ../../man/man1/man.man1:1159 @@ -2290,14 +2209,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1297 -#, fuzzy -#| msgid "" -#| "If $B<MANOPT> 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<MANOPT> 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<MANOPT> 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%> " @@ -2307,21 +2218,12 @@ msgid "" "part of an option's argument must be escaped." msgstr "" "如果设置了 $B<MANOPT>，它会先于 B<%man%> 的命令行并假设为类似的格式来解析。由" -"于所有其他的 B<%man%> 特定环境变量可以表达为命令行选项而可以入选包含进 " +"于所有其他的 B<%man%> 特定环境变量可以表达为命令行选项而可以包被含进 " "$B<MANOPT>，因此 这些环境变量可能废弃。注意，所有应当解释为命令行选项参数一部" "分的空格必须被转义。" #. type: Plain text #: ../../man/man1/man.man1:1311 -#, fuzzy -#| msgid "" -#| "If $B<MANWIDTH> 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<ioctl>(2) if available, the value of $B<COLUMNS>, 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<MANWIDTH> 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 " @@ -2332,9 +2234,9 @@ msgid "" "between 66 and 80 characters." msgstr "" "如果设置了 $B<MANWIDTH>，它的值将用作手册页格式化时的每行长度。如果未设置，手" -"册页将使用适合当前终端的行长度格式化(可能时使用 B<ioctl>(2) 获取、采用 " -"$B<COLUMNS> 的值，或在都不可用的情况下退回 80 个字符)。Cat 页面只有在默认格式" -"化可用时才会保存，即终端行长度介于 66 到 80 个字符时。" +"册页将使用适合当前终端的行长度格式化(使用 $B<COLUMNS> 的值或通过 B<ioctl>(2) " +"调用获取，或在都不可用的情况下退回到 80 个字符)。Cat 页面只有在默认格式化可用" +"时才会保存，即终端行长度介于 66 到 80 个字符时。" #. type: Plain text #: ../../man/man1/man.man1:1322 @@ -2404,12 +2306,9 @@ msgstr "历史" #. 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 - 原作者 John W. Eaton (jwe@che.utexas.edu)。" +msgstr "1990, 1991 \\(en 原作者 John W.\\& Eaton (jwe@che.utexas.edu)。" #. type: Plain text #: ../../man/man1/man.man1:1388 @@ -2422,46 +2321,32 @@ 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 "" -"1994年4月30日 - 2000年2月23日: Wilf. (G.Wilford@ee.surrey.ac.uk) 在几位热心" -"人的帮助下开发和维护这个包。" +"1994年4月30日 \\(en 2000年2月23日: Wilf. (G.Wilford@ee.surrey.ac.uk) 在几位" +"热心人的帮助下开发和维护这个包。" #. type: Plain text #: ../../man/man1/man.man1:1396 -#, fuzzy -#| msgid "" -#| "30th October 1996 - 30th March 2001: Fabrizio Polacco " -#| "E<lt>fpolacco@debian.orgE<gt> 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 " "E<lt>fpolacco@debian.orgE<gt> maintained and enhanced this package for the " "Debian project, with the help of all the community." msgstr "" -"1996年10月30日 - 2001年3月30日: Fabrizio Polacco E<lt>fpolacco@debian." +"1996年10月30日 \\(en 2001年3月30日: Fabrizio Polacco E<lt>fpolacco@debian." "orgE<gt> 为 Debian 项目维护并增强了这个包，过程中得到整个社区的帮助。" #. type: Plain text #: ../../man/man1/man.man1:1398 -#, fuzzy -#| msgid "" -#| "31st March 2001 - present day: Colin Watson E<lt>cjwatson@debian.orgE<gt> " -#| "is now developing and maintaining man-db." msgid "" "31st March 2001 \\(en present day: Colin Watson E<lt>cjwatson@debian." "orgE<gt> is now developing and maintaining man-db." msgstr "" -"2001年3月31日 - 今天: Colin Watson E<lt>cjwatson@debian.orgE<gt> 开发和维护" -"着 man-db。" +"2001年3月31日 \\(en 今天: Colin Watson E<lt>cjwatson@debian.orgE<gt> 开发和维" +"护着 man-db。" #. type: TH #: ../../man/man1/manconv.man1:9 @@ -2538,7 +2423,7 @@ msgstr "将手册转换为 I<编码>。" #. type: Plain text #: ../../man/man1/manconv.man1:63 msgid "Do not issue error messages when the page cannot be converted." -msgstr "在页面无法转换时不发出错误消息。" +msgstr "在页面无法转换时不显示错误消息。" #. type: TH #: ../../man/man1/manpath.man1:12 @@ -2553,15 +2438,11 @@ msgstr "%manpath% - 确定手册页的搜索路径" #. type: Plain text #: ../../man/man1/manpath.man1:22 -#, fuzzy -#| msgid "" -#| "B<%manpath%> [\\|B<-qgdchV>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|." -#| "\\|]\\|] [\\|B<-C> I<file>\\|]" msgid "" "B<%manpath%> [\\|B<-qgdc?V>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] " "[\\|B<-C> I<file>\\|]" msgstr "" -"B<%manpath%> [\\|B<-qgdchV>\\|] [\\|B<-m> I<系统>\\|[\\|,.\\|.\\|.\\|]\\|] " +"B<%manpath%> [\\|B<-qgdc?V>\\|] [\\|B<-m> I<系统>\\|[\\|,.\\|.\\|.\\|]\\|] " "[\\|B<-C> I<文件>\\|]" #. type: Plain text @@ -2571,7 +2452,7 @@ msgid "" "issue a warning. If not, B<%manpath%> will determine a suitable manual page " "hierarchy search path and display the results." msgstr "" -"如果设置了 $B<MANPATH>，B<%manpath%> 只会显示其内容并发出一条警告。如果未设" +"如果设置了 $B<MANPATH>，B<%manpath%> 只会显示其内容并显示一条警告。如果未设" "置，B<%manpath%> 会确定一个合适的手册页层次结构搜索路径并显示结果。" #. type: Plain text @@ -2587,7 +2468,7 @@ msgstr "" #. type: Plain text #: ../../man/man1/manpath.man1:41 msgid "Do not issue warnings." -msgstr "不发出警告。" +msgstr "不显示警告。" #. type: Plain text #: ../../man/man1/manpath.man1:49 @@ -2648,7 +2529,7 @@ msgstr "" "如果设置了 $B<MANPATH>，B<%manpath%> 显示它的值，而不是在运行时确定它。如果 " "$B<MANPATH> 前缀是冒号，则变量的值会追加到从配置文件内容确定的列表之后。如果" "冒号在变量值的结尾，则确定的列表会追加到变量内容之后。如果变量的值包含双冒号" -"(B<::>)，则确定的列表会插入值的中间，两个冒号间。" +"(B<::>)，则确定的列表会插入值的中间（两个冒号间）。" #. type: TH #: ../../man/man1/whatis.man1:12 @@ -2658,24 +2539,17 @@ msgstr "%thwhatis%" #. type: Plain text #: ../../man/man1/whatis.man1:15 -#, fuzzy -#| msgid "%whatis% - display manual page descriptions" msgid "%whatis% - display one-line manual page descriptions" -msgstr "%whatis% - 显示手册页描述" +msgstr "%whatis% - 显示在线手册页说明" #. type: Plain text #: ../../man/man1/whatis.man1:32 -#, fuzzy -#| msgid "" -#| "B<%whatis%> [\\|B<-dlhvV>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -#| "\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] " -#| "[\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." msgid "" "B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" "\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" "B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." msgstr "" -"B<%whatis%> [\\|B<-dlhvV>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<列表>" +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<列表>" "\\|] [\\|B<-m> I<系统>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<路径>\\|] [\\|B<-" "L> I<区域>\\|] [\\|B<-C> I<文件>\\|] I<名称> \\&.\\|.\\|." @@ -2906,7 +2780,7 @@ msgid "" "Lines of this form indicate manpaths that every automatically generated " "$B<MANPATH> should contain. This will typically include I</usr/man>." msgstr "" -"这种形式的行指示每个自动生成的 $B<MANPATH> 应包含的 manpath。它通常包含 I</" +"这种形式的行指定每个自动生成的 $B<MANPATH> 应包含的 manpath。它通常包含 I</" "usr/man>。" #. type: TP @@ -2922,8 +2796,8 @@ msgid "" "I<path_element> found in the user's $B<PATH>, I<manpath_element> will be " "added to the $B<MANPATH>." msgstr "" -"这种形式的行设置 $B<PATH> 到 $B<MANPATH> 的映射。对于在用户 $B<PATH> 中找到的" -"每个 I<path_element>，会将 I<manpath_element> 添加到 $B<MANPATH>。" +"这种形式的行将设置 $B<PATH> 到 $B<MANPATH> 的映射。对于在用户 $B<PATH> 中找到" +"的每个 I<path_element>，会将 I<manpath_element> 添加到 $B<MANPATH>。" #. type: TP #: ../../man/man5/manpath.man5:54 @@ -3038,7 +2912,7 @@ msgstr "" msgid "" "If multiple B<SECTION> directives are given, their section lists will be " "concatenated." -msgstr "如果给出了多个 B<SECTION> 指令，它们的章节列表会合并。" +msgstr "如果给出了多个 B<SECTION> 指令，它们的章节列表会被合并。" #. type: Plain text #: ../../man/man5/manpath.man5:139 @@ -3050,8 +2924,8 @@ msgid "" "their main section (e.g. \"1 1mh 8 ...\")." msgstr "" "如果某个特定扩展不在列表中(像 1mh)，它会和它所属章节的其他部分一起显示。这样" -"的效果是，要强制某种特定的顺序，您只需明确列出扩展。带扩展的章节通常应该与其" -"主章节相邻(如“1 1mh 8 ...)。" +"的效果是，若要强制某种特定的顺序，您只需明确列出扩展。带扩展的章节通常应该与" +"其主章节相邻(如“1 1mh 8 ...)。" #. type: Plain text #: ../../man/man5/manpath.man5:142 @@ -3138,10 +3012,8 @@ msgstr "accessdb - 以易读的格式转储 man-db 数据库的内容" #. type: Plain text #: ../../man/man8/accessdb.man8:20 -#, fuzzy -#| msgid "B</usr/sbin/accessdb> [\\|B<-hV>\\|] [I<E<lt>index-fileE<gt>>]" msgid "B</usr/sbin/accessdb> [\\|B<-d?V>\\|] [I<E<lt>index-fileE<gt>>]" -msgstr "B</usr/sbin/accessdb> [\\|B<-hV>\\|] [I<E<lt>索引文件E<gt>>]" +msgstr "B</usr/sbin/accessdb> [\\|B<-d?V>\\|] [I<E<lt>索引文件E<gt>>]" #. type: Plain text #: ../../man/man8/accessdb.man8:27 @@ -3152,8 +3024,8 @@ msgid "" "database library in use." msgstr "" "B<accessdb> 会以易读的格式输出 man-db 数据库中包含的内容。它默认转储来自 B</" -"var/cache/man/index.E<lt>db-typeE<gt>> 的数据，其中 E<lt>db-typeE<gt> 依使用" -"的 数据库 库而定。" +"var/cache/man/index.E<lt>db-typeE<gt>> 的数据，其中 E<lt>db-typeE<gt> 由所使" +"用的数据库的库确定。" #. type: Plain text #: ../../man/man8/accessdb.man8:29 @@ -3173,15 +3045,11 @@ msgstr "%catman% - 创建或更新预格式化的手册页" #. type: Plain text #: ../../man/man8/catman.man8:24 -#, fuzzy -#| msgid "" -#| "B<%catman%> [\\|B<-dhV>\\|] [\\|B<-M> I<path>\\|] [\\|B<-C> I<file>\\|] " -#| "[\\|I<section>\\|] \\&.\\|.\\|." msgid "" "B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<path>\\|] [\\|B<-C> I<file>\\|] [\\|" "I<section>\\|] \\&.\\|.\\|." msgstr "" -"B<%catman%> [\\|B<-dhV>\\|] [\\|B<-M> I<路径>\\|] [\\|B<-C> I<文件>\\|] [\\|" +"B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<路径>\\|] [\\|B<-C> I<文件>\\|] [\\|" "I<章节>\\|] \\&.\\|.\\|." #. type: Plain text @@ -3194,8 +3062,8 @@ msgid "" "provide suitable directories to contain them." msgstr "" "B<%catman%> 用于创建最新的预格式化手册页集合(称为 cat 页面)。Cat 页面通常比原" -"手册页显示得快。是本地管理员决定加入 cat 页面支持的，他们必须提供合适的目录来" -"保存这些页面。" +"手册页显示得快。若本地管理员决定加入 cat 页面支持，他们必须提供合适的目录来保" +"存这些页面。" #. type: Plain text #: ../../man/man8/catman.man8:49 @@ -3250,15 +3118,11 @@ msgstr "%mandb% - 创建或更新手册页索引缓存" #. type: Plain text #: ../../man/man8/mandb.man8:22 -#, fuzzy -#| msgid "" -#| "B<%mandb%> [\\|B<-dqsucpt>\\||\\|B<-h>\\||\\|B<-V>\\|] [\\|B<-C> I<file>" -#| "\\|] [\\|I<manpath>\\|]" msgid "" "B<%mandb%> [\\|B<-dqsucpt?V>\\|] [\\|B<-C> I<file>\\|] [\\|I<manpath>\\|]" msgstr "" -"B<%mandb%> [\\|B<-dqsucpt>\\||\\|B<-h>\\||\\|B<-V>\\|] [\\|B<-C> I<文件>\\|] " -"[\\|I<manpath>\\|]" +"B<%mandb%> [\\|B<-dqsucpt?V>\\||\\|B<-h>\\||\\|B<-V>\\|] [\\|B<-C> I<文件>" +"\\|] [\\|I<manpath>\\|]" #. type: Plain text #: ../../man/man8/mandb.man8:29 @@ -3289,8 +3153,8 @@ msgid "" "requests, bogus manual page filenames and manual pages from which the " "B<whatis> cannot be parsed." msgstr "" -"当创建或更新 B<索引>时，B<%mandb%> 会警告错误的 ROFF .so 请求，假的手册页名称" -"和手册页，B<whatis> 无法解析它们。" +"当创建或更新 B<索引>时，B<%mandb%> 会警告错误的 ROFF .so 请求，无效的手册页名" +"称和手册页，因为 B<whatis> 无法解析它们。" #. type: Plain text #: ../../man/man8/mandb.man8:52 @@ -3336,8 +3200,8 @@ msgstr "异步" #. type: tbl table #: ../../man/man8/mandb.man8:59 #, no-wrap -msgid "Filename" -msgstr "文件名" +msgid "Filename\n" +msgstr "文件名\n" #. type: tbl table #: ../../man/man8/mandb.man8:61 @@ -3360,8 +3224,8 @@ msgstr "是" #. type: tbl table #: ../../man/man8/mandb.man8:61 #, no-wrap -msgid "I<index.bt>" -msgstr "I<index.bt>" +msgid "I<index.bt>\n" +msgstr "I<index.bt>\n" #. type: tbl table #: ../../man/man8/mandb.man8:64 @@ -3379,8 +3243,8 @@ msgstr "已散列" #. type: tbl table #: ../../man/man8/mandb.man8:64 ../../man/man8/mandb.man8:67 #, no-wrap -msgid "I<index.db>" -msgstr "I<index.db>" +msgid "I<index.db>\n" +msgstr "I<index.db>\n" #. type: tbl table #: ../../man/man8/mandb.man8:67 @@ -3403,8 +3267,8 @@ msgstr "UNIX ndbm" #. type: tbl table #: ../../man/man8/mandb.man8:70 #, no-wrap -msgid "I<index.(dir|pag)>" -msgstr "I<index.(dir|pag)>" +msgid "I<index.(dir|pag)>\n" +msgstr "I<index.(dir|pag)>\n" #. type: Plain text #: ../../man/man8/mandb.man8:83 @@ -3416,12 +3280,12 @@ msgid "" "databases from scratch." msgstr "" "那些提供异步更新的数据库速度更快，但代价是可能在异常中止时损坏数据。万一这种" -"事情发生，可能要重新运行 B<%mandb%> 加 B<-c> 选项来重新创建数据库。" +"事情发生，可能要重新以 B<-c> 选项运行 B<%mandb%> 来重建数据库。" #. type: Plain text #: ../../man/man8/mandb.man8:90 msgid "Produce no warnings." -msgstr "不发出警告。" +msgstr "不显示警告。" #. type: Plain text #: ../../man/man8/mandb.man8:94 @@ -3448,7 +3312,7 @@ msgid "" msgstr "" "默认情况下，B<%mandb%> 会尝试更新任何以前创建的数据库。如果某个数据库不存在，" "程序会创建它。此选项强制 B<%mandb%> 删除以前的数据库并重新生成数据库，并隐含" -"打开 B<--no-purge>。在数据库损坏或将来引入新数据库存储方案时，这一选项可能用" +"了 B<--no-purge>。在数据库损坏或将来引入新数据库存储方案时，这一选项可能用" "到。" #. type: Plain text @@ -3476,8 +3340,8 @@ msgid "" "implies B<-p> and disables B<-c> and B<-s>." msgstr "" "只更新指定文件名对应的记录。此选项不作常规使用；它由 B<%man%> 内部使用(以 " -"B<MAN_DB_UPDATES> 选项编译时)，查找页面是否过期。它隐含打开 B<-p>，关闭 B<-" -"c> 和 B<-s>。" +"B<MAN_DB_UPDATES> 选项编译时)，以便查找页面是否过期。它隐含了 B<-p>，关闭了 " +"B<-c> 和 B<-s>。" #. type: Plain text #: ../../man/man8/mandb.man8:141 @@ -3487,7 +3351,7 @@ msgstr "显示用法消息，然后退出。" #. type: Plain text #: ../../man/man8/mandb.man8:147 msgid "Show the version, then exit." -msgstr "显示版本，然后退出。" +msgstr "显示版本号，然后退出。" #. type: Plain text #: ../../man/man8/mandb.man8:154 @@ -3508,7 +3372,7 @@ msgstr "诊断" #. type: Plain text #: ../../man/man8/mandb.man8:162 msgid "The following warning messages can be emitted during database building." -msgstr "在构建数据库时可能会发出以下警告消息。" +msgstr "在构建数据库时可能会显示以下警告消息。" #. type: TP #: ../../man/man8/mandb.man8:162 @@ -3533,7 +3397,7 @@ msgstr "" #: ../../man/man8/mandb.man8:173 #, no-wrap msgid "B<E<lt>filenameE<gt>: is a dangling symlink>" -msgstr "B<E<lt>文件名E<gt>: 是一个空符号(dangling)链接>" +msgstr "B<E<lt>文件名E<gt>: 是一个的无效的符号链接>" #. type: Plain text #: ../../man/man8/mandb.man8:178 @@ -3564,7 +3428,7 @@ msgstr "" #: ../../man/man8/mandb.man8:182 #, no-wrap msgid "B<E<lt>filenameE<gt>: ignoring bogus filename>" -msgstr "B<E<lt>文件名E<gt>: 将忽略假(bogus)文件名>" +msgstr "B<E<lt>文件名E<gt>: 将忽略假的文件名>" #. type: Plain text #: ../../man/man8/mandb.man8:188 @@ -3603,3 +3467,35 @@ msgid "" "The B<WHATIS PARSING> section formerly in this manual page is now part of " "B<lexgrog>(1)." msgstr "此手册页中的 B<WHATIS PARSING> 小节现在是 B<lexgrog>(1) 的一部分。" + +#~ msgid "" +#~ "$mtime$ -E<gt> \"795987034\"\n" +#~ "$version$ -E<gt> \"2.3.1\"\n" +#~ "apropos -E<gt> \"1 1 795981542 A - - search the manual page names and " +#~ "descriptions\"\n" +#~ "catman -E<gt> \"8 8 795981544 A - - create or update the pre-formatted " +#~ "manual pages\"\n" +#~ "man -E<gt> \"1 1 795981542 A - - an interface to the on-line reference " +#~ "manuals\"\n" +#~ "mandb -E<gt> \"8 8 795981544 A - - create or update the manual page index " +#~ "caches\"\n" +#~ "manpath -E<gt> \" 1 5\"\n" +#~ "manpath~1 -E<gt> \"1 1 795981542 A - - determine search path for manual " +#~ "pages\"\n" +#~ "manpath~5 -E<gt> \"5 5 795981543 A - - format of the /etc/man_db.config " +#~ "file\"\n" +#~ "whatis -E<gt> \"1 1 795981543 A - - search the manual page names\"\n" +#~ "zsoelim -E<gt> \"1 1 795981543 A - - satisfy .so requests in roff input" +#~ "\"\n" +#~ msgstr "" +#~ "$mtime$ -E<gt> “795987034”\n" +#~ "$version$ -E<gt> “2.3.1”\n" +#~ "apropos -E<gt> “1 1 795981542 A - - 搜索手册页名称和描述”\n" +#~ "catman -E<gt> “8 8 795981544 A - - 创建或更新预格式化的手册页”\n" +#~ "man -E<gt> “1 1 795981542 A - - 在线参考手册的一个接口界面”\n" +#~ "mandb -E<gt> “8 8 795981544 A - - 创建或更新手册页索引缓存”\n" +#~ "manpath -E<gt> “ 1 5”\n" +#~ "manpath~1 -E<gt> “1 1 795981542 A - - 定义手册页的搜索路径”\n" +#~ "manpath~5 -E<gt> “5 5 795981543 A - - /etc/man_db.config 文件的格式”\n" +#~ "whatis -E<gt> “1 1 795981543 A - - 搜索手册页名称\n" +#~ "zsoelim -E<gt> “1 1 795981543 A - - 满足 roff 输入中的 .so 请求”\n" diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in index 5a32661..df6cdca 100644 --- a/man/ru/Makefile.in +++ b/man/ru/Makefile.in @@ -2125,18 +2125,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ diff --git a/man/zh_CN/Makefile.in b/man/zh_CN/Makefile.in index e9afb77..5a438ea 100644 --- a/man/zh_CN/Makefile.in +++ b/man/zh_CN/Makefile.in @@ -2125,18 +2125,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 replace.sed: $(top_builddir)/man/replace.sin $(AM_V_GEN)sed -e 's,%REPLACE_CONFIG_FILE%,$(config_file),g' $(top_builddir)/man/replace.sin > $@ -.man1.1: replace.sed +$(MANS): replace.sed + +.man1.1: $(AM_V_at)$(MKDIR_P) man1 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.1//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ -.man5.5: replace.sed +.man5.5: $(AM_V_at)$(MKDIR_P) man5 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)sed -f replace.sed $< > $@ -.man8.8: replace.sed +.man8.8: $(AM_V_at)$(MKDIR_P) man8 - @$(MAKE) $(AM_MAKEFLAGS) replace.sed $(AM_V_GEN)program=`echo '$@' | sed -e 's/\.8//' -e 's,.*/,,' -e '$(program_transform_name)'`; \ sed -f replace.sed -e "s,%program%,$$program,g" $< > $@ @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.7.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2015-08-04 08:34+0200\n" "Last-Translator: Jordi Mallach <jordi@gnu.org>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -280,7 +280,7 @@ msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -594,7 +594,7 @@ msgstr "no es pot crear un directori temporal" msgid "can't open temporary file %s" msgstr "no es pot obrir el fitxer temporal %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "no es pot crear un directori temporal" @@ -604,18 +604,18 @@ msgstr "no es pot crear un directori temporal" msgid "can't remove directory %s" msgstr "no es pot eliminar el directori %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "no es pot canviar de directori a %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -624,29 +624,29 @@ msgstr "" "\n" "no es pot escriure a %s en el mode catman" -#: src/man.c:2444 +#: src/man.c:2447 #, 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:3169 +#: src/man.c:3172 #, 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:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, 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:3524 +#: src/man.c:3527 #, 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:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Pàgina de manual " @@ -871,7 +871,7 @@ msgstr "avís: el directori requerit %s no existeix" msgid "can't determine current directory" msgstr "no es pot determinar el directori actual" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "avís: %s no comença amb %s" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.6.1-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2012-04-07 19:04+0100\n" "Last-Translator: Marek Černocký <marek@manet.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" @@ -268,7 +268,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -575,7 +575,7 @@ msgstr "nelze vytvořit dočasnou složku" msgid "can't open temporary file %s" msgstr "nelze otevřít dočasný soubor %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "nelze vytvořit dočasnou složku" @@ -585,19 +585,19 @@ msgstr "nelze vytvořit dočasnou složku" msgid "can't remove directory %s" msgstr "nelze odstranit složku %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "nelze se přepnout do složky %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -606,27 +606,27 @@ msgstr "" "\n" "do %s nelze v režimu catman zapisovat" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "%s nelze převést na název katalogu" -#: src/man.c:3169 +#: src/man.c:3172 #, 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:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, 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:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "interní chyba: kandidující typ %d je mimo rozsah" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Manuálová stránka " @@ -847,7 +847,7 @@ msgstr "varování: povinná složka %s neexistuje" msgid "can't determine current directory" msgstr "nelze zjistit aktuální složku" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "varování: cesta %s nezačíná na %s" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.6.1-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2012-03-17 23:42+0100\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" @@ -282,7 +282,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -592,7 +592,7 @@ msgstr "kan ikke oprette midlertidig mappe" msgid "can't open temporary file %s" msgstr "kan ikke åbne midlertidig fil %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "kan ikke oprette midlertidig mappe" @@ -602,18 +602,18 @@ msgstr "kan ikke oprette midlertidig mappe" msgid "can't remove directory %s" msgstr "kan ikke fjerne kataloget %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "kan ikke skifte katalog til %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -622,27 +622,27 @@ msgstr "" "\n" "kan ikke skrive til %s i tilstanden katalogmanual" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "Kan ikke konvertere %s til katalognavn" -#: src/man.c:3169 +#: src/man.c:3172 #, 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:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb-kommandoen mislykkedes med slutstatus %d" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "intern fejl: kandidattype %d uden for gyldigt interval" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Manualside " @@ -858,7 +858,7 @@ msgstr "advarsel: det obligatoriske katalog %s findes ikke" msgid "can't determine current directory" msgstr "kan ikke bestemme aktuelt katalog" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "advarsel: %s begynder ikke med %s" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.6.1-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2012-04-25 21:22-0700\n" "Last-Translator: Arun Persaud <arun@nubati.net>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" @@ -276,7 +276,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -589,7 +589,7 @@ msgid "can't open temporary file %s" msgstr "Temporäre Datei %s kann nicht geöffnet werden" # (mes) NEU -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "Temporäres Verzeichnis kann nicht erzeugt werden." @@ -599,19 +599,19 @@ msgstr "Temporäres Verzeichnis kann nicht erzeugt werden." msgid "can't remove directory %s" msgstr "Verzeichnis %s kann nicht entfernt werden" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "Es kann nicht ins Verzeichnis %s gewechselt werden" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -620,27 +620,27 @@ msgstr "" "\n" "im »catman«-Modus kann nicht nach %s geschrieben werden" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "%s kann nicht in »cat«-Namen umgewandelt werden" -#: src/man.c:3169 +#: src/man.c:3172 #, 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:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "»mandb«-Befehl schlug fehl mit Beendigungs-Status %d" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "interner Fehler: Kandidatentyp %d außerhalb des Bereichs" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Handbuchseite " @@ -858,7 +858,7 @@ msgstr "Warnung: erforderliches Verzeichnis %s existiert nicht" msgid "can't determine current directory" msgstr "momentanes Verzeichnis kann nicht festgestellt werden" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "Warnung: %s fängt nicht mit %s an" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.6.1-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2013-02-19 13:10-0300\n" "Last-Translator: Felipe Castro <fefcas@gmail.com>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" @@ -265,7 +265,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -569,7 +569,7 @@ msgstr "ne eblas krei provizoran dosierujon" msgid "can't open temporary file %s" msgstr "ne eblas malfermi la provizoran dosieron %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "ne eblas krei provizoran dosierujon" @@ -579,18 +579,18 @@ msgstr "ne eblas krei provizoran dosierujon" msgid "can't remove directory %s" msgstr "ne eblas forigi la dosierujon %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "ne eblas apliki chdir al %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -599,27 +599,27 @@ msgstr "" "\n" "ne eblas skribi al %s sub reĝimo catman" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "Ne eblas konverti %s al cat-nomo" -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: fini je whatis refs estas malrekomendinde\n" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "komando mandb fiaskis kun elir-stato %d" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "interna eraro: kanditata tipo %d estas for de intervalo" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Manlibra paĝo " @@ -835,7 +835,7 @@ msgstr "averto: la deviga dosierujo %s ne ekzistas" msgid "can't determine current directory" msgstr "ne eblas determini la nunan dosierujon" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "averto: %s ne komenciĝas per %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.3.20\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2002-07-03 21:52+0200\n" "Last-Translator: David Martnez <ender@debian.org>\n" "Language-Team: debian-l10n-spanish@lists.debian.org\n" @@ -264,7 +264,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -566,7 +566,7 @@ msgstr "no se puede crear un nombre de fichero temporal." msgid "can't open temporary file %s" msgstr "no se puede abrir el fichero de configuracin de rutas de man %s." -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "no se puede crear un nombre de fichero temporal." @@ -576,18 +576,18 @@ msgstr "no se puede crear un nombre de fichero temporal." msgid "can't remove directory %s" msgstr "no se puede borrar el directorio %s." -#: src/man.c:2081 +#: src/man.c:2084 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- prxima: %s [ ver (return) | siguiente (Ctrl-D) | salir (Ctrl-C) ]\n" -#: src/man.c:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "no se puede cambiar al directorio %s." -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -596,27 +596,27 @@ msgstr "" "\n" "no se puede escribir en %s en modo catman." -#: src/man.c:2444 +#: src/man.c:2447 #, 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:3169 +#: src/man.c:3172 #, 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:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, fuzzy, c-format msgid "mandb command failed with exit status %d" msgstr "la orden man fall con cdigo de salida %d." -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr "Pgina de manual " @@ -838,7 +838,7 @@ msgstr "aviso: el directorio %s no existe y es obligatorio." msgid "can't determine current directory" msgstr "no se puede determinar el directorio actual." -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "aviso: %s no comienza con %s." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.7.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2015-07-28 21:52+0300\n" "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" @@ -266,7 +266,7 @@ msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "" msgstr[1] "" -#: src/lexgrog.l:816 src/man.c:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -565,7 +565,7 @@ msgstr "nykyistä hakemistoa ei voi määrittää" msgid "can't open temporary file %s" msgstr "opastepolkujen asetustiedostoa %s ei voi avata" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "nykyistä hakemistoa ei voi määrittää" @@ -575,44 +575,44 @@ msgstr "nykyistä hakemistoa ei voi määrittää" msgid "can't remove directory %s" msgstr "" -#: src/man.c:2081 +#: src/man.c:2084 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" -#: src/man.c:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" "cannot write to %s in catman mode" msgstr "" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "" -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb-komento epäonnistui paluuarvolla %d" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Opastesivu " @@ -828,7 +828,7 @@ msgstr "varoitus: välttämätön hakemisto %s ei ole olemassa" msgid "can't determine current directory" msgstr "nykyistä hakemistoa ei voi määrittää" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "varoitus: %s ei ala merkkijonolla %s" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.6.1-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2012-02-06 14:43-0400\n" "Last-Translator: David Prévot <david@tilapin.org>\n" "Language-Team: French <traduc@traduc.org>\n" @@ -267,7 +267,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -576,7 +576,7 @@ msgstr "impossible de créer le répertoire temporaire" msgid "can't open temporary file %s" msgstr "impossible d'ouvrir le fichier temporaire %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "impossible de créer le répertoire temporaire" @@ -586,19 +586,19 @@ msgstr "impossible de créer le répertoire temporaire" msgid "can't remove directory %s" msgstr "impossible de supprimer le répertoire %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "impossible d'aller dans le répertoire %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -607,28 +607,28 @@ msgstr "" "\n" "impossible d'écrire vers %s en mode catman" -#: src/man.c:2444 +#: src/man.c:2447 #, 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:3169 +#: src/man.c:3172 #, 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:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, 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:3524 +#: src/man.c:3527 #, 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:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Page de manuel " @@ -848,7 +848,7 @@ msgstr "attention : le répertoire requis %s n'existe pas" msgid "can't determine current directory" msgstr "impossible de déterminer quel est le répertoire courant" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "attention : %s ne commence pas par %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.6.6-pre2\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2014-08-10 19:00+0700\n" "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" @@ -265,7 +265,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -572,7 +572,7 @@ msgstr "tidak dapat membuat direktori sementara" msgid "can't open temporary file %s" msgstr "tidak dapat membuka berkas sementara %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "tidak dapat membuat direktori sementara" @@ -582,19 +582,19 @@ msgstr "tidak dapat membuat direktori sementara" msgid "can't remove directory %s" msgstr "tidak dapat menghapus direktori %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "tidak dapat chdir ke %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -603,27 +603,27 @@ msgstr "" "\n" "tidak dapat menulis ke %s dalam mode catman" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "Tidak dapat mengubah %s ke nama cat" -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: bergantung ke referensi whatis sudah ditinggalkan\n" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "perintah mandb gagal dengan status keluar %d" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "internal error: tipe kandidat %d diluar dari jangkauan" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Halaman buku panduan " @@ -844,7 +844,7 @@ msgstr "peringatan: direktori wajib %s tidak ada" msgid "can't determine current directory" msgstr "tidak dapat menentukan direktori sekarang" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "peringatan: %s tidak dimulai dengan %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.4.3\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2005-12-10 17:30+0100\n" "Last-Translator: Giuseppe Sacco <eppesuig@debian.org>\n" "Language-Team: Italian <tp@linux.it>\n" @@ -266,7 +266,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -566,7 +566,7 @@ msgstr "impossibile creare un file 'cat' temporaneo per %s" msgid "can't open temporary file %s" msgstr "impossibile aprire il file temporaneo %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "impossibile creare un file 'cat' temporaneo per %s" @@ -576,18 +576,18 @@ msgstr "impossibile creare un file 'cat' temporaneo per %s" msgid "can't remove directory %s" msgstr "impossibile rimuovere la directory %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "impossibile fare chdir a %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -596,27 +596,27 @@ msgstr "" "\n" "impossibile scrivere in %s in modo catman" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "Impossibile convertire %s nel nome cat" -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: confidare nei whatis refs obsoleto\n" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "comando mandb fallito con stato d'uscita %d" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "errore interno: il tipo %d candidato oltre il limite" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Pagina di manuale " @@ -836,7 +836,7 @@ msgstr "attenzione: la directory essenziale %s non esiste" msgid "can't determine current directory" msgstr "impossibile determinare la directory corrente" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "attenzione: %s non inizia con %s" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-2.6.5\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2013-06-27 19:41+0900\n" "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" @@ -267,7 +267,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -573,7 +573,7 @@ msgstr "一時ディレクトリを作成できません" msgid "can't open temporary file %s" msgstr "一時ファイル %s を開けません" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "一時ディレクトリを作成できません" @@ -583,18 +583,18 @@ msgstr "一時ディレクトリを作成できません" msgid "can't remove directory %s" msgstr "ディレクトリ %s を削除できません" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "%s にディレクトリを変更できません" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -603,27 +603,27 @@ msgstr "" "\n" "catman モードで %s に書き込みできません" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "%s を整形済みファイル名に変換できません" -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: whatis の参照に頼ることは勧められなくなっています\n" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb コマンドが終了ステータス %d で失敗しました" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "内部エラー: 候補の種類 %d は範囲内にありません" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " マニュアルページ " @@ -840,7 +840,7 @@ msgstr "警告: 必要なディレクトリ %s が存在しません" msgid "can't determine current directory" msgstr "カレントディレクトリを決定できません" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "警告: %s は %s で始まっていません" diff --git a/po/man-db.pot b/po/man-db.pot index 62bf779..438464a 100644 --- a/po/man-db.pot +++ b/po/man-db.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Colin Watson <cjwatson@debian.org> -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the man-db package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: man-db 2.7.3\n" +"Project-Id-Version: man-db 2.7.4\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -264,7 +264,7 @@ msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "" msgstr[1] "" -#: src/lexgrog.l:816 src/man.c:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -562,7 +562,7 @@ msgstr "" msgid "can't open temporary file %s" msgstr "" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, c-format msgid "can't restore previous working directory" msgstr "" @@ -572,44 +572,44 @@ msgstr "" msgid "can't remove directory %s" msgstr "" -#: src/man.c:2081 +#: src/man.c:2084 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" -#: src/man.c:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" "cannot write to %s in catman mode" msgstr "" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "" -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr "" @@ -825,7 +825,7 @@ msgstr "" msgid "can't determine current directory" msgstr "" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-2.5.7-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2009-11-16 08:36+0100\n" "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" @@ -269,7 +269,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -573,7 +573,7 @@ msgstr "kan geen tijdelijk map aanmaken" msgid "can't open temporary file %s" msgstr "kan tijdelijk bestand %s niet openen" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "kan geen tijdelijk map aanmaken" @@ -583,18 +583,18 @@ msgstr "kan geen tijdelijk map aanmaken" msgid "can't remove directory %s" msgstr "kan map %s niet verwijderen" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "kan niet naar map %s gaan" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -603,27 +603,27 @@ msgstr "" "\n" "kan niet naar %s schrijven in 'catman'-modus" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "Kan %s niet omzetten naar een cat-naam" -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: vertrouwen op 'whatis'-referenties wordt ontraden\n" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "'mandb' is mislukt met afsluitwaarde %d" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "**interne fout**: kandidaattype %d valt buiten bereik" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Handleidingspagina " @@ -844,7 +844,7 @@ msgstr "waarschuwing: vereiste map %s bestaat niet" msgid "can't determine current directory" msgstr "kan huidige map niet bepalen" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "waarschuwing: %s begint niet met %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.6.1-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2013-02-03 20:23+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -275,7 +275,7 @@ msgstr[1] "" msgstr[2] "" "ostrzeżenie: whatis dla argumentu %s przekracza %d bajtów, obcinanie." -#: src/lexgrog.l:816 src/man.c:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -583,7 +583,7 @@ msgstr "nie można utworzyć katalogu tymczasowego" msgid "can't open temporary file %s" msgstr "nie można otworzyć pliku tymczasowego %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "nie można utworzyć katalogu tymczasowego" @@ -593,19 +593,19 @@ msgstr "nie można utworzyć katalogu tymczasowego" msgid "can't remove directory %s" msgstr "nie można usunąć katalogu %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "nie można zmienić katalogu na %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -614,28 +614,28 @@ msgstr "" "\n" "nie można zapisać do %s w trybie catman" -#: src/man.c:2444 +#: src/man.c:2447 #, 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:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: poleganie na odnośnikach whatis jest niezalecane\n" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "polecenie mandb zakończyło się błędem %d" -#: src/man.c:3524 +#: src/man.c:3527 #, 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:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Strona podręcznika ekranowego " @@ -855,7 +855,7 @@ msgstr "ostrzeżenie: obowiązkowy katalog %s nie istnieje" msgid "can't determine current directory" msgstr "nie można określić katalogu bieżącego" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "ostrzeżenie: %s nie zaczyna się od %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4c50e56..f0ae8b6 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.4.1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2003-02-22 18:45-0300\n" "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n" "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n" @@ -264,7 +264,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -567,7 +567,7 @@ msgstr "impossvel criar um nome de arquivo temporrio" msgid "can't open temporary file %s" msgstr "impossvel abrir o arquivo de configurao do manpath %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "impossvel criar um nome de arquivo temporrio" @@ -577,17 +577,17 @@ msgstr "impossvel criar um nome de arquivo temporrio" msgid "can't remove directory %s" msgstr "impossvel remover o diretrio %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "impossvel chdir para %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -596,27 +596,27 @@ msgstr "" "\n" "impossvel escrever em %s no modo catman" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "Impossvel converter %s para um nome 'cat'" -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: uso de whatis refs est obsoleto\n" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, fuzzy, c-format msgid "mandb command failed with exit status %d" msgstr "o comando man falhou com estado de sada %d" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Pagina de manual " @@ -836,7 +836,7 @@ msgstr "aviso: diretrio obrigatrio %s no existe" msgid "can't determine current directory" msgstr "impossvel determinar o diretrio corrente" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "aviso: %s no comea com %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.4.2-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2003-10-27 08:40+0200\n" "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" @@ -265,7 +265,7 @@ msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "avertisment: whatis pentru %s depete %d octei, se trunchiaz." msgstr[1] "avertisment: whatis pentru %s depete %d octei, se trunchiaz." -#: src/lexgrog.l:816 src/man.c:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -565,7 +565,7 @@ msgstr "nu se poate crea un nume de fiier temporar" msgid "can't open temporary file %s" msgstr "nu se poate deschide fiierul de configurare al cii de man %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "nu se poate crea un nume de fiier temporar" @@ -575,19 +575,19 @@ msgstr "nu se poate crea un nume de fiier temporar" msgid "can't remove directory %s" msgstr "nu se poate terge directorul %s" -#: src/man.c:2081 +#: src/man.c:2084 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- urmtor: %s [ vizualizare (return) | omitere (Ctrl-D) | ieire (Ctrl-" "C) ]\n" -#: src/man.c:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "nu se poate schimba directorul(chdir) n %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -596,27 +596,27 @@ msgstr "" "\n" "nu se poate scrie n %s n modul catman" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "Nu pot converti %s n nume cat" -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: ncrederea n referinele whatis este nvechit\n" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "comanda mandb a euat cu stare de ieire %d" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "eroare intern: candidatul tip %d depete domeniul" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Pagin de manual " @@ -838,7 +838,7 @@ msgstr "avertisment: directorul necesar %s nu exist" msgid "can't determine current directory" msgstr "nu se poate determina directorul curent" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "avertisment: %s nu ncepe cu %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.6.1-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2012-02-06 20:46+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <gnu@mx.ru>\n" @@ -273,7 +273,7 @@ msgstr[1] "" msgstr[2] "" "предупреждение: результат whatis для %s превысил %d байт, обрезается." -#: src/lexgrog.l:816 src/man.c:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -577,7 +577,7 @@ msgstr "не удалось создать временный каталог" msgid "can't open temporary file %s" msgstr "не удалось открыть временный файл %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "не удалось создать временный каталог" @@ -587,18 +587,18 @@ msgstr "не удалось создать временный каталог" msgid "can't remove directory %s" msgstr "не удалось удалить каталог %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "не удалось выполнить функцию chdir в %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -607,27 +607,27 @@ msgstr "" "\n" "не удалось записать в %s в режиме catman" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "Не удалось преобразовать %s в cat имя" -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: полагаться на ссылки whatis настоятельно не рекомендуется\n" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "команда mandb завершилась неудачно (код выхода %d)" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "внутренняя ошибка: тип кандидата %d вне диапазона" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Справочная страница " @@ -849,7 +849,7 @@ msgstr "предупреждение: обязательный каталог %s msgid "can't determine current directory" msgstr "не удалось определить текущий каталог" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "предупреждение: %s не начинается с %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.6.6-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2014-01-16 09:51+0200\n" "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" @@ -267,7 +267,7 @@ msgstr[0] "упозорење: шта-је за „%s“ премашује %d msgstr[1] "упозорење: шта-је за „%s“ премашује %d бајта, скраћујем." msgstr[2] "упозорење: шта-је за „%s“ премашује %d бајтова, скраћујем." -#: src/lexgrog.l:816 src/man.c:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -571,7 +571,7 @@ msgstr "не могу да направим привремени директо msgid "can't open temporary file %s" msgstr "не могу да отворим привремену датотеку „%s“" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "не могу да направим привремени директоријум" @@ -581,19 +581,19 @@ msgstr "не могу да направим привремени директо msgid "can't remove directory %s" msgstr "не могу да уклоним директоријум „%s“" -#: src/man.c:2081 +#: src/man.c:2084 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Ман-- следеће: %s [ преглед (повратница) | прескочи (Ктрл-Д) | изађи (Ктрл-" "Ц) ]\n" -#: src/man.c:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "не могу да се пребацим у „%s“" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -602,27 +602,27 @@ msgstr "" "\n" "не могу да пишем у „%s“ у катман режиму" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "Не могу да претворим „%s“ у кат назив" -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: ослањање на упуте шта-је је застарело\n" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "наредба мандб није успела са излазним стањем „%d“" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "унутрашња грешка: врста кандидата „%d“ је ван опсега" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Страница упутства " @@ -842,7 +842,7 @@ msgstr "упозорење: обавезан директоријум „%s“ msgid "can't determine current directory" msgstr "не могу да одредим текући директоријум" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "упозорење: „%s“ не почиње са „%s“" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.5.0-pre2\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2007-09-17 16:57+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" @@ -265,7 +265,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -572,7 +572,7 @@ msgid "can't open temporary file %s" msgstr "kan inte öppna temporärfil %s" # cat är vad? catalogue? kommandot "cat"? -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "kan inte skapa temporär cat för %s" @@ -582,18 +582,18 @@ msgstr "kan inte skapa temporär cat för %s" msgid "can't remove directory %s" msgstr "kan inte ta bort katalogen %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "kan inte byta katalog till %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -602,27 +602,27 @@ msgstr "" "\n" "kan inte skriva till %s i catman-läge" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "Kan inte konvertera %s till cat-namn" -#: src/man.c:3169 +#: src/man.c:3172 #, 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:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb-kommandot misslyckades med slutstatus %d" -#: src/man.c:3524 +#: src/man.c:3527 #, c-format msgid "internal error: candidate type %d out of range" msgstr "internt fel: kandidattypen %d utanför intervallet" -#: src/man.c:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Manualsida " @@ -842,7 +842,7 @@ msgstr "varning: obligatoriska katalogen %s finns inte" msgid "can't determine current directory" msgstr "kan inte avgöra aktuell katalog" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "varning: %s börjar inte med %s" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.6.6-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2014-01-12 16:01+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -273,7 +273,7 @@ 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:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -578,7 +578,7 @@ msgstr "không thể tạo thư mục tạm thời" msgid "can't open temporary file %s" msgstr "không thể mở tập tin tạm %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "không thể tạo thư mục tạm thời" @@ -588,17 +588,17 @@ msgstr "không thể tạo thư mục tạm thời" msgid "can't remove directory %s" msgstr "không thể gỡ bỏ thư mục %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "không thể chdir (chuyển đổi thư mục) sang %s" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -607,28 +607,28 @@ msgstr "" "\n" "không thể ghi vào %s trong chế độ \"catman\"" -#: src/man.c:2444 +#: src/man.c:2447 #, 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:3169 +#: src/man.c:3172 #, 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:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, 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:3524 +#: src/man.c:3527 #, 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:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Trang hướng dẫn " @@ -845,7 +845,7 @@ msgstr "cảnh báo: không có thư mục bắt buộc %s" msgid "can't determine current directory" msgstr "không thể tháo gỡ thư mục hiện có" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "cảnh báo: %s không bắt đầu bằng %s" diff --git a/po/zh_CN.po b/po/zh_CN.po index 74a2c85..6c27b85 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.5.1-pre2\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2015-09-09 16:34+0100\n" +"POT-Creation-Date: 2015-10-08 02:22+0100\n" "PO-Revision-Date: 2008-01-16 17:49-0600\n" "Last-Translator: Ming Hua <minghua-guest@users.alioth.debian.org>\n" "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists." @@ -287,7 +287,7 @@ msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "警告：对 %s 的 whatis 操作结果超过 %d 字节，正在截断。" msgstr[1] "警告：对 %s 的 whatis 操作结果超过 %d 字节，正在截断。" -#: src/lexgrog.l:816 src/man.c:2239 src/man.c:2321 src/man.c:2418 +#: src/lexgrog.l:816 src/man.c:2242 src/man.c:2324 src/man.c:2421 #: src/manconv_main.c:165 src/straycats.c:221 src/ult_src.c:346 #: src/ult_src.c:360 src/zsoelim.l:498 #, c-format @@ -595,7 +595,7 @@ msgstr "无法为 %s 创建临时 cat 文件" msgid "can't open temporary file %s" msgstr "无法打开临时文件 %s" -#: src/man.c:1925 src/man.c:1962 src/man.c:3702 +#: src/man.c:1925 src/man.c:1962 src/man.c:3705 #, fuzzy, c-format msgid "can't restore previous working directory" msgstr "无法为 %s 创建临时 cat 文件" @@ -605,18 +605,18 @@ msgstr "无法为 %s 创建临时 cat 文件" msgid "can't remove directory %s" msgstr "无法移除目录 %s" -#: src/man.c:2081 +#: src/man.c:2084 #, 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:2129 +#: src/man.c:2132 #, c-format msgid "can't chdir to %s" msgstr "无法进入到 %s 目录中" -#: src/man.c:2363 +#: src/man.c:2366 #, c-format msgid "" "\n" @@ -625,23 +625,23 @@ msgstr "" "\n" "无法在 catman 模式下对 %s 写入" -#: src/man.c:2444 +#: src/man.c:2447 #, c-format msgid "Can't convert %s to cat name" msgstr "无法把 %s 转换为 cat 名称" # need-proofread -#: src/man.c:3169 +#: src/man.c:3172 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s：依赖于 whatis 引用是已被废弃的做法\n" -#: src/man.c:3319 src/man.c:4088 +#: src/man.c:3322 src/man.c:4091 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb 命令失败，退出状态代码为 %d" -#: src/man.c:3524 +#: src/man.c:3527 #, 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:4018 +#: src/man.c:4021 msgid " Manual page " msgstr " Manual page " @@ -876,7 +876,7 @@ msgstr "警告：必需的目录 %s 不存在" msgid "can't determine current directory" msgstr "无法确定当前目录" -#: src/manp.c:1382 +#: src/manp.c:1384 #, c-format msgid "warning: %s does not begin with %s" msgstr "警告：%s 并非以 %s 开始" @@ -679,7 +679,7 @@ static int get_roff_line_length (void) int line_length = cat_width ? cat_width : get_line_length (); /* groff >= 1.18 defaults to 78. */ - if (!troff && line_length != 80) { + if ((!troff || ditroff) && line_length != 80) { int length = line_length * 39 / 40; if (length > line_length - 2) return line_length - 2; @@ -1309,7 +1309,7 @@ static pipeline *make_roff_command (const char *dir, const char *file, #endif /* TROFF_IS_GROFF */ #if defined(TROFF_IS_GROFF) || defined(HEIRLOOM_NROFF) - if (!troff) { + { pipecmd *seq = add_roff_line_length (cmd, &save_cat); if (seq) @@ -1858,7 +1858,7 @@ static void format_display (pipeline *decomp, pipeline *format_cmd, pipeline *disp_cmd, const char *man_file) { - int status; + int format_status = 0, disp_status = 0; #ifdef TROFF_IS_GROFF struct saved_cwd old_cwd = { -1, NULL }; int have_old_cwd = 0; @@ -1898,7 +1898,7 @@ static void format_display (pipeline *decomp, pipeline_connect (decomp, format_cmd, NULL); pipeline_pump (decomp, format_cmd, NULL); pipeline_wait (decomp); - status = pipeline_wait (format_cmd); + format_status = pipeline_wait (format_cmd); } else #endif /* TROFF_IS_GROFF */ if (format_cmd) { @@ -1906,20 +1906,20 @@ static void format_display (pipeline *decomp, pipeline_connect (format_cmd, disp_cmd, NULL); pipeline_pump (decomp, format_cmd, disp_cmd, NULL); pipeline_wait (decomp); - pipeline_wait (format_cmd); - status = pipeline_wait (disp_cmd); + format_status = pipeline_wait (format_cmd); + disp_status = pipeline_wait (disp_cmd); } else { pipeline_connect (decomp, disp_cmd, NULL); pipeline_pump (decomp, disp_cmd, NULL); pipeline_wait (decomp); - status = pipeline_wait (disp_cmd); + disp_status = pipeline_wait (disp_cmd); } #ifdef TROFF_IS_GROFF if (format_cmd && htmlout) { char *browser_list, *candidate; - if (status) { + if (format_status) { if (have_old_cwd && restore_cwd (&old_cwd) < 0) { error (0, errno, _("can't restore previous working " @@ -1933,7 +1933,7 @@ static void format_display (pipeline *decomp, htmldir); free (htmlfile); free (htmldir); - gripe_system (format_cmd, status); + gripe_system (format_cmd, format_status); } browser_list = xstrdup (html_pager); @@ -1942,8 +1942,8 @@ static void format_display (pipeline *decomp, pipeline *browser; debug ("Trying browser: %s\n", candidate); browser = make_browser (candidate, htmlfile); - status = do_system_drop_privs (browser); - if (!status) + disp_status = do_system_drop_privs (browser); + if (!disp_status) break; } if (!candidate) { @@ -1970,9 +1970,12 @@ static void format_display (pipeline *decomp, free (htmldir); } else #endif /* TROFF_IS_GROFF */ - /* TODO: check format_cmd status too? */ - if (status && status != (SIGPIPE + 0x80) * 256) - gripe_system (disp_cmd, status); + { + if (format_status && format_status != (SIGPIPE + 0x80) * 256) + gripe_system (format_cmd, format_status); + if (disp_status && disp_status != (SIGPIPE + 0x80) * 256) + gripe_system (disp_cmd, disp_status); + } regain_effective_privs (); } @@ -1238,6 +1238,8 @@ void create_pathlist (const char *manp, char **mp) ++dupcheck) { char *dupcheck_target = canonicalize_file_name (*dupcheck); + if (!dupcheck_target) + continue; if (!STREQ (target, dupcheck_target)) { free (dupcheck_target); continue; |